From c6cb03387c74855a579e7aa924f93ae480998851 Mon Sep 17 00:00:00 2001 From: Conner Swann <2635475+yourbuddyconner@users.noreply.github.com> Date: Mon, 20 Jan 2025 22:01:21 -0800 Subject: [PATCH 1/6] upgrade sp1 to v4 --- Cargo.lock | 1235 ++++++++---- Cargo.toml | 2 +- src/sp1.rs | 1 + workspaces/base_files/sp1/cargo_guest | 2 +- workspaces/base_files/sp1/cargo_host | 14 +- workspaces/sp1/program/Cargo.lock | 243 ++- workspaces/sp1/program/Cargo.toml | 2 +- workspaces/sp1/script/Cargo.lock | 2516 +++++++++++-------------- workspaces/sp1/script/Cargo.toml | 12 +- 9 files changed, 2220 insertions(+), 1807 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6802492..6f8c814 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,7 +77,7 @@ source = "git+https://github.com/yetanotherco/aligned_layer?tag=v0.10.2#1f458901 dependencies = [ "ciborium", "dialoguer", - "ethers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers", "futures-util", "hex", "lambdaworks-crypto", @@ -97,25 +97,166 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "alloy-consensus" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88e1edea70787c33e11197d3f32ae380f3db19e6e061e539a5bcf8184a6b326" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-trie", + "auto_impl", + "c-kzg", + "derive_more", + "serde", +] + +[[package]] +name = "alloy-consensus-any" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b1bb53f40c0273cd1975573cd457b39213e68584e36d1401d25fd0398a1d65" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c986539255fb839d1533c128e190e557e52ff652c9ef62939e233a81dd93f7e" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more", + "serde", +] + +[[package]] +name = "alloy-eips" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9fadfe089e9ccc0650473f2d4ef0a28bc015bbca5631d9f0f09e49b557fdb3" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "c-kzg", + "derive_more", + "once_cell", + "serde", + "sha2", +] + +[[package]] +name = "alloy-json-abi" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24acd2f5ba97c7a320e67217274bc81fe3c3174b8e6144ec875d9d54e760e278" +dependencies = [ + "alloy-primitives", + "alloy-sol-type-parser", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e29040b9d5fe2fb70415531882685b64f8efd08dfbd6cc907120650504821105" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror 2.0.9", + "tracing", +] + +[[package]] +name = "alloy-network" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510cc00b318db0dfccfdd2d032411cfae64fc144aef9679409e014145d3dacc4" +dependencies = [ + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-any", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror 2.0.9", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9081c099e798b8a2bba2145eb82a9a146f01fc7a35e9ab6e7b43305051f97550" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-primitives" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4" +checksum = "ec878088ec6283ce1e90d280316aadd3d6ce3de06ff63d68953c855e7e447e92" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more 0.99.18", - "hex-literal", + "derive_more", + "foldhash", + "hashbrown 0.15.2", + "indexmap 2.7.0", "itoa", "k256", "keccak-asm", + "paste", "proptest", "rand", "ruint", + "rustc-hash 2.1.0", "serde", + "sha3", "tiny-keccak", ] @@ -125,19 +266,103 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f542548a609dca89fcd72b3b9f355928cf844d4363c5eed9c5273a3dd225e097" dependencies = [ + "alloy-rlp-derive", "arrayvec", "bytes", ] +[[package]] +name = "alloy-rlp-derive" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", +] + +[[package]] +name = "alloy-rpc-types-any" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed98e1af55a7d856bfa385f30f63d8d56be2513593655c904a8f4a7ec963aa3e" +dependencies = [ + "alloy-consensus-any", + "alloy-rpc-types-eth", + "alloy-serde", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8737d7a6e37ca7bba9c23e9495c6534caec6760eb24abc9d5ffbaaba147818e1" +dependencies = [ + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "derive_more", + "itertools 0.13.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851bf8d5ad33014bd0c45153c603303e730acc8a209450a7ae6b4a12c2789e2" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-signer" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e10ca565da6500cca015ba35ee424d59798f2e1b85bc0dd8f81dafd401f029a" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror 2.0.9", +] + +[[package]] +name = "alloy-signer-local" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47fababf5a745133490cde927d48e50267f97d3d1209b9fc9f1d1d666964d172" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "async-trait", + "k256", + "rand", + "thiserror 2.0.9", +] + [[package]] name = "alloy-sol-macro" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" +checksum = "8d039d267aa5cbb7732fa6ce1fd9b5e9e29368f580f80ba9d7a8450c794de4b2" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.95", @@ -145,15 +370,15 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" +checksum = "620ae5eee30ee7216a38027dec34e0585c55099f827f92f50d11e3d2d3a4a954" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap", - "proc-macro-error", + "indexmap 2.7.0", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.95", @@ -163,9 +388,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" +checksum = "ad9f7d057e00f8c5994e4ff4492b76532c51ead39353aa2ed63f8c50c0f4d52e" dependencies = [ "const-hex", "dunce", @@ -176,18 +401,45 @@ dependencies = [ "syn-solidity", ] +[[package]] +name = "alloy-sol-type-parser" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74e60b084fe1aef8acecda2743ff2d93c18ff3eb67a2d3b12f62582a1e66ef5e" +dependencies = [ + "serde", + "winnow 0.6.22", +] + [[package]] name = "alloy-sol-types" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" +checksum = "c1382302752cd751efd275f4d6ef65877ddf61e0e6f5ac84ef4302b79a33a31a" dependencies = [ + "alloy-json-abi", "alloy-primitives", "alloy-sol-macro", "const-hex", "serde", ] +[[package]] +name = "alloy-trie" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6917c79e837aa7b77b7a6dae9f89cbe15313ac161c4d3cfaf8909ef21f3d22d8" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "arrayvec", + "derive_more", + "nybbles", + "serde", + "smallvec", + "tracing", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -512,6 +764,9 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "ascii-canvas" @@ -522,6 +777,28 @@ dependencies = [ "term", ] +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "async-trait" version = "0.1.84" @@ -595,7 +872,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.2", "tokio", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -622,6 +899,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -762,19 +1053,6 @@ dependencies = [ "constant_time_eq 0.3.1", ] -[[package]] -name = "blake3" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq 0.3.1", -] - [[package]] name = "block" version = "0.1.6" @@ -803,6 +1081,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "blst" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" +dependencies = [ + "cc", + "glob", + "threadpool", + "zeroize", +] + [[package]] name = "bonsai-sdk" version = "1.2.0" @@ -916,6 +1206,21 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "c-kzg" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" +dependencies = [ + "blst", + "cc", + "glob", + "hex", + "libc", + "once_cell", + "serde", +] + [[package]] name = "camino" version = "1.1.9" @@ -948,6 +1253,25 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cbindgen" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" +dependencies = [ + "clap", + "heck 0.4.1", + "indexmap 2.7.0", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 2.0.95", + "tempfile", + "toml", +] + [[package]] name = "cc" version = "1.2.7" @@ -1185,16 +1509,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] -name = "convert_case" -version = "0.4.0" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "core-foundation" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ "core-foundation-sys", "libc", @@ -1213,7 +1541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "libc", ] @@ -1235,6 +1563,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -1297,6 +1634,16 @@ dependencies = [ "cipher", ] +[[package]] +name = "ctrlc" +version = "3.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +dependencies = [ + "nix", + "windows-sys 0.59.0", +] + [[package]] name = "darling" version = "0.20.10" @@ -1423,6 +1770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", + "pem-rfc7468", "zeroize", ] @@ -1446,19 +1794,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.1", - "syn 2.0.95", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -1477,6 +1812,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.95", + "unicode-xid", ] [[package]] @@ -1578,6 +1914,20 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "downloader" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac1e888d6830712d565b2f3a974be3200be9296bc1b03db8251a4cbf18a4a34" +dependencies = [ + "digest 0.10.7", + "futures", + "rand", + "reqwest 0.12.12", + "thiserror 1.0.69", + "tokio", +] + [[package]] name = "dunce" version = "1.0.5" @@ -1632,6 +1982,7 @@ dependencies = [ "ff 0.13.0", "generic-array 0.14.7", "group 0.13.0", + "pem-rfc7468", "pkcs8", "rand_core", "sec1", @@ -1811,87 +2162,42 @@ dependencies = [ "uint", ] -[[package]] -name = "ethers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0" -dependencies = [ - "ethers-addressbook 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-contract 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-middleware 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-providers 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-signers 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ethers" version = "2.0.14" source = "git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections#69bba841ff352cf27b014d4fbb7985a180d88e25" dependencies = [ - "ethers-addressbook 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-contract 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-addressbook", + "ethers-contract", + "ethers-core", "ethers-etherscan", - "ethers-middleware 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-providers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-signers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-middleware", + "ethers-providers", + "ethers-signers", "ethers-solc", ] -[[package]] -name = "ethers-addressbook" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759" -dependencies = [ - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "once_cell", - "serde", - "serde_json", -] - [[package]] name = "ethers-addressbook" version = "2.0.14" source = "git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections#69bba841ff352cf27b014d4fbb7985a180d88e25" dependencies = [ - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-core", "once_cell", "serde", "serde_json", ] -[[package]] -name = "ethers-contract" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa" -dependencies = [ - "const-hex", - "ethers-contract-abigen 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-contract-derive 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-providers 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util", - "once_cell", - "pin-project", - "serde", - "serde_json", - "thiserror 1.0.69", -] - [[package]] name = "ethers-contract" version = "2.0.14" source = "git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections#69bba841ff352cf27b014d4fbb7985a180d88e25" dependencies = [ "const-hex", - "ethers-contract-abigen 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-contract-derive 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-providers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-contract-abigen", + "ethers-contract-derive", + "ethers-core", + "ethers-providers", "futures-util", "once_cell", "pin-project", @@ -1900,28 +2206,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "ethers-contract-abigen" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b" -dependencies = [ - "Inflector", - "const-hex", - "dunce", - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "eyre", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "serde", - "serde_json", - "syn 2.0.95", - "toml", - "walkdir", -] - [[package]] name = "ethers-contract-abigen" version = "2.0.14" @@ -1930,7 +2214,7 @@ dependencies = [ "Inflector", "const-hex", "dunce", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-core", "ethers-etherscan", "eyre", "prettyplease", @@ -1945,22 +2229,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "ethers-contract-derive" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f" -dependencies = [ - "Inflector", - "const-hex", - "ethers-contract-abigen 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2", - "quote", - "serde_json", - "syn 2.0.95", -] - [[package]] name = "ethers-contract-derive" version = "2.0.14" @@ -1968,44 +2236,14 @@ source = "git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reco dependencies = [ "Inflector", "const-hex", - "ethers-contract-abigen 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-contract-abigen", + "ethers-core", "proc-macro2", "quote", "serde_json", "syn 2.0.95", ] -[[package]] -name = "ethers-core" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" -dependencies = [ - "arrayvec", - "bytes", - "cargo_metadata", - "chrono", - "const-hex", - "elliptic-curve", - "ethabi", - "generic-array 0.14.7", - "k256", - "num_enum 0.7.3", - "once_cell", - "open-fastrlp", - "rand", - "rlp", - "serde", - "serde_json", - "strum", - "syn 2.0.95", - "tempfile", - "thiserror 1.0.69", - "tiny-keccak", - "unicode-xid", -] - [[package]] name = "ethers-core" version = "2.0.14" @@ -2041,7 +2279,7 @@ version = "2.0.14" source = "git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections#69bba841ff352cf27b014d4fbb7985a180d88e25" dependencies = [ "chrono", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-core", "reqwest 0.11.27", "semver 1.0.24", "serde", @@ -2050,32 +2288,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "ethers-middleware" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de" -dependencies = [ - "async-trait", - "auto_impl", - "ethers-contract 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-providers 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ethers-signers 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-channel", - "futures-locks", - "futures-util", - "instant", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "tracing-futures", - "url", -] - [[package]] name = "ethers-middleware" version = "2.0.14" @@ -2083,11 +2295,11 @@ source = "git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reco dependencies = [ "async-trait", "auto_impl", - "ethers-contract 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-contract", + "ethers-core", "ethers-etherscan", - "ethers-providers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", - "ethers-signers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-providers", + "ethers-signers", "futures-channel", "futures-locks", "futures-util", @@ -2102,42 +2314,6 @@ dependencies = [ "url", ] -[[package]] -name = "ethers-providers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2" -dependencies = [ - "async-trait", - "auto_impl", - "base64 0.21.7", - "bytes", - "const-hex", - "enr", - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core", - "futures-timer", - "futures-util", - "hashers", - "http 0.2.12", - "instant", - "jsonwebtoken", - "once_cell", - "pin-project", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "tracing-futures", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "ws_stream_wasm", -] - [[package]] name = "ethers-providers" version = "2.0.14" @@ -2149,7 +2325,7 @@ dependencies = [ "bytes", "const-hex", "enr", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-core", "futures-channel", "futures-core", "futures-timer", @@ -2175,25 +2351,6 @@ dependencies = [ "ws_stream_wasm", ] -[[package]] -name = "ethers-signers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2" -dependencies = [ - "async-trait", - "coins-bip32", - "coins-bip39", - "const-hex", - "elliptic-curve", - "eth-keystore", - "ethers-core 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "rand", - "sha2", - "thiserror 1.0.69", - "tracing", -] - [[package]] name = "ethers-signers" version = "2.0.14" @@ -2205,7 +2362,7 @@ dependencies = [ "const-hex", "elliptic-curve", "eth-keystore", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-core", "rand", "sha2", "thiserror 1.0.69", @@ -2221,7 +2378,7 @@ dependencies = [ "const-hex", "dirs", "dunce", - "ethers-core 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers-core", "glob", "home", "md-5", @@ -2537,6 +2694,12 @@ dependencies = [ "slab", ] +[[package]] +name = "futures-utils-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" + [[package]] name = "fxhash" version = "0.2.1" @@ -2565,9 +2728,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb8bc4c28d15ade99c7e90b219f30da4be5c88e586277e8cbe886beeb868ab2" +checksum = "96512db27971c2c3eece70a1e106fbe6c87760234e31e8f7e5634912fe52794a" dependencies = [ "serde", "typenum", @@ -2658,7 +2821,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2677,7 +2840,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.2.0", - "indexmap", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2717,6 +2880,12 @@ dependencies = [ "rayon", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.13.2" @@ -2746,6 +2915,7 @@ dependencies = [ "allocator-api2", "equivalent", "foldhash", + "serde", ] [[package]] @@ -2780,6 +2950,9 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] [[package]] name = "hex-literal" @@ -2957,32 +3130,29 @@ dependencies = [ ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-timeout" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "bytes", - "hyper 0.14.32", - "native-tls", + "hyper 1.5.2", + "hyper-util", + "pin-project-lite", "tokio", - "tokio-native-tls", + "tower-service", ] [[package]] name = "hyper-tls" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.5.2", - "hyper-util", +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.32", "native-tls", "tokio", "tokio-native-tls", - "tower-service", ] [[package]] @@ -3216,6 +3386,16 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.7.0" @@ -3224,6 +3404,7 @@ checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2", + "serde", ] [[package]] @@ -3692,7 +3873,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -3703,6 +3884,18 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -3934,6 +4127,17 @@ dependencies = [ "libloading 0.7.4", ] +[[package]] +name = "nybbles" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307" +dependencies = [ + "const-hex", + "serde", + "smallvec", +] + [[package]] name = "objc" version = "0.2.7" @@ -4039,11 +4243,23 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + [[package]] name = "p3-air" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066f571b2e645505ed5972dd0e1e252ba03352150830c9566769ca711c0f1e9b" +checksum = "02634a874a2286b73f3e0a121e79d6774e92ccbec648c5568f4a7479a4830858" dependencies = [ "p3-field", "p3-matrix", @@ -4051,9 +4267,9 @@ dependencies = [ [[package]] name = "p3-baby-bear" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff00f571044d299310d9659c6e51c98422de3bf94b8577f7f30cf59cf2043e40" +checksum = "080896e9d09e9761982febafe3b3da5cbf320e32f0c89b6e2e01e875129f4c2d" dependencies = [ "num-bigint 0.4.6", "p3-field", @@ -4064,21 +4280,11 @@ dependencies = [ "serde", ] -[[package]] -name = "p3-blake3" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4cb69ae54a279bbbd477566d1bdb71aa879b528fd658d0fcfc36f54b00217c" -dependencies = [ - "blake3", - "p3-symmetric", -] - [[package]] name = "p3-bn254-fr" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf19917f986d45e9abb6d177e875824ced6eed096480d574fce16f2c45c721ea" +checksum = "f8c53da73873e24d751ec3bd9d8da034bb5f99c71f24f4903ff37190182bff10" dependencies = [ "ff 0.13.0", "num-bigint 0.4.6", @@ -4091,9 +4297,9 @@ dependencies = [ [[package]] name = "p3-challenger" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be7e4fbce4566a93091107eadfafa0b5374bd1ffd3e0f6b850da3ff72eb183f" +checksum = "0f5c497659a7d9a87882e30ee9a8d0e20c8dcd32cd10d432410e7d6f146ef103" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -4105,13 +4311,12 @@ dependencies = [ [[package]] name = "p3-commit" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a03eb0f99d68a712c41e658e9a7782a0705d4ffcfb6232a43bd3f1ef9591002" +checksum = "54ec340c5cb17739a7b9ee189378bdac8f0e684b9b5ce539476c26e77cd6a27d" dependencies = [ "itertools 0.12.1", "p3-challenger", - "p3-dft", "p3-field", "p3-matrix", "p3-util", @@ -4120,9 +4325,9 @@ dependencies = [ [[package]] name = "p3-dft" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1556de968523fbe5d804ab50600ea306fcceea3500cfd7601e40882480524664" +checksum = "292e97d02d4c38d8b306c2b8c0428bf15f4d32a11a40bcf80018f675bf33267e" dependencies = [ "p3-field", "p3-matrix", @@ -4133,9 +4338,9 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec2af6e1ac47a2035af5165e668d64612c4b9ccabd06df37fc1fd381fdf8a71" +checksum = "f91d8e5f9ede1171adafdb0b6a0df1827fbd4eb6a6217bfa36374e5d86248757" dependencies = [ "itertools 0.12.1", "num-bigint 0.4.6", @@ -4147,9 +4352,9 @@ dependencies = [ [[package]] name = "p3-fri" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f351ee9f9d4256455164565cd91e3e6d2487cc2a5355515fa2b6d479269188dd" +checksum = "4ef838ff24d9b3de3d88d0ac984937d2aa2923bf25cb108ba9b2dc357e472197" dependencies = [ "itertools 0.12.1", "p3-challenger", @@ -4166,9 +4371,9 @@ dependencies = [ [[package]] name = "p3-interpolation" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24d0f2907a374ebe4545fcff3120d6376d9630cf0bef30feedcfc5908ea2c37" +checksum = "c806c3afb8d6acf1d3a78f4be1e9e8b026f13c01b0cdd5ae2e068b70a3ba6d80" dependencies = [ "p3-field", "p3-matrix", @@ -4177,9 +4382,9 @@ dependencies = [ [[package]] name = "p3-keccak-air" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66badd47cedf6570e91a0cabc389b80dfd53ba1a6e9a45a3923fd54b86122ff" +checksum = "b46cef7ee8ae1f7cb560e7b7c137e272f6ba75be98179b3aa18695705231e0fb" dependencies = [ "p3-air", "p3-field", @@ -4191,9 +4396,9 @@ dependencies = [ [[package]] name = "p3-matrix" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa272f3ae77ed8d73478aa7c89e712efb15bda3ff4aff10fadfe11a012cd5389" +checksum = "98bf2c7680b8e906a5e147fe4ceb05a11cc9fa35678aa724333bcb35c72483c1" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4206,18 +4411,18 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eecad6292021858f282d643d9d1284ab112a200494d589863a9c4080e578ef0" +checksum = "fd9ac6f1d11ad4d3c13cc496911109d6282315e64f851a666ed80ad4d77c0983" dependencies = [ "rayon", ] [[package]] name = "p3-mds" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716c4dbe68a02f1541eb09149d07b8663a3a5951b1864a31cd67ff3bb0826e57" +checksum = "706cea48976f54702dc68dffa512684c1304d1a3606cadea423cfe0b1ee25134" dependencies = [ "itertools 0.12.1", "p3-dft", @@ -4230,9 +4435,9 @@ dependencies = [ [[package]] name = "p3-merkle-tree" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad7ebab52a03c26025988663a135aed62f5084a2e2ea262176dc8748efb593e5" +checksum = "1f4ced385da80dd6b3fd830eaa452c9fa899f2dc3f6463aceba00620d5f071ec" dependencies = [ "itertools 0.12.1", "p3-commit", @@ -4247,9 +4452,9 @@ dependencies = [ [[package]] name = "p3-poseidon2" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c042efa15beab7a8c4d0ca9b9e4cbda7582be0c08e121e830fec45f082935b" +checksum = "a2ce5f5ec7f1ba3a233a671621029def7bd416e7c51218c9d1167d21602cf312" dependencies = [ "gcd", "p3-field", @@ -4261,9 +4466,9 @@ dependencies = [ [[package]] name = "p3-symmetric" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9896a831f5b688adc13f6fbe1dcf66ecfaa4622a500f81aa745610e777acb72" +checksum = "2f29dc5bb6c99d3de75869d5c086874b64890280eeb7d3e068955f939e219253" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4272,9 +4477,9 @@ dependencies = [ [[package]] name = "p3-uni-stark" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8437ebcd060c8a5479898030b114a93da8a86eb4c2e5f313d9eeaaf40c6e6f61" +checksum = "83ceaeef06b0bc97e5af2d220cd340b0b3a72bdf37e4584b73b3bc357cfc9ed3" dependencies = [ "itertools 0.12.1", "p3-air", @@ -4291,9 +4496,9 @@ dependencies = [ [[package]] name = "p3-util" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dedb9d27ba47ac314c6fac4ca54e55c3e486c864d51ec5ba55dbe47b75121157" +checksum = "e1b84d324cd4ac09194a9d0e8ab1834e67a0e47dec477c28fcf9d68b2824c1fe" dependencies = [ "serde", ] @@ -4409,6 +4614,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + [[package]] name = "pbkdf2" version = "0.11.0" @@ -4440,6 +4651,15 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -4464,7 +4684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.7.0", ] [[package]] @@ -4613,6 +4833,15 @@ dependencies = [ "syn 2.0.95", ] +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -4670,6 +4899,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "proc-macro2" version = "1.0.92" @@ -4804,6 +5055,7 @@ dependencies = [ "libc", "rand_chacha", "rand_core", + "serde", ] [[package]] @@ -4943,7 +5195,7 @@ dependencies = [ "http-body 0.4.6", "hyper 0.14.32", "hyper-rustls 0.24.2", - "hyper-tls 0.5.0", + "hyper-tls", "ipnet", "js-sys", "log", @@ -4958,7 +5210,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration 0.5.1", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -4979,23 +5231,19 @@ checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", - "encoding_rs", "futures-channel", "futures-core", "futures-util", - "h2 0.4.7", "http 1.2.0", "http-body 1.0.1", "http-body-util", "hyper 1.5.2", "hyper-rustls 0.27.5", - "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -5007,12 +5255,10 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 1.0.2", - "system-configuration 0.6.1", "tokio", - "tokio-native-tls", "tokio-rustls 0.26.1", "tokio-util", - "tower", + "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -5413,6 +5659,7 @@ version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ + "log", "once_cell", "ring 0.17.8", "rustls-pki-types", @@ -5421,6 +5668,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework 3.1.0", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -5518,7 +5777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "cfg-if", - "derive_more 1.0.0", + "derive_more", "parity-scale-codec", "scale-info-derive", ] @@ -5608,7 +5867,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81d3f8c9bfcc3cbb6b0179eb57042d75b1582bdc65c3cb95f3fa999509c03cbc" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -5882,6 +6154,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "snowbridge-amcl" @@ -5917,13 +6192,26 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "sp1-build" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +dependencies = [ + "anyhow", + "cargo_metadata", + "chrono", + "clap", + "dirs", +] + [[package]] name = "sp1-core-executor" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "bincode", "bytemuck", + "clap", "elf", "enum-map", "eyre", @@ -5933,16 +6221,20 @@ dependencies = [ "log", "nohash-hasher", "num", + "p3-baby-bear", "p3-field", "p3-maybe-rayon", + "p3-util", "rand", "rrs-succinct", "serde", + "serde_json", "sp1-curves", "sp1-primitives", "sp1-stark", "strum", "strum_macros", + "subenum", "thiserror 1.0.69", "tiny-keccak", "tracing", @@ -5952,13 +6244,16 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "bincode", + "cbindgen", + "cc", "cfg-if", "elliptic-curve", - "generic-array 1.1.1", + "generic-array 1.1.0", + "glob", "hashbrown 0.14.5", "hex", "itertools 0.13.0", @@ -5966,18 +6261,24 @@ dependencies = [ "log", "num", "num_cpus", + "p256", "p3-air", "p3-baby-bear", - "p3-blake3", "p3-challenger", "p3-field", "p3-keccak-air", "p3-matrix", "p3-maybe-rayon", + "p3-poseidon2", + "p3-symmetric", "p3-uni-stark", "p3-util", + "pathdiff", "rand", + "rayon", + "rayon-scan", "serde", + "serde_json", "size", "snowbridge-amcl", "sp1-core-executor", @@ -5997,18 +6298,35 @@ dependencies = [ "web-time", ] +[[package]] +name = "sp1-cuda" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +dependencies = [ + "bincode", + "ctrlc", + "prost", + "serde", + "sp1-core-machine", + "sp1-prover", + "tokio", + "tracing", + "twirp-rs", +] + [[package]] name = "sp1-curves" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "cfg-if", "dashu", "elliptic-curve", - "generic-array 1.1.1", + "generic-array 1.1.0", "itertools 0.13.0", "k256", "num", + "p256", "p3-field", "serde", "snowbridge-amcl", @@ -6019,8 +6337,8 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "quote", "syn 1.0.109", @@ -6028,8 +6346,8 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "bincode", "hex", @@ -6045,16 +6363,17 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "anyhow", "bincode", "clap", "dirs", + "downloader", "eyre", + "hex", "itertools 0.13.0", - "lazy_static", "lru", "num-bigint 0.4.6", "p3-baby-bear", @@ -6064,11 +6383,12 @@ dependencies = [ "p3-field", "p3-matrix", "p3-symmetric", + "p3-util", "rayon", - "reqwest 0.11.27", "serde", "serde_json", "serial_test", + "sha2", "sp1-core-executor", "sp1-core-machine", "sp1-primitives", @@ -6077,17 +6397,16 @@ dependencies = [ "sp1-recursion-core", "sp1-recursion-gnark-ffi", "sp1-stark", - "subtle-encoding", - "tempfile", "thiserror 1.0.69", "tracing", + "tracing-appender", "tracing-subscriber 0.3.19", ] [[package]] name = "sp1-recursion-circuit" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -6119,8 +6438,8 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6140,13 +6459,18 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "backtrace", + "cbindgen", + "cc", + "cfg-if", "ff 0.13.0", + "glob", "hashbrown 0.14.5", "itertools 0.13.0", + "num_cpus", "p3-air", "p3-baby-bear", "p3-bn254-fr", @@ -6161,6 +6485,8 @@ dependencies = [ "p3-poseidon2", "p3-symmetric", "p3-util", + "pathdiff", + "rand", "serde", "sp1-core-machine", "sp1-derive", @@ -6175,8 +6501,8 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "quote", "syn 1.0.109", @@ -6184,8 +6510,8 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "anyhow", "bincode", @@ -6209,16 +6535,19 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ + "alloy-primitives", + "alloy-signer", + "alloy-signer-local", "alloy-sol-types", "anyhow", "async-trait", + "backoff", "bincode", "cfg-if", "dirs", - "ethers 2.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "hashbrown 0.14.5", "hex", @@ -6232,8 +6561,11 @@ dependencies = [ "reqwest 0.12.12", "reqwest-middleware", "serde", + "serde_json", + "sp1-build", "sp1-core-executor", "sp1-core-machine", + "sp1-cuda", "sp1-primitives", "sp1-prover", "sp1-stark", @@ -6242,6 +6574,7 @@ dependencies = [ "tempfile", "thiserror 1.0.69", "tokio", + "tonic", "tracing", "twirp-rs", "vergen", @@ -6249,13 +6582,13 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "arrayref", - "getrandom", "hashbrown 0.14.5", "itertools 0.13.0", + "num-bigint 0.4.6", "num-traits", "p3-air", "p3-baby-bear", @@ -6278,7 +6611,6 @@ dependencies = [ "strum", "strum_macros", "sysinfo 0.30.13", - "thiserror 1.0.69", "tracing", ] @@ -6368,19 +6700,22 @@ dependencies = [ ] [[package]] -name = "subtle" -version = "2.6.1" +name = "subenum" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "4f5d5dfb8556dd04017db5e318bbeac8ab2b0c67b76bf197bfb79e9b29f18ecf" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] -name = "subtle-encoding" -version = "0.5.1" +name = "subtle" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945" -dependencies = [ - "zeroize", -] +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svm-rs" @@ -6426,9 +6761,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c837dc8852cb7074e46b444afb81783140dab12c58867b49fb3898fbafedf7ea" +checksum = "b84e4d83a0a6704561302b917a932484e1cae2d8c6354c64be8b7bac1c1fe057" dependencies = [ "paste", "proc-macro2", @@ -6498,19 +6833,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys 0.5.0", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "system-configuration-sys 0.6.0", + "core-foundation 0.9.4", + "system-configuration-sys", ] [[package]] @@ -6523,16 +6847,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -6614,6 +6928,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "time" version = "0.3.37" @@ -6740,6 +7063,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-tungstenite" version = "0.20.1" @@ -6809,7 +7143,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.7.0", "toml_datetime", "winnow 0.5.40", ] @@ -6820,13 +7154,66 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", "winnow 0.6.22", ] +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.2", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "rustls-native-certs", + "rustls-pemfile 2.2.0", + "socket2", + "tokio", + "tokio-rustls 0.26.1", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower" version = "0.5.2" @@ -6867,6 +7254,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror 1.0.69", + "time", + "tracing-subscriber 0.3.19", +] + [[package]] name = "tracing-attributes" version = "0.1.28" @@ -7012,7 +7411,7 @@ dependencies = [ "serde_json", "thiserror 1.0.69", "tokio", - "tower", + "tower 0.5.2", "url", ] @@ -7817,7 +8216,7 @@ dependencies = [ "dialoguer", "dirs", "env_logger", - "ethers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", + "ethers", "hex", "log", "nvml-wrapper", diff --git a/Cargo.toml b/Cargo.toml index b16152b..770c696 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ toml = "0.8.12" reqwest = { version = "0.11", features = ["blocking"] } # Sp1 -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } # Risc 0 risc0-zkvm = { git = "https://github.com/risc0/risc0.git", tag = "v1.2.0" } diff --git a/src/sp1.rs b/src/sp1.rs index 05533f2..0cb0eb1 100644 --- a/src/sp1.rs +++ b/src/sp1.rs @@ -101,6 +101,7 @@ pub fn generate_sp1_proof( if use_gpu { cmd.arg("--features").arg("cuda"); + cmd.env("SP1_PROVER", "cuda"); } cmd.arg("--") diff --git a/workspaces/base_files/sp1/cargo_guest b/workspaces/base_files/sp1/cargo_guest index a042dd1..bb64629 100644 --- a/workspaces/base_files/sp1/cargo_guest +++ b/workspaces/base_files/sp1/cargo_guest @@ -5,4 +5,4 @@ name = "method" edition = "2021" [dependencies] -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } +sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } diff --git a/workspaces/base_files/sp1/cargo_host b/workspaces/base_files/sp1/cargo_host index e4767f9..a3aad0a 100644 --- a/workspaces/base_files/sp1/cargo_host +++ b/workspaces/base_files/sp1/cargo_host @@ -5,19 +5,19 @@ name = "method" edition = "2021" [build-dependencies] -sp1-helper = "3.4.0" +sp1-helper = "4.0.0" [features] default = [] cuda = ["dep:sp1-cuda", "sp1-sdk/cuda"] [dependencies] -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-prover = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0", optional = true } -sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-core-machine = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-prover = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0", optional = true } +sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-core-machine = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/workspaces/sp1/program/Cargo.lock b/workspaces/sp1/program/Cargo.lock index bc44f3e..aeaee39 100644 --- a/workspaces/sp1/program/Cargo.lock +++ b/workspaces/sp1/program/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + [[package]] name = "bincode" version = "1.3.3" @@ -61,6 +67,18 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "gcd" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" + [[package]] name = "generic-array" version = "0.14.7" @@ -82,6 +100,21 @@ dependencies = [ "wasi", ] +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -108,6 +141,158 @@ dependencies = [ "zk_rust_io", ] +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "p3-baby-bear" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080896e9d09e9761982febafe3b3da5cbf320e32f0c89b6e2e01e875129f4c2d" +dependencies = [ + "num-bigint", + "p3-field", + "p3-mds", + "p3-poseidon2", + "p3-symmetric", + "rand", + "serde", +] + +[[package]] +name = "p3-dft" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "292e97d02d4c38d8b306c2b8c0428bf15f4d32a11a40bcf80018f675bf33267e" +dependencies = [ + "p3-field", + "p3-matrix", + "p3-maybe-rayon", + "p3-util", + "tracing", +] + +[[package]] +name = "p3-field" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91d8e5f9ede1171adafdb0b6a0df1827fbd4eb6a6217bfa36374e5d86248757" +dependencies = [ + "itertools", + "num-bigint", + "num-traits", + "p3-util", + "rand", + "serde", +] + +[[package]] +name = "p3-matrix" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98bf2c7680b8e906a5e147fe4ceb05a11cc9fa35678aa724333bcb35c72483c1" +dependencies = [ + "itertools", + "p3-field", + "p3-maybe-rayon", + "p3-util", + "rand", + "serde", + "tracing", +] + +[[package]] +name = "p3-maybe-rayon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3925562a4c03183eafc92fd07b19f65ac6cb4b48d68c3920ce58d9bee6efe362" + +[[package]] +name = "p3-mds" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706cea48976f54702dc68dffa512684c1304d1a3606cadea423cfe0b1ee25134" +dependencies = [ + "itertools", + "p3-dft", + "p3-field", + "p3-matrix", + "p3-symmetric", + "p3-util", + "rand", +] + +[[package]] +name = "p3-poseidon2" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ce5f5ec7f1ba3a233a671621029def7bd416e7c51218c9d1167d21602cf312" +dependencies = [ + "gcd", + "p3-field", + "p3-mds", + "p3-symmetric", + "rand", + "serde", +] + +[[package]] +name = "p3-symmetric" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f29dc5bb6c99d3de75869d5c086874b64890280eeb7d3e068955f939e219253" +dependencies = [ + "itertools", + "p3-field", + "serde", +] + +[[package]] +name = "p3-util" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88dd5ca3eb6ff33cb20084778c32a6d68064a1913b4632437408c5a1098408b3" +dependencies = [ + "serde", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -198,17 +383,35 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "bincode", "serde", + "sp1-primitives", +] + +[[package]] +name = "sp1-primitives" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +dependencies = [ + "bincode", + "hex", + "lazy_static", + "num-bigint", + "p3-baby-bear", + "p3-field", + "p3-poseidon2", + "p3-symmetric", + "serde", + "sha2", ] [[package]] name = "sp1-zkvm" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "cfg-if", "getrandom", @@ -217,6 +420,7 @@ dependencies = [ "rand", "sha2", "sp1-lib", + "sp1-primitives", ] [[package]] @@ -230,6 +434,37 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +dependencies = [ + "once_cell", +] + [[package]] name = "typenum" version = "1.17.0" diff --git a/workspaces/sp1/program/Cargo.toml b/workspaces/sp1/program/Cargo.toml index 53d32d2..fe5df7d 100644 --- a/workspaces/sp1/program/Cargo.toml +++ b/workspaces/sp1/program/Cargo.toml @@ -5,5 +5,5 @@ name = "method" edition = "2021" [dependencies] -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } +sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } zk_rust_io = { git = "https://github.com/yetanotherco/zkRust.git" } diff --git a/workspaces/sp1/script/Cargo.lock b/workspaces/sp1/script/Cargo.lock index 00f8aea..572ba16 100644 --- a/workspaces/sp1/script/Cargo.lock +++ b/workspaces/sp1/script/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "addchain" version = "0.2.0" @@ -38,17 +28,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - [[package]] name = "ahash" version = "0.8.11" @@ -76,25 +55,166 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "alloy-consensus" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88e1edea70787c33e11197d3f32ae380f3db19e6e061e539a5bcf8184a6b326" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-trie", + "auto_impl", + "c-kzg", + "derive_more", + "serde", +] + +[[package]] +name = "alloy-consensus-any" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b1bb53f40c0273cd1975573cd457b39213e68584e36d1401d25fd0398a1d65" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c986539255fb839d1533c128e190e557e52ff652c9ef62939e233a81dd93f7e" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more", + "serde", +] + +[[package]] +name = "alloy-eips" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9fadfe089e9ccc0650473f2d4ef0a28bc015bbca5631d9f0f09e49b557fdb3" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "c-kzg", + "derive_more", + "once_cell", + "serde", + "sha2", +] + +[[package]] +name = "alloy-json-abi" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24acd2f5ba97c7a320e67217274bc81fe3c3174b8e6144ec875d9d54e760e278" +dependencies = [ + "alloy-primitives", + "alloy-sol-type-parser", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e29040b9d5fe2fb70415531882685b64f8efd08dfbd6cc907120650504821105" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror 2.0.9", + "tracing", +] + +[[package]] +name = "alloy-network" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510cc00b318db0dfccfdd2d032411cfae64fc144aef9679409e014145d3dacc4" +dependencies = [ + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-any", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror 2.0.9", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9081c099e798b8a2bba2145eb82a9a146f01fc7a35e9ab6e7b43305051f97550" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-serde", + "serde", +] + [[package]] name = "alloy-primitives" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4" +checksum = "ec878088ec6283ce1e90d280316aadd3d6ce3de06ff63d68953c855e7e447e92" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more 0.99.18", - "hex-literal", + "derive_more", + "foldhash", + "hashbrown 0.15.2", + "indexmap 2.7.0", "itoa", "k256", "keccak-asm", + "paste", "proptest", "rand", "ruint", + "rustc-hash 2.1.0", "serde", + "sha3", "tiny-keccak", ] @@ -104,19 +224,103 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f542548a609dca89fcd72b3b9f355928cf844d4363c5eed9c5273a3dd225e097" dependencies = [ + "alloy-rlp-derive", "arrayvec", "bytes", ] +[[package]] +name = "alloy-rlp-derive" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.94", +] + +[[package]] +name = "alloy-rpc-types-any" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed98e1af55a7d856bfa385f30f63d8d56be2513593655c904a8f4a7ec963aa3e" +dependencies = [ + "alloy-consensus-any", + "alloy-rpc-types-eth", + "alloy-serde", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8737d7a6e37ca7bba9c23e9495c6534caec6760eb24abc9d5ffbaaba147818e1" +dependencies = [ + "alloy-consensus", + "alloy-consensus-any", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "derive_more", + "itertools 0.13.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851bf8d5ad33014bd0c45153c603303e730acc8a209450a7ae6b4a12c2789e2" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-signer" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e10ca565da6500cca015ba35ee424d59798f2e1b85bc0dd8f81dafd401f029a" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror 2.0.9", +] + +[[package]] +name = "alloy-signer-local" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47fababf5a745133490cde927d48e50267f97d3d1209b9fc9f1d1d666964d172" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-signer", + "async-trait", + "k256", + "rand", + "thiserror 2.0.9", +] + [[package]] name = "alloy-sol-macro" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" +checksum = "8d039d267aa5cbb7732fa6ce1fd9b5e9e29368f580f80ba9d7a8450c794de4b2" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.94", @@ -124,15 +328,15 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" +checksum = "620ae5eee30ee7216a38027dec34e0585c55099f827f92f50d11e3d2d3a4a954" dependencies = [ "alloy-sol-macro-input", "const-hex", - "heck", - "indexmap", - "proc-macro-error", + "heck 0.5.0", + "indexmap 2.7.0", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.94", @@ -142,31 +346,58 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" +checksum = "ad9f7d057e00f8c5994e4ff4492b76532c51ead39353aa2ed63f8c50c0f4d52e" dependencies = [ "const-hex", "dunce", - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.94", "syn-solidity", ] +[[package]] +name = "alloy-sol-type-parser" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74e60b084fe1aef8acecda2743ff2d93c18ff3eb67a2d3b12f62582a1e66ef5e" +dependencies = [ + "serde", + "winnow 0.6.21", +] + [[package]] name = "alloy-sol-types" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" +checksum = "c1382302752cd751efd275f4d6ef65877ddf61e0e6f5ac84ef4302b79a33a31a" dependencies = [ + "alloy-json-abi", "alloy-primitives", "alloy-sol-macro", "const-hex", "serde", ] +[[package]] +name = "alloy-trie" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6917c79e837aa7b77b7a6dae9f89cbe15313ac161c4d3cfaf8909ef21f3d22d8" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "arrayvec", + "derive_more", + "nybbles", + "serde", + "smallvec", + "tracing", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -381,12 +612,26 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] -name = "async-trait" -version = "0.1.83" +name = "async-stream" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", @@ -394,14 +639,14 @@ dependencies = [ ] [[package]] -name = "async_io_stream" -version = "0.3.3" +name = "async-trait" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ - "futures", - "pharos", - "rustc_version 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.94", ] [[package]] @@ -437,10 +682,10 @@ dependencies = [ "axum-core", "bytes", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", - "hyper 1.5.2", + "hyper", "hyper-util", "itoa", "matchit", @@ -453,9 +698,9 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -470,18 +715,32 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -504,18 +763,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -528,12 +775,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bech32" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" - [[package]] name = "bincode" version = "1.3.3" @@ -549,7 +790,7 @@ version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cexpr", "clang-sys", "itertools 0.13.0", @@ -578,12 +819,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.6.0" @@ -622,19 +857,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "blake3" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -658,13 +880,15 @@ dependencies = [ ] [[package]] -name = "bs58" -version = "0.5.1" +name = "blst" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" dependencies = [ - "sha2", - "tinyvec", + "cc", + "glob", + "threadpool", + "zeroize", ] [[package]] @@ -701,10 +925,25 @@ dependencies = [ ] [[package]] -name = "camino" -version = "1.1.9" +name = "c-kzg" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" +dependencies = [ + "blst", + "cc", + "glob", + "hex", + "libc", + "once_cell", + "serde", +] + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -732,6 +971,25 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "cbindgen" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" +dependencies = [ + "clap", + "heck 0.4.1", + "indexmap 2.7.0", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 2.0.94", + "tempfile", + "toml", +] + [[package]] name = "cc" version = "1.2.6" @@ -776,16 +1034,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clang-sys" version = "1.8.1" @@ -825,7 +1073,7 @@ version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.94", @@ -837,58 +1085,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" -[[package]] -name = "coins-bip32" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3" -dependencies = [ - "bs58", - "coins-core", - "digest 0.10.7", - "hmac", - "k256", - "serde", - "sha2", - "thiserror 1.0.69", -] - -[[package]] -name = "coins-bip39" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" -dependencies = [ - "bitvec", - "coins-bip32", - "hmac", - "once_cell", - "pbkdf2 0.12.2", - "rand", - "sha2", - "thiserror 1.0.69", -] - -[[package]] -name = "coins-core" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979" -dependencies = [ - "base64 0.21.7", - "bech32", - "bs58", - "digest 0.10.7", - "generic-array 0.14.7", - "hex", - "ripemd", - "serde", - "serde_derive", - "sha2", - "sha3", - "thiserror 1.0.69", -] - [[package]] name = "colorchoice" version = "1.0.3" @@ -933,17 +1129,11 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "core-foundation" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ "core-foundation-sys", "libc", @@ -964,6 +1154,15 @@ dependencies = [ "libc", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -1017,15 +1216,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "ctrlc" version = "3.4.5" @@ -1121,6 +1311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", + "pem-rfc7468", "zeroize", ] @@ -1144,19 +1335,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.1", - "syn 2.0.94", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -1175,6 +1353,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.94", + "unicode-xid", ] [[package]] @@ -1236,6 +1415,20 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "downloader" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac1e888d6830712d565b2f3a974be3200be9296bc1b03db8251a4cbf18a4a34" +dependencies = [ + "digest 0.10.7", + "futures", + "rand", + "reqwest", + "thiserror 1.0.69", + "tokio", +] + [[package]] name = "dunce" version = "1.0.5" @@ -1280,6 +1473,7 @@ dependencies = [ "ff 0.13.0", "generic-array 0.14.7", "group 0.13.0", + "pem-rfc7468", "pkcs8", "rand_core", "sec1", @@ -1293,33 +1487,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enr" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4" -dependencies = [ - "base64 0.21.7", - "bytes", - "hex", - "k256", - "log", - "rand", - "rlp", - "serde", - "sha3", - "zeroize", -] - [[package]] name = "enum-map" version = "2.7.3" @@ -1357,270 +1524,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "eth-keystore" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fda3bf123be441da5260717e0661c25a2fd9cb2b2c1d20bf2e05580047158ab" -dependencies = [ - "aes", - "ctr", - "digest 0.10.7", - "hex", - "hmac", - "pbkdf2 0.11.0", - "rand", - "scrypt", - "serde", - "serde_json", - "sha2", - "sha3", - "thiserror 1.0.69", - "uuid", -] - -[[package]] -name = "ethabi" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898" -dependencies = [ - "ethereum-types", - "hex", - "once_cell", - "regex", - "serde", - "serde_json", - "sha3", - "thiserror 1.0.69", - "uint", -] - -[[package]] -name = "ethbloom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "scale-info", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "primitive-types", - "scale-info", - "uint", -] - -[[package]] -name = "ethers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0" -dependencies = [ - "ethers-addressbook", - "ethers-contract", - "ethers-core", - "ethers-middleware", - "ethers-providers", - "ethers-signers", -] - -[[package]] -name = "ethers-addressbook" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759" -dependencies = [ - "ethers-core", - "once_cell", - "serde", - "serde_json", -] - -[[package]] -name = "ethers-contract" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa" -dependencies = [ - "const-hex", - "ethers-contract-abigen", - "ethers-contract-derive", - "ethers-core", - "ethers-providers", - "futures-util", - "once_cell", - "pin-project", - "serde", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "ethers-contract-abigen" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b" -dependencies = [ - "Inflector", - "const-hex", - "dunce", - "ethers-core", - "eyre", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "serde", - "serde_json", - "syn 2.0.94", - "toml", - "walkdir", -] - -[[package]] -name = "ethers-contract-derive" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f" -dependencies = [ - "Inflector", - "const-hex", - "ethers-contract-abigen", - "ethers-core", - "proc-macro2", - "quote", - "serde_json", - "syn 2.0.94", -] - -[[package]] -name = "ethers-core" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" -dependencies = [ - "arrayvec", - "bytes", - "cargo_metadata", - "chrono", - "const-hex", - "elliptic-curve", - "ethabi", - "generic-array 0.14.7", - "k256", - "num_enum 0.7.3", - "once_cell", - "open-fastrlp", - "rand", - "rlp", - "serde", - "serde_json", - "strum", - "syn 2.0.94", - "tempfile", - "thiserror 1.0.69", - "tiny-keccak", - "unicode-xid", -] - -[[package]] -name = "ethers-middleware" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de" -dependencies = [ - "async-trait", - "auto_impl", - "ethers-contract", - "ethers-core", - "ethers-providers", - "ethers-signers", - "futures-channel", - "futures-locks", - "futures-util", - "instant", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "tracing-futures", - "url", -] - -[[package]] -name = "ethers-providers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2" -dependencies = [ - "async-trait", - "auto_impl", - "base64 0.21.7", - "bytes", - "const-hex", - "enr", - "ethers-core", - "futures-core", - "futures-timer", - "futures-util", - "hashers", - "http 0.2.12", - "instant", - "jsonwebtoken", - "once_cell", - "pin-project", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "tracing-futures", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "ws_stream_wasm", -] - -[[package]] -name = "ethers-signers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2" -dependencies = [ - "async-trait", - "coins-bip32", - "coins-bip39", - "const-hex", - "elliptic-curve", - "eth-keystore", - "ethers-core", - "rand", - "sha2", - "thiserror 1.0.69", - "tracing", -] - [[package]] name = "eyre" version = "0.6.12" @@ -1723,21 +1626,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1796,22 +1684,12 @@ dependencies = [ ] [[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-locks" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06" -dependencies = [ - "futures-channel", - "futures-task", -] - -[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] name = "futures-macro" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1834,16 +1712,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -dependencies = [ - "gloo-timers", - "send_wrapper 0.4.0", -] - [[package]] name = "futures-util" version = "0.3.31" @@ -1863,13 +1731,10 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" +name = "futures-utils-wasm" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] +checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" [[package]] name = "gcd" @@ -1890,9 +1755,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb8bc4c28d15ade99c7e90b219f30da4be5c88e586277e8cbe886beeb868ab2" +checksum = "96512db27971c2c3eece70a1e106fbe6c87760234e31e8f7e5634912fe52794a" dependencies = [ "serde", "typenum", @@ -1923,7 +1788,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.6.0", + "bitflags", "libc", "libgit2-sys", "log", @@ -1936,18 +1801,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "group" version = "0.12.1" @@ -1971,25 +1824,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.7" @@ -2001,8 +1835,8 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.2.0", - "indexmap", + "http", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2032,6 +1866,12 @@ dependencies = [ "rayon", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.14.5" @@ -2052,16 +1892,14 @@ dependencies = [ "allocator-api2", "equivalent", "foldhash", + "serde", ] [[package]] -name = "hashers" -version = "1.0.1" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2bca93b15ea5a746f220e56587f71e73c6165eab783df9e26590069953e3c30" -dependencies = [ - "fxhash", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heck" @@ -2080,12 +1918,9 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +dependencies = [ + "serde", +] [[package]] name = "hmac" @@ -2096,17 +1931,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.2.0" @@ -2118,17 +1942,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -2136,7 +1949,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.2.0", + "http", ] [[package]] @@ -2147,8 +1960,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -2164,30 +1977,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "hyper" -version = "0.14.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.5.2" @@ -2197,9 +1986,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.7", - "http 1.2.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -2216,8 +2005,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", - "http 1.2.0", - "hyper 1.5.2", + "http", + "hyper", "hyper-util", "rustls", "rustls-pki-types", @@ -2228,31 +2017,15 @@ dependencies = [ ] [[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.32", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" +name = "hyper-timeout" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "bytes", - "http-body-util", - "hyper 1.5.2", + "hyper", "hyper-util", - "native-tls", + "pin-project-lite", "tokio", - "tokio-native-tls", "tower-service", ] @@ -2265,9 +2038,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "hyper 1.5.2", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -2446,24 +2219,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" -dependencies = [ - "serde", -] - [[package]] name = "impl-trait-for-tuples" version = "0.2.3" @@ -2481,6 +2236,16 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.7.0" @@ -2489,6 +2254,7 @@ checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2", + "serde", ] [[package]] @@ -2504,15 +2270,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "instant" version = "0.1.13" @@ -2586,20 +2343,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonwebtoken" -version = "8.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" -dependencies = [ - "base64 0.21.7", - "pem", - "ring 0.16.20", - "serde", - "serde_json", - "simple_asn1", -] - [[package]] name = "jubjub" version = "0.9.0" @@ -2653,7 +2396,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -2696,7 +2439,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags", "libc", ] @@ -2789,7 +2532,7 @@ dependencies = [ "sp1-helper", "sp1-prover", "sp1-sdk", - "sp1-stark", + "sp1-stark 3.4.0", "tracing", "tracing-subscriber", "zk_rust_io", @@ -2827,30 +2570,13 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nix" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cfg-if", "cfg_aliases", "libc", @@ -3013,16 +2739,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive 0.7.3", + "num_enum_derive", ] [[package]] @@ -3037,18 +2754,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.94", -] - [[package]] name = "num_threads" version = "0.1.7" @@ -3064,6 +2769,17 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +[[package]] +name = "nybbles" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307" +dependencies = [ + "const-hex", + "serde", + "smallvec", +] + [[package]] name = "object" version = "0.36.7" @@ -3079,75 +2795,12 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "open-fastrlp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", - "ethereum-types", - "open-fastrlp-derive", -] - -[[package]] -name = "open-fastrlp-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c" -dependencies = [ - "bytes", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "openssl" -version = "0.10.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.94", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -3160,14 +2813,36 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + [[package]] name = "p3-air" version = "0.1.4-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "066f571b2e645505ed5972dd0e1e252ba03352150830c9566769ca711c0f1e9b" dependencies = [ - "p3-field", - "p3-matrix", + "p3-field 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", +] + +[[package]] +name = "p3-air" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02634a874a2286b73f3e0a121e79d6774e92ccbec648c5568f4a7479a4830858" +dependencies = [ + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", ] [[package]] @@ -3177,49 +2852,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff00f571044d299310d9659c6e51c98422de3bf94b8577f7f30cf59cf2043e40" dependencies = [ "num-bigint 0.4.6", - "p3-field", - "p3-mds", - "p3-poseidon2", - "p3-symmetric", + "p3-field 0.1.4-succinct", + "p3-mds 0.1.4-succinct", + "p3-poseidon2 0.1.4-succinct", + "p3-symmetric 0.1.4-succinct", "rand", "serde", ] [[package]] -name = "p3-blake3" -version = "0.1.4-succinct" +name = "p3-baby-bear" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4cb69ae54a279bbbd477566d1bdb71aa879b528fd658d0fcfc36f54b00217c" +checksum = "080896e9d09e9761982febafe3b3da5cbf320e32f0c89b6e2e01e875129f4c2d" dependencies = [ - "blake3", - "p3-symmetric", + "num-bigint 0.4.6", + "p3-field 0.2.0-succinct", + "p3-mds 0.2.0-succinct", + "p3-poseidon2 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "rand", + "serde", ] [[package]] name = "p3-bn254-fr" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf19917f986d45e9abb6d177e875824ced6eed096480d574fce16f2c45c721ea" +checksum = "f8c53da73873e24d751ec3bd9d8da034bb5f99c71f24f4903ff37190182bff10" dependencies = [ "ff 0.13.0", "num-bigint 0.4.6", - "p3-field", - "p3-poseidon2", - "p3-symmetric", + "p3-field 0.2.0-succinct", + "p3-poseidon2 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", "rand", "serde", ] [[package]] name = "p3-challenger" -version = "0.1.4-succinct" +version = "0.1.4-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be7e4fbce4566a93091107eadfafa0b5374bd1ffd3e0f6b850da3ff72eb183f" +dependencies = [ + "p3-field 0.1.4-succinct", + "p3-maybe-rayon 0.1.4-succinct", + "p3-symmetric 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "serde", + "tracing", +] + +[[package]] +name = "p3-challenger" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be7e4fbce4566a93091107eadfafa0b5374bd1ffd3e0f6b850da3ff72eb183f" +checksum = "0f5c497659a7d9a87882e30ee9a8d0e20c8dcd32cd10d432410e7d6f146ef103" dependencies = [ - "p3-field", - "p3-maybe-rayon", - "p3-symmetric", - "p3-util", + "p3-field 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-util 0.2.0-succinct", "serde", "tracing", ] @@ -3231,11 +2925,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a03eb0f99d68a712c41e658e9a7782a0705d4ffcfb6232a43bd3f1ef9591002" dependencies = [ "itertools 0.12.1", - "p3-challenger", - "p3-dft", - "p3-field", - "p3-matrix", - "p3-util", + "p3-challenger 0.1.4-succinct", + "p3-dft 0.1.4-succinct", + "p3-field 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "serde", +] + +[[package]] +name = "p3-commit" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ec340c5cb17739a7b9ee189378bdac8f0e684b9b5ce539476c26e77cd6a27d" +dependencies = [ + "itertools 0.12.1", + "p3-challenger 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-util 0.2.0-succinct", "serde", ] @@ -3245,10 +2953,23 @@ version = "0.1.4-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1556de968523fbe5d804ab50600ea306fcceea3500cfd7601e40882480524664" dependencies = [ - "p3-field", - "p3-matrix", - "p3-maybe-rayon", - "p3-util", + "p3-field 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-maybe-rayon 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "tracing", +] + +[[package]] +name = "p3-dft" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "292e97d02d4c38d8b306c2b8c0428bf15f4d32a11a40bcf80018f675bf33267e" +dependencies = [ + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-util 0.2.0-succinct", "tracing", ] @@ -3261,7 +2982,21 @@ dependencies = [ "itertools 0.12.1", "num-bigint 0.4.6", "num-traits", - "p3-util", + "p3-util 0.1.4-succinct", + "rand", + "serde", +] + +[[package]] +name = "p3-field" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91d8e5f9ede1171adafdb0b6a0df1827fbd4eb6a6217bfa36374e5d86248757" +dependencies = [ + "itertools 0.12.1", + "num-bigint 0.4.6", + "num-traits", + "p3-util 0.2.0-succinct", "rand", "serde", ] @@ -3273,14 +3008,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f351ee9f9d4256455164565cd91e3e6d2487cc2a5355515fa2b6d479269188dd" dependencies = [ "itertools 0.12.1", - "p3-challenger", - "p3-commit", - "p3-dft", - "p3-field", - "p3-interpolation", - "p3-matrix", - "p3-maybe-rayon", - "p3-util", + "p3-challenger 0.1.4-succinct", + "p3-commit 0.1.4-succinct", + "p3-dft 0.1.4-succinct", + "p3-field 0.1.4-succinct", + "p3-interpolation 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-maybe-rayon 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "serde", + "tracing", +] + +[[package]] +name = "p3-fri" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef838ff24d9b3de3d88d0ac984937d2aa2923bf25cb108ba9b2dc357e472197" +dependencies = [ + "itertools 0.12.1", + "p3-challenger 0.2.0-succinct", + "p3-commit 0.2.0-succinct", + "p3-dft 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-interpolation 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-util 0.2.0-succinct", "serde", "tracing", ] @@ -3291,22 +3045,33 @@ version = "0.1.4-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24d0f2907a374ebe4545fcff3120d6376d9630cf0bef30feedcfc5908ea2c37" dependencies = [ - "p3-field", - "p3-matrix", - "p3-util", + "p3-field 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-util 0.1.4-succinct", +] + +[[package]] +name = "p3-interpolation" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c806c3afb8d6acf1d3a78f4be1e9e8b026f13c01b0cdd5ae2e068b70a3ba6d80" +dependencies = [ + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-util 0.2.0-succinct", ] [[package]] name = "p3-keccak-air" -version = "0.1.4-succinct" +version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66badd47cedf6570e91a0cabc389b80dfd53ba1a6e9a45a3923fd54b86122ff" +checksum = "b46cef7ee8ae1f7cb560e7b7c137e272f6ba75be98179b3aa18695705231e0fb" dependencies = [ - "p3-air", - "p3-field", - "p3-matrix", - "p3-maybe-rayon", - "p3-util", + "p3-air 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-util 0.2.0-succinct", "tracing", ] @@ -3317,9 +3082,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa272f3ae77ed8d73478aa7c89e712efb15bda3ff4aff10fadfe11a012cd5389" dependencies = [ "itertools 0.12.1", - "p3-field", - "p3-maybe-rayon", - "p3-util", + "p3-field 0.1.4-succinct", + "p3-maybe-rayon 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "rand", + "serde", + "tracing", +] + +[[package]] +name = "p3-matrix" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98bf2c7680b8e906a5e147fe4ceb05a11cc9fa35678aa724333bcb35c72483c1" +dependencies = [ + "itertools 0.12.1", + "p3-field 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-util 0.2.0-succinct", "rand", "serde", "tracing", @@ -3334,6 +3114,15 @@ dependencies = [ "rayon", ] +[[package]] +name = "p3-maybe-rayon" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd9ac6f1d11ad4d3c13cc496911109d6282315e64f851a666ed80ad4d77c0983" +dependencies = [ + "rayon", +] + [[package]] name = "p3-mds" version = "0.1.4-succinct" @@ -3341,11 +3130,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "716c4dbe68a02f1541eb09149d07b8663a3a5951b1864a31cd67ff3bb0826e57" dependencies = [ "itertools 0.12.1", - "p3-dft", - "p3-field", - "p3-matrix", - "p3-symmetric", - "p3-util", + "p3-dft 0.1.4-succinct", + "p3-field 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-symmetric 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "rand", +] + +[[package]] +name = "p3-mds" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706cea48976f54702dc68dffa512684c1304d1a3606cadea423cfe0b1ee25134" +dependencies = [ + "itertools 0.12.1", + "p3-dft 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-util 0.2.0-succinct", "rand", ] @@ -3356,12 +3160,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad7ebab52a03c26025988663a135aed62f5084a2e2ea262176dc8748efb593e5" dependencies = [ "itertools 0.12.1", - "p3-commit", - "p3-field", - "p3-matrix", - "p3-maybe-rayon", - "p3-symmetric", - "p3-util", + "p3-commit 0.1.4-succinct", + "p3-field 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-maybe-rayon 0.1.4-succinct", + "p3-symmetric 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "serde", + "tracing", +] + +[[package]] +name = "p3-merkle-tree" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4ced385da80dd6b3fd830eaa452c9fa899f2dc3f6463aceba00620d5f071ec" +dependencies = [ + "itertools 0.12.1", + "p3-commit 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-util 0.2.0-succinct", "serde", "tracing", ] @@ -3373,9 +3194,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39c042efa15beab7a8c4d0ca9b9e4cbda7582be0c08e121e830fec45f082935b" dependencies = [ "gcd", - "p3-field", - "p3-mds", - "p3-symmetric", + "p3-field 0.1.4-succinct", + "p3-mds 0.1.4-succinct", + "p3-symmetric 0.1.4-succinct", + "rand", + "serde", +] + +[[package]] +name = "p3-poseidon2" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ce5f5ec7f1ba3a233a671621029def7bd416e7c51218c9d1167d21602cf312" +dependencies = [ + "gcd", + "p3-field 0.2.0-succinct", + "p3-mds 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", "rand", "serde", ] @@ -3387,7 +3222,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9896a831f5b688adc13f6fbe1dcf66ecfaa4622a500f81aa745610e777acb72" dependencies = [ "itertools 0.12.1", - "p3-field", + "p3-field 0.1.4-succinct", + "serde", +] + +[[package]] +name = "p3-symmetric" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f29dc5bb6c99d3de75869d5c086874b64890280eeb7d3e068955f939e219253" +dependencies = [ + "itertools 0.12.1", + "p3-field 0.2.0-succinct", "serde", ] @@ -3398,14 +3244,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8437ebcd060c8a5479898030b114a93da8a86eb4c2e5f313d9eeaaf40c6e6f61" dependencies = [ "itertools 0.12.1", - "p3-air", - "p3-challenger", - "p3-commit", - "p3-dft", - "p3-field", - "p3-matrix", - "p3-maybe-rayon", - "p3-util", + "p3-air 0.1.4-succinct", + "p3-challenger 0.1.4-succinct", + "p3-commit 0.1.4-succinct", + "p3-dft 0.1.4-succinct", + "p3-field 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-maybe-rayon 0.1.4-succinct", + "p3-util 0.1.4-succinct", + "serde", + "tracing", +] + +[[package]] +name = "p3-uni-stark" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ceaeef06b0bc97e5af2d220cd340b0b3a72bdf37e4584b73b3bc357cfc9ed3" +dependencies = [ + "itertools 0.12.1", + "p3-air 0.2.0-succinct", + "p3-challenger 0.2.0-succinct", + "p3-commit 0.2.0-succinct", + "p3-dft 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-util 0.2.0-succinct", "serde", "tracing", ] @@ -3419,6 +3284,15 @@ dependencies = [ "serde", ] +[[package]] +name = "p3-util" +version = "0.2.0-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b84d324cd4ac09194a9d0e8ab1834e67a0e47dec477c28fcf9d68b2824c1fe" +dependencies = [ + "serde", +] + [[package]] name = "pairing" version = "0.22.0" @@ -3514,31 +3388,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "pbkdf2" -version = "0.12.2" +name = "pathdiff" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest 0.10.7", - "hmac", -] +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] -name = "pem" -version = "1.1.1" +name = "pem-rfc7468" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ - "base64 0.13.1", + "base64ct", ] [[package]] @@ -3558,16 +3419,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version 0.4.1", -] - [[package]] name = "pin-project" version = "1.1.7" @@ -3647,6 +3498,15 @@ dependencies = [ "syn 2.0.94", ] +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -3655,9 +3515,6 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", - "impl-serde", - "scale-info", "uint", ] @@ -3681,27 +3538,25 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.94", ] [[package]] @@ -3721,7 +3576,7 @@ checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.6.0", + "bitflags", "lazy_static", "num-traits", "rand", @@ -3789,7 +3644,7 @@ dependencies = [ "bytes", "getrandom", "rand", - "ring 0.17.8", + "ring", "rustc-hash 2.1.0", "rustls", "rustls-pki-types", @@ -3838,6 +3693,7 @@ dependencies = [ "libc", "rand_chacha", "rand_core", + "serde", ] [[package]] @@ -3903,7 +3759,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags", ] [[package]] @@ -3961,87 +3817,41 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - [[package]] name = "reqwest" version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ - "base64 0.22.1", + "base64", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2 0.4.7", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", - "hyper 1.5.2", + "hyper", "hyper-rustls", - "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", - "system-configuration 0.6.1", + "sync_wrapper", "tokio", - "tokio-native-tls", "tokio-rustls", "tokio-util", - "tower", + "tower 0.5.2", "tower-service", "url", "wasm-bindgen", @@ -4060,8 +3870,8 @@ checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" dependencies = [ "anyhow", "async-trait", - "http 1.2.0", - "reqwest 0.12.12", + "http", + "reqwest", "serde", "thiserror 1.0.69", "tower-service", @@ -4077,21 +3887,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -4102,20 +3897,11 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "rlp" version = "0.5.2" @@ -4123,21 +3909,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ "bytes", - "rlp-derive", "rustc-hex", ] -[[package]] -name = "rlp-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rrs-succinct" version = "0.1.0" @@ -4145,7 +3919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3372685893a9f67d18e98e792d690017287fd17379a83d798d958e517d380fa9" dependencies = [ "downcast-rs", - "num_enum 0.5.11", + "num_enum", "paste", ] @@ -4229,7 +4003,7 @@ version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -4242,8 +4016,9 @@ version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ + "log", "once_cell", - "ring 0.17.8", + "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -4251,12 +4026,15 @@ dependencies = [ ] [[package]] -name = "rustls-pemfile" -version = "1.0.4" +name = "rustls-native-certs" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" dependencies = [ - "base64 0.21.7", + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", ] [[package]] @@ -4283,9 +4061,9 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -4312,24 +4090,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "scale-info" version = "2.11.6" @@ -4337,7 +4097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "cfg-if", - "derive_more 1.0.0", + "derive_more", "parity-scale-codec", "scale-info-derive", ] @@ -4378,18 +4138,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scrypt" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" -dependencies = [ - "hmac", - "pbkdf2 0.11.0", - "salsa20", - "sha2", -] - [[package]] name = "sdd" version = "3.0.5" @@ -4412,11 +4160,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ - "bitflags 2.6.0", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -4425,9 +4173,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -4460,18 +4208,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" - -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.217" @@ -4625,18 +4361,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "thiserror 1.0.69", - "time", -] - [[package]] name = "size" version = "0.4.1" @@ -4657,6 +4381,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "snowbridge-amcl" @@ -4674,15 +4401,27 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ - "libc", - "windows-sys 0.52.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "sp1-build" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +dependencies = [ + "anyhow", + "cargo_metadata", + "chrono", + "clap", + "dirs", ] [[package]] name = "sp1-build" -version = "3.4.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58e5f49cf1481363abb74b55104e215f3b6e58dc2adb748bde7a6e4ea61b51d" +checksum = "82249c52570bdb8c499e352a5309ca8051f80068df42d4b4500987592f9eb57c" dependencies = [ "anyhow", "cargo_metadata", @@ -4693,11 +4432,12 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "bincode", "bytemuck", + "clap", "elf", "enum-map", "eyre", @@ -4707,16 +4447,20 @@ dependencies = [ "log", "nohash-hasher", "num", - "p3-field", - "p3-maybe-rayon", + "p3-baby-bear 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-util 0.2.0-succinct", "rand", "rrs-succinct", "serde", + "serde_json", "sp1-curves", - "sp1-primitives", - "sp1-stark", + "sp1-primitives 4.0.0", + "sp1-stark 4.0.0", "strum", "strum_macros", + "subenum", "thiserror 1.0.69", "tiny-keccak", "tracing", @@ -4726,13 +4470,16 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "bincode", + "cbindgen", + "cc", "cfg-if", "elliptic-curve", - "generic-array 1.1.1", + "generic-array 1.1.0", + "glob", "hashbrown 0.14.5", "hex", "itertools 0.13.0", @@ -4740,25 +4487,31 @@ dependencies = [ "log", "num", "num_cpus", - "p3-air", - "p3-baby-bear", - "p3-blake3", - "p3-challenger", - "p3-field", + "p256", + "p3-air 0.2.0-succinct", + "p3-baby-bear 0.2.0-succinct", + "p3-challenger 0.2.0-succinct", + "p3-field 0.2.0-succinct", "p3-keccak-air", - "p3-matrix", - "p3-maybe-rayon", - "p3-uni-stark", - "p3-util", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-poseidon2 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-uni-stark 0.2.0-succinct", + "p3-util 0.2.0-succinct", + "pathdiff", "rand", + "rayon", + "rayon-scan", "serde", + "serde_json", "size", "snowbridge-amcl", "sp1-core-executor", "sp1-curves", - "sp1-derive", - "sp1-primitives", - "sp1-stark", + "sp1-derive 4.0.0", + "sp1-primitives 4.0.0", + "sp1-stark 4.0.0", "static_assertions", "strum", "strum_macros", @@ -4773,8 +4526,8 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "bincode", "ctrlc", @@ -4789,21 +4542,22 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "cfg-if", "dashu", "elliptic-curve", - "generic-array 1.1.1", + "generic-array 1.1.0", "itertools 0.13.0", "k256", "num", - "p3-field", + "p256", + "p3-field 0.2.0-succinct", "serde", "snowbridge-amcl", - "sp1-primitives", - "sp1-stark", + "sp1-primitives 4.0.0", + "sp1-stark 4.0.0", "typenum", ] @@ -4816,13 +4570,22 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "sp1-derive" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "sp1-helper" -version = "3.4.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158708d1ac1a62e96e5c4f69df5267a6241573a01dd896530d1f435365ffc275" +checksum = "b0fb17d71032c21ba86f741485714a260249afda15c7dd6b92f43f595356cf93" dependencies = [ - "sp1-build", + "sp1-build 4.0.1", ] [[package]] @@ -4834,137 +4597,162 @@ dependencies = [ "hex", "lazy_static", "num-bigint 0.4.6", - "p3-baby-bear", - "p3-field", - "p3-poseidon2", - "p3-symmetric", + "p3-baby-bear 0.1.4-succinct", + "p3-field 0.1.4-succinct", + "p3-poseidon2 0.1.4-succinct", + "p3-symmetric 0.1.4-succinct", + "serde", + "sha2", +] + +[[package]] +name = "sp1-primitives" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +dependencies = [ + "bincode", + "hex", + "lazy_static", + "num-bigint 0.4.6", + "p3-baby-bear 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-poseidon2 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", "serde", "sha2", ] [[package]] name = "sp1-prover" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "anyhow", "bincode", "clap", "dirs", + "downloader", "eyre", + "hex", "itertools 0.13.0", - "lazy_static", "lru", "num-bigint 0.4.6", - "p3-baby-bear", + "p3-baby-bear 0.2.0-succinct", "p3-bn254-fr", - "p3-challenger", - "p3-commit", - "p3-field", - "p3-matrix", - "p3-symmetric", + "p3-challenger 0.2.0-succinct", + "p3-commit 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-util 0.2.0-succinct", "rayon", - "reqwest 0.11.27", "serde", "serde_json", "serial_test", + "sha2", "sp1-core-executor", "sp1-core-machine", - "sp1-primitives", + "sp1-primitives 4.0.0", "sp1-recursion-circuit", "sp1-recursion-compiler", "sp1-recursion-core", "sp1-recursion-gnark-ffi", - "sp1-stark", - "subtle-encoding", - "tempfile", + "sp1-stark 4.0.0", "thiserror 1.0.69", "tracing", + "tracing-appender", "tracing-subscriber", ] [[package]] name = "sp1-recursion-circuit" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", "num-traits", - "p3-air", - "p3-baby-bear", + "p3-air 0.2.0-succinct", + "p3-baby-bear 0.2.0-succinct", "p3-bn254-fr", - "p3-challenger", - "p3-commit", - "p3-dft", - "p3-field", - "p3-fri", - "p3-matrix", - "p3-symmetric", - "p3-util", + "p3-challenger 0.2.0-succinct", + "p3-commit 0.2.0-succinct", + "p3-dft 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-fri 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-util 0.2.0-succinct", "rand", "rayon", "serde", "sp1-core-executor", "sp1-core-machine", - "sp1-derive", - "sp1-primitives", + "sp1-derive 4.0.0", + "sp1-primitives 4.0.0", "sp1-recursion-compiler", "sp1-recursion-core", "sp1-recursion-gnark-ffi", - "sp1-stark", + "sp1-stark 4.0.0", "tracing", ] [[package]] name = "sp1-recursion-compiler" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "backtrace", "itertools 0.13.0", - "p3-baby-bear", + "p3-baby-bear 0.2.0-succinct", "p3-bn254-fr", - "p3-field", - "p3-symmetric", + "p3-field 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", "serde", "sp1-core-machine", - "sp1-primitives", + "sp1-primitives 4.0.0", "sp1-recursion-core", "sp1-recursion-derive", - "sp1-stark", + "sp1-stark 4.0.0", "tracing", "vec_map", ] [[package]] name = "sp1-recursion-core" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "backtrace", + "cbindgen", + "cc", + "cfg-if", "ff 0.13.0", + "glob", "hashbrown 0.14.5", "itertools 0.13.0", - "p3-air", - "p3-baby-bear", + "num_cpus", + "p3-air 0.2.0-succinct", + "p3-baby-bear 0.2.0-succinct", "p3-bn254-fr", - "p3-challenger", - "p3-commit", - "p3-dft", - "p3-field", - "p3-fri", - "p3-matrix", - "p3-maybe-rayon", - "p3-merkle-tree", - "p3-poseidon2", - "p3-symmetric", - "p3-util", + "p3-challenger 0.2.0-succinct", + "p3-commit 0.2.0-succinct", + "p3-dft 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-fri 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-merkle-tree 0.2.0-succinct", + "p3-poseidon2 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-util 0.2.0-succinct", + "pathdiff", + "rand", "serde", "sp1-core-machine", - "sp1-derive", - "sp1-primitives", - "sp1-stark", + "sp1-derive 4.0.0", + "sp1-primitives 4.0.0", + "sp1-stark 4.0.0", "static_assertions", "thiserror 1.0.69", "tracing", @@ -4974,8 +4762,8 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "quote", "syn 1.0.109", @@ -4983,8 +4771,8 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ "anyhow", "bincode", @@ -4994,54 +4782,60 @@ dependencies = [ "hex", "log", "num-bigint 0.4.6", - "p3-baby-bear", - "p3-field", - "p3-symmetric", + "p3-baby-bear 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", "serde", "serde_json", "sha2", "sp1-core-machine", "sp1-recursion-compiler", - "sp1-stark", + "sp1-stark 4.0.0", "tempfile", ] [[package]] name = "sp1-sdk" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" dependencies = [ + "alloy-primitives", + "alloy-signer", + "alloy-signer-local", "alloy-sol-types", "anyhow", "async-trait", + "backoff", "bincode", "cfg-if", "dirs", - "ethers", "futures", "hashbrown 0.14.5", "hex", "indicatif", "itertools 0.13.0", "log", - "p3-baby-bear", - "p3-field", - "p3-fri", + "p3-baby-bear 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-fri 0.2.0-succinct", "prost", - "reqwest 0.12.12", + "reqwest", "reqwest-middleware", "serde", + "serde_json", + "sp1-build 4.0.0", "sp1-core-executor", "sp1-core-machine", "sp1-cuda", - "sp1-primitives", + "sp1-primitives 4.0.0", "sp1-prover", - "sp1-stark", + "sp1-stark 4.0.0", "strum", "strum_macros", "tempfile", "thiserror 1.0.69", "tokio", + "tonic", "tracing", "twirp-rs", "vergen", @@ -5057,24 +4851,24 @@ dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", "num-traits", - "p3-air", - "p3-baby-bear", - "p3-challenger", - "p3-commit", - "p3-dft", - "p3-field", - "p3-fri", - "p3-matrix", - "p3-maybe-rayon", - "p3-merkle-tree", - "p3-poseidon2", - "p3-symmetric", - "p3-uni-stark", - "p3-util", + "p3-air 0.1.4-succinct", + "p3-baby-bear 0.1.4-succinct", + "p3-challenger 0.1.4-succinct", + "p3-commit 0.1.4-succinct", + "p3-dft 0.1.4-succinct", + "p3-field 0.1.4-succinct", + "p3-fri 0.1.4-succinct", + "p3-matrix 0.1.4-succinct", + "p3-maybe-rayon 0.1.4-succinct", + "p3-merkle-tree 0.1.4-succinct", + "p3-poseidon2 0.1.4-succinct", + "p3-symmetric 0.1.4-succinct", + "p3-uni-stark 0.1.4-succinct", + "p3-util 0.1.4-succinct", "rayon-scan", "serde", - "sp1-derive", - "sp1-primitives", + "sp1-derive 3.4.0", + "sp1-primitives 3.4.0", "strum", "strum_macros", "sysinfo", @@ -5083,10 +4877,38 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +name = "sp1-stark" +version = "4.0.0" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +dependencies = [ + "arrayref", + "hashbrown 0.14.5", + "itertools 0.13.0", + "num-bigint 0.4.6", + "num-traits", + "p3-air 0.2.0-succinct", + "p3-baby-bear 0.2.0-succinct", + "p3-challenger 0.2.0-succinct", + "p3-commit 0.2.0-succinct", + "p3-dft 0.2.0-succinct", + "p3-field 0.2.0-succinct", + "p3-fri 0.2.0-succinct", + "p3-matrix 0.2.0-succinct", + "p3-maybe-rayon 0.2.0-succinct", + "p3-merkle-tree 0.2.0-succinct", + "p3-poseidon2 0.2.0-succinct", + "p3-symmetric 0.2.0-succinct", + "p3-uni-stark 0.2.0-succinct", + "p3-util 0.2.0-succinct", + "rayon-scan", + "serde", + "sp1-derive 4.0.0", + "sp1-primitives 4.0.0", + "strum", + "strum_macros", + "sysinfo", + "tracing", +] [[package]] name = "spin" @@ -5137,7 +4959,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -5145,19 +4967,22 @@ dependencies = [ ] [[package]] -name = "subtle" -version = "2.6.1" +name = "subenum" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "4f5d5dfb8556dd04017db5e318bbeac8ab2b0c67b76bf197bfb79e9b29f18ecf" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] -name = "subtle-encoding" -version = "0.5.1" +name = "subtle" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945" -dependencies = [ - "zeroize", -] +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -5183,9 +5008,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.7.7" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c837dc8852cb7074e46b444afb81783140dab12c58867b49fb3898fbafedf7ea" +checksum = "b84e4d83a0a6704561302b917a932484e1cae2d8c6354c64be8b7bac1c1fe057" dependencies = [ "paste", "proc-macro2", @@ -5193,12 +5018,6 @@ dependencies = [ "syn 2.0.94", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -5234,48 +5053,6 @@ dependencies = [ "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys 0.5.0", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "system-configuration-sys 0.6.0", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -5346,6 +5123,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "time" version = "0.3.37" @@ -5443,22 +5229,23 @@ dependencies = [ ] [[package]] -name = "tokio-native-tls" -version = "0.3.1" +name = "tokio-rustls" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "native-tls", + "rustls", "tokio", ] [[package]] -name = "tokio-rustls" -version = "0.26.1" +name = "tokio-stream" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ - "rustls", + "futures-core", + "pin-project-lite", "tokio", ] @@ -5502,7 +5289,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.7.0", "toml_datetime", "winnow 0.5.40", ] @@ -5513,13 +5300,66 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", "winnow 0.6.21", ] +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "rustls-native-certs", + "rustls-pemfile", + "socket2", + "tokio", + "tokio-rustls", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower" version = "0.5.2" @@ -5529,7 +5369,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -5560,6 +5400,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror 1.0.69", + "time", + "tracing-subscriber", +] + [[package]] name = "tracing-attributes" version = "0.1.28" @@ -5594,16 +5446,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -5648,16 +5490,16 @@ dependencies = [ "async-trait", "axum", "futures", - "http 1.2.0", + "http", "http-body-util", - "hyper 1.5.2", + "hyper", "prost", - "reqwest 0.12.12", + "reqwest", "serde", "serde_json", "thiserror 1.0.69", "tokio", - "tower", + "tower 0.5.2", "url", ] @@ -5709,12 +5551,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -5750,16 +5586,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", - "serde", -] - [[package]] name = "valuable" version = "0.1.0" @@ -5809,16 +5635,6 @@ dependencies = [ "libc", ] -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -5959,15 +5775,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -6189,16 +5996,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "write16" version = "1.0.0" @@ -6211,25 +6008,6 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" -[[package]] -name = "ws_stream_wasm" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version 0.4.1", - "send_wrapper 0.6.0", - "thiserror 1.0.69", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/workspaces/sp1/script/Cargo.toml b/workspaces/sp1/script/Cargo.toml index 1ca4ed1..cd245c9 100644 --- a/workspaces/sp1/script/Cargo.toml +++ b/workspaces/sp1/script/Cargo.toml @@ -5,19 +5,19 @@ name = "method" edition = "2021" [build-dependencies] -sp1-helper = "3.4.0" +sp1-helper = "4.0.0" [features] default = [] cuda = ["dep:sp1-cuda", "sp1-sdk/cuda"] [dependencies] -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-prover = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0", optional = true } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-prover = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0", optional = true } sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } -sp1-core-machine = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } +sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-core-machine = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" From 7c5a763276bbd11abcc6f5e9e34cd5547953386b Mon Sep 17 00:00:00 2001 From: Conner Swann <2635475+yourbuddyconner@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:49:10 -0800 Subject: [PATCH 2/6] nits --- install_zkrust_from_source.sh | 2 +- workspaces/base_files/sp1/host | 8 ++++---- workspaces/sp1/script/src/main.rs | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/install_zkrust_from_source.sh b/install_zkrust_from_source.sh index 685bd7f..c523168 100644 --- a/install_zkrust_from_source.sh +++ b/install_zkrust_from_source.sh @@ -74,7 +74,7 @@ if ! command -v sp1up &> /dev/null; then echo "Installing SP1 toolchain..." curl -L https://sp1.succinct.xyz | bash export PATH="$PATH:$HOME/.sp1/bin" - sp1up -v v3.4.0 + sp1up -v v4.0.0 else echo "SP1 toolchain already installed" fi diff --git a/workspaces/base_files/sp1/host b/workspaces/base_files/sp1/host index 45d1465..0af1c17 100644 --- a/workspaces/base_files/sp1/host +++ b/workspaces/base_files/sp1/host @@ -23,11 +23,11 @@ fn main() { // INPUT // - let client = ProverClient::new(); + let client = ProverClient::from_env(); let (pk, vk) = client.setup(METHOD_ELF); // First run executor to get cycle count - let (_, report) = client.execute(METHOD_ELF, stdin.clone()).run().unwrap(); + let (_, report) = client.execute(METHOD_ELF, &stdin.clone()).run().unwrap(); // Get total cycles from cycle tracker metrics.cycles = report.cycle_tracker.iter().map(|(_, cycles)| *cycles).sum(); // Number of segments is the number of cycle tracking entries @@ -36,7 +36,7 @@ fn main() { // Generate uncompressed proof core_timer.start_timing(); // Set as mutable to allow for template code to access it if needed - let mut proof = client.prove(&pk, stdin.clone()).run().unwrap(); + let mut proof = client.prove(&pk, &stdin.clone()).run().unwrap(); metrics.core_prove_duration = core_timer.elapsed().unwrap(); // Get uncompressed proof size @@ -53,7 +53,7 @@ fn main() { // Generate compressed proof compress_timer.start_timing(); let compressed = client - .prove(&pk, stdin) + .prove(&pk, &stdin) .compressed() // Enable compression .run() .unwrap(); diff --git a/workspaces/sp1/script/src/main.rs b/workspaces/sp1/script/src/main.rs index 45d1465..0af1c17 100644 --- a/workspaces/sp1/script/src/main.rs +++ b/workspaces/sp1/script/src/main.rs @@ -23,11 +23,11 @@ fn main() { // INPUT // - let client = ProverClient::new(); + let client = ProverClient::from_env(); let (pk, vk) = client.setup(METHOD_ELF); // First run executor to get cycle count - let (_, report) = client.execute(METHOD_ELF, stdin.clone()).run().unwrap(); + let (_, report) = client.execute(METHOD_ELF, &stdin.clone()).run().unwrap(); // Get total cycles from cycle tracker metrics.cycles = report.cycle_tracker.iter().map(|(_, cycles)| *cycles).sum(); // Number of segments is the number of cycle tracking entries @@ -36,7 +36,7 @@ fn main() { // Generate uncompressed proof core_timer.start_timing(); // Set as mutable to allow for template code to access it if needed - let mut proof = client.prove(&pk, stdin.clone()).run().unwrap(); + let mut proof = client.prove(&pk, &stdin.clone()).run().unwrap(); metrics.core_prove_duration = core_timer.elapsed().unwrap(); // Get uncompressed proof size @@ -53,7 +53,7 @@ fn main() { // Generate compressed proof compress_timer.start_timing(); let compressed = client - .prove(&pk, stdin) + .prove(&pk, &stdin) .compressed() // Enable compression .run() .unwrap(); From cdbd927224fb82b65df36d59c9554639c6506ef8 Mon Sep 17 00:00:00 2001 From: Conner Swann <2635475+yourbuddyconner@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:00:23 -0800 Subject: [PATCH 3/6] update patch package versions --- src/sp1.rs | 2 +- workspaces/sp1/script/Cargo.lock | 599 ++++++++----------------------- workspaces/sp1/script/Cargo.toml | 2 +- 3 files changed, 161 insertions(+), 442 deletions(-) diff --git a/src/sp1.rs b/src/sp1.rs index 0cb0eb1..9d3b46f 100644 --- a/src/sp1.rs +++ b/src/sp1.rs @@ -42,7 +42,7 @@ pub const SP1_METRICS_PATH: &str = "./proof_data/sp1/sp1_metrics.json"; pub const SP1_GUEST_PROGRAM_HEADER: &str = "#![no_main]\nsp1_zkvm::entrypoint!(main);\n"; /// SP1 Cargo patch for accelerated SHA-256, K256, and bigint-multiplication circuits -pub const SP1_ACCELERATION_IMPORT: &str = "\n[patch.crates-io]\nsha2 = { git = \"https://github.com/sp1-patches/RustCrypto-hashes\", package = \"sha2\", branch = \"patch-sha2-v0.10.6\" }\nsha3 = { git = \"https://github.com/sp1-patches/RustCrypto-hashes\", package = \"sha3\", branch = \"patch-sha3-v0.10.8\" }\ncrypto-bigint = { git = \"https://github.com/sp1-patches/RustCrypto-bigint\", branch = \"patch-v0.5.5\" }\ntiny-keccak = { git = \"https://github.com/sp1-patches/tiny-keccak\", branch = \"patch-v2.0.2\" }\ned25519-consensus = { git = \"https://github.com/sp1-patches/ed25519-consensus\", branch = \"patch-v2.1.0\" }\necdsa-core = { git = \"https://github.com/sp1-patches/signatures\", package = \"ecdsa\", branch = \"patch-ecdsa-v0.16.9\" }\n"; +pub const SP1_ACCELERATION_IMPORT: &str = "\n[patch.crates-io]\nsha2 = { git = \"https://github.com/sp1-patches/RustCrypto-hashes\", package = \"sha2\", branch = \"patch-sha2-v0.10.8\" }\nsha3 = { git = \"https://github.com/sp1-patches/RustCrypto-hashes\", package = \"sha3\", branch = \"patch-sha3-v0.10.8\" }\ncrypto-bigint = { git = \"https://github.com/sp1-patches/RustCrypto-bigint\", branch = \"patch-v0.5.5\" }\ntiny-keccak = { git = \"https://github.com/sp1-patches/tiny-keccak\", branch = \"patch-v2.0.2\" }\ned25519-consensus = { git = \"https://github.com/sp1-patches/ed25519-consensus\", branch = \"patch-v2.1.0\" }\necdsa-core = { git = \"https://github.com/sp1-patches/signatures\", package = \"ecdsa\", branch = \"patch-ecdsa-v0.16.9\" }\n"; /// SP1 User I/O // Host diff --git a/workspaces/sp1/script/Cargo.lock b/workspaces/sp1/script/Cargo.lock index 572ba16..67a8641 100644 --- a/workspaces/sp1/script/Cargo.lock +++ b/workspaces/sp1/script/Cargo.lock @@ -2532,7 +2532,7 @@ dependencies = [ "sp1-helper", "sp1-prover", "sp1-sdk", - "sp1-stark 3.4.0", + "sp1-stark", "tracing", "tracing-subscriber", "zk_rust_io", @@ -2825,39 +2825,14 @@ dependencies = [ "sha2", ] -[[package]] -name = "p3-air" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066f571b2e645505ed5972dd0e1e252ba03352150830c9566769ca711c0f1e9b" -dependencies = [ - "p3-field 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", -] - [[package]] name = "p3-air" version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02634a874a2286b73f3e0a121e79d6774e92ccbec648c5568f4a7479a4830858" dependencies = [ - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", -] - -[[package]] -name = "p3-baby-bear" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff00f571044d299310d9659c6e51c98422de3bf94b8577f7f30cf59cf2043e40" -dependencies = [ - "num-bigint 0.4.6", - "p3-field 0.1.4-succinct", - "p3-mds 0.1.4-succinct", - "p3-poseidon2 0.1.4-succinct", - "p3-symmetric 0.1.4-succinct", - "rand", - "serde", + "p3-field", + "p3-matrix", ] [[package]] @@ -2867,10 +2842,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080896e9d09e9761982febafe3b3da5cbf320e32f0c89b6e2e01e875129f4c2d" dependencies = [ "num-bigint 0.4.6", - "p3-field 0.2.0-succinct", - "p3-mds 0.2.0-succinct", - "p3-poseidon2 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", + "p3-field", + "p3-mds", + "p3-poseidon2", + "p3-symmetric", "rand", "serde", ] @@ -2883,56 +2858,27 @@ checksum = "f8c53da73873e24d751ec3bd9d8da034bb5f99c71f24f4903ff37190182bff10" dependencies = [ "ff 0.13.0", "num-bigint 0.4.6", - "p3-field 0.2.0-succinct", - "p3-poseidon2 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", + "p3-field", + "p3-poseidon2", + "p3-symmetric", "rand", "serde", ] -[[package]] -name = "p3-challenger" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be7e4fbce4566a93091107eadfafa0b5374bd1ffd3e0f6b850da3ff72eb183f" -dependencies = [ - "p3-field 0.1.4-succinct", - "p3-maybe-rayon 0.1.4-succinct", - "p3-symmetric 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "serde", - "tracing", -] - [[package]] name = "p3-challenger" version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f5c497659a7d9a87882e30ee9a8d0e20c8dcd32cd10d432410e7d6f146ef103" dependencies = [ - "p3-field 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-field", + "p3-maybe-rayon", + "p3-symmetric", + "p3-util", "serde", "tracing", ] -[[package]] -name = "p3-commit" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a03eb0f99d68a712c41e658e9a7782a0705d4ffcfb6232a43bd3f1ef9591002" -dependencies = [ - "itertools 0.12.1", - "p3-challenger 0.1.4-succinct", - "p3-dft 0.1.4-succinct", - "p3-field 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "serde", -] - [[package]] name = "p3-commit" version = "0.2.0-succinct" @@ -2940,53 +2886,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ec340c5cb17739a7b9ee189378bdac8f0e684b9b5ce539476c26e77cd6a27d" dependencies = [ "itertools 0.12.1", - "p3-challenger 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-challenger", + "p3-field", + "p3-matrix", + "p3-util", "serde", ] -[[package]] -name = "p3-dft" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1556de968523fbe5d804ab50600ea306fcceea3500cfd7601e40882480524664" -dependencies = [ - "p3-field 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-maybe-rayon 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "tracing", -] - [[package]] name = "p3-dft" version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "292e97d02d4c38d8b306c2b8c0428bf15f4d32a11a40bcf80018f675bf33267e" dependencies = [ - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-field", + "p3-matrix", + "p3-maybe-rayon", + "p3-util", "tracing", ] -[[package]] -name = "p3-field" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec2af6e1ac47a2035af5165e668d64612c4b9ccabd06df37fc1fd381fdf8a71" -dependencies = [ - "itertools 0.12.1", - "num-bigint 0.4.6", - "num-traits", - "p3-util 0.1.4-succinct", - "rand", - "serde", -] - [[package]] name = "p3-field" version = "0.2.0-succinct" @@ -2996,30 +2915,11 @@ dependencies = [ "itertools 0.12.1", "num-bigint 0.4.6", "num-traits", - "p3-util 0.2.0-succinct", + "p3-util", "rand", "serde", ] -[[package]] -name = "p3-fri" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f351ee9f9d4256455164565cd91e3e6d2487cc2a5355515fa2b6d479269188dd" -dependencies = [ - "itertools 0.12.1", - "p3-challenger 0.1.4-succinct", - "p3-commit 0.1.4-succinct", - "p3-dft 0.1.4-succinct", - "p3-field 0.1.4-succinct", - "p3-interpolation 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-maybe-rayon 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "serde", - "tracing", -] - [[package]] name = "p3-fri" version = "0.2.0-succinct" @@ -3027,38 +2927,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ef838ff24d9b3de3d88d0ac984937d2aa2923bf25cb108ba9b2dc357e472197" dependencies = [ "itertools 0.12.1", - "p3-challenger 0.2.0-succinct", - "p3-commit 0.2.0-succinct", - "p3-dft 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-interpolation 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-challenger", + "p3-commit", + "p3-dft", + "p3-field", + "p3-interpolation", + "p3-matrix", + "p3-maybe-rayon", + "p3-util", "serde", "tracing", ] -[[package]] -name = "p3-interpolation" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24d0f2907a374ebe4545fcff3120d6376d9630cf0bef30feedcfc5908ea2c37" -dependencies = [ - "p3-field 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-util 0.1.4-succinct", -] - [[package]] name = "p3-interpolation" version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c806c3afb8d6acf1d3a78f4be1e9e8b026f13c01b0cdd5ae2e068b70a3ba6d80" dependencies = [ - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-field", + "p3-matrix", + "p3-util", ] [[package]] @@ -3067,26 +2956,11 @@ version = "0.2.0-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b46cef7ee8ae1f7cb560e7b7c137e272f6ba75be98179b3aa18695705231e0fb" dependencies = [ - "p3-air 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-util 0.2.0-succinct", - "tracing", -] - -[[package]] -name = "p3-matrix" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa272f3ae77ed8d73478aa7c89e712efb15bda3ff4aff10fadfe11a012cd5389" -dependencies = [ - "itertools 0.12.1", - "p3-field 0.1.4-succinct", - "p3-maybe-rayon 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "rand", - "serde", + "p3-air", + "p3-field", + "p3-matrix", + "p3-maybe-rayon", + "p3-util", "tracing", ] @@ -3097,23 +2971,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98bf2c7680b8e906a5e147fe4ceb05a11cc9fa35678aa724333bcb35c72483c1" dependencies = [ "itertools 0.12.1", - "p3-field 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-field", + "p3-maybe-rayon", + "p3-util", "rand", "serde", "tracing", ] -[[package]] -name = "p3-maybe-rayon" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eecad6292021858f282d643d9d1284ab112a200494d589863a9c4080e578ef0" -dependencies = [ - "rayon", -] - [[package]] name = "p3-maybe-rayon" version = "0.2.0-succinct" @@ -3123,21 +2988,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "p3-mds" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716c4dbe68a02f1541eb09149d07b8663a3a5951b1864a31cd67ff3bb0826e57" -dependencies = [ - "itertools 0.12.1", - "p3-dft 0.1.4-succinct", - "p3-field 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-symmetric 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "rand", -] - [[package]] name = "p3-mds" version = "0.2.0-succinct" @@ -3145,31 +2995,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "706cea48976f54702dc68dffa512684c1304d1a3606cadea423cfe0b1ee25134" dependencies = [ "itertools 0.12.1", - "p3-dft 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-dft", + "p3-field", + "p3-matrix", + "p3-symmetric", + "p3-util", "rand", ] -[[package]] -name = "p3-merkle-tree" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad7ebab52a03c26025988663a135aed62f5084a2e2ea262176dc8748efb593e5" -dependencies = [ - "itertools 0.12.1", - "p3-commit 0.1.4-succinct", - "p3-field 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-maybe-rayon 0.1.4-succinct", - "p3-symmetric 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "serde", - "tracing", -] - [[package]] name = "p3-merkle-tree" version = "0.2.0-succinct" @@ -3177,30 +3010,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f4ced385da80dd6b3fd830eaa452c9fa899f2dc3f6463aceba00620d5f071ec" dependencies = [ "itertools 0.12.1", - "p3-commit 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-commit", + "p3-field", + "p3-matrix", + "p3-maybe-rayon", + "p3-symmetric", + "p3-util", "serde", "tracing", ] -[[package]] -name = "p3-poseidon2" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c042efa15beab7a8c4d0ca9b9e4cbda7582be0c08e121e830fec45f082935b" -dependencies = [ - "gcd", - "p3-field 0.1.4-succinct", - "p3-mds 0.1.4-succinct", - "p3-symmetric 0.1.4-succinct", - "rand", - "serde", -] - [[package]] name = "p3-poseidon2" version = "0.2.0-succinct" @@ -3208,24 +3027,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ce5f5ec7f1ba3a233a671621029def7bd416e7c51218c9d1167d21602cf312" dependencies = [ "gcd", - "p3-field 0.2.0-succinct", - "p3-mds 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", + "p3-field", + "p3-mds", + "p3-symmetric", "rand", "serde", ] -[[package]] -name = "p3-symmetric" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9896a831f5b688adc13f6fbe1dcf66ecfaa4622a500f81aa745610e777acb72" -dependencies = [ - "itertools 0.12.1", - "p3-field 0.1.4-succinct", - "serde", -] - [[package]] name = "p3-symmetric" version = "0.2.0-succinct" @@ -3233,29 +3041,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f29dc5bb6c99d3de75869d5c086874b64890280eeb7d3e068955f939e219253" dependencies = [ "itertools 0.12.1", - "p3-field 0.2.0-succinct", + "p3-field", "serde", ] -[[package]] -name = "p3-uni-stark" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8437ebcd060c8a5479898030b114a93da8a86eb4c2e5f313d9eeaaf40c6e6f61" -dependencies = [ - "itertools 0.12.1", - "p3-air 0.1.4-succinct", - "p3-challenger 0.1.4-succinct", - "p3-commit 0.1.4-succinct", - "p3-dft 0.1.4-succinct", - "p3-field 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-maybe-rayon 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "serde", - "tracing", -] - [[package]] name = "p3-uni-stark" version = "0.2.0-succinct" @@ -3263,27 +3052,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83ceaeef06b0bc97e5af2d220cd340b0b3a72bdf37e4584b73b3bc357cfc9ed3" dependencies = [ "itertools 0.12.1", - "p3-air 0.2.0-succinct", - "p3-challenger 0.2.0-succinct", - "p3-commit 0.2.0-succinct", - "p3-dft 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-air", + "p3-challenger", + "p3-commit", + "p3-dft", + "p3-field", + "p3-matrix", + "p3-maybe-rayon", + "p3-util", "serde", "tracing", ] -[[package]] -name = "p3-util" -version = "0.1.4-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dedb9d27ba47ac314c6fac4ca54e55c3e486c864d51ec5ba55dbe47b75121157" -dependencies = [ - "serde", -] - [[package]] name = "p3-util" version = "0.2.0-succinct" @@ -4447,17 +4227,17 @@ dependencies = [ "log", "nohash-hasher", "num", - "p3-baby-bear 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-baby-bear", + "p3-field", + "p3-maybe-rayon", + "p3-util", "rand", "rrs-succinct", "serde", "serde_json", "sp1-curves", - "sp1-primitives 4.0.0", - "sp1-stark 4.0.0", + "sp1-primitives", + "sp1-stark", "strum", "strum_macros", "subenum", @@ -4488,17 +4268,17 @@ dependencies = [ "num", "num_cpus", "p256", - "p3-air 0.2.0-succinct", - "p3-baby-bear 0.2.0-succinct", - "p3-challenger 0.2.0-succinct", - "p3-field 0.2.0-succinct", + "p3-air", + "p3-baby-bear", + "p3-challenger", + "p3-field", "p3-keccak-air", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-poseidon2 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-uni-stark 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-matrix", + "p3-maybe-rayon", + "p3-poseidon2", + "p3-symmetric", + "p3-uni-stark", + "p3-util", "pathdiff", "rand", "rayon", @@ -4509,9 +4289,9 @@ dependencies = [ "snowbridge-amcl", "sp1-core-executor", "sp1-curves", - "sp1-derive 4.0.0", - "sp1-primitives 4.0.0", - "sp1-stark 4.0.0", + "sp1-derive", + "sp1-primitives", + "sp1-stark", "static_assertions", "strum", "strum_macros", @@ -4553,23 +4333,14 @@ dependencies = [ "k256", "num", "p256", - "p3-field 0.2.0-succinct", + "p3-field", "serde", "snowbridge-amcl", - "sp1-primitives 4.0.0", - "sp1-stark 4.0.0", + "sp1-primitives", + "sp1-stark", "typenum", ] -[[package]] -name = "sp1-derive" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "sp1-derive" version = "4.0.0" @@ -4588,23 +4359,6 @@ dependencies = [ "sp1-build 4.0.1", ] -[[package]] -name = "sp1-primitives" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" -dependencies = [ - "bincode", - "hex", - "lazy_static", - "num-bigint 0.4.6", - "p3-baby-bear 0.1.4-succinct", - "p3-field 0.1.4-succinct", - "p3-poseidon2 0.1.4-succinct", - "p3-symmetric 0.1.4-succinct", - "serde", - "sha2", -] - [[package]] name = "sp1-primitives" version = "4.0.0" @@ -4614,10 +4368,10 @@ dependencies = [ "hex", "lazy_static", "num-bigint 0.4.6", - "p3-baby-bear 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-poseidon2 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", + "p3-baby-bear", + "p3-field", + "p3-poseidon2", + "p3-symmetric", "serde", "sha2", ] @@ -4637,14 +4391,14 @@ dependencies = [ "itertools 0.13.0", "lru", "num-bigint 0.4.6", - "p3-baby-bear 0.2.0-succinct", + "p3-baby-bear", "p3-bn254-fr", - "p3-challenger 0.2.0-succinct", - "p3-commit 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-challenger", + "p3-commit", + "p3-field", + "p3-matrix", + "p3-symmetric", + "p3-util", "rayon", "serde", "serde_json", @@ -4652,12 +4406,12 @@ dependencies = [ "sha2", "sp1-core-executor", "sp1-core-machine", - "sp1-primitives 4.0.0", + "sp1-primitives", "sp1-recursion-circuit", "sp1-recursion-compiler", "sp1-recursion-core", "sp1-recursion-gnark-ffi", - "sp1-stark 4.0.0", + "sp1-stark", "thiserror 1.0.69", "tracing", "tracing-appender", @@ -4672,28 +4426,28 @@ dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", "num-traits", - "p3-air 0.2.0-succinct", - "p3-baby-bear 0.2.0-succinct", + "p3-air", + "p3-baby-bear", "p3-bn254-fr", - "p3-challenger 0.2.0-succinct", - "p3-commit 0.2.0-succinct", - "p3-dft 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-fri 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-challenger", + "p3-commit", + "p3-dft", + "p3-field", + "p3-fri", + "p3-matrix", + "p3-symmetric", + "p3-util", "rand", "rayon", "serde", "sp1-core-executor", "sp1-core-machine", - "sp1-derive 4.0.0", - "sp1-primitives 4.0.0", + "sp1-derive", + "sp1-primitives", "sp1-recursion-compiler", "sp1-recursion-core", "sp1-recursion-gnark-ffi", - "sp1-stark 4.0.0", + "sp1-stark", "tracing", ] @@ -4704,16 +4458,16 @@ source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021c dependencies = [ "backtrace", "itertools 0.13.0", - "p3-baby-bear 0.2.0-succinct", + "p3-baby-bear", "p3-bn254-fr", - "p3-field 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", + "p3-field", + "p3-symmetric", "serde", "sp1-core-machine", - "sp1-primitives 4.0.0", + "sp1-primitives", "sp1-recursion-core", "sp1-recursion-derive", - "sp1-stark 4.0.0", + "sp1-stark", "tracing", "vec_map", ] @@ -4732,27 +4486,27 @@ dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", "num_cpus", - "p3-air 0.2.0-succinct", - "p3-baby-bear 0.2.0-succinct", + "p3-air", + "p3-baby-bear", "p3-bn254-fr", - "p3-challenger 0.2.0-succinct", - "p3-commit 0.2.0-succinct", - "p3-dft 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-fri 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-merkle-tree 0.2.0-succinct", - "p3-poseidon2 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-challenger", + "p3-commit", + "p3-dft", + "p3-field", + "p3-fri", + "p3-matrix", + "p3-maybe-rayon", + "p3-merkle-tree", + "p3-poseidon2", + "p3-symmetric", + "p3-util", "pathdiff", "rand", "serde", "sp1-core-machine", - "sp1-derive 4.0.0", - "sp1-primitives 4.0.0", - "sp1-stark 4.0.0", + "sp1-derive", + "sp1-primitives", + "sp1-stark", "static_assertions", "thiserror 1.0.69", "tracing", @@ -4782,15 +4536,15 @@ dependencies = [ "hex", "log", "num-bigint 0.4.6", - "p3-baby-bear 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", + "p3-baby-bear", + "p3-field", + "p3-symmetric", "serde", "serde_json", "sha2", "sp1-core-machine", "sp1-recursion-compiler", - "sp1-stark 4.0.0", + "sp1-stark", "tempfile", ] @@ -4815,9 +4569,9 @@ dependencies = [ "indicatif", "itertools 0.13.0", "log", - "p3-baby-bear 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-fri 0.2.0-succinct", + "p3-baby-bear", + "p3-field", + "p3-fri", "prost", "reqwest", "reqwest-middleware", @@ -4827,9 +4581,9 @@ dependencies = [ "sp1-core-executor", "sp1-core-machine", "sp1-cuda", - "sp1-primitives 4.0.0", + "sp1-primitives", "sp1-prover", - "sp1-stark 4.0.0", + "sp1-stark", "strum", "strum_macros", "tempfile", @@ -4841,41 +4595,6 @@ dependencies = [ "vergen", ] -[[package]] -name = "sp1-stark" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v3.4.0#563ede179054dbc62186e24583bdcc4a68256799" -dependencies = [ - "arrayref", - "getrandom", - "hashbrown 0.14.5", - "itertools 0.13.0", - "num-traits", - "p3-air 0.1.4-succinct", - "p3-baby-bear 0.1.4-succinct", - "p3-challenger 0.1.4-succinct", - "p3-commit 0.1.4-succinct", - "p3-dft 0.1.4-succinct", - "p3-field 0.1.4-succinct", - "p3-fri 0.1.4-succinct", - "p3-matrix 0.1.4-succinct", - "p3-maybe-rayon 0.1.4-succinct", - "p3-merkle-tree 0.1.4-succinct", - "p3-poseidon2 0.1.4-succinct", - "p3-symmetric 0.1.4-succinct", - "p3-uni-stark 0.1.4-succinct", - "p3-util 0.1.4-succinct", - "rayon-scan", - "serde", - "sp1-derive 3.4.0", - "sp1-primitives 3.4.0", - "strum", - "strum_macros", - "sysinfo", - "thiserror 1.0.69", - "tracing", -] - [[package]] name = "sp1-stark" version = "4.0.0" @@ -4886,24 +4605,24 @@ dependencies = [ "itertools 0.13.0", "num-bigint 0.4.6", "num-traits", - "p3-air 0.2.0-succinct", - "p3-baby-bear 0.2.0-succinct", - "p3-challenger 0.2.0-succinct", - "p3-commit 0.2.0-succinct", - "p3-dft 0.2.0-succinct", - "p3-field 0.2.0-succinct", - "p3-fri 0.2.0-succinct", - "p3-matrix 0.2.0-succinct", - "p3-maybe-rayon 0.2.0-succinct", - "p3-merkle-tree 0.2.0-succinct", - "p3-poseidon2 0.2.0-succinct", - "p3-symmetric 0.2.0-succinct", - "p3-uni-stark 0.2.0-succinct", - "p3-util 0.2.0-succinct", + "p3-air", + "p3-baby-bear", + "p3-challenger", + "p3-commit", + "p3-dft", + "p3-field", + "p3-fri", + "p3-matrix", + "p3-maybe-rayon", + "p3-merkle-tree", + "p3-poseidon2", + "p3-symmetric", + "p3-uni-stark", + "p3-util", "rayon-scan", "serde", - "sp1-derive 4.0.0", - "sp1-primitives 4.0.0", + "sp1-derive", + "sp1-primitives", "strum", "strum_macros", "sysinfo", diff --git a/workspaces/sp1/script/Cargo.toml b/workspaces/sp1/script/Cargo.toml index cd245c9..0a28376 100644 --- a/workspaces/sp1/script/Cargo.toml +++ b/workspaces/sp1/script/Cargo.toml @@ -15,7 +15,7 @@ cuda = ["dep:sp1-cuda", "sp1-sdk/cuda"] sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } sp1-prover = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0", optional = true } -sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", tag = "v3.4.0" } +sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } sp1-core-machine = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } From 08f2299b8c22a5262f7762102b38074bc706fd60 Mon Sep 17 00:00:00 2001 From: Conner Swann <2635475+yourbuddyconner@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:44:28 -0800 Subject: [PATCH 4/6] bump to 4.0.1 --- Cargo.lock | 60 +++++++++++----------- Cargo.toml | 2 +- install_zkrust_from_source.sh | 2 +- workspaces/base_files/sp1/cargo_guest | 2 +- workspaces/base_files/sp1/cargo_host | 11 ++-- workspaces/sp1/program/Cargo.lock | 12 ++--- workspaces/sp1/program/Cargo.toml | 2 +- workspaces/sp1/script/Cargo.lock | 73 +++++++++++++-------------- workspaces/sp1/script/Cargo.toml | 11 ++-- 9 files changed, 80 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f8c814..dffc2f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6194,8 +6194,8 @@ dependencies = [ [[package]] name = "sp1-build" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "anyhow", "cargo_metadata", @@ -6206,8 +6206,8 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "bytemuck", @@ -6244,8 +6244,8 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "cbindgen", @@ -6300,8 +6300,8 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "ctrlc", @@ -6316,8 +6316,8 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "cfg-if", "dashu", @@ -6337,8 +6337,8 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "quote", "syn 1.0.109", @@ -6346,8 +6346,8 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "hex", @@ -6363,8 +6363,8 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "anyhow", "bincode", @@ -6405,8 +6405,8 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -6438,8 +6438,8 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6459,8 +6459,8 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "backtrace", "cbindgen", @@ -6501,8 +6501,8 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "quote", "syn 1.0.109", @@ -6510,8 +6510,8 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "anyhow", "bincode", @@ -6535,8 +6535,8 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "alloy-primitives", "alloy-signer", @@ -6582,8 +6582,8 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "arrayref", "hashbrown 0.14.5", diff --git a/Cargo.toml b/Cargo.toml index 770c696..e3b0c09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ toml = "0.8.12" reqwest = { version = "0.11", features = ["blocking"] } # Sp1 -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.1" } # Risc 0 risc0-zkvm = { git = "https://github.com/risc0/risc0.git", tag = "v1.2.0" } diff --git a/install_zkrust_from_source.sh b/install_zkrust_from_source.sh index c523168..add2c3b 100644 --- a/install_zkrust_from_source.sh +++ b/install_zkrust_from_source.sh @@ -74,7 +74,7 @@ if ! command -v sp1up &> /dev/null; then echo "Installing SP1 toolchain..." curl -L https://sp1.succinct.xyz | bash export PATH="$PATH:$HOME/.sp1/bin" - sp1up -v v4.0.0 + sp1up -v v4.0.1 else echo "SP1 toolchain already installed" fi diff --git a/workspaces/base_files/sp1/cargo_guest b/workspaces/base_files/sp1/cargo_guest index bb64629..a83cff3 100644 --- a/workspaces/base_files/sp1/cargo_guest +++ b/workspaces/base_files/sp1/cargo_guest @@ -5,4 +5,4 @@ name = "method" edition = "2021" [dependencies] -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.1" } diff --git a/workspaces/base_files/sp1/cargo_host b/workspaces/base_files/sp1/cargo_host index a3aad0a..2ed4373 100644 --- a/workspaces/base_files/sp1/cargo_host +++ b/workspaces/base_files/sp1/cargo_host @@ -5,19 +5,14 @@ name = "method" edition = "2021" [build-dependencies] -sp1-helper = "4.0.0" +sp1-helper = "4.0.1" [features] default = [] -cuda = ["dep:sp1-cuda", "sp1-sdk/cuda"] +cuda = ["sp1-sdk/cuda"] [dependencies] -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-prover = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0", optional = true } -sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-core-machine = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.1" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/workspaces/sp1/program/Cargo.lock b/workspaces/sp1/program/Cargo.lock index aeaee39..dfc8447 100644 --- a/workspaces/sp1/program/Cargo.lock +++ b/workspaces/sp1/program/Cargo.lock @@ -383,8 +383,8 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "serde", @@ -393,8 +393,8 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "hex", @@ -410,8 +410,8 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "cfg-if", "getrandom", diff --git a/workspaces/sp1/program/Cargo.toml b/workspaces/sp1/program/Cargo.toml index fe5df7d..8bccedb 100644 --- a/workspaces/sp1/program/Cargo.toml +++ b/workspaces/sp1/program/Cargo.toml @@ -5,5 +5,5 @@ name = "method" edition = "2021" [dependencies] -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.1" } zk_rust_io = { git = "https://github.com/yetanotherco/zkRust.git" } diff --git a/workspaces/sp1/script/Cargo.lock b/workspaces/sp1/script/Cargo.lock index 67a8641..58394a5 100644 --- a/workspaces/sp1/script/Cargo.lock +++ b/workspaces/sp1/script/Cargo.lock @@ -2526,13 +2526,8 @@ dependencies = [ "bincode", "serde", "serde_json", - "sp1-core-executor", - "sp1-core-machine", - "sp1-cuda", "sp1-helper", - "sp1-prover", "sp1-sdk", - "sp1-stark", "tracing", "tracing-subscriber", "zk_rust_io", @@ -4187,8 +4182,9 @@ dependencies = [ [[package]] name = "sp1-build" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82249c52570bdb8c499e352a5309ca8051f80068df42d4b4500987592f9eb57c" dependencies = [ "anyhow", "cargo_metadata", @@ -4200,8 +4196,7 @@ dependencies = [ [[package]] name = "sp1-build" version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82249c52570bdb8c499e352a5309ca8051f80068df42d4b4500987592f9eb57c" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "anyhow", "cargo_metadata", @@ -4212,8 +4207,8 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "bytemuck", @@ -4250,8 +4245,8 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "cbindgen", @@ -4306,8 +4301,8 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "ctrlc", @@ -4322,8 +4317,8 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "cfg-if", "dashu", @@ -4343,8 +4338,8 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "quote", "syn 1.0.109", @@ -4356,13 +4351,13 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0fb17d71032c21ba86f741485714a260249afda15c7dd6b92f43f595356cf93" dependencies = [ - "sp1-build 4.0.1", + "sp1-build 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp1-primitives" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "bincode", "hex", @@ -4378,8 +4373,8 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "anyhow", "bincode", @@ -4420,8 +4415,8 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -4453,8 +4448,8 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "backtrace", "itertools 0.13.0", @@ -4474,8 +4469,8 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "backtrace", "cbindgen", @@ -4516,8 +4511,8 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "quote", "syn 1.0.109", @@ -4525,8 +4520,8 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "anyhow", "bincode", @@ -4550,8 +4545,8 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "alloy-primitives", "alloy-signer", @@ -4577,7 +4572,7 @@ dependencies = [ "reqwest-middleware", "serde", "serde_json", - "sp1-build 4.0.0", + "sp1-build 4.0.1 (git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1)", "sp1-core-executor", "sp1-core-machine", "sp1-cuda", @@ -4597,8 +4592,8 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.0#4a1dcea0749021ce6e2596bce5bb45f2def7a95c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1.git?tag=v4.0.1#dae15e9fe60d51a3a702361c74ca93f97fab2e16" dependencies = [ "arrayref", "hashbrown 0.14.5", diff --git a/workspaces/sp1/script/Cargo.toml b/workspaces/sp1/script/Cargo.toml index 0a28376..4945736 100644 --- a/workspaces/sp1/script/Cargo.toml +++ b/workspaces/sp1/script/Cargo.toml @@ -5,19 +5,14 @@ name = "method" edition = "2021" [build-dependencies] -sp1-helper = "4.0.0" +sp1-helper = "4.0.1" [features] default = [] -cuda = ["dep:sp1-cuda", "sp1-sdk/cuda"] +cuda = ["sp1-sdk/cuda"] [dependencies] -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-prover = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0", optional = true } -sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-core-executor = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } -sp1-core-machine = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.0" } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v4.0.1" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" From 8d4d71d67fc5cfc18d1dc1605424c39469faca14 Mon Sep 17 00:00:00 2001 From: Conner Swann <2635475+yourbuddyconner@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:14:28 -0800 Subject: [PATCH 5/6] remove elf folder(?) --- .../program/elf/riscv32im-succinct-zkvm-elf | Bin 138652 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 workspaces/sp1/program/elf/riscv32im-succinct-zkvm-elf diff --git a/workspaces/sp1/program/elf/riscv32im-succinct-zkvm-elf b/workspaces/sp1/program/elf/riscv32im-succinct-zkvm-elf deleted file mode 100755 index 87bed89ae4b2bb363f5ac623e978a919f84d16c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138652 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 z 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 f{Gr Date: Tue, 21 Jan 2025 21:31:47 -0800 Subject: [PATCH 6/6] elf path fix --- workspaces/base_files/sp1/host | 4 +++- workspaces/sp1/script/src/main.rs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/workspaces/base_files/sp1/host b/workspaces/base_files/sp1/host index 0af1c17..74dbbe5 100644 --- a/workspaces/base_files/sp1/host +++ b/workspaces/base_files/sp1/host @@ -6,7 +6,9 @@ use tracing::{error, info}; /// The ELF (executable and linkable format) file for the Succinct RISC-V zkVM. /// /// This file is generated by running `cargo prove build` inside the `program` directory. -pub const METHOD_ELF: &[u8] = include_bytes!("../../program/elf/riscv32im-succinct-zkvm-elf"); +pub const METHOD_ELF: &[u8] = include_bytes!( + "../../program/target/elf-compilation/riscv32im-succinct-zkvm-elf/release/method" +); fn main() { let args: Vec = std::env::args().collect(); diff --git a/workspaces/sp1/script/src/main.rs b/workspaces/sp1/script/src/main.rs index 0af1c17..74dbbe5 100644 --- a/workspaces/sp1/script/src/main.rs +++ b/workspaces/sp1/script/src/main.rs @@ -6,7 +6,9 @@ use tracing::{error, info}; /// The ELF (executable and linkable format) file for the Succinct RISC-V zkVM. /// /// This file is generated by running `cargo prove build` inside the `program` directory. -pub const METHOD_ELF: &[u8] = include_bytes!("../../program/elf/riscv32im-succinct-zkvm-elf"); +pub const METHOD_ELF: &[u8] = include_bytes!( + "../../program/target/elf-compilation/riscv32im-succinct-zkvm-elf/release/method" +); fn main() { let args: Vec = std::env::args().collect();