diff --git a/.github/workflows/cycle-tracking.yml b/.github/workflows/cycle-tracking.yml index d3b93a78..518ebf85 100644 --- a/.github/workflows/cycle-tracking.yml +++ b/.github/workflows/cycle-tracking.yml @@ -30,7 +30,7 @@ jobs: - name: "Install SP1 toolchain" run: | - sp1up -v v6.0.2 + sp1up -v v6.1.0 - name: "Set up test fixture" run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 04acf9b2..e6892f77 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -33,35 +33,6 @@ jobs: exit 1 fi - deps-semver: - name: "Check upstream SemVer violations" - runs-on: ["runs-on", "runner=8cpu-linux-x64", "run-id=${{ github.run_id }}"] - steps: - - name: "Checkout sources" - uses: "actions/checkout@v4" - - - name: "Install protoc" - run: | - sudo apt-get update - sudo apt-get install -y protobuf-compiler - - - name: "Install sp1up" - run: | - curl -L https://sp1.succinct.xyz | bash - echo "$HOME/.sp1/bin" >> $GITHUB_PATH - - - name: "Install SP1 toolchain" - run: | - sp1up -v v6.0.2 - - - name: "Remove lock files" - run: | - find -name Cargo.lock -type f -exec rm {} \; - - - name: "Build without lock files" - run: | - cargo build --all --all-targets - fmt: name: "Check code format" runs-on: ["runs-on", "runner=8cpu-linux-x64", "run-id=${{ github.run_id }}"] @@ -100,7 +71,7 @@ jobs: - name: "Install SP1 toolchain" run: | - sp1up -v v6.0.2 + sp1up -v v6.1.0 # This step is necessary to generate the ELF files. - name: "Build" @@ -133,7 +104,7 @@ jobs: - name: "Install SP1 toolchain" run: | - sp1up -v v6.0.2 + sp1up -v v6.1.0 - name: "Set up test fixture" run: | diff --git a/Cargo.lock b/Cargo.lock index f716dd4c..09d56eaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -352,7 +352,7 @@ dependencies = [ "rand 0.9.2", "rapidhash", "ruint", - "rustc-hash 2.1.1", + "rustc-hash", "serde", "sha3", ] @@ -532,7 +532,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.14.0", + "itertools 0.13.0", "serde", "serde_json", "serde_with", @@ -680,7 +680,7 @@ checksum = "aa501ad58dd20acddbfebc65b52e60f05ebf97c52fa40d1b35e91f5e2da0ad0e" dependencies = [ "alloy-json-rpc", "alloy-transport", - "itertools 0.14.0", + "itertools 0.13.0", "reqwest", "serde_json", "tower 0.5.3", @@ -1297,26 +1297,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" -dependencies = [ - "bitflags 2.11.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.117", -] - [[package]] name = "bit-set" version = "0.8.0" @@ -1588,15 +1568,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -1621,17 +1592,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "4.5.60" @@ -1816,6 +1776,30 @@ dependencies = [ "libc", ] +[[package]] +name = "crash-context" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031ed29858d90cfdf27fe49fae28028a1f20466db97962fa2f4ea34809aeebf3" +dependencies = [ + "cfg-if", + "libc", + "mach2", +] + +[[package]] +name = "crash-handler" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df5c9639f4942eb7702b964b3f9adf03a55724a57558cc177407388a8b936e2" +dependencies = [ + "cfg-if", + "crash-context", + "libc", + "mach2", + "parking_lot 0.12.5", +] + [[package]] name = "crc" version = "3.4.0" @@ -2284,20 +2268,6 @@ 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 0.8.5", - "reqwest", - "thiserror 1.0.69", - "tokio", -] - [[package]] name = "dunce" version = "1.0.5" @@ -3630,16 +3600,6 @@ version = "0.2.182" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link", -] - [[package]] name = "libm" version = "0.2.16" @@ -3728,6 +3688,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +[[package]] +name = "mach2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" +dependencies = [ + "libc", +] + [[package]] name = "macro-string" version = "0.1.4" @@ -4989,8 +4958,8 @@ version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ - "heck 0.5.0", - "itertools 0.14.0", + "heck 0.4.1", + "itertools 0.13.0", "log", "multimap", "once_cell", @@ -5010,7 +4979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.117", @@ -5052,7 +5021,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "socket2 0.6.2", "thiserror 2.0.18", @@ -5072,7 +5041,7 @@ dependencies = [ "lru-slab", "rand 0.9.2", "ring", - "rustc-hash 2.1.1", + "rustc-hash", "rustls", "rustls-pki-types", "slab", @@ -6417,12 +6386,6 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -6950,18 +6913,18 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "slop-air" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "242539aba9e5424923d7bd629775570c7d10ec28584e96ea599575a51bedcde8" +checksum = "9bfd4c0fb41e0638afd60ce2ebf74d59225e3c20e25b8f202912c8a38f793de4" dependencies = [ "p3-air", ] [[package]] name = "slop-algebra" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691beea96fd18d4881f9ca1cb4e58194dac6366f24956a2fdae00c8ee382a0c9" +checksum = "733912d564a68ff209707e71fdc517d4ff82d4362b6a409f6a8241dfcb7a576a" dependencies = [ "itertools 0.14.0", "p3-field", @@ -6970,9 +6933,9 @@ dependencies = [ [[package]] name = "slop-alloc" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58b7800cba9b31377f9353174d13fd8e39608b6f1d1531f0e92b8ce4af49ae0" +checksum = "0ee6cc091290f9db6e3d3452430970f5234dbd270541300c9554d8172e18d0c2" dependencies = [ "serde", "slop-algebra", @@ -6981,9 +6944,9 @@ dependencies = [ [[package]] name = "slop-baby-bear" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949e3c822532a87b4ad04f7280283c256621b0a83aee1b40cbd721df29df641d" +checksum = "3f0138bae78c3d8f1691ee28315dd87b3d71c0b71e51e7b9eabf8d2e6ffffcfa" dependencies = [ "lazy_static", "p3-baby-bear", @@ -6996,9 +6959,9 @@ dependencies = [ [[package]] name = "slop-basefold" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58984f92091a668a006b6895487079d99209e599b02d636f061fe4ae26977fb5" +checksum = "272d5e3082f066bcdd6ded60e3dd403a7697f4bbfaeea4c4e00f088bd555305e" dependencies = [ "derive-where", "itertools 0.14.0", @@ -7019,9 +6982,9 @@ dependencies = [ [[package]] name = "slop-basefold-prover" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86eb8581b52f97860242fe5e8d6b49d2a37e1b38d4a647adf24acaa2965ee7d" +checksum = "175433ed8fc9a45fcb835b4375bbe54c5df0022b920f248055da6ae99e141104" dependencies = [ "derive-where", "itertools 0.14.0", @@ -7046,9 +7009,9 @@ dependencies = [ [[package]] name = "slop-bn254" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1852499c245f7f3dec23408b4930b3ea7570ae914b9c31f12950ac539d85ee" +checksum = "a71b23ede427299e139fb822c5d0ea8fb931dc297eba0c6e2f30f774c04ebc81" dependencies = [ "ff 0.13.1", "p3-bn254-fr", @@ -7062,9 +7025,9 @@ dependencies = [ [[package]] name = "slop-challenger" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4349af93602f3876a3eda948a74d9d16d774c401dfe25f41a45ffd84f230bc1" +checksum = "59e4993210936ab317c0d56ee8257e1cdfe6c2fae4df1e158737f034e21d45f9" dependencies = [ "futures", "p3-challenger", @@ -7075,9 +7038,9 @@ dependencies = [ [[package]] name = "slop-commit" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584339690d20fb6b34b0dc957cbd267221ba2ab7b0c1292c118378f3498979c4" +checksum = "afe1a49612ffedb6a44825ccbaa54ea53670a61366b8112a80865fef462630f9" dependencies = [ "p3-commit", "serde", @@ -7086,9 +7049,9 @@ dependencies = [ [[package]] name = "slop-dft" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148281e1611ca570d016a733aac2f3ec9867241cc800a96d15bc6ecfd010daf7" +checksum = "b1fe8ca56f2cb47f22658f923e8d1a97413bb89ecc4e7185722ec406e61b82e9" dependencies = [ "p3-dft", "serde", @@ -7100,18 +7063,18 @@ dependencies = [ [[package]] name = "slop-fri" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0857a346ea28496ee56b1dcad192db8c7ff0455a18bfd67ce6513323b594b746" +checksum = "434a8e3f5fc6c5a1973a3c3964b4589af26c74bd480fd7cd6dcb0feb7d7e8f92" dependencies = [ "p3-fri", ] [[package]] name = "slop-futures" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bbfea5447d243572da7aae8d5e57856229a97fb8bc6a42439d4c5f4de951ee0" +checksum = "69e76ea10d2865798d6a9c39faffbc2c23c0bbf34a6e449e83de409aa265171a" dependencies = [ "crossbeam", "futures", @@ -7124,9 +7087,9 @@ dependencies = [ [[package]] name = "slop-jagged" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc420430b93d38e9aae903bc4bc11c342f8d49d015cca26eeb36a6ea3f7a0f1f" +checksum = "8677ede7f5b5f1fa19884ba07b6120cbb74b4e4ff4cb56cd068e01fffd4e603b" dependencies = [ "derive-where", "futures", @@ -7158,18 +7121,18 @@ dependencies = [ [[package]] name = "slop-keccak-air" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288abf40d9901f79e221ece87f11324826289bf5d694fde07dd785bdb4afda38" +checksum = "794162816eb0c8869f2bf09881ac6a7c808da1aab11e097ca25460e4ef895cc7" dependencies = [ "p3-keccak-air", ] [[package]] name = "slop-koala-bear" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "574784c044d11cf9d8238dc18bce9b897bc34d0fb1daaceafd75ebb400084016" +checksum = "8986e94b9a43d58fc8ce5bf111b0985479ab888ced923e3052fb19943f7859b4" dependencies = [ "lazy_static", "p3-koala-bear", @@ -7182,27 +7145,27 @@ dependencies = [ [[package]] name = "slop-matrix" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1117c395388bd172826115ac4f9a7e09bf9c937ceafa82194132a058e27c0d" +checksum = "a89bef0d6e09bc5431c6b50b3eee460722ca9eb569dffcdec582bd1d72db496c" dependencies = [ "p3-matrix", ] [[package]] name = "slop-maybe-rayon" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81316cfe721c3f47cd0af63002a8b6557c951ff9588fa7db0f4f3b99af091486" +checksum = "e135011bcdae048b9e85f42ba95cc8dc69cb4f5566289044cabe67a6ac65e6e0" dependencies = [ "p3-maybe-rayon", ] [[package]] name = "slop-merkle-tree" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e700652778c15320f6269362103b87a3787a7c9d70fb05d9742dbce66c46f764" +checksum = "748e3fb2d76fd2e2017d9e544072a8318efc1deac6277b5721d31381a674d505" dependencies = [ "derive-where", "ff 0.13.1", @@ -7221,15 +7184,16 @@ dependencies = [ "slop-poseidon2", "slop-symmetric", "slop-tensor", + "slop-utils", "thiserror 1.0.69", "zkhash", ] [[package]] name = "slop-multilinear" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6151db452ace0d960314f46c61a2b8d45e1fa4dfd5830447c67fc1e1e1e823b5" +checksum = "b579ce845ca26e0c2750d11f09327add269e4b695c21b35f1659f49b9bd08311" dependencies = [ "derive-where", "futures", @@ -7248,27 +7212,27 @@ dependencies = [ [[package]] name = "slop-poseidon2" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af617970b63e8d7199204bc02996745b6c35c39f2b513a118c62c7b1a0b2f1b" +checksum = "5b06e4a24cba104a0a39740eedd97e60e8896926cc38e6a58d5866cc9811affa" dependencies = [ "p3-poseidon2", ] [[package]] name = "slop-primitives" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d82c53508f3ebff8acdabb5db2584f37686257a2549a17c977cf30cd9e24e6" +checksum = "0b0b66701c82f6aab97f4990b5d9ed7463beb5b5042dbe5eda5f6c71a6207b35" dependencies = [ "slop-algebra", ] [[package]] name = "slop-stacked" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25c9fb9c908a2d10037934e2c299d30f98a2146f6ded87a7b529b05ddbfda27" +checksum = "8992c338b13abe792faf62000a47096f08817ea655036c530990b1c60c5ff256" dependencies = [ "derive-where", "futures", @@ -7289,9 +7253,9 @@ dependencies = [ [[package]] name = "slop-sumcheck" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c691f34c05e933777059a10804e00f77834b927abc2701f5f394e9c2b49c1c" +checksum = "45fdcab8b7e0fa43b808112fd1c387eabfa7e09435c6a4fb92e45b917971ade8" dependencies = [ "futures", "itertools 0.14.0", @@ -7307,18 +7271,18 @@ dependencies = [ [[package]] name = "slop-symmetric" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15acfa7f567ffa4f36de134492632a397c33fa6af2e48894e50978b52eeeb871" +checksum = "e6d159948b924fd00f280064d7a049e43dceb2f26067f32fb99570d3169969ee" dependencies = [ "p3-symmetric", ] [[package]] name = "slop-tensor" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796e5ff7dcdcd2c15f423a27550a4688e25009bd5ca648d9593d66f243950d6" +checksum = "f0a6b65130a06d1b1a24ab4928e1eadc5a6e14f35c171c0e69d5b9cf6c4d56e9" dependencies = [ "arrayvec", "derive-where", @@ -7336,18 +7300,18 @@ dependencies = [ [[package]] name = "slop-uni-stark" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504f32330985e48a6aa9c9e0985641a4dc084d3843ff59075591b24b818f2a67" +checksum = "b3655347bb0dc0e559a63fa8c5053a79d9d0258af04b6b3bebfc51fff880416a" dependencies = [ "p3-uni-stark", ] [[package]] name = "slop-utils" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba510663661800990c1207ddbf3a1e67a551f05d882a60197adbb19c6824754f" +checksum = "4fad36458e05b6ccc8ebe951734e9d036128eb0f01596824e1104a37b3216654" dependencies = [ "p3-util", "tracing-forest", @@ -7356,9 +7320,9 @@ dependencies = [ [[package]] name = "slop-whir" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71f6a16450fc701450831121810da91c6ee3ac50e4705327dcd4957b046015a" +checksum = "d104106013cf050132b47d73568b4562e273c0dda3a1d304a96afab25737d414" dependencies = [ "derive-where", "futures", @@ -7425,9 +7389,9 @@ dependencies = [ [[package]] name = "sp1-build" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fe5854ea3054c20b34fe85b08437583174e8cd71e612fcfef67ea841daea14" +checksum = "7321136acefff985b0fb201b84359d609451bbd0a63203d4b601eaabe28da14f" dependencies = [ "anyhow", "cargo_metadata", @@ -7439,9 +7403,9 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc9268de48a534ccb82287a517c0a07ee594136bc9fce6c7eb438c69e7917be" +checksum = "89e911afd7e96cab3936e275445e23d1e6cb26776bd06223cb4466e812b13b54" dependencies = [ "bincode", "bytemuck", @@ -7480,11 +7444,48 @@ dependencies = [ "vec_map", ] +[[package]] +name = "sp1-core-executor-runner" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3bf24cda2b466c097e62a60a3e1ac7ff014d7972f4ff350d72ff2b89eff5128" +dependencies = [ + "base64 0.22.1", + "bincode", + "cargo_metadata", + "hashbrown 0.14.5", + "hex", + "libc", + "sha2", + "sp1-core-executor", + "sp1-core-executor-runner-binary", + "sp1-jit", + "sp1-primitives", + "sysinfo", + "tracing", + "uuid", +] + +[[package]] +name = "sp1-core-executor-runner-binary" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf22b7b1696ce686f79efb99a543a10b0b82d1068834087d21f0fe3d76d9054d" +dependencies = [ + "bincode", + "crash-handler", + "libc", + "serde", + "sp1-core-executor", + "sp1-jit", + "tracing-subscriber", +] + [[package]] name = "sp1-core-machine" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d436300d3052341854e58c88a9b5444a6f45689ee8933f9bec047ac367693182" +checksum = "83fd9328937306a831184febaae80c7b63ee15d3716573f0a34d62f5dee7408d" dependencies = [ "bincode", "cfg-if", @@ -7510,6 +7511,7 @@ dependencies = [ "slop-uni-stark", "snowbridge-amcl", "sp1-core-executor", + "sp1-core-executor-runner", "sp1-curves", "sp1-derive", "sp1-hypercube", @@ -7529,9 +7531,9 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a03bb846daaabe6e94af5e5199aa110b42c68482d6380b7e765d9d6b65119d52" +checksum = "5d59fee6cc9cd3a9aedf0dfb79b157ea1e4597b4448bb2f40a549fdde16b2eaa" dependencies = [ "bincode", "bytes", @@ -7550,9 +7552,9 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e3ad4fc0f5ea7286fbe5c788d97125dc0cb40eb81f15becb432a65f350cd2f9" +checksum = "bf1e420a0980906ff8f875525664209395c7a5243243ff70283adb357e921ef2" dependencies = [ "cfg-if", "dashu", @@ -7572,9 +7574,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f111a90749619066fbd7ba102b22375bc6c824abb66804c3184ba0f650d017a2" +checksum = "caa1235972b67b86514c3f23ba690972b712dd009159c2e50f723d7ac02173d8" dependencies = [ "proc-macro2", "quote", @@ -7583,9 +7585,9 @@ dependencies = [ [[package]] name = "sp1-hypercube" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff340db83b2c38b01f022624b8b792c38f201417581d6855dbe9a445d2485f" +checksum = "b8314d1620d659913912121a3ecae19d1384fdd06e43d954034cad8bd082f5db" dependencies = [ "arrayref", "deepsize2", @@ -7631,12 +7633,13 @@ dependencies = [ [[package]] name = "sp1-jit" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcadaa9206d36ae953c1b4390373879281ef1423115aa180e7ef0e82259d92aa" +checksum = "7e6b9a7102c21e5ecd5b65861188f068f17951a2db9bc3fd4f65cd5f9b0e8449" dependencies = [ "dynasmrt", "hashbrown 0.14.5", + "libc", "memfd", "memmap2", "serde", @@ -7658,9 +7661,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f395525b4fc46d37136f45be264c81718a67f4409c14c547ff491a263e019e7" +checksum = "b6b77098dae9d62e080be3af253188c08e7e96e666423306654eede0110bf363" dependencies = [ "bincode", "blake3", @@ -7682,15 +7685,14 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64545387a6b5ee58155d75183223a8f19961e23d76a13a49c16514896e52ff7" +checksum = "d4ba1691f53df50f8024f756c3a0e7b009e544e31c7297ae591eceba1d27232c" dependencies = [ "anyhow", "bincode", "clap", "dirs", - "downloader", "either", "enum-map", "eyre", @@ -7721,6 +7723,7 @@ dependencies = [ "slop-stacked", "slop-symmetric", "sp1-core-executor", + "sp1-core-executor-runner", "sp1-core-machine", "sp1-derive", "sp1-hypercube", @@ -7746,9 +7749,9 @@ dependencies = [ [[package]] name = "sp1-prover-types" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834512266314b8dd35fd52b921d62abb113c3c35b27358acdbc178b3a17ec72e" +checksum = "011fe0b63d8b930665e5e6ca5f9f766c1b442727ec473d0baeea629d225c4360" dependencies = [ "anyhow", "async-scoped", @@ -7767,9 +7770,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105531a782d66030eab608832e0829e4699053a6d41cd3c2c7931def9c9540fb" +checksum = "ae1bb2594e6480d20c6d4be6099408df3a0de85bc956f0e74511c80515ac9e2d" dependencies = [ "bincode", "itertools 0.14.0", @@ -7807,9 +7810,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ab98d241444285539b0d4203288fbe9887707c355e346cfb176b461524c58d" +checksum = "8e113c225149badeda05e679f169281cad6ef0480919f726e21acdfbf38848fb" dependencies = [ "backtrace", "cfg-if", @@ -7828,9 +7831,9 @@ dependencies = [ [[package]] name = "sp1-recursion-executor" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc69767dce218874edbef09515ccc5fb32d5e6b857a95a99944a66f6f405f5b1" +checksum = "a8805b6ad230dbfc249a4c8a2ddb8cdad1053377739b7c8a6a78f06328170b63" dependencies = [ "backtrace", "cfg-if", @@ -7852,13 +7855,12 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f526cb636baa1ad67f1410884e7a5580b7068beee3ee88609fb39f906bab27b3" +checksum = "1a7892c7c442aa109053998b360e91a26d776f63cb394fa50caf59ca626c08dd" dependencies = [ "anyhow", "bincode", - "bindgen", "cfg-if", "hex", "num-bigint 0.4.6", @@ -7877,9 +7879,9 @@ dependencies = [ [[package]] name = "sp1-recursion-machine" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ec6719240b0933289332d730be328d3a3e4f9e6ff9ee2e20ec2b4a99aeed9" +checksum = "2fb19db493ef086f0b5869e6c5ad52da728f265647a8a1f2bf765c3236eda6b0" dependencies = [ "itertools 0.14.0", "rand 0.8.5", @@ -7900,9 +7902,9 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8dae789acfa3b4e8211234d05901c28cd1b988f230c9db0c29207fa131071a" +checksum = "349ca86c7a88456c9f0fa1c8869e0d35bb63d6c811dc9ad8337c90909ce532ec" dependencies = [ "anyhow", "async-trait", @@ -7918,18 +7920,9 @@ dependencies = [ "num-bigint 0.4.6", "serde", "sha2", - "slop-algebra", - "slop-alloc", - "slop-basefold", - "slop-commit", - "slop-jagged", - "slop-merkle-tree", - "slop-multilinear", - "slop-stacked", - "slop-sumcheck", - "slop-tensor", "sp1-build", "sp1-core-executor", + "sp1-core-executor-runner", "sp1-core-machine", "sp1-cuda", "sp1-hypercube", @@ -7937,7 +7930,6 @@ dependencies = [ "sp1-prover", "sp1-prover-types", "sp1-recursion-executor", - "sp1-recursion-gnark-ffi", "sp1-verifier", "strum", "tempfile", @@ -7948,9 +7940,9 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11dd15bf0dc2325ced1f3bb58bfed84efc5228a09127ab6787ee5103514f09e" +checksum = "f97f6c90e5f44ffaa18e0cf7aab2f4f02d0a2261aee21d4a48e09cc453ef0e0e" dependencies = [ "bincode", "blake3", diff --git a/Cargo.toml b/Cargo.toml index 8425edc0..34b1bdc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,10 +53,10 @@ rsp-provider = { path = "./crates/provider" } # sp1 -sp1-build = "6.0.2" -sp1-core-executor = { version = "6.0.2", features = ["bigint-rug"] } -sp1-prover = "6.0.2" -sp1-sdk = { version = "6.0.2", features = ["profiling"] } +sp1-build = "=6.1.0" +sp1-core-executor = { version = "=6.1.0", features = ["bigint-rug"] } +sp1-prover = "=6.1.0" +sp1-sdk = { version = "=6.1.0", features = ["profiling"] } # reth reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3", default-features = false } diff --git a/bin/client-op/Cargo.lock b/bin/client-op/Cargo.lock index 75fa3fe5..00719ace 100644 --- a/bin/client-op/Cargo.lock +++ b/bin/client-op/Cargo.lock @@ -4498,9 +4498,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "slop-algebra" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691beea96fd18d4881f9ca1cb4e58194dac6366f24956a2fdae00c8ee382a0c9" +checksum = "733912d564a68ff209707e71fdc517d4ff82d4362b6a409f6a8241dfcb7a576a" dependencies = [ "itertools 0.14.0", "p3-field", @@ -4509,9 +4509,9 @@ dependencies = [ [[package]] name = "slop-bn254" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1852499c245f7f3dec23408b4930b3ea7570ae914b9c31f12950ac539d85ee" +checksum = "a71b23ede427299e139fb822c5d0ea8fb931dc297eba0c6e2f30f774c04ebc81" dependencies = [ "ff 0.13.1", "p3-bn254-fr", @@ -4525,9 +4525,9 @@ dependencies = [ [[package]] name = "slop-challenger" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4349af93602f3876a3eda948a74d9d16d774c401dfe25f41a45ffd84f230bc1" +checksum = "59e4993210936ab317c0d56ee8257e1cdfe6c2fae4df1e158737f034e21d45f9" dependencies = [ "futures", "p3-challenger", @@ -4538,9 +4538,9 @@ dependencies = [ [[package]] name = "slop-koala-bear" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "574784c044d11cf9d8238dc18bce9b897bc34d0fb1daaceafd75ebb400084016" +checksum = "8986e94b9a43d58fc8ce5bf111b0985479ab888ced923e3052fb19943f7859b4" dependencies = [ "lazy_static", "p3-koala-bear", @@ -4553,27 +4553,27 @@ dependencies = [ [[package]] name = "slop-poseidon2" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af617970b63e8d7199204bc02996745b6c35c39f2b513a118c62c7b1a0b2f1b" +checksum = "5b06e4a24cba104a0a39740eedd97e60e8896926cc38e6a58d5866cc9811affa" dependencies = [ "p3-poseidon2", ] [[package]] name = "slop-primitives" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d82c53508f3ebff8acdabb5db2584f37686257a2549a17c977cf30cd9e24e6" +checksum = "0b0b66701c82f6aab97f4990b5d9ed7463beb5b5042dbe5eda5f6c71a6207b35" dependencies = [ "slop-algebra", ] [[package]] name = "slop-symmetric" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15acfa7f567ffa4f36de134492632a397c33fa6af2e48894e50978b52eeeb871" +checksum = "e6d159948b924fd00f280064d7a049e43dceb2f26067f32fb99570d3169969ee" dependencies = [ "p3-symmetric", ] @@ -4589,9 +4589,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "517e820776910468611149dda66791bdb700c1b7d68b96f0ea2e604f00ad8771" +checksum = "9b96392c1b1c197beaa6b0806099a8d73643a09d5ac0874e26c9c5153a7fcb4c" dependencies = [ "bincode", "elliptic-curve", @@ -4601,9 +4601,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f395525b4fc46d37136f45be264c81718a67f4409c14c547ff491a263e019e7" +checksum = "b6b77098dae9d62e080be3af253188c08e7e96e666423306654eede0110bf363" dependencies = [ "bincode", "blake3", @@ -4625,9 +4625,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45aa8c53b0332dcce1f588185df97e8ed9e7a6b37b0c6584f29674017628831f" +checksum = "d31a7c3f072f248342284031684c9195e2264422964129c3b8652f9196ecc937" dependencies = [ "cfg-if", "critical-section", diff --git a/bin/client-op/Cargo.toml b/bin/client-op/Cargo.toml index 7ceb862f..48711766 100644 --- a/bin/client-op/Cargo.toml +++ b/bin/client-op/Cargo.toml @@ -11,7 +11,7 @@ bincode = "1.3.3" rsp-client-executor = { path = "../../crates/executor/client", features = ["optimism"]} # sp1 -sp1-zkvm = "6.0.2" +sp1-zkvm = "=6.1.0" # Statically turns off logging log = { version = "0.4", features = ["max_level_off", "release_max_level_off"] } diff --git a/bin/client/Cargo.lock b/bin/client/Cargo.lock index 7a01f3fa..e4115a42 100644 --- a/bin/client/Cargo.lock +++ b/bin/client/Cargo.lock @@ -4086,9 +4086,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "slop-algebra" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691beea96fd18d4881f9ca1cb4e58194dac6366f24956a2fdae00c8ee382a0c9" +checksum = "733912d564a68ff209707e71fdc517d4ff82d4362b6a409f6a8241dfcb7a576a" dependencies = [ "itertools 0.14.0", "p3-field", @@ -4097,9 +4097,9 @@ dependencies = [ [[package]] name = "slop-bn254" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1852499c245f7f3dec23408b4930b3ea7570ae914b9c31f12950ac539d85ee" +checksum = "a71b23ede427299e139fb822c5d0ea8fb931dc297eba0c6e2f30f774c04ebc81" dependencies = [ "ff 0.13.1", "p3-bn254-fr", @@ -4113,9 +4113,9 @@ dependencies = [ [[package]] name = "slop-challenger" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4349af93602f3876a3eda948a74d9d16d774c401dfe25f41a45ffd84f230bc1" +checksum = "59e4993210936ab317c0d56ee8257e1cdfe6c2fae4df1e158737f034e21d45f9" dependencies = [ "futures", "p3-challenger", @@ -4126,9 +4126,9 @@ dependencies = [ [[package]] name = "slop-koala-bear" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "574784c044d11cf9d8238dc18bce9b897bc34d0fb1daaceafd75ebb400084016" +checksum = "8986e94b9a43d58fc8ce5bf111b0985479ab888ced923e3052fb19943f7859b4" dependencies = [ "lazy_static", "p3-koala-bear", @@ -4141,27 +4141,27 @@ dependencies = [ [[package]] name = "slop-poseidon2" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af617970b63e8d7199204bc02996745b6c35c39f2b513a118c62c7b1a0b2f1b" +checksum = "5b06e4a24cba104a0a39740eedd97e60e8896926cc38e6a58d5866cc9811affa" dependencies = [ "p3-poseidon2", ] [[package]] name = "slop-primitives" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d82c53508f3ebff8acdabb5db2584f37686257a2549a17c977cf30cd9e24e6" +checksum = "0b0b66701c82f6aab97f4990b5d9ed7463beb5b5042dbe5eda5f6c71a6207b35" dependencies = [ "slop-algebra", ] [[package]] name = "slop-symmetric" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15acfa7f567ffa4f36de134492632a397c33fa6af2e48894e50978b52eeeb871" +checksum = "e6d159948b924fd00f280064d7a049e43dceb2f26067f32fb99570d3169969ee" dependencies = [ "p3-symmetric", ] @@ -4177,9 +4177,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "517e820776910468611149dda66791bdb700c1b7d68b96f0ea2e604f00ad8771" +checksum = "9b96392c1b1c197beaa6b0806099a8d73643a09d5ac0874e26c9c5153a7fcb4c" dependencies = [ "bincode", "elliptic-curve", @@ -4189,9 +4189,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f395525b4fc46d37136f45be264c81718a67f4409c14c547ff491a263e019e7" +checksum = "b6b77098dae9d62e080be3af253188c08e7e96e666423306654eede0110bf363" dependencies = [ "bincode", "blake3", @@ -4213,9 +4213,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "6.0.2" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45aa8c53b0332dcce1f588185df97e8ed9e7a6b37b0c6584f29674017628831f" +checksum = "d31a7c3f072f248342284031684c9195e2264422964129c3b8652f9196ecc937" dependencies = [ "cfg-if", "critical-section", diff --git a/bin/client/Cargo.toml b/bin/client/Cargo.toml index e1266990..e2c35304 100644 --- a/bin/client/Cargo.toml +++ b/bin/client/Cargo.toml @@ -11,7 +11,7 @@ bincode = "1.3.3" rsp-client-executor = { path = "../../crates/executor/client" } # sp1 -sp1-zkvm = "6.0.2" +sp1-zkvm = "=6.1.0" # Statically turns off logging log = { version = "0.4", features = ["max_level_off", "release_max_level_off"] } diff --git a/bin/eth-proofs/Cargo.toml b/bin/eth-proofs/Cargo.toml index b370d33a..4d8afdd4 100644 --- a/bin/eth-proofs/Cargo.toml +++ b/bin/eth-proofs/Cargo.toml @@ -38,3 +38,7 @@ alloy-transport-ws.workspace = true [build-dependencies] sp1-build.workspace = true + +[features] +default = ["cuda"] +cuda = ["sp1-sdk/cuda", "rsp-host-executor/cuda"] diff --git a/crates/executor/client/src/into_primitives.rs b/crates/executor/client/src/into_primitives.rs index d074190a..3a357c34 100644 --- a/crates/executor/client/src/into_primitives.rs +++ b/crates/executor/client/src/into_primitives.rs @@ -202,7 +202,7 @@ fn handle_custom_chains( let chain = if let Ok(chain) = NamedChain::try_from(chain_spec.chain_id()) { chain } else { - return Err(err) + return Err(err); }; match chain { diff --git a/crates/executor/host/Cargo.toml b/crates/executor/host/Cargo.toml index 8f883c79..8dc6a18e 100644 --- a/crates/executor/host/Cargo.toml +++ b/crates/executor/host/Cargo.toml @@ -70,6 +70,7 @@ bincode = "1.3.3" dotenv = "0.15.0" [features] +cuda = ["sp1-sdk/cuda"] alerting = ["dep:reqwest"] execution-witness = [ "rsp-mpt/execution-witness", diff --git a/crates/executor/host/src/executor_components.rs b/crates/executor/host/src/executor_components.rs index 1998f0f2..a9f86d50 100644 --- a/crates/executor/host/src/executor_components.rs +++ b/crates/executor/host/src/executor_components.rs @@ -15,9 +15,11 @@ use reth_primitives_traits::NodePrimitives; use rsp_client_executor::{custom::CustomEvmFactory, BlockValidator, IntoInput, IntoPrimitives}; use rsp_primitives::genesis::Genesis; use serde::de::DeserializeOwned; +#[cfg(feature = "cuda")] +use sp1_sdk::CudaProver; use sp1_sdk::{ - env::EnvProver, CpuProver, CudaProver, ProveRequest, Prover, SP1ProofMode, - SP1ProofWithPublicValues, SP1Stdin, + env::EnvProver, CpuProver, ProveRequest, Prover, SP1ProofMode, SP1ProofWithPublicValues, + SP1Stdin, }; use crate::ExecutionHooks; @@ -66,6 +68,7 @@ impl MaybeProveWithCycles for CpuProver { } } +#[cfg(feature = "cuda")] impl MaybeProveWithCycles for CudaProver { async fn prove_with_cycles( &self, diff --git a/crates/executor/host/src/full_executor.rs b/crates/executor/host/src/full_executor.rs index a88d2e38..3a65126b 100644 --- a/crates/executor/host/src/full_executor.rs +++ b/crates/executor/host/src/full_executor.rs @@ -92,7 +92,7 @@ pub trait BlockExecutor { let input_block_hash = client_input.current_block.header.hash_slow(); if input_block_hash != executed_block_hash { - return Err(HostError::HeaderMismatch(executed_block_hash, input_block_hash))? + return Err(HostError::HeaderMismatch(executed_block_hash, input_block_hash))?; } info!(?executed_block_hash, "Execution successful");