diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8d20b806ce..915d011b64 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -53,15 +53,15 @@ jobs: matrix: # We build a dynamic-linked linux binary because otherwise HSM support fails with: # Error: IO: Dynamic loading not supported - os: [macos-13-large, ubuntu-20.04, ubuntu-22.04, windows-2022] + os: [macos-13-large, ubuntu-22.04, ubuntu-24.04, windows-2022] include: - os: macos-13-large target: x86_64-apple-darwin binary_path: target/x86_64-apple-darwin/release/dfx - - os: ubuntu-20.04 + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu binary_path: target/x86_64-unknown-linux-gnu/release/dfx - - os: ubuntu-22.04 + - os: ubuntu-24.04 target: x86_64-unknown-linux-gnu binary_path: target/x86_64-unknown-linux-gnu/release/dfx - os: windows-2022 @@ -109,7 +109,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13-large, ubuntu-20.04, ubuntu-22.04] + os: [macos-13-large, ubuntu-22.04, ubuntu-24.04] steps: - uses: actions/checkout@v4 - name: Download dfx binary @@ -182,7 +182,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13-large, ubuntu-20.04, ubuntu-22.04] + os: [macos-13-large, ubuntu-22.04, ubuntu-24.04] steps: - name: Checking out repo uses: actions/checkout@v4 @@ -192,7 +192,7 @@ jobs: python-version: "3.9" - name: Installing playwright run: | - pip install playwright==1.40.0 + pip install playwright==1.50.0 playwright install playwright install-deps - name: Download dfx binary diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e95094effb..9591a8fffc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,7 +36,7 @@ jobs: binary_path: target/x86_64-apple-darwin/release name: x86_64-darwin tar: gtar - - os: ubuntu-20.04 + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu binary_path: target/x86_64-unknown-linux-gnu/release name: x86_64-linux @@ -86,7 +86,7 @@ jobs: - name: Check dynamically-linked libraries (ubuntu) run: | ACTUAL="$(ldd ${{ matrix.binary_path }}/dfx | awk '{ print $1 }' | sort | awk -v d=" " '{s=(NR==1?s:s d)$0}END{printf "%s",s}')" - EXPECTED="/lib64/ld-linux-x86-64.so.2 libc.so.6 libdl.so.2 libgcc_s.so.1 libm.so.6 libpthread.so.0 libstdc++.so.6 linux-vdso.so.1" + EXPECTED="/lib64/ld-linux-x86-64.so.2 libc.so.6 libgcc_s.so.1 libm.so.6 libstdc++.so.6 linux-vdso.so.1" echo "Dynamically-linked libraries:" echo " Actual: $ACTUAL" echo " Expected: $EXPECTED" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0557bcda88..c9f6c9c75c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,8 +29,11 @@ Updated Motoko to [0.14.2](https://github.com/dfinity/motoko/releases/tag/0.14.2 ### Replica -Updated replica to elected commit 2f02a660f6f17b5a78c13d9b372f74c8228f79b8. -This incorporates the following executed proposals: +Updated replica to non-elected commit ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3. + +This includes X_OC_JWT and X_OC_API_KEY cors headers in PocketIC HTTP gateway (see https://github.com/dfinity/ic/pull/4154). + +This also incorporates the following executed proposals up to commit 2f02a660f6f17b5a78c13d9b372f74c8228f79b8: - [135422](https://dashboard.internetcomputer.org/proposal/135422) - [135421](https://dashboard.internetcomputer.org/proposal/135421) diff --git a/Cargo.lock b/Cargo.lock index d9e46d0815..7025d04e07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3149,6 +3149,18 @@ dependencies = [ "thiserror 2.0.11", ] +[[package]] +name = "ic-management-canister-types" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a23527ab5e2ede1aae270cdb79ef0491479c8b5c2de9fd393048ca907cac5e1" +dependencies = [ + "candid", + "candid_parser", + "serde", + "serde_bytes", +] + [[package]] name = "ic-protobuf" version = "0.9.0" @@ -4807,14 +4819,16 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "pocket-ic" -version = "6.0.0" -source = "git+https://github.com/dfinity/ic?rev=2f02a660f6f17b5a78c13d9b372f74c8228f79b8#2f02a660f6f17b5a78c13d9b372f74c8228f79b8" +version = "7.0.0" +source = "git+https://github.com/dfinity/ic?rev=ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3#ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3" dependencies = [ "backoff", "base64 0.13.1", "candid", + "flate2", "hex", "ic-certification 3.0.2", + "ic-management-canister-types", "ic-transport-types 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest", "schemars", diff --git a/e2e/tests-dfx/ledger.bash b/e2e/tests-dfx/ledger.bash index ea5fa40567..3a4f26b9a0 100644 --- a/e2e/tests-dfx/ledger.bash +++ b/e2e/tests-dfx/ledger.bash @@ -5,7 +5,7 @@ load ../utils/_ install_nns() { dfx_start_for_nns_install - dfx extension install nns --version 0.4.3 + dfx extension install nns --version 0.5.0 dfx nns install --ledger-accounts 345f723e9e619934daac6ae0f4be13a7b0ba57d6a608e511a00fd0ded5866752 22ca7edac648b814e81d7946e8bacea99280e07c5f51a04ba7a38009d8ad8e89 5a94fe181e9d411c58726cb87cbf2d016241b6c350bc3330e4869ca76e54ecbc } @@ -158,10 +158,10 @@ tc_to_num() { balance=$(tc_to_num "$(dfx wallet balance)") assert_command dfx ledger top-up "$wallet" --icp 5 - assert_match "Canister was topped up with 617283500000000 cycles" + assert_match "Canister was topped up with 500000000000000 cycles" balance_now=$(tc_to_num "$(dfx wallet balance)") - (( balance_now - balance > 600000000000000 )) + (( balance_now - balance > 400000000000000 )) # Transaction Deduplication t=$(current_time_nanoseconds) @@ -204,7 +204,7 @@ tc_to_num() { dfx_new assert_command dfx canister create e2e_project_backend assert_command dfx ledger top-up e2e_project_backend --amount 5 - assert_contains "Canister was topped up with 617283500000000 cycles" + assert_contains "Canister was topped up with 500000000000000 cycles" } @test "ledger create-canister" { diff --git a/nix/sources.json b/nix/sources.json index 971134f05e..b1304898f5 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -2,71 +2,71 @@ "canister_sandbox-x86_64-darwin": { "builtin": false, "description": "The canister_sandbox binary. It must be updated together with the replica binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "11nygpdlj6d8ac7n1l2xxyq2ynzj213vqk70sxhhj9y8iwd2qjdx", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1ksq6374awgxdr1bw0syv77jwnb076hqgr0grczdsrjng3x26rib", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/canister_sandbox.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/canister_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/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": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "113sq3z2w993cmsrlp7v8dgy5affd8hfnrfh4lymsvqx2f4zznhl", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "008dw013n045xyda7d6640vrb3583gz3l2d7kcpzppjdfaky7x0k", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/canister_sandbox.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/canister_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/canister_sandbox.gz" }, "compiler_sandbox-x86_64-darwin": { "builtin": false, "description": "The compiler_sandbox binary. It must be updated together with the replica binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "0gjkqanfhl2ppbhzqqcwcvyjl93r5h23d88qlfsmv9slgf8acbsf", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1pwrqn7gy8hcdxkm31ri5267yf7iil8b5f734gjbg9kr509b061k", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/compiler_sandbox.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/compiler_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/compiler_sandbox.gz" }, "compiler_sandbox-x86_64-linux": { "builtin": false, "description": "The compiler_sandbox binary. It must be updated together with the replica binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "17yw2vp2nj72rxapcmdsqbck286zpvqv81l8iq376a5xq7l9zrww", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "06ww7skkky6gw55fskdghqrp39l004zpygj1k6zvs575sbc77y29", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/compiler_sandbox.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/compiler_sandbox.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/compiler_sandbox.gz" }, "ic-admin-x86_64-darwin": { "builtin": false, "description": "The ic-admin binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "1layrwg2xs5n74p5p731vrjip7gqrsab1ifv4zcn3plkcwqd30if", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "0prppg5r89mx6mpgp45j1csvbq98s0ls5ch4k7p9lps60zkjlpl8", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-admin.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-admin.gz" }, "ic-admin-x86_64-linux": { "builtin": false, "description": "The ic-admin binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "0aapgwmdwalaqhkcd9q7q4j1mgpcnr6hdmgj0v0pz262nhnnyi95", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1k6hgp0g1mv6z8qmxs7bzsdffbn5mlzda0dvqz9rgi4n4p6918xf", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-admin.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-admin.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-admin.gz" }, "ic-btc-adapter-x86_64-darwin": { "builtin": false, - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "1csd3m0dp8nixzjylcy3cs46g0l2r70kfy5yqpk3lks18wjm2r2c", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1944mx24dvyzw82ibnadyxw8wyy2ncxc3wdqn7phya6f68ykag88", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-btc-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-btc-adapter.gz" }, "ic-btc-adapter-x86_64-linux": { "builtin": false, - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "10l4wh98m3jrp5q60z376x0xd91cwm4yb3h344p6pgk39q69ard6", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1hll2fjvqfxdkzkl69zrvpdi0b8hndhaaj6zzdfh10d1la4y6xqm", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-btc-adapter.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-btc-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-btc-adapter.gz" }, "ic-btc-canister": { @@ -78,52 +78,52 @@ }, "ic-https-outcalls-adapter-x86_64-darwin": { "builtin": false, - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "1r32pzwwj24q6y9mmkvm164ab2sn7g6ni8yw8wzv6i017zibj7nd", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1gig8g6a6kdq1y0nn8spl28zfg38a4fk8w8yx1qq337n22mqjfk5", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-https-outcalls-adapter.gz" }, "ic-https-outcalls-adapter-x86_64-linux": { "builtin": false, - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "1qzcj4la362k7drwqpnb28n7kk7c8hcrapnbl8x7q370ib39r9n3", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1arhhz12hcilqg2wym6f8kjgjw98w42ym9xm0dmz87kdy5wbgfvs", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-https-outcalls-adapter.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-https-outcalls-adapter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-https-outcalls-adapter.gz" }, "ic-nns-init-x86_64-darwin": { "builtin": false, "description": "The ic-nns-init binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "0ns20xifpfhnspd37y4plxmfyz8k59s2ccr5x4nczcl2li2a5czb", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "18qgm7il73zchvxbil5saw7vqi01w74a22901zq7vs8y82419pdd", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-nns-init.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-nns-init.gz" }, "ic-nns-init-x86_64-linux": { "builtin": false, "description": "The ic-nns-init binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "0dxd4l9jxwab1gp9mrr2vc3b5jnmirnbgk6xdxjcfx1w1yn3fkrs", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "0d8k1zykp0n6767jn5z5127y9blhw1jwq9pzjrqrrw6pfdlixacn", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-nns-init.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-nns-init.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-nns-init.gz" }, "ic-starter-x86_64-darwin": { "builtin": false, - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "010fzgjm787g70dskw61m9nh05xh3flcf2g3baqq30as8gs57zyq", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "0dl3gnmfd54y10f6y4d541bq4va822kb739kp1b9lk31jmannk3a", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-starter.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-starter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/ic-starter.gz" }, "ic-starter-x86_64-linux": { "builtin": false, - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "1n3m9mn5j9aq49ak8h10nv3dc5bb6bnva347xsqr9cl4ph3l58bw", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "111nksjh4m7fnafalr0hxbcqhgjqrhxqfzycq6lk2ybffhmyc5k2", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-starter.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-starter.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/ic-starter.gz" }, "motoko-base": { @@ -153,71 +153,71 @@ "version": "0.14.2" }, "pocket-ic-x86_64-darwin": { - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "02lmg0fvibd6x748388q9c8bdjc51xd3bp11gkj68jx0aknnww20", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1k4yj123bf9h4v63cdjx5826589n8v85172zfnynnflzv9as1c7i", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/pocket-ic.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/pocket-ic.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/pocket-ic.gz" }, "pocket-ic-x86_64-linux": { - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "0i2wbw1kvgiph72lalpaimw8pd2ws9r4wjr7nzrr8ld9cry12lkg", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1sp5p0pkvm8sb9fcwyjgi6nfiq3phfb3g5p1wpw87pkjpdri1lks", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/pocket-ic.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/pocket-ic.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/pocket-ic.gz" }, "replica-x86_64-darwin": { "builtin": false, "description": "The replica binary. It must be updated together with the canister_sandbox binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "0id145fzd911jq94hy7azmigk2lcm3pag35j4zw50k6w6y0m94gv", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "06clr34qnssawj24rn9gwcrcrxxyh5b0da1q106m3ksd3sb1hblx", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/replica.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/replica.gz", "url_template": "https://download.dfinity.systems/ic//binaries/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": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "11r6ghai1cfjhndj4aflj6ds6ad9dzvs2iw0yksb8lgnwgx9b86g", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "0266cp5qhw17vcd679g1a9256h2qkvb70hwnvvad5j5dl4y9lrx1", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/replica.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/replica.gz", "url_template": "https://download.dfinity.systems/ic//binaries/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": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "1rkz7kzq91zpgd7yabawgpfqfglyl6f214i3zp7ckg0k78s7b30b", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "13r13bhfw69majr9xv53497z7xxkapzmdpc2nbbmmndn5bjamivs", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/sandbox_launcher.gz", "url_template": "https://download.dfinity.systems/ic//binaries/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": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "09kz23mc2h86zb088zajaqcj8x190l577jykixfgfqa625flr904", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1sbb40v3kmqrrdqhc95530m1jciys577fz6w2hglcd53gzl620cb", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/sandbox_launcher.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/sandbox_launcher.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/sandbox_launcher.gz" }, "sns-x86_64-darwin": { "builtin": false, "description": "The sns binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "0rq0250k2ip3kdm5jv96gk9pqxfagc310sbq5kmwvf5y2i1l9qxy", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1xifdmpdm65qa2iggl9lqly78pgbrqzcjidfqnvxagc6znyiq555", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/sns.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/sns.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-darwin/sns.gz" }, "sns-x86_64-linux": { "builtin": false, "description": "The sns binary.", - "rev": "2f02a660f6f17b5a78c13d9b372f74c8228f79b8", - "sha256": "1b41f7bxncrs9fslag4m1qbwxdxb9vwrp96vd7yvliyv3v9ybhn9", + "rev": "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3", + "sha256": "1hjlpqjismzi8886zp5hcqd0ccs04k7a6rhhxwbqb97ja0by1n0f", "type": "file", - "url": "https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/sns.gz", + "url": "https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/sns.gz", "url_template": "https://download.dfinity.systems/ic//binaries/x86_64-linux/sns.gz" } } diff --git a/scripts/test-uis.py b/scripts/test-uis.py index bb62b4b5ee..a82d84fb49 100644 --- a/scripts/test-uis.py +++ b/scripts/test-uis.py @@ -43,7 +43,9 @@ "Message": "Caller 2vxsx-fae is not allowed to query ic00 method fetch_canister_logs" """.strip(), "/index.js", - ) + ), + ("[JavaScript Warning: \"This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “”", "/"), + ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available", "/index.js") ] _CANDID_UI_ERRORS_TO_IGNORE = [ ("Error", "/index.js") diff --git a/scripts/workflows/e2e-matrix.py b/scripts/workflows/e2e-matrix.py index 95e8a3ba7e..f8b52f989f 100755 --- a/scripts/workflows/e2e-matrix.py +++ b/scripts/workflows/e2e-matrix.py @@ -16,7 +16,7 @@ def test_scripts(prefix): matrix = { "test": test, "backend": ["pocketic", "replica"], - "os": ["macos-13-large", "ubuntu-20.04"], + "os": ["macos-13-large", "ubuntu-22.04"], "exclude": [ { "backend": "pocketic", diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 6526ab86b8..92797f9461 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -86,7 +86,7 @@ os_str_bytes = { version = "6.3.0", features = ["conversions"] } patch = "0.7.0" pem.workspace = true petgraph = "0.6.0" -pocket-ic = { git = "https://github.com/dfinity/ic", rev = "2f02a660f6f17b5a78c13d9b372f74c8228f79b8" } +pocket-ic = { git = "https://github.com/dfinity/ic", rev = "ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3" } rand = "0.8.5" regex = "1.5.5" reqwest = { workspace = true, features = ["blocking", "json"] } diff --git a/src/dfx/assets/dfx-asset-sources.toml b/src/dfx/assets/dfx-asset-sources.toml index 3289970a9a..020618d026 100644 --- a/src/dfx/assets/dfx-asset-sources.toml +++ b/src/dfx/assets/dfx-asset-sources.toml @@ -1,25 +1,25 @@ # generated by write-dfx-asset-sources.sh -replica-rev = '2f02a660f6f17b5a78c13d9b372f74c8228f79b8' +replica-rev = 'ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3' [x86_64-darwin.ic-admin] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-admin.gz' -sha256 = '2e82d1306793de61d927dbc5b094cef89d1b65de619c5b2e39b6e82e1ecf5ed1' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-admin.gz' +sha256 = '885e2ae707465f9aee9904b2a229d028e1b5350bb290fb6e35bd2694cbbb375f' [x86_64-darwin.ic-btc-adapter] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-btc-adapter.gz' -sha256 = '4c64512547414f3ae6c5be7837c1c98282678866c333eae5efd1a2db401d4db3' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-btc-adapter.gz' +sha256 = '083d353d32ce280fefb1b8f1c13ab3c27b8e78f74dd91505e2dfef4644af84a4' [x86_64-darwin.ic-https-outcalls-adapter] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz' -sha256 = 'cd1eb9e23f0144b33f47dca368cd3b568ba5880975cf5a93379808c9f9bf62e4' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-https-outcalls-adapter.gz' +sha256 = '653a89ab10f68c8171e81e71341d51683cf791a057236b810fb84da3cc432fbe' [x86_64-darwin.ic-nns-init] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-nns-init.gz' -sha256 = 'ebb3a244a482b2cf2ce9253326742a137def6aa797f833dad516baeb6207425b' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-nns-init.gz' +sha256 = 'addd1488401ee97df00f2009a1c8e10144bc0f57bad0b8fa86ec8f43e3a90fa3' [x86_64-darwin.ic-starter] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/ic-starter.gz' -sha256 = 'd8ff53f4435a8181b15ae309c7a81bb017006daac1f0a91b38efa053e5fb0e04' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/ic-starter.gz' +sha256 = '6a4c6b5595614c9a56b8338db3a610486d825720a5116f1c089e94e6aa7d8336' [x86_64-darwin.motoko] url = 'https://github.com/dfinity/motoko/releases/download/0.14.2/motoko-Darwin-x86_64-0.14.2.tar.gz' @@ -27,30 +27,30 @@ sha256 = '412c3e1bb6d413c2604f26be65766d0aeb0c13fc7b481ed4185da68316e309d9' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.replica] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/replica.gz' -sha256 = 'fb91548137dc4c50f827b28ca7eea88c8af962fdea7848129621a4f65d21a145' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/replica.gz' +sha256 = '9d2e18961e4dcf510d0838a8065681bef7cc32e32fd94c84e44a6b8bc9c89419' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.canister_sandbox] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/canister_sandbox.gz' -sha256 = 'bd492c1a8fc8270961d7e04cbc4710f25b2fb0ef5dd0600f53a81949db7dde86' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/canister_sandbox.gz' +sha256 = '2b6623fa785666dd3ecb0fe487a13960592ecfd95e03be426efd7145ce3058cf' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.compiler_sandbox] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/compiler_sandbox.gz' -sha256 = '4e2fa6907b54a75db5a318a136042c79242afd669c61fce1ba5750e8acc2533e' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/compiler_sandbox.gz' +sha256 = '3318b0122879a6b7e423e3b8b2108df1387f8c28318751676f0c22ff8ec599df' [x86_64-darwin.sandbox_launcher] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/sandbox_launcher.gz' -sha256 = '0b8c75343a13bcc9cefd2392209ca19e3e87dd7d5c2de54f7bf78784ff3c7fe6' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/sandbox_launcher.gz' +sha256 = '7ac7aae42ab6d95ad7b282dd56ff55b3f7f34f22a3ec9eb2543519eee01a218f' [x86_64-darwin.sns] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/sns.gz' -sha256 = 'bee3444314beb8cdeb2c786910067bca757cd37c266d596a9be3463141110067' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/sns.gz' +sha256 = 'a5141cbdfd863dd5b7c5ae45c93eceeb5d743cc534d1f7a250b898da6e6d2ef6' [x86_64-darwin.pocket-ic] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-darwin/pocket-ic.gz' -sha256 = '40706eed54a04b64e47c21dc355a0f85c9b6104b18a181c8e9a6adb81d78950a' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-darwin/pocket-ic.gz' +sha256 = 'f1b0a055da9f3a6bbd755f9c50d04636a162042a5d3636cc2630b93544909ecc' [x86_64-darwin.motoko-base] url = 'https://github.com/dfinity/motoko/releases/download/0.14.2/motoko-base-library.tar.gz' @@ -61,24 +61,24 @@ url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2 sha256 = '09f5647a45ff6d5d05b2b0ed48613fb2365b5fe6573ba0e901509c39fb9564ac' [x86_64-linux.ic-admin] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-admin.gz' -sha256 = '25456f2db4c2887fc106f2d5064db6ecbe1a24c107a7c626c48a2ade2a7f5729' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-admin.gz' +sha256 = 'aea390cc2596c497d3c7bb01d53eadc52ee79afeebe85e31fa66d7f0c07dd0cc' [x86_64-linux.ic-btc-adapter] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-btc-adapter.gz' -sha256 = 'a665950c4e63be6b2e21038ee549e52ca4d64137677c6070b9598e8a12e48482' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-btc-adapter.gz' +sha256 = '1577e389a2a181005dfbdf48a560b3102d10dbddf92743e79fad3bbca51394c2' [x86_64-linux.ic-https-outcalls-adapter] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-https-outcalls-adapter.gz' -sha256 = 'c3a69cc68ae00c7c3aa2cb5e951944eccc792c12cb5ecc733b5398a12891ece3' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-https-outcalls-adapter.gz' +sha256 = '7abbb778f16d1ef46b03b5a7ea05e12871f9e444ce54cfc5c3343228c28730ab' [x86_64-linux.ic-nns-init] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-nns-init.gz' -sha256 = '3a4f37ac0f3c74c7646fddccb76c8ed5cab206db22e79aee0b4bf12e1325ad37' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-nns-init.gz' +sha256 = '96a91e6973d7f09c7196ff26cc65e090aee48f08e5172b8f39c6823bfd0f1335' [x86_64-linux.ic-starter] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/ic-starter.gz' -sha256 = '7ca14207bc84b294b1ee870cb5ed326b15d6c6b620403455225825596c4d75d8' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/ic-starter.gz' +sha256 = '6216e62b746e7931a9c1cc7f873bcc583e88d9ea1064aa9cb2ee5402a59e3684' [x86_64-linux.motoko] url = 'https://github.com/dfinity/motoko/releases/download/0.14.2/motoko-Linux-x86_64-0.14.2.tar.gz' @@ -86,30 +86,30 @@ sha256 = '7b142760c55b7fc1d599c85c88d793020377ed1db95c2bd1f18fe38713b381bb' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.replica] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/replica.gz' -sha256 = 'cfa095fae3f651b4f4f48047a1f76fa929a39b91d429229b85d2b110157c2687' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/replica.gz' +sha256 = 'a1679a3ca1adc8d2d4de964370d69e5840534452e1a5631adb277088cb65c608' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.canister_sandbox] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/canister_sandbox.gz' -sha256 = '14daff89131d6f5d3d25d065eb206acea9e25f43fb5c9a756523252efec07a84' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/canister_sandbox.gz' +sha256 = '13f4e3a7724ddefb2f9ba7093afe1ba88c953720c6b4a39aef85003b02e00d01' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.compiler_sandbox] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/compiler_sandbox.gz' -sha256 = '9ce79fe8c1bd2873068e8806b4f1bedf2031d9c2ba557655cfe2482bee16dc9f' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/compiler_sandbox.gz' +sha256 = '49f873d8d2e514bdbf99413e7f3f0180a6713386af4ded4ae1cff839a73e9c1b' [x86_64-linux.sandbox_launcher] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/sandbox_launcher.gz' -sha256 = '04a44c5d114661f75c8fd3cb730a052974241956527d84c0fa0641c1ea107f26' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/sandbox_launcher.gz' +sha256 = '8b0161e87fa334461f14dc7c774ed13e32192a18a5240671cb19d73936206be9' [x86_64-linux.sns] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/sns.gz' -sha256 = 'c9c2e5d31edb47bafd69dba49bf94eabb7ce170e953c45b54b3a33dbd77181ac' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/sns.gz' +sha256 = '0ed8e01750f2a48517ef1066a3ce244033061a66b0dc6f1042f1571d25be54c2' [x86_64-linux.pocket-ic] -url = 'https://download.dfinity.systems/ic/2f02a660f6f17b5a78c13d9b372f74c8228f79b8/binaries/x86_64-linux/pocket-ic.gz' -sha256 = '6f52117c66a95194f3b7274b4e72d25cb48b788dea5245c58137be3d035f5c44' +url = 'https://download.dfinity.systems/ic/ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3/binaries/x86_64-linux/pocket-ic.gz' +sha256 = '7ad21073bb72de83f8e5e19637968377e0e8ac894f7ace5c5a1ad53d2fb8e5ea' [x86_64-linux.motoko-base] url = 'https://github.com/dfinity/motoko/releases/download/0.14.2/motoko-base-library.tar.gz'