diff --git a/Cargo.lock b/Cargo.lock index e630ae0fd..9b5c250d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,29 +86,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "alloy" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcc41e8a11a4975b18ec6afba2cc48d591fa63336a4c526dacb50479a8d6b35" -dependencies = [ - "alloy-consensus 0.9.2", - "alloy-contract", - "alloy-core", - "alloy-eips 0.9.2", - "alloy-network 0.9.2", - "alloy-provider", - "alloy-pubsub", - "alloy-rpc-client", - "alloy-rpc-types", - "alloy-signer 0.9.2", - "alloy-signer-local 0.9.2", - "alloy-transport", - "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", -] - [[package]] name = "alloy-chains" version = "0.1.55" @@ -195,7 +172,6 @@ dependencies = [ "alloy-network-primitives 0.9.2", "alloy-primitives", "alloy-provider", - "alloy-pubsub", "alloy-rpc-types-eth 0.9.2", "alloy-sol-types", "alloy-transport", @@ -204,23 +180,11 @@ dependencies = [ "thiserror 2.0.11", ] -[[package]] -name = "alloy-core" -version = "0.8.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0713007d14d88a6edb8e248cddab783b698dbb954a28b8eee4bab21cfb7e578" -dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-types", -] - [[package]] name = "alloy-dyn-abi" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e3b98c37b3218924cd1d2a8570666b89662be54e5b182643855f783ea68b33" +checksum = "bc9138f4f0912793642d453523c3116bd5d9e11de73b70177aa7cb3e94b98ad2" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -307,9 +271,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731ea743b3d843bc657e120fb1d1e9cc94f5dab8107e35a82125a63e6420a102" +checksum = "24acd2f5ba97c7a320e67217274bc81fe3c3174b8e6144ec875d9d54e760e278" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -423,9 +387,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788bb18e8f61d5d9340b52143f27771daf7e1dccbaf2741621d2493f9debf52e" +checksum = "ec878088ec6283ce1e90d280316aadd3d6ce3de06ff63d68953c855e7e447e92" dependencies = [ "alloy-rlp", "bytes", @@ -461,13 +425,10 @@ dependencies = [ "alloy-network 0.9.2", "alloy-network-primitives 0.9.2", "alloy-primitives", - "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-eth 0.9.2", "alloy-transport", "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", @@ -488,25 +449,6 @@ dependencies = [ "wasmtimer", ] -[[package]] -name = "alloy-pubsub" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2269fd635f7b505f27c63a3cb293148cd02301efce4c8bdd9ff54fbfc4a20e23" -dependencies = [ - "alloy-json-rpc 0.9.2", - "alloy-primitives", - "alloy-transport", - "bimap", - "futures", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower 0.5.2", - "tracing", -] - [[package]] name = "alloy-rlp" version = "0.3.10" @@ -537,11 +479,8 @@ checksum = "d06a292b37e182e514903ede6e623b9de96420e8109ce300da288a96d88b7e4b" dependencies = [ "alloy-json-rpc 0.9.2", "alloy-primitives", - "alloy-pubsub", "alloy-transport", "alloy-transport-http", - "alloy-transport-ipc", - "alloy-transport-ws", "futures", "pin-project", "reqwest", @@ -563,7 +502,6 @@ checksum = "9383845dd924939e7ab0298bbfe231505e20928907d7905aa3bf112287305e06" dependencies = [ "alloy-primitives", "alloy-rpc-types-debug", - "alloy-rpc-types-engine", "alloy-rpc-types-eth 0.9.2", "alloy-serde 0.9.2", "serde", @@ -755,9 +693,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07b74d48661ab2e4b50bb5950d74dbff5e61dd8ed03bb822281b706d54ebacb" +checksum = "8d039d267aa5cbb7732fa6ce1fd9b5e9e29368f580f80ba9d7a8450c794de4b2" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -769,11 +707,10 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19cc9c7f20b90f9be1a8f71a3d8e283a43745137b0837b1a1cb13159d37cad72" +checksum = "620ae5eee30ee7216a38027dec34e0585c55099f827f92f50d11e3d2d3a4a954" dependencies = [ - "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", @@ -788,26 +725,24 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713b7e6dfe1cb2f55c80fb05fd22ed085a1b4e48217611365ed0ae598a74c6ac" +checksum = "ad9f7d057e00f8c5994e4ff4492b76532c51ead39353aa2ed63f8c50c0f4d52e" dependencies = [ - "alloy-json-abi", "const-hex", "dunce", "heck 0.5.0", "proc-macro2", "quote", - "serde_json", "syn 2.0.96", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eda2711ab2e1fb517fc6e2ffa9728c9a232e296d16810810e6957b781a1b8bc" +checksum = "74e60b084fe1aef8acecda2743ff2d93c18ff3eb67a2d3b12f62582a1e66ef5e" dependencies = [ "serde", "winnow 0.6.24", @@ -815,9 +750,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b478bc9c0c4737a04cd976accde4df7eba0bdc0d90ad6ff43d58bc93cf79c1" +checksum = "c1382302752cd751efd275f4d6ef65877ddf61e0e6f5ac84ef4302b79a33a31a" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -861,43 +796,6 @@ dependencies = [ "url", ] -[[package]] -name = "alloy-transport-ipc" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4da44bc9a5155ab599666d26decafcf12204b72a80eeaba7c5e234ee8ac205" -dependencies = [ - "alloy-json-rpc 0.9.2", - "alloy-pubsub", - "alloy-transport", - "bytes", - "futures", - "interprocess", - "pin-project", - "serde_json", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "alloy-transport-ws" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58011745b2f17b334db40df9077d75b181f78360a5bc5c35519e15d4bfce15e2" -dependencies = [ - "alloy-pubsub", - "alloy-transport", - "futures", - "http", - "rustls", - "serde_json", - "tokio", - "tokio-tungstenite", - "tracing", - "ws_stream_wasm", -] - [[package]] name = "alloy-trie" version = "0.7.8" @@ -1178,17 +1076,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version 0.4.1", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -1331,12 +1218,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" - [[package]] name = "bincode" version = "1.3.3" @@ -2059,12 +1940,6 @@ dependencies = [ "rustversion", ] -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - [[package]] name = "der" version = "0.7.9" @@ -2170,12 +2045,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "doctest-file" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" - [[package]] name = "dotenv" version = "0.15.0" @@ -3168,21 +3037,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "interprocess" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "894148491d817cb36b6f778017b8ac46b17408d522dd90f539d677ea938362eb" -dependencies = [ - "doctest-file", - "futures-core", - "libc", - "recvmsg", - "tokio", - "widestring", - "windows-sys 0.52.0", -] - [[package]] name = "ipnet" version = "2.10.1" @@ -4183,7 +4037,7 @@ version = "0.1.0" dependencies = [ "cargo_metadata", "chrono", - "sp1-build", + "sp1-build 4.0.0", ] [[package]] @@ -4236,12 +4090,16 @@ dependencies = [ name = "op-succinct-host-utils" version = "0.1.0" dependencies = [ - "alloy", "alloy-consensus 0.9.2", + "alloy-contract", "alloy-eips 0.9.2", "alloy-primitives", + "alloy-provider", "alloy-rlp", + "alloy-signer-local 0.9.2", "alloy-sol-types", + "alloy-transport", + "alloy-transport-http", "anyhow", "cargo_metadata", "dotenv", @@ -4269,7 +4127,6 @@ dependencies = [ name = "op-succinct-proposer" version = "0.1.0" dependencies = [ - "alloy", "alloy-primitives", "anyhow", "axum", @@ -4300,6 +4157,7 @@ dependencies = [ "csv", "dotenv", "kona-host", + "kona-preimage", "op-succinct-build-utils", "op-succinct-client-utils", "op-succinct-host-utils", @@ -4314,7 +4172,6 @@ dependencies = [ name = "op-succinct-scripts" version = "0.1.0" dependencies = [ - "alloy", "alloy-primitives", "anyhow", "bincode", @@ -4793,16 +4650,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version 0.4.1", -] - [[package]] name = "pin-project" version = "1.1.8" @@ -5193,12 +5040,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "recvmsg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" - [[package]] name = "redox_syscall" version = "0.5.8" @@ -5840,12 +5681,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.217" @@ -5984,17 +5819,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.10.8" @@ -6121,11 +5945,22 @@ dependencies = [ "dirs", ] +[[package]] +name = "sp1-build" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" +dependencies = [ + "anyhow", + "cargo_metadata", + "chrono", + "clap", + "dirs", +] + [[package]] name = "sp1-core-executor" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "386bdb534e0cf3643dd9dd67ed06933730913a03dd1ab0e64893cd969c1da57a" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "bincode", "bytemuck", @@ -6148,7 +5983,7 @@ dependencies = [ "serde", "serde_json", "sp1-curves", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-stark", "strum", "strum_macros", @@ -6162,9 +5997,8 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89881a2078d8e32933e9687a0f146e470842f3674f8a813524d80b7dc42eb7e9" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "bincode", "cbindgen", @@ -6203,7 +6037,7 @@ dependencies = [ "sp1-core-executor", "sp1-curves", "sp1-derive", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-stark", "static_assertions", "strum", @@ -6219,9 +6053,8 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef50ff96d561bb7e8a000ec35317863a517f7c68f9d1231e1483c4e93c174a1" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "bincode", "ctrlc", @@ -6236,9 +6069,8 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b325b91b40643b36738a4abcdfde81ba8b158e04c3e1a2d94a1942df84e03c8" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "cfg-if", "dashu", @@ -6251,16 +6083,15 @@ dependencies = [ "p3-field", "serde", "snowbridge-amcl", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-stark", "typenum", ] [[package]] name = "sp1-derive" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d6abd68038a6f688601cdd0cbec17b56f56e5d10e3f34f1a42bee8cc7ca2c" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "quote", "syn 1.0.109", @@ -6274,7 +6105,7 @@ checksum = "2378a017c2159e1ab89ed73ff797771ab8b00b11ee1d86852c00c2c9fabc76ce" dependencies = [ "bincode", "serde", - "sp1-primitives", + "sp1-primitives 4.0.0", ] [[package]] @@ -6295,11 +6126,27 @@ dependencies = [ "sha2", ] +[[package]] +name = "sp1-primitives" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" +dependencies = [ + "bincode", + "hex", + "lazy_static", + "num-bigint 0.4.6", + "p3-baby-bear", + "p3-field", + "p3-poseidon2", + "p3-symmetric", + "serde", + "sha2", +] + [[package]] name = "sp1-prover" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82833ca900c54cd9f933560b433e56be97edd7322f8ec1654037e4326f3f6b7e" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "anyhow", "bincode", @@ -6326,7 +6173,7 @@ dependencies = [ "sha2", "sp1-core-executor", "sp1-core-machine", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-recursion-circuit", "sp1-recursion-compiler", "sp1-recursion-core", @@ -6340,9 +6187,8 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0e78b19138ed445e02a2c69ae2115df6be3595bb464fc0e2ade550b7b9601a" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -6364,7 +6210,7 @@ dependencies = [ "sp1-core-executor", "sp1-core-machine", "sp1-derive", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-recursion-compiler", "sp1-recursion-core", "sp1-recursion-gnark-ffi", @@ -6374,9 +6220,8 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6cd484565925bc9f10af6358ebe4f8a2193af635299725294a1ee8441854689" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "backtrace", "itertools 0.13.0", @@ -6386,7 +6231,7 @@ dependencies = [ "p3-symmetric", "serde", "sp1-core-machine", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-recursion-core", "sp1-recursion-derive", "sp1-stark", @@ -6396,9 +6241,8 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781a49a2ade18ebafc090070a3ce62854ee3aed802fe0f36074cd9984e9183ce" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "backtrace", "cbindgen", @@ -6428,7 +6272,7 @@ dependencies = [ "serde", "sp1-core-machine", "sp1-derive", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-stark", "static_assertions", "thiserror 1.0.69", @@ -6439,9 +6283,8 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8f0f802f8d5b1a3afca56c5b398c16a0382bef8969be8b9a3edc7b8e8b37be" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "quote", "syn 1.0.109", @@ -6449,9 +6292,8 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5b4480f59b320bd25beaf3b19c0d3c9b60d140a99964805b18853a611a8eaf" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "anyhow", "bincode", @@ -6475,9 +6317,8 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47b98599a826c8d24976791495bc59c7d8be3af97a515cf5f7a7c3b02daa835" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "alloy-primitives", "alloy-signer 0.8.3", @@ -6503,11 +6344,11 @@ dependencies = [ "reqwest-middleware", "serde", "serde_json", - "sp1-build", + "sp1-build 4.0.1", "sp1-core-executor", "sp1-core-machine", "sp1-cuda", - "sp1-primitives", + "sp1-primitives 4.0.1", "sp1-prover", "sp1-stark", "strum", @@ -6523,9 +6364,8 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4779a915a218d668868fd6d11f6f225e6ec0033121345772214901edc8e9fa" +version = "4.0.1" +source = "git+https://github.com/succinctlabs/sp1?branch=ratan%2Fset-alloy-features-off-by-default#4ba53378f4d9c2f1cd2e06a38e1b72f18699ef4e" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6549,7 +6389,7 @@ dependencies = [ "rayon-scan", "serde", "sp1-derive", - "sp1-primitives", + "sp1-primitives 4.0.1", "strum", "strum_macros", "sysinfo 0.30.13", @@ -6573,7 +6413,7 @@ dependencies = [ "rand", "sha2", "sp1-lib", - "sp1-primitives", + "sp1-primitives 4.0.0", ] [[package]] @@ -6730,9 +6570,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e89d8bf2768d277f40573c83a02a099e96d96dd3104e13ea676194e61ac4b0" +checksum = "b84e4d83a0a6704561302b917a932484e1cae2d8c6354c64be8b7bac1c1fe057" dependencies = [ "paste", "proc-macro2", @@ -7017,22 +6857,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots", -] - [[package]] name = "tokio-util" version = "0.7.13" @@ -7281,26 +7105,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror 1.0.69", - "utf-8", -] - [[package]] name = "twirp-rs" version = "0.13.0-succinct" @@ -7400,12 +7204,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf16_iter" version = "1.0.5" @@ -7621,12 +7419,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - [[package]] name = "winapi" version = "0.3.9" @@ -7929,25 +7721,6 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" -[[package]] -name = "ws_stream_wasm" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version 0.4.1", - "send_wrapper", - "thiserror 1.0.69", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index 90f80c448..70563c551 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/succinctlabs/op-succinct" anyhow = { version = "1.0.86", default-features = false } thiserror = { version = "2.0.3" } cfg-if = "1.0.0" -spin = { version = "0.9.8", features = ["mutex"] } +spin = { version = "0.9.8" } lru = "0.12.3" async-trait = "0.1.80" sha2 = "0.10.8" @@ -68,29 +68,31 @@ kona-host = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff4 # op-succinct op-succinct-prove = { path = "scripts/prove" } -op-succinct-witnessgen = { path = "scripts/witnessgen" } op-succinct-client-utils = { path = "utils/client" } op-succinct-host-utils = { path = "utils/host" } op-succinct-build-utils = { path = "utils/build" } op-succinct-proposer = { path = "proposer/succinct" } +# Alloy (Network) +alloy-signer-local = { version = "=0.9.2" } +alloy-provider = { version = "=0.9.2" } +alloy-transport = { version = "=0.9.2" } +alloy-transport-http = { version = "=0.9.2" } +alloy-contract = { version = "=0.9.2" } + # Alloy -alloy = { version = "=0.9.2", default-features = false, features = ["full"] } alloy-rlp = { version = "=0.3.10", default-features = false } alloy-trie = { version = "=0.7.8", default-features = false } alloy-eips = { version = "=0.9.2", default-features = false } alloy-serde = { version = "=0.9.2", default-features = false } -alloy-provider = { version = "=0.9.2", default-features = false } alloy-consensus = { version = "=0.9.2", default-features = false } -alloy-transport = { version = "=0.9.2", default-features = false } alloy-rpc-types = { version = "=0.9.2", default-features = false } alloy-rpc-client = { version = "=0.9.2", default-features = false } -alloy-primitives = { version = "=0.8.18", default-features = false } +alloy-primitives = { version = "=0.8.19", default-features = false } alloy-node-bindings = { version = "=0.9.2", default-features = false } -alloy-transport-http = { version = "=0.9.2", default-features = false } alloy-rpc-types-engine = { version = "=0.9.2", default-features = false } alloy-rpc-types-beacon = { version = "=0.9.2", default-features = false } -alloy-sol-types = { version = "=0.8.18", default-features = false } +alloy-sol-types = { version = "=0.8.19", default-features = false } # OP Alloy op-alloy-consensus = { version = "=0.9.5", default-features = false } @@ -110,7 +112,10 @@ revm = { version = "19.3.0", default-features = false, features = ["kzg-rs"] } # sp1 sp1-lib = { version = "4.0.0", features = ["verify"] } -sp1-sdk = { version = "4.0.0" } +# sp1-sdk = { version = "4.0.0" } +# Switch back to crates SP1 SDK after the release that turns off alloy default features is out. +# https://github.com/succinctlabs/sp1/pull/1980 +sp1-sdk = { git = "https://github.com/succinctlabs/sp1", branch = "ratan/set-alloy-features-off-by-default" } sp1-zkvm = { version = "4.0.0", features = ["verify", "embedded"] } sp1-build = { version = "4.0.0" } diff --git a/programs/aggregation/Cargo.toml b/programs/aggregation/Cargo.toml index 36a22a3d8..6faeb1c75 100644 --- a/programs/aggregation/Cargo.toml +++ b/programs/aggregation/Cargo.toml @@ -13,7 +13,7 @@ sp1-zkvm = { workspace = true } sp1-lib = { workspace = true } op-succinct-client-utils = { workspace = true } alloy-consensus = { workspace = true } -alloy-primitives = { workspace = true } +alloy-primitives = { workspace = true, default-features = false } alloy-sol-types = { workspace = true } serde_cbor.workspace = true bincode.workspace = true diff --git a/programs/aggregation/src/main.rs b/programs/aggregation/src/main.rs index 0a625bb58..e0419ec3a 100644 --- a/programs/aggregation/src/main.rs +++ b/programs/aggregation/src/main.rs @@ -7,7 +7,7 @@ sp1_zkvm::entrypoint!(main); use alloy_consensus::Header; use alloy_primitives::B256; use alloy_sol_types::SolValue; -use std::collections::HashMap; +use alloy_primitives::map::HashMap; use op_succinct_client_utils::{ boot::BootInfoStruct, diff --git a/programs/range/Cargo.toml b/programs/range/Cargo.toml index a83a08f95..f5ad3b349 100644 --- a/programs/range/Cargo.toml +++ b/programs/range/Cargo.toml @@ -23,7 +23,7 @@ maili-genesis.workspace = true alloy-consensus.workspace = true alloy-eips.workspace = true alloy-rlp.workspace = true -alloy-primitives.workspace = true +alloy-primitives = { workspace = true, default-features = false } # sp1 sp1-zkvm.workspace = true diff --git a/programs/range/src/main.rs b/programs/range/src/main.rs index a1a403ad9..d61939ad0 100644 --- a/programs/range/src/main.rs +++ b/programs/range/src/main.rs @@ -6,7 +6,8 @@ //! native mode, the data for verifying the batch validity is fetched from RPC, while in zkVM mode, //! the data is supplied by the host binary to the verifiable program. -#![cfg_attr(target_os = "zkvm", no_main)] +#![no_main] +sp1_zkvm::entrypoint!(main); extern crate alloc; @@ -29,8 +30,6 @@ use maili_genesis::RollupConfig; use op_succinct_client_utils::precompiles::zkvm_handle_register; use tracing::{error, info}; -sp1_zkvm::entrypoint!(main); - use alloc::vec::Vec; use op_succinct_client_utils::{boot::BootInfoStruct, BootInfoWithBytesConfig, InMemoryOracle}; use serde_json; diff --git a/proposer/succinct/Cargo.toml b/proposer/succinct/Cargo.toml index 626271366..742449a4b 100644 --- a/proposer/succinct/Cargo.toml +++ b/proposer/succinct/Cargo.toml @@ -15,8 +15,7 @@ path = "bin/server.rs" # workspace tokio = { workspace = true } -alloy-primitives = { workspace = true } -alloy = { workspace = true } +alloy-primitives = { workspace = true, default-features = false } # local op-succinct-host-utils.workspace = true diff --git a/scripts/fees/Cargo.toml b/scripts/fees/Cargo.toml index 1af09f9d0..6dd3d6890 100644 --- a/scripts/fees/Cargo.toml +++ b/scripts/fees/Cargo.toml @@ -17,4 +17,4 @@ clap = { workspace = true } anyhow = { workspace = true } tokio = { workspace = true } dotenv = { workspace = true } -alloy-primitives = { workspace = true } +alloy-primitives = { workspace = true, default-features = false } diff --git a/scripts/prove/Cargo.toml b/scripts/prove/Cargo.toml index 161ae1f03..f5d63bad6 100644 --- a/scripts/prove/Cargo.toml +++ b/scripts/prove/Cargo.toml @@ -27,6 +27,7 @@ csv.workspace = true # kona kona-host = { workspace = true } +kona-preimage = { workspace = true } # local op-succinct-host-utils.workspace = true @@ -34,7 +35,7 @@ op-succinct-client-utils.workspace = true op-succinct-scripts = { path = "../utils" } # alloy -alloy-primitives = { workspace = true } +alloy-primitives = { workspace = true, default-features = false } # sp1 sp1-sdk = { workspace = true } diff --git a/scripts/prove/bin/multi.rs b/scripts/prove/bin/multi.rs index 19bd06981..b0b84bbcd 100644 --- a/scripts/prove/bin/multi.rs +++ b/scripts/prove/bin/multi.rs @@ -1,5 +1,7 @@ use anyhow::Result; use clap::Parser; +use kona_host::start_native_preimage_server; +use kona_preimage::{BidirectionalChannel, HintWriter, OracleReader, PreimageKey, PreimageKeyType}; use op_succinct_host_utils::{ block_range::get_validated_block_range, fetcher::{CacheMode, OPSuccinctDataFetcher, RunContext}, @@ -38,7 +40,15 @@ async fn main() -> Result<()> { // By default, re-run the native execution unless the user passes `--use-cache`. let witness_generation_time_sec = if !args.use_cache { - generate_witness(&host_cli).await? + let hint_chan = BidirectionalChannel::new()?; + let preimage_chan = BidirectionalChannel::new()?; + // Create the server and start it. + let server_task = task::spawn(start_native_preimage_server( + kv_store, + fetcher, + hint_chan.host, + preimage_chan.host, + )); } else { Duration::ZERO }; diff --git a/scripts/utils/Cargo.toml b/scripts/utils/Cargo.toml index c9ad3bc82..b2c895bb3 100644 --- a/scripts/utils/Cargo.toml +++ b/scripts/utils/Cargo.toml @@ -34,8 +34,7 @@ path = "bin/gen_sp1_test_artifacts.rs" [dependencies] # workspace -alloy-primitives = { workspace = true } -alloy = { workspace = true } +alloy-primitives = { workspace = true, default-features = false } bincode = { workspace = true } tokio = { workspace = true } clap = { workspace = true } diff --git a/scripts/utils/bin/fetch_and_save_proof.rs b/scripts/utils/bin/fetch_and_save_proof.rs index 9ac365009..58410ef4d 100644 --- a/scripts/utils/bin/fetch_and_save_proof.rs +++ b/scripts/utils/bin/fetch_and_save_proof.rs @@ -1,4 +1,3 @@ -use alloy::{hex, sol_types::SolValue}; use alloy_primitives::B256; use anyhow::Result; use clap::Parser; diff --git a/scripts/utils/bin/fetch_rollup_config.rs b/scripts/utils/bin/fetch_rollup_config.rs index 612cdef8e..63fb46f7d 100644 --- a/scripts/utils/bin/fetch_rollup_config.rs +++ b/scripts/utils/bin/fetch_rollup_config.rs @@ -1,4 +1,3 @@ -use alloy::{eips::BlockId, hex, signers::local::PrivateKeySigner}; use alloy_primitives::Address; use anyhow::Result; use op_succinct_client_utils::{boot::hash_rollup_config, types::u32_to_u8}; diff --git a/scripts/witnessgen/Cargo.toml b/scripts/witnessgen/Cargo.toml deleted file mode 100644 index a77f614d7..000000000 --- a/scripts/witnessgen/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "op-succinct-witnessgen" -version = "0.1.0" -license.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -repository.workspace = true - -[[bin]] -name = "native_host_runner" -path = "bin/native_host_runner.rs" - -[dependencies] -kona-host = { workspace = true } -tokio = { workspace = true } -clap = { workspace = true } -anyhow = { workspace = true } diff --git a/scripts/witnessgen/bin/native_host_runner.rs b/scripts/witnessgen/bin/native_host_runner.rs deleted file mode 100644 index d41d0fb7c..000000000 --- a/scripts/witnessgen/bin/native_host_runner.rs +++ /dev/null @@ -1,28 +0,0 @@ -use anyhow::Result; -use clap::Parser; -use kona_host::{init_tracing_subscriber, start_server, start_server_and_native_client, HostCli}; - -// Source: https://github.com/ethereum-optimism/kona/blob/main/bin/host/src/main.rs -#[tokio::main(flavor = "multi_thread")] -async fn main() -> Result<()> { - let cfg = HostCli::parse(); - init_tracing_subscriber(cfg.v)?; - - if cfg.server { - let res = start_server(cfg.clone()).await; - if res.is_err() { - std::process::exit(1); - } - } else { - let res = start_server_and_native_client(cfg.clone()).await; - if res.is_err() { - std::process::exit(1); - } - } - - println!( - "Ran host program with end block: {:?}", - cfg.claimed_l2_block_number - ); - std::process::exit(0); -} diff --git a/utils/build/src/lib.rs b/utils/build/src/lib.rs index f7b673e78..2d58ad599 100644 --- a/utils/build/src/lib.rs +++ b/utils/build/src/lib.rs @@ -43,35 +43,6 @@ fn build_native_program(program: &str, program_args: ProgramBuildArgs) { ); } -/// Build the native host runner to a separate target directory to avoid build lockups. -fn build_native_host_runner() { - let metadata = cargo_metadata::MetadataCommand::new() - .exec() - .expect("Failed to get cargo metadata"); - let target_dir = metadata.target_directory.join("native_host_runner"); - - let status = Command::new("cargo") - .args([ - "build", - "--workspace", - "--bin", - "native_host_runner", - "--release", - "--target-dir", - target_dir.as_ref(), - ]) - .status() - .expect("Failed to execute cargo build command"); - if !status.success() { - panic!("Failed to build native_host_runner"); - } - - println!( - "cargo:warning=native_host_runner built with release profile at {}", - current_datetime() - ); -} - pub(crate) fn current_datetime() -> String { let now = Local::now(); now.format("%Y-%m-%d %H:%M:%S").to_string() @@ -105,8 +76,4 @@ pub fn build_all(program_args: ProgramBuildArgs) { // Build aggregation program. // build_zkvm_program("aggregation"); - - // Note: Don't comment this out, because the Docker program depends on the native host runner - // being built. - build_native_host_runner(); } diff --git a/utils/client/Cargo.toml b/utils/client/Cargo.toml index ebffaf975..061042f91 100644 --- a/utils/client/Cargo.toml +++ b/utils/client/Cargo.toml @@ -16,7 +16,7 @@ op-alloy-consensus.workspace = true alloy-consensus.workspace = true alloy-rlp.workspace = true alloy-eips.workspace = true -alloy-primitives.workspace = true +alloy-primitives = { workspace = true, default-features = false } alloy-sol-types.workspace = true revm.workspace = true diff --git a/utils/host/Cargo.toml b/utils/host/Cargo.toml index b8e0932e1..da21967ad 100644 --- a/utils/host/Cargo.toml +++ b/utils/host/Cargo.toml @@ -20,12 +20,16 @@ maili-protocol.workspace = true op-alloy-consensus.workspace = true # alloy -alloy = { workspace = true } -alloy-rlp.workspace = true -alloy-primitives.workspace = true -alloy-consensus.workspace = true -alloy-sol-types.workspace = true -alloy-eips.workspace = true +alloy-signer-local = { workspace = true, default-features = false } +alloy-provider = { workspace = true, default-features = false } +alloy-transport = { workspace = true, default-features = true } +alloy-transport-http = { workspace = true, default-features = true } +alloy-rlp = { workspace = true, default-features = false } +alloy-primitives = { workspace = true, default-features = false } +alloy-consensus = { workspace = true, default-features = false } +alloy-sol-types = { workspace = true, default-features = false } +alloy-eips = { workspace = true, default-features = false } +alloy-contract = { workspace = true, default-features = false } # kona kona-host.workspace = true diff --git a/utils/host/src/block_range.rs b/utils/host/src/block_range.rs index 9e6464727..72638b15c 100644 --- a/utils/host/src/block_range.rs +++ b/utils/host/src/block_range.rs @@ -8,7 +8,6 @@ use crate::fetcher::{OPSuccinctDataFetcher, RPCMode}; use alloy_eips::BlockId; use anyhow::{bail, Result}; use futures::StreamExt; -use op_alloy_rpc_types::{OutputResponse, SafeHeadResponse}; use serde::{Deserialize, Serialize}; /// Get the start and end block numbers for a range, with validation. diff --git a/utils/host/src/fetcher.rs b/utils/host/src/fetcher.rs index 22b12a981..10d4aced3 100644 --- a/utils/host/src/fetcher.rs +++ b/utils/host/src/fetcher.rs @@ -1,20 +1,14 @@ -use alloy::{ - eips::{BlockId, BlockNumberOrTag}, - primitives::{Address, B256}, - providers::{Provider, ProviderBuilder, RootProvider}, - transports::{ - http::{reqwest::Url, Client, Http}, - Transport, - }, -}; use alloy_consensus::{BlockHeader, Header}; +use alloy_eips::{BlockId, BlockNumberOrTag}; +use alloy_primitives::{Address, B256}; +use alloy_provider::{Provider, ProviderBuilder, RootProvider}; use alloy_rlp::Decodable; use alloy_sol_types::SolValue; +use alloy_transport_http::Http; use anyhow::Result; use anyhow::{anyhow, bail}; use cargo_metadata::MetadataCommand; use futures::{stream, StreamExt}; -use kona_host::HostCli; use maili_genesis::RollupConfig; use maili_protocol::calculate_tx_l1_cost_fjord; use maili_protocol::L2BlockInfo; @@ -23,24 +17,25 @@ use op_alloy_network::{ primitives::{BlockTransactions, BlockTransactionsKind, HeaderResponse}, BlockResponse, Network, Optimism, }; -use op_alloy_rpc_types::{OpTransactionReceipt, OutputResponse, SafeHeadResponse}; +use op_alloy_rpc_types::OpTransactionReceipt; use op_succinct_client_utils::boot::BootInfoStruct; +use reqwest::{Client, Url}; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; use std::{ cmp::{min, Ordering}, - collections::HashMap, env, fs, path::Path, str::FromStr, sync::Arc, }; -use alloy_primitives::{keccak256, Bytes, U256, U64}; +use alloy_primitives::{keccak256, map::HashMap, Bytes, U256, U64}; +use crate::L2Output; use crate::{ rollup_config::{get_rollup_config_path, merge_rollup_config}, - L2Output, ProgramType, + ProgramType, }; #[derive(Clone)] @@ -400,7 +395,7 @@ impl OPSuccinctDataFetcher { pub async fn get_l1_header(&self, block_number: BlockId) -> Result
{ let block = self .l1_provider - .get_block(block_number, alloy::rpc::types::BlockTransactionsKind::Full) + .get_block(block_number, BlockTransactionsKind::Full) .await?; if let Some(block) = block { @@ -413,7 +408,7 @@ impl OPSuccinctDataFetcher { pub async fn get_l2_header(&self, block_number: BlockId) -> Result
{ let block = self .l2_provider - .get_block(block_number, alloy::rpc::types::BlockTransactionsKind::Full) + .get_block(block_number, BlockTransactionsKind::Full) .await?; if let Some(block) = block { @@ -807,7 +802,7 @@ impl OPSuccinctDataFetcher { // witness data. fs::create_dir_all(&data_directory)?; - Ok(HostCli { + Ok(SingleChainHostCli { l1_head: l1_head_hash, agreed_l2_output_root, agreed_l2_head_hash, @@ -1046,9 +1041,8 @@ mod tests { #[tokio::test] #[cfg(test)] async fn test_l2_safe_head_progression() { - use alloy::eips::BlockId; + use alloy_eips::BlockId; use futures::StreamExt; - use op_alloy_rpc_types::SafeHeadResponse; use crate::fetcher::RPCMode; diff --git a/utils/host/src/helpers.rs b/utils/host/src/helpers.rs index 3b5102445..f10c4dfe1 100644 --- a/utils/host/src/helpers.rs +++ b/utils/host/src/helpers.rs @@ -1,6 +1,6 @@ -use alloy_primitives::hex; +use alloy_primitives::{hex, map::HashMap}; use op_succinct_client_utils::BytesHasherBuilder; -use std::{collections::HashMap, fs, io::Read, path::PathBuf}; +use std::{fs, io::Read, path::PathBuf}; pub fn load_kv_store(data_dir: &PathBuf) -> HashMap<[u8; 32], Vec, BytesHasherBuilder> { let capacity = get_file_count(data_dir); diff --git a/utils/host/src/lib.rs b/utils/host/src/lib.rs index 85006904f..59c55098d 100644 --- a/utils/host/src/lib.rs +++ b/utils/host/src/lib.rs @@ -5,14 +5,11 @@ pub mod rollup_config; pub mod stats; pub mod witnessgen; -use alloy::sol; use alloy_consensus::Header; -use alloy_primitives::B256; +use alloy_primitives::{map::HashMap, B256}; +use alloy_sol_types::sol; use anyhow::Result; -use kona_host::{ - kv::{DiskKeyValueStore, MemoryKeyValueStore}, - HostCli, -}; +use kona_host::{DiskKeyValueStore, MemoryKeyValueStore}; use maili_genesis::RollupConfig; use op_succinct_client_utils::{ boot::BootInfoStruct, types::AggregationInputs, BootInfoWithBytesConfig, BytesHasherBuilder, @@ -20,7 +17,7 @@ use op_succinct_client_utils::{ }; use rkyv::to_bytes; use sp1_sdk::{HashableKey, SP1Proof, SP1Stdin}; -use std::{collections::HashMap, fs::File, io::Read}; +use std::{fs::File, io::Read}; sol! { #[allow(missing_docs)] diff --git a/utils/host/src/rollup_config.rs b/utils/host/src/rollup_config.rs index 6a8eaf2e2..70f815245 100644 --- a/utils/host/src/rollup_config.rs +++ b/utils/host/src/rollup_config.rs @@ -1,7 +1,7 @@ use std::fs; use std::path::PathBuf; -use alloy::eips::eip1559::BaseFeeParams; +use alloy_eips::eip1559::BaseFeeParams; use alloy_primitives::Address; use anyhow::Result; use maili_genesis::ChainGenesis; diff --git a/utils/host/src/witnessgen.rs b/utils/host/src/witnessgen.rs index 263c4cc3c..f0d51ee3f 100644 --- a/utils/host/src/witnessgen.rs +++ b/utils/host/src/witnessgen.rs @@ -2,8 +2,6 @@ use anyhow::Result; use std::{path::PathBuf, time::Duration}; use sysinfo::System; -use kona_host::HostCli; - use crate::fetcher::RunContext; /// Convert the HostCli to a vector of arguments that can be passed to a command.