chore(nns): add support in release scripts for node-rewards canister (#4252)

Author: max-dfinity

Cargo.lock

@@ -50,6 +50,7 @@ canisters(
         "sns_ledger_v2": "ic-icrc1-ledger.wasm.gz",
         "sns_archive": "ic-icrc1-archive.wasm.gz",
         "sns_index": "ic-icrc1-index-ng.wasm.gz",
+        "node-rewards": "node-rewards-canister.wasm.gz",
     },
     path = "//:mainnet-canister-revisions.json",
     reponames = {
@@ -87,6 +88,7 @@ canisters(
         "sns_ledger_v2": "mainnet_ic-icrc1-ledger-v2",
         "sns_archive": "mainnet_ic-icrc1-archive",
         "sns_index": "mainnet_ic-icrc1-index-ng",
+        "node-rewards": "mainnet_node-rewards-canister",
     },
 )
 

WORKSPACE.bazel

@@ -95,6 +95,10 @@
     "rev": "b5192581ccd35b67fe5a1f795ead9cbcd25956d6",
     "sha256": "8c8eb285de53ca5609abd7dc41ba3ec8eeb67708b81469311fd670e6738d7d0a"
   },
+  "node-rewards": {
+    "rev": "3a3cf55373bfe5843fac9fff6657127ae11b5dd8",
+    "sha256": "8637e0182ffc1255563e295efee28f2163f9be21bbd27f3e65bfc3c1f470d3ca"
+  },
   "registry": {
     "rev": "c5dee3a11b79da7b5c433574f38605d75c9feaf5",
     "sha256": "a0f4a36d46816619ef042d8de1a893c105a33c0c493106f5f9d04602ed9afbcf"

mainnet-canister-revisions.json

@@ -103,6 +103,7 @@ DEV_DATA = [
     "//rs/nns/gtc:genesis-token-canister",
     "//rs/nns/handlers/root/impl:root-canister",
     "//rs/nns/sns-wasm:sns-wasm-canister",
+    "//rs/node_rewards/canister:node-rewards-canister",
     "//rs/pocket_ic_server:pocket-ic-server",
     "//rs/registry/canister:registry-canister",
     "//rs/rosetta-api/tvl/xrc_mock:xrc_mock_canister",
@@ -121,6 +122,7 @@ DEV_DATA = [
     "@mainnet_nns_registry_canister//file",
     "@mainnet_nns_root-canister//file",
     "@mainnet_nns_sns-wasm-canister//file",
+    "@mainnet_node-rewards-canister//file",
     "@mainnet_sns-governance-canister//file",
     "@mainnet_sns-root-canister//file",
     "@mainnet_sns-swap-canister//file",
@@ -143,6 +145,7 @@ DEV_ENV = {
     "MAINNET_IC_ICRC1_ARCHIVE_WASM_PATH": "$(rootpath @mainnet_ic-icrc1-archive//file)",
     "MAINNET_IC_ICRC1_INDEX_NG_WASM_PATH": "$(rootpath @mainnet_ic-icrc1-index-ng//file)",
     "MAINNET_SNS_WASM_CANISTER_WASM_PATH": "$(rootpath @mainnet_nns_sns-wasm-canister//file)",
+    "MAINNET_NODE_REWARDS_CANISTER_WASM_PATH": "$(rootpath @mainnet_node-rewards-canister//file)",
     "MAINNET_ICP_LEDGER_CANISTER_WASM_PATH": "$(rootpath @mainnet_icp_ledger_canister//file)",
     "MAINNET_GOVERNANCE_CANISTER_WASM_PATH": "$(rootpath @mainnet_nns_governance_canister//file)",
     "MAINNET_LIFELINE_CANISTER_WASM_PATH": "$(rootpath @mainnet_nns_lifeline_canister//file)",
@@ -151,6 +154,7 @@ DEV_ENV = {
     "NEURON_CSV_PATH": "rs/nns/integration_tests/src/neurons.csv",
     "GENESIS_TOKEN_CANISTER_WASM_PATH": "$(rootpath //rs/nns/gtc:genesis-token-canister)",
     "SNS_WASM_CANISTER_WASM_PATH": "$(rootpath //rs/nns/sns-wasm:sns-wasm-canister)",
+    "NODE_REWARDS_CANISTER_WASM_PATH": "$(rootpath //rs/node_rewards/canister:node-rewards-canister)",
     "SNS_GOVERNANCE_CANISTER_WASM_PATH": "$(rootpath //rs/sns/governance:sns-governance-canister-test)",
     "MAINNET_SNS_GOVERNANCE_CANISTER_WASM_PATH": "$(rootpath @mainnet_sns-governance-canister//file)",
     "SNS_ROOT_CANISTER_WASM_PATH": "$(rootpath //rs/sns/root:sns-root-canister)",

rs/nervous_system/integration_tests/BUILD.bazel

@@ -183,6 +183,7 @@ fn run_determine_targets(cmd: DetermineTargets) -> Result<()> {
         "Registry",
         "Cycles-Minting",
         "Genesis-Token",
+        "Node-Rewards",
     ];
     let sns_candidates = ["Root", "Governance", "Swap", "Ledger", "Archive", "Index"];
 
@@ -278,9 +279,6 @@ fn run_create_proposal_texts(cmd: CreateProposalTexts) -> Result<()> {
     let mut sns_proposal_text_paths = Vec::new();
 
     {
-        // Switch to the commit being released while we generate the proposal texts
-        let _commit_switcher = CommitSwitcher::switch(commit.clone())?;
-
         println!(
             "Creating proposal texts for {} NNS canisters and {} SNS canisters at commit {}",
             nns_canisters.len(),

rs/nervous_system/tools/release-runscript/src/main.rs

@@ -5,15 +5,15 @@ use ic_base_types::CanisterId;
 use ic_nervous_system_agent::nns::sns_wasm;
 use ic_nns_constants::{
     CYCLES_MINTING_CANISTER_ID, GENESIS_TOKEN_CANISTER_ID, GOVERNANCE_CANISTER_ID,
-    LEDGER_CANISTER_ID, LIFELINE_CANISTER_ID, REGISTRY_CANISTER_ID, ROOT_CANISTER_ID,
-    SNS_WASM_CANISTER_ID,
+    LEDGER_CANISTER_ID, LIFELINE_CANISTER_ID, NODE_REWARDS_CANISTER_ID, REGISTRY_CANISTER_ID,
+    ROOT_CANISTER_ID, SNS_WASM_CANISTER_ID,
 };
 use std::env;
 use std::fs::File;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 
-pub const NNS_CANISTER_NAME_TO_ID: [(&str, CanisterId); 8] = [
+pub const NNS_CANISTER_NAME_TO_ID: [(&str, CanisterId); 9] = [
     ("registry", REGISTRY_CANISTER_ID),
     ("governance", GOVERNANCE_CANISTER_ID),
     ("ledger", LEDGER_CANISTER_ID),
@@ -22,6 +22,7 @@ pub const NNS_CANISTER_NAME_TO_ID: [(&str, CanisterId); 8] = [
     ("genesis-token", GENESIS_TOKEN_CANISTER_ID),
     ("cycles-minting", CYCLES_MINTING_CANISTER_ID),
     ("sns-wasm", SNS_WASM_CANISTER_ID),
+    ("node-rewards", NODE_REWARDS_CANISTER_ID),
 ];
 
 async fn get_mainnet_canister_git_commit_id_and_module_hash(

rs/nervous_system/tools/sync-with-released-nervous-system-wasms/src/main.rs

@@ -54,5 +54,9 @@
   "nns-ui": {
     "local": "qoctq-giaaa-aaaaa-aaaea-cai",
     "mainnet": "qoctq-giaaa-aaaaa-aaaea-cai"
+  },
+  "node-rewards": {
+    "local": "sgymv-uiaaa-aaaaa-aaaia-cai",
+    "mainnet": "sgymv-uiaaa-aaaaa-aaaia-cai"
   }
 }

rs/nns/canister_ids.json

@@ -30,6 +30,8 @@ pub const LEDGER_INDEX_CANISTER_INDEX_IN_NNS_SUBNET: u64 = 11;
 pub const ICP_LEDGER_ARCHIVE_1_CANISTER_INDEX_IN_NNS_SUBNET: u64 = 12;
 pub const SUBNET_RENTAL_CANISTER_INDEX_IN_NNS_SUBNET: u64 = 13;
 pub const ICP_LEDGER_ARCHIVE_2_CANISTER_INDEX_IN_NNS_SUBNET: u64 = 14;
+pub const ICP_LEDGER_ARCHIVE_3_CANISTER_INDEX_IN_NNS_SUBNET: u64 = 15;
+pub const NODE_REWARDS_CANISTER_INDEX_IN_NNS_SUBNET: u64 = 16;
 // Exchange Rate, Cycles Ledger (Index) Canisters are deployed to the II subnet.
 pub const EXCHANGE_RATE_CANISTER_INDEX: u64 = 0x2100001;
 pub const CYCLES_LEDGER_CANISTER_INDEX: u64 = 0x2100002;
@@ -115,6 +117,12 @@ pub const SUBNET_RENTAL_CANISTER_ID: CanisterId =
 /// 14: q4eej-kyaaa-aaaaa-aaaha-cai
 pub const ICP_LEDGER_ARCHIVE_2_CANISTER_ID: CanisterId =
     CanisterId::from_u64(ICP_LEDGER_ARCHIVE_2_CANISTER_INDEX_IN_NNS_SUBNET);
+// 15: q3fc5-haaaa-aaaaa-aaahq-cai
+pub const ICP_LEDGER_ARCHIVE_3_CANISTER_ID: CanisterId =
+    CanisterId::from_u64(ICP_LEDGER_ARCHIVE_3_CANISTER_INDEX_IN_NNS_SUBNET);
+// 16: sgymv-uiaaa-aaaaa-aaaia-cai
+pub const NODE_REWARDS_CANISTER_ID: CanisterId =
+    CanisterId::from_u64(NODE_REWARDS_CANISTER_INDEX_IN_NNS_SUBNET);
 /// 0x2_100_001 (34_603_009): uf6dk-hyaaa-aaaaq-qaaaq-cai
 pub const EXCHANGE_RATE_CANISTER_ID: CanisterId =
     CanisterId::from_u64(EXCHANGE_RATE_CANISTER_INDEX);
@@ -139,7 +147,7 @@ pub const SNS_AGGREGATOR_CANISTER_ID: CanisterId =
 ///
 /// As of May 2024, it looks like this is only used by (a whole bunch of) tests, mostly as the
 /// argument to send_whitelist.
-pub const ALL_NNS_CANISTER_IDS: [&CanisterId; 10] = [
+pub const ALL_NNS_CANISTER_IDS: [&CanisterId; 17] = [
     &REGISTRY_CANISTER_ID,
     &GOVERNANCE_CANISTER_ID,
     &LEDGER_CANISTER_ID,
@@ -149,7 +157,14 @@ pub const ALL_NNS_CANISTER_IDS: [&CanisterId; 10] = [
     &GENESIS_TOKEN_CANISTER_ID,
     &IDENTITY_CANISTER_ID,
     &NNS_UI_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_CANISTER_ID,
     &SNS_WASM_CANISTER_ID,
+    &LEDGER_INDEX_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_1_CANISTER_ID,
+    &SUBNET_RENTAL_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_2_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_3_CANISTER_ID,
+    &NODE_REWARDS_CANISTER_ID,
 ];
 
 // The memory allocation for the ledger, governance and registry canisters
@@ -190,12 +205,14 @@ pub fn canister_id_to_nns_canister_name(canister_id: CanisterId) -> String {
         GOVERNANCE_CANISTER_ID           => "governance",
         ICP_LEDGER_ARCHIVE_1_CANISTER_ID => "icp-ledger-archive-1",
         ICP_LEDGER_ARCHIVE_2_CANISTER_ID => "icp-ledger-archive-2",
+        ICP_LEDGER_ARCHIVE_3_CANISTER_ID => "icp-ledger-archive-3",
         ICP_LEDGER_ARCHIVE_CANISTER_ID   => "icp-ledger-archive",
         IDENTITY_CANISTER_ID             => "identity",
         LEDGER_CANISTER_ID               => "ledger",
         LEDGER_INDEX_CANISTER_ID         => "ledger-index",
         LIFELINE_CANISTER_ID             => "lifeline",
         NNS_UI_CANISTER_ID               => "nns-ui",
+        NODE_REWARDS_CANISTER_ID         => "node-rewards",
         REGISTRY_CANISTER_ID             => "registry",
         ROOT_CANISTER_ID                 => "root",
         SNS_WASM_CANISTER_ID             => "sns-wasm",
@@ -205,7 +222,7 @@ pub fn canister_id_to_nns_canister_name(canister_id: CanisterId) -> String {
         id_to_name.len(),
         // Because 0 through 14 accounts for the first 15 canister +
         // 1 for exchange rate canister.
-        16,
+        18,
         "{:#?}",
         id_to_name
     );

rs/nns/constants/src/lib.rs

@@ -4561,10 +4561,6 @@ impl Governance {
                 )
             })?;
 
-        println!(
-            "{}INFO: Committing new NetworkEconomics:\n{:#?}",
-            LOG_PREFIX, new_network_economics,
-        );
         self.heap_data.economics = Some(new_network_economics);
         Ok(())
     }

rs/nns/governance/src/governance.rs

@@ -8,8 +8,9 @@ use ic_nns_constants::{
     BITCOIN_MAINNET_CANISTER_ID, BITCOIN_TESTNET_CANISTER_ID, CYCLES_LEDGER_CANISTER_ID,
     CYCLES_LEDGER_INDEX_CANISTER_ID, CYCLES_MINTING_CANISTER_ID, EXCHANGE_RATE_CANISTER_ID,
     GENESIS_TOKEN_CANISTER_ID, GOVERNANCE_CANISTER_ID, ICP_LEDGER_ARCHIVE_1_CANISTER_ID,
-    ICP_LEDGER_ARCHIVE_2_CANISTER_ID, ICP_LEDGER_ARCHIVE_CANISTER_ID, LEDGER_CANISTER_ID,
-    LEDGER_INDEX_CANISTER_ID, LIFELINE_CANISTER_ID, REGISTRY_CANISTER_ID, ROOT_CANISTER_ID,
+    ICP_LEDGER_ARCHIVE_2_CANISTER_ID, ICP_LEDGER_ARCHIVE_3_CANISTER_ID,
+    ICP_LEDGER_ARCHIVE_CANISTER_ID, LEDGER_CANISTER_ID, LEDGER_INDEX_CANISTER_ID,
+    LIFELINE_CANISTER_ID, NODE_REWARDS_CANISTER_ID, REGISTRY_CANISTER_ID, ROOT_CANISTER_ID,
     SNS_AGGREGATOR_CANISTER_ID, SNS_WASM_CANISTER_ID, SUBNET_RENTAL_CANISTER_ID,
 };
 use std::collections::HashMap;
@@ -20,7 +21,7 @@ pub mod install_code;
 pub mod stop_or_start_canister;
 pub mod update_canister_settings;
 
-const PROTOCOL_CANISTER_IDS: [&CanisterId; 17] = [
+const PROTOCOL_CANISTER_IDS: [&CanisterId; 19] = [
     &REGISTRY_CANISTER_ID,
     &GOVERNANCE_CANISTER_ID,
     &LEDGER_CANISTER_ID,
@@ -33,6 +34,8 @@ const PROTOCOL_CANISTER_IDS: [&CanisterId; 17] = [
     &ICP_LEDGER_ARCHIVE_1_CANISTER_ID,
     &SUBNET_RENTAL_CANISTER_ID,
     &ICP_LEDGER_ARCHIVE_2_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_3_CANISTER_ID,
+    &NODE_REWARDS_CANISTER_ID,
     &EXCHANGE_RATE_CANISTER_ID,
     &BITCOIN_MAINNET_CANISTER_ID,
     &BITCOIN_TESTNET_CANISTER_ID,