diff --git a/Cargo.lock b/Cargo.lock index d1fedcfc..b0287535 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,16 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "addchain" version = "0.2.0" @@ -38,23 +28,11 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - [[package]] name = "aggchain-proof-builder" version = "0.1.0" dependencies = [ "aggchain-proof-core", - "aggkit-prover-config", "alloy", "anyhow", "futures", @@ -62,7 +40,6 @@ dependencies = [ "sp1-sdk", "thiserror 2.0.11", "tower 0.4.13", - "tracing", "url", ] @@ -80,22 +57,31 @@ dependencies = [ ] [[package]] -name = "aggkit-prover" +name = "aggchain-proof-service" version = "0.1.0" dependencies = [ "aggchain-proof-builder", + "aggkit-prover-types", + "proposer-service", + "serde", + "thiserror 2.0.11", + "tower 0.4.13", + "tracing", +] + +[[package]] +name = "aggkit-prover" +version = "0.1.0" +dependencies = [ + "aggchain-proof-service", "aggkit-prover-config", "aggkit-prover-types", "anyhow", "bincode", - "futures", - "http 1.2.0", + "http", "hyper-util", - "proposer-client", - "proposer-service", "prover-engine", "prover-logger", - "thiserror 2.0.11", "tokio", "tokio-stream", "tokio-util", @@ -109,25 +95,15 @@ dependencies = [ name = "aggkit-prover-config" version = "0.1.0" dependencies = [ - "dirs", - "ethers", - "humantime-serde", + "aggchain-proof-service", "insta", - "jsonrpsee", "pretty_assertions", "prover-config", "prover-logger", "prover-utils", - "rstest", "serde", - "serde_json", - "serde_with", - "sp1-sdk", "thiserror 2.0.11", "toml", - "tracing", - "tracing-subscriber", - "url", ] [[package]] @@ -154,53 +130,37 @@ dependencies = [ "anyhow", "bincode", "buildstructor", - "futures", "prover-engine", "prover-executor", "prover-logger", - "sp1-prover", "sp1-sdk", - "thiserror 2.0.11", "tokio", "tokio-util", - "toml", "tonic", "tonic-health", "tonic-reflection", "tower 0.4.13", "tracing", - "tracing-subscriber", ] [[package]] name = "agglayer-prover-config" version = "0.1.0" dependencies = [ - "dirs", - "ethers", - "humantime-serde", "insta", - "jsonrpsee", "pretty_assertions", "prover-config", "prover-logger", "prover-utils", - "rstest", "serde", - "serde_json", - "serde_with", "thiserror 2.0.11", "toml", - "tracing", - "tracing-subscriber", - "url", ] [[package]] name = "agglayer-prover-types" version = "0.1.0" dependencies = [ - "anyhow", "bincode", "prost", "serde", @@ -677,7 +637,7 @@ dependencies = [ "lru 0.13.0", "parking_lot", "pin-project", - "reqwest 0.12.12", + "reqwest", "serde", "serde_json", "thiserror 2.0.11", @@ -743,7 +703,7 @@ dependencies = [ "alloy-transport-ws", "futures", "pin-project", - "reqwest 0.12.12", + "reqwest", "serde", "serde_json", "tokio", @@ -1007,7 +967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40e2f34fcd849676c8fe274a6e72f0664dfede7ce06d12daa728d2e72f1b4393" dependencies = [ "alloy-json-rpc 0.11.0", - "base64 0.22.1", + "base64", "futures-utils-wasm", "serde", "serde_json", @@ -1027,7 +987,7 @@ checksum = "6e291c97c3c0ebb5d03c34e3a55c0f7c5bfa307536a2efaaa6fae4b3a4d09851" dependencies = [ "alloy-json-rpc 0.11.0", "alloy-transport", - "reqwest 0.12.12", + "reqwest", "serde_json", "tower 0.5.2", "tracing", @@ -1063,11 +1023,11 @@ dependencies = [ "alloy-pubsub", "alloy-transport", "futures", - "http 1.2.0", - "rustls 0.23.21", + "http", + "rustls", "serde_json", "tokio", - "tokio-tungstenite 0.26.1", + "tokio-tungstenite", "tracing", "ws_stream_wasm", ] @@ -1307,15 +1267,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - [[package]] name = "async-stream" version = "0.3.6" @@ -1393,10 +1344,10 @@ dependencies = [ "axum-core 0.4.5", "bytes", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", - "hyper 1.5.2", + "hyper", "hyper-util", "itoa", "matchit 0.7.3", @@ -1409,7 +1360,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tower 0.5.2", "tower-layer", @@ -1425,14 +1376,14 @@ checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" dependencies = [ "axum-core 0.5.0", "axum-macros", - "base64 0.22.1", + "base64", "bytes", "form_urlencoded", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", - "hyper 1.5.2", + "hyper", "hyper-util", "itoa", "matchit 0.8.4", @@ -1446,9 +1397,9 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", - "tokio-tungstenite 0.26.1", + "tokio-tungstenite", "tower 0.5.2", "tower-layer", "tower-service", @@ -1464,13 +1415,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -1484,13 +1435,13 @@ checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" dependencies = [ "bytes", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -1543,18 +1494,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -1567,12 +1506,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bech32" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" - [[package]] name = "bimap" version = "0.6.3" @@ -1594,7 +1527,7 @@ version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ - "bitflags 2.8.0", + "bitflags", "cexpr", "clang-sys", "itertools 0.13.0", @@ -1623,12 +1556,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.8.0" @@ -1664,7 +1591,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.3.1", + "constant_time_eq", ] [[package]] @@ -1701,16 +1628,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "bs58" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" -dependencies = [ - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tinyvec", -] - [[package]] name = "buildstructor" version = "0.5.4" @@ -1759,27 +1676,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "c-kzg" version = "1.0.3" @@ -1857,12 +1753,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cexpr" version = "0.6.0" @@ -1897,16 +1787,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clang-sys" version = "1.8.1" @@ -1958,74 +1838,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" -[[package]] -name = "coins-bip32" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3" -dependencies = [ - "bs58", - "coins-core", - "digest 0.10.7", - "hmac", - "k256", - "serde", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.69", -] - -[[package]] -name = "coins-bip39" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" -dependencies = [ - "bitvec", - "coins-bip32", - "hmac", - "once_cell", - "pbkdf2 0.12.2", - "rand", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.69", -] - -[[package]] -name = "coins-core" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979" -dependencies = [ - "base64 0.21.7", - "bech32", - "bs58", - "digest 0.10.7", - "generic-array 0.14.7", - "hex", - "ripemd", - "serde", - "serde_derive", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "sha3", - "thiserror 1.0.69", -] - [[package]] name = "colorchoice" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "console" version = "0.15.10" @@ -2078,12 +1896,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.1" @@ -2140,15 +1952,6 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - [[package]] name = "crossbeam-channel" version = "0.5.14" @@ -2211,15 +2014,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "ctrlc" version = "3.4.5" @@ -2452,16 +2246,6 @@ dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - [[package]] name = "dirs-sys" version = "0.4.1" @@ -2474,17 +2258,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -2517,7 +2290,7 @@ dependencies = [ "digest 0.10.7", "futures", "rand", - "reqwest 0.12.12", + "reqwest", "thiserror 1.0.69", "tokio", ] @@ -2574,15 +2347,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ena" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" -dependencies = [ - "log", -] - [[package]] name = "encode_unicode" version = "1.0.0" @@ -2598,24 +2362,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enr" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4" -dependencies = [ - "base64 0.21.7", - "bytes", - "hex", - "k256", - "log", - "rand", - "rlp", - "serde", - "sha3", - "zeroize", -] - [[package]] name = "enum-map" version = "2.7.3" @@ -2654,355 +2400,37 @@ dependencies = [ ] [[package]] -name = "eth-keystore" -version = "0.5.0" +name = "eyre" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fda3bf123be441da5260717e0661c25a2fd9cb2b2c1d20bf2e05580047158ab" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ - "aes", - "ctr", - "digest 0.10.7", - "hex", - "hmac", - "pbkdf2 0.11.0", - "rand", - "scrypt", - "serde", - "serde_json", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "sha3", - "thiserror 1.0.69", - "uuid", + "indenter", + "once_cell", ] [[package]] -name = "ethabi" -version = "18.0.0" +name = "fastrand" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898" -dependencies = [ - "ethereum-types", - "hex", - "once_cell", - "regex", - "serde", - "serde_json", - "sha3", - "thiserror 1.0.69", - "uint", -] +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] -name = "ethbloom" -version = "0.13.0" +name = "fastrlp" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" dependencies = [ - "crunchy", - "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "scale-info", - "tiny-keccak 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayvec", + "auto_impl", + "bytes", ] [[package]] -name = "ethereum-types" -version = "0.14.1" +name = "fastrlp" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "primitive-types", - "scale-info", - "uint", -] - -[[package]] -name = "ethers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0" -dependencies = [ - "ethers-addressbook", - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-middleware", - "ethers-providers", - "ethers-signers", - "ethers-solc", -] - -[[package]] -name = "ethers-addressbook" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759" -dependencies = [ - "ethers-core", - "once_cell", - "serde", - "serde_json", -] - -[[package]] -name = "ethers-contract" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa" -dependencies = [ - "const-hex", - "ethers-contract-abigen", - "ethers-contract-derive", - "ethers-core", - "ethers-providers", - "futures-util", - "once_cell", - "pin-project", - "serde", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "ethers-contract-abigen" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b" -dependencies = [ - "Inflector", - "const-hex", - "dunce", - "ethers-core", - "ethers-etherscan", - "eyre", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "reqwest 0.11.27", - "serde", - "serde_json", - "syn 2.0.96", - "toml", - "walkdir", -] - -[[package]] -name = "ethers-contract-derive" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f" -dependencies = [ - "Inflector", - "const-hex", - "ethers-contract-abigen", - "ethers-core", - "proc-macro2", - "quote", - "serde_json", - "syn 2.0.96", -] - -[[package]] -name = "ethers-core" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" -dependencies = [ - "arrayvec", - "bytes", - "cargo_metadata", - "chrono", - "const-hex", - "elliptic-curve", - "ethabi", - "generic-array 0.14.7", - "k256", - "num_enum 0.7.3", - "once_cell", - "open-fastrlp", - "rand", - "rlp", - "serde", - "serde_json", - "strum", - "syn 2.0.96", - "tempfile", - "thiserror 1.0.69", - "tiny-keccak 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid", -] - -[[package]] -name = "ethers-etherscan" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79e5973c26d4baf0ce55520bd732314328cabe53193286671b47144145b9649" -dependencies = [ - "chrono", - "ethers-core", - "reqwest 0.11.27", - "semver 1.0.25", - "serde", - "serde_json", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "ethers-middleware" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de" -dependencies = [ - "async-trait", - "auto_impl", - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-providers", - "ethers-signers", - "futures-channel", - "futures-locks", - "futures-util", - "instant", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tracing", - "tracing-futures", - "url", -] - -[[package]] -name = "ethers-providers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2" -dependencies = [ - "async-trait", - "auto_impl", - "base64 0.21.7", - "bytes", - "const-hex", - "enr", - "ethers-core", - "futures-core", - "futures-timer", - "futures-util", - "hashers", - "http 0.2.12", - "instant", - "jsonwebtoken", - "once_cell", - "pin-project", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tokio-tungstenite 0.20.1", - "tracing", - "tracing-futures", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "ws_stream_wasm", -] - -[[package]] -name = "ethers-signers" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2" -dependencies = [ - "async-trait", - "coins-bip32", - "coins-bip39", - "const-hex", - "elliptic-curve", - "eth-keystore", - "ethers-core", - "rand", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.69", - "tracing", -] - -[[package]] -name = "ethers-solc" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66244a771d9163282646dbeffe0e6eca4dda4146b6498644e678ac6089b11edd" -dependencies = [ - "cfg-if", - "const-hex", - "dirs", - "dunce", - "ethers-core", - "glob", - "home", - "md-5", - "num_cpus", - "once_cell", - "path-slash", - "rayon", - "regex", - "semver 1.0.25", - "serde", - "serde_json", - "solang-parser", - "svm-rs", - "thiserror 1.0.69", - "tiny-keccak 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio", - "tracing", - "walkdir", - "yansi 0.5.1", -] - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "fastrlp" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", -] - -[[package]] -name = "fastrlp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4" +checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4" dependencies = [ "arrayvec", "auto_impl", @@ -3067,16 +2495,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flate2" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "fnv" version = "1.0.7" @@ -3113,16 +2531,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "funty" version = "2.0.0" @@ -3177,16 +2585,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-locks" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06" -dependencies = [ - "futures-channel", - "futures-task", -] - [[package]] name = "futures-macro" version = "0.3.31" @@ -3215,10 +2613,6 @@ name = "futures-timer" version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -dependencies = [ - "gloo-timers", - "send_wrapper 0.4.0", -] [[package]] name = "futures-util" @@ -3244,15 +2638,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "gcd" version = "2.3.0" @@ -3305,7 +2690,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.8.0", + "bitflags", "libc", "libgit2-sys", "log", @@ -3318,52 +2703,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" -[[package]] -name = "gloo-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "http 1.2.0", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror 1.0.69", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "group" version = "0.12.1" @@ -3387,25 +2726,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.7.1", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.7" @@ -3417,7 +2737,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.2.0", + "http", "indexmap 2.7.1", "slab", "tokio", @@ -3477,15 +2797,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashers" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2bca93b15ea5a746f220e56587f71e73c6165eab783df9e26590069953e3c30" -dependencies = [ - "fxhash", -] - [[package]] name = "heck" version = "0.4.1" @@ -3522,26 +2833,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.2.0" @@ -3553,17 +2844,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -3571,7 +2851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.2.0", + "http", ] [[package]] @@ -3582,8 +2862,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.2.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -3615,30 +2895,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hyper" -version = "0.14.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.5.2" @@ -3648,9 +2904,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.7", - "http 1.2.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -3660,20 +2916,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.32", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.5" @@ -3681,16 +2923,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", - "http 1.2.0", - "hyper 1.5.2", + "http", + "hyper", "hyper-util", - "log", - "rustls 0.23.21", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls", "tower-service", - "webpki-roots 0.26.7", + "webpki-roots", ] [[package]] @@ -3699,7 +2940,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.5.2", + "hyper", "hyper-util", "pin-project-lite", "tokio", @@ -3714,7 +2955,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.2", + "hyper", "hyper-util", "native-tls", "tokio", @@ -3731,9 +2972,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "hyper 1.5.2", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -3918,24 +3159,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" -dependencies = [ - "serde", -] - [[package]] name = "impl-trait-for-tuples" version = "0.2.3" @@ -3988,15 +3211,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "insta" version = "1.41.0" @@ -4050,269 +3264,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror 1.0.69", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "jsonrpsee" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "834af00800e962dee8f7bfc0f60601de215e73e78e5497d733a2919da837d3c8" -dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-http-client", - "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types", - "jsonrpsee-wasm-client", - "jsonrpsee-ws-client", - "tokio", - "tracing", -] - -[[package]] -name = "jsonrpsee-client-transport" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def0fd41e2f53118bd1620478d12305b2c75feef57ea1f93ef70568c98081b7e" -dependencies = [ - "base64 0.22.1", - "futures-channel", - "futures-util", - "gloo-net", - "http 1.2.0", - "jsonrpsee-core", - "pin-project", - "rustls 0.23.21", - "rustls-pki-types", - "rustls-platform-verifier", - "soketto", - "thiserror 1.0.69", - "tokio", - "tokio-rustls 0.26.1", - "tokio-util", - "tracing", - "url", -] - -[[package]] -name = "jsonrpsee-core" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76637f6294b04e747d68e69336ef839a3493ca62b35bf488ead525f7da75c5bb" -dependencies = [ - "async-trait", - "bytes", - "futures-timer", - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "http-body-util", - "jsonrpsee-types", - "parking_lot", - "pin-project", - "rand", - "rustc-hash 2.1.0", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tokio-stream", - "tracing", - "wasm-bindgen-futures", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c24e981ad17798bbca852b0738bfb7b94816ed687bd0d5da60bfa35fa0fdc3" -dependencies = [ - "async-trait", - "base64 0.22.1", - "http-body 1.0.1", - "hyper 1.5.2", - "hyper-rustls 0.27.5", - "hyper-util", - "jsonrpsee-core", - "jsonrpsee-types", - "rustls 0.23.21", - "rustls-platform-verifier", - "serde", - "serde_json", - "thiserror 1.0.69", - "tokio", - "tower 0.4.13", - "tracing", - "url", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.24.8" +name = "itertools" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcae0c6c159e11541080f1f829873d8f374f81eda0abc67695a13fc8dc1a580" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ - "heck 0.5.0", - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.96", + "either", ] [[package]] -name = "jsonrpsee-server" -version = "0.24.8" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b7a3df90a1a60c3ed68e7ca63916b53e9afa928e33531e87f61a9c8e9ae87b" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ - "futures-util", - "http 1.2.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.5.2", - "hyper-util", - "jsonrpsee-core", - "jsonrpsee-types", - "pin-project", - "route-recognizer", - "serde", - "serde_json", - "soketto", - "thiserror 1.0.69", - "tokio", - "tokio-stream", - "tokio-util", - "tower 0.4.13", - "tracing", + "either", ] [[package]] -name = "jsonrpsee-types" -version = "0.24.8" +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddb81adb1a5ae9182df379e374a79e24e992334e7346af4d065ae5b2acb8d4c6" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ - "http 1.2.0", - "serde", - "serde_json", - "thiserror 1.0.69", + "either", ] [[package]] -name = "jsonrpsee-wasm-client" -version = "0.24.8" +name = "itoa" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e41af42ca39657313748174d02766e5287d3a57356f16756dbd8065b933977" -dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", -] +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] -name = "jsonrpsee-ws-client" -version = "0.24.8" +name = "jobserver" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4f3642a292f5b76d8a16af5c88c16a0860f2ccc778104e5c848b28183d9538" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ - "http 1.2.0", - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", - "url", + "libc", ] [[package]] -name = "jsonwebtoken" -version = "8.3.0" +name = "js-sys" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ - "base64 0.21.7", - "pem", - "ring 0.16.20", - "serde", - "serde_json", - "simple_asn1", + "once_cell", + "wasm-bindgen", ] [[package]] @@ -4362,43 +3362,13 @@ dependencies = [ "sha3-asm", ] -[[package]] -name = "lalrpop" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" -dependencies = [ - "ascii-canvas", - "bit-set", - "ena", - "itertools 0.11.0", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.8.5", - "string_cache", - "term", - "tiny-keccak 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid", - "walkdir", -] - -[[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" -dependencies = [ - "regex-automata 0.4.9", -] - [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -4441,7 +3411,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.8.0", + "bitflags", "libc", ] @@ -4530,16 +3500,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest 0.10.7", -] - [[package]] name = "memchr" version = "2.7.4" @@ -4607,19 +3567,13 @@ dependencies = [ "tempfile", ] -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - [[package]] name = "nix" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.8.0", + "bitflags", "cfg-if", "cfg_aliases", "libc", @@ -4812,7 +3766,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 2.0.96", @@ -4861,38 +3814,13 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "open-fastrlp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", - "ethereum-types", - "open-fastrlp-derive", -] - -[[package]] -name = "open-fastrlp-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c" -dependencies = [ - "bytes", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "openssl" version = "0.10.70" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" dependencies = [ - "bitflags 2.8.0", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -5309,17 +4237,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "pasta_curves" version = "0.4.1" @@ -5356,49 +4273,12 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "path-slash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" - [[package]] name = "pathdiff" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", - "hmac", - "password-hash", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest 0.10.7", - "hmac", -] - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -5479,57 +4359,6 @@ dependencies = [ "rustc_version 0.4.1", ] -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_macros", - "phf_shared 0.11.3", -] - -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared 0.11.3", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator", - "phf_shared 0.11.3", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher 1.0.1", -] - [[package]] name = "pin-project" version = "1.1.8" @@ -5599,12 +4428,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - [[package]] name = "pretty_assertions" version = "1.4.1" @@ -5612,7 +4435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", - "yansi 1.0.1", + "yansi", ] [[package]] @@ -5642,9 +4465,6 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", - "impl-serde", - "scale-info", "uint", ] @@ -5717,11 +4537,10 @@ dependencies = [ name = "proposer-client" version = "0.1.0" dependencies = [ - "aggkit-prover-config", "alloy-primitives", "anyhow", "hex", - "reqwest 0.12.12", + "reqwest", "serde", "sp1-sdk", "thiserror 2.0.11", @@ -5733,12 +4552,9 @@ dependencies = [ name = "proposer-service" version = "0.1.0" dependencies = [ - "aggkit-prover-config", - "aggkit-prover-types", "futures", "proposer-client", - "prover-engine", - "prover-logger", + "prover-utils", "serde", "sp1-sdk", "thiserror 2.0.11", @@ -5754,7 +4570,7 @@ checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.8.0", + "bitflags", "lazy_static", "num-traits", "rand", @@ -5845,7 +4661,7 @@ dependencies = [ "agglayer-telemetry", "anyhow", "axum 0.8.1", - "http 1.2.0", + "http", "http-body-util", "tokio", "tokio-util", @@ -5922,7 +4738,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.1.0", - "rustls 0.23.21", + "rustls", "socket2", "thiserror 2.0.11", "tokio", @@ -5938,9 +4754,9 @@ dependencies = [ "bytes", "getrandom", "rand", - "ring 0.17.8", + "ring", "rustc-hash 2.1.0", - "rustls 0.23.21", + "rustls", "rustls-pki-types", "slab", "thiserror 2.0.11", @@ -6059,7 +4875,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.8.0", + "bitflags", ] [[package]] @@ -6123,64 +4939,23 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - [[package]] name = "reqwest" version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.7", - "http 1.2.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.5.2", - "hyper-rustls 0.27.5", + "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -6192,17 +4967,17 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.21", - "rustls-pemfile 2.2.0", + "rustls", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", - "system-configuration 0.6.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.26.1", + "tokio-rustls", "tokio-util", "tower 0.5.2", "tower-service", @@ -6211,7 +4986,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.7", + "webpki-roots", "windows-registry", ] @@ -6223,8 +4998,8 @@ checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" dependencies = [ "anyhow", "async-trait", - "http 1.2.0", - "reqwest 0.12.12", + "http", + "reqwest", "serde", "thiserror 1.0.69", "tower-service", @@ -6240,21 +5015,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -6265,20 +5025,11 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "rlp" version = "0.5.2" @@ -6286,27 +5037,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ "bytes", - "rlp-derive", "rustc-hex", ] -[[package]] -name = "rlp-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "route-recognizer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" - [[package]] name = "rrs-succinct" version = "0.1.0" @@ -6428,25 +5161,13 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.8.0", + "bitflags", "errno", "libc", "linux-raw-sys", "windows-sys 0.59.0", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.21" @@ -6455,26 +5176,13 @@ checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" dependencies = [ "log", "once_cell", - "ring 0.17.8", + "ring", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "schannel", - "security-framework 2.11.1", -] - [[package]] name = "rustls-native-certs" version = "0.8.1" @@ -6487,15 +5195,6 @@ dependencies = [ "security-framework 3.2.0", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -6514,52 +5213,15 @@ dependencies = [ "web-time", ] -[[package]] -name = "rustls-platform-verifier" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" -dependencies = [ - "core-foundation 0.9.4", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls 0.23.21", - "rustls-native-certs 0.7.3", - "rustls-platform-verifier-android", - "rustls-webpki 0.102.8", - "security-framework 2.11.1", - "security-framework-sys", - "webpki-roots 0.26.7", - "winapi", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "rustls-webpki" version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -6586,24 +5248,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "scale-info" version = "2.11.6" @@ -6652,28 +5296,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scrypt" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" -dependencies = [ - "hmac", - "pbkdf2 0.11.0", - "salsa20", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "sdd" version = "3.0.5" @@ -6700,11 +5322,10 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.8.0", + "bitflags", "core-foundation 0.9.4", "core-foundation-sys", "libc", - "num-bigint 0.4.6", "security-framework-sys", ] @@ -6714,7 +5335,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ - "bitflags 2.8.0", + "bitflags", "core-foundation 0.10.0", "core-foundation-sys", "libc", @@ -6758,12 +5379,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" - [[package]] name = "send_wrapper" version = "0.6.0" @@ -6839,7 +5454,7 @@ version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ - "base64 0.22.1", + "base64", "chrono", "hex", "indexmap 1.9.3", @@ -6980,30 +5595,6 @@ version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" -[[package]] -name = "simple_asn1" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "thiserror 2.0.11", - "time", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - [[package]] name = "size" version = "0.4.1" @@ -7048,36 +5639,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "soketto" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures", - "http 1.2.0", - "httparse", - "log", - "rand", - "sha1", -] - -[[package]] -name = "solang-parser" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26" -dependencies = [ - "itertools 0.11.0", - "lalrpop", - "lalrpop-util", - "phf", - "thiserror 1.0.69", - "unicode-xid", -] - [[package]] name = "sp1-build" version = "4.0.1" @@ -7469,7 +6030,7 @@ dependencies = [ "p3-field", "p3-fri", "prost", - "reqwest 0.12.12", + "reqwest", "reqwest-middleware", "serde", "serde_json", @@ -7544,12 +6105,6 @@ dependencies = [ "sp1-primitives", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -7588,19 +6143,6 @@ dependencies = [ "regex", ] -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", -] - [[package]] name = "strsim" version = "0.11.1" @@ -7647,26 +6189,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "svm-rs" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11297baafe5fa0c99d5722458eac6a5e25c01eb1b8e5cd137f54079093daa7a4" -dependencies = [ - "dirs", - "fs2", - "hex", - "once_cell", - "reqwest 0.11.27", - "semver 1.0.25", - "serde", - "serde_json", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.69", - "url", - "zip", -] - [[package]] name = "syn" version = "1.0.109" @@ -7701,12 +6223,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -7742,36 +6258,15 @@ dependencies = [ "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "system-configuration-sys 0.5.0", -] - [[package]] name = "system-configuration" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.8.0", + "bitflags", "core-foundation 0.9.4", - "system-configuration-sys 0.6.0", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", + "system-configuration-sys", ] [[package]] @@ -7804,17 +6299,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -7989,23 +6473,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.21", + "rustls", "tokio", ] @@ -8021,21 +6495,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", - "tungstenite 0.20.1", - "webpki-roots 0.25.4", -] - [[package]] name = "tokio-tungstenite" version = "0.26.1" @@ -8044,12 +6503,12 @@ checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a" dependencies = [ "futures-util", "log", - "rustls 0.23.21", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.1", - "tungstenite 0.26.1", - "webpki-roots 0.26.7", + "tokio-rustls", + "tungstenite", + "webpki-roots", ] [[package]] @@ -8060,7 +6519,6 @@ checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -8120,29 +6578,29 @@ dependencies = [ "async-stream", "async-trait", "axum 0.7.9", - "base64 0.22.1", + "base64", "bytes", - "h2 0.4.7", - "http 1.2.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.5.2", + "hyper", "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", "prost", - "rustls-native-certs 0.8.1", - "rustls-pemfile 2.2.0", + "rustls-native-certs", + "rustls-pemfile", "socket2", "tokio", - "tokio-rustls 0.26.1", + "tokio-rustls", "tokio-stream", "tower 0.4.13", "tower-layer", "tower-service", "tracing", - "zstd 0.13.2", + "zstd", ] [[package]] @@ -8225,7 +6683,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -8302,16 +6760,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -8380,26 +6828,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 0.2.12", - "httparse", - "log", - "rand", - "rustls 0.21.12", - "sha1", - "thiserror 1.0.69", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.26.1" @@ -8409,11 +6837,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.2.0", + "http", "httparse", "log", "rand", - "rustls 0.23.21", + "rustls", "rustls-pki-types", "sha1", "thiserror 2.0.11", @@ -8429,11 +6857,11 @@ dependencies = [ "async-trait", "axum 0.7.9", "futures", - "http 1.2.0", + "http", "http-body-util", - "hyper 1.5.2", + "hyper", "prost", - "reqwest 0.12.12", + "reqwest", "serde", "serde_json", "thiserror 1.0.69", @@ -8490,12 +6918,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -8538,16 +6960,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", - "serde", -] - [[package]] name = "valuable" version = "0.1.1" @@ -8597,16 +7009,6 @@ dependencies = [ "libc", ] -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -8740,12 +7142,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.7" @@ -8777,15 +7173,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -9007,16 +7394,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "write16" version = "1.0.0" @@ -9041,7 +7418,7 @@ dependencies = [ "log", "pharos", "rustc_version 0.4.1", - "send_wrapper 0.6.0", + "send_wrapper", "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", @@ -9057,12 +7434,6 @@ dependencies = [ "tap", ] -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - [[package]] name = "yansi" version = "1.0.1" @@ -9177,26 +7548,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq 0.1.5", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2 0.11.0", - "sha1", - "time", - "zstd 0.11.2+zstd.1.5.2", -] - [[package]] name = "zkhash" version = "0.2.0" @@ -9224,32 +7575,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - [[package]] name = "zstd" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 7.2.1", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index df011b96..68fe53db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [ # Project dependencies aggchain-proof-builder = { path = "crates/aggchain-proof-builder" } aggchain-proof-core = { path = "crates/aggchain-proof-core" } +aggchain-proof-service = { path = "crates/aggchain-proof-service" } aggkit-prover = { path = "crates/aggkit-prover" } aggkit-prover-config = { path = "crates/aggkit-prover-config" } aggkit-prover-types = { path = "crates/aggkit-prover-types" } @@ -86,5 +87,5 @@ test-log = "0.2.16" # SP1 dependencies sp1-core-machine = "=4.0.0" -sp1-sdk = "=4.0.0" +sp1-sdk = { version="=4.0.0", features = ["native-gnark"] } sp1-prover = "=4.0.0" diff --git a/crates/aggchain-proof-builder/Cargo.toml b/crates/aggchain-proof-builder/Cargo.toml index 876d5d24..f521bba2 100644 --- a/crates/aggchain-proof-builder/Cargo.toml +++ b/crates/aggchain-proof-builder/Cargo.toml @@ -10,13 +10,11 @@ anyhow.workspace = true futures.workspace = true thiserror.workspace = true tower = { workspace = true, features = ["timeout"] } -tracing.workspace = true serde = { workspace = true, features = ["derive"] } -sp1-sdk = { workspace = true, features = ["native-gnark"] } +sp1-sdk.workspace = true url.workspace = true aggchain-proof-core.workspace = true -aggkit-prover-config.workspace = true [lints] workspace = true diff --git a/crates/aggkit-prover-config/src/aggchain_proof_builder.rs b/crates/aggchain-proof-builder/src/config.rs similarity index 85% rename from crates/aggkit-prover-config/src/aggchain_proof_builder.rs rename to crates/aggchain-proof-builder/src/config.rs index 5ff5bbeb..497e147e 100644 --- a/crates/aggkit-prover-config/src/aggchain_proof_builder.rs +++ b/crates/aggchain-proof-builder/src/config.rs @@ -1,9 +1,12 @@ use std::str::FromStr; -use jsonrpsee::core::Serialize; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use url::Url; +pub(crate) const HTTP_RPC_NODE_INITIAL_BACKOFF_MS: u64 = 5000; + +pub(crate) const HTTP_RPC_NODE_BACKOFF_MAX_RETRIES: u32 = 64; + /// The Aggchain proof builder configuration #[derive(Serialize, Deserialize, Clone, Debug)] #[serde(rename_all = "kebab-case")] diff --git a/crates/aggchain-proof-builder/src/lib.rs b/crates/aggchain-proof-builder/src/lib.rs index de143dbf..f1750311 100644 --- a/crates/aggchain-proof-builder/src/lib.rs +++ b/crates/aggchain-proof-builder/src/lib.rs @@ -1,13 +1,10 @@ +pub mod config; mod provider; use std::sync::Arc; use std::task::{Context, Poll}; use aggchain_proof_core::proof::AggchainProofWitness; -use aggkit_prover_config::aggchain_proof_service::{ - HTTP_RPC_NODE_BACKOFF_MAX_RETRIES, HTTP_RPC_NODE_INITIAL_BACKOFF_MS, -}; -use aggkit_prover_config::AggchainProofBuilderConfig; use alloy::eips::{BlockId, BlockNumberOrTag}; use alloy::network::primitives::BlockTransactionsKind; use alloy::primitives::B256; @@ -17,6 +14,7 @@ use futures::{future::BoxFuture, FutureExt}; use serde::{Deserialize, Serialize}; use sp1_sdk::SP1ProofWithPublicValues; +use crate::config::AggchainProofBuilderConfig; use crate::provider::json_rpc::{build_http_retry_provider, AlloyProvider}; /// Aggchain proof is generated from FEP proof and additional @@ -64,16 +62,16 @@ impl AggchainProofBuilder { l1_client: Arc::new( build_http_retry_provider( &config.l1_rpc_endpoint, - HTTP_RPC_NODE_INITIAL_BACKOFF_MS, - HTTP_RPC_NODE_BACKOFF_MAX_RETRIES, + config::HTTP_RPC_NODE_INITIAL_BACKOFF_MS, + config::HTTP_RPC_NODE_BACKOFF_MAX_RETRIES, ) .map_err(Error::AlloyProviderError)?, ), _l2_client: Arc::new( build_http_retry_provider( &config.l2_rpc_endpoint, - HTTP_RPC_NODE_INITIAL_BACKOFF_MS, - HTTP_RPC_NODE_BACKOFF_MAX_RETRIES, + config::HTTP_RPC_NODE_INITIAL_BACKOFF_MS, + config::HTTP_RPC_NODE_BACKOFF_MAX_RETRIES, ) .map_err(Error::AlloyProviderError)?, ), diff --git a/crates/aggchain-proof-service/Cargo.toml b/crates/aggchain-proof-service/Cargo.toml new file mode 100644 index 00000000..308f0dfc --- /dev/null +++ b/crates/aggchain-proof-service/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "aggchain-proof-service" +version.workspace = true +edition.workspace = true +license.workspace = true + +[lints] +workspace = true + +[dependencies] +serde.workspace = true +thiserror.workspace = true +tower = { workspace = true, features = ["timeout"] } +tracing.workspace = true + +aggchain-proof-builder.workspace = true +aggkit-prover-types.workspace = true +proposer-service.workspace = true diff --git a/crates/aggkit-prover-config/src/aggchain_proof_service.rs b/crates/aggchain-proof-service/src/config.rs similarity index 60% rename from crates/aggkit-prover-config/src/aggchain_proof_service.rs rename to crates/aggchain-proof-service/src/config.rs index e54b270c..71a6dd59 100644 --- a/crates/aggkit-prover-config/src/aggchain_proof_service.rs +++ b/crates/aggchain-proof-service/src/config.rs @@ -1,14 +1,9 @@ use std::fmt::Debug; +use aggchain_proof_builder::config::AggchainProofBuilderConfig; +use proposer_service::config::ProposerServiceConfig; use serde::{Deserialize, Serialize}; -use crate::aggchain_proof_builder::AggchainProofBuilderConfig; -use crate::proposer_service::ProposerServiceConfig; - -pub const HTTP_RPC_NODE_INITIAL_BACKOFF_MS: u64 = 5000; - -pub const HTTP_RPC_NODE_BACKOFF_MAX_RETRIES: u32 = 64; - /// The Aggchain proof service configuration #[derive(Serialize, Deserialize, Clone, Debug, Default)] #[serde(rename_all = "kebab-case")] diff --git a/crates/aggkit-prover/src/aggchain_proof/error.rs b/crates/aggchain-proof-service/src/error.rs similarity index 100% rename from crates/aggkit-prover/src/aggchain_proof/error.rs rename to crates/aggchain-proof-service/src/error.rs diff --git a/crates/aggchain-proof-service/src/lib.rs b/crates/aggchain-proof-service/src/lib.rs new file mode 100644 index 00000000..7998549d --- /dev/null +++ b/crates/aggchain-proof-service/src/lib.rs @@ -0,0 +1,5 @@ +pub mod config; + +pub mod error; + +pub mod service; diff --git a/crates/aggkit-prover/src/aggchain_proof/service.rs b/crates/aggchain-proof-service/src/service.rs similarity index 96% rename from crates/aggkit-prover/src/aggchain_proof/service.rs rename to crates/aggchain-proof-service/src/service.rs index 8952b474..a888a80d 100644 --- a/crates/aggkit-prover/src/aggchain_proof/service.rs +++ b/crates/aggchain-proof-service/src/service.rs @@ -7,12 +7,12 @@ use std::{ use aggchain_proof_builder::{ AggchainProof, AggchainProofBuilder, AggchainProofBuilderRequest as ProofBuilderRequest, }; -use aggkit_prover_config::aggchain_proof_service::AggchainProofServiceConfig; use aggkit_prover_types::Hash; use proposer_service::{ProposerRequest, ProposerService}; use tracing::debug; -use super::error::Error; +use crate::config::AggchainProofServiceConfig; +use crate::error::Error; /// A request for the AggchainProofService to generate the /// aggchain proof for the range of blocks. @@ -42,7 +42,7 @@ pub struct AggchainProofServiceResponse { /// proposer service and the `aggchain-proof-builder` service to generate the /// Aggchain proof. #[derive(Clone)] -pub(crate) struct AggchainProofService { +pub struct AggchainProofService { pub(crate) proposer_service: ProposerService, pub(crate) aggchain_proof_builder: AggchainProofBuilder, } diff --git a/crates/aggkit-prover-config/Cargo.toml b/crates/aggkit-prover-config/Cargo.toml index 0462ea02..fc33b73d 100644 --- a/crates/aggkit-prover-config/Cargo.toml +++ b/crates/aggkit-prover-config/Cargo.toml @@ -4,19 +4,11 @@ version.workspace = true edition.workspace = true [dependencies] -dirs.workspace = true -ethers.workspace = true -humantime-serde = "1.1.1" -jsonrpsee.workspace = true serde = { workspace = true, features = ["derive"] } -serde_with.workspace = true -sp1-sdk = { workspace = true, features = ["native-gnark"] } thiserror.workspace = true toml.workspace = true -tracing.workspace = true -tracing-subscriber = { workspace = true, features = ["env-filter"] } -url = { workspace = true, features = ["serde"] } +aggchain-proof-service.workspace = true prover-logger.workspace = true prover-utils.workspace = true prover-config.workspace = true @@ -24,9 +16,4 @@ prover-config.workspace = true [dev-dependencies] insta = { workspace = true, features = ["toml", "redactions", "filters"] } pretty_assertions = "1.4.0" -rstest.workspace = true -serde_json = { workspace = true } -[features] -default = [] -testutils = [] diff --git a/crates/aggkit-prover-config/src/lib.rs b/crates/aggkit-prover-config/src/lib.rs index 49adff82..4be50475 100644 --- a/crates/aggkit-prover-config/src/lib.rs +++ b/crates/aggkit-prover-config/src/lib.rs @@ -1,20 +1,13 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::path::Path; +use aggchain_proof_service::config::AggchainProofServiceConfig; use prover_config::{NetworkProverConfig, ProverType}; use prover_logger::log::Log; use serde::{Deserialize, Serialize}; -use crate::aggchain_proof_service::AggchainProofServiceConfig; -pub use crate::{ - aggchain_proof_builder::AggchainProofBuilderConfig, shutdown::ShutdownConfig, - telemetry::TelemetryConfig, -}; +pub use crate::{shutdown::ShutdownConfig, telemetry::TelemetryConfig}; -pub mod aggchain_proof_service; - -pub mod aggchain_proof_builder; -pub mod proposer_service; pub mod shutdown; pub(crate) mod telemetry; diff --git a/crates/aggkit-prover/Cargo.toml b/crates/aggkit-prover/Cargo.toml index 9626ef06..ddb7af32 100644 --- a/crates/aggkit-prover/Cargo.toml +++ b/crates/aggkit-prover/Cargo.toml @@ -10,9 +10,7 @@ workspace = true [dependencies] anyhow.workspace = true bincode.workspace = true -futures.workspace = true http = "1.2.0" -thiserror.workspace = true tokio = { workspace = true, features = ["full"] } tokio-util.workspace = true tonic = { workspace = true, features = ["zstd"] } @@ -20,11 +18,9 @@ tonic-types = { workspace = true } tower = { workspace = true, features = ["timeout"] } tracing.workspace = true -aggchain-proof-builder.workspace = true +aggchain-proof-service.workspace = true aggkit-prover-config.workspace = true aggkit-prover-types.workspace = true -proposer-client.workspace = true -proposer-service.workspace = true prover-engine.workspace = true prover-logger.workspace = true diff --git a/crates/aggkit-prover/src/aggchain_proof/mod.rs b/crates/aggkit-prover/src/aggchain_proof/mod.rs deleted file mode 100644 index a0e447a6..00000000 --- a/crates/aggkit-prover/src/aggchain_proof/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -pub mod error; -pub(crate) mod rpc; -pub(crate) mod service; - -pub use rpc::GrpcService; - -#[cfg(test)] -mod tests; diff --git a/crates/aggkit-prover/src/lib.rs b/crates/aggkit-prover/src/lib.rs index e5df4146..ec6d4ebd 100644 --- a/crates/aggkit-prover/src/lib.rs +++ b/crates/aggkit-prover/src/lib.rs @@ -1 +1,3 @@ -pub mod aggchain_proof; +pub mod rpc; +#[cfg(test)] +mod tests; diff --git a/crates/aggkit-prover/src/main.rs b/crates/aggkit-prover/src/main.rs index 57020789..cde61dea 100644 --- a/crates/aggkit-prover/src/main.rs +++ b/crates/aggkit-prover/src/main.rs @@ -1,6 +1,5 @@ use std::sync::Arc; -use aggkit_prover::aggchain_proof::GrpcService; use aggkit_prover_types::v1::aggchain_proof_service_server::AggchainProofServiceServer; use prover_engine::ProverEngine; use tokio_util::sync::CancellationToken; @@ -28,8 +27,9 @@ fn main() -> anyhow::Result<()> { .build()?; // TODO: implement the aggchain-proof service - let aggchain_proof_service = - AggchainProofServiceServer::new(GrpcService::new(&config.aggchain_proof_service)?); + let aggchain_proof_service = AggchainProofServiceServer::new( + aggkit_prover::rpc::GrpcService::new(&config.aggchain_proof_service)?, + ); _ = ProverEngine::builder() .add_rpc_service(aggchain_proof_service) diff --git a/crates/aggkit-prover/src/aggchain_proof/rpc.rs b/crates/aggkit-prover/src/rpc.rs similarity index 93% rename from crates/aggkit-prover/src/aggchain_proof/rpc.rs rename to crates/aggkit-prover/src/rpc.rs index 485ea96e..e2291a06 100644 --- a/crates/aggkit-prover/src/aggchain_proof/rpc.rs +++ b/crates/aggkit-prover/src/rpc.rs @@ -1,4 +1,5 @@ -use aggkit_prover_config::aggchain_proof_service::AggchainProofServiceConfig; +use aggchain_proof_service::config::AggchainProofServiceConfig; +use aggchain_proof_service::service::{AggchainProofService, AggchainProofServiceRequest}; use aggkit_prover_types::v1::{ aggchain_proof_service_server::AggchainProofService as AggchainProofGrpcService, GenerateAggchainProofRequest, GenerateAggchainProofResponse, @@ -10,8 +11,6 @@ use tonic_types::{ErrorDetails, StatusExt}; use tower::{Service, ServiceExt}; use tracing::instrument; -use super::service::{AggchainProofService, AggchainProofServiceRequest}; - #[derive(Clone)] pub struct GrpcService { service: AggchainProofService, @@ -20,7 +19,7 @@ pub struct GrpcService { impl GrpcService { pub fn new( config: &AggchainProofServiceConfig, - ) -> Result { + ) -> Result { Ok(GrpcService { service: AggchainProofService::new(config)?, }) diff --git a/crates/aggkit-prover/src/aggchain_proof/tests/mod.rs b/crates/aggkit-prover/src/tests/mod.rs similarity index 94% rename from crates/aggkit-prover/src/aggchain_proof/tests/mod.rs rename to crates/aggkit-prover/src/tests/mod.rs index 6791076c..aa150311 100644 --- a/crates/aggkit-prover/src/aggchain_proof/tests/mod.rs +++ b/crates/aggkit-prover/src/tests/mod.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; -use aggkit_prover_config::aggchain_proof_service::AggchainProofServiceConfig; +use aggchain_proof_service::config::AggchainProofServiceConfig; +use aggchain_proof_service::service::{AggchainProofService, AggchainProofServiceRequest}; use aggkit_prover_types::v1::{ aggchain_proof_service_client::AggchainProofServiceClient, aggchain_proof_service_server::AggchainProofServiceServer, GenerateAggchainProofRequest, @@ -11,10 +12,7 @@ use tonic::transport::{Endpoint, Server}; use tonic_types::StatusExt; use tower::{service_fn, Service}; -use crate::aggchain_proof::{ - service::{AggchainProofService, AggchainProofServiceRequest}, - GrpcService, -}; +use crate::rpc::GrpcService; #[tokio::test] #[ignore] diff --git a/crates/agglayer-prover-config/Cargo.toml b/crates/agglayer-prover-config/Cargo.toml index bd6cac9e..98c6a857 100644 --- a/crates/agglayer-prover-config/Cargo.toml +++ b/crates/agglayer-prover-config/Cargo.toml @@ -4,17 +4,9 @@ version.workspace = true edition.workspace = true [dependencies] -dirs.workspace = true -ethers.workspace = true -humantime-serde = "1.1.1" -jsonrpsee.workspace = true serde = { workspace = true, features = ["derive"] } -serde_with.workspace = true thiserror.workspace = true toml.workspace = true -tracing.workspace = true -tracing-subscriber = { workspace = true, features = ["env-filter"] } -url = { workspace = true, features = ["serde"] } prover-logger.workspace = true prover-utils.workspace = true @@ -23,9 +15,4 @@ prover-config.workspace = true [dev-dependencies] insta = { workspace = true, features = ["toml", "redactions", "filters"] } pretty_assertions = "1.4.0" -rstest.workspace = true -serde_json = { workspace = true } -[features] -default = [] -testutils = [] diff --git a/crates/agglayer-prover-types/Cargo.toml b/crates/agglayer-prover-types/Cargo.toml index 50c261a7..0b6320e5 100644 --- a/crates/agglayer-prover-types/Cargo.toml +++ b/crates/agglayer-prover-types/Cargo.toml @@ -5,10 +5,10 @@ edition.workspace = true license.workspace = true [dependencies] -anyhow.workspace = true bincode.workspace = true prost.workspace = true serde.workspace = true +sp1-sdk.workspace = true thiserror.workspace = true tonic = { workspace = true, default-features = false, features = [ "prost", @@ -16,7 +16,7 @@ tonic = { workspace = true, default-features = false, features = [ "transport", ] } -sp1-sdk.workspace = true + [build-dependencies] tonic-build = { version = "0.12", default-features = false, features = [ diff --git a/crates/agglayer-prover/Cargo.toml b/crates/agglayer-prover/Cargo.toml index 284e1fdf..46e34091 100644 --- a/crates/agglayer-prover/Cargo.toml +++ b/crates/agglayer-prover/Cargo.toml @@ -11,12 +11,9 @@ workspace = true anyhow.workspace = true bincode.workspace = true buildstructor.workspace = true -futures.workspace = true -thiserror.workspace = true +sp1-sdk.workspace = true tokio = { workspace = true, features = ["full"] } tokio-util.workspace = true -toml.workspace = true -tracing-subscriber = { workspace = true, features = ["env-filter", "json"] } tracing.workspace = true tower = { workspace = true, features = ["timeout"] } tonic = { workspace = true, features = ["zstd"] } @@ -30,8 +27,7 @@ prover-engine.workspace = true prover-executor.workspace = true prover-logger.workspace = true -sp1-sdk = { workspace = true, features = ["native-gnark"] } -sp1-prover = { workspace = true, features = ["native-gnark"] } + [features] default = [] diff --git a/crates/proposer-client/Cargo.toml b/crates/proposer-client/Cargo.toml index 9309ccc0..1db0fe25 100644 --- a/crates/proposer-client/Cargo.toml +++ b/crates/proposer-client/Cargo.toml @@ -11,17 +11,12 @@ workspace = true anyhow.workspace = true alloy-primitives.workspace = true hex.workspace = true -aggkit-prover-config.workspace = true reqwest = { workspace = true, features = ["json"]} serde.workspace = true +sp1-sdk.workspace = true thiserror.workspace = true tracing.workspace = true tonic.workspace = true -sp1-sdk = { workspace = true, features = ["native-gnark"] } - -[features] -default = [] -testutils = [] diff --git a/crates/proposer-service/Cargo.toml b/crates/proposer-service/Cargo.toml index 221a8412..51a75335 100644 --- a/crates/proposer-service/Cargo.toml +++ b/crates/proposer-service/Cargo.toml @@ -7,16 +7,13 @@ license.workspace = true [dependencies] futures.workspace = true serde.workspace = true -sp1-sdk = { workspace = true, features = ["native-gnark"] } +sp1-sdk.workspace = true tower = { workspace = true, features = ["timeout"] } thiserror.workspace = true url.workspace = true -aggkit-prover-config.workspace = true -aggkit-prover-types.workspace = true proposer-client.workspace = true -prover-engine.workspace = true -prover-logger.workspace = true +prover-utils.workspace = true [lints] workspace = true diff --git a/crates/aggkit-prover-config/src/proposer_service.rs b/crates/proposer-service/src/config.rs similarity index 100% rename from crates/aggkit-prover-config/src/proposer_service.rs rename to crates/proposer-service/src/config.rs diff --git a/crates/proposer-service/src/lib.rs b/crates/proposer-service/src/lib.rs index 33f72bcc..c22da71f 100644 --- a/crates/proposer-service/src/lib.rs +++ b/crates/proposer-service/src/lib.rs @@ -1,7 +1,6 @@ use std::sync::Arc; use std::task::{Context, Poll}; -use aggkit_prover_config::proposer_service::ProposerServiceConfig; use futures::{future::BoxFuture, FutureExt}; use proposer_client::network_prover::new_network_prover; use proposer_client::rpc::ProposerRpcClient; @@ -11,8 +10,12 @@ use sp1_sdk::NetworkProver; pub mod error; +pub mod config; + pub use error::Error; +use crate::config::ProposerServiceConfig; + #[derive(Clone)] pub struct ProposerService { pub client: Arc>,