chore: update replica version to 5849c6da (#3821)

* chore: update replica version to 5849c6daf2037349bd36dcb6e26ce61c2c6570d0

* changelog for replica

* dependencies header

* include pocket-ic update

* add compiler_sandbox

* remove --debug-overrides

* compiler_sandbox in dfx cache

* pocket-ic error message change

---------

Co-authored-by: lwshang <[email protected]>
Co-authored-by: Linwei Shang <[email protected]>

Author: dfinity-bot

CHANGELOG.md

@@ -41,9 +41,23 @@ Identities protected by a shorter password can still be decrypted.
 Schnorr signature signing for `Bip340Secp256k1` is now enabled.
 A test key id `Bip340Secp256k1:dfx_test_key` is ready to be used by locally created canisters.
 
+## Dependencies
+
 ### Replica
 
-Updated replica to elected commit 2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1.
+Updated replica to elected commit 5849c6daf2037349bd36dcb6e26ce61c2c6570d0.
+This incorporates the following executed proposals:
+
+- [130985](https://dashboard.internetcomputer.org/proposal/130985)
+- [130984](https://dashboard.internetcomputer.org/proposal/130984)
+- [130819](https://dashboard.internetcomputer.org/proposal/130819)
+- [130818](https://dashboard.internetcomputer.org/proposal/130818)
+- [130748](https://dashboard.internetcomputer.org/proposal/130748)
+- [130749](https://dashboard.internetcomputer.org/proposal/130749)
+- [130728](https://dashboard.internetcomputer.org/proposal/130728)
+- [130727](https://dashboard.internetcomputer.org/proposal/130727)
+- [130409](https://dashboard.internetcomputer.org/proposal/130409)
+- [130408](https://dashboard.internetcomputer.org/proposal/130408)
 
 # 0.21.0
 

e2e/tests-dfx/create.bash

@@ -57,7 +57,7 @@ teardown() {
   assert_command_fail dfx canister create e2e_project_backend --specified-id nojwb-ieaaa-aaaaa-aaaaa-cai
 
   if [[ "$USE_POCKETIC" ]]; then
-    assert_match "Desired canister ID nojwb-ieaaa-aaaaa-aaaaa-cai not contained on any subnet"
+    assert_match "The effective canister ID nojwb-ieaaa-aaaaa-aaaaa-cai does not belong to an existing subnet and it is not a mainnet canister ID."
   else
     assert_match "Specified CanisterId nojwb-ieaaa-aaaaa-aaaaa-cai is not hosted by subnet"
   fi

nix/sources.json

@@ -27,8 +27,12 @@ niv update ic-starter-x86_64-linux -a rev="$SHA"
 
 niv update replica-x86_64-darwin -a rev="$SHA"
 niv update replica-x86_64-linux -a rev="$SHA"
+niv update pocket-ic-x86_64-darwin -a rev="$SHA"
+niv update pocket-ic-x86_64-linux -a rev="$SHA"
 niv update canister_sandbox-x86_64-darwin -a rev="$SHA"
 niv update canister_sandbox-x86_64-linux -a rev="$SHA"
+niv update compiler_sandbox-x86_64-darwin -a rev="$SHA"
+niv update compiler_sandbox-x86_64-linux -a rev="$SHA"
 niv update sandbox_launcher-x86_64-darwin -a rev="$SHA"
 niv update sandbox_launcher-x86_64-linux -a rev="$SHA"
 niv update sns-x86_64-darwin -a rev="$SHA"

scripts/update-replica.sh

@@ -87,10 +87,10 @@ write_replica_rev
 motoko_base_sha="$(calculate_sha256 "motoko-base")"
 for platform in "darwin" "linux";
 do
-    for name in "icx-proxy" "ic-admin" "ic-btc-adapter" "ic-https-outcalls-adapter" "ic-nns-init" "ic-starter" "motoko" "replica" "canister_sandbox" "sandbox_launcher" "sns" "pocket-ic";
+    for name in "icx-proxy" "ic-admin" "ic-btc-adapter" "ic-https-outcalls-adapter" "ic-nns-init" "ic-starter" "motoko" "replica" "canister_sandbox" "compiler_sandbox" "sandbox_launcher" "sns" "pocket-ic";
     do
-        if [[ "$name" == "replica" || "$name" == "canister_sandbox" ]]; then
-            echo "# The replica and canister_sandbox binaries must have the same revision." >>"$DFX_ASSET_SOURCES"
+        if [[ "$name" == "replica" || "$name" == "canister_sandbox" || "$name" == "compiler_sandbox" ]]; then
+            echo "# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision." >>"$DFX_ASSET_SOURCES"
         fi
         write_entry "$name" "x86_64-${platform}"
     done

scripts/write-dfx-asset-sources.sh

@@ -1,55 +1,60 @@
 # generated by write-dfx-asset-sources.sh
-replica-rev = '2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1'
+replica-rev = '5849c6daf2037349bd36dcb6e26ce61c2c6570d0'
 
 [x86_64-darwin.icx-proxy]
 url = 'https://download.dfinity.systems/ic/f2cd225b621674b19f3d601ebb42555d0c6f614d/binaries/x86_64-darwin/icx-proxy-dev.gz'
 sha256 = 'a68fb80aa3c6ab46f7fa93160cc1969812bdea347cde7b684617df61f3991517'
 
 [x86_64-darwin.ic-admin]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/ic-admin.gz'
-sha256 = '47fadbbd4b7ad38fca9b62242d1038c423519f1a7be3ecac0d58a24dcc10e6d1'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/ic-admin.gz'
+sha256 = 'c655cff8eaf1b964bf019d721242721e9d1c45d3c2c536f3810eea3451421a59'
 
 [x86_64-darwin.ic-btc-adapter]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/ic-btc-adapter.gz'
-sha256 = '5913dce2fef0ffb08f8e30689ada2d9001c146a5989b868b761d208dc8a1ebe2'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/ic-btc-adapter.gz'
+sha256 = '4140fd147033f80d449502161aef8bfaec73ca3c16f862105ac0a3b59c0a24f2'
 
 [x86_64-darwin.ic-https-outcalls-adapter]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz'
-sha256 = '04a887996fb0ac47e58b313679ed56ad1a09b0cefa63a1a508637d42acc5e491'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz'
+sha256 = '2ae5b17fa03981f3aba1ff779c7b13da114eadf67a8396180f24c0e1af206217'
 
 [x86_64-darwin.ic-nns-init]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/ic-nns-init.gz'
-sha256 = 'f49c696ef8dc4243d00c54a70589a08621362bd09d6464a8b067678427fa4167'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/ic-nns-init.gz'
+sha256 = '76c0274aa5011a1518c1bbbc915fdec1c5a907f3e3f9d338fe2e426ef2031454'
 
 [x86_64-darwin.ic-starter]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/ic-starter.gz'
-sha256 = '2399d2054cbe2bdd53567cf08a3b33761e46fd9e9fcbe3d77803f345fefeafb0'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/ic-starter.gz'
+sha256 = 'df789889721f50d76d95545deaf29e4f01de94b78bee3841bd4f0b59ff037796'
 
 [x86_64-darwin.motoko]
 url = 'https://github.com/dfinity/motoko/releases/download/0.11.1/motoko-Darwin-x86_64-0.11.1.tar.gz'
 sha256 = '41c71aa0fea08226147ef1db01c5ca122a894ac0ab20e41cb149b9002ce3a24f'
-# The replica and canister_sandbox binaries must have the same revision.
+# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
 
 [x86_64-darwin.replica]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/replica.gz'
-sha256 = '74788f4459c706293503851f7fb66711168c8379e50f2fade7575c8a8b972dd4'
-# The replica and canister_sandbox binaries must have the same revision.
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/replica.gz'
+sha256 = '1f0e2b929490c126b40de61589bd9aa5c8c88e7acc1702faadbae63b9a8c2a43'
+# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
 
 [x86_64-darwin.canister_sandbox]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/canister_sandbox.gz'
-sha256 = 'e04cbb50999772f6b85a266543a53d949fb63434e749b0bad3fdf5b97b9f6367'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/canister_sandbox.gz'
+sha256 = '082d115cf88f895430c6b7b6ded47b446799648799a0234dc444a60c77cb22a9'
+# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
+
+[x86_64-darwin.compiler_sandbox]
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/compiler_sandbox.gz'
+sha256 = '6940c66b316d6353cb2ae0e22227d49173ced0fe0a53418958783cc993911c0d'
 
 [x86_64-darwin.sandbox_launcher]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/sandbox_launcher.gz'
-sha256 = '02a1fcb458c26242283698dfd557d1c017a8c74165cae1049586b6eec404594c'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/sandbox_launcher.gz'
+sha256 = 'e5e63263c26fa9c990e70d01d1fcc22184cdc44a8f3c3d04930856718dfe5aa8'
 
 [x86_64-darwin.sns]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-darwin/sns.gz'
-sha256 = '5bc4c861b5b0c0445955ee196524fdbb15555056c1e1dc9609a6bceb7baf128a'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/sns.gz'
+sha256 = 'f124b2fffda982fd57890d1d04a2526e0d42a730361f1964e055e7ab905605eb'
 
 [x86_64-darwin.pocket-ic]
-url = 'https://download.dfinity.systems/ic/5e285dcaf77db014ac85d6f96ff392fe461945f5/binaries/x86_64-darwin/pocket-ic.gz'
-sha256 = '10669c9b95f5b5f2011a2fe1d8cac2c2d160ef7475c72325a83f2249959ed386'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-darwin/pocket-ic.gz'
+sha256 = '357febfa30a1879dac8619b053474a4bf068d578a07cf741488eb906ff218519'
 
 [x86_64-darwin.motoko-base]
 url = 'https://github.com/dfinity/motoko/releases/download/0.11.1/motoko-base-library.tar.gz'
@@ -64,50 +69,55 @@ url = 'https://download.dfinity.systems/ic/f2cd225b621674b19f3d601ebb42555d0c6f6
 sha256 = 'f9a6ab381b6f00349ecca5fb27a1afe1d505b1aa330ab59cd1f988d96f067696'
 
 [x86_64-linux.ic-admin]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/ic-admin.gz'
-sha256 = '8a371c731822227e6d4d90e008f60ac52c3476562cf234bf4d5322da573c4504'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/ic-admin.gz'
+sha256 = '3be80df1bd9efc43e8a841eef950829cd841f958daabf425fb3f63d23f9eddd0'
 
 [x86_64-linux.ic-btc-adapter]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/ic-btc-adapter.gz'
-sha256 = '51c93f4b18c7fc9e9a51e1fe2e26bfd707c8118d6a1cf547c55a85f364879f47'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/ic-btc-adapter.gz'
+sha256 = '44d3cb6fd71fff0da48c5b8e99290e6f2826c251373e46b2ecbd721691f6c422'
 
 [x86_64-linux.ic-https-outcalls-adapter]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/ic-https-outcalls-adapter.gz'
-sha256 = '9370138ba10f05dce1c5f3eec41da1cf872378d337dcdf0f834dc179cf0d313f'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/ic-https-outcalls-adapter.gz'
+sha256 = 'd6bcfefc266151a187c55bbb38ffd9b3062481910b608c324abc83ca8eee9530'
 
 [x86_64-linux.ic-nns-init]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/ic-nns-init.gz'
-sha256 = 'fcad1d2d346ca6eac6c09b639777c43449c6742d08e9130fd50d32ad320f50dd'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/ic-nns-init.gz'
+sha256 = 'cbef2fd9190ce9a7d67667950a7dcdac8e0bc2cff65dabcd90022d78e4b35963'
 
 [x86_64-linux.ic-starter]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/ic-starter.gz'
-sha256 = 'c48f938383c6c46587e390becb72e85656437b671110dc32dca47e688ed8aa9b'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/ic-starter.gz'
+sha256 = '2cdccaf2d249cf73291d93c80a54b849201863ed3432b33c827d8eeadbbb48da'
 
 [x86_64-linux.motoko]
 url = 'https://github.com/dfinity/motoko/releases/download/0.11.1/motoko-Linux-x86_64-0.11.1.tar.gz'
 sha256 = '6a6c1b9d9d69bb49b40859c1c51b40b0dabf2dd3aabacf37c73817dafee60a70'
-# The replica and canister_sandbox binaries must have the same revision.
+# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
 
 [x86_64-linux.replica]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/replica.gz'
-sha256 = 'c8d16a54dc8435fe728f6f0c1288036e66ba36f5404dfb6dda495e5d36cc9b48'
-# The replica and canister_sandbox binaries must have the same revision.
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/replica.gz'
+sha256 = '92351e75be63c7bc9ef1da365aab6049c811b94efdab7382428c2bcda7450150'
+# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
 
 [x86_64-linux.canister_sandbox]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/canister_sandbox.gz'
-sha256 = '1e22bd1384cd0dad0d25fd36c301661dbf4bebd6223d6dcff2f06dce4dd0e889'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/canister_sandbox.gz'
+sha256 = 'cbf3489588fe5892500047ac313de58ce29a76f5574a9f401a1dad46fbb722c4'
+# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.
+
+[x86_64-linux.compiler_sandbox]
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/compiler_sandbox.gz'
+sha256 = '37e6460a94c746b6e41fc27a43a9aa93f5057e765b248f61fd0e99e90952b487'
 
 [x86_64-linux.sandbox_launcher]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/sandbox_launcher.gz'
-sha256 = '7a4fbf9f60145045b89551991b7087fae383ebb3b3e3e7b3248c6d985bf40f13'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/sandbox_launcher.gz'
+sha256 = '1c114bd2937847c7f00a14b9181cbff86bbcb06116e88fadc0c305ec1d2d67c5'
 
 [x86_64-linux.sns]
-url = 'https://download.dfinity.systems/ic/2e269c77aa2f6b2353ddad6a4ac3d5ddcac196b1/binaries/x86_64-linux/sns.gz'
-sha256 = '53a0e615f723ad6718b17344d37222951d337fc09f3dccec3a55e3c2e24d48f3'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/sns.gz'
+sha256 = '6c115f6a34bf986b9db3f12d77d9b54cf055de03e3ffc794a3bdf3ab7659a263'
 
 [x86_64-linux.pocket-ic]
-url = 'https://download.dfinity.systems/ic/5e285dcaf77db014ac85d6f96ff392fe461945f5/binaries/x86_64-linux/pocket-ic.gz'
-sha256 = '96d8d05163c0d15b72a062fbf4c02c4babc06796161013b07dfae267c8915af0'
+url = 'https://download.dfinity.systems/ic/5849c6daf2037349bd36dcb6e26ce61c2c6570d0/binaries/x86_64-linux/pocket-ic.gz'
+sha256 = 'f0eda7bea0916c8017e6f61ac076aae66e4f13c4943c78736d525e81d76a767c'
 
 [x86_64-linux.motoko-base]
 url = 'https://github.com/dfinity/motoko/releases/download/0.11.1/motoko-base-library.tar.gz'

src/dfx/assets/dfx-asset-sources.toml

@@ -178,17 +178,18 @@ async fn download_binaries(
 ) -> HashMap<PathBuf, Bytes> {
     let mut joinset = JoinSet::new();
     for bin in [
+        "canister_sandbox",
+        "compiler_sandbox",
         "ic-admin",
         "ic-btc-adapter",
         "ic-https-outcalls-adapter",
         "ic-nns-init",
+        "ic-starter",
         "icx-proxy",
+        "pocket-ic",
         "replica",
-        "canister_sandbox",
         "sandbox_launcher",
-        "ic-starter",
         "sns",
-        "pocket-ic",
     ] {
         let source = sources
             .get(bin)

src/dfx/assets/prepare_assets.rs

@@ -343,10 +343,6 @@ fn replica_start_thread(
                     socket_path.to_str().unwrap_or_default(),
                 ]);
             }
-
-            // Show debug logs from the bitcoin canister.
-            // This helps developers see, for example, the current tip height.
-            cmd.args(["--debug-overrides", "ic_btc_canister::heartbeat"]);
         }
         if config.canister_http_adapter.enabled {
             cmd.args(["--subnet-features", "http_requests"]);

src/dfx/src/actors/replica.rs

@@ -227,7 +227,9 @@ async fn create_with_management_canister(
             status, content, ..
         })) if (400..500).contains(&status) => {
             let message = String::from_utf8_lossy(&content);
-            if message.contains("not contained on any subnet") {
+            if message.contains(
+                "does not belong to an existing subnet and it is not a mainnet canister ID.",
+            ) {
                 Err(anyhow!("{message}"))
             } else {
                 Err(anyhow!(NEEDS_WALLET))