From efb2d71cb11e98729f0ac08ceda8b494f42710cb Mon Sep 17 00:00:00 2001 From: raymondk <922020+raymondk@users.noreply.github.com> Date: Tue, 17 Jun 2025 16:30:07 +0000 Subject: [PATCH 1/7] chore: update replica version to ac7ff452684f84ea0cfc3fd0a27228220a368b33 --- Cargo.lock | 202 +++++++++++--------------- src/dfx/Cargo.toml | 2 +- src/dfx/assets/dfx-asset-sources.json | 14 +- 3 files changed, 93 insertions(+), 125 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12de2f6927..2f6960e115 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -522,7 +522,7 @@ dependencies = [ "pbkdf2", "rand_core", "ripemd", - "sha2 0.10.8", + "sha2 0.10.9", "subtle", "zeroize", ] @@ -1609,7 +1609,7 @@ dependencies = [ "serde_bytes", "serde_cbor", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "shell-words", "slog", "slog-async", @@ -1664,7 +1664,7 @@ dependencies = [ "semver", "serde", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "slog", "tar", "tempfile", @@ -2651,16 +2651,21 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.10" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" dependencies = [ + "base64 0.22.1", "bytes", "futures-channel", + "futures-core", "futures-util", "http 1.2.0", "http-body 1.0.1", "hyper 1.6.0", + "ipnet", + "libc", + "percent-encoding", "pin-project-lite", "socket2", "tokio", @@ -2714,7 +2719,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "ic-certification 3.0.2", - "ic-transport-types 0.40.1", + "ic-transport-types", "ic-verify-bls-signature", "k256 0.13.4", "leb128", @@ -2729,7 +2734,7 @@ dependencies = [ "serde_bytes", "serde_cbor", "serde_repr", - "sha2 0.10.8", + "sha2 0.10.9", "simple_asn1", "stop-token", "thiserror 2.0.11", @@ -2764,7 +2769,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "slog", "tempfile", "thiserror 1.0.69", @@ -2871,7 +2876,7 @@ dependencies = [ "miracl_core_bls12381", "nom", "parking_lot 0.12.3", - "sha2 0.10.8", + "sha2 0.10.9", "thiserror 1.0.69", ] @@ -2883,7 +2888,7 @@ dependencies = [ "hex", "serde", "serde_bytes", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -2895,7 +2900,7 @@ dependencies = [ "hex", "serde", "serde_bytes", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -2907,7 +2912,7 @@ dependencies = [ "hex", "serde", "serde_bytes", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -2957,7 +2962,7 @@ dependencies = [ "serde", "serde_bytes", "serde_cbor", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -3011,7 +3016,7 @@ name = "ic-crypto-internal-sha2" version = "0.9.0" source = "git+https://github.com/dfinity/ic.git?rev=1290256484f59c3d950c5e9a098e97383b248ad6#1290256484f59c3d950c5e9a098e97383b248ad6" dependencies = [ - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -3160,7 +3165,7 @@ dependencies = [ "hex", "ic-agent", "pkcs11", - "sha2 0.10.8", + "sha2 0.10.9", "simple_asn1", "thiserror 2.0.11", ] @@ -3198,7 +3203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08ae59483e377cd9aad94ec339ed1d2583b0d5929cab989328dac2d853b2f570" dependencies = [ "leb128", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -3220,7 +3225,7 @@ dependencies = [ "leb128", "log", "nom", - "sha2 0.10.8", + "sha2 0.10.9", "thiserror 1.0.69", "urlencoding", ] @@ -3239,7 +3244,7 @@ dependencies = [ "leb128", "serde", "serde_cbor", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -3272,24 +3277,6 @@ dependencies = [ "wsl", ] -[[package]] -name = "ic-transport-types" -version = "0.39.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979ee7bee5a67150a4c090fb012c93c294a528b4a867bad9a15cc6d01cb4227f" -dependencies = [ - "candid", - "hex", - "ic-certification 3.0.2", - "leb128", - "serde", - "serde_bytes", - "serde_cbor", - "serde_repr", - "sha2 0.10.8", - "thiserror 2.0.11", -] - [[package]] name = "ic-transport-types" version = "0.40.1" @@ -3304,7 +3291,7 @@ dependencies = [ "serde_bytes", "serde_cbor", "serde_repr", - "sha2 0.10.8", + "sha2 0.10.9", "thiserror 2.0.11", ] @@ -3375,7 +3362,7 @@ dependencies = [ "semver", "serde", "serde_bytes", - "sha2 0.10.8", + "sha2 0.10.9", "strum 0.26.3", "strum_macros 0.26.4", "thiserror 2.0.11", @@ -3394,7 +3381,7 @@ dependencies = [ "lazy_static", "pairing 0.23.0", "rand", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -3461,7 +3448,7 @@ dependencies = [ "crc32fast", "data-encoding", "serde", - "sha2 0.10.8", + "sha2 0.10.9", "thiserror 1.0.69", ] @@ -3495,7 +3482,7 @@ dependencies = [ "num-traits", "serde", "serde_bytes", - "sha2 0.10.8", + "sha2 0.10.9", "strum 0.26.3", "strum_macros 0.26.4", "time", @@ -3668,7 +3655,7 @@ dependencies = [ "candid", "candid_parser", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -3750,6 +3737,16 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "is-terminal" version = "0.4.15" @@ -3875,7 +3872,7 @@ dependencies = [ "cfg-if", "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.8", + "sha2 0.10.9", "sha3", ] @@ -3889,7 +3886,7 @@ dependencies = [ "ecdsa 0.16.9", "elliptic-curve 0.13.8", "once_cell", - "sha2 0.10.8", + "sha2 0.10.9", "signature 2.2.0", ] @@ -3963,9 +3960,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.173" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb" [[package]] name = "libdbus-sys" @@ -4529,7 +4526,7 @@ dependencies = [ "ecdsa 0.16.9", "elliptic-curve 0.13.8", "primeorder", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -4748,7 +4745,7 @@ checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", - "sha2 0.10.8", + "sha2 0.10.9", ] [[package]] @@ -4836,8 +4833,8 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "pocket-ic" -version = "9.0.0" -source = "git+https://github.com/dfinity/ic?rev=f195ba756bc3bf170a2888699e5e74101fdac6ba#f195ba756bc3bf170a2888699e5e74101fdac6ba" +version = "9.0.2" +source = "git+https://github.com/dfinity/ic?rev=ac7ff452684f84ea0cfc3fd0a27228220a368b33#ac7ff452684f84ea0cfc3fd0a27228220a368b33" dependencies = [ "backoff", "base64 0.13.1", @@ -4846,14 +4843,14 @@ dependencies = [ "hex", "ic-certification 3.0.2", "ic-management-canister-types", - "ic-transport-types 0.39.3", + "ic-transport-types", "reqwest", "schemars", "serde", "serde_bytes", "serde_cbor", "serde_json", - "sha2 0.10.8", + "sha2 0.10.9", "slog", "strum 0.26.3", "strum_macros 0.26.4", @@ -5259,9 +5256,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.12" +version = "0.12.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" +checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" dependencies = [ "base64 0.22.1", "bytes", @@ -5275,18 +5272,14 @@ dependencies = [ "hyper 1.6.0", "hyper-rustls 0.27.5", "hyper-util", - "ipnet", "js-sys", "log", - "mime", "mime_guess", - "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls 0.23.22", "rustls-native-certs", - "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -5294,17 +5287,16 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-rustls 0.26.1", - "tokio-socks", "tokio-util", "tower", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.8", - "windows-registry", + "webpki-roots 1.0.0", ] [[package]] @@ -5470,15 +5462,6 @@ dependencies = [ "security-framework 3.2.0", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" version = "1.11.0" @@ -5839,9 +5822,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -5989,9 +5972,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", @@ -6382,7 +6365,7 @@ dependencies = [ "pbkdf2", "rand", "rustc-hash 1.1.0", - "sha2 0.10.8", + "sha2 0.10.9", "thiserror 1.0.69", "unicode-normalization", "wasm-bindgen", @@ -6472,18 +6455,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-socks" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" -dependencies = [ - "either", - "futures-util", - "thiserror 1.0.69", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.13" @@ -6529,6 +6500,24 @@ dependencies = [ "tower-service", ] +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags 2.8.0", + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -7051,6 +7040,15 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "webpki-roots" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" @@ -7103,36 +7101,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets", -] - [[package]] name = "windows-sys" version = "0.52.0" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index b40a3c0883..46c1529d9d 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -93,7 +93,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 = "f195ba756bc3bf170a2888699e5e74101fdac6ba" } +pocket-ic = { git = "https://github.com/dfinity/ic", rev = "ac7ff452684f84ea0cfc3fd0a27228220a368b33" } rand = "0.8.5" regex = "1.5.5" reqwest = { workspace = true, features = ["blocking", "json"] } diff --git a/src/dfx/assets/dfx-asset-sources.json b/src/dfx/assets/dfx-asset-sources.json index ef9f798e85..0595f90592 100644 --- a/src/dfx/assets/dfx-asset-sources.json +++ b/src/dfx/assets/dfx-asset-sources.json @@ -1,5 +1,5 @@ { - "replica-rev": "f195ba756bc3bf170a2888699e5e74101fdac6ba", + "replica-rev": "ac7ff452684f84ea0cfc3fd0a27228220a368b33", "x86_64-darwin": { "motoko": { "url": "https://github.com/dfinity/motoko/releases/download/0.14.11/motoko-Darwin-x86_64-0.14.11.tar.gz", @@ -7,9 +7,9 @@ "version": "0.14.11" }, "pocket-ic": { - "url": "https://download.dfinity.systems/ic/f195ba756bc3bf170a2888699e5e74101fdac6ba/binaries/x86_64-darwin/pocket-ic.gz", - "sha256": "c39ed40ee4145aa706af1802628c59c5c3e2a0eeb2bbb684e92a0fa1fb5930e7", - "rev": "f195ba756bc3bf170a2888699e5e74101fdac6ba" + "url": "https://download.dfinity.systems/ic/ac7ff452684f84ea0cfc3fd0a27228220a368b33/binaries/x86_64-darwin/pocket-ic.gz", + "sha256": "392fcc1765d8bfb970dda2ab7fa53a66a938b1c2e16e2d5f0f983d15533f0100", + "rev": "ac7ff452684f84ea0cfc3fd0a27228220a368b33" } }, "x86_64-linux": { @@ -19,9 +19,9 @@ "version": "0.14.11" }, "pocket-ic": { - "url": "https://download.dfinity.systems/ic/f195ba756bc3bf170a2888699e5e74101fdac6ba/binaries/x86_64-linux/pocket-ic.gz", - "sha256": "237272216498074e5250a0685813b96632963ff9abbc51a7030d9b625985028d", - "rev": "f195ba756bc3bf170a2888699e5e74101fdac6ba" + "url": "https://download.dfinity.systems/ic/ac7ff452684f84ea0cfc3fd0a27228220a368b33/binaries/x86_64-linux/pocket-ic.gz", + "sha256": "ca85b6f6d5c9819ab0e24857db8945ed4df58a89168f5e5000e3f9136ceccbc5", + "rev": "ac7ff452684f84ea0cfc3fd0a27228220a368b33" } }, "common": { From 32ad36b977a1cbb12e2f4d528252568321925813 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Tue, 17 Jun 2025 17:15:55 -0700 Subject: [PATCH 2/7] regression in reqwest --- Cargo.lock | 203 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 144 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f6960e115..b57f79a570 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -426,7 +426,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -915,7 +915,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -2285,7 +2285,7 @@ dependencies = [ "cfg-if", "libc", "wasi 0.13.3+wasi-0.2.2", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -2655,7 +2655,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" dependencies = [ - "base64 0.22.1", "bytes", "futures-channel", "futures-core", @@ -2663,9 +2662,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "hyper 1.6.0", - "ipnet", "libc", - "percent-encoding", "pin-project-lite", "socket2", "tokio", @@ -3737,16 +3734,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" -[[package]] -name = "iri-string" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is-terminal" version = "0.4.15" @@ -4598,7 +4585,7 @@ dependencies = [ "libc", "redox_syscall 0.5.8", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -5256,9 +5243,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.20" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" +checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" dependencies = [ "base64 0.22.1", "bytes", @@ -5272,14 +5259,18 @@ dependencies = [ "hyper 1.6.0", "hyper-rustls 0.27.5", "hyper-util", + "ipnet", "js-sys", "log", + "mime", "mime_guess", + "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls 0.23.22", "rustls-native-certs", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -5287,16 +5278,17 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-rustls 0.26.1", + "tokio-socks", "tokio-util", "tower", - "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.0", + "webpki-roots 0.26.8", + "windows-registry", ] [[package]] @@ -5462,6 +5454,15 @@ dependencies = [ "security-framework 3.2.0", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" version = "1.11.0" @@ -6455,6 +6456,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror 1.0.69", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.13" @@ -6500,24 +6513,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "tower-http" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" -dependencies = [ - "bitflags 2.8.0", - "bytes", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "iri-string", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.3" @@ -7040,15 +7035,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "which" version = "4.4.2" @@ -7098,7 +7084,42 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.53.2", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +dependencies = [ + "windows-link", ] [[package]] @@ -7107,7 +7128,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -7116,7 +7137,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -7125,14 +7146,30 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", ] [[package]] @@ -7141,48 +7178,96 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.7.0" From 01df29a5fd6a2564b281f05a090efe26b2713eba Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Tue, 17 Jun 2025 18:07:58 -0700 Subject: [PATCH 3/7] pocketic now returns 503 for bad response certification --- e2e/tests-dfx/assetscanister.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/tests-dfx/assetscanister.bash b/e2e/tests-dfx/assetscanister.bash index 0a32e774c9..1f94578b9c 100644 --- a/e2e/tests-dfx/assetscanister.bash +++ b/e2e/tests-dfx/assetscanister.bash @@ -747,7 +747,7 @@ check_permission_failure() { # fails with because %e6 is not valid utf-8 percent encoding assert_command_fail curl --fail -vv http://localhost:"$PORT"/%e6?canisterId="$ID" - assert_contains "500 Internal Server Error" + assert_contains "503 Service Unavailable" } @test "http_request percent-decodes urls" { @@ -817,7 +817,7 @@ check_permission_failure() { assert_command_fail curl --fail -vv http://localhost:"$PORT"/%e6?canisterId="$ID" # fails because %e6 is not valid utf-8 percent encoding - assert_contains "500 Internal Server Error" + assert_contains "503 Service Unavailable" assert_command curl --fail -vv http://localhost:"$PORT"/%25?canisterId="$ID" assert_match "200 OK" "$stderr" @@ -1640,7 +1640,7 @@ EOF # However, due to returning the wrong certificate, it fails with Err(InvalidResponseHashes) # see https://dfinity.atlassian.net/browse/SDK-1246 - assert_contains "500 Internal Server Error" + assert_contains "503 Service Unavailable" assert_command dfx canister call e2e_project_frontend set_asset_properties '( record { key="/test_alias_file.html"; is_aliased=opt(opt(true)) })' @@ -1687,7 +1687,7 @@ EOF # again see # see https://dfinity.atlassian.net/browse/SDK-1246, this should be 404 # assert_match "404 Not Found" "$stderr" - assert_contains "500 Internal Server Error" + assert_contains "503 Service Unavailable" assert_command curl --fail -vv http://localhost:"$PORT"/index_test?canisterId="$ID" assert_match "200 OK" "$stderr" From 0f838fc05e0113baeab70c00269534cf97658b70 Mon Sep 17 00:00:00 2001 From: Raymond Khalife Date: Wed, 18 Jun 2025 14:53:31 -0400 Subject: [PATCH 4/7] chore: bump nns extension version --- e2e/tests-dfx/cycles-ledger.bash | 2 +- e2e/tests-dfx/extension.bash | 2 +- e2e/tests-dfx/ledger.bash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/tests-dfx/cycles-ledger.bash b/e2e/tests-dfx/cycles-ledger.bash index b20029153d..0465da8832 100644 --- a/e2e/tests-dfx/cycles-ledger.bash +++ b/e2e/tests-dfx/cycles-ledger.bash @@ -25,7 +25,7 @@ teardown() { start_and_install_nns() { dfx_start_for_nns_install - dfx extension install nns --version 0.5.1 + dfx extension install nns --version 0.5.3 dfx nns install --ledger-accounts "$(dfx ledger account-id --identity cycle-giver)" } diff --git a/e2e/tests-dfx/extension.bash b/e2e/tests-dfx/extension.bash index 60172fd868..6a9d7ca14e 100644 --- a/e2e/tests-dfx/extension.bash +++ b/e2e/tests-dfx/extension.bash @@ -184,7 +184,7 @@ EOF } EOF - dfx extension install nns --version 0.5.1 + dfx extension install nns --version 0.5.3 dfx nns install } diff --git a/e2e/tests-dfx/ledger.bash b/e2e/tests-dfx/ledger.bash index f8441ef6b0..521f402def 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.5.1 + dfx extension install nns --version 0.5.3 dfx nns install --ledger-accounts 345f723e9e619934daac6ae0f4be13a7b0ba57d6a608e511a00fd0ded5866752 22ca7edac648b814e81d7946e8bacea99280e07c5f51a04ba7a38009d8ad8e89 5a94fe181e9d411c58726cb87cbf2d016241b6c350bc3330e4869ca76e54ecbc } From c987c1c4264fa6f165aa14c658bded0821ac07b0 Mon Sep 17 00:00:00 2001 From: Raymond Khalife Date: Thu, 19 Jun 2025 12:37:03 -0400 Subject: [PATCH 5/7] bump the version of the nns extension --- e2e/tests-dfx/cycles-ledger.bash | 2 +- e2e/tests-dfx/extension.bash | 2 +- e2e/tests-dfx/ledger.bash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/tests-dfx/cycles-ledger.bash b/e2e/tests-dfx/cycles-ledger.bash index 0465da8832..8b4f6e6d28 100644 --- a/e2e/tests-dfx/cycles-ledger.bash +++ b/e2e/tests-dfx/cycles-ledger.bash @@ -25,7 +25,7 @@ teardown() { start_and_install_nns() { dfx_start_for_nns_install - dfx extension install nns --version 0.5.3 + dfx extension install nns --version 0.5.4 dfx nns install --ledger-accounts "$(dfx ledger account-id --identity cycle-giver)" } diff --git a/e2e/tests-dfx/extension.bash b/e2e/tests-dfx/extension.bash index 6a9d7ca14e..277fae451a 100644 --- a/e2e/tests-dfx/extension.bash +++ b/e2e/tests-dfx/extension.bash @@ -184,7 +184,7 @@ EOF } EOF - dfx extension install nns --version 0.5.3 + dfx extension install nns --version 0.5.4 dfx nns install } diff --git a/e2e/tests-dfx/ledger.bash b/e2e/tests-dfx/ledger.bash index 521f402def..361d591691 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.5.3 + dfx extension install nns --version 0.5.4 dfx nns install --ledger-accounts 345f723e9e619934daac6ae0f4be13a7b0ba57d6a608e511a00fd0ded5866752 22ca7edac648b814e81d7946e8bacea99280e07c5f51a04ba7a38009d8ad8e89 5a94fe181e9d411c58726cb87cbf2d016241b6c350bc3330e4869ca76e54ecbc } From f422af1fe2da5eb1129ce48cda31a3adcbd7d1e2 Mon Sep 17 00:00:00 2001 From: Raymond Khalife Date: Thu, 19 Jun 2025 15:42:06 -0400 Subject: [PATCH 6/7] update changelog --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 612f5852a4..a9b276d6a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,19 @@ You can get the fees by `get_config` API on the [BTC Mainnet Canister](https://d If you were using the contents of the `pocket-ic-proxy-port` file to determine the port for the `/http_gateway` endpoint, you should instead use `dfx info pocketic-config-port` +## Dependencies + +### Replica + +Updated replica to elected commit ac7ff452684f84ea0cfc3fd0a27228220a368b33. +This incorporates the following executed proposals: + +- [136982](https://dashboard.internetcomputer.org/proposal/136982) +- [136887](https://dashboard.internetcomputer.org/proposal/136887) +- [136789](https://dashboard.internetcomputer.org/proposal/136789) +- [136731](https://dashboard.internetcomputer.org/proposal/136731) +- [136567](https://dashboard.internetcomputer.org/proposal/136567) + # 0.27.0 ### feat!: remove the 'native' replica From a01d9f6d265ce01fcad0d71e0face7bb74f9da8f Mon Sep 17 00:00:00 2001 From: raymondk Date: Thu, 19 Jun 2025 15:53:51 -0400 Subject: [PATCH 7/7] Update CHANGELOG.md This commit is not elected --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9b276d6a7..0b5453399c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,7 +40,7 @@ the `/http_gateway` endpoint, you should instead use `dfx info pocketic-config-p ### Replica -Updated replica to elected commit ac7ff452684f84ea0cfc3fd0a27228220a368b33. +Updated replica to commit ac7ff452684f84ea0cfc3fd0a27228220a368b33. This incorporates the following executed proposals: - [136982](https://dashboard.internetcomputer.org/proposal/136982)