From efe05895a893820ba2a948eb6f0ec41b7b619e5d Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 10 Oct 2022 16:09:59 +0200 Subject: [PATCH 1/3] ++ --- e2e/tests-dfx/sns.bash | 2 ++ src/dfx/src/lib/nns/install_nns.rs | 2 +- src/dfx/src/lib/nns/install_nns/canisters.rs | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/e2e/tests-dfx/sns.bash b/e2e/tests-dfx/sns.bash index 7cf574da47..b8c0b97b62 100755 --- a/e2e/tests-dfx/sns.bash +++ b/e2e/tests-dfx/sns.bash @@ -81,4 +81,6 @@ SNS_CONFIG_FILE_NAME="sns.yml" dfx canister id sns_ledger dfx canister id sns_root dfx canister id sns_swap + dfx canister id sns_ledger_archive + dfx canister id sns_ledger_index } diff --git a/src/dfx/src/lib/nns/install_nns.rs b/src/dfx/src/lib/nns/install_nns.rs index 29a6e2501e..f0d04dfe2b 100644 --- a/src/dfx/src/lib/nns/install_nns.rs +++ b/src/dfx/src/lib/nns/install_nns.rs @@ -594,7 +594,7 @@ pub fn set_cmc_authorized_subnets( } /// Uploads wasms to the nns-sns-wasm canister. -#[context("Failed to upload wasm fils to the nns-sns-wasm canister; it may not be possible to create an SNS.")] +#[context("Failed to upload wasm files to the nns-sns-wasm canister; it may not be possible to create an SNS.")] pub fn upload_nns_sns_wasms_canister_wasms(env: &dyn Environment) -> anyhow::Result<()> { for SnsCanisterInstallation { upload_name, diff --git a/src/dfx/src/lib/nns/install_nns/canisters.rs b/src/dfx/src/lib/nns/install_nns/canisters.rs index 14115eb6db..1fccaf5684 100644 --- a/src/dfx/src/lib/nns/install_nns/canisters.rs +++ b/src/dfx/src/lib/nns/install_nns/canisters.rs @@ -175,17 +175,24 @@ pub const SNS_LEDGER_ARCHIVE: SnsCanisterInstallation = SnsCanisterInstallation upload_name: "archive", wasm_name: "ic-icrc1-archive.wasm", }; +/// Indexes ledger data. +pub const SNS_LEDGER_INDEX: SnsCanisterInstallation = SnsCanisterInstallation { + canister_name: "sns-ledger-index", + upload_name: "index", + wasm_name: "ic-icrc1-index.wasm", +}; /// SNS wasm files hosted by the nns-sns-wasms canister. /// /// Note: Sets of these canisters are deployed on request, so one network will /// typically have many sets of these canisters, one per project decentralized /// with the SNS toolchain. -pub const SNS_CANISTERS: [&SnsCanisterInstallation; 5] = [ +pub const SNS_CANISTERS: [&SnsCanisterInstallation; 6] = [ &SNS_ROOT, &SNS_GOVERNANCE, &SNS_SWAP, &SNS_LEDGER, &SNS_LEDGER_ARCHIVE, + &SNS_LEDGER_INDEX, ]; /// Test account with well known public & private keys, used in NNS_LEDGER, NNS_DAPP and third party projects. From 93d962d7daaa2e0dd0c1a201e4873eca3645ed43 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 10 Oct 2022 16:30:27 +0200 Subject: [PATCH 2/3] Fix tests --- e2e/tests-dfx/sns.bash | 4 ++-- src/dfx/src/lib/nns/install_nns/canisters.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/e2e/tests-dfx/sns.bash b/e2e/tests-dfx/sns.bash index b8c0b97b62..588d586f6b 100755 --- a/e2e/tests-dfx/sns.bash +++ b/e2e/tests-dfx/sns.bash @@ -53,6 +53,7 @@ SNS_CONFIG_FILE_NAME="sns.yml" @test "sns deploy fails without config file" { dfx_new + dfx nns import rm -f sns.yml # Is not expected to be present anyway assert_command_fail dfx sns deploy assert_match "Error encountered when generating the SnsInitPayload: Couldn't open initial parameters file" @@ -78,9 +79,8 @@ SNS_CONFIG_FILE_NAME="sns.yml" dfx sns deploy # SNS canister IDs should be saved dfx canister id sns_governance + dfx canister id sns_index dfx canister id sns_ledger dfx canister id sns_root dfx canister id sns_swap - dfx canister id sns_ledger_archive - dfx canister id sns_ledger_index } diff --git a/src/dfx/src/lib/nns/install_nns/canisters.rs b/src/dfx/src/lib/nns/install_nns/canisters.rs index 1fccaf5684..be1079003d 100644 --- a/src/dfx/src/lib/nns/install_nns/canisters.rs +++ b/src/dfx/src/lib/nns/install_nns/canisters.rs @@ -176,8 +176,8 @@ pub const SNS_LEDGER_ARCHIVE: SnsCanisterInstallation = SnsCanisterInstallation wasm_name: "ic-icrc1-archive.wasm", }; /// Indexes ledger data. -pub const SNS_LEDGER_INDEX: SnsCanisterInstallation = SnsCanisterInstallation { - canister_name: "sns-ledger-index", +pub const SNS_INDEX: SnsCanisterInstallation = SnsCanisterInstallation { + canister_name: "sns-index", upload_name: "index", wasm_name: "ic-icrc1-index.wasm", }; @@ -192,7 +192,7 @@ pub const SNS_CANISTERS: [&SnsCanisterInstallation; 6] = [ &SNS_SWAP, &SNS_LEDGER, &SNS_LEDGER_ARCHIVE, - &SNS_LEDGER_INDEX, + &SNS_INDEX, ]; /// Test account with well known public & private keys, used in NNS_LEDGER, NNS_DAPP and third party projects. From 27cf1490b6534f0aaf1c219928b899cd55488e1f Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 10 Oct 2022 16:36:47 +0200 Subject: [PATCH 3/3] bump