diff --git a/CHANGELOG.md b/CHANGELOG.md index f9ec8bd4f3..551d4a36bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## DFX +### fix: Save SNS canister IDs + +SNS canister IDs were not being parsed reliably. Now the candid file is being specified explicitly, which resolves the issue in at least some cases. + ### feat: NNS usability improvements The command line interface for nns commands has been updated to: @@ -453,6 +457,10 @@ This release candidate has not yet been elected. This also incorporates the following executed proposals: +* [85007](https://dashboard.internetcomputer.org/proposal/85007) +* [84391](https://dashboard.internetcomputer.org/proposal/84391) +* [83786](https://dashboard.internetcomputer.org/proposal/83786) +* [82425](https://dashboard.internetcomputer.org/proposal/82425) * [81788](https://dashboard.internetcomputer.org/proposal/81788) * [81571](https://dashboard.internetcomputer.org/proposal/81571) * [80992](https://dashboard.internetcomputer.org/proposal/80992) diff --git a/e2e/assets/ledger/cycles-minting-canister.wasm b/e2e/assets/ledger/cycles-minting-canister.wasm index 13a38d87a2..84891c1be0 100644 Binary files a/e2e/assets/ledger/cycles-minting-canister.wasm and b/e2e/assets/ledger/cycles-minting-canister.wasm differ diff --git a/e2e/assets/ledger/genesis-token-canister.wasm b/e2e/assets/ledger/genesis-token-canister.wasm index cc442a9344..dffc8ab2c7 100644 Binary files a/e2e/assets/ledger/genesis-token-canister.wasm and b/e2e/assets/ledger/genesis-token-canister.wasm differ diff --git a/e2e/assets/ledger/governance-canister.wasm b/e2e/assets/ledger/governance-canister.wasm index 6c306d6c9e..f1e39ab4a4 100644 Binary files a/e2e/assets/ledger/governance-canister.wasm and b/e2e/assets/ledger/governance-canister.wasm differ diff --git a/e2e/assets/ledger/governance-canister_test.wasm b/e2e/assets/ledger/governance-canister_test.wasm index 67c907fcc5..568e7c91ea 100644 Binary files a/e2e/assets/ledger/governance-canister_test.wasm and b/e2e/assets/ledger/governance-canister_test.wasm differ diff --git a/e2e/assets/ledger/ic-ckbtc-minter.wasm b/e2e/assets/ledger/ic-ckbtc-minter.wasm index 227d20c842..0f6e1efd1e 100644 Binary files a/e2e/assets/ledger/ic-ckbtc-minter.wasm and b/e2e/assets/ledger/ic-ckbtc-minter.wasm differ diff --git a/e2e/assets/ledger/ic-icrc1-ledger.wasm b/e2e/assets/ledger/ic-icrc1-ledger.wasm index 86f54f46b5..c261254147 100644 Binary files a/e2e/assets/ledger/ic-icrc1-ledger.wasm and b/e2e/assets/ledger/ic-icrc1-ledger.wasm differ diff --git a/e2e/assets/ledger/ic-nns-init_linux b/e2e/assets/ledger/ic-nns-init_linux index a9dfc837aa..7adf7a5df6 100755 Binary files a/e2e/assets/ledger/ic-nns-init_linux and b/e2e/assets/ledger/ic-nns-init_linux differ diff --git a/e2e/assets/ledger/ic-nns-init_macos b/e2e/assets/ledger/ic-nns-init_macos index ac3c506e99..db4ab9a6f9 100755 Binary files a/e2e/assets/ledger/ic-nns-init_macos and b/e2e/assets/ledger/ic-nns-init_macos differ diff --git a/e2e/assets/ledger/ledger-canister_notify-method.wasm b/e2e/assets/ledger/ledger-canister_notify-method.wasm index fab244234e..cd801aafc8 100644 Binary files a/e2e/assets/ledger/ledger-canister_notify-method.wasm and b/e2e/assets/ledger/ledger-canister_notify-method.wasm differ diff --git a/e2e/assets/ledger/registry-canister.wasm b/e2e/assets/ledger/registry-canister.wasm index 95d54daf17..589f1dbd39 100644 Binary files a/e2e/assets/ledger/registry-canister.wasm and b/e2e/assets/ledger/registry-canister.wasm differ diff --git a/e2e/assets/ledger/root-canister.wasm b/e2e/assets/ledger/root-canister.wasm index ab61896c3d..6b3a4aa58b 100644 Binary files a/e2e/assets/ledger/root-canister.wasm and b/e2e/assets/ledger/root-canister.wasm differ diff --git a/e2e/assets/ledger/sns-wasm-canister.wasm b/e2e/assets/ledger/sns-wasm-canister.wasm index ed0f34336a..2059ec8162 100644 Binary files a/e2e/assets/ledger/sns-wasm-canister.wasm and b/e2e/assets/ledger/sns-wasm-canister.wasm differ diff --git a/e2e/tests-dfx/sns.bash b/e2e/tests-dfx/sns.bash index 08417e8228..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" @@ -76,4 +77,10 @@ SNS_CONFIG_FILE_NAME="sns.yml" install_asset sns/valid dfx sns config validate 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 } diff --git a/nix/sources.json b/nix/sources.json index 3179375a27..3130f995ab 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -15,87 +15,87 @@ "canister-sandbox-x86_64-darwin": { "builtin": false, "description": "The canister-sandbox binary. It must be updated together with the replica binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0i02fimzy8zgwnv67jz15cv6pm88dim12hdxs3qmbg85n41095h8", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1hy7jwwhv0wwb02lfxs6v7cf2jrppbrx01w3il7ghig8kakxqa1m", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/canister_sandbox.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/canister_sandbox.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-darwin/canister_sandbox.gz" }, "canister-sandbox-x86_64-linux": { "builtin": false, "description": "The canister-sandbox binary. It must be updated together with the replica binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0839hm1n9vn6ri3ld88kqkpjmaiwj9xiv1c41abj7mc6zprprgqz", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1h6jr2bn95lcgbldfbgqa5sqs9b54zn44dpqj6nhvbjfrhwrhaca", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/canister_sandbox.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/canister_sandbox.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-linux/canister_sandbox.gz" }, "ic-admin-x86_64-darwin": { "builtin": false, "description": "The ic-admin binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "1na5g9w37mwgxz7mnlz0h0lqg61b46nrvrvz2z761rrgvw1716yd", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "12cbb8hjy3w3l8pyh2ym333gy8qry1ncdcvns0xdzavijv46m3hz", "type": "file", - "url": "https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/nix-release/x86_64-darwin/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/ic-admin.gz", "url_template": "https://download.dfinity.systems/ic//nix-release/x86_64-darwin/ic-admin.gz" }, "ic-admin-x86_64-linux": { "builtin": false, "description": "The ic-admin binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0i2vdsin0pp80aha32x4irxcyp555nlzk31prz4bh5n8sm8zf76x", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "0fx4qa5shisyh11ac575y4qk7rqd08xjfp6448r4mxs66ypji9bc", "type": "file", - "url": "https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/release/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/ic-admin.gz", "url_template": "https://download.dfinity.systems/ic//release/ic-admin.gz" }, "ic-btc-adapter-x86_64-darwin": { "builtin": false, - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "1g73000s659sp68sx1qxmsvvzyjdzn5z7p7xsgq0a23gdma26yh5", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "0cyqk2x8n24fkpv5k7c1cb4p6863sqm99vhkn9k9d35d0rx9kz68", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-btc-adapter.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-darwin/ic-btc-adapter.gz" }, "ic-btc-adapter-x86_64-linux": { "builtin": false, - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "039pj341jx4z6bsyywbkb6y4mnwxljrxrj2k32ydlrdkndl1c276", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "03758z8z3mv466pm1am6xjznfg4j5ggqj25gpqbj4658xr8l31jh", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-btc-adapter.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-linux/ic-btc-adapter.gz" }, "ic-canister-http-adapter-x86_64-darwin": { "builtin": false, - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0ka1484g8qg313milbbrzvs875av59z8mhykjxl2lvci47ddkj05", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1fkkb6rqnj0cnglic3m1dpnj7kfvpk5jnv5ald263wy4mv1srm9i", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-darwin/ic-canister-http-adapter.gz" }, "ic-canister-http-adapter-x86_64-linux": { "builtin": false, - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0i24bj2vw6gza6aa4dw9ia2m5l85cvwjmx4dch9349wxlq046y46", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "0wdc3lsv9kbhm6qy0j8xj4sqjb504rpd24qv1479caah7ld4pk7n", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/ic-canister-http-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-canister-http-adapter.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-linux/ic-canister-http-adapter.gz" }, "ic-nns-init-x86_64-darwin": { "builtin": false, "description": "The ic-nns-init binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "11bb16bzalgy50hgw12zifb426r3s253za9vf61zc8caaj6jaxfd", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1qinw9mcjpqlh2ay8zcqgqzngwdk99dp1mkc72vf15dyxllnv5zp", "type": "file", - "url": "https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/nix-release/x86_64-darwin/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/ic-nns-init.gz", "url_template": "https://download.dfinity.systems/ic//nix-release/x86_64-darwin/ic-nns-init.gz" }, "ic-nns-init-x86_64-linux": { "builtin": false, "description": "The ic-nns-init binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0njxgfn9v1gp79j48gcpzkyhl6m4xp0yv6ikfl4cl7a1xvy3miir", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "0v2xfx6j36h8q5m9pyim5pnpckqxikqlaacybk7j6kc9ybclzr0m", "type": "file", - "url": "https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/release/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/ic-nns-init.gz", "url_template": "https://download.dfinity.systems/ic//release/ic-nns-init.gz" }, "ic-ref-x86_64-darwin": { @@ -118,18 +118,18 @@ }, "ic-starter-x86_64-darwin": { "builtin": false, - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "1p025v66jqxbgqy7kn9psw7cnlq53b8dkyaim7dnyrkv26p84rmj", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1vgjv68pa2003qxglrk6gvldyj11575mr4ymvks9xa1x0ypcz1pa", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/ic-starter.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-starter.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-darwin/ic-starter.gz" }, "ic-starter-x86_64-linux": { "builtin": false, - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0qdy7l3aidwj0zk1mp3kvm0602dd32x7iwxq43d8272p4aamaxv0", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "0vlyf21mdrr7sw4k97gmjjrkwrhinxhl7r4jyv2bng9z45hyddcl", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/ic-starter.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-starter.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-linux/ic-starter.gz" }, "icx-proxy-x86_64-darwin": { @@ -179,55 +179,55 @@ "replica-x86_64-darwin": { "builtin": false, "description": "The replica binary. It must be updated together with the canister-sandbox binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "07ycaigi4vvhs880id80flxcn64da2f6m95lm1f544ndjsqqmxvs", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1rjpcpm2s4mm9zg2c82w297vxjvjg381a779p9qfsivzdgp002vj", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/replica.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/replica.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-darwin/replica.gz" }, "replica-x86_64-linux": { "builtin": false, "description": "The replica binary. It must be updated together with the canister-sandbox binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "1flwd7xd2fy0v3gyrs47qk01mkkyf4m5f37ffdzg66075nf4san8", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "0gidik77y6d2gsr7imyiyad3zhr6xv8f5j60h8h4h507cw31d3rk", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/replica.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/replica.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-linux/replica.gz" }, "sandbox-launcher-x86_64-darwin": { "builtin": false, "description": "The sandbox_launcher binary. It must be updated together with the replica binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "1hl4ikxyna8fd9sbms11384spjrskc4qjbg0qx7fcnbf69wzrazg", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1kmqw198gqmkc5116rda6zy4cfi37ffl5mijnsiv58b2n8bvyp0l", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/sandbox_launcher.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-darwin/sandbox_launcher.gz" }, "sandbox-launcher-x86_64-linux": { "builtin": false, "description": "The sandbox_launcher binary. It must be updated together with the replica binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "0wlny3pg3n5vkicys4c1varn3chlfb41qf4csgddlnix7a5xpf1k", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "01jbn1mzxkdnw662ygskfack750nqv7z23mw8p9gp806h5b1b32i", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/sandbox_launcher.gz", "url_template": "https://download.dfinity.systems/blessed/ic//sdk-release/x86_64-linux/sandbox_launcher.gz" }, "sns-x86_64-darwin": { "builtin": false, "description": "The sns binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "01fin46hxlmal8cxfwmx4l6fn2yr9za7dds7cv75hdw1zcr7r7hb", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "09jgpk5h89vw92456p6vs7f0ayzq3pvjq805a6jr078asz29vlg4", "type": "file", - "url": "https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/nix-release/x86_64-darwin/sns.gz", + "url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/sns.gz", "url_template": "https://download.dfinity.systems/ic//nix-release/x86_64-darwin/sns.gz" }, "sns-x86_64-linux": { "builtin": false, "description": "The sns binary.", - "rev": "9173c5f1b28e140931060b90e9de65b923ee57e6", - "sha256": "01hv2s172v3d4zgwv38yk26dcpr4f11ixd1fdj1992zk32a0mw2l", + "rev": "10c0341032ac00c9728ecefa1e82e919f0f09022", + "sha256": "1pv8zqr0q4ppa4gmvlghnjq28rpgli9b2mx1afx5rkiz7p3hhw4g", "type": "file", - "url": "https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/release/sns.gz", + "url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/sns.gz", "url_template": "https://download.dfinity.systems/ic//release/sns.gz" } } diff --git a/scripts/dfx-asset-sources.sh b/scripts/dfx-asset-sources.sh index d6a1fd8944..005e6b6952 100644 --- a/scripts/dfx-asset-sources.sh +++ b/scripts/dfx-asset-sources.sh @@ -7,48 +7,48 @@ ICX_PROXY_X86_64_DARWIN_SHA256=5783bba5021cf43149bc118789cea29f6462fd97dd78bdb77 ICX_PROXY_X86_64_DARWIN_URL=https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-macos.tar.gz ICX_PROXY_X86_64_LINUX_SHA256=7a5612a1fb7512d22dcd37627a9d626fbc282b172665a832fe2cc2b243789fa1 ICX_PROXY_X86_64_LINUX_URL=https://github.com/dfinity/icx-proxy/releases/download/rev-c312760/binaries-linux.tar.gz -IC_ADMIN_X86_64_DARWIN_SHA256=cd9b7002df2fe760ce177fe79dad212b98872980e0535bcfef8fd733787a45d9 -IC_ADMIN_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/nix-release/x86_64-darwin/ic-admin.gz -IC_ADMIN_X86_64_LINUX_SHA256=dd1cf751d5c816b8c8cf378cf9a92da55ccf7a8ea48ba1a002e85e60a36e5b44 -IC_ADMIN_X86_64_LINUX_URL=https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/release/ic-admin.gz -IC_BTC_ADAPTER_X86_64_DARWIN_SHA256=057a23546d6f0805f0d3fddcf38bfd4dfabfb7ae1d87ae91b93a15a30100e3bc -IC_BTC_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/ic-btc-adapter.gz -IC_BTC_ADAPTER_X86_64_LINUX_SHA256=e6081668b3b365dabc1853c8dcb3a49ddb4abc597371eff5329f7419c890370d -IC_BTC_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/ic-btc-adapter.gz -IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_SHA256=05c8d9da21916d2a6897d3c38a7e2a5b9583f4fe792d1aeb08e361f40822414d -IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz -IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_SHA256=86784300a69d273212648df42af96605d152858a8937a29451ff19be855c4444 -IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/ic-canister-http-adapter.gz -IC_NNS_INIT_X86_64_DARWIN_SHA256=cd75258d548a21f683713ba93f8ad0231b41968b5f04fe2028fe51f597096b85 -IC_NNS_INIT_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/nix-release/x86_64-darwin/ic-nns-init.gz -IC_NNS_INIT_X86_64_LINUX_SHA256=39c63afcee411dca0875339aedc1eda41a0afdfc973d44643af7859dac7b5d5a -IC_NNS_INIT_X86_64_LINUX_URL=https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/release/ic-nns-init.gz -IC_STARTER_X86_64_DARWIN_SHA256=b26682ae117b666fdba951f9d9d01a0553cb0ed737d9793c7eab6369cc2e02dc -IC_STARTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/ic-starter.gz -IC_STARTER_X86_64_LINUX_SHA256=6077559522571c81da20b8f378ba18ad096040dd73dc1ae60792b7a8063dbe61 -IC_STARTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/ic-starter.gz +IC_ADMIN_X86_64_DARWIN_SHA256=1f8e6ac89671abdf3ad076b3c66cf01923ffc618d50be82fa2830f2f215a8b89 +IC_ADMIN_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/ic-admin.gz +IC_ADMIN_X86_64_LINUX_SHA256=6ca528af3746f74a3222c45c273b020de73331f1e514a642805e47a88bc2a43b +IC_ADMIN_X86_64_LINUX_URL=https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/ic-admin.gz +IC_BTC_ADAPTER_X86_64_DARWIN_SHA256=c8fc997a06ad8c9666b213ee942ad6c32073c962819d59f69d8e088bba98d833 +IC_BTC_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-btc-adapter.gz +IC_BTC_ADAPTER_X86_64_LINUX_SHA256=50864151eea8182217beaf0889df2b923c67bfeca6aa50af3164d7f1d147e50c +IC_BTC_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-btc-adapter.gz +IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_SHA256=31d5acc3aec4f36144a3aa6c2bcbbcdbcd23ed6da10e16e9b30c488bb35973ba +IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz +IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_SHA256=f6cc4b1a3d5029960e091b13d16e26a02c8935911d49e0b1a970cdb4351dac71 +IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-canister-http-adapter.gz +IC_NNS_INIT_X86_64_DARWIN_SHA256=f7976d29edbe95e0b6386cd6705b4ab3f1673f7e987de49580145fc96ae236e2 +IC_NNS_INIT_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/ic-nns-init.gz +IC_NNS_INIT_X86_64_LINUX_SHA256=15e44fd9f2894d23cf5c9e2945f18c1d4f76ed2d35fa9b6ac1089a214d775d6c +IC_NNS_INIT_X86_64_LINUX_URL=https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/ic-nns-init.gz +IC_STARTER_X86_64_DARWIN_SHA256=ea86cfae073da89ef4dcd5935ccb292148dfe87e6666fa3a1e00087591d9f2ed +IC_STARTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-starter.gz +IC_STARTER_X86_64_LINUX_SHA256=94b5e661213f3dbbc4f692e44361b711663eb394f59d3409d727e75683709e6e +IC_STARTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-starter.gz MOTOKO_X86_64_DARWIN_SHA256=e651c24b2bde4b3fce6813640114946882cef022e921a4976186273f273bb72a MOTOKO_X86_64_DARWIN_URL=https://github.com/dfinity/motoko/releases/download/0.7.0/motoko-macos-0.7.0.tar.gz MOTOKO_X86_64_LINUX_SHA256=3655796f6bd839b7fc00f00acbff3a340d45d0226d1b07d2a2ae83a0cdc8db8b MOTOKO_X86_64_LINUX_URL=https://github.com/dfinity/motoko/releases/download/0.7.0/motoko-linux64-0.7.0.tar.gz # The replica and canister_sandbox binaries must have the same revision. -REPLICA_X86_64_DARWIN_SHA256=7af78ab196cd12525ca8b4a46a9c508d18cb3a7500b50810d2706f125f54cc1f -REPLICA_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/replica.gz -REPLICA_X86_64_LINUX_SHA256=c82a4d9c2d0718f37e73ee0c572a717ece1ac0c487e8ecdfd8c03bd1fa699cba -REPLICA_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/replica.gz +REPLICA_X86_64_DARWIN_SHA256=720b00ee6b7f47ed70bae91c15d07872cbbe4f125c2026de4fb5122dea6557e6 +REPLICA_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/replica.gz +REPLICA_X86_64_LINUX_SHA256=338f1606670714482082c0c8e2d0ee26c33f9af2d1d778b27ea2197fce8c2d3e +REPLICA_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/replica.gz # The replica and canister_sandbox binaries must have the same revision. -CANISTER_SANDBOX_X86_64_DARWIN_SHA256=08960402b105bd55f1d0bd41116a6c08d56b362be1cb63b6e5ef23ff6b740244 -CANISTER_SANDBOX_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/canister_sandbox.gz -CANISTER_SANDBOX_X86_64_LINUX_SHA256=1fbf7cf3fd86d523970a84851d7b923caa2aefc413a14647ccc6ee6443856920 -CANISTER_SANDBOX_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/canister_sandbox.gz -SANDBOX_LAUNCHER_X86_64_DARWIN_SHA256=efabfc79326e59e64ec7e02d89099b3acbab091a21e8ba746a0e29ebfb8c84c2 -SANDBOX_LAUNCHER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-darwin/sandbox_launcher.gz -SANDBOX_LAUNCHER_X86_64_LINUX_SHA256=33b8db8b3a3d5adadad38c381cc87214b261b3da8111ed599cbbd8f1eef09672 -SANDBOX_LAUNCHER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/sdk-release/x86_64-linux/sandbox_launcher.gz -SNS_X86_64_DARWIN_SHA256=0b9e7c32fb813758ce6647b776d44fd90beb0c25bd72d719a2aad20e0db1d105 -SNS_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/nix-release/x86_64-darwin/sns.gz -SNS_X86_64_LINUX_SHA256=54f00a9418f38b94826c2eb41e4370245fd68c981e8dcddf276d6c7182161b06 -SNS_X86_64_LINUX_URL=https://download.dfinity.systems/ic/9173c5f1b28e140931060b90e9de65b923ee57e6/release/sns.gz +CANISTER_SANDBOX_X86_64_DARWIN_SHA256=3528dca79ae845f80e8d8307d0f3ba374be1d8d946774705589c830d3997c7c3 +CANISTER_SANDBOX_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/canister_sandbox.gz +CANISTER_SANDBOX_X86_64_LINUX_SHA256=8a299839cc4eae0dad91f83642ec2765258d7551f82dd7e87a8c966497c8d2c0 +CANISTER_SANDBOX_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/canister_sandbox.gz +SANDBOX_LAUNCHER_X86_64_DARWIN_SHA256=145cbf17b262a1b2a3b632d6429d3b233a46fc37aa65134261b3e28752e0b8ce +SANDBOX_LAUNCHER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/sandbox_launcher.gz +SANDBOX_LAUNCHER_X86_64_LINUX_SHA256=518c15568106a0fbd245bc0ef1cfc61694339972533f2f8ce1b6cdfe6bb04b06 +SANDBOX_LAUNCHER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/sandbox_launcher.gz +SNS_X86_64_DARWIN_SHA256=e4d19dc4d70a1d90a55105202cf71df87b05dcd1db5c5388487c2704cbbc4f26 +SNS_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/sns.gz +SNS_X86_64_LINUX_SHA256=8f7008c73d3fce5cba53a157b152a4ef6624b0b4f0d15d1f51f7120c32fe68df +SNS_X86_64_LINUX_URL=https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/sns.gz MOTOKO_BASE_URL=https://github.com/dfinity/motoko/releases/download/0.7.0/motoko-base-library.tar.gz MOTOKO_BASE_SHA256=9fbffb7172e62419b1073c0e687adf1212a0fd4aaf387e360cb74cf8053704c4 -REPLICA_REV=9173c5f1b28e140931060b90e9de65b923ee57e6 +REPLICA_REV=10c0341032ac00c9728ecefa1e82e919f0f09022 diff --git a/src/dfx/src/commands/sns/deploy.rs b/src/dfx/src/commands/sns/deploy.rs index 3fd5764864..657b7c7496 100644 --- a/src/dfx/src/commands/sns/deploy.rs +++ b/src/dfx/src/commands/sns/deploy.rs @@ -16,9 +16,10 @@ pub struct DeployOpts {} /// Executes the command line `dfx sns deploy`. pub fn exec(env: &dyn Environment, _opts: DeployOpts) -> DfxResult { + println!("Creating SNS canisters. This typically takes about one minute..."); let config = env.get_config_or_anyhow()?; let path = config.get_project_root().join(sns::CONFIG_FILE_NAME); - deploy_sns(env, &path)?; + println!("{}", deploy_sns(env, &path)?); Ok(()) } 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..be1079003d 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_INDEX: SnsCanisterInstallation = SnsCanisterInstallation { + canister_name: "sns-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_INDEX, ]; /// Test account with well known public & private keys, used in NNS_LEDGER, NNS_DAPP and third party projects. diff --git a/src/dfx/src/lib/sns/deploy.rs b/src/dfx/src/lib/sns/deploy.rs index 06a3dc0227..96f03e720b 100644 --- a/src/dfx/src/lib/sns/deploy.rs +++ b/src/dfx/src/lib/sns/deploy.rs @@ -1,4 +1,5 @@ //! Code for creating an SNS. +use anyhow::bail; use fn_error_context::context; use std::ffi::OsString; use std::path::Path; @@ -10,11 +11,33 @@ use crate::Environment; /// Creates an SNS. This requires funds but no proposal. #[context("Failed to deploy SNS with config: {}", path.display())] pub fn deploy_sns(env: &dyn Environment, path: &Path) -> DfxResult { + // Note: It MAY be possible to get the did file location using existing sdk methods. + let did_file = "candid/nns-sns-wasm.did"; + if !Path::new(did_file).exists() { + bail!("Missing did file at '{did_file}'. Please run 'dfx nns import' to get the file."); + } + + // Note: The --network flag is not available at the moment, + // so this always applies to local canister IDs. + // This will have to be expanded to cover deployments to + // mainnet quite soon. + let canister_ids_file = ".dfx/local/canister_ids.json"; + let args = vec![ OsString::from("deploy"), OsString::from("--init-config-file"), OsString::from(path), + OsString::from("--candid"), + OsString::from(did_file), + OsString::from("--save-to"), + OsString::from(canister_ids_file), ]; - call_bundled(env, "sns", &args) - .map(|stdout| format!("Deployed SNS: {}\n{}", path.display(), stdout)) + call_bundled(env, "sns", &args).map(|stdout| { + format!( + "Deployed SNS:\nSNS config: {}\nCanister ID file: {}\n\n{}", + path.display(), + canister_ids_file, + stdout + ) + }) }