diff --git a/Cargo.lock b/Cargo.lock index 12de2f6927..3634dea744 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=3564b37939f037ba4d051ada88251c13954597d2#3564b37939f037ba4d051ada88251c13954597d2" 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..ba386e59b7 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 = "3564b37939f037ba4d051ada88251c13954597d2" } 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..0fcda4bc8d 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": "3564b37939f037ba4d051ada88251c13954597d2", "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/3564b37939f037ba4d051ada88251c13954597d2/binaries/x86_64-darwin/pocket-ic.gz", + "sha256": "196d073d79fccd221c3154b3552c097becbed9ec14cbaa00a09b9c918827f685", + "rev": "3564b37939f037ba4d051ada88251c13954597d2" } }, "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/3564b37939f037ba4d051ada88251c13954597d2/binaries/x86_64-linux/pocket-ic.gz", + "sha256": "f1be89546b93cfa80e29b97c34fc1d5484da0d4e4487d08863268c9b6e9a3a79", + "rev": "3564b37939f037ba4d051ada88251c13954597d2" } }, "common": {