diff --git a/Cargo.lock b/Cargo.lock index dd533407..b02426aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,7 +58,7 @@ dependencies = [ "client-utils", "serde_cbor", "sha2", - "sp1-lib 1.1.1 (git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime)", + "sp1-lib 1.2.0-rc1 (registry+https://github.com/rust-lang/crates.io-index)", "sp1-zkvm", ] @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b515e82c8468ddb6ff8db21c78a5997442f113fd8471fd5b2261b2602dd0c67" +checksum = "e4a777d352cd752b81c695828b1bb6e04b3e87ca4d94a6fe343244eb54effb2d" dependencies = [ "num_enum 0.7.3", "strum", @@ -385,7 +385,7 @@ checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -514,7 +514,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -531,7 +531,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "syn-solidity", "tiny-keccak", ] @@ -549,7 +549,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.75", + "syn 2.0.76", "syn-solidity", ] @@ -896,7 +896,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -907,7 +907,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -945,7 +945,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1095,7 +1095,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.75", + "syn 2.0.76", "which", ] @@ -1221,7 +1221,7 @@ dependencies = [ "group 0.13.0", "pairing 0.23.0", "rand_core", - "sp1-lib 1.2.0-rc1", + "sp1-lib 1.2.0-rc1 (git+https://github.com/succinctlabs/sp1.git?branch=dev)", "subtle", ] @@ -1317,7 +1317,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1337,15 +1337,16 @@ dependencies = [ [[package]] name = "c-kzg" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf100c4cea8f207e883ff91ca886d621d8a166cb04971dfaa9bb8fd99ed95df" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" dependencies = [ "blst", "cc", "glob", "hex", "libc", + "once_cell", "serde", ] @@ -1383,9 +1384,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.14" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", @@ -1478,7 +1479,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1500,6 +1501,7 @@ dependencies = [ "async-trait", "itertools 0.13.0", "kona-client", + "kona-common", "kona-derive", "kona-executor", "kona-mpt", @@ -1623,9 +1625,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -1774,7 +1776,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1798,7 +1800,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1809,7 +1811,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1950,7 +1952,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2027,18 +2029,15 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" -version = "0.16.9" -source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#1caae137b2b2c458b8a542b1c4e9fb40293c67a3" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "anyhow", - "cfg-if", "der", "digest 0.10.7", "elliptic-curve", - "hex-literal", "rfc6979", "signature", - "sp1-lib 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "spki", ] @@ -2126,7 +2125,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2277,7 +2276,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.75", + "syn 2.0.76", "toml", "walkdir", ] @@ -2295,7 +2294,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2321,7 +2320,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.75", + "syn 2.0.76", "tempfile", "thiserror", "tiny-keccak", @@ -2609,7 +2608,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2927,6 +2926,7 @@ dependencies = [ "rkyv", "serde", "serde_cbor", + "sp1-build", "sp1-sdk", "tokio", ] @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "kona-client" version = "0.1.0" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3410,6 +3410,8 @@ dependencies = [ "lru", "op-alloy-consensus", "revm", + "serde", + "serde_json", "spin 0.9.8", "tracing", ] @@ -3417,7 +3419,7 @@ dependencies = [ [[package]] name = "kona-common" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "anyhow", "cfg-if", @@ -3427,20 +3429,20 @@ dependencies = [ [[package]] name = "kona-common-proc" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "anyhow", "cfg-if", "kona-common", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] name = "kona-derive" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -3449,8 +3451,6 @@ dependencies = [ "alloy-provider", "alloy-rlp", "alloy-rpc-client", - "alloy-rpc-types", - "alloy-sol-types", "alloy-transport", "alloy-transport-http", "anyhow", @@ -3465,7 +3465,6 @@ dependencies = [ "reqwest 0.12.7", "revm", "serde", - "serde_json", "sha2", "spin 0.9.8", "tracing", @@ -3475,15 +3474,14 @@ dependencies = [ [[package]] name = "kona-executor" version = "0.0.1" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "alloy-rlp", "anyhow", - "kona-derive", "kona-mpt", + "kona-primitives", "op-alloy-consensus", "revm", "tracing", @@ -3492,7 +3490,7 @@ dependencies = [ [[package]] name = "kona-host" version = "0.1.0" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "alloy-consensus", "alloy-eips", @@ -3512,10 +3510,12 @@ dependencies = [ "kona-derive", "kona-mpt", "kona-preimage", + "kona-primitives", "os_pipe", "reqwest 0.12.7", "revm", "serde", + "serde_json", "tokio", "tracing", "tracing-subscriber", @@ -3524,7 +3524,7 @@ dependencies = [ [[package]] name = "kona-mpt" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -3538,12 +3538,11 @@ dependencies = [ [[package]] name = "kona-preimage" version = "0.0.2" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "alloy-primitives", "anyhow", "async-trait", - "cfg-if", "kona-common", "rkyv", "tracing", @@ -3552,17 +3551,22 @@ dependencies = [ [[package]] name = "kona-primitives" version = "0.0.1" -source = "git+https://github.com/ethereum-optimism/kona?rev=e4a032c1325687221d01674f0de0fd757e516e65#e4a032c1325687221d01674f0de0fd757e516e65" +source = "git+https://github.com/ethereum-optimism/kona?branch=main#edd7081acc321122889e99b352e05df8f255f058" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", - "alloy-sol-types", "anyhow", + "c-kzg", + "hashbrown 0.14.5", "op-alloy-consensus", + "revm", "serde", + "sha2", + "spin 0.9.8", "superchain-primitives", + "tracing", ] [[package]] @@ -3653,9 +3657,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.19" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -4012,7 +4016,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4155,7 +4159,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4666,7 +4670,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4732,12 +4736,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4855,7 +4859,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5232,7 +5236,8 @@ dependencies = [ [[package]] name = "revm" version = "13.0.0" -source = "git+https://github.com/bluealloy/revm#1ad860469755e3cf71383f45d71c3faaf61d3029" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2f635bbbf4002b1b5c0219f841ec1a317723883ed7662c0d138617539a6087" dependencies = [ "auto_impl", "cfg-if", @@ -5246,7 +5251,8 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "9.0.0" -source = "git+https://github.com/bluealloy/revm#1ad860469755e3cf71383f45d71c3faaf61d3029" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ad04c7d87dc3421a5ccca76e56dbd0b29a358c03bb41fe9e80976e9d3f397d" dependencies = [ "revm-primitives", "serde", @@ -5255,7 +5261,8 @@ dependencies = [ [[package]] name = "revm-precompile" version = "10.0.0" -source = "git+https://github.com/bluealloy/revm#1ad860469755e3cf71383f45d71c3faaf61d3029" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526a4ba5ec400e7bbe71affbc10fe2e67c1cd1fb782bab988873d09a102e271" dependencies = [ "aurora-engine-modexp", "blst", @@ -5274,7 +5281,8 @@ dependencies = [ [[package]] name = "revm-primitives" version = "8.0.0" -source = "git+https://github.com/bluealloy/revm#1ad860469755e3cf71383f45d71c3faaf61d3029" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4093d98a26601f0a793871c5bc7928410592f76b1f03fc89fde77180c554643c" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5296,7 +5304,8 @@ dependencies = [ [[package]] name = "rfc6979" version = "0.4.0" -source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#1caae137b2b2c458b8a542b1c4e9fb40293c67a3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac", "subtle", @@ -5740,9 +5749,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -5759,13 +5768,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5799,7 +5808,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5850,7 +5859,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5888,7 +5897,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5957,9 +5966,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", "rand_core", @@ -6026,8 +6035,9 @@ dependencies = [ [[package]] name = "sp1-build" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16a18bb0916d1b4ee6f56bad0d79f0f844b2e7eb8dc6f4abce3dc440541ddf99" dependencies = [ "anyhow", "cargo_metadata", @@ -6038,8 +6048,9 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a627bb8b04c2b537d4eb2a845f01a87357af37b079403d5ded060af445e4ee3" dependencies = [ "bincode", "bytemuck", @@ -6073,8 +6084,9 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8e59ebb97faeae1da856b10108dd3b0d4e37edf83a64c8092c2fb41f2372e4" dependencies = [ "anyhow", "arrayref", @@ -6138,8 +6150,9 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e817efa8ac773c56a0522115cb0f44704c1ba358f9db504d63770385be52918f" dependencies = [ "bincode", "ctrlc", @@ -6158,8 +6171,9 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bcfa6b9b6291ab3b13bcd24ea9414705cdcaea6a25d0cb014e6f6acedd72509" dependencies = [ "curve25519-dalek", "dashu", @@ -6178,8 +6192,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddb6f5a85805239ba886cd36f371712080e668a1281d953b93df0561fc085a0a" dependencies = [ "proc-macro2", "quote", @@ -6188,20 +6203,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "1.1.1" +version = "1.2.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839009d6aab5876710e2bc35170d1f328bc70f38992f0037b938623dadfcc61f" -dependencies = [ - "anyhow", - "bincode", - "cfg-if", - "serde", -] - -[[package]] -name = "sp1-lib" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +checksum = "2f600a97b145e66f0f5e56595527c359f5cc8cb1f9dc8a6da1ba34bb845c9d1e" dependencies = [ "anyhow", "bincode", @@ -6214,7 +6218,7 @@ dependencies = [ [[package]] name = "sp1-lib" version = "1.2.0-rc1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=dev#4467d6ae0e686f8ff371fe13ea5b74640cf02352" +source = "git+https://github.com/succinctlabs/sp1.git?branch=dev#c1ff739c2ac79851da1c7e8abc4e3eb84ddadf6c" dependencies = [ "anyhow", "bincode", @@ -6226,8 +6230,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ca81d652375947f93636e0acfa89ffff7ad74531974d9b0c5c77ee6b74d3ec" dependencies = [ "itertools 0.13.0", "lazy_static", @@ -6239,8 +6244,9 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c583b70271b8e9b29a2d8cc81237c9150e5668f3ea30f6e1b3b64f043d190632" dependencies = [ "anyhow", "bincode", @@ -6278,8 +6284,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d52b699642e3f56099fe7b731cc55f269c44150c95d9ce772b9bbbe14e7320" dependencies = [ "bincode", "itertools 0.13.0", @@ -6302,8 +6309,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6996298c6a55ba2742e20937b44c2eca49c698ef23735f24e310da85b264e22a" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6331,8 +6339,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e426a4215dfc57398b4ec0a1de244d84ffa627443da5aa044420beb4a8ebde6c" dependencies = [ "arrayref", "backtrace", @@ -6368,8 +6377,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core-v2" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3597f842c4b16778fca5b2ab972b308bcce0c6ca50633e88d2804a5a6bb936c" dependencies = [ "arrayref", "backtrace", @@ -6408,8 +6418,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad893a3082bc0142fbc4c51965af25e6c6214dcd37bf285cb481c9ceed7bce2" dependencies = [ "proc-macro2", "quote", @@ -6418,8 +6429,9 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3307cb27b8fab5d8b769bfaa4eaaa2c1e62224cbed0eb0426327635ca1db6a81" dependencies = [ "anyhow", "bincode", @@ -6444,8 +6456,9 @@ dependencies = [ [[package]] name = "sp1-recursion-program" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8675f1f3f0ecd18748215a8c1ea47974523d3289ae1f64117cd259b5d85d7a8" dependencies = [ "itertools 0.13.0", "p3-air", @@ -6475,8 +6488,9 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10be778e6b4030feabe5ecda6c8b617cae8d6c4a77db9c2e836f2c1e78f75a1c" dependencies = [ "alloy-sol-types", "anyhow", @@ -6521,8 +6535,9 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15e06e3cb60d88c3c4fc66d17713d69cfd8c1338c67519466322e0d15f10168" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6550,8 +6565,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime#a7d4e4f6bb5a2b3cb9931134ad05a83197cdcae7" +version = "1.2.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e2045ac8427c677bd1285b1d9eeccc29a54ee952bb38eff83151894376097" dependencies = [ "bincode", "cfg-if", @@ -6564,7 +6580,7 @@ dependencies = [ "rand", "serde", "sha2", - "sp1-lib 1.1.1 (git+https://github.com/succinctlabs/sp1.git?branch=john/faster-runtime)", + "sp1-lib 1.2.0-rc1 (registry+https://github.com/rust-lang/crates.io-index)", "sp1-primitives", ] @@ -6646,7 +6662,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6661,7 +6677,7 @@ dependencies = [ "lazy_static", "rand", "rustc-hex", - "sp1-lib 1.2.0-rc1", + "sp1-lib 1.2.0-rc1 (git+https://github.com/succinctlabs/sp1.git?branch=dev)", ] [[package]] @@ -6708,9 +6724,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -6726,7 +6742,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6837,7 +6853,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6942,7 +6958,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7127,7 +7143,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7460,7 +7476,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "wasm-bindgen-shared", ] @@ -7494,7 +7510,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7910,7 +7926,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7930,7 +7946,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7979,3 +7995,8 @@ dependencies = [ "sp1-sdk", "tokio", ] + +[[patch.unused]] +name = "ecdsa" +version = "0.16.9" +source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#1caae137b2b2c458b8a542b1c4e9fb40293c67a3" diff --git a/Cargo.toml b/Cargo.toml index 6b2cf706..5dcca823 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,29 +18,18 @@ repository = "" [workspace.dependencies] # kona -# kona-common = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } -# kona-common-proc = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } -# kona-preimage = { git = "https://github.com/ethereum-optimism/kona", branch = "main", features = [ -# "rkyv", -# ] } -# kona-primitives = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } -# kona-mpt = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } -# kona-derive = { git = "https://github.com/ethereum-optimism/kona", branch = "main", default-features = false } -# kona-executor = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } -# kona-client = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } -# kona-host = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } -# Note: CachingOracle needs to be exposed publicly in Kona. Make a PR to re-expose it again. -kona-common = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65" } -kona-common-proc = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65" } -kona-preimage = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65", features = [ +# TODO: Change to stable tag when released. +kona-common = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } +kona-common-proc = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } +kona-preimage = { git = "https://github.com/ethereum-optimism/kona", branch = "main", features = [ "rkyv", ] } -kona-primitives = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65" } -kona-mpt = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65" } -kona-derive = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65", default-features = false } -kona-executor = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65" } -kona-client = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65" } -kona-host = { git = "https://github.com/ethereum-optimism/kona", rev = "e4a032c1325687221d01674f0de0fd757e516e65" } +kona-primitives = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } +kona-mpt = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } +kona-derive = { git = "https://github.com/ethereum-optimism/kona", branch = "main", default-features = false } +kona-executor = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } +kona-client = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } +kona-host = { git = "https://github.com/ethereum-optimism/kona", branch = "main" } # general anyhow = { version = "1.0.86", default-features = false } @@ -79,7 +68,7 @@ alloy = { version = "0.2", default-features = false, features = ["full"] } alloy-primitives = { version = "0.7.6", default-features = false } alloy-rlp = { version = "0.3.5", default-features = false } alloy-eips = { version = "0.2", default-features = false } -revm = { git = "https://github.com/bluealloy/revm", version = "13.0", default-features = false } +revm = { version = "13.0", default-features = false } bincode = "1.3.3" base64 = "0.22.1" tower-http = { version = "0.5.2", features = ["limit"] } @@ -88,14 +77,11 @@ alloy-sol-types = { version = "0.7.6" } op-alloy-consensus = { version = "0.1.4", default-features = false } # sp1 -sp1-lib = { git = "https://github.com/succinctlabs/sp1.git", branch = "john/faster-runtime", features = [ - "verify", -] } -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", branch = "john/faster-runtime", features = [ - "verify", -] } -sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", branch = "john/faster-runtime" } -sp1-build = { git = "https://github.com/succinctlabs/sp1.git", branch = "john/faster-runtime" } +# TODO: Change to stable tag. +sp1-lib = { version = "1.2.0-rc1", features = ["verify"] } +sp1-zkvm = { version = "1.2.0-rc1", features = ["verify"] } +sp1-sdk = { version = "1.2.0-rc1" } +sp1-build = { version = "1.2.0-rc1" } # kzg kzg-rs = { git = "https://github.com/succinctlabs/kzg-rs" } @@ -110,11 +96,8 @@ lto = "fat" [patch.crates-io] tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" } sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } -sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", branch = "patch-sha3-v0.10.8" } ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", branch = "patch-ecdsa-v0.16.9" } substrate-bn = { git = "https://github.com/sp1-patches/bn", branch = "patch-v0.6.0" } -# Note: This alloy-primitives patch uses sha3 instead of tiny-keccak. +# Note: Patch alloy-primitives to use sha3 instead of tiny-keccak. Reduces cycle count for Keccak by 50%. +sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", branch = "patch-sha3-v0.10.8" } alloy-primitives = { git = "https://github.com/sp1-patches/alloy-core", branch = "patch-v0.7.7" } -# alloy-primitives = { path = "../alloy-core/crates/primitives" } -# alloy-sol-macro-expander = { git = "https://github.com/sp1-patches/alloy-core", branch = "patch-v0.7.7" } -# secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.0" } diff --git a/client-programs/fault-proof/src/main.rs b/client-programs/fault-proof/src/main.rs index 3bce4424..50cbad6d 100644 --- a/client-programs/fault-proof/src/main.rs +++ b/client-programs/fault-proof/src/main.rs @@ -25,6 +25,7 @@ cfg_if! { use alloc::vec::Vec; } else { use kona_client::CachingOracle; + use client_utils::pipes::{ORACLE_READER, HINT_WRITER}; } } @@ -58,7 +59,7 @@ fn main() { // If we are compiling for online mode, create a caching oracle that speaks to the // fetcher via hints, and gather boot info from this oracle. } else { - let oracle = Arc::new(CachingOracle::new(1024)); + let oracle = Arc::new(CachingOracle::new(1024, ORACLE_READER, HINT_WRITER)); let boot = Arc::new(BootInfo::load(oracle.as_ref()).await.unwrap()); let precompile_overrides = NoPrecompileOverride; } diff --git a/client-programs/range/src/main.rs b/client-programs/range/src/main.rs index ad5c7bb9..4f58397f 100644 --- a/client-programs/range/src/main.rs +++ b/client-programs/range/src/main.rs @@ -37,6 +37,7 @@ cfg_if! { use alloc::vec::Vec; } else { use kona_client::CachingOracle; + use client_utils::pipes::{ORACLE_READER, HINT_WRITER}; } } @@ -72,7 +73,7 @@ fn main() { // If we are compiling for online mode, create a caching oracle that speaks to the // fetcher via hints, and gather boot info from this oracle. } else { - let oracle = Arc::new(CachingOracle::new(1024)); + let oracle = Arc::new(CachingOracle::new(1024, ORACLE_READER, HINT_WRITER)); let boot = Arc::new(BootInfo::load(oracle.as_ref()).await.unwrap()); // let precompile_overrides = NoPrecompileOverride; @@ -83,7 +84,7 @@ fn main() { let precompile_overrides = NoPrecompileOverride; let l1_provider = OracleL1ChainProvider::new(boot.clone(), oracle.clone()); - let mut l2_provider = MultiblockOracleL2ChainProvider::new(boot.clone(), oracle.clone()); + let mut l2_provider = MultiblockOracleL2ChainProvider::new(boot.clone(), oracle.clone()); let beacon = OracleBlobProvider::new(oracle.clone()); //////////////////////////////////////////////////////////////// @@ -113,7 +114,7 @@ fn main() { .with_fetcher(l2_provider.clone()) .with_hinter(l2_provider.clone()) .with_precompile_overrides(precompile_overrides) - .build() + .build() .unwrap(); println!("cycle-tracker-end: execution-instantiation"); diff --git a/crates/client-utils/Cargo.toml b/crates/client-utils/Cargo.toml index 18779cfd..72d0c9ff 100644 --- a/crates/client-utils/Cargo.toml +++ b/crates/client-utils/Cargo.toml @@ -25,6 +25,7 @@ kona-client.workspace = true kona-preimage.workspace = true kona-mpt.workspace = true kona-derive.workspace = true +kona-common.workspace = true # general serde.workspace = true diff --git a/crates/client-utils/src/lib.rs b/crates/client-utils/src/lib.rs index 8d908d83..8b2ada7c 100644 --- a/crates/client-utils/src/lib.rs +++ b/crates/client-utils/src/lib.rs @@ -14,6 +14,8 @@ pub mod precompiles; pub mod types; +pub mod pipes; + extern crate alloc; pub mod driver; diff --git a/crates/client-utils/src/pipes.rs b/crates/client-utils/src/pipes.rs new file mode 100644 index 00000000..479d0929 --- /dev/null +++ b/crates/client-utils/src/pipes.rs @@ -0,0 +1,18 @@ +//! Contains FPVM-specific constructs for the `kona-client` program. + +use kona_common::FileDescriptor; +use kona_preimage::{HintWriter, OracleReader, PipeHandle}; + +/// The global preimage oracle reader pipe. +static ORACLE_READER_PIPE: PipeHandle = + PipeHandle::new(FileDescriptor::PreimageRead, FileDescriptor::PreimageWrite); + +/// The global hint writer pipe. +static HINT_WRITER_PIPE: PipeHandle = + PipeHandle::new(FileDescriptor::HintRead, FileDescriptor::HintWrite); + +/// The global preimage oracle reader. +pub static ORACLE_READER: OracleReader = OracleReader::new(ORACLE_READER_PIPE); + +/// The global hint writer. +pub static HINT_WRITER: HintWriter = HintWriter::new(HINT_WRITER_PIPE); diff --git a/crates/client-utils/src/precompiles/mod.rs b/crates/client-utils/src/precompiles/mod.rs index c0d57fa4..d85c6a7e 100644 --- a/crates/client-utils/src/precompiles/mod.rs +++ b/crates/client-utils/src/precompiles/mod.rs @@ -3,13 +3,15 @@ use alloc::sync::Arc; use kona_executor::PrecompileOverride; use kona_mpt::{TrieDB, TrieDBFetcher, TrieDBHinter}; +use revm::db::states::state::State; +use revm::handler::Handler; use revm::{ handler::register::EvmHandler, precompile::{ bn128, secp256k1, Precompile, PrecompileResult, PrecompileSpecId, PrecompileWithAddress, }, primitives::Bytes, - ContextPrecompiles, State, + ContextPrecompiles, }; pub const PRECOMPILE_HOOK_FD: u32 = 115; diff --git a/crates/host-utils/Cargo.toml b/crates/host-utils/Cargo.toml index b47a2a8b..16686484 100644 --- a/crates/host-utils/Cargo.toml +++ b/crates/host-utils/Cargo.toml @@ -22,3 +22,4 @@ tokio.workspace = true futures.workspace = true num-format.workspace = true serde.workspace = true +sp1-build.workspace = true diff --git a/crates/host-utils/src/fetcher.rs b/crates/host-utils/src/fetcher.rs index 0ec3f171..9a32dcdd 100644 --- a/crates/host-utils/src/fetcher.rs +++ b/crates/host-utils/src/fetcher.rs @@ -371,7 +371,7 @@ impl SP1KonaDataFetcher { data_dir: Some(data_directory.into()), exec: Some(exec_directory), server: false, - // rollup_config_path: None, + rollup_config_path: None, v: 0, }) } diff --git a/elf/aggregation-elf b/elf/aggregation-elf index f0a27bf1..34076ec5 100755 Binary files a/elf/aggregation-elf and b/elf/aggregation-elf differ diff --git a/elf/range-elf b/elf/range-elf index 1de4260e..64dcd139 100755 Binary files a/elf/range-elf and b/elf/range-elf differ diff --git a/op-succinct-proposer/bin/cost_estimator.rs b/op-succinct-proposer/bin/cost_estimator.rs index df39f818..2f0b05fc 100644 --- a/op-succinct-proposer/bin/cost_estimator.rs +++ b/op-succinct-proposer/bin/cost_estimator.rs @@ -68,6 +68,8 @@ struct SpanBatchRange { end: u64, } +/// Get the boundaries of the span batches from the Go server from the optimism monorepo. This endpoint +/// downloads the data posted to the Optimism L1 Batch Inbox contract. async fn get_span_batch_ranges_from_server( data_fetcher: &SP1KonaDataFetcher, start: u64, @@ -86,9 +88,9 @@ async fn get_span_batch_ranges_from_server( batchSender: batch_sender.to_string(), }; + // Get the span batch server URL from the environment. let span_batch_server_url = env::var("SPAN_BATCH_SERVER_URL").unwrap_or("http://localhost:8080".to_string()); - let query_url = format!("{}/span-batch-ranges", span_batch_server_url); let response: SpanBatchResponse = client @@ -99,6 +101,7 @@ async fn get_span_batch_ranges_from_server( .json() .await?; + // Return the ranges. Ok(response.ranges) } @@ -136,7 +139,6 @@ async fn main() -> Result<()> { let rollup_config = RollupConfig::from_l2_chain_id(l2_chain_id).unwrap(); // Fetch the span batch ranges according to args.start and args.end - // TODO: If the ranges are greater than 20 blocks, we will have to split them in a custom way. let span_batch_ranges: Vec = get_span_batch_ranges_from_server( &data_fetcher, args.start, diff --git a/op-succinct-proposer/src/lib.rs b/op-succinct-proposer/src/lib.rs index 4263760c..b11850ef 100644 --- a/op-succinct-proposer/src/lib.rs +++ b/op-succinct-proposer/src/lib.rs @@ -55,14 +55,15 @@ pub async fn run_native_host( let target_dir = metadata.target_directory.join("release"); let args = convert_host_cli_to_args(host_cli); + // Run the native host runner. let child = tokio::process::Command::new(target_dir.join("native_host_runner")) .args(&args) .env("RUST_LOG", "info") .spawn()?; - let child = Arc::new(Mutex::new(child)); let child_clone = Arc::clone(&child); + // Time out the native host runner after the given timeout. let result = tokio::select! { status = wait_for_child(child_clone) => status, _ = tokio::time::sleep(timeout) => { diff --git a/zkvm-host/Cargo.toml b/zkvm-host/Cargo.toml index 7a233459..2ae63c83 100644 --- a/zkvm-host/Cargo.toml +++ b/zkvm-host/Cargo.toml @@ -31,15 +31,18 @@ kona-host = { workspace = true } # local host-utils.workspace = true +client-utils.workspace = true # sp1 sp1-sdk = { workspace = true } anyhow.workspace = true dotenv.workspace = true num-format.workspace = true -client-utils.workspace = true revm.workspace = true log.workspace = true csv.workspace = true + + [build-dependencies] sp1-build = { workspace = true } +host-utils = { workspace = true } diff --git a/zkvm-host/bin/multi.rs b/zkvm-host/bin/multi.rs index e89a5bc0..82ee38ef 100644 --- a/zkvm-host/bin/multi.rs +++ b/zkvm-host/bin/multi.rs @@ -105,7 +105,7 @@ async fn main() -> Result<()> { l2_chain_id, args.start, args.end ); - // Make the directory if it doesn't exist. + // Create the report directory if it doesn't exist. let report_dir = format!("execution-reports/multi/{}", l2_chain_id); if !std::path::Path::new(&report_dir).exists() { fs::create_dir_all(&report_dir).unwrap(); @@ -120,6 +120,7 @@ async fn main() -> Result<()> { ) .await; println!("Execution Stats: \n{:?}", stats); + // Write to CSV. let mut csv_writer = csv::Writer::from_path(report_path)?; csv_writer.serialize(&stats)?; diff --git a/zkvm-host/bin/single.rs b/zkvm-host/bin/single.rs index 624e4076..edb6a0f6 100644 --- a/zkvm-host/bin/single.rs +++ b/zkvm-host/bin/single.rs @@ -46,10 +46,6 @@ async fn main() -> Result<()> { // By default, re-run the native execution unless the user passes `--use-cache`. if !args.use_cache { - println!( - "Overwriting existing data directory. {}", - data_dir.display() - ); // Overwrite existing data directory. fs::create_dir_all(&data_dir).unwrap(); diff --git a/zkvm-host/src/lib.rs b/zkvm-host/src/lib.rs deleted file mode 100644 index 8b137891..00000000 --- a/zkvm-host/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -