From 2de19e0d9b8cd08f84352df7f993387ec317741c Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 22 Sep 2022 02:54:07 -0700 Subject: [PATCH 1/4] fix: nns tests Note that the canister is is wrong --- src/dfx/src/lib/nns/install_nns/canisters.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/dfx/src/lib/nns/install_nns/canisters.rs b/src/dfx/src/lib/nns/install_nns/canisters.rs index 539e1c1bd8..b50d7c547e 100644 --- a/src/dfx/src/lib/nns/install_nns/canisters.rs +++ b/src/dfx/src/lib/nns/install_nns/canisters.rs @@ -83,6 +83,13 @@ pub const NNS_UI: IcNnsInitCanister = IcNnsInitCanister { test_wasm_name: None, canister_id: "qoctq-giaaa-aaaaa-aaaea-cai", }; +/// Canister that converts between bitcoin and ckBTC +pub const NNS_IC_CKBTC_MINTER: IcNnsInitCanister = IcNnsInitCanister { + canister_name: "nns-ic-ckbtc-minter", + wasm_name: "ic-ckbtc-minter.wasm", + test_wasm_name: None, + canister_id: "rkp4c-7iaaa-aaaaa-aaaca-cai", // not correct +}; /// Minimum data needed to download and deploy a standard canister via dfx deploy NAME. pub struct StandardCanister { /// The typical name of the canister, as seen in dfx.json or used in `dfx canister id NAME`. @@ -109,7 +116,7 @@ pub const NNS_DAPP: StandardCanister = StandardCanister { wasm_url: "https://github.com/dfinity/nns-dapp/releases/download/proposal-80618/nns-dapp_local_v2.wasm", }; /// Backend canisters deployed by `ic nns init`. -pub const NNS_CORE: &[&IcNnsInitCanister; 10] = &[ +pub const NNS_CORE: &[&IcNnsInitCanister; 11] = &[ &NNS_REGISTRY, &NNS_GOVERNANCE, &NNS_LEDGER, @@ -120,6 +127,7 @@ pub const NNS_CORE: &[&IcNnsInitCanister; 10] = &[ &NNS_SNS_WASM, &NNS_IDENTITY, &NNS_UI, + &NNS_IC_CKBTC_MINTER, ]; /// Frontend canisters deployed by `ic nns init`. The deployment is normal, like any other canister. pub const NNS_FRONTEND: [&StandardCanister; 2] = [&INTERNET_IDENTITY, &NNS_DAPP]; From c0780d9d6291c5a3acf39022b6d0660e56ccda0c Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 22 Sep 2022 03:19:41 -0700 Subject: [PATCH 2/4] add some new required fields to sns/valid/sns.yml --- e2e/assets/sns/valid/sns.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/e2e/assets/sns/valid/sns.yml b/e2e/assets/sns/valid/sns.yml index aff819946f..5d270ee32a 100644 --- a/e2e/assets/sns/valid/sns.yml +++ b/e2e/assets/sns/valid/sns.yml @@ -7,10 +7,14 @@ initial_token_distribution: airdrop_neurons: - controller: w3i5o-5ylvd-cmm42-pw66i-n6qcw-fw3q7-kk5la-4edui-ozozq-5qq3j-dae stake_e8s: 100000000 + memo: 42 + dissolve_delay_seconds: 86400 developer_distribution: developer_neurons: - controller: dktcs-d43lz-rosn2-wnwsj-kef34-6kl3i-ux7qb-ka6xr-biref-ykeaj-sqe stake_e8s: 100000000 + memo: 42 + dissolve_delay_seconds: 86400 swap_distribution: initial_swap_amount_e8s: 200000000 total_e8s: 1000000000 From ea8fe72eab7fde2fb7f7df4c533150c8e6bd63f6 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 22 Sep 2022 03:32:05 -0700 Subject: [PATCH 3/4] Add new required field --- e2e/assets/sns/valid/sns.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/assets/sns/valid/sns.yml b/e2e/assets/sns/valid/sns.yml index 5d270ee32a..3f66099b2f 100644 --- a/e2e/assets/sns/valid/sns.yml +++ b/e2e/assets/sns/valid/sns.yml @@ -27,6 +27,7 @@ min_icp_e8s: 100000000 min_participant_icp_e8s: 100000000 min_participants: 1 name: "Car Pedal TESAT Robot" +neuron_minimum_dissolve_delay_to_vote_seconds: 3600 neuron_minimum_stake_e8s: 1000000 proposal_reject_cost_e8s: 100000000 token_name: "maxs awesome TESAT" From 03a1073a28918f0338a7fc688781e2495c11a245 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Sep 2022 10:16:54 +0200 Subject: [PATCH 4/4] Bump canister IDs --- e2e/tests-dfx/nns.bash | 8 +++++--- src/dfx/src/lib/nns/install_nns/canisters.rs | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/e2e/tests-dfx/nns.bash b/e2e/tests-dfx/nns.bash index 0cff7a49f0..f17ba6a3ab 100755 --- a/e2e/tests-dfx/nns.bash +++ b/e2e/tests-dfx/nns.bash @@ -76,9 +76,10 @@ nns_canister_id() { nns-cycles-minting) echo "rkp4c-7iaaa-aaaaa-aaaca-cai" ;; nns-lifeline) echo "rno2w-sqaaa-aaaaa-aaacq-cai" ;; nns-genesis-token) echo "renrk-eyaaa-aaaaa-aaada-cai" ;; - nns-sns-wasm) echo "qaa6y-5yaaa-aaaaa-aaafa-cai" ;; - internet_identity) echo "qhbym-qaaaa-aaaaa-aaafq-cai" ;; - nns-dapp) echo "qsgjb-riaaa-aaaaa-aaaga-cai" ;; + nns-ic-ckbtc-minter) echo "qjdve-lqaaa-aaaaa-aaaeq-cai" ;; + nns-sns-wasm) echo "qjdve-lqaaa-aaaaa-aaaeq-cai" ;; + internet_identity) echo "qaa6y-5yaaa-aaaaa-aaafa-cai" ;; + nns-dapp) echo "qhbym-qaaaa-aaaaa-aaafq-cai" ;; *) echo "ERROR: Unknown NNS canister '$1'." >&2 exit 1;; esac @@ -103,6 +104,7 @@ assert_nns_canister_id_matches() { assert_nns_canister_id_matches nns-cycles-minting assert_nns_canister_id_matches nns-lifeline assert_nns_canister_id_matches nns-genesis-token + assert_nns_canister_id_matches nns-ic-ckbtc-minter assert_nns_canister_id_matches nns-sns-wasm # TODO: No source provides these canister IDs - yet. #assert_nns_canister_id_matches internet_identity diff --git a/src/dfx/src/lib/nns/install_nns/canisters.rs b/src/dfx/src/lib/nns/install_nns/canisters.rs index b50d7c547e..c55ccdcdd9 100644 --- a/src/dfx/src/lib/nns/install_nns/canisters.rs +++ b/src/dfx/src/lib/nns/install_nns/canisters.rs @@ -88,7 +88,7 @@ pub const NNS_IC_CKBTC_MINTER: IcNnsInitCanister = IcNnsInitCanister { canister_name: "nns-ic-ckbtc-minter", wasm_name: "ic-ckbtc-minter.wasm", test_wasm_name: None, - canister_id: "rkp4c-7iaaa-aaaaa-aaaca-cai", // not correct + canister_id: "qaa6y-5yaaa-aaaaa-aaafa-cai", }; /// Minimum data needed to download and deploy a standard canister via dfx deploy NAME. pub struct StandardCanister { @@ -113,7 +113,7 @@ pub const NNS_DAPP: StandardCanister = StandardCanister { canister_name: "nns-dapp", canister_id: "qsgjb-riaaa-aaaaa-aaaga-cai", wasm_name: "nns-dapp_local.wasm", - wasm_url: "https://github.com/dfinity/nns-dapp/releases/download/proposal-80618/nns-dapp_local_v2.wasm", + wasm_url: "https://github.com/dfinity/nns-dapp/releases/download/tip/nns-dapp_t2.wasm", }; /// Backend canisters deployed by `ic nns init`. pub const NNS_CORE: &[&IcNnsInitCanister; 11] = &[ @@ -125,9 +125,9 @@ pub const NNS_CORE: &[&IcNnsInitCanister; 11] = &[ &NNS_LIFELINE, &NNS_GENESIS_TOKENS, &NNS_SNS_WASM, + &NNS_IC_CKBTC_MINTER, &NNS_IDENTITY, &NNS_UI, - &NNS_IC_CKBTC_MINTER, ]; /// Frontend canisters deployed by `ic nns init`. The deployment is normal, like any other canister. pub const NNS_FRONTEND: [&StandardCanister; 2] = [&INTERNET_IDENTITY, &NNS_DAPP];