diff --git a/CHANGELOG.md b/CHANGELOG.md index cf4b16262e..08f567dd8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -505,9 +505,10 @@ Changed the text in this case to read: ### Replica -Updated replica to elected commit f7e3c96a2be92186718f6a1e67eea37bf3252c00. +Updated replica to elected commit 3e1be1316341811db5c9300935c4236bfab8fa2a. This incorporates the following executed proposals: +- [87631](https://dashboard.internetcomputer.org/proposal/87631) - [86738](https://dashboard.internetcomputer.org/proposal/86738) - [86279](https://dashboard.internetcomputer.org/proposal/86279) * [85007](https://dashboard.internetcomputer.org/proposal/85007) diff --git a/e2e/assets/ledger/cycles-minting-canister.wasm b/e2e/assets/ledger/cycles-minting-canister.wasm index 2b86abbd39..73fb1b9c31 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 f51ad7eb3a..ab2e4e01ff 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 dec6377ab8..055f1e3175 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 ea39a1cbd7..81ae90e939 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 786280aab0..ef4a418ff2 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-nns-init_linux b/e2e/assets/ledger/ic-nns-init_linux index 08de5ab04f..b3b4899bf2 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 85390f6b38..65135df11b 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/registry-canister.wasm b/e2e/assets/ledger/registry-canister.wasm index f53cd112a6..273cef03ff 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 47b621fe06..3ba38ca999 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 5dd267f8a4..341762257b 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/assets/sns/valid/sns.yml b/e2e/assets/sns/valid/sns.yml index 3f66099b2f..d17e5895d4 100644 --- a/e2e/assets/sns/valid/sns.yml +++ b/e2e/assets/sns/valid/sns.yml @@ -1,4 +1,7 @@ description: 'We''ve been making video game games since 2006, we''re based in Toronto' +reward_rate_transition_duration_seconds: 315576000 +initial_reward_rate_percentage: 10.0 +final_reward_rate_percentage: 5.0 fallback_controller_principal_ids: - hpikg-6exdt-jn33w-ndty3-fc7jc-tl2lr-buih3-cs3y7-tftkp-sfp62-gqe initial_token_distribution: @@ -33,4 +36,4 @@ proposal_reject_cost_e8s: 100000000 token_name: "maxs awesome TESAT" token_symbol: TESAT transaction_fee_e8s: 10000 -url: https://nns.ic0.app \ No newline at end of file +url: https://nns.ic0.app diff --git a/nix/sources.json b/nix/sources.json index 27dd30b989..32ce604365 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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "0cb45xzrmm5p54n8ppr40lqbahgrf9rhjl4saca6jg2a8l2b2bmp", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "07d5jf6y6a7kl3s4pgmjs7xsr93cvn6lp56gyr7zxziab81wp1i3", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/canister_sandbox.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "016ydsndy16iwp33j2kc6fn1sasnkcii84rhv65pgnkqgcl28w6q", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "1vyxwlvh59irx0j4rbjdyrj2j7hhhnc1c5552yc0pbmip9xalzkr", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/canister_sandbox.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "1bax4rm900h2cr7lq8lcbsg39ijk4r8in0dvqgp3nz9wj4qd60pp", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0gnd5kws45gn62pif57xd03m65wxrimczi7pjshx303ili1yfgrh", "type": "file", - "url": "https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/nix-release/x86_64-darwin/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "14dbp4n3xnyibhbq7dp25432jaz76381rzhdkn56x560idj0acqz", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0kp4kp8fm2fq4c20qlypcj27wvplfpnba7rvzf0gknwq4hzlc0f2", "type": "file", - "url": "https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/release/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/release/ic-admin.gz", "url_template": "https://download.dfinity.systems/ic//release/ic-admin.gz" }, "ic-btc-adapter-x86_64-darwin": { "builtin": false, - "rev": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "1rsbiyz9bs80511iql4gwvqc3j15k29l4fifcw1wssfqfqzzqwry", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0r3ig6j51qjdz5dap8vaxxsmswwx35b5i2kd6ihsna9b4hdnmqmi", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "0ffqskh1aw4wbj4habzi2if8s9qcyz04l381w6zvfy8j5m01pa7h", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0wccya75dxr8n08kkwgy73awvg6131xa4wcq4dralzw9nwgiz516", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "17d96z1yjcyfx2jd461zfgb2fiaz8s5isjrk8qj2qawwvc2s7xvr", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0jxmlyig5jv3n1f1yynspxn23kgf72bisy3kvzhz01rmici8mp6r", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "072s12bj6rsppcg0zb2w6vs3dgf191svzszhm6ybg89y936dfcz2", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "1a0dz90f36rhbcfg82vlr8qy29bgypn9rfb9kyr9rgjhq5g5c2k1", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/ic-canister-http-adapter.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "1xlpkmq3zv11d0r813w9mj3ywvqm275hb3x5di53djai3w2vw66z", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "196jnry9zmrl60wrmdfpwfl4fz0yhid8ifdqmi15gvfc82aj51j0", "type": "file", - "url": "https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/nix-release/x86_64-darwin/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "05ikr9365m9mp2g4nk7hg2yskmpxnmjapclc0hhbj3kjvn3kh5gb", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0s17mfvj3r5896zgxxb89c9nykjn9ikn51ll0yvf81rw0p0wmjki", "type": "file", - "url": "https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/release/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "0ncf7i9dixi8cgjzjn60nrdbg1vf8vgzjn5ls019ahy7xmwiwa12", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0kkcj7sp54n3g2r606la3mk70l4d9pl6kq6c55cryhdrak2xrddk", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/ic-starter.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "1xdz7ynk0nqvvfmdd2wm8h7nwkpj2s7fzsysa1jhlj9szsqxj75p", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "1rk1qh2mra8pyrly61fbdld3jmchbrsqam1n9638d3h7awhr7vhb", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/ic-starter.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "1c2fy0chv9ja060sn5kypa2z07ciswh01qz21dy6ncwdqvcd8i2i", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "06mvsa9ibj3waj600digpgnipj74lc020lgvvamzzvpqpvwh6hag", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/replica.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "0d37ciw81jbj1g1p32b3xy1s3naiidzysjkb8ik3djl638r3jry5", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "1c71c3zzljdjgbgx85qgijf75ccqv9vm083sidycnrh8m1lrzh27", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/replica.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "1z83g5v664mh25c1c1s2lh6aknja9b8q9swqyi3mig34vs8lw4dy", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "1l9snlc2aylyxyxcbb63p5i3zcglc0hs906qbgz0isbvqlywpwd5", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "0mv5nb8nv11lixia98rj5ys0df37bfdgksa0bs9j71dlmb4kf7fw", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "1fll57vidn1gbvsj0vf3h60m88r3504qz465wdfhl2v9l9a7zd4z", "type": "file", - "url": "https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "0k8ji0l2w9pdwa51gq8yw4pdiikshf2mgg2q5c579pqq5gkh7h98", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "0dghs5jradl5ynbh5lnmrchaw9hjd5az5zp4c2n9cqmsaa3560h4", "type": "file", - "url": "https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/nix-release/x86_64-darwin/sns.gz", + "url": "https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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": "f7e3c96a2be92186718f6a1e67eea37bf3252c00", - "sha256": "0vcr9z8kq8fzikjgz1gwis0gb83r2qijbyn4ly83lifva3n1j4z3", + "rev": "3e1be1316341811db5c9300935c4236bfab8fa2a", + "sha256": "1whfzda1yf6747r0fzr6f65xcxd2sgy6fydc29lsj6qp6sa4611g", "type": "file", - "url": "https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/release/sns.gz", + "url": "https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/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 5a09103550..8ab7e51053 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=f702d330913c7d3beec3bb011b512653c6349e5e8c224c4f660202906a265dad -IC_ADMIN_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/nix-release/x86_64-darwin/ic-admin.gz -IC_ADMIN_X86_64_LINUX_SHA256=1f3305648bc0946e8a9d0dfe1cd030e72b290629e2b683175cd1db3e2cb9ab91 -IC_ADMIN_X86_64_LINUX_URL=https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/release/ic-admin.gz -IC_BTC_ADAPTER_X86_64_DARWIN_SHA256=3e73fc3f76d869cd03672e3a42939825c8c1f0e68f501c432800e995be8f4be7 -IC_BTC_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/ic-btc-adapter.gz -IC_BTC_ADAPTER_X86_64_LINUX_SHA256=f0a81b402d1279b7bfe1010d4ac0f70c278d5c14f12f05895c9c7015e0d4d839 -IC_BTC_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/ic-btc-adapter.gz -IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_SHA256=79f7a305db9c2b2c2446334b1d8b465f4527d6733f18d2a4e8ce33e9c337a99d -IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz -IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_SHA256=e233d7cc483ea1b7bca9f0ebbf7548c1bd36f4365cac0f1ebb57672397085a1c -IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/ic-canister-http-adapter.gz -IC_NNS_INIT_X86_64_DARWIN_SHA256=df18be051f51c9364a6ca58f05cb11156fee87ac898f80326821ec3f709d97f6 -IC_NNS_INIT_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/nix-release/x86_64-darwin/ic-nns-init.gz -IC_NNS_INIT_X86_64_LINUX_SHA256=eb153887dd720eb920048cb2ab64b5fdd6a9bd78f04c4b9eb835d56246ca3316 -IC_NNS_INIT_X86_64_LINUX_URL=https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/release/ic-nns-init.gz -IC_STARTER_X86_64_DARWIN_SHA256=22281e79edc7439502d0b458f9df466e87b75ab6c058f9e56328f6d8523c8e59 -IC_STARTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/ic-starter.gz -IC_STARTER_X86_64_LINUX_SHA256=b71cd9b1fe3a490a6550daebef8e16f24e6e0f44958bd6aadb1b5b30ad3fbff5 -IC_STARTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/ic-starter.gz +IC_ADMIN_X86_64_DARWIN_SHA256=303fe743a47180d1a196f7c4cf6acc9d17530768fd1417af30f615a2f92ccd3e +IC_ADMIN_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/nix-release/x86_64-darwin/ic-admin.gz +IC_ADMIN_X86_64_LINUX_SHA256=c201463f2498dbf980fb3b1fb5ec75f46e7e8464d7530c0423d889ead09de44e +IC_ADMIN_X86_64_LINUX_URL=https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/release/ic-admin.gz +IC_BTC_ADAPTER_X86_64_DARWIN_SHA256=b1e26a1b242b29ab61346d8a5856199d735d75ef6aa3ab5af94de250a4797164 +IC_BTC_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-darwin/ic-btc-adapter.gz +IC_BTC_ADAPTER_X86_64_LINUX_SHA256=26941f1fb7897faa72239871a27a18c1bccdd538fef13911b028f7568ef28c71 +IC_BTC_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-linux/ic-btc-adapter.gz +IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_SHA256=d9dc8a228b3507f0e1df73781d9738eecd216cbfda7a1f5cb063cbf2a2a7b54b +IC_CANISTER_HTTP_ADAPTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-darwin/ic-canister-http-adapter.gz +IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_SHA256=610a565ec150be9cb29f69b99cecf56f25e131ca740bf41c5b309be140fa0da8 +IC_CANISTER_HTTP_ADAPTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-linux/ic-canister-http-adapter.gz +IC_NNS_INIT_X86_64_DARWIN_SHA256=4086229540cced5742acb8b9885a841e7c47a8e3d7b59a393034d79f7cb6d2a4 +IC_NNS_INIT_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/nix-release/x86_64-darwin/ic-nns-init.gz +IC_NNS_INIT_X86_64_LINUX_SHA256=71cacac1053c07e4b607948662674c564e6f134b68f5febe49a8e421b7ab2768 +IC_NNS_INIT_X86_64_LINUX_URL=https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/release/ic-nns-init.gz +IC_STARTER_X86_64_DARWIN_SHA256=b3b5dcc554b9419f5929cce069e84d8d5070661d8a1a60b278c39272f5916c4e +IC_STARTER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-darwin/ic-starter.gz +IC_STARTER_X86_64_LINUX_SHA256=0bee932157078e868649365485755e9055391a6dcb05e369f617a95c05c461e6 +IC_STARTER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-linux/ic-starter.gz MOTOKO_X86_64_DARWIN_SHA256=0fd98250ce7f2c6dbbaa9ccae141ad60d9542bd4e915e0fb4f82a235db666c88 MOTOKO_X86_64_DARWIN_URL=https://github.com/dfinity/motoko/releases/download/0.7.1/motoko-macos-0.7.1.tar.gz MOTOKO_X86_64_LINUX_SHA256=132b13907425d3a7bccf10f48a420140244e663f0b48b200908c295a71a3a3c7 MOTOKO_X86_64_LINUX_URL=https://github.com/dfinity/motoko/releases/download/0.7.1/motoko-linux64-0.7.1.tar.gz # The replica and canister_sandbox binaries must have the same revision. -REPLICA_X86_64_DARWIN_SHA256=5144d4d8c68d336b7c0be2e30020d7911df085ba7e16ab81014aa60d19f04eb0 -REPLICA_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/replica.gz -REPLICA_X86_64_LINUX_SHA256=c56739321a86ca3666446b4aed7f8b51d9a183ef638971c30b72c98078646734 -REPLICA_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/replica.gz +REPLICA_X86_64_DARWIN_SHA256=4f4103f9bef8eeffabdafb512000a3e4c81bedbb2f36008c547cc81593d2bb1a +REPLICA_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-darwin/replica.gz +REPLICA_X86_64_LINUX_SHA256=47c09f69a80866cb7c8b7a205077da98b1729c8c0f17d4df7ab249faff60e1b0 +REPLICA_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-linux/replica.gz # The replica and canister_sandbox binaries must have the same revision. -CANISTER_SANDBOX_X86_64_DARWIN_SHA256=b72eb104454a3c6914539a50097372f941b5300524df8b2c29b7d49a7f2f6431 -CANISTER_SANDBOX_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/canister_sandbox.gz -CANISTER_SANDBOX_X86_64_LINUX_SHA256=d87024287b78da778bd9301314239b562b1dac336c0a39c6e5d104dfac6ede04 -CANISTER_SANDBOX_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/canister_sandbox.gz -SANDBOX_LAUNCHER_X86_64_DARWIN_SHA256=be114e91de64bc5847f498eb84d14a4adaa90ca44207165811b01263767903fd -SANDBOX_LAUNCHER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-darwin/sandbox_launcher.gz -SANDBOX_LAUNCHER_X86_64_LINUX_SHA256=dc1d37c9aab48523935e40e9f99a5b67b806b42f32a3a4628f34846dd1b26557 -SANDBOX_LAUNCHER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/sdk-release/x86_64-linux/sandbox_launcher.gz -SNS_X86_64_DARWIN_SHA256=28c103e72b18df740a2b58bc5785837ac6d82ee11ee1178ae2ed262e2888124d -SNS_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/nix-release/x86_64-darwin/sns.gz -SNS_X86_64_LINUX_SHA256=e31319ec50db453a90a7c4fa25231679a0f5808efc85ffe48cdf213cd14f996d -SNS_X86_64_LINUX_URL=https://download.dfinity.systems/ic/f7e3c96a2be92186718f6a1e67eea37bf3252c00/release/sns.gz +CANISTER_SANDBOX_X86_64_DARWIN_SHA256=2386cb035a2afefe4ff6cf944b8ddd6ca4acfbd1b2be4bf4a0f328e38d93a51d +CANISTER_SANDBOX_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-darwin/canister_sandbox.gz +CANISTER_SANDBOX_X86_64_LINUX_SHA256=797eaa7abab1ae0b9817a514169885101e2964f64dae4c24e839a60237e5ddef +CANISTER_SANDBOX_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-linux/canister_sandbox.gz +SANDBOX_LAUNCHER_X86_64_DARWIN_SHA256=a5f1cb3dc57be908fe5bd880a42160f4b13f62b9c3acc5baef9e7a2518b53ad1 +SANDBOX_LAUNCHER_X86_64_DARWIN_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-darwin/sandbox_launcher.gz +SANDBOX_LAUNCHER_X86_64_LINUX_SHA256=9fb47f54a2690b0a5de3c5908f09282323548181c36d20f55e2fd816f72994ba +SANDBOX_LAUNCHER_X86_64_LINUX_URL=https://download.dfinity.systems/blessed/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/sdk-release/x86_64-linux/sandbox_launcher.gz +SNS_X86_64_DARWIN_SHA256=0402538652ba6296ac60e4fef255691226ae20cbd5d20297f585369565d1f035 +SNS_X86_64_DARWIN_URL=https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/nix-release/x86_64-darwin/sns.gz +SNS_X86_64_LINUX_SHA256=2f04439436171ba96912ac7967fcd3a275d68b71267f07f221c7381f54fb0ef2 +SNS_X86_64_LINUX_URL=https://download.dfinity.systems/ic/3e1be1316341811db5c9300935c4236bfab8fa2a/release/sns.gz MOTOKO_BASE_URL=https://github.com/dfinity/motoko/releases/download/0.7.1/motoko-base-library.tar.gz MOTOKO_BASE_SHA256=efa535dfbf49119f98c3b7fd1c464a7f9f602e7e1d00ce15a7ee2872316c0af1 -REPLICA_REV=f7e3c96a2be92186718f6a1e67eea37bf3252c00 +REPLICA_REV=3e1be1316341811db5c9300935c4236bfab8fa2a diff --git a/scripts/nns-canister.patch b/scripts/nns-canister.patch index a876192743..096ccf40e3 100644 --- a/scripts/nns-canister.patch +++ b/scripts/nns-canister.patch @@ -20,7 +20,7 @@ diff --git a/rs/nns/governance/src/governance.rs b/rs/nns/governance/src/governa index 329e56bef..2f2d8f826 100644 --- a/rs/nns/governance/src/governance.rs +++ b/rs/nns/governance/src/governance.rs -@@ -81,7 +81,7 @@ const MIN_NUMBER_VOTES_FOR_PROPOSAL_RATIO: f64 = 0.03; +@@ -89,7 +89,7 @@ const MIN_NUMBER_VOTES_FOR_PROPOSAL_RATIO: f64 = 0.03; // Parameter of the wait for quiet algorithm. This is the maximum amount the // deadline can be delayed on each vote. @@ -33,18 +33,19 @@ diff --git a/rs/nns/cmc/src/main.rs b/rs/nns/cmc/src/main.rs index 2c02d80dc..5a6072dc7 100644 --- a/rs/nns/cmc/src/main.rs +++ b/rs/nns/cmc/src/main.rs -@@ -106,8 +106,8 @@ impl State { - minting_account_id: None, - authorized_subnets: BTreeMap::new(), - default_subnets: vec![], -- icp_xdr_conversion_rate: None, +@@ -188,7 +188,10 @@ impl Default for State { + timestamp_seconds: 1620633600, // 10 May 2021 10:00:00 AM CEST + xdr_permyriad_per_icp: 1_000_000, // 100 XDR = 1 ICP + }), - average_icp_xdr_conversion_rate: None, -+ icp_xdr_conversion_rate: Some(IcpXdrConversionRate{ timestamp_seconds: 1652443527, xdr_permyriad_per_icp: 60154 }), -+ average_icp_xdr_conversion_rate: Some(IcpXdrConversionRate{ timestamp_seconds: 1652443527, xdr_permyriad_per_icp: 60154 }), ++ average_icp_xdr_conversion_rate: Some(IcpXdrConversionRate { ++ timestamp_seconds: 1620633600, // 10 May 2021 10:00:00 AM CEST ++ xdr_permyriad_per_icp: 1_000_000, // 100 XDR = 1 ICP ++ }), recent_icp_xdr_rates: Some(vec![ IcpXdrConversionRate::default(); - NUM_DAYS_FOR_ICP_XDR_AVERAGE -@@ -320,6 +320,7 @@ fn get_icp_xdr_conversion_rate_() { + ICP_XDR_CONVERSION_RATE_CACHE_SIZE +@@ -634,6 +637,7 @@ fn get_icp_xdr_conversion_rate_() { #[export_name = "canister_update set_icp_xdr_conversion_rate"] fn set_icp_xdr_conversion_rate_() { @@ -52,7 +53,7 @@ index 2c02d80dc..5a6072dc7 100644 let caller = caller(); assert_eq!( -@@ -329,6 +330,7 @@ fn set_icp_xdr_conversion_rate_() { +@@ -643,6 +647,7 @@ fn set_icp_xdr_conversion_rate_() { caller, "set_icp_xdr_conversion_rate" );