Merge remote-tracking branch 'origin/master' into rumenov/rmrwlocad

dfinity · Nov 15, 2024 · 261bb48 · 261bb48
2 parents 138ab30 + 2244bbb
commit 261bb48
Show file tree

Hide file tree

Showing 104 changed files with 5,541 additions and 2,017 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -208,6 +208,7 @@ go_deps.bzl               @dfinity/idx
 /rs/rust_canisters/stable_structures/                   @dfinity/execution
 /rs/rust_canisters/stable_memory_integrity              @dfinity/execution
 /rs/rust_canisters/canister_creator                     @dfinity/execution
+/rs/rust_canisters/load_simulator                       @dfinity/execution
 /rs/rust_canisters/xnet_test/                           @dfinity/ic-message-routing-owners
 /rs/rust_canisters/downstream_calls_test/               @dfinity/ic-message-routing-owners
 /rs/rust_canisters/random_traffic_test/                 @dfinity/ic-message-routing-owners

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -316,6 +316,7 @@ members = [
     "rs/rust_canisters/downstream_calls_test",
     "rs/rust_canisters/ecdsa",
     "rs/rust_canisters/http_types",
+    "rs/rust_canisters/load_simulator",
     "rs/rust_canisters/memory_test",
     "rs/rust_canisters/on_wire",
     "rs/rust_canisters/pmap",

diff --git a/ic-os/boundary-guestos/context/docker-base.prod b/ic-os/boundary-guestos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/boundaryos-base@sha256:451327fb6888c436361465a5734f9838e84c2e394843f1a4400bfa8437f43c9e
+ghcr.io/dfinity/boundaryos-base@sha256:a6f3fb0d6c40dc709cd19d473807f64318dc599d79e138243b279bdf13d36150
diff --git a/ic-os/components/ic/generate-ic-config/generate-ic-config.sh b/ic-os/components/ic/generate-ic-config/generate-ic-config.sh
@@ -217,7 +217,6 @@ IPV4_ADDRESS="${ipv4_address:-}"
 IPV4_GATEWAY="${ipv4_gateway:-}"
 DOMAIN="${domain:-}"
 NNS_URLS="${nns_urls:-http://[::1]:8080}"
-NODE_INDEX="${node_index:-0}"
 # Default value is 24h
 BACKUP_RETENTION_TIME_SECS="${backup_retention_time_secs:-86400}"
 # Default value is 1h
@@ -239,7 +238,6 @@ sed -e "s@{{ ipv6_address }}@${IPV6_ADDRESS}@" \
     -e "s@{{ ipv4_gateway }}@${IPV4_GATEWAY}@" \
     -e "s@{{ domain }}@${DOMAIN}@" \
     -e "s@{{ nns_urls }}@${NNS_URLS}@" \
-    -e "s@{{ node_index }}@${NODE_INDEX}@" \
     -e "s@{{ backup_retention_time_secs }}@${BACKUP_RETENTION_TIME_SECS}@" \
     -e "s@{{ backup_purging_interval_secs }}@${BACKUP_PURGING_INTERVAL_SECS}@" \
     -e "s@{{ malicious_behavior }}@${MALICIOUS_BEHAVIOR}@" \

diff --git a/ic-os/components/ic/generate-ic-config/ic.json5.template b/ic-os/components/ic/generate-ic-config/ic.json5.template
@@ -3,7 +3,7 @@
     // Global Replica Configuration
     // ============================================
 
-    node_id: "{{ node_index }}",
+    node_id: "0",
 
     // =======================================================
     // Configuration of transport parameters and node identity
@@ -158,7 +158,7 @@
     // ===================================
     logger: {
         // The node id to append to log lines.
-        node_id: {{ node_index }},
+        node_id: 0,
         // The log level to use.
         level: "info",
         // The format of emitted log lines

diff --git a/ic-os/components/setupos-scripts/functions.sh b/ic-os/components/setupos-scripts/functions.sh
@@ -12,6 +12,11 @@ function log_and_halt_installation_on_error() {
 
     if [ "${exit_code}" -ne 0 ]; then
         {
+            # Sleep before printing error log to ensure previous log messages
+            # have time to display on console (helpful for screen recordings).
+            echo "ERROR DETECTED..."
+            sleep 5
+
             echo -e "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
             echo "--------------------------------------------------------------------------------"
             echo "                       INTERNET COMPUTER - SETUP - FAILED"

diff --git a/ic-os/guestos/context/docker-base.dev b/ic-os/guestos/context/docker-base.dev
@@ -1 +1 @@
-ghcr.io/dfinity/guestos-base-dev@sha256:8a0b0eb1d92df090f47c653307ccd8a537bf2d83de94f39c3aacca0ff6743074
+ghcr.io/dfinity/guestos-base-dev@sha256:60ceca01eb6ed570bd99025305005e02bf586cf08476c028ef52aeaf56541d00
diff --git a/ic-os/guestos/context/docker-base.prod b/ic-os/guestos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/guestos-base@sha256:618c1c4755af3fa30357350d983c89dbd8999ea61fb1cf31707a44f62d4b3161
+ghcr.io/dfinity/guestos-base@sha256:a22e4f8093866002d324d0583b0a33c15725954cb1d132c6d89971f80a383201
diff --git a/ic-os/hostos/context/docker-base.dev b/ic-os/hostos/context/docker-base.dev
@@ -1 +1 @@
-ghcr.io/dfinity/hostos-base-dev@sha256:37f5f725a1390f55cf6e3e65bef34464c432867fdc14207b66aa1793d6cb0d56
+ghcr.io/dfinity/hostos-base-dev@sha256:8fa9b6f10bd6b1ee7438407db3d10d2e8b22fcff959616986d57bdbd4a884c17
diff --git a/ic-os/hostos/context/docker-base.prod b/ic-os/hostos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/hostos-base@sha256:425cfbb72c967ea8ea28ee3a23cfe10271ae7b641e54f816a29422a7650d08bd
+ghcr.io/dfinity/hostos-base@sha256:b5b7d3f25b3381a2eddcb8942f00c4f46dbe2d9ca4c81d966f9fbc9f72c3024c
diff --git a/ic-os/setupos/context/docker-base.dev b/ic-os/setupos/context/docker-base.dev
@@ -1 +1 @@
-ghcr.io/dfinity/setupos-base-dev@sha256:4a8a66d87bf6de3daf5f080e25add9e2934984a90e8acdfb7f6acfcd6e646895
+ghcr.io/dfinity/setupos-base-dev@sha256:4f0e8cdfae3fd8fab096d29c3ded0fbb18eb9c56ff1aa67bc72a5d3a4692e43e
diff --git a/ic-os/setupos/context/docker-base.prod b/ic-os/setupos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/setupos-base@sha256:40ec1d9ad32e1cf8931a188bf6a4a1adb9962788a47956db43a41ed12441832c
+ghcr.io/dfinity/setupos-base@sha256:9142679e9fbe9fe98524930745ac2f3cc0e556f472f40ab38036f8ff4d1321f5
diff --git a/packages/pocket-ic/BUILD.bazel b/packages/pocket-ic/BUILD.bazel
@@ -45,7 +45,7 @@ rust_library(
     name = "pocket-ic",
     srcs = glob(["src/**/*.rs"]),
     proc_macro_deps = MACRO_DEPENDENCIES,
-    version = "5.0.0",
+    version = "6.0.0",
     deps = DEPENDENCIES,
 )
 

diff --git a/packages/pocket-ic/CHANGELOG.md b/packages/pocket-ic/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+
+
+## 6.0.0 - 2024-11-13
+
 ### Added
 - The function `PocketIc::get_subnet_metrics` to retrieve metrics of a given subnet.
 - The function `PocketIcBuilder::with_bitcoind_addr` to specify the address and port at which a `bitcoind` process is listening.

diff --git a/packages/pocket-ic/Cargo.toml b/packages/pocket-ic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pocket-ic"
-version = "5.0.0"
+version = "6.0.0"
 license = "Apache-2.0"
 description = "PocketIC: A Canister Smart Contract Testing Platform"
 repository = "https://github.com/dfinity/ic"

diff --git a/packages/pocket-ic/src/lib.rs b/packages/pocket-ic/src/lib.rs
@@ -76,7 +76,7 @@ pub mod common;
 pub mod management_canister;
 pub mod nonblocking;
 
-const EXPECTED_SERVER_VERSION: &str = "pocket-ic-server 6.0.0";
+const EXPECTED_SERVER_VERSION: &str = "pocket-ic-server 7.0.0";
 
 // the default timeout of a PocketIC operation
 const DEFAULT_MAX_REQUEST_TIME_MS: u64 = 300_000;

diff --git a/publish/canisters/BUILD.bazel b/publish/canisters/BUILD.bazel
@@ -8,6 +8,7 @@ load("//ci/src/artifacts:upload.bzl", "upload_artifacts")
 # 4. Canisters required for test environments.
 CANISTERS = {
     "canister-creator-canister.wasm.gz": "//rs/rust_canisters/canister_creator:canister_creator_canister",
+    "load_simulator_canister.wasm.gz": "//rs/rust_canisters/load_simulator:load_simulator_canister",
     "cycles-minting-canister.wasm.gz": "//rs/nns/cmc:cycles-minting-canister",
     "genesis-token-canister.wasm.gz": "//rs/nns/gtc:genesis-token-canister",
     "governance-canister.wasm.gz": "//rs/nns/governance:governance-canister",

diff --git a/rs/bitcoin/ckbtc/minter/BUILD.bazel b/rs/bitcoin/ckbtc/minter/BUILD.bazel
@@ -129,6 +129,25 @@ rust_test(
     ],
 )
 
+rust_test(
+    name = "ckbtc_minter_replay_events_tests",
+    srcs = ["tests/replay_events.rs"],
+    data = [
+        "test_resources/mainnet_events.gz",
+        "test_resources/testnet_events.gz",
+    ],
+    deps = [
+        # Keep sorted.
+        ":ckbtc_minter_lib",
+        "@crate_index//:bitcoin",
+        "@crate_index//:candid",
+        "@crate_index//:flate2",
+        "@crate_index//:ic-agent",
+        "@crate_index//:serde",
+        "@crate_index//:tokio",
+    ],
+)
+
 # integration tests defined in ckbtc minter tests/
 rust_ic_test(
     name = "ckbtc_minter_tests",

diff --git a/rs/bitcoin/ckbtc/minter/Cargo.toml b/rs/bitcoin/ckbtc/minter/Cargo.toml
@@ -52,6 +52,8 @@ assert_matches = { workspace = true }
 bitcoin = { workspace = true }
 candid_parser = { workspace = true }
 canister-test = { path = "../../../rust_canisters/canister_test" }
+flate2 = { workspace = true }
+ic-agent = { workspace = true }
 ic-bitcoin-canister-mock = { path = "../../mock" }
 ic-config = { path = "../../../config" }
 ic-icrc1-ledger = { path = "../../../ledger_suite/icrc1/ledger" }
@@ -60,6 +62,7 @@ ic-test-utilities-load-wasm = { path = "../../../test_utilities/load_wasm" }
 ic-types = { path = "../../../types/types" }
 proptest = { workspace = true }
 simple_asn1 = { workspace = true }
+tokio = { workspace = true }
 
 [features]
 self_check = []