Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update replica version to cbf9a3bb #2692

Merged
merged 6 commits into from
Oct 17, 2022
Merged

chore: update replica version to cbf9a3bb #2692

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
390cf20
chore: update replica version to cbf9a3bbd63f37f343f5ebc44e88eafff148…
bitdivine Oct 17, 2022
f8e8a42
Merge branch 'master' into chore-update-replica-cbf9a3bbd63f37f343f5e…
bitdivine Oct 17, 2022
3e7b60a
Disable sns tests that are not used yet
bitdivine Oct 17, 2022
a9dd436
Disable sns tests that are not used yet
bitdivine Oct 17, 2022
dcc68ea
CHANGELOG++
bitdivine Oct 17, 2022
ec98708
Merge replica updates
bitdivine Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,13 @@ Changed the text in this case to read:

### Replica

Updated replica to elected commit cbf9a3bbd63f37f343f5ebc44e88eafff1481767.
This incorporates the following executed proposals:

- [86279](https://dashboard.internetcomputer.org/proposal/86279)

ericswanson-dfinity marked this conversation as resolved.
Show resolved Hide resolved
### Replica

Updated replica to release candidate at commit 9173c5f1b28e140931060b90e9de65b923ee57e6.
This release candidate has not yet been elected.

Expand Down
Binary file modified e2e/assets/ledger/cycles-minting-canister.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/genesis-token-canister.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/governance-canister.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/governance-canister_test.wasm
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions e2e/assets/ledger/governance.did
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,10 @@ type Neuron = record {
known_neuron_data : opt KnownNeuronData;
spawn_at_timestamp_seconds : opt nat64;
};
type NeuronBasketConstructionParameters = record {
dissolve_delay_interval_seconds : nat64;
count : nat64;
};
type NeuronId = record { id : nat64 };
type NeuronIdOrSubaccount = variant {
Subaccount : vec nat8;
Expand Down Expand Up @@ -266,6 +270,7 @@ type Operation = variant {
};
type Params = record {
min_participant_icp_e8s : nat64;
neuron_basket_construction_parameters : opt NeuronBasketConstructionParameters;
max_icp_e8s : nat64;
swap_due_timestamp_seconds : nat64;
min_participants : nat32;
Expand Down
Binary file modified e2e/assets/ledger/ic-ckbtc-minter.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/ic-icrc1-ledger.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/ic-nns-init_linux
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/ic-nns-init_macos
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/ledger-canister_notify-method.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/registry-canister.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/root-canister.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified e2e/assets/ledger/sns-wasm-canister.wasm
View file
Open in desktop
Binary file not shown.
23 changes: 10 additions & 13 deletions e2e/tests-dfx/sns.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,19 @@ SNS_CONFIG_FILE_NAME="sns.yml"
dfx start --clean --background --host 127.0.0.1:8080
sleep 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The local entries mentioned and patched on the left are now entered cleanly so we can remove the patchwork.

dfx nns install
# There are no entries for "local" upstream yet, so we need a network mapping.
dfx nns import --network-mapping local=mainnet
# This canister ID is not included upstream .. yet.
jq '.canisters["nns-sns-wasm"].remote.id.local="qaa6y-5yaaa-aaaaa-aaafa-cai"' dfx.json | sponge dfx.json
ls candid
cat dfx.json
dfx nns import --network-mapping local
dfx nns import
dfx sns import
ls candid
cat dfx.json
# Deploy the SNS
install_asset sns/valid
dfx sns config validate
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However a whitelist has been added so we cannot get past this next step:

dfx sns deploy
# The remaining steps don't work any more as a pre-launch whitelist has been added.
#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_governance
#dfx canister id sns_index
#dfx canister id sns_ledger
#dfx canister id sns_root
#dfx canister id sns_swap
}
108 changes: 54 additions & 54 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1hy7jwwhv0wwb02lfxs6v7cf2jrppbrx01w3il7ghig8kakxqa1m",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "016jmmmffh0hmildclsbbdvhf3w3mzkdibvbr8frjdqyllmwbmc2",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/canister_sandbox.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-darwin/canister_sandbox.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/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": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1h6jr2bn95lcgbldfbgqa5sqs9b54zn44dpqj6nhvbjfrhwrhaca",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "0q1q0rnw9imrxknxl2ayhx4vv1iqaisc7j2qs45p610hgz8ymqrx",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/canister_sandbox.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-linux/canister_sandbox.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/sdk-release/x86_64-linux/canister_sandbox.gz"
},
"ic-admin-x86_64-darwin": {
"builtin": false,
"description": "The ic-admin binary.",
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "12cbb8hjy3w3l8pyh2ym333gy8qry1ncdcvns0xdzavijv46m3hz",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "1y039dq2pn28g4jgrbkhs4s41rj96ga4sx27cmmw7p6zcq8q57ck",
"type": "file",
"url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/ic-admin.gz",
"url": "https://download.dfinity.systems/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/nix-release/x86_64-darwin/ic-admin.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/nix-release/x86_64-darwin/ic-admin.gz"
},
"ic-admin-x86_64-linux": {
"builtin": false,
"description": "The ic-admin binary.",
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "0fx4qa5shisyh11ac575y4qk7rqd08xjfp6448r4mxs66ypji9bc",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "0w35m00mlhgqrgdvv7lgm8cy539asvhq32ic8lc5lp3as8rhsdad",
"type": "file",
"url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/ic-admin.gz",
"url": "https://download.dfinity.systems/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/release/ic-admin.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/release/ic-admin.gz"
},
"ic-btc-adapter-x86_64-darwin": {
"builtin": false,
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "0cyqk2x8n24fkpv5k7c1cb4p6863sqm99vhkn9k9d35d0rx9kz68",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "1klnlvmz57fklqfwd3fdjv0ik0d61s82qfi6mwd70jyxppcgs4qw",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-btc-adapter.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-darwin/ic-btc-adapter.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/sdk-release/x86_64-darwin/ic-btc-adapter.gz"
},
"ic-btc-adapter-x86_64-linux": {
"builtin": false,
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "03758z8z3mv466pm1am6xjznfg4j5ggqj25gpqbj4658xr8l31jh",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "0ffqskh1aw4wbj4habzi2if8s9qcyz04l381w6zvfy8j5m01pa7h",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-btc-adapter.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-linux/ic-btc-adapter.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/sdk-release/x86_64-linux/ic-btc-adapter.gz"
},
"ic-canister-http-adapter-x86_64-darwin": {
"builtin": false,
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1fkkb6rqnj0cnglic3m1dpnj7kfvpk5jnv5ald263wy4mv1srm9i",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "0g2bgwy0a5smrshanmi7x62kwdji4bs0z6pgpp4zz9vhdngi4l4f",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz"
},
"ic-canister-http-adapter-x86_64-linux": {
"builtin": false,
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "0wdc3lsv9kbhm6qy0j8xj4sqjb504rpd24qv1479caah7ld4pk7n",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "072s12bj6rsppcg0zb2w6vs3dgf191svzszhm6ybg89y936dfcz2",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-canister-http-adapter.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-linux/ic-canister-http-adapter.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/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": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1qinw9mcjpqlh2ay8zcqgqzngwdk99dp1mkc72vf15dyxllnv5zp",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "1x7wrlcb4wgy98d97nkj6pq10v2z0cijci2rnh4k82a0sh019f5s",
"type": "file",
"url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/ic-nns-init.gz",
"url": "https://download.dfinity.systems/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/nix-release/x86_64-darwin/ic-nns-init.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/nix-release/x86_64-darwin/ic-nns-init.gz"
},
"ic-nns-init-x86_64-linux": {
"builtin": false,
"description": "The ic-nns-init binary.",
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "0v2xfx6j36h8q5m9pyim5pnpckqxikqlaacybk7j6kc9ybclzr0m",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "05ikr9365m9mp2g4nk7hg2yskmpxnmjapclc0hhbj3kjvn3kh5gb",
"type": "file",
"url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/ic-nns-init.gz",
"url": "https://download.dfinity.systems/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/release/ic-nns-init.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/release/ic-nns-init.gz"
},
"ic-ref-x86_64-darwin": {
Expand All @@ -118,18 +118,18 @@
},
"ic-starter-x86_64-darwin": {
"builtin": false,
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1vgjv68pa2003qxglrk6gvldyj11575mr4ymvks9xa1x0ypcz1pa",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "06l4da1i51p56yvyvfs96xaz0rr67n1r5nc2rvl3d32shjg9bsn5",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/ic-starter.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-darwin/ic-starter.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/sdk-release/x86_64-darwin/ic-starter.gz"
},
"ic-starter-x86_64-linux": {
"builtin": false,
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "0vlyf21mdrr7sw4k97gmjjrkwrhinxhl7r4jyv2bng9z45hyddcl",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "143hnjzqjgpprvsk8gd24v9v6jshfyqmiqib3jkq8dz0vkcd9kn6",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/ic-starter.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-linux/ic-starter.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/sdk-release/x86_64-linux/ic-starter.gz"
},
"icx-proxy-x86_64-darwin": {
Expand Down Expand Up @@ -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": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1rjpcpm2s4mm9zg2c82w297vxjvjg381a779p9qfsivzdgp002vj",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "1m79b44gk8qmcadbi9l1cn2v1pzjrf095fnidpdv6l82dy340rc0",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/replica.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-darwin/replica.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/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": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "0gidik77y6d2gsr7imyiyad3zhr6xv8f5j60h8h4h507cw31d3rk",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "0569n3zlrc8c42cwlg8hqrqdc8x7jv94nf1gqy77f07dfcr4h787",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/replica.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-linux/replica.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/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": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1kmqw198gqmkc5116rda6zy4cfi37ffl5mijnsiv58b2n8bvyp0l",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "1sn87iaaw1dv7bcq26dkracvz3f577cvhjv0w4084dwqywi3yyj6",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-darwin/sandbox_launcher.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-darwin/sandbox_launcher.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/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": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "01jbn1mzxkdnw662ygskfack750nqv7z23mw8p9gp806h5b1b32i",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "0mv5nb8nv11lixia98rj5ys0df37bfdgksa0bs9j71dlmb4kf7fw",
"type": "file",
"url": "https://download.dfinity.systems/blessed/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/sdk-release/x86_64-linux/sandbox_launcher.gz",
"url": "https://download.dfinity.systems/blessed/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/sdk-release/x86_64-linux/sandbox_launcher.gz",
"url_template": "https://download.dfinity.systems/blessed/ic/<rev>/sdk-release/x86_64-linux/sandbox_launcher.gz"
},
"sns-x86_64-darwin": {
"builtin": false,
"description": "The sns binary.",
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "09jgpk5h89vw92456p6vs7f0ayzq3pvjq805a6jr078asz29vlg4",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "11vjsygvfckc823xfwmx57igbjsmc74jhnbkm3x1zxsh8bp8dcnw",
"type": "file",
"url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/nix-release/x86_64-darwin/sns.gz",
"url": "https://download.dfinity.systems/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/nix-release/x86_64-darwin/sns.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/nix-release/x86_64-darwin/sns.gz"
},
"sns-x86_64-linux": {
"builtin": false,
"description": "The sns binary.",
"rev": "10c0341032ac00c9728ecefa1e82e919f0f09022",
"sha256": "1pv8zqr0q4ppa4gmvlghnjq28rpgli9b2mx1afx5rkiz7p3hhw4g",
"rev": "cbf9a3bbd63f37f343f5ebc44e88eafff1481767",
"sha256": "0vcr9z8kq8fzikjgz1gwis0gb83r2qijbyn4ly83lifva3n1j4z3",
"type": "file",
"url": "https://download.dfinity.systems/ic/10c0341032ac00c9728ecefa1e82e919f0f09022/release/sns.gz",
"url": "https://download.dfinity.systems/ic/cbf9a3bbd63f37f343f5ebc44e88eafff1481767/release/sns.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/release/sns.gz"
}
}
Loading