diff --git a/Cargo.lock b/Cargo.lock index a7f01de..9e67d7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,7 +61,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88e1edea70787c33e11197d3f32ae380f3db19e6e061e539a5bcf8184a6b326" dependencies = [ - "alloy-eips", + "alloy-eips 0.8.3", "alloy-primitives", "alloy-rlp", "alloy-serde", @@ -72,20 +72,46 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-consensus" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e32ef5c74bbeb1733c37f4ac7f866f8c8af208b7b4265e21af609dcac5bd5e" +dependencies = [ + "alloy-eips 0.11.1", + "alloy-primitives", + "alloy-rlp", + "alloy-trie", + "auto_impl", + "derive_more", +] + [[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-consensus 0.8.3", + "alloy-eips 0.8.3", "alloy-primitives", "alloy-rlp", "alloy-serde", "serde", ] +[[package]] +name = "alloy-eip2124" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675264c957689f0fd75f5993a73123c2cc3b5c235a38f5b9037fe6c826bfb2c0" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "crc", + "thiserror 2.0.11", +] + [[package]] name = "alloy-eip2930" version = "0.1.0" @@ -109,6 +135,17 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-eip7702" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cabf647eb4650c91a9d38cb6f972bb320009e7e9d61765fb688a86f1563b33e8" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more", +] + [[package]] name = "alloy-eips" version = "0.8.3" @@ -116,7 +153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9fadfe089e9ccc0650473f2d4ef0a28bc015bbca5631d9f0f09e49b557fdb3" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.4.2", "alloy-primitives", "alloy-rlp", "alloy-serde", @@ -127,6 +164,22 @@ dependencies = [ "sha2", ] +[[package]] +name = "alloy-eips" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5591581ca2ab0b3e7226a4047f9a1bfcf431da1d0cce3752fda609fea3c27e37" +dependencies = [ + "alloy-eip2124", + "alloy-eip2930", + "alloy-eip7702 0.5.0", + "alloy-primitives", + "alloy-rlp", + "auto_impl", + "derive_more", + "sha2", +] + [[package]] name = "alloy-json-abi" version = "0.8.19" @@ -159,9 +212,9 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "510cc00b318db0dfccfdd2d032411cfae64fc144aef9679409e014145d3dacc4" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.3", "alloy-consensus-any", - "alloy-eips", + "alloy-eips 0.8.3", "alloy-json-rpc", "alloy-network-primitives", "alloy-primitives", @@ -184,8 +237,8 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9081c099e798b8a2bba2145eb82a9a146f01fc7a35e9ab6e7b43305051f97550" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.8.3", + "alloy-eips 0.8.3", "alloy-primitives", "alloy-serde", "serde", @@ -257,9 +310,9 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8737d7a6e37ca7bba9c23e9495c6534caec6760eb24abc9d5ffbaaba147818e1" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.3", "alloy-consensus-any", - "alloy-eips", + "alloy-eips 0.8.3", "alloy-network-primitives", "alloy-primitives", "alloy-rlp", @@ -302,7 +355,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47fababf5a745133490cde927d48e50267f97d3d1209b9fc9f1d1d666964d172" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.3", "alloy-network", "alloy-primitives", "alloy-signer", @@ -794,7 +847,7 @@ dependencies = [ "bitflags", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.12.1", "log", "prettyplease", "proc-macro2", @@ -875,7 +928,20 @@ checksum = "a3c196a77437e7cc2fb515ce413a6401291578b5afc8ecb29a3c7ab957f05941" dependencies = [ "ff 0.12.1", "group 0.12.1", - "pairing", + "pairing 0.22.0", + "rand_core", + "subtle", +] + +[[package]] +name = "bls12_381" +version = "0.8.0" +source = "git+https://github.com/zkcrypto/bls12_381?rev=9ea427c0eb1a7e2ac16902a322aea156c496ddb0#9ea427c0eb1a7e2ac16902a322aea156c496ddb0" +dependencies = [ + "digest 0.10.7", + "ff 0.13.0", + "group 0.13.0", + "pairing 0.23.0", "rand_core", "subtle", ] @@ -1155,6 +1221,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crossbeam-channel" version = "0.5.14" @@ -1563,13 +1644,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "ethereum_hashing" version = "0.7.0" -source = "git+https://github.com/unnawut/ethereum_hashing?branch=sha256context#e2566c68f13020afaea1176da3d93f6a0b930d5f" +source = "git+https://github.com/ReamLabs/ethereum_hashing#e2566c68f13020afaea1176da3d93f6a0b930d5f" dependencies = [ "sha2", ] @@ -1802,12 +1883,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" - [[package]] name = "futures-util" version = "0.3.31" @@ -2473,7 +2548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a575df5f985fe1cd5b2b05664ff6accfc46559032b954529fd225a2168d27b0f" dependencies = [ "bitvec", - "bls12_381", + "bls12_381 0.7.1", "ff 0.12.1", "group 0.12.1", "rand_core", @@ -2516,7 +2591,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/grandinetech/rust-kzg#09e1b73f25726977b5ab231559562173a5267de4" +source = "git+https://github.com/grandinetech/rust-kzg#6ea2a2ad93ecac70d627edc91334ccb5f4ecd4fb" dependencies = [ "sha2", "siphasher", @@ -2556,7 +2631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3195,6 +3270,15 @@ dependencies = [ "group 0.12.1", ] +[[package]] +name = "pairing" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" +dependencies = [ + "group 0.13.0", +] + [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -3498,7 +3582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.98", @@ -3559,7 +3643,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3646,24 +3730,43 @@ dependencies = [ "rayon", ] +[[package]] +name = "ream-bls" +version = "0.1.0" +source = "git+https://github.com/ReamLabs/ream#fe6bc6133b9082381baafe54be7a9a694e5c328b" +dependencies = [ + "alloy-primitives", + "anyhow", + "bls12_381 0.8.0", + "ethereum_ssz", + "ethereum_ssz_derive", + "serde", + "sha2", + "ssz_types", + "thiserror 2.0.11", + "tree_hash", + "tree_hash_derive", +] + [[package]] name = "ream-consensus" version = "0.1.0" -source = "git+https://github.com/unnawut/ream?branch=remove-deserialize#9226465dd978d1ebf3e89e7b3462265774163c0d" +source = "git+https://github.com/ReamLabs/ream#fe6bc6133b9082381baafe54be7a9a694e5c328b" dependencies = [ + "alloy-consensus 0.11.1", "alloy-primitives", + "alloy-rlp", "anyhow", - "blst", + "async-trait", "ethereum_hashing", "ethereum_serde_utils", "ethereum_ssz", "ethereum_ssz_derive", "itertools 0.14.0", "kzg", - "rstest", + "ream-bls", "serde", "serde_yaml", - "snap", "ssz_types", "tree_hash", "tree_hash_derive", @@ -3769,12 +3872,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "relative-path" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" - [[package]] name = "reqwest" version = "0.12.12" @@ -3881,36 +3978,6 @@ dependencies = [ "paste", ] -[[package]] -name = "rstest" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros", - "rustc_version 0.4.1", -] - -[[package]] -name = "rstest_macros" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" -dependencies = [ - "cfg-if", - "glob", - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "regex", - "relative-path", - "rustc_version 0.4.1", - "syn 2.0.98", - "unicode-ident", -] - [[package]] name = "ruint" version = "1.12.4" @@ -3995,7 +4062,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4218,9 +4285,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "itoa", "memchr", @@ -5058,7 +5125,7 @@ dependencies = [ "getrandom 0.3.1", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6185,7 +6252,7 @@ dependencies = [ "ark-std 0.4.0", "bitvec", "blake2", - "bls12_381", + "bls12_381 0.7.1", "byteorder", "cfg-if", "group 0.12.1", diff --git a/Cargo.toml b/Cargo.toml index 4be0eb2..702f786 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,11 @@ [workspace] -members = [ - "lib", - "program", - "script", -] +members = ["lib", "program", "script"] resolver = "2" [workspace.dependencies] ethereum_ssz = "0.8.2" tracing = "0.1.40" -ream-consensus = { git = "https://github.com/unnawut/ream", package = "ream-consensus", branch = "remove-deserialize" } +ream-consensus = { git = "https://github.com/ReamLabs/ream", package = "ream-consensus" } [patch.crates-io] -ethereum_hashing = { git = "https://github.com/unnawut/ethereum_hashing", branch = "sha256context" } \ No newline at end of file +ethereum_hashing = { git = "https://github.com/ReamLabs/ethereum_hashing" } diff --git a/program/src/main.rs b/program/src/main.rs index 55797e3..22d006b 100644 --- a/program/src/main.rs +++ b/program/src/main.rs @@ -27,7 +27,7 @@ pub fn main() { // State transition of the beacon state. println!("cycle-tracker-start: process-block-header"); - let _ = pre_state.process_block_header(block); + let _ = pre_state.process_block_header(&block); println!("cycle-tracker-end: process-block-header"); // Commit to the public values of the program. The final proof will have a commitment to all the