From 3152acbf68800b8867884a9ade4d220768af2fbb Mon Sep 17 00:00:00 2001 From: DFINITY bot <58022693+dfinity-bot@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:54:30 +0100 Subject: [PATCH] chore: update replica version to a6284881 (#3985) * remove PocketIC port file before starting gateway * fix failures caused by increased cycles cost --------- Co-authored-by: Martin Raszyk Co-authored-by: Eric Swanson --- CHANGELOG.md | 28 ++++ Cargo.lock | 189 ++++++++------------------ e2e/tests-dfx/call.bash | 1 + e2e/tests-dfx/playground.bash | 9 ++ nix/sources.json | 132 +++++++++--------- src/dfx/Cargo.toml | 2 +- src/dfx/assets/dfx-asset-sources.toml | 90 ++++++------ src/dfx/src/actors/pocketic_proxy.rs | 1 + 8 files changed, 206 insertions(+), 246 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a48c6dbf0..1117ac68b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,34 @@ Success! The dfx server is running. You must open a new terminal to continue developing. If you'd prefer to stop, quit with 'Ctrl-C'. ``` +## Dependencies + +### Replica + +Updated replica to elected commit a62848817cec7ae50618a87a526c85d020283fd9. +This incorporates the following executed proposals: + +- [134036](https://dashboard.internetcomputer.org/proposal/134036) +- [134035](https://dashboard.internetcomputer.org/proposal/134035) +- [134034](https://dashboard.internetcomputer.org/proposal/134034) +- [134032](https://dashboard.internetcomputer.org/proposal/134032) +- [133939](https://dashboard.internetcomputer.org/proposal/133939) +- [133953](https://dashboard.internetcomputer.org/proposal/133953) +- [133952](https://dashboard.internetcomputer.org/proposal/133952) +- [133951](https://dashboard.internetcomputer.org/proposal/133951) +- [133950](https://dashboard.internetcomputer.org/proposal/133950) +- [133902](https://dashboard.internetcomputer.org/proposal/133902) +- [133901](https://dashboard.internetcomputer.org/proposal/133901) +- [133900](https://dashboard.internetcomputer.org/proposal/133900) +- [133798](https://dashboard.internetcomputer.org/proposal/133798) +- [133799](https://dashboard.internetcomputer.org/proposal/133799) +- [133800](https://dashboard.internetcomputer.org/proposal/133800) +- [133457](https://dashboard.internetcomputer.org/proposal/133457) +- [133450](https://dashboard.internetcomputer.org/proposal/133450) +- [133443](https://dashboard.internetcomputer.org/proposal/133443) +- [133397](https://dashboard.internetcomputer.org/proposal/133397) +- [133396](https://dashboard.internetcomputer.org/proposal/133396) + # 0.24.2 ### feat: Support canister log allowed viewer list diff --git a/Cargo.lock b/Cargo.lock index 72347e06e8..54c4f6319e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1548,9 +1548,9 @@ dependencies = [ "hex", "humantime", "hyper-rustls 0.24.2", - "ic-agent 0.38.0", + "ic-agent", "ic-asset", - "ic-cdk 0.13.5", + "ic-cdk", "ic-identity-hsm", "ic-utils 0.38.0", "ic-wasm", @@ -1626,7 +1626,7 @@ dependencies = [ "handlebars", "hex", "humantime-serde", - "ic-agent 0.38.0", + "ic-agent", "ic-identity-hsm", "ic-utils 0.38.0", "itertools 0.10.5", @@ -2512,17 +2512,6 @@ dependencies = [ "http 1.1.0", ] -[[package]] -name = "http-body-to-bytes" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17a08236c6f51c2ee95d840f45acf8fa9e339390e00b4ef640857b2f2a534d70" -dependencies = [ - "bytes", - "http-body 1.0.0", - "http-body-util", -] - [[package]] name = "http-body-util" version = "0.1.1" @@ -2633,7 +2622,7 @@ dependencies = [ "hyper 1.3.1", "hyper-util", "rustls 0.23.7", - "rustls-native-certs", + "rustls-native-certs 0.7.0", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2684,53 +2673,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ic-agent" -version = "0.37.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd3fdf5e5c4f4a9fe5ca612f0febd22dcb161d2f2b75b0142326732be5e4978" -dependencies = [ - "async-lock 3.3.0", - "backoff", - "cached 0.52.0", - "candid", - "ed25519-consensus", - "futures-util", - "hex", - "http 1.1.0", - "http-body 1.0.0", - "http-body-to-bytes", - "http-body-util", - "hyper 1.3.1", - "hyper-rustls 0.27.2", - "hyper-util", - "ic-certification 2.5.0", - "ic-transport-types 0.37.1", - "ic-verify-bls-signature", - "k256 0.13.3", - "leb128", - "p256", - "pem 3.0.4", - "pkcs8 0.10.2", - "rand", - "rangemap", - "reqwest", - "ring 0.17.8", - "rustls-webpki 0.102.3", - "sec1 0.7.3", - "serde", - "serde_bytes", - "serde_cbor", - "serde_repr", - "sha2 0.10.8", - "simple_asn1", - "thiserror", - "time", - "tokio", - "tower", - "url", -] - [[package]] name = "ic-agent" version = "0.38.0" @@ -2746,7 +2688,7 @@ dependencies = [ "hex", "http 1.1.0", "http-body 1.0.0", - "ic-certification 2.5.0", + "ic-certification 2.6.0", "ic-transport-types 0.38.0", "ic-verify-bls-signature", "k256 0.13.3", @@ -2786,7 +2728,7 @@ dependencies = [ "futures-intrusive", "globset", "hex", - "ic-agent 0.38.0", + "ic-agent", "ic-utils 0.38.0", "itertools 0.10.5", "json5", @@ -2856,7 +2798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07bc917070b8fc4bd88e3199746372e44d507f54c93a9b191787e1caefca1eba" dependencies = [ "candid", - "ic-certification 2.5.0", + "ic-certification 2.6.0", "leb128", "nom", "thiserror", @@ -2869,21 +2811,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b1da6a25b045f9da3c9459c0cb2b0700ac368ee16382975a17185a23b9c18ab" dependencies = [ "candid", - "ic-cdk-macros 0.13.2", - "ic0 0.21.1", - "serde", - "serde_bytes", -] - -[[package]] -name = "ic-cdk" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8ecacd682fa05a985253592963306cb9799622d7b1cce4b1edb89c6ec85be1" -dependencies = [ - "candid", - "ic-cdk-macros 0.16.0", - "ic0 0.23.0", + "ic-cdk-macros", + "ic0", "serde", "serde_bytes", ] @@ -2898,24 +2827,10 @@ dependencies = [ "proc-macro2", "quote", "serde", - "serde_tokenstream 0.1.7", + "serde_tokenstream", "syn 1.0.109", ] -[[package]] -name = "ic-cdk-macros" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4d857135deef20cc7ea8f3869a30cd9cfeb1392b3a81043790b2cd82adc3e0" -dependencies = [ - "candid", - "proc-macro2", - "quote", - "serde", - "serde_tokenstream 0.2.2", - "syn 2.0.61", -] - [[package]] name = "ic-certificate-verification" version = "2.4.0" @@ -2925,7 +2840,7 @@ dependencies = [ "cached 0.47.0", "candid", "ic-cbor", - "ic-certification 2.5.0", + "ic-certification 2.6.0", "lazy_static", "leb128", "miracl_core_bls12381", @@ -2948,9 +2863,9 @@ dependencies = [ [[package]] name = "ic-certification" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20052ce9255fbe2de7041a4f6996fddd095ba1f31ae83b6c0ccdee5be6e7bbcf" +checksum = "e64ee3d8b6e81b51f245716d3e0badb63c283c00f3c9fb5d5219afc30b5bf821" dependencies = [ "hex", "serde", @@ -2991,8 +2906,8 @@ dependencies = [ "candid", "candid_parser", "hex", - "ic-cdk 0.13.5", - "ic-certification 2.5.0", + "ic-cdk", + "ic-certification 2.6.0", "ic-certification-testing", "ic-crypto-tree-hash", "ic-http-certification", @@ -3161,7 +3076,7 @@ name = "ic-frontend-canister" version = "0.2.5" dependencies = [ "candid", - "ic-cdk 0.13.5", + "ic-cdk", "ic-certified-assets", ] @@ -3173,7 +3088,7 @@ checksum = "7ddb96501529c2380e087fa9f4552fd0d416f5784bb1e48142d746e9b3d6ae13" dependencies = [ "candid", "http 0.2.12", - "ic-certification 2.5.0", + "ic-certification 2.6.0", "ic-representation-independent-hash", "serde", "thiserror", @@ -3206,7 +3121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9975ba49e50ccf10d8268b168b9a35da165904f56725a333e8294d7e5f1d92" dependencies = [ "hex", - "ic-agent 0.38.0", + "ic-agent", "pkcs11", "sha2 0.10.8", "simple_asn1", @@ -3251,7 +3166,7 @@ dependencies = [ "http 0.2.12", "ic-cbor", "ic-certificate-verification", - "ic-certification 2.5.0", + "ic-certification 2.6.0", "ic-http-certification", "ic-representation-independent-hash", "leb128", @@ -3308,7 +3223,7 @@ checksum = "875dc4704780383112e8e8b5063a1b98de114321d0c7d3e7f635dcf360a57fba" dependencies = [ "candid", "hex", - "ic-certification 2.5.0", + "ic-certification 2.6.0", "leb128", "serde", "serde_bytes", @@ -3325,7 +3240,7 @@ checksum = "dc1834f2f91324b7263e0a05b95d385fd109b51efec991f053112d8cd2503d6e" dependencies = [ "candid", "hex", - "ic-certification 2.5.0", + "ic-certification 2.6.0", "leb128", "serde", "serde_bytes", @@ -3396,7 +3311,7 @@ dependencies = [ "async-trait", "candid", "futures-util", - "ic-agent 0.38.0", + "ic-agent", "once_cell", "semver", "serde", @@ -3448,12 +3363,6 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a54b5297861c651551676e8c43df805dad175cc33bc97dbd992edbbb85dcbcdf" -[[package]] -name = "ic0" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de254dd67bbd58073e23dc1c8553ba12fa1dc610a19de94ad2bbcd0460c067f" - [[package]] name = "ic_bls12_381" version = "0.8.0" @@ -3524,7 +3433,7 @@ dependencies = [ "clap", "delay", "humantime", - "ic-agent 0.38.0", + "ic-agent", "ic-asset", "ic-utils 0.38.0", "libflate 1.4.0", @@ -4675,13 +4584,12 @@ dependencies = [ [[package]] name = "pocket-ic" version = "5.0.0" -source = "git+https://github.com/dfinity/ic?rev=3c76b9142f67da01393d9280c705f88b6e522a93#3c76b9142f67da01393d9280c705f88b6e522a93" +source = "git+https://github.com/dfinity/ic?rev=a62848817cec7ae50618a87a526c85d020283fd9#a62848817cec7ae50618a87a526c85d020283fd9" dependencies = [ "base64 0.13.1", "candid", "hex", - "ic-agent 0.37.1", - "ic-cdk 0.16.0", + "ic-certification 2.6.0", "ic-transport-types 0.37.1", "reqwest", "schemars", @@ -4691,11 +4599,14 @@ dependencies = [ "serde_json", "sha2 0.10.8", "slog", + "strum 0.26.3", + "strum_macros 0.26.4", "thiserror", "tokio", "tracing", "tracing-appender", "tracing-subscriber", + "wslpath", ] [[package]] @@ -5145,9 +5056,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -5171,7 +5082,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls 0.23.7", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pemfile", "rustls-pki-types", "serde", @@ -5386,6 +5297,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "2.1.2" @@ -5725,18 +5649,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "serde_tokenstream" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "syn 2.0.61", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -6050,6 +5962,9 @@ name = "strum" version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] [[package]] name = "strum_macros" @@ -6399,9 +6314,9 @@ dependencies = [ [[package]] name = "tokio-socks" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ "either", "futures-util", @@ -7220,6 +7135,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" +[[package]] +name = "wslpath" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04a2ecdf2cc4d33a6a93d71bcfbc00bb1f635cdb8029a2cc0709204a045ec7a3" + [[package]] name = "wyz" version = "0.5.1" diff --git a/e2e/tests-dfx/call.bash b/e2e/tests-dfx/call.bash index 0454cb68ad..8122d77868 100644 --- a/e2e/tests-dfx/call.bash +++ b/e2e/tests-dfx/call.bash @@ -199,6 +199,7 @@ teardown() { dfx canister create --all dfx build dfx canister install hello_backend + [[ "$USE_POCKETIC" ]] && dfx ledger fabricate-cycles --t 9999999 --canister hello_backend assert_command dfx canister call hello_backend recurse 100 } diff --git a/e2e/tests-dfx/playground.bash b/e2e/tests-dfx/playground.bash index 5d8d3630ff..1fb928006f 100644 --- a/e2e/tests-dfx/playground.bash +++ b/e2e/tests-dfx/playground.bash @@ -27,6 +27,7 @@ setup_playground() { dfx_start dfx deploy backend dfx ledger fabricate-cycles --t 9999999 --canister backend + PLAYGROUND_CANISTER_ID=$(dfx canister id backend) export PLAYGROUND_CANISTER_ID echo "PLAYGROUND_CANISTER_ID is $PLAYGROUND_CANISTER_ID" @@ -45,6 +46,10 @@ setup_playground() { } @test "canister lifecycle" { + assert_command dfx canister create --all --playground + [[ "$USE_POCKETIC" ]] && dfx ledger fabricate-cycles --t 9999999 --canister hello_backend --playground + [[ "$USE_POCKETIC" ]] && dfx ledger fabricate-cycles --t 9999999 --canister hello_frontend --playground + assert_command dfx deploy --playground assert_command dfx canister --playground call hello_backend greet '("player")' assert_match "Hello, player!" @@ -87,6 +92,10 @@ setup_playground() { # If the hashes didn't match then the playground would attempt to # instrument the asset canister during upload which would run into execution limits. @test "playground-installed asset canister is same wasm as normal asset canister" { + assert_command dfx canister create --all --playground + [[ "$USE_POCKETIC" ]] && dfx ledger fabricate-cycles --t 9999999 --canister hello_backend --playground + [[ "$USE_POCKETIC" ]] && dfx ledger fabricate-cycles --t 9999999 --canister hello_frontend --playground + assert_command dfx deploy --playground PLAYGROUND_HASH=$(dfx canister --playground info hello_frontend | grep hash) echo "PLAYGROUND_HASH: ${PLAYGROUND_HASH}" diff --git a/nix/sources.json b/nix/sources.json index 5c1a7c1a7a..db0a8a1d63 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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "0y7zs1njdvzs971r0l1wjmbgwa4alc99mlqssd6lg67548g8pbdn", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1kncgldpv8sqkw34c6qyza0s09zz7zk3n0qc76fj3jvmz4is99ar", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/canister_sandbox.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1rb3r9h2pfqsvbdr716s7k9gh3by3c1ap5ab6jgg0qci6fyh5ls0", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1mww6b9y1ynsa04wlys1ckkfvvw6irbk5va12gvjwsmyhw92crmp", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/canister_sandbox.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "028vy5pz7m17rx10iqyj0qsnlns5qq6zxmplx0jc0gg9f8hdlmfd", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1z7nnsk6k94ial5pdn0rnvwba38q4d1b2vdhmi94b1qd8cq1slda", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/compiler_sandbox.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "0shc1l0k8b23rabln81vzfj17ah71dqji1dw44hhbm835gfz1sf9", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "0rmlybqsqc87nx0xknfxvz5qkz2wn7xx65m4gk1l39cdwx3ab9xq", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/compiler_sandbox.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1r4rsmvj408l1cyb9ih59xf0dr0z708s9qwnlby0a1lcyfarbd0c", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "0rmg487g393lh6dnb4isnamb81r9ifkp96n1jyysbkiw2n179a67", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1q96fmqd0l5vqmvp0a9cm2rw3bgjr1xhvmyib00n5gks9ijivrgd", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "050sg2swz66ppyvzd3bvx5f7csc4ymjbs42jbqrvskcnhmw4v0a2", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "11z81llj7dk3p2xq4cdikic3gbpb25f4j1087fhdhwpsbjlrxiba", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "17p501lixydsqk3b0x6sddc4nsisnd5zlcaxl9wfni9ji7pns00b", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1s4m93ngbqpp5ab1qgb2g51hnk94jj7zsi9i7zl1psb9dgnkh5nz", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1fpgvswpj209khpz644c9rvbs2ky5xrw892jpvmxgp9ppyd4gpa0", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1vskby9drh0jwyxafbnk11qj3pmf8p24hkcalr5d2m9s5lpigjhi", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1zaqlgm5yxhm2plgf83cwjzfapj73dq3bamrk5l2b15dsjx8zf5l", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1jcxr8lzgr77wm1d2ksfhv44nchqmx4dcgh2r0hbn4ck2zls1w6i", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "135529wzk5rh3x960vgp493vrcgw3ga5n6rnxa4iw9jiijb9ylvj", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-https-outcalls-adapter.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "0pwm70vx0xbnv3kv4x64nszdihrx3kd7kwz9kid82v5xlpmlda0i", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1jc5pa4l1fzmvgyhzw73jpi50dh97girgbmkn656cgaxvbfg9jxw", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "00gvrh7iiv8wilhc39sarcaf5f5dsr5rcd5wy4rh8as7k39ykjki", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "0ha7wi72nyzp3rcb8af2zmmq78lxglmggi42fqv3nzx74f90mf3i", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1w1r21g5wbh0klzm59y30rx46z4izxblvp7jckddmqjsp98wwshm", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "0k4zhx3vmzyv5isy08q65kaigks9ywj65lw7wzff3gl2wnkxi6gr", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-starter.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1g0bvajccdaj3sjh9y28b7g6jlh841xs5n0xi76ffhzvxhkfvc1s", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "08n4nns6zn4072aww45ll7f96sknxhs7k5hlbciklnr5gnzrfd51", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-starter.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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.2" }, "pocket-ic-x86_64-darwin": { - "rev": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "0ybw08pghwgcw3lqxgd41q0jc4qdyga2grcnfnqbiynrjrbyx8w9", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1xlsd1lkv22raw0z9n02li6ghg6vpb30hygr8s1g0fvchzhsnizx", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/pocket-ic.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "0a5s0vvyshg59h139lsxpikrvicml8az1rp5m1cwimh7djjc9acv", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "16ch04yghl21pr8lk9mcdrvw1f7l8rbpbslh34bsn96xjshy453v", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/pocket-ic.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "1i4ab9yjamip4ys969qy7q32qhh4dn7dzdljwwzbis78vh4crrzr", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "0whfgqrjbbp6alwdk8w478ifypbfccg83d6mx5325vzym6hqn35l", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/replica.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "0vg22spwl8kz0dmknj7v88hgndv1qlvqby6ayb5hs8446rn73psh", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1m2ghvf8p87mhvns8bphnkhplfsad499s3r11c1q9lbgbnzld07i", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/replica.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "01bzyx8faysx8mslvkiwcq21f3c5fbnhc73f703s22aav292afxv", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "05sb7ipkjy3vlz4dyja3z3wr8mqpg999mlyrbxrki4hili2xjy5s", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "128igib3yv995lznapd6x73lsnhnwpi0gf4vixia3413kr22kd1g", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "11ljnvnx1c55bkb0g23iyxwhp8w9j8x528gpb4q8sf7ganyq2fb6", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "08grpjrxn7zzs3xvvfnds4h1vpwi4k7zlhzvs2jjk4ma064x0rdp", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "1nfrwn4gn81bw5ba3dkkfibfpmr0c0hmaf7ksicphjlxvqpi9xjl", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/sns.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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": "3c76b9142f67da01393d9280c705f88b6e522a93", - "sha256": "11lna989cdz371xy9ipgahdv4dsj4i9l44zagzjyvgq6rylfivi0", + "rev": "a62848817cec7ae50618a87a526c85d020283fd9", + "sha256": "0ra40c1apbykwk1xbs3w3rqzgimz5lnk24wzdf5ajkbla0hqqpxz", "type": "file", - "url": "https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/sns.gz", + "url": "https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/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 2d2697186d..3aac54abdd 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -127,7 +127,7 @@ ci_info = "0.14" junction = "1.0.0" [target.'cfg(unix)'.dependencies] -pocket-ic = { git = "https://github.com/dfinity/ic", rev = "3c76b9142f67da01393d9280c705f88b6e522a93" } +pocket-ic = { git = "https://github.com/dfinity/ic", rev = "a62848817cec7ae50618a87a526c85d020283fd9" } [dev-dependencies] env_logger = "0.10" diff --git a/src/dfx/assets/dfx-asset-sources.toml b/src/dfx/assets/dfx-asset-sources.toml index 7c044d44be..e1b61ae29f 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 = '3c76b9142f67da01393d9280c705f88b6e522a93' +replica-rev = 'a62848817cec7ae50618a87a526c85d020283fd9' [x86_64-darwin.ic-admin] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-admin.gz' -sha256 = '0cb49595f38c0605fca296e3a411381fe4065c4f05c6b43c0b14012277d599e4' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/ic-admin.gz' +sha256 = 'c7a87482153ccea5bd97c19a74a78b2907b4aab23a92659b8174a4f10e22af66' [x86_64-darwin.ic-btc-adapter] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-btc-adapter.gz' -sha256 = '6ac59ea95cfa72d8a03b0804495c11ebae37589cb13182bbb863b623290de887' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/ic-btc-adapter.gz' +sha256 = '0b006def893245eb78a25d31fa4bb33a6a4b586bda74b0c6c4baf91e6900e59e' [x86_64-darwin.ic-https-outcalls-adapter] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz' -sha256 = '11ca172f2d3a55d14aa68a4d48c445aede217108d32ea7bae712c0dc925f53ef' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz' +sha256 = 'b4b88fbad4ad84256899b9aa35701b475ee5bee46c20f7e81515765feaa358fd' [x86_64-darwin.ic-nns-init] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-nns-init.gz' -sha256 = '11a846eba5bd6c815a9ce9f379da1c3dc3d8beb6c474b2e7d87675d03738955f' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/ic-nns-init.gz' +sha256 = 'bccbf4dcda5d3d668ab1b3ae97e33b093650e295e3f00ffddbf5bb4089ba85c9' [x86_64-darwin.ic-starter] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/ic-starter.gz' -sha256 = '156ace51ba5ae2dada64f2dc4d57ff917c437a06c3a7523f9d002e5e5e1039f0' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/ic-starter.gz' +sha256 = 'f999d8a7e582bee1dce787d36224f749cf17d52c0623e0752cdbffba47879f4c' [x86_64-darwin.motoko] url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-Darwin-x86_64-0.13.2.tar.gz' @@ -27,30 +27,30 @@ sha256 = 'a386beb11b14f59c2dbfcdb413081433db36bf26ec6f76314441976c8f9565dd' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.replica] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/replica.gz' -sha256 = 'f9e7cc08dce8e8b83ee792b6df8e6d04422c063e1e2793b4273756257d5a8ac4' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/replica.gz' +sha256 = 'b40c8ba1a9feef2246e9d5b4811e636e5def223a84a3d93855e6ae25337e0e72' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.canister_sandbox] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/canister_sandbox.gz' -sha256 = 'b6ad8b1e22e598474dd31ad39a12a38a28fe56953c5090c349faef266dd0ff78' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/canister_sandbox.gz' +sha256 = '59a5a423f975cb219d390c033be63fff27a081fa1e1b46069f58a37d1b7dccce' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.compiler_sandbox] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/compiler_sandbox.gz' -sha256 = 'cd55da2072e93dc024e8f4d6fe0dc6455b6a3506d2e30842cf27d4f36ff11b09' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/compiler_sandbox.gz' +sha256 = 'aa511d30430d874552acb06db14223180db5f8b619d8760b5591a469a6b6f6fc' [x86_64-darwin.sandbox_launcher] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/sandbox_launcher.gz' -sha256 = 'bb3b2592d84a09a107386e1c06ed72850d1704663cce4d75455d7be550f77f05' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/sandbox_launcher.gz' +sha256 = 'ba78d945a4119238735fd9d39a527a175794f9f84349dfc8a77b78396f3c4b17' [x86_64-darwin.sns] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/sns.gz' -sha256 = 'b765d08901aa9229a5d0fb43facf2491df1d20d1cdbabdfbd0ff1fdbb3bcf921' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/sns.gz' +sha256 = '54f6142fde9d4a7859d4f33855216020d7eb567473b6a156e12b20fb88e5d9d9' [x86_64-darwin.pocket-ic] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-darwin/pocket-ic.gz' -sha256 = '89a3ee5796d9fab8b07596e527d4f30d1326010ea4bd8ee9e0ec71f82e027c79' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-darwin/pocket-ic.gz' +sha256 = 'fd47abe1876c3bf08246f97908c6badb3cf84ca402d8f4015759883d69689af6' [x86_64-darwin.motoko-base] url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/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/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-admin.gz' -sha256 = 'ede51d654c7abe620158d1d70d7bc8f2adc1b3a82c297077c5bb50d0707526e1' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/ic-admin.gz' +sha256 = '42814d7885964dbd335e5210bd64f58469765ce97b8df6b7bfd798cfb5781a14' [x86_64-linux.ic-btc-adapter] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-btc-adapter.gz' -sha256 = 'df1638ed6b69e91be83f3145fd8f94244d0b4379623d1c962af7e2f5ec4895e8' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/ic-btc-adapter.gz' +sha256 = '40dd479abf37ddd7ebbe5224c4732f7e0abd764e8c10f32f9c090879b9deefba' [x86_64-linux.ic-https-outcalls-adapter] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-https-outcalls-adapter.gz' -sha256 = 'd1f0a0e9179311bb20c8023ed648af18324bc8864e4fd142e5e7e4f729ca9dc9' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/ic-https-outcalls-adapter.gz' +sha256 = '72539f968c51261e89ea361b5bd41bfcb1bc4722f76d60521f3097f97912a58c' [x86_64-linux.ic-nns-init] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-nns-init.gz' -sha256 = '71cae9d398472b0433f1bc34964bd6adb8e214cb4aa7c1208d1ced180fccfb01' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/ic-nns-init.gz' +sha256 = '71b80a9223a77f3b367682c4f72a7d9da2836bfdc229b4581ef77b2b4ee44741' [x86_64-linux.ic-starter] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/ic-starter.gz' -sha256 = '3ab0ed26ecfb43e7cc891dd8a27b20085269de5948f804a51e5235c6a4da0bbc' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/ic-starter.gz' +sha256 = 'a13497bf7d255b3a235b14967934ec766a93dca1b410ce953880d86fb4b5c422' [x86_64-linux.motoko] url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-Linux-x86_64-0.13.2.tar.gz' @@ -86,30 +86,30 @@ sha256 = '4992332aff140909aff055175fabeb5a4c7417a256ea309102c1faa20e6c2ac4' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.replica] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/replica.gz' -sha256 = '50df716c3684200dcbf2caf88537c56137fb2042fb483b6b037f22caaf16e26d' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/replica.gz' +sha256 = 'f18046bf5d6fd184030b210f9d12694a3b7ae1b4f02ea4ed86f5a08bdc864fd4' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.canister_sandbox] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/canister_sandbox.gz' -sha256 = '40d302bd339161f09e344b95ab021b7e0df8d23cda8493dbda1abb2b60ca63e5' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/canister_sandbox.gz' +sha256 = 'b766261287be6a2ef71341ed32578e86efede664417bca0950dafae0d3329cd7' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.compiler_sandbox] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/compiler_sandbox.gz' -sha256 = 'c9e9f0dd2b03d5052121bc8528710b07aa13a4fb3b204b97ca432c34010d0c6a' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/compiler_sandbox.gz' +sha256 = 'b8a7a546e78da541c37ca416d3fbb15cfc89cbdfddd9d941b70731acf1f2b466' [x86_64-linux.sandbox_launcher] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/sandbox_launcher.gz' -sha256 = '2fb429449e2390a1628f9bb807e2e5165a4dc7e9a65d653f2d296d3f567c1189' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/sandbox_launcher.gz' +sha256 = '663981bd55ef388d3059f721513a9289a30b79f7718807d65ca5b0d0edb69286' [x86_64-linux.sns] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/sns.gz' -sha256 = '20eee8a8cf06bfede57fea134253245237b21b54efc6e47b38e3379650529686' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/sns.gz' +sha256 = 'bf5f8c2150744da98a6b9f13312d2dbfc6f7711e7ce8d5c3e4d3afab02034465' [x86_64-linux.pocket-ic] -url = 'https://download.dfinity.systems/ic/3c76b9142f67da01393d9280c705f88b6e522a93/binaries/x86_64-linux/pocket-ic.gz' -sha256 = '9ba9c4a46c07d6c859a8e5e6f015a295c59d67bc5dd334024ce541edf706ba28' +url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283fd9/binaries/x86_64-linux/pocket-ic.gz' +sha256 = '7b14e2a196dd24ab171990ea755746f4b8c0776eaca64951be4150f83c019099' [x86_64-linux.motoko-base] url = 'https://github.com/dfinity/motoko/releases/download/0.13.2/motoko-base-library.tar.gz' diff --git a/src/dfx/src/actors/pocketic_proxy.rs b/src/dfx/src/actors/pocketic_proxy.rs index 4f6da239bf..b41a04454f 100644 --- a/src/dfx/src/actors/pocketic_proxy.rs +++ b/src/dfx/src/actors/pocketic_proxy.rs @@ -260,6 +260,7 @@ fn pocketic_proxy_start_thread( cmd.args(["--port-file".as_ref(), pocketic_proxy_port_path.as_os_str()]); cmd.stdout(std::process::Stdio::inherit()); cmd.stderr(std::process::Stdio::inherit()); + let _ = std::fs::remove_file(&pocketic_proxy_port_path); let last_start = std::time::Instant::now(); debug!(logger, "Starting pocket-ic gateway..."); let mut child = cmd.spawn().expect("Could not start pocket-ic gateway.");