Skip to content

Contracts: Stabilize APIs #3384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pgherveou merged 9 commits into from
Feb 20, 2024
Merged

Contracts: Stabilize APIs #3384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
72bbe0a
Contracts: Stabilize call_v2
pgherveou Feb 19, 2024
365cef0
Stabilize instantiate_v2 and rename add/remove_delegate_dependency wi…
pgherveou Feb 19, 2024
1eb74a1
Fix test name
pgherveou Feb 19, 2024
f706bd8
More renaming
pgherveou Feb 19, 2024
1073e03
Fix PRdoc
pgherveou Feb 19, 2024
e96f7c5
Comments rewording
pgherveou Feb 19, 2024
f502516
Merge branch 'master' into pg/call_v2
pgherveou Feb 19, 2024
643b86c
fixes
pgherveou Feb 19, 2024
bac4e6d
Fix Tests
pgherveou Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix Tests
  • Loading branch information
@pgherveou
pgherveou committed Feb 20, 2024
commit bac4e6df7e2244b83e68c87a3b2b3b2c077d8f0d
3 changes: 2 additions & 1 deletion substrate/frame/contracts/fixtures/contracts/call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ pub extern "C" fn call() {
callee_addr,
0u64, // How much ref_time to devote for the execution. 0 = all.
0u64, // How much proof_size to devote for the execution. 0 = all.
&0u64.to_le_bytes(), // value transferred to the contract.
None, // No deposit limit.
&0u64.to_le_bytes(), // Value transferred to the contract.
callee_input,
None,
)
Expand Down
3 changes: 2 additions & 1 deletion substrate/frame/contracts/fixtures/contracts/call_return_code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ pub extern "C" fn call() {
callee_addr,
0u64, // How much ref_time to devote for the execution. 0 = all.
0u64, // How much proof_size to devote for the execution. 0 = all.
&100u64.to_le_bytes(), // value transferred to the contract.
None, // No deposit limit.
&100u64.to_le_bytes(), // Value transferred to the contract.
input,
None,
) {
Expand Down
3 changes: 2 additions & 1 deletion substrate/frame/contracts/fixtures/contracts/call_runtime_and_call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ pub extern "C" fn call() {
callee_addr,
0u64, // How much ref_time to devote for the execution. 0 = all.
0u64, // How much proof_size to devote for the execution. 0 = all.
&0u64.to_le_bytes(), // value transferred to the contract.
None, // No deposit limit.
&0u64.to_le_bytes(), // Value transferred to the contract.
callee_input,
None,
)
Expand Down
2 changes: 1 addition & 1 deletion substrate/frame/contracts/fixtures/contracts/caller_contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pub extern "C" fn call() {
let res = api::call_v2(
uapi::CallFlags::empty(),
callee,
1u64, // too little ref_time weight
1u64, // Too little ref_time weight.
0u64, // How much proof_size weight to devote for the execution. 0 = all.
None, // No deposit limit.
&value,
Expand Down
3 changes: 2 additions & 1 deletion substrate/frame/contracts/fixtures/contracts/chain_extension_temp_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ pub extern "C" fn call() {
addr,
0u64, // How much ref_time to devote for the execution. 0 = all.
0u64, // How much proof_size to devote for the execution. 0 = all.
&0u64.to_le_bytes(), // value transferred to the contract.
None, // No deposit limit.
&0u64.to_le_bytes(), // Value transferred to the contract.
input,
None,
)
Expand Down
2 changes: 1 addition & 1 deletion substrate/frame/contracts/fixtures/contracts/create_storage_and_call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub extern "C" fn call() {
0u64, // How much ref_time weight to devote for the execution. 0 = all.
0u64, // How much proof_size weight to devote for the execution. 0 = all.
Some(deposit_limit),
&0u64.to_le_bytes(), // value transferred to the contract.
&0u64.to_le_bytes(), // Value transferred to the contract.
input,
None,
)
Expand Down
3 changes: 2 additions & 1 deletion substrate/frame/contracts/fixtures/contracts/reentrance_count_call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ pub extern "C" fn call() {
addr,
0u64, // How much ref_time to devote for the execution. 0 = all.
0u64, // How much proof_size to devote for the execution. 0 = all.
&0u64.to_le_bytes(), // value transferred to the contract.
None, // No deposit limit.
&0u64.to_le_bytes(), // Value transferred to the contract.
&count,
None,
)
Expand Down
1 change: 1 addition & 0 deletions substrate/frame/contracts/fixtures/contracts/self_destruct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ pub extern "C" fn call() {
addr,
0u64, // How much ref_time to devote for the execution. 0 = all.
0u64, // How much proof_size to devote for the execution. 0 = all.
None, // No deposit limit.
&0u64.to_le_bytes(), // Value to transfer.
&[0u8; 0],
None,
Expand Down
6 changes: 3 additions & 3 deletions substrate/frame/contracts/src/wasm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3399,8 +3399,8 @@ mod tests {
}

#[test]
fn add_unlock_delegate_dependency() {
const CODE_ADD_unlock_delegate_dependency: &str = r#"
fn lock_unlock_delegate_dependency() {
const CODE_LOCK_UNLOCK_DELEGATE_DEPENDENCY: &str = r#"
(module
(import "seal0" "lock_delegate_dependency" (func $lock_delegate_dependency (param i32)))
(import "seal0" "unlock_delegate_dependency" (func $unlock_delegate_dependency (param i32)))
Expand All @@ -3426,7 +3426,7 @@ mod tests {
)
"#;
let mut mock_ext = MockExt::default();
assert_ok!(execute(&CODE_ADD_unlock_delegate_dependency, vec![], &mut mock_ext));
assert_ok!(execute(&CODE_LOCK_UNLOCK_DELEGATE_DEPENDENCY, vec![], &mut mock_ext));
let delegate_dependencies: Vec<_> =
mock_ext.delegate_dependencies.into_inner().into_iter().collect();
assert_eq!(delegate_dependencies.len(), 1);
Expand Down