Merge branch 'master' into delete-ENABLE_CREATE_CANISTER_AND_INSTALL_CODE_PROPOSALS-daniel-wong

Author: daniel-wong-dfinity-org

Cargo.lock

@@ -62,10 +62,8 @@ COPY packages.* /tmp/
 RUN apt-get -y update && \
     apt-get -y upgrade && \
     apt-get -y --no-install-recommends install $(for P in ${PACKAGE_FILES}; do cat /tmp/$P | sed -e "s/#.*//" ; done) \
-        # TODO(NODE-1852): Temporarily pin the kernel here.
-        # ${_KERNEL_PACKAGE} \
-        # linux-modules-extra-$(apt-cache depends ${_KERNEL_PACKAGE} | sed -n -e 's/  Depends: linux-image-\(.*\)-generic/\1/p')-generic && \
-        linux-image-6.14.0-37-generic linux-modules-extra-6.14.0-37-generic && \
+        ${_KERNEL_PACKAGE} \
+        linux-modules-extra-$(apt-cache depends ${_KERNEL_PACKAGE} | sed -n -e 's/  Depends: linux-image-\(.*\)-generic/\1/p')-generic && \
     rm /tmp/packages.*
 
 # Install node_exporter

ic-os/guestos/context/Dockerfile.base

