diff --git a/e2e/assets/sns/valid/sns.yml b/e2e/assets/sns/valid/sns.yml index aff819946f..3f66099b2f 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 @@ -23,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" 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 539e1c1bd8..c55ccdcdd9 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: "qaa6y-5yaaa-aaaaa-aaafa-cai", +}; /// 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`. @@ -106,10 +113,10 @@ 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; 10] = &[ +pub const NNS_CORE: &[&IcNnsInitCanister; 11] = &[ &NNS_REGISTRY, &NNS_GOVERNANCE, &NNS_LEDGER, @@ -118,6 +125,7 @@ pub const NNS_CORE: &[&IcNnsInitCanister; 10] = &[ &NNS_LIFELINE, &NNS_GENESIS_TOKENS, &NNS_SNS_WASM, + &NNS_IC_CKBTC_MINTER, &NNS_IDENTITY, &NNS_UI, ];