From d84e9d7fe810664bb21ee6d23832fbf4e16fc3fd Mon Sep 17 00:00:00 2001 From: ratankaliani Date: Sat, 7 Sep 2024 00:17:38 +0000 Subject: [PATCH] feat: use 1.3.0-rc2 --- Cargo.lock | 143 ++++++++++++++++++++++++++++++------------ Cargo.toml | 24 +++---- utils/host/src/lib.rs | 2 +- 3 files changed, 115 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91d7d159..fa33f350 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,7 +65,7 @@ dependencies = [ "op-succinct-client-utils", "serde_cbor", "sha2", - "sp1-lib 1.2.0", + "sp1-lib 1.2.0 (git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2)", "sp1-zkvm", ] @@ -2095,7 +2095,7 @@ dependencies = [ "hex-literal", "rfc6979", "signature", - "sp1-lib 1.2.0", + "sp1-lib 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "spki", ] @@ -2175,6 +2175,27 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enum-map" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" +dependencies = [ + "enum-map-derive", + "serde", +] + +[[package]] +name = "enum-map-derive" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "enumn" version = "0.1.14" @@ -6121,8 +6142,7 @@ dependencies = [ [[package]] name = "sp1-build" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae094a567949cc3bbcdb265e45591cf7ac7185f121f6f29ac64a44acb00220e" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "anyhow", "cargo_metadata", @@ -6134,12 +6154,12 @@ dependencies = [ [[package]] name = "sp1-core-executor" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fde11e88cf1e7fa272ec3accb643845b1d3a13b9b7840a0357b00acdfdbedf9" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "bincode", "bytemuck", "elf", + "enum-map", "eyre", "generic-array 1.1.0", "hashbrown 0.14.5", @@ -6165,13 +6185,13 @@ dependencies = [ "tiny-keccak", "tracing", "typenum", + "vec_map", ] [[package]] name = "sp1-core-machine" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "748ffa83d438905521f389f46fed2de6f3b05b1da2ffc2273194bede11a258fc" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "anyhow", "arrayref", @@ -6236,8 +6256,7 @@ dependencies = [ [[package]] name = "sp1-curves" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c19d1e60fdd17ec53b8453d7634ed3a136800151412c8d9873944f782c4bc89" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "curve25519-dalek", "dashu", @@ -6257,8 +6276,7 @@ dependencies = [ [[package]] name = "sp1-derive" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d06fdae1dc74a9085b155d12180825653e530983262b8ad2e57fe15551d17a" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "proc-macro2", "quote", @@ -6292,11 +6310,23 @@ dependencies = [ "snowbridge-amcl", ] +[[package]] +name = "sp1-lib" +version = "1.2.0" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" +dependencies = [ + "anyhow", + "bincode", + "cfg-if", + "hex", + "serde", + "snowbridge-amcl", +] + [[package]] name = "sp1-primitives" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13f9b8ac43071ecfe5980a135cbcecb26ecad243165adce8de5aa3746a2af59" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "itertools 0.13.0", "lazy_static", @@ -6309,8 +6339,7 @@ dependencies = [ [[package]] name = "sp1-prover" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5496754989ea23332537094818b4d8bc55e04171fc4f87161493399c2219ad" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "anyhow", "bincode", @@ -6318,6 +6347,7 @@ dependencies = [ "dirs", "hex", "itertools 0.13.0", + "lru", "num-bigint 0.4.6", "oneshot", "p3-baby-bear", @@ -6333,11 +6363,10 @@ dependencies = [ "sp1-core-executor", "sp1-core-machine", "sp1-primitives", - "sp1-recursion-circuit", + "sp1-recursion-circuit-v2", "sp1-recursion-compiler", - "sp1-recursion-core", + "sp1-recursion-core-v2", "sp1-recursion-gnark-ffi", - "sp1-recursion-program", "sp1-stark", "subtle-encoding", "tempfile", @@ -6349,8 +6378,7 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0ee89dd4928419672f046a472b3e0114e405805d96de9f39e4e83d323778ab" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "bincode", "itertools 0.13.0", @@ -6371,11 +6399,48 @@ dependencies = [ "sp1-stark", ] +[[package]] +name = "sp1-recursion-circuit-v2" +version = "1.2.0" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" +dependencies = [ + "bincode", + "hashbrown 0.14.5", + "itertools 0.13.0", + "p3-air", + "p3-baby-bear", + "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", + "rand", + "serde", + "sp1-core-executor", + "sp1-core-machine", + "sp1-primitives", + "sp1-recursion-circuit", + "sp1-recursion-compiler", + "sp1-recursion-core-v2", + "sp1-recursion-derive", + "sp1-recursion-gnark-ffi", + "sp1-recursion-program", + "sp1-stark", + "stacker", + "tracing", +] + [[package]] name = "sp1-recursion-compiler" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89d0dcf2766edd698ecc336c90d6a228759ee716fc6e24a8e3927210e2536de" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6404,8 +6469,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef244f580afc3c783880cdee7e26c56eb1d3c4522e2c98bd89f79366c3d92a1" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "arrayref", "backtrace", @@ -6442,8 +6506,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core-v2" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82adbabcf41de013fb7394c06437937fd740c5005e760a215bfc2196f993ae" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "arrayref", "backtrace", @@ -6483,8 +6546,7 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168c1e526a6c8b3877f360fae3fb545bdf0ce7e11e77878170775eeb87c9a043" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "proc-macro2", "quote", @@ -6494,8 +6556,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1100ea8ab4374397aafb7f89b6d5d60ed8d5040b51f6db22bd3f9807204b13a1" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "anyhow", "bincode", @@ -6521,8 +6582,7 @@ dependencies = [ [[package]] name = "sp1-recursion-program" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35252bdd8b0bd54f37d1df5ec9ef10de0d301550e6a5fc660de134f1b126da78" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "itertools 0.13.0", "p3-air", @@ -6553,8 +6613,7 @@ dependencies = [ [[package]] name = "sp1-sdk" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a21138889b9cbe9b72a652162dad26b904e07dccbbbc10adb4b081abdd4f80" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "alloy-sol-types 0.7.7", "anyhow", @@ -6599,8 +6658,7 @@ dependencies = [ [[package]] name = "sp1-stark" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfae288fe87c6c9fe5f15c04ad38605f2e8e27f86d1e4228359e36a20f003c68" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "arrayref", "getrandom", @@ -6624,14 +6682,14 @@ dependencies = [ "serde", "sp1-derive", "sp1-primitives", + "sysinfo", "tracing", ] [[package]] name = "sp1-zkvm" version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a777787c41fffb1ce1e74229f480223ce8d0ae66763aaac689cec737a19663e" +source = "git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2#f2f6b4333ada19b09820986230dc34e80738ee1a" dependencies = [ "bincode", "cfg-if", @@ -6644,7 +6702,7 @@ dependencies = [ "rand", "serde", "sha2", - "sp1-lib 1.2.0", + "sp1-lib 1.2.0 (git+https://github.com/succinctlabs/sp1.git?branch=tamir/v1.3.0-rc2)", "sp1-primitives", ] @@ -6659,7 +6717,7 @@ dependencies = [ "group 0.13.0", "pairing 0.23.0", "rand_core", - "sp1-lib 1.2.0", + "sp1-lib 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "subtle", ] @@ -7474,6 +7532,9 @@ name = "vec_map" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +dependencies = [ + "serde", +] [[package]] name = "vergen" diff --git a/Cargo.toml b/Cargo.toml index e5e34bf8..59aeaa2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,18 +71,18 @@ alloy-sol-types = { version = "0.8" } op-alloy-consensus = { version = "0.2", default-features = false } # sp1 -sp1-lib = { version = "1.2.0", features = ["verify"] } -sp1-zkvm = { version = "1.2.0", features = ["verify"] } -sp1-sdk = { version = "1.2.0" } -sp1-build = { version = "1.2.0" } -# sp1-lib = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2", features = [ -# "verify", -# ] } -# sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2", features = [ -# "verify", -# ] } -# sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2" } -# sp1-build = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2" } +# sp1-lib = { version = "1.2.0", features = ["verify"] } +# sp1-zkvm = { version = "1.2.0", features = ["verify"] } +# sp1-sdk = { version = "1.2.0" } +# sp1-build = { version = "1.2.0" } +sp1-lib = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2", features = [ + "verify", +] } +sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2", features = [ + "verify", +] } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2" } +sp1-build = { git = "https://github.com/succinctlabs/sp1.git", branch = "tamir/v1.3.0-rc2" } [profile.release-client-lto] inherits = "release" diff --git a/utils/host/src/lib.rs b/utils/host/src/lib.rs index 258f37d7..993ad34e 100644 --- a/utils/host/src/lib.rs +++ b/utils/host/src/lib.rs @@ -89,7 +89,7 @@ pub fn get_agg_proof_stdin( let SP1Proof::Compressed(compressed_proof) = proof else { panic!(); }; - stdin.write_proof(compressed_proof, vkey.vk.clone()); + stdin.write_proof(*compressed_proof, vkey.vk.clone()); } // Write the aggregation inputs to the stdin.