diff --git a/CHANGELOG.md b/CHANGELOG.md index 10744abb6f..bb1015864c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ * Command `rules` that outputs time-efficient GNU Make rules. +# 0.25.0 + ### fix: correctly detects hyphenated Rust bin crates ### fix: removes unnecessary tsc step in sveltekit build script @@ -192,9 +194,11 @@ Updated Motoko to [0.13.6](https://github.com/dfinity/motoko/releases/tag/0.13.6 ### Replica -Updated replica to elected commit 233c1ee2ef68c1c8800b8151b2b9f38e17b8440a. +Updated replica to elected commit 4ba583480e05a518aa2bcf36f5a0e48475e8edc2. This incorporates the following executed proposals: +- [134967](https://dashboard.internetcomputer.org/proposal/134967) +- [134966](https://dashboard.internetcomputer.org/proposal/134966) - [134900](https://dashboard.internetcomputer.org/proposal/134900) - [134773](https://dashboard.internetcomputer.org/proposal/134773) - [134684](https://dashboard.internetcomputer.org/proposal/134684) diff --git a/Cargo.lock b/Cargo.lock index 42a9744dda..7fe7f60a46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.39.3" -source = "git+https://github.com/dfinity/agent-rs?rev=a96022bd185e97f52c5cde1c82c7592abddcff86#a96022bd185e97f52c5cde1c82c7592abddcff86" +source = "git+https://github.com/dfinity/agent-rs?rev=9ebf6314ce2fcb36772c7d81d6d414b4628d6101#9ebf6314ce2fcb36772c7d81d6d414b4628d6101" dependencies = [ "arc-swap", "async-channel", @@ -2671,7 +2671,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "ic-certification 3.0.2", - "ic-transport-types 0.39.3 (git+https://github.com/dfinity/agent-rs?rev=a96022bd185e97f52c5cde1c82c7592abddcff86)", + "ic-transport-types 0.39.3 (git+https://github.com/dfinity/agent-rs?rev=9ebf6314ce2fcb36772c7d81d6d414b4628d6101)", "ic-verify-bls-signature", "k256 0.13.4", "leb128", @@ -3111,7 +3111,7 @@ dependencies = [ [[package]] name = "ic-identity-hsm" version = "0.39.3" -source = "git+https://github.com/dfinity/agent-rs?rev=a96022bd185e97f52c5cde1c82c7592abddcff86#a96022bd185e97f52c5cde1c82c7592abddcff86" +source = "git+https://github.com/dfinity/agent-rs?rev=9ebf6314ce2fcb36772c7d81d6d414b4628d6101#9ebf6314ce2fcb36772c7d81d6d414b4628d6101" dependencies = [ "hex", "ic-agent", @@ -3229,7 +3229,7 @@ dependencies = [ [[package]] name = "ic-transport-types" version = "0.39.3" -source = "git+https://github.com/dfinity/agent-rs?rev=a96022bd185e97f52c5cde1c82c7592abddcff86#a96022bd185e97f52c5cde1c82c7592abddcff86" +source = "git+https://github.com/dfinity/agent-rs?rev=9ebf6314ce2fcb36772c7d81d6d414b4628d6101#9ebf6314ce2fcb36772c7d81d6d414b4628d6101" dependencies = [ "candid", "hex", @@ -3299,7 +3299,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.39.3" -source = "git+https://github.com/dfinity/agent-rs?rev=a96022bd185e97f52c5cde1c82c7592abddcff86#a96022bd185e97f52c5cde1c82c7592abddcff86" +source = "git+https://github.com/dfinity/agent-rs?rev=9ebf6314ce2fcb36772c7d81d6d414b4628d6101#9ebf6314ce2fcb36772c7d81d6d414b4628d6101" dependencies = [ "async-trait", "candid", @@ -4735,7 +4735,7 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "pocket-ic" version = "6.0.0" -source = "git+https://github.com/dfinity/ic?rev=233c1ee2ef68c1c8800b8151b2b9f38e17b8440a#233c1ee2ef68c1c8800b8151b2b9f38e17b8440a" +source = "git+https://github.com/dfinity/ic?rev=4ba583480e05a518aa2bcf36f5a0e48475e8edc2#4ba583480e05a518aa2bcf36f5a0e48475e8edc2" dependencies = [ "backoff", "base64 0.13.1", @@ -7013,7 +7013,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2a3ebbd8de..97044c6b8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,11 +22,11 @@ license = "Apache-2.0" candid = "0.10.11" candid_parser = "0.1.4" dfx-core = { path = "src/dfx-core", version = "0.1.0" } -ic-agent = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "a96022bd185e97f52c5cde1c82c7592abddcff86" } +ic-agent = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "9ebf6314ce2fcb36772c7d81d6d414b4628d6101" } ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.21.0" } ic-cdk = "0.13.1" -ic-identity-hsm = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "a96022bd185e97f52c5cde1c82c7592abddcff86" } -ic-utils = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "a96022bd185e97f52c5cde1c82c7592abddcff86" } +ic-identity-hsm = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "9ebf6314ce2fcb36772c7d81d6d414b4628d6101" } +ic-utils = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "9ebf6314ce2fcb36772c7d81d6d414b4628d6101" } aes-gcm = "0.10.3" anyhow = "1.0.56" diff --git a/e2e/assets/playground_backend/mops.toml b/e2e/assets/playground_backend/mops.toml index 8114f36b67..eb5a2ffebe 100644 --- a/e2e/assets/playground_backend/mops.toml +++ b/e2e/assets/playground_backend/mops.toml @@ -5,3 +5,4 @@ splay = "0.1.0" [[canister]] candid = "service/wasm-utils/wasm-utils.did" output = "service/pool/Wasm-utils.mo" + diff --git a/e2e/assets/playground_backend/service/pool/IC.mo b/e2e/assets/playground_backend/service/pool/IC.mo index fa6fedad08..231bdb4bc8 100644 --- a/e2e/assets/playground_backend/service/pool/IC.mo +++ b/e2e/assets/playground_backend/service/pool/IC.mo @@ -23,8 +23,8 @@ module { #reinstall; #upgrade : ?{ wasm_memory_persistence : ?{ - #Keep; - #Replace; + #keep; + #replace; }; }; #install; @@ -85,6 +85,22 @@ module { message_hash : Blob; }; public type sign_with_ecdsa_result = { signature : Blob }; + public type schnorr_algorithm = { + #bip340secp256k1; + #ed25519; + }; + public type schnorr_aux = { + #bip341: { + merkle_root_hash: Blob + } + }; + public type sign_with_schnorr_args = { + message : Blob; + derivation_path : [Blob]; + key_id : { algorithm : schnorr_algorithm; name : Text }; + aux: ?schnorr_aux; + }; + public type sign_with_schnorr_result = { signature : Blob }; public type user_id = Principal; public type wasm_module = Blob; public type Self = actor { @@ -116,6 +132,7 @@ module { } -> async (); raw_rand : shared () -> async Blob; sign_with_ecdsa : shared sign_with_ecdsa_args -> async sign_with_ecdsa_result; + sign_with_schnorr : shared sign_with_schnorr_args -> async sign_with_schnorr_result; start_canister : shared { canister_id : canister_id } -> async (); stop_canister : shared { canister_id : canister_id } -> async (); uninstall_code : shared { canister_id : canister_id } -> async (); diff --git a/e2e/assets/playground_backend/service/pool/Main.mo b/e2e/assets/playground_backend/service/pool/Main.mo index 2d297f4287..f99532cc44 100644 --- a/e2e/assets/playground_backend/service/pool/Main.mo +++ b/e2e/assets/playground_backend/service/pool/Main.mo @@ -361,7 +361,6 @@ shared (creator) actor class Self(opt_params : ?Types.InitParams) = this { mode = args.mode; canister_id = args.canister_id; }; - Debug.print("install mode: " # debug_show(args.mode)); await IC.install_code newArgs; stats := Logs.updateStats(stats, #install); @@ -710,6 +709,12 @@ shared (creator) actor class Self(opt_params : ?Types.InitParams) = this { await* pool.addCycles(caller, #refund); res }; + public shared ({ caller }) func sign_with_schnorr(arg: ICType.sign_with_schnorr_args) : async ICType.sign_with_schnorr_result { + await* pool.addCycles(caller, #method "sign_with_schnorr"); + let res = await IC.sign_with_schnorr(arg); + await* pool.addCycles(caller, #refund); + res + }; public shared ({ caller }) func _ttp_request(request : ICType.http_request_args) : async ICType.http_request_result { await* pool.addCycles(caller, #method "http_request"); let new_request = switch (request.transform) { @@ -832,6 +837,7 @@ shared (creator) actor class Self(opt_params : ?Types.InitParams) = this { #_ttp_request : Any; #__transform : Any; #sign_with_ecdsa: Any; + #sign_with_schnorr: Any; #eth_call: Any; #eth_feeHistory: Any; #eth_getBlockByNumber: Any; @@ -856,6 +862,7 @@ shared (creator) actor class Self(opt_params : ?Types.InitParams) = this { case (#_ttp_request _) false; case (#__transform _) false; case (#sign_with_ecdsa _) false; + case (#sign_with_schnorr _) false; case (#eth_call _) false; case (#eth_feeHistory _) false; case (#eth_getBlockByNumber _) false; diff --git a/e2e/assets/playground_backend/wasm-utils.did b/e2e/assets/playground_backend/wasm-utils.did index 76c7913b92..004ede4e73 100644 --- a/e2e/assets/playground_backend/wasm-utils.did +++ b/e2e/assets/playground_backend/wasm-utils.did @@ -1,7 +1,8 @@ type Config = record { - profiling : bool; + profiling : opt record { start_page: opt nat32; page_limit: opt nat32 }; remove_cycles_add : bool; limit_stable_memory_page : opt nat32; + limit_heap_memory_page : opt nat32; backend_canister_id : opt principal; }; diff --git a/e2e/assets/playground_backend/wasm-utils.wasm b/e2e/assets/playground_backend/wasm-utils.wasm old mode 100644 new mode 100755 index c56d4f8abb..7fce4f7ec5 Binary files a/e2e/assets/playground_backend/wasm-utils.wasm and b/e2e/assets/playground_backend/wasm-utils.wasm differ diff --git a/e2e/tests-dfx/call.bash b/e2e/tests-dfx/call.bash index 53cba42ff7..d41042bec0 100644 --- a/e2e/tests-dfx/call.bash +++ b/e2e/tests-dfx/call.bash @@ -318,7 +318,7 @@ function impersonate_sender() { # test management canister call failure (setting memory allocation to a low value) assert_command_fail dfx canister update-settings hello_backend --memory-allocation 1 --impersonate "${IDENTITY_PRINCIPAL}" - assert_contains "Management canister call failed: IC0402: Canister was given 1 B memory allocation but at least" + assert_contains "Canister was given 1 B memory allocation but at least" # canister status fails because the default identity does not control the canister anymore assert_command_fail dfx canister status hello_backend @@ -334,22 +334,22 @@ function impersonate_sender() { # test management canister call submission failure assert_command_fail dfx canister status hello_backend --impersonate "${IDENTITY_PRINCIPAL}" - assert_contains "Failed to submit management canister call: IC0207: Canister $CANISTER_ID is out of cycles" + assert_contains "Failed to submit management canister call: Canister $CANISTER_ID is out of cycles" # test update call submission failure assert_command_fail dfx canister call aaaaa-aa canister_status "(record { canister_id=principal\"$CANISTER_ID\" })" --update --impersonate "${IDENTITY_PRINCIPAL}" - assert_contains "Failed to submit canister call: IC0207: Canister $CANISTER_ID is out of cycles" + assert_contains "Failed to submit canister call: Canister $CANISTER_ID is out of cycles" # test async call submission failure assert_command_fail dfx canister call aaaaa-aa canister_status "(record { canister_id=principal\"$CANISTER_ID\" })" --async --impersonate "${IDENTITY_PRINCIPAL}" - assert_contains "Failed to submit canister call: IC0207: Canister $CANISTER_ID is out of cycles" + assert_contains "Failed to submit canister call: Canister $CANISTER_ID is out of cycles" # unfreeze the canister assert_command dfx canister update-settings hello_backend --freezing-threshold 0 --impersonate "${IDENTITY_PRINCIPAL}" # test update call failure assert_command_fail dfx canister call aaaaa-aa delete_canister "(record { canister_id=principal\"$CANISTER_ID\" })" --update --impersonate "${IDENTITY_PRINCIPAL}" - assert_contains "Canister call failed: IC0510: Canister $CANISTER_ID must be stopped before it is deleted." + assert_contains "Canister call failed: Canister $CANISTER_ID must be stopped before it is deleted." # test update call assert_command dfx canister call aaaaa-aa start_canister "(record { canister_id=principal\"$CANISTER_ID\" })" --update --impersonate "${IDENTITY_PRINCIPAL}" @@ -361,7 +361,7 @@ function impersonate_sender() { # test query call failure assert_command_fail dfx canister call aaaaa-aa fetch_canister_logs "(record { canister_id=principal\"$CANISTER_ID\" })" --query --impersonate "$CANISTER_ID" - assert_contains "Failed to perform query call: IC0406: Caller $CANISTER_ID is not allowed to query ic00 method fetch_canister_logs" + assert_contains "Failed to perform query call: Caller $CANISTER_ID is not allowed to query ic00 method fetch_canister_logs" # test query call assert_command dfx canister call aaaaa-aa fetch_canister_logs "(record { canister_id=principal\"$CANISTER_ID\" })" --query --impersonate "${IDENTITY_PRINCIPAL}" diff --git a/nix/sources.json b/nix/sources.json index 7d4314ed4e..f352da12c4 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -2,71 +2,71 @@ "canister_sandbox-x86_64-darwin": { "builtin": false, "description": "The canister_sandbox binary. It must be updated together with the replica binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1g8mv5mgwkg0vmvc4wdywd3vl43n2blfs241pgmaj1vz7mycv03i", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "13bm03qyywixdlnw5jq0yzrd7g6a2mp8mmlgdmid9nknpw51mrkg", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/canister_sandbox.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/canister_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/canister_sandbox.gz" }, "canister_sandbox-x86_64-linux": { "builtin": false, "description": "The canister_sandbox binary. It must be updated together with the replica binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1c42254cc2iaaiwfyas9sqq0rjyflrch6mrcmv2wygp5skrxr6jb", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "11paqhxlv7hlc8nw4yzb8is4kb9msndjihkdm7c3n1pj184j3mff", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/canister_sandbox.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/canister_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/canister_sandbox.gz" }, "compiler_sandbox-x86_64-darwin": { "builtin": false, "description": "The compiler_sandbox binary. It must be updated together with the replica binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1hd868fjnwvw0rfl39cdbfbkv1jwwiq2ihndvfldqk7bj19vx4jr", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1jvhbjz0iwqvx4cfl25w83wn3y7ba80h9y7ff60d2vbwyx4spqyi", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/compiler_sandbox.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/compiler_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/compiler_sandbox.gz" }, "compiler_sandbox-x86_64-linux": { "builtin": false, "description": "The compiler_sandbox binary. It must be updated together with the replica binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1g7nji5iihxh5qd8kiiazyq0rlh287h55kmmdfpw8hpff7679d69", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "0bh7z2n5b2frr6c6h09kz7lqnr4dbivgyp4cyfamjz557qqwcxn4", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/compiler_sandbox.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/compiler_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/compiler_sandbox.gz" }, "ic-admin-x86_64-darwin": { "builtin": false, "description": "The ic-admin binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1qj6wwy3vpndr49lb1288qxf3hiyqabrj4gqh7k3sb1zhysprc73", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1x4zayqh9rla7q2m3ld1ss3sq07xvz0cysksw84ssj12cqb8gn9j", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-admin.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-admin.gz" }, "ic-admin-x86_64-linux": { "builtin": false, "description": "The ic-admin binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1qyqzig8yynkc8l2xmwm4rb0vlb4r3i9rcfgqmavr7kd0cb6l4ph", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "10ymh7ccz1gn2x5cmik10njcz7774nk2vqax68a06yzcxklrs15r", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-admin.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-admin.gz" }, "ic-btc-adapter-x86_64-darwin": { "builtin": false, - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "124sc46cnl4gl1y7zfk4bf1lnb35apqsqrds5s4dnsjjmnj2w5j7", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "0s17digpzzq14nq5xk6m1wgc8v9i4rz2391yfvhyn3rq4v3399dl", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-btc-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-btc-adapter.gz" }, "ic-btc-adapter-x86_64-linux": { "builtin": false, - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "0gblcj3rrdh6xlw6872hyb95kgqk4ai6vjg5aj00b2zhv4ickq6r", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1ad8vpp17gr9sdn07mcwlr62igyl8knnk0h3b9ix47wcnk7kzipi", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-btc-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-btc-adapter.gz" }, "ic-btc-canister": { @@ -78,52 +78,52 @@ }, "ic-https-outcalls-adapter-x86_64-darwin": { "builtin": false, - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "0k6wq8wcvn2byizvaxn3cswbvgh6jdvfydf87zc5psqfz9gpln0r", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "11wqnq9szls3l590ijpnc12idfcp7l2fc5aqvx3ivam7w27r3gy8", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-https-outcalls-adapter.gz" }, "ic-https-outcalls-adapter-x86_64-linux": { "builtin": false, - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "0jvbid49418d49f6vc6kj3j6nmc8ww3988cildvis7hdvwkhd6cr", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1d2z6ilbn880ggd8312ccm3bgsq5kiav964mz4zl8jqk73sjp6ly", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-https-outcalls-adapter.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-https-outcalls-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-https-outcalls-adapter.gz" }, "ic-nns-init-x86_64-darwin": { "builtin": false, "description": "The ic-nns-init binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1pjclcp5c3n92xx5lrqrlcnl1gbs5nyzaxxqr440g2xhq3sc2bh2", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "16ynn4nkbzr12aj6m10xh3z37fr5kbmhhnhxp2mrnlz59p9hn9nn", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-nns-init.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-nns-init.gz" }, "ic-nns-init-x86_64-linux": { "builtin": false, "description": "The ic-nns-init binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "0s43bnrwxnysjjb1klxzbb6aacb84dgvbgdj80icyn90vklp8ncq", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "03s5nn2dkjrbcal0jcvl5gf2zxbmkysjwxdw4bzs9yqrpf67n5hb", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-nns-init.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-nns-init.gz" }, "ic-starter-x86_64-darwin": { "builtin": false, - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1n5xb3mjasr4hlk9rypr2bsm3m28zj9gqwvpqqw152rnkjncv9wv", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "0irl8h13hm6p65vbmp0vlldldglbfqxgxpxn7mxb49ksg3hf3j9a", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-starter.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-starter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-starter.gz" }, "ic-starter-x86_64-linux": { "builtin": false, - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "0awa7hc8yrqr1wl7m52l3ha9vahcxclm5wav8n637bi98330q725", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "0nvb3pkiq52s18mx3fbgsd09skdz676sx5c5d93dvsx5ljzby0pd", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-starter.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-starter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-starter.gz" }, "motoko-base": { @@ -153,71 +153,71 @@ "version": "0.13.6" }, "pocket-ic-x86_64-darwin": { - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1d78ry9f2hjsbciih4rcyvjl2b46mxxlk9fn3rs58dmbmaivqj6q", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1yl3m0pv4lcpp38sfgmlagf7w5nkq14yd07zlsg6hkx9gr8z4gww", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/pocket-ic.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/pocket-ic.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/pocket-ic.gz" }, "pocket-ic-x86_64-linux": { - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1cginlcm030hwsg8gah9h3n7wzdx6d4sq8jpf0wzfllsl8zgs0zi", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1jwcqlzv4vrl1yhi4qn922d4lkz74sx09khfz7xrsvfg5khp52ar", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/pocket-ic.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/pocket-ic.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/pocket-ic.gz" }, "replica-x86_64-darwin": { "builtin": false, "description": "The replica binary. It must be updated together with the canister_sandbox binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1pf6yzd0ssvicxyfrx0gvf1brs3chx74wzbd7iyq7zagv270nc00", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "03bxfq36jizdc0vqq50jak08sdz6mzcfhdz7rr37xb63i2wilkrs", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/replica.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/replica.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/replica.gz" }, "replica-x86_64-linux": { "builtin": false, "description": "The replica binary. It must be updated together with the canister_sandbox binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "114hkl59a1l154rra97x8x0ydz70bs3ldcmg3igwfb00h05a5kk0", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "0my37zr2jri788d9yjdakv2wmq7xip8v4ng6r4g8w0zbhn7x9zjg", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/replica.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/replica.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/replica.gz" }, "sandbox_launcher-x86_64-darwin": { "builtin": false, "description": "The sandbox_launcher binary. It must be updated together with the replica binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "18aay65as009q8r7a4xaabvjjgivi6ln7sai12hk19ajj4yz4b27", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "079kakdl6qym244a8img4sal62jjv4yy4bmpp3mk1a2bcln9n310", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/sandbox_launcher.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/sandbox_launcher.gz" }, "sandbox_launcher-x86_64-linux": { "builtin": false, "description": "The sandbox_launcher binary. It must be updated together with the replica binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "0qgqq2m1a2xm4fg5crzgawa9lrs7rc9xzqc8kcqx1854b30vzjdi", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1lls0i3j72gmx0gn0rjjhvz19bidbccncswdf5apynlhfb853fyh", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/sandbox_launcher.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/sandbox_launcher.gz" }, "sns-x86_64-darwin": { "builtin": false, "description": "The sns binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "024zk320mi7k91d8r5dbnk0vy2q0mh112bwa8higm32if9886cb6", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "0cl921qhc2kdnjwxdxi6nxhkcmbk7xvvfn1y4ipm9833kafp7r7v", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/sns.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/sns.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/sns.gz" }, "sns-x86_64-linux": { "builtin": false, "description": "The sns binary.", - "rev": "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a", - "sha256": "1n3w23v59sqlqlb3rjnr83b0kdkw0dr0lqs1v20fbrh0d59brbf9", + "rev": "4ba583480e05a518aa2bcf36f5a0e48475e8edc2", + "sha256": "1g11pnz9f5jir8bmxk351xq9lfm2kxdbvmy1mmh8ymdnqp3qbjd2", "type": "file", - "url": "https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/sns.gz", + "url": "https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/sns.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/sns.gz" } } diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index d144603fc9..2ed97e8803 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -86,7 +86,7 @@ os_str_bytes = { version = "6.3.0", features = ["conversions"] } patch = "0.7.0" pem.workspace = true petgraph = "0.6.0" -pocket-ic = { git = "https://github.com/dfinity/ic", rev = "233c1ee2ef68c1c8800b8151b2b9f38e17b8440a" } +pocket-ic = { git = "https://github.com/dfinity/ic", rev = "4ba583480e05a518aa2bcf36f5a0e48475e8edc2" } rand = "0.8.5" regex = "1.5.5" reqwest = { workspace = true, features = ["blocking", "json"] } diff --git a/src/dfx/assets/dfx-asset-sources.toml b/src/dfx/assets/dfx-asset-sources.toml index cf1f80d355..41666bfa16 100644 --- a/src/dfx/assets/dfx-asset-sources.toml +++ b/src/dfx/assets/dfx-asset-sources.toml @@ -1,25 +1,25 @@ # generated by write-dfx-asset-sources.sh -replica-rev = '233c1ee2ef68c1c8800b8151b2b9f38e17b8440a' +replica-rev = '4ba583480e05a518aa2bcf36f5a0e48475e8edc2' [x86_64-darwin.ic-admin] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-admin.gz' -sha256 = 'e3b07cb5873f2c3de681f8119997c23ec2e13a4648844513c9cdde3d3ce746e2' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-admin.gz' +sha256 = '32d98716662248ad09e27a6acfc0dffd00ac87d6a1d151053e8ae604b1579ff4' [x86_64-darwin.ic-btc-adapter] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-btc-adapter.gz' -sha256 = '47162ea4ad526adb882eba65acf155652c4b835b64ba7f7ca08f50cb0c619a88' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-btc-adapter.gz' +sha256 = 'b4a534c626380febe1763ea4217e26316dc41e0fd5cc5eb02501ff7f5f6c2768' [x86_64-darwin.ic-https-outcalls-adapter] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz' -sha256 = '19587a5ffa0eeb5bd83fc835ef769306bebdb866c376b57ff44bd8cd38c2dc4c' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz' +sha256 = 'c8bf918fe0a7aa1d47df5815e6043d97b9164560f6ca0852a143d3af13b69887' [x86_64-darwin.ic-nns-init] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-nns-init.gz' -sha256 = '022ec1f4c0b08b0708c9b877f5bd2d7abd402da319675a7a17c90e562ea34cde' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-nns-init.gz' +sha256 = 'd6260bd34de5539babb81d5a08eb9a25bb33fe801d846aa41221ff352db1d69b' [x86_64-darwin.ic-starter] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/ic-starter.gz' -sha256 = '9ba7cdac9c368b1238c67773fc92fc48d451f512f9fa9c2685246b25eb58bdd8' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/ic-starter.gz' +sha256 = '2ac9e1e0787a26b27a3db6dffe3a768bbe461ba51bdcba7631d7543802443447' [x86_64-darwin.motoko] url = 'https://github.com/dfinity/motoko/releases/download/0.13.6/motoko-Darwin-x86_64-0.13.6.tar.gz' @@ -27,30 +27,30 @@ sha256 = 'a1159d654def06356b1a727e3ea3608991c0a176e9398bd31a26aa594ef4f870' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.replica] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/replica.gz' -sha256 = '00300b8ed84ffd837d3c6d7d4e4e876ce8bc82db0ff4ec7c67716b0ddaf7c6dd' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/replica.gz' +sha256 = '3a4f1ab988c3ac7e46cee737e8d8afe6378dc05412148c3760ed476906767d0d' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.canister_sandbox] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/canister_sandbox.gz' -sha256 = '7180cd7c3d7f07a9eabb8108ede8127610ba47e3be71c276dde04dfe6ad915bd' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/canister_sandbox.gz' +sha256 = '6fe61a0abf76dad4626d8fd68a6e15cabcd3f2f700cbc22d6d3d72eff100758d' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.compiler_sandbox] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/compiler_sandbox.gz' -sha256 = '5992be5390eb4cdca8dbcdc22870e45c863d975b8da5415d067c732b1d32a8c1' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/compiler_sandbox.gz' +sha256 = 'd1e3ab49f77c6dd18071eef8040152ebf861f940bc08ea18e91bf308be5c70cb' [x86_64-darwin.sandbox_launcher] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/sandbox_launcher.gz' -sha256 = '472cf23d9152a530a10851e963a9893b3e29f752aa137532c20900ad8af14aa1' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/sandbox_launcher.gz' +sha256 = '200c9b2c654ba830ebb8b72ee23dd9520a439526af46a40811d56343db54331d' [x86_64-darwin.sns] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/sns.gz' -sha256 = '6631835072518cfa22448a2f1102ac000bbfc1b4ab958c5a48f3c40ac4989f08' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/sns.gz' +sha256 = 'fbe4739d9a63a0546f243e58b7773f73553661b726f6d6b9b46d0a0671108932' [x86_64-darwin.pocket-ic] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-darwin/pocket-ic.gz' -sha256 = 'd848bca3aaab3654741ed6a5497baf862c41e5f62c1318235b5a42e192cfe8b4' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-darwin/pocket-ic.gz' +sha256 = '9c3ff2517ea94f689ea6ff80e649c0d3167edc53b43ea7d1b89751b22fa883fa' [x86_64-darwin.motoko-base] url = 'https://github.com/dfinity/motoko/releases/download/0.13.6/motoko-base-library.tar.gz' @@ -61,24 +61,24 @@ url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2 sha256 = '09f5647a45ff6d5d05b2b0ed48613fb2365b5fe6573ba0e901509c39fb9564ac' [x86_64-linux.ic-admin] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-admin.gz' -sha256 = 'f0126a16036d9ebc55c5cfb19ce2c864d10d562695d72e2862d37a8f5efcd8e3' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-admin.gz' +sha256 = 'b9049de9ecec7b0314325de12da625e79ccfa40561c6ca4a17f685cfd881d583' [x86_64-linux.ic-btc-adapter] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-btc-adapter.gz' -sha256 = 'd9e0c922d9f08b058054e5c96da22213bf59d2f2501c6438ed06b69c8764743d' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-btc-adapter.gz' +sha256 = 'f1c63fcfb48c1fd2635a038269ed44d4bf284ca69cd5036cd329bf13eedda8a9' [x86_64-linux.ic-https-outcalls-adapter] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-https-outcalls-adapter.gz' -sha256 = '99990627df0d1e1d77a391219406e788556be490d3b06d5c220d0592488b6b4b' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-https-outcalls-adapter.gz' +sha256 = '9e9a2bf538134b443ff99598b4559c05ebb746654c8481da7b0021bb68345fb4' [x86_64-linux.ic-nns-init] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-nns-init.gz' -sha256 = '985974e9dc2059cf2240b2bdb55f236831a5cc5abfd3199694dadbceb35d8368' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-nns-init.gz' +sha256 = '0b167b8cbb19fba4ff22bc752eb59f75f52fdc2b743309a8622bcbd984b5450f' [x86_64-linux.ic-starter] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/ic-starter.gz' -sha256 = '451c0cc64029ae338c455bf15229eb0caa9d141c54947a280f19678f183c8a2b' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/ic-starter.gz' +sha256 = 'ed02bfbea4a5ebdd466a8595aecd31bf4d9d40d36fb9d12b0a5a141ce71d6b5b' [x86_64-linux.motoko] url = 'https://github.com/dfinity/motoko/releases/download/0.13.6/motoko-Linux-x86_64-0.13.6.tar.gz' @@ -86,30 +86,30 @@ sha256 = '4f5ad590e8755ef2427c4bd786e26a1a87e9b88629bf6380656cf65de60af4f4' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.replica] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/replica.gz' -sha256 = '60cea20a80002cc75f1cafb246875ee0fce64147fd249533298106950a9d9084' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/replica.gz' +sha256 = '4ffed48f85eb038e1ec9e659b2d18dfde0cac59eaa499f1a42276629f23fc357' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.canister_sandbox] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/canister_sandbox.gz' -sha256 = '4b9adcf3d4e53ecfc5ae2c570359a6cecb0c30d6492bef78542a0ac6481182b0' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/canister_sandbox.gz' +sha256 = 'ced521090af2063bd8a96dc2289bd535ad497444eb7bc22d62149e4d3bc4ea86' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.compiler_sandbox] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/compiler_sandbox.gz' -sha256 = 'c9b474cc71ee42c4af6bb5ce52e04102d20cb0ff2ac6891a2eb0c3184b94f6bc' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/compiler_sandbox.gz' +sha256 = 'c476c6313ea57c5995f38c5cff765c8d648be9f933016898c9d98955acf8072e' [x86_64-linux.sandbox_launcher] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/sandbox_launcher.gz' -sha256 = 'b1c9bfc158a4a0d0319b88e1df13cb47679a1457ef67569e23b50b15aac0f861' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/sandbox_launcher.gz' +sha256 = 'd0bb51d072905a7f55718d6b66195b2dae14fe865266601fe8f5892347049ad2' [x86_64-linux.sns] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/sns.gz' -sha256 = 'c9adbc526900e6e580d841630a72037cb609d640d9ca3c16c514eb54f6107cd8' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/sns.gz' +sha256 = 'a2c985c7c5b6558f60adc1d7bd5a9fa23a9a700f65cc5e17ca511697bebd21bc' [x86_64-linux.pocket-ic] -url = 'https://download.dfinity.systems/ic/233c1ee2ef68c1c8800b8151b2b9f38e17b8440a/binaries/x86_64-linux/pocket-ic.gz' -sha256 = 'f103fd3ea29a52f739705722ac4933bd7d7eec8009aa879ee6100c5019b5f1b1' +url = 'https://download.dfinity.systems/ic/4ba583480e05a518aa2bcf36f5a0e48475e8edc2/binaries/x86_64-linux/pocket-ic.gz' +sha256 = '598972e12ccf6d9dfbf90ece04ba26e74f4a9a10c96212a10f346fb23fc58ccb' [x86_64-linux.motoko-base] url = 'https://github.com/dfinity/motoko/releases/download/0.13.6/motoko-base-library.tar.gz' diff --git a/src/dfx/src/commands/canister/call.rs b/src/dfx/src/commands/canister/call.rs index 1841020aee..1e69f2d84f 100644 --- a/src/dfx/src/commands/canister/call.rs +++ b/src/dfx/src/commands/canister/call.rs @@ -22,7 +22,6 @@ use ic_utils::interfaces::management_canister::MgmtMethod; use ic_utils::interfaces::wallet::{CallForwarder, CallResult}; use ic_utils::interfaces::WalletCanister; use pocket_ic::common::rest::RawEffectivePrincipal; -use pocket_ic::WasmResult; use slog::warn; use std::option::Option; use std::path::PathBuf; @@ -356,7 +355,7 @@ To figure out the id of your wallet, run 'dfx identity get-wallet (--network ic) CallSender::Impersonate(sender) => { let pocketic = env.get_pocketic(); if let Some(pocketic) = pocketic { - let res = pocketic + pocketic .query_call_with_effective_principal( canister_id, RawEffectivePrincipal::CanisterId( @@ -367,11 +366,13 @@ To figure out the id of your wallet, run 'dfx identity get-wallet (--network ic) arg_value, ) .await - .map_err(|err| anyhow!("Failed to perform query call: {}", err))?; - match res { - WasmResult::Reply(data) => data, - WasmResult::Reject(err) => bail!("Canister rejected: {}", err), - } + .map_err(|err| { + anyhow!( + "Failed to perform query call: {} ({})", + err.reject_message, + err.error_code + ) + })? } else { bail!("Impersonating sender is only supported for a local PocketIC instance.") } @@ -416,7 +417,13 @@ To figure out the id of your wallet, run 'dfx identity get-wallet (--network ic) arg_value, ) .await - .map_err(|err| anyhow!("Failed to submit canister call: {}", err))? + .map_err(|err| { + anyhow!( + "Failed to submit canister call: {} ({})", + err.reject_message, + err.error_code + ) + })? .message_id; CallResponse::Poll(RequestId::new(msg_id.as_slice().try_into().unwrap())) } else { @@ -465,15 +472,20 @@ To figure out the id of your wallet, run 'dfx identity get-wallet (--network ic) arg_value, ) .await - .map_err(|err| anyhow!("Failed to submit canister call: {}", err))?; - let res = pocketic - .await_call_no_ticks(msg_id) - .await - .map_err(|err| anyhow!("Canister call failed: {}", err))?; - match res { - WasmResult::Reply(data) => data, - WasmResult::Reject(err) => bail!("Canister rejected: {}", err), - } + .map_err(|err| { + anyhow!( + "Failed to submit canister call: {} ({})", + err.reject_message, + err.error_code + ) + })?; + pocketic.await_call_no_ticks(msg_id).await.map_err(|err| { + anyhow!( + "Canister call failed: {} ({})", + err.reject_message, + err.error_code + ) + })? } else { bail!("Impersonating sender is only supported for a local PocketIC instance.") } diff --git a/src/dfx/src/lib/operations/canister/mod.rs b/src/dfx/src/lib/operations/canister/mod.rs index 57d54490d6..ef06f9974a 100644 --- a/src/dfx/src/lib/operations/canister/mod.rs +++ b/src/dfx/src/lib/operations/canister/mod.rs @@ -31,7 +31,6 @@ use ic_utils::interfaces::management_canister::{ use ic_utils::interfaces::ManagementCanister; use ic_utils::Argument; use pocket_ic::common::rest::RawEffectivePrincipal; -use pocket_ic::WasmResult; use std::collections::HashSet; use std::path::PathBuf; @@ -76,16 +75,22 @@ where encode_args((arg,)).unwrap(), ) .await - .map_err(|err| anyhow!("Failed to submit management canister call: {}", err))?; - let res = pocketic - .await_call_no_ticks(msg_id) - .await - .map_err(|err| anyhow!("Management canister call failed: {}", err))?; - match res { - WasmResult::Reply(data) => decode_args(&data) - .context("Could not decode management canister response.")?, - WasmResult::Reject(err) => bail!("Management canister rejected: {}", err), - } + .map_err(|err| { + anyhow!( + "Failed to submit management canister call: {} ({})", + err.reject_message, + err.error_code + ) + })?; + let data = pocketic.await_call_no_ticks(msg_id).await.map_err(|err| { + anyhow!( + "Management canister call failed: {} ({})", + err.reject_message, + err.error_code + ) + })?; + + decode_args(&data).context("Could not decode management canister response.")? } else { bail!("Impersonating sender is only supported for a local PocketIC instance.") } @@ -140,7 +145,7 @@ where CallSender::Impersonate(sender) => { let pocketic = env.get_pocketic(); if let Some(pocketic) = pocketic { - let res = pocketic + let data = pocketic .query_call_with_effective_principal( Principal::management_canister(), RawEffectivePrincipal::CanisterId(destination_canister.as_slice().to_vec()), @@ -150,13 +155,14 @@ where ) .await .map_err(|err| { - anyhow!("Failed to perform management canister query call: {}", err) + anyhow!( + "Failed to perform management canister query call: {} ({})", + err.reject_message, + err.error_code + ) })?; - match res { - WasmResult::Reply(data) => decode_args(&data) - .context("Failed to decode management canister query call response.")?, - WasmResult::Reject(err) => bail!("Management canister rejected: {}", err), - } + decode_args(&data) + .context("Failed to decode management canister query call response.")? } else { bail!("Impersonating sender is only supported for a local PocketIC instance.") }