From 748b2029dde5fd4d0b4b008ab32517a0f24c586a Mon Sep 17 00:00:00 2001 From: Ratan Kaliani Date: Fri, 30 Aug 2024 16:02:57 -0700 Subject: [PATCH] add --- Cargo.lock | 377 +----------------- programs/aggregation/src/main.rs | 114 +----- programs/fault-proof/src/main.rs | 10 +- programs/range/Cargo.toml | 6 +- programs/range/src/main.rs | 13 +- proposer/succinct/Cargo.toml | 17 +- proposer/succinct/bin/fetch_and_save_proof.rs | 7 +- proposer/succinct/bin/server.rs | 7 +- scripts/prove/Cargo.toml | 1 - utils/client/Cargo.toml | 1 - utils/client/src/boot.rs | 11 +- utils/client/src/oracle/mod.rs | 4 - utils/host/Cargo.toml | 3 - utils/host/src/fetcher.rs | 14 +- utils/host/src/lib.rs | 9 +- 15 files changed, 52 insertions(+), 542 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4bb9fd1a..cac84d09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,13 +61,9 @@ version = "0.1.0" dependencies = [ "alloy-consensus", "alloy-primitives", -<<<<<<< HEAD "alloy-sol-types", - "client-utils", -======= "itertools 0.13.0", "op-succinct-client-utils", ->>>>>>> origin/main "serde_cbor", "sha2", "sp1-lib 1.2.0-rc2", @@ -1463,38 +1459,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] -<<<<<<< HEAD -name = "client-utils" -version = "0.1.0" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-sol-types", - "anyhow", - "async-trait", - "itertools 0.13.0", - "kona-client", - "kona-common", - "kona-derive", - "kona-executor", - "kona-mpt", - "kona-preimage", - "kona-primitives", - "kzg-rs 0.2.1", - "log", - "op-alloy-consensus", - "revm 13.0.0 (git+https://github.com/bluealloy/revm)", - "rkyv", - "serde", - "serde_json", - "sha2", -] - -[[package]] -======= ->>>>>>> origin/main name = "cobs" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1919,11 +1883,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", -<<<<<<< HEAD - "rustc_version 0.4.0", -======= "rustc_version 0.4.1", ->>>>>>> origin/main "syn 2.0.76", ] @@ -2419,11 +2379,8 @@ dependencies = [ "kona-client", "kona-executor", "kona-primitives", -<<<<<<< HEAD - "serde_json", -======= "op-succinct-client-utils", ->>>>>>> origin/main + "serde_json", "sp1-zkvm", ] @@ -2887,35 +2844,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "host-utils" -version = "0.1.0" -dependencies = [ - "alloy", - "alloy-consensus", - "alloy-primitives", - "alloy-sol-types", - "anyhow", - "bincode", - "cargo_metadata", - "client-utils", - "dotenv", - "futures", - "kona-client", - "kona-host", - "kona-primitives", - "log", - "revm 13.0.0 (git+https://github.com/bluealloy/revm)", - "rkyv", - "serde_cbor", - "serde_json", - "sp1-sdk", - "tokio", -] - -[[package]] -======= ->>>>>>> origin/main name = "http" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3375,11 +3303,7 @@ dependencies = [ [[package]] name = "kona-client" version = "0.1.0" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "alloy-consensus", "alloy-eips", @@ -3397,11 +3321,7 @@ dependencies = [ "kona-primitives", "lru", "op-alloy-consensus", -<<<<<<< HEAD - "revm 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -======= "revm", ->>>>>>> origin/main "serde", "serde_json", "spin 0.9.8", @@ -3411,11 +3331,7 @@ dependencies = [ [[package]] name = "kona-common" version = "0.0.2" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "anyhow", "cfg-if", @@ -3425,11 +3341,7 @@ dependencies = [ [[package]] name = "kona-common-proc" version = "0.0.2" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "anyhow", "cfg-if", @@ -3442,11 +3354,7 @@ dependencies = [ [[package]] name = "kona-derive" version = "0.0.2" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -3454,10 +3362,6 @@ dependencies = [ "alloy-primitives", "alloy-provider", "alloy-rlp", -<<<<<<< HEAD - "alloy-rpc-client", -======= ->>>>>>> origin/main "alloy-transport", "anyhow", "async-trait", @@ -3468,14 +3372,7 @@ dependencies = [ "miniz_oxide 0.8.0", "op-alloy-consensus", "reqwest 0.12.7", -<<<<<<< HEAD - "revm 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "sha2", - "spin 0.9.8", -======= "serde", ->>>>>>> origin/main "tracing", "unsigned-varint", ] @@ -3483,11 +3380,7 @@ dependencies = [ [[package]] name = "kona-executor" version = "0.0.1" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "alloy-consensus", "alloy-eips", @@ -3496,18 +3389,14 @@ dependencies = [ "kona-mpt", "kona-primitives", "op-alloy-consensus", - "revm 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm", "tracing", ] [[package]] name = "kona-host" version = "0.1.0" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "alloy-consensus", "alloy-eips", @@ -3530,11 +3419,7 @@ dependencies = [ "kona-primitives", "os_pipe", "reqwest 0.12.7", -<<<<<<< HEAD - "revm 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -======= "revm", ->>>>>>> origin/main "serde", "serde_json", "tokio", @@ -3545,29 +3430,21 @@ dependencies = [ [[package]] name = "kona-mpt" version = "0.0.2" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rlp", "alloy-trie", "anyhow", - "revm 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm", "tracing", ] [[package]] name = "kona-preimage" version = "0.0.2" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "alloy-primitives", "anyhow", @@ -3580,11 +3457,7 @@ dependencies = [ [[package]] name = "kona-primitives" version = "0.0.1" -<<<<<<< HEAD -source = "git+https://github.com/ethereum-optimism/kona?branch=main#df189a2f53961ba48a00994e3a0ecea02e1ecf2c" -======= source = "git+https://github.com/ethereum-optimism/kona?branch=main#2206cde65df13978ff5a238ceb0d4bcbc6aab7ce" ->>>>>>> origin/main dependencies = [ "alloy-consensus", "alloy-eips", @@ -3594,11 +3467,7 @@ dependencies = [ "c-kzg", "hashbrown 0.14.5", "op-alloy-consensus", -<<<<<<< HEAD - "revm 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -======= "revm", ->>>>>>> origin/main "serde", "sha2", "spin 0.9.8", @@ -4036,11 +3905,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ -<<<<<<< HEAD - "proc-macro-crate 3.2.0", -======= "proc-macro-crate 1.3.1", ->>>>>>> origin/main "proc-macro2", "quote", "syn 2.0.76", @@ -4132,6 +3997,7 @@ dependencies = [ "revm", "rkyv", "serde", + "serde_json", "sha2", ] @@ -4144,16 +4010,21 @@ dependencies = [ "alloy-primitives", "alloy-sol-types", "anyhow", + "bincode", "cargo_metadata", "dotenv", "futures", + "kona-client", "kona-host", + "kona-primitives", + "log", "num-format", "op-succinct-client-utils", "revm", "rkyv", "serde", "serde_cbor", + "serde_json", "sp1-build", "sp1-sdk", "tokio", @@ -4179,21 +4050,14 @@ dependencies = [ "kona-primitives", "lazy_static", "log", -<<<<<<< HEAD - "reqwest 0.12.7", - "revm 13.0.0 (git+https://github.com/bluealloy/revm)", - "serde", - "serde_json", - "sp1-helper", -======= "op-succinct-client-utils", "op-succinct-host-utils", "rayon", "reqwest 0.12.7", "revm", "serde", + "serde_json", "sp1-build", ->>>>>>> origin/main "sp1-sdk", "tokio", "tower-http", @@ -4204,6 +4068,7 @@ dependencies = [ name = "op-succinct-prove" version = "0.1.0" dependencies = [ + "alloy-sol-types", "anyhow", "cargo_metadata", "clap", @@ -5132,11 +4997,8 @@ dependencies = [ "kona-primitives", "log", "op-alloy-consensus", -<<<<<<< HEAD - "serde_json", -======= "op-succinct-client-utils", ->>>>>>> origin/main + "serde_json", "sp1-zkvm", ] @@ -5358,42 +5220,22 @@ dependencies = [ "auto_impl", "cfg-if", "dyn-clone", - "revm-interpreter 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "revm-precompile 10.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-interpreter", + "revm-precompile", "serde", "serde_json", ] -[[package]] -name = "revm" -version = "13.0.0" -source = "git+https://github.com/bluealloy/revm#a46a88b6e77de56276d5b4eb60a6f1bf47a5313f" -dependencies = [ - "auto_impl", - "cfg-if", - "dyn-clone", - "revm-interpreter 9.0.0 (git+https://github.com/bluealloy/revm)", - "revm-precompile 10.0.0 (git+https://github.com/bluealloy/revm)", -] - [[package]] name = "revm-interpreter" version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ad04c7d87dc3421a5ccca76e56dbd0b29a358c03bb41fe9e80976e9d3f397d" dependencies = [ - "revm-primitives 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives", "serde", ] -[[package]] -name = "revm-interpreter" -version = "9.0.0" -source = "git+https://github.com/bluealloy/revm#a46a88b6e77de56276d5b4eb60a6f1bf47a5313f" -dependencies = [ - "revm-primitives 8.0.0 (git+https://github.com/bluealloy/revm)", -] - [[package]] name = "revm-precompile" version = "10.0.0" @@ -5408,28 +5250,13 @@ dependencies = [ "kzg-rs 0.1.0", "once_cell", "p256", - "revm-primitives 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives", "ripemd", "secp256k1", "sha2", "substrate-bn", ] -[[package]] -name = "revm-precompile" -version = "10.0.0" -source = "git+https://github.com/bluealloy/revm#a46a88b6e77de56276d5b4eb60a6f1bf47a5313f" -dependencies = [ - "aurora-engine-modexp", - "cfg-if", - "k256", - "once_cell", - "revm-primitives 8.0.0 (git+https://github.com/bluealloy/revm)", - "ripemd", - "sha2", - "substrate-bn", -] - [[package]] name = "revm-primitives" version = "8.0.0" @@ -5453,23 +5280,6 @@ dependencies = [ "serde", ] -[[package]] -name = "revm-primitives" -version = "8.0.0" -source = "git+https://github.com/bluealloy/revm#a46a88b6e77de56276d5b4eb60a6f1bf47a5313f" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "auto_impl", - "bitflags 2.6.0", - "bitvec", - "cfg-if", - "dyn-clone", - "enumn", - "hashbrown 0.14.5", - "hex", -] - [[package]] name = "rfc6979" version = "0.4.0" @@ -6028,22 +5838,6 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.76", -<<<<<<< HEAD -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.4.0", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -======= ->>>>>>> origin/main ] [[package]] @@ -6206,14 +6000,9 @@ dependencies = [ [[package]] name = "sp1-build" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3534c49b852e04f5145c4b8b480c87806086acb85d2346912d57c7a8fbb0f12c" ->>>>>>> origin/main dependencies = [ "anyhow", "cargo_metadata", @@ -6223,11 +6012,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "sp1-core" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= name = "sp1-core-executor" version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6268,7 +6052,6 @@ name = "sp1-core-machine" version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45e4b2ef0a4e19253c1901cc6b96181d16f2b184e4840bf6df4e9ba79f34decb" ->>>>>>> origin/main dependencies = [ "anyhow", "arrayref", @@ -6277,7 +6060,6 @@ dependencies = [ "bytemuck", "cfg-if", "curve25519-dalek", - "dashu", "elf", "elliptic-curve", "generic-array 1.1.0", @@ -6324,7 +6106,6 @@ dependencies = [ "strum_macros", "tempfile", "thiserror", - "tiny-keccak", "tracing", "tracing-forest", "tracing-subscriber", @@ -6355,14 +6136,9 @@ dependencies = [ [[package]] name = "sp1-derive" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d2af56e4bbbc1950916a0ae75293cdb79b98992b103b0aa1d9fd3a06fdbcdef" ->>>>>>> origin/main dependencies = [ "proc-macro2", "quote", @@ -6370,19 +6146,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "sp1-helper" -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -dependencies = [ - "cargo_metadata", - "chrono", - "sp1-build", -] - -[[package]] -======= ->>>>>>> origin/main name = "sp1-lib" version = "1.1.1" source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" @@ -6411,14 +6174,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7180d57586adfe1d212ffddd044a179415823ccaeaddfeb17788c627135fb2c" ->>>>>>> origin/main dependencies = [ "itertools 0.13.0", "lazy_static", @@ -6430,14 +6188,9 @@ dependencies = [ [[package]] name = "sp1-prover" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d88a36d8c81777af8a45ffa4e95bd7cda7426f23b3196c2b1073c82ff8d916" ->>>>>>> origin/main dependencies = [ "anyhow", "bincode", @@ -6475,14 +6228,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96b6b4bee94645ef4d22d7bd75728823efcc15f408b190ebedbd45bf0b68ce15" ->>>>>>> origin/main dependencies = [ "bincode", "itertools 0.13.0", @@ -6505,14 +6253,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1909d329420a602889c2ab0ee2ecc3513de5aa23a8d036fc7015f03ea1e3defa" ->>>>>>> origin/main dependencies = [ "backtrace", "itertools 0.13.0", @@ -6540,14 +6283,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00e846f994800afd84b7cead471a5b2e804f0e38f965497cdceb93fad8e33608" ->>>>>>> origin/main dependencies = [ "arrayref", "backtrace", @@ -6583,14 +6321,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core-v2" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7e2d95d154217cd7b73ec9d7b57fea830b9c2c2fc2d6cd576f0ca195814772" ->>>>>>> origin/main dependencies = [ "arrayref", "backtrace", @@ -6629,14 +6362,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4deb8da6b6c57599071a8d1730e2af5b3922a85a77470513b14ba0f8d9da9960" ->>>>>>> origin/main dependencies = [ "proc-macro2", "quote", @@ -6645,14 +6373,9 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07a699e5e619a9c50eb98eab1a2dd19c3db46879aa792965f3cc869f46d6b4d8" ->>>>>>> origin/main dependencies = [ "anyhow", "bincode", @@ -6677,14 +6400,9 @@ dependencies = [ [[package]] name = "sp1-recursion-program" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea81ce0e6be0ceabf421d10239ca6c439a0f3e88ef4d441f07102870075e6c8" ->>>>>>> origin/main dependencies = [ "itertools 0.13.0", "p3-air", @@ -6714,14 +6432,9 @@ dependencies = [ [[package]] name = "sp1-sdk" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57811a47cbd84f6e1ba7a3f8686f557bbc028a3f82b3515bad0e8f3d0870f5cf" ->>>>>>> origin/main dependencies = [ "alloy-sol-types", "anyhow", @@ -6796,14 +6509,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -<<<<<<< HEAD -version = "1.1.1" -source = "git+https://github.com/succinctlabs/sp1.git?branch=experimental#232d0fb2913f86e31383c8116379c51798ef7d78" -======= version = "1.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3abb3d72cb37e4cb7fc5a687d5ce55edefcec5e5a2378eb04cd682919cb71c7c" ->>>>>>> origin/main dependencies = [ "bincode", "cfg-if", @@ -6948,15 +6656,9 @@ dependencies = [ [[package]] name = "superchain-primitives" -<<<<<<< HEAD -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92c0bb828219b159e625b816e9248adafb028eabb86917b0dfbca9c658c0990" -======= version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa28a95195192539fa2a3ff607057b08c6ad0839b9edb2aff17917c93c42d661" ->>>>>>> origin/main dependencies = [ "alloy-consensus", "alloy-eips", @@ -7191,15 +6893,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -<<<<<<< HEAD -version = "1.39.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" -======= version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" ->>>>>>> origin/main dependencies = [ "backtrace", "bytes", @@ -7313,11 +7009,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ -<<<<<<< HEAD - "indexmap 2.4.0", -======= "indexmap 2.5.0", ->>>>>>> origin/main "toml_datetime", "winnow 0.5.40", ] @@ -7575,15 +7267,6 @@ name = "unicode-xid" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" -<<<<<<< HEAD - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -======= ->>>>>>> origin/main [[package]] name = "unsigned-varint" @@ -8191,31 +7874,3 @@ dependencies = [ "sha3", "subtle", ] -<<<<<<< HEAD - -[[package]] -name = "zkvm-host" -version = "0.1.0" -dependencies = [ - "alloy-sol-types", - "anyhow", - "cargo_metadata", - "clap", - "client-utils", - "dotenv", - "host-utils", - "kona-host", - "log", - "num-format", - "revm 13.0.0 (git+https://github.com/bluealloy/revm)", - "sp1-helper", - "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" -======= ->>>>>>> origin/main diff --git a/programs/aggregation/src/main.rs b/programs/aggregation/src/main.rs index 3f479d6d..4aef7d20 100644 --- a/programs/aggregation/src/main.rs +++ b/programs/aggregation/src/main.rs @@ -4,20 +4,13 @@ #[cfg(target_os = "zkvm")] sp1_zkvm::entrypoint!(main); -<<<<<<< HEAD:client-programs/aggregation/src/main.rs use alloy_consensus::Header; use alloy_primitives::B256; use alloy_sol_types::SolValue; -use client_utils::{boot::BootInfoStruct, types::AggregationInputs}; -use sha2::{Digest, Sha256}; -======= ->>>>>>> origin/main:programs/aggregation/src/main.rs use std::collections::HashMap; -use alloy_consensus::Header; -use alloy_primitives::B256; use itertools::Itertools; -use op_succinct_client_utils::{types::AggregationInputs, RawBootInfo}; +use op_succinct_client_utils::{types::AggregationInputs, boot::BootInfoStruct}; use sha2::{Digest, Sha256}; /// The verification key for the multi-block program. @@ -30,55 +23,46 @@ use sha2::{Digest, Sha256}; const MULTI_BLOCK_PROGRAM_VKEY_DIGEST: [u32; 8] = [1807316243, 1400630407, 873277975, 658999266, 422343326, 774525422, 1268417967, 711858264]; -<<<<<<< HEAD:client-programs/aggregation/src/main.rs -/// Verify that the L1 heads in the boot infos are in the header chain. -fn verify_l1_heads(agg_inputs: &AggregationInputs, headers: &[Header]) { - // Create a map of each l1_head in the BootInfo's to booleans - let mut l1_heads_map: HashMap = agg_inputs - .boot_infos - .iter() - .map(|boot_info| (boot_info.l1Head, false)) - .collect(); -======= -fn main() { - // Read in the aggregation inputs corresponding to each multi-block proof. +pub fn main() { + // Read in the public values corresponding to each multi-block proof. let agg_inputs = sp1_zkvm::io::read::(); - - // Read in the headers. - // - // Note: The headers are in order from start to end. We use [serde_cbor] as bincode - // serialization causes issues with the zkVM. + // Note: The headers are in order from start to end. We use serde_cbor as bincode serialization causes + // issues with the zkVM. let headers_bytes = sp1_zkvm::io::read_vec(); let headers: Vec
= serde_cbor::from_slice(&headers_bytes).unwrap(); assert!(!agg_inputs.boot_infos.is_empty()); // Confirm that the boot infos are sequential. - agg_inputs.boot_infos.iter().tuples().for_each(|(prev_boot_info, curr_boot_info)| { - // The claimed block of the previous boot info must be the l2 output root of the current - // boot. - assert_eq!(prev_boot_info.l2_claim, curr_boot_info.l2_output_root); + agg_inputs.boot_infos.windows(2).for_each(|pair| { + let (prev_boot_info, boot_info) = (&pair[0], &pair[1]); + + // The claimed block of the previous boot info must be the L2 output root of the current boot. + assert_eq!(prev_boot_info.l2PostRoot, boot_info.l2PreRoot); - // The chain id must be the same for all the boot infos, to ensure they're + // The chain ID must be the same for all the boot infos, to ensure they're // from the same chain and span batch range. - assert_eq!(prev_boot_info.chain_id, curr_boot_info.chain_id); + assert_eq!(prev_boot_info.chainId, boot_info.chainId); + + // The rollup config must be the same for all the boot infos, to ensure they're + // from the same chain and span batch range. + assert_eq!(prev_boot_info.rollupConfigHash, boot_info.rollupConfigHash); }); // Verify each multi-block program proof. agg_inputs.boot_infos.iter().for_each(|boot_info| { - // Compute the public values digest as the hash of the abi-encoded [`RawBootInfo`]. + // In the multi-block program, the public values digest is just the hash of the ABI encoded + // boot info. let abi_encoded_boot_info = boot_info.abi_encode(); let pv_digest = Sha256::digest(abi_encoded_boot_info); - // Verify the proof against the public values digest. if cfg!(target_os = "zkvm") { sp1_lib::verify::verify_sp1_proof(&MULTI_BLOCK_PROGRAM_VKEY_DIGEST, &pv_digest.into()); } }); - // Create a map of each l1 head in the [`RawBootInfo`]s to booleans + // Create a map of each l1 head in the [`RawBootInfo`]'s to booleans let mut l1_heads_map: HashMap = - agg_inputs.boot_infos.iter().map(|boot_info| (boot_info.l1_head, false)).collect(); ->>>>>>> origin/main:programs/aggregation/src/main.rs + agg_inputs.boot_infos.iter().map(|boot_info| (boot_info.l1_head, false)).collect(); // Iterate through the headers in reverse order. The headers should be sequentially linked and // include the l1 head of each boot info. @@ -98,48 +82,6 @@ fn main() { for (l1_head, found) in l1_heads_map.iter() { assert!(*found, "l1 head {:?} not found in the provided header chain", l1_head); } -<<<<<<< HEAD:client-programs/aggregation/src/main.rs -} - -pub fn main() { - // Read in the public values corresponding to each multi-block proof. - let agg_inputs = sp1_zkvm::io::read::(); - // Note: The headers are in order from start to end. We use serde_cbor as bincode serialization causes - // issues with the zkVM. - let headers_bytes = sp1_zkvm::io::read_vec(); - let headers: Vec
= serde_cbor::from_slice(&headers_bytes).unwrap(); - assert!(!agg_inputs.boot_infos.is_empty()); - - // Confirm that the boot infos are sequential. - agg_inputs.boot_infos.windows(2).for_each(|pair| { - let (prev_boot_info, boot_info) = (&pair[0], &pair[1]); - - // The claimed block of the previous boot info must be the L2 output root of the current boot. - assert_eq!(prev_boot_info.l2PostRoot, boot_info.l2PreRoot); - - // The chain ID must be the same for all the boot infos, to ensure they're - // from the same chain and span batch range. - assert_eq!(prev_boot_info.chainId, boot_info.chainId); - - // The rollup config must be the same for all the boot infos, to ensure they're - // from the same chain and span batch range. - assert_eq!(prev_boot_info.rollupConfigHash, boot_info.rollupConfigHash); - }); - - // Verify each multi-block program proof. - agg_inputs.boot_infos.iter().for_each(|boot_info| { - // In the multi-block program, the public values digest is just the hash of the ABI encoded - // boot info. - let abi_encoded_boot_info = boot_info.abi_encode(); - let pv_digest = Sha256::digest(abi_encoded_boot_info); - - if cfg!(target_os = "zkvm") { - sp1_lib::verify::verify_sp1_proof(&MULTI_BLOCK_PROGRAM_VKEY_DIGEST, &pv_digest.into()); - } - }); - - // Verify the L1 heads of each boot info are on the L1. - verify_l1_heads(&agg_inputs, &headers); let first_boot_info = &agg_inputs.boot_infos[0]; let last_boot_info = &agg_inputs.boot_infos[agg_inputs.boot_infos.len() - 1]; @@ -152,21 +94,9 @@ pub fn main() { l1Head: agg_inputs.latest_l1_checkpoint_head, chainId: last_boot_info.chainId, rollupConfigHash: last_boot_info.rollupConfigHash, -======= - - let first_boot_info = &agg_inputs.boot_infos[0]; - let last_boot_info = &agg_inputs.boot_infos[agg_inputs.boot_infos.len() - 1]; - - // Consolidate the boot info into an aggregated [`RawBootInfo`] that proves the range. - let final_boot_info = RawBootInfo { - l2_output_root: first_boot_info.l2_output_root, - l2_claim_block: last_boot_info.l2_claim_block, - l2_claim: last_boot_info.l2_claim, - l1_head: agg_inputs.latest_l1_checkpoint_head, - chain_id: last_boot_info.chain_id, ->>>>>>> origin/main:programs/aggregation/src/main.rs - }; + } // Commit to the aggregated [`RawBootInfo`]. sp1_zkvm::io::commit_slice(&final_boot_info.abi_encode()); + } diff --git a/programs/fault-proof/src/main.rs b/programs/fault-proof/src/main.rs index 52a149d5..63177ed9 100644 --- a/programs/fault-proof/src/main.rs +++ b/programs/fault-proof/src/main.rs @@ -21,21 +21,13 @@ cfg_if! { // from SP1 and compile to a program that can be run in zkVM. if #[cfg(target_os = "zkvm")] { sp1_zkvm::entrypoint!(main); -<<<<<<< HEAD:client-programs/fault-proof/src/main.rs - use client_utils::{InMemoryOracle, boot::BootInfoStruct, BootInfoWithBytesConfig}; + use op_succinct_client_utils::{InMemoryOracle, boot::BootInfoStruct, BootInfoWithBytesConfig}; use kona_primitives::RollupConfig; -======= - use op_succinct_client_utils::{RawBootInfo, InMemoryOracle}; ->>>>>>> origin/main:programs/fault-proof/src/main.rs use alloc::vec::Vec; use serde_json; } else { use kona_client::CachingOracle; -<<<<<<< HEAD:client-programs/fault-proof/src/main.rs - use client_utils::pipes::{ORACLE_READER, HINT_WRITER}; -======= use op_succinct_client_utils::pipes::{ORACLE_READER, HINT_WRITER}; ->>>>>>> origin/main:programs/fault-proof/src/main.rs } } diff --git a/programs/range/Cargo.toml b/programs/range/Cargo.toml index a1e6ef60..32184437 100644 --- a/programs/range/Cargo.toml +++ b/programs/range/Cargo.toml @@ -10,12 +10,8 @@ repository.workspace = true [dependencies] # workspace (general) cfg-if.workspace = true -<<<<<<< HEAD:client-programs/range/Cargo.toml -client-utils.workspace = true -serde_json.workspace = true -======= op-succinct-client-utils.workspace = true ->>>>>>> origin/main:programs/range/Cargo.toml +serde_json.workspace = true # workspace (ethereum) op-alloy-consensus.workspace = true diff --git a/programs/range/src/main.rs b/programs/range/src/main.rs index 4126f8e5..5fd813e2 100644 --- a/programs/range/src/main.rs +++ b/programs/range/src/main.rs @@ -30,24 +30,16 @@ cfg_if! { if #[cfg(target_os = "zkvm")] { sp1_zkvm::entrypoint!(main); -<<<<<<< HEAD:client-programs/range/src/main.rs - use client_utils::{InMemoryOracle, BootInfoWithBytesConfig, boot::BootInfoStruct}; use kona_primitives::RollupConfig; -======= use op_succinct_client_utils::{ - RawBootInfo, + BootInfoWithBytesConfig, boot::BootInfoStruct, InMemoryOracle }; ->>>>>>> origin/main:programs/range/src/main.rs use alloc::vec::Vec; use serde_json; } else { use kona_client::CachingOracle; -<<<<<<< HEAD:client-programs/range/src/main.rs - use client_utils::pipes::{ORACLE_READER, HINT_WRITER}; -======= use op_succinct_client_utils::pipes::{ORACLE_READER, HINT_WRITER}; ->>>>>>> origin/main:programs/range/src/main.rs } } @@ -89,11 +81,8 @@ fn main() { oracle.verify().expect("key value verification failed"); println!("cycle-tracker-report-end: oracle-verify"); } else { -<<<<<<< HEAD:client-programs/range/src/main.rs -======= // 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. ->>>>>>> origin/main:programs/range/src/main.rs let oracle = Arc::new(CachingOracle::new(1024, ORACLE_READER, HINT_WRITER)); let boot = Arc::new(BootInfo::load(oracle.as_ref()).await.unwrap()); } diff --git a/proposer/succinct/Cargo.toml b/proposer/succinct/Cargo.toml index 7758ffe6..3f0c0b69 100644 --- a/proposer/succinct/Cargo.toml +++ b/proposer/succinct/Cargo.toml @@ -20,10 +20,10 @@ name = "vkey" path = "bin/vkey.rs" [[bin]] -<<<<<<< HEAD:op-succinct-proposer/Cargo.toml name = "fetch-rollup-config" path = "bin/fetch_rollup_config.rs" -======= + +[[bin]] name = "cost_estimator" path = "bin/cost_estimator.rs" @@ -34,7 +34,6 @@ path = "bin/load_stdin.rs" [[bin]] name = "span_batch_ranges" path = "bin/span_batch_ranges.rs" ->>>>>>> origin/main:proposer/succinct/Cargo.toml [dependencies] @@ -48,22 +47,14 @@ kona-host = { workspace = true } kona-primitives.workspace = true # local -<<<<<<< HEAD:op-succinct-proposer/Cargo.toml -host-utils.workspace = true -client-utils.workspace = true -======= op-succinct-host-utils.workspace = true ->>>>>>> origin/main:proposer/succinct/Cargo.toml # sp1 sp1-sdk = { workspace = true } anyhow.workspace = true dotenv.workspace = true -<<<<<<< HEAD:op-succinct-proposer/Cargo.toml -======= op-succinct-client-utils.workspace = true ->>>>>>> origin/main:proposer/succinct/Cargo.toml serde = { workspace = true } serde_json.workspace = true @@ -77,16 +68,12 @@ tower-http.workspace = true cargo_metadata.workspace = true revm.workspace = true reqwest.workspace = true -<<<<<<< HEAD:op-succinct-proposer/Cargo.toml -======= futures.workspace = true itertools.workspace = true csv.workspace = true rayon = "1.10.0" lazy_static = "1.5.0" uuid = "1.10.0" ->>>>>>> origin/main:proposer/succinct/Cargo.toml - [build-dependencies] sp1-build = { workspace = true } cargo_metadata.workspace = true diff --git a/proposer/succinct/bin/fetch_and_save_proof.rs b/proposer/succinct/bin/fetch_and_save_proof.rs index e293d7a1..2ade9192 100644 --- a/proposer/succinct/bin/fetch_and_save_proof.rs +++ b/proposer/succinct/bin/fetch_and_save_proof.rs @@ -2,13 +2,8 @@ use alloy::hex; use alloy::sol_types::SolValue; use anyhow::Result; use clap::Parser; -<<<<<<< HEAD:op-succinct-proposer/bin/fetch_and_save_proof.rs -use client_utils::boot::BootInfoStruct; -use client_utils::BOOT_INFO_SIZE; -======= ->>>>>>> origin/main:proposer/succinct/bin/fetch_and_save_proof.rs use dotenv::dotenv; -use op_succinct_client_utils::{RawBootInfo, BOOT_INFO_SIZE}; +use op_succinct_client_utils::{boot::BootInfoStruct, BOOT_INFO_SIZE}; use sp1_sdk::{NetworkProver, SP1ProofWithPublicValues}; use std::{fs, path::Path}; diff --git a/proposer/succinct/bin/server.rs b/proposer/succinct/bin/server.rs index abf9aec6..a5b34e03 100644 --- a/proposer/succinct/bin/server.rs +++ b/proposer/succinct/bin/server.rs @@ -7,13 +7,8 @@ use axum::{ Json, Router, }; use base64::{engine::general_purpose, Engine as _}; -<<<<<<< HEAD:op-succinct-proposer/bin/server.rs -use client_utils::boot::BootInfoStruct; -use host_utils::{fetcher::SP1KonaDataFetcher, get_agg_proof_stdin, get_proof_stdin, ProgramType}; -======= ->>>>>>> origin/main:proposer/succinct/bin/server.rs use log::info; -use op_succinct_client_utils::{RawBootInfo, BOOT_INFO_SIZE}; +use op_succinct_client_utils::{boot::BootInfoStruct, BOOT_INFO_SIZE}; use op_succinct_host_utils::{ fetcher::OPSuccinctDataFetcher, get_agg_proof_stdin, get_proof_stdin, ProgramType, }; diff --git a/scripts/prove/Cargo.toml b/scripts/prove/Cargo.toml index 29830fdc..9ca1da33 100644 --- a/scripts/prove/Cargo.toml +++ b/scripts/prove/Cargo.toml @@ -29,7 +29,6 @@ alloy-sol-types = { workspace = true } anyhow.workspace = true dotenv.workspace = true num-format.workspace = true -client-utils.workspace = true revm.workspace = true log.workspace = true diff --git a/utils/client/Cargo.toml b/utils/client/Cargo.toml index 838cb684..0f2ad2aa 100644 --- a/utils/client/Cargo.toml +++ b/utils/client/Cargo.toml @@ -26,7 +26,6 @@ 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/utils/client/src/boot.rs b/utils/client/src/boot.rs index 6c8e5d12..51a71cfc 100644 --- a/utils/client/src/boot.rs +++ b/utils/client/src/boot.rs @@ -9,21 +9,21 @@ use sha2::{Digest, Sha256}; // ABI encoding of BootInfo is 6 * 32 bytes. pub const BOOT_INFO_SIZE: usize = 6 * 32; -/// Hash the serialized rollup config using SHA256. Note: The rollup config is never unrolled on-chain, -/// so switching to a different hash function is not a concern, as long as the config hash is -/// consistent with the one on the contract. +/// Hash the serialized rollup config using SHA256. Note: The rollup config is never unrolled +/// on-chain, so switching to a different hash function is not a concern, as long as the config hash +/// is consistent with the one on the contract. pub fn hash_rollup_config(serialized_config: &Vec) -> B256 { // Create a SHA256 hasher let mut hasher = Sha256::new(); -<<<<<<< HEAD:crates/client-utils/src/boot.rs // Hash the serialized config hasher.update(serialized_config.as_slice()); // Finalize and convert to B256 let hash = hasher.finalize(); B256::from_slice(hash.as_slice()) -======= +} + impl From for BootInfo { /// Convert the BootInfoWithoutRollupConfig into BootInfo by deriving the RollupConfig. fn from(boot_info_without_rollup_config: RawBootInfo) -> Self { @@ -33,7 +33,6 @@ impl From for BootInfo { Self { l1_head, l2_output_root, l2_claim, l2_claim_block, chain_id, rollup_config } } ->>>>>>> origin/main:utils/client/src/boot.rs } sol! { diff --git a/utils/client/src/oracle/mod.rs b/utils/client/src/oracle/mod.rs index ea1fdf8a..722fbe06 100644 --- a/utils/client/src/oracle/mod.rs +++ b/utils/client/src/oracle/mod.rs @@ -65,10 +65,6 @@ impl HintWriterClient for InMemoryOracle { /// and verify it once, rather than verifying each of the 4096 elements separately. #[derive(Default)] struct Blob { -<<<<<<< HEAD:crates/client-utils/src/oracle/mod.rs - // TODO: This commitment is currently unused. -======= ->>>>>>> origin/main:utils/client/src/oracle/mod.rs _commitment: FixedBytes<48>, // 4096 Field elements, each 32 bytes. data: FixedBytes<131072>, diff --git a/utils/host/Cargo.toml b/utils/host/Cargo.toml index cc14c032..8590c712 100644 --- a/utils/host/Cargo.toml +++ b/utils/host/Cargo.toml @@ -24,10 +24,7 @@ revm.workspace = true dotenv.workspace = true tokio.workspace = true futures.workspace = true -<<<<<<< HEAD:crates/host-utils/Cargo.toml bincode.workspace = true -======= num-format.workspace = true serde.workspace = true sp1-build.workspace = true ->>>>>>> origin/main:utils/host/Cargo.toml diff --git a/utils/host/src/fetcher.rs b/utils/host/src/fetcher.rs index 7ce8cadb..2bfed5dc 100644 --- a/utils/host/src/fetcher.rs +++ b/utils/host/src/fetcher.rs @@ -8,12 +8,8 @@ use alloy_primitives::{Address, B256}; use alloy_sol_types::SolValue; use anyhow::Result; use cargo_metadata::MetadataCommand; -<<<<<<< HEAD:crates/host-utils/src/fetcher.rs -use client_utils::boot::BootInfoStruct; -======= ->>>>>>> origin/main:utils/host/src/fetcher.rs use kona_host::HostCli; -use op_succinct_client_utils::RawBootInfo; +use op_succinct_client_utils::boot::BootInfoStruct; use std::{cmp::Ordering, env, fs, path::Path, str::FromStr, sync::Arc, time::Duration}; use tokio::time::sleep; @@ -94,13 +90,9 @@ impl OPSuccinctDataFetcher { let mut earliest_l1_header: Option
= None; for boot_info in boot_infos { -<<<<<<< HEAD:crates/host-utils/src/fetcher.rs let l1_block_header = self .get_header_by_hash(ChainMode::L1, boot_info.l1Head) .await?; -======= - let l1_block_header = self.get_header_by_hash(ChainMode::L1, boot_info.l1_head).await?; ->>>>>>> origin/main:utils/host/src/fetcher.rs if l1_block_header.number < earliest_block_num { earliest_block_num = l1_block_header.number; earliest_l1_header = Some(l1_block_header); @@ -352,11 +344,7 @@ impl OPSuccinctDataFetcher { data_dir: Some(data_directory.into()), exec: Some(exec_directory), server: false, -<<<<<<< HEAD:crates/host-utils/src/fetcher.rs rollup_config_path: Some(rollup_config_path.into()), -======= - rollup_config_path: None, ->>>>>>> origin/main:utils/host/src/fetcher.rs v: 0, }) } diff --git a/utils/host/src/lib.rs b/utils/host/src/lib.rs index 1cca12fc..b11ae16f 100644 --- a/utils/host/src/lib.rs +++ b/utils/host/src/lib.rs @@ -1,18 +1,11 @@ pub mod fetcher; pub mod helpers; -<<<<<<< HEAD:crates/host-utils/src/lib.rs -pub mod precompile; -use alloy_consensus::Header; -use alloy_primitives::B256; -use client_utils::{boot::BootInfoStruct, types::AggregationInputs, BootInfoWithBytesConfig}; -======= pub mod stats; use alloy_consensus::Header; use alloy_primitives::B256; ->>>>>>> origin/main:utils/host/src/lib.rs use kona_host::HostCli; -use op_succinct_client_utils::{types::AggregationInputs, RawBootInfo}; +use op_succinct_client_utils::{boot::BootInfoStruct,types::AggregationInputs, RawBootInfo, BootInfoWithBytesConfig}; use sp1_sdk::{SP1Proof, SP1Stdin}; use std::{fs::File, io::Read};