@@ -68,12 +68,12 @@
     "sha256": "bce508df3db43b47b158c0aab9a7c9a3709a78e055a7ced76d5ff89832f9e778"
   },
   "governance": {
-    "rev": "b904c9dd1bdef8841bd12f03efbc71180a015e25",
-    "sha256": "bae2c5741b1ff9a5ad67b6d91b6c0945cfdbffd57349614346cd29f32aa3e637"
+    "rev": "021bf342f66296d5605b355a61b2430406a83783",
+    "sha256": "c66ff7d948ff79a826e61eab9e11714082d93a45e42f3b7deec1c2377341285f"
   },
   "governance-canister_test": {
-    "rev": "b904c9dd1bdef8841bd12f03efbc71180a015e25",
-    "sha256": "4b339f28e589d6ed42cf56b46b253485167d7be687e6cac46012f68d8b48812b"
+    "rev": "021bf342f66296d5605b355a61b2430406a83783",
+    "sha256": "dfce35eed2811d7e2b303785868cf9d87e40e37a40fc7c4a76c50eefec57fd32"
   },
   "index": {
     "rev": "3ae3649a2366aaca83404b692fc58e4c6e604a25",
@@ -104,8 +104,8 @@
     "tag": "proposal-141231"
   },
   "node-rewards": {
-    "rev": "d17cf0bcd330e94f868cc7d19d0ac860cbe64198",
-    "sha256": "da1f1f9ec646bfe4a50f2ec06111b57845b549a2d86d27c31eab138965f29a58"
+    "rev": "ea86e66305668654c6699f182dc69f547af7106a",
+    "sha256": "a8213923e423e32f1b62cf5588fa6504e9d8689b4fe86ca520b5e8a77d8f1359"
   },
   "registry": {
     "rev": "2450f6dd9beb5e2049a7b201e7b54f28e9d63815",

mainnet-canister-revisions.json

@@ -3497,6 +3497,26 @@ fn default_cost_schedule_on_cloud_engine() {
     let _pic = PocketIcBuilder::new_with_config(config).build();
 }
 
+#[test]
+fn cloud_engine_with_registry() {
+    // Regression test: creating a cloud engine subnet with the registry ICP feature enabled
+    // must not trigger the registry invariant check failure
+    // "is a cloud engine subnet but some nodes do not have reward type 4".
+    let icp_features = IcpFeatures {
+        registry: Some(IcpFeaturesConfig::DefaultConfig),
+        ..Default::default()
+    };
+    let subnet_spec = SubnetSpec::default().with_cost_schedule(CanisterCyclesCostSchedule::Free);
+    let config = ExtendedSubnetConfigSet {
+        nns: Some(SubnetSpec::default()),
+        cloud_engine: vec![subnet_spec],
+        ..Default::default()
+    };
+    let _pic = PocketIcBuilder::new_with_config(config)
+        .with_icp_features(icp_features)
+        .build();
+}
+
 #[test]
 fn cloud_engine_default_effective_canister_id() {
     // Create a PocketIC instance with a single (cloud) engine and NNS subnet.

packages/pocket-ic/tests/tests.rs

@@ -263,6 +263,7 @@ mod tests {
                 id: CallbackId::from(id),
                 content_hash: CryptoHashOf::from(CryptoHash(vec![1, 2, 3])),
                 content_size: 42,
+                is_reject: false,
                 registry_version: RegistryVersion::from(id),
                 replica_version: ReplicaVersion::default(),
             },

rs/artifact_pool/src/canister_http_pool.rs

@@ -108,6 +108,9 @@ pub const MAX_MESSAGE_DURATION_BEFORE_WARN_IN_SECONDS: f64 = 5.0;
 ///
 const MAX_PAUSED_EXECUTIONS: usize = 4;
 
+/// Cost for creating a new canister.
+pub const CANISTER_CREATION_FEE: Cycles = Cycles::new(500_000_000_000);
+
 /// 10B cycles corresponds to 1 SDR cent. Assuming we can create 1 signature per
 /// second, that would come to  26k SDR per month if we spent the whole time
 /// creating signatures. At 13 nodes and 2k SDR per node per month this would
@@ -458,7 +461,7 @@ impl CyclesAccountManagerConfig {
         let ten_update_instructions_execution_fee_in_cycles = 10;
         Self {
             reference_subnet_size: DEFAULT_REFERENCE_SUBNET_SIZE,
-            canister_creation_fee: Cycles::new(500_000_000_000),
+            canister_creation_fee: CANISTER_CREATION_FEE,
             compute_percent_allocated_per_second_fee: Cycles::new(10_000_000),
 
             // The following fields are set based on a thought experiment where

rs/config/src/subnet_config.rs

@@ -29,6 +29,7 @@ rust_library(
         "//rs/query_stats",
         "//rs/registry/provisional_whitelist",
         "//rs/registry/resource_limits",
+        "//rs/registry/routing_table",
         "//rs/registry/subnet_type",
         "//rs/replicated_state",
         "//rs/state_layout",

rs/execution_environment/BUILD.bazel

@@ -27,6 +27,7 @@ ic-metrics = { path = "../monitoring/metrics" }
 ic-query-stats = { path = "../query_stats" }
 ic-registry-provisional-whitelist = { path = "../registry/provisional_whitelist" }
 ic-registry-resource-limits = { path = "../registry/resource_limits" }
+ic-registry-routing-table = { path = "../registry/routing_table" }
 ic-registry-subnet-type = { path = "../registry/subnet_type" }
 ic-replicated-state = { path = "../replicated_state" }
 ic-state-layout = { path = "../state_layout" }
@@ -67,7 +68,6 @@ ic-crypto-sha2 = { path = "../crypto/sha2" }
 ic-crypto-test-utils-vetkd = { path = "../crypto/test_utils/vetkd" }
 ic-interfaces-state-manager-mocks = { path = "../interfaces/state_manager/mocks" }
 ic-nns-constants = { path = "../nns/constants" }
-ic-registry-routing-table = { path = "../registry/routing_table" }
 ic-registry-subnet-features = { path = "../registry/subnet_features" }
 ic-state-machine-tests = { path = "../state_machine_tests" }
 ic-test-utilities = { path = "../test_utilities" }

rs/execution_environment/Cargo.toml

@@ -2337,6 +2337,12 @@ impl CanisterManager {
                     round_limits,
                     compilation_cost_handling,
                 );
+            debug_assert!(
+                instructions_for_execution <= prepaid_execution_instructions,
+                "instructions_for_execution {:?} exceeds prepaid_execution_instructions {:?}",
+                instructions_for_execution,
+                prepaid_execution_instructions,
+            );
             let instructions_to_refund =
                 prepaid_execution_instructions.saturating_sub(&instructions_for_execution);
             self.cycles_account_manager.refund_unused_execution_cycles(

rs/execution_environment/src/canister_manager.rs

@@ -25,7 +25,7 @@ use ic_config::{
         SUBNET_MEMORY_RESERVATION, TEST_DEFAULT_LOG_MEMORY_USAGE,
     },
     flag_status::FlagStatus,
-    subnet_config::SchedulerConfig,
+    subnet_config::{CANISTER_CREATION_FEE, SchedulerConfig},
 };
 use ic_cycles_account_manager::{CyclesAccountManager, ResourceSaturation};
 use ic_embedders::{
@@ -7263,7 +7263,7 @@ fn create_canister_free() {
             .canister_metrics()
             .consumed_cycles()
             .get(),
-        0
+        CANISTER_CREATION_FEE.get()
     );
     assert_eq!(canister.system_state.balance(), *INITIAL_CYCLES);
 }
@@ -7296,7 +7296,7 @@ fn create_canister_as_subnet_admin_succeeds_on_free_cost_schedule() {
             .canister_metrics()
             .consumed_cycles()
             .get(),
-        0
+        CANISTER_CREATION_FEE.get()
     );
     assert_eq!(canister.system_state.balance(), Cycles::new(0));
 }