diff --git a/Cargo.lock b/Cargo.lock index 6e352283e..125b5e24a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,6 +27,16 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + [[package]] name = "aes" version = "0.8.4" @@ -38,6 +48,20 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + [[package]] name = "ahash" version = "0.8.11" @@ -89,7 +113,9 @@ checksum = "c54e2fbc026948a0f638bf6a94fc0ce6e44652280fed40bb0dd970e3357bc5f2" dependencies = [ "alloy-primitives", "alloy-rlp", + "arbitrary", "num_enum", + "proptest", "serde", "strum 0.26.3", ] @@ -110,14 +136,14 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "arbitrary", "auto_impl", "c-kzg", @@ -145,6 +171,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-contract" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460ab80ce4bda1c80bcf96fe7460520476f2c7b734581c6567fac2708e2a60ef" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-network 0.5.4", + "alloy-network-primitives 0.5.4", + "alloy-primitives", + "alloy-provider 0.5.4", + "alloy-rpc-types-eth 0.5.4", + "alloy-sol-types", + "alloy-transport 0.5.4", + "futures", + "futures-util", + "thiserror", +] + [[package]] name = "alloy-dyn-abi" version = "0.8.7" @@ -181,10 +227,23 @@ name = "alloy-eip7702" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "k256", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", + "derive_more 1.0.0", "k256", "rand", "serde", @@ -197,7 +256,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.1.1", "alloy-primitives", "alloy-rlp", "alloy-serde 0.3.6", @@ -205,36 +264,38 @@ dependencies = [ "derive_more 1.0.0", "once_cell", "serde", - "sha2", + "sha2 0.10.8", ] [[package]] name = "alloy-eips" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.3.2", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "arbitrary", "c-kzg", "derive_more 1.0.0", + "ethereum_ssz", + "ethereum_ssz_derive", "once_cell", "serde", - "sha2", + "sha2 0.10.8", ] [[package]] name = "alloy-genesis" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" +checksum = "dde15e14944a88bd6a57d325e9a49b75558746fe16aaccc79713ae50a6a9574c" dependencies = [ "alloy-primitives", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "serde", ] @@ -266,9 +327,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7" +checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -301,18 +362,18 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" +checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", - "alloy-json-rpc 0.4.2", - "alloy-network-primitives 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-json-rpc 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", - "alloy-rpc-types-eth 0.4.2", - "alloy-serde 0.4.2", - "alloy-signer 0.4.2", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", + "alloy-signer 0.5.4", "alloy-sol-types", "async-trait", "auto_impl", @@ -334,22 +395,22 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "serde", ] [[package]] name = "alloy-primitives" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb848c43f6b06ae3de2e4a67496cbbabd78ae87db0f1248934f15d76192c6a" +checksum = "fd58d377699e6cfeab52c4a9d28bdc4ef37e2bd235ff2db525071fe37a2e9af5" dependencies = [ "alloy-rlp", "arbitrary", @@ -413,21 +474,21 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" +checksum = "4814d141ede360bb6cd1b4b064f1aab9de391e7c4d0d4d50ac89ea4bc1e25fbd" dependencies = [ "alloy-chains", - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", - "alloy-json-rpc 0.4.2", - "alloy-network 0.4.2", - "alloy-network-primitives 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-json-rpc 0.5.4", + "alloy-network 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", - "alloy-rpc-client 0.4.2", - "alloy-rpc-types-eth 0.4.2", - "alloy-transport 0.4.2", - "alloy-transport-http 0.4.2", + "alloy-rpc-client 0.5.4", + "alloy-rpc-types-eth 0.5.4", + "alloy-transport 0.5.4", + "alloy-transport-http 0.5.4", "async-stream", "async-trait", "auto_impl", @@ -435,14 +496,17 @@ dependencies = [ "futures", "futures-utils-wasm", "lru", + "parking_lot 0.12.3", "pin-project", "reqwest 0.12.8", + "schnellru", "serde", "serde_json", "thiserror", "tokio", "tracing", "url", + "wasmtimer", ] [[package]] @@ -490,14 +554,14 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc" +checksum = "7fc2bd1e7403463a5f2c61e955bcc9d3072b63aa177442b0f9aa6a6d22a941e3" dependencies = [ - "alloy-json-rpc 0.4.2", + "alloy-json-rpc 0.5.4", "alloy-primitives", - "alloy-transport 0.4.2", - "alloy-transport-http 0.4.2", + "alloy-transport 0.5.4", + "alloy-transport-http 0.5.4", "futures", "pin-project", "reqwest 0.12.8", @@ -508,26 +572,27 @@ dependencies = [ "tower 0.5.1", "tracing", "url", + "wasmtimer", ] [[package]] name = "alloy-rpc-types" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" +checksum = "eea9bf1abdd506f985a53533f5ac01296bcd6102c5e139bbc5d40bc468d2c916" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.4.2", - "alloy-serde 0.4.2", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb520ed46cc5b7d8c014a73fdd77b6a310383a2a5c0a5ae3c9b8055881f062b7" +checksum = "ea02c25541fb19eaac4278aa5c41d2d7e0245898887e54a74bfc0f3103e99415" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -537,22 +602,22 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" +checksum = "2382fc63fb0cf3e02818d547b80cb66cc49a31f8803d0c328402b2008bc13650" dependencies = [ "alloy-primitives", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "serde", ] [[package]] name = "alloy-rpc-types-beacon" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8dc5980fe30203d698627cddb5f0cedc57f900c8b5e1229c8b9448e37acb4a" +checksum = "45357a642081c8ce235c0ad990c4e9279f5f18a723545076b38cfcc05cc25234" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rpc-types-engine", "serde", @@ -562,9 +627,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d8f8c5bfb160081a772f1f68eb9a37e8929c4ef74e5d01f5b78c2b645a5c5e" +checksum = "a5afe3ab1038f90faf56304aa0adf1e6a8c9844615d8f83967f932f3a70390b1" dependencies = [ "alloy-primitives", "serde", @@ -572,17 +637,21 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0285c4c09f838ab830048b780d7f4a4f460f309aa1194bb049843309524c64c" +checksum = "886d22d41992287a235af2f3af4299b5ced2bcafb81eb835572ad35747476946" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "derive_more 1.0.0", + "ethereum_ssz", + "ethereum_ssz_derive", "jsonrpsee-types 0.24.6", + "jsonwebtoken", + "rand", "serde", "strum 0.26.3", ] @@ -610,16 +679,16 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", - "alloy-network-primitives 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "alloy-sol-types", "arbitrary", "derive_more 1.0.0", @@ -631,26 +700,26 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cec23ce56c869eec5f6b6fd6a8a92b5aa0cfaf8d7be3a96502e537554dc7430" +checksum = "3246948dfa5f5060a9abe04233d741ea656ef076b12958f3242416ce9f375058" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "serde", "serde_json", ] [[package]] name = "alloy-rpc-types-trace" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017cad3e5793c5613588c1f9732bcbad77e820ba7d0feaba3527749f856fdbc5" +checksum = "4e5fb6c5c401321f802f69dcdb95b932f30f8158f6798793f914baac5995628e" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 0.4.2", - "alloy-serde 0.4.2", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", "serde", "serde_json", "thiserror", @@ -658,13 +727,13 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b230e321c416be7f50530159392b4c41a45596d40d97e185575bcd0b545e521" +checksum = "9ad066b49c3b1b5f64cdd2399177a19926a6a15db2dbf11e2098de621f9e7480" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 0.4.2", - "alloy-serde 0.4.2", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", "serde", ] @@ -681,9 +750,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" dependencies = [ "alloy-primitives", "arbitrary", @@ -707,9 +776,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" +checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" dependencies = [ "alloy-primitives", "async-trait", @@ -721,14 +790,14 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" +checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-network 0.4.2", + "alloy-consensus 0.5.4", + "alloy-network 0.5.4", "alloy-primitives", - "alloy-signer 0.4.2", + "alloy-signer 0.5.4", "async-trait", "k256", "rand", @@ -829,11 +898,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904" +checksum = "be77579633ebbc1266ae6fd7694f75c408beb1aeb6865d0b18f22893c265a061" dependencies = [ - "alloy-json-rpc 0.4.2", + "alloy-json-rpc 0.5.4", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -844,6 +913,7 @@ dependencies = [ "tower 0.5.1", "tracing", "url", + "wasmtimer", ] [[package]] @@ -863,12 +933,12 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.4.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" +checksum = "91fd1a5d0827939847983b46f2f79510361f901dc82f8e3c38ac7397af142c6e" dependencies = [ - "alloy-json-rpc 0.4.2", - "alloy-transport 0.4.2", + "alloy-json-rpc 0.5.4", + "alloy-transport 0.5.4", "reqwest 0.12.8", "serde_json", "tower 0.5.1", @@ -878,14 +948,19 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9703ce68b97f8faae6f7739d1e003fc97621b856953cbcdbb2b515743f23288" +checksum = "cdd7f8b3a7c65ca09b3c7bdd7c7d72d7423d026f5247eda96af53d24e58315c1" dependencies = [ "alloy-primitives", "alloy-rlp", + "arbitrary", + "arrayvec", + "derive_arbitrary", "derive_more 1.0.0", "nybbles", + "proptest", + "proptest-derive", "serde", "smallvec", "tracing", @@ -963,13 +1038,13 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aquamarine" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" +checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" dependencies = [ "include_dir", "itertools 0.10.5", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.79", @@ -1189,6 +1264,9 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "ascii-canvas" @@ -1199,6 +1277,12 @@ dependencies = [ "term", ] +[[package]] +name = "asn1_der" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" + [[package]] name = "assert-json-diff" version = "2.0.2" @@ -1594,6 +1678,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + [[package]] name = "blockifier" version = "0.8.0-rc.3" @@ -1626,7 +1719,7 @@ dependencies = [ "rstest 0.17.0", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "sha3", "starknet-types-core", "starknet_api 0.13.0-rc.1 (git+https://github.com/dojoengine/sequencer?tag=v0.8.0-rc3.1)", @@ -1718,6 +1811,15 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bson" version = "2.13.0" @@ -2213,7 +2315,7 @@ dependencies = [ "num-integer", "num-traits 0.2.19", "rand", - "sha2", + "sha2 0.10.8", "smol_str", "starknet-types-core", "thiserror", @@ -2526,7 +2628,7 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "sha3", "starknet-crypto 0.6.2", "starknet-types-core", @@ -2730,6 +2832,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "concat-kdf" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d72c1252426a83be2092dd5884a5f6e3b8e7180f6891b6263d2c21b92ec8816" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "console" version = "0.15.8" @@ -2775,6 +2886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", + "konst", ] [[package]] @@ -2878,6 +2990,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-channel" version = "0.5.13" @@ -2938,9 +3056,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array", + "subtle", +] + [[package]] name = "ctr" version = "0.9.2" @@ -2950,6 +3079,33 @@ dependencies = [ "cipher", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rustc_version 0.4.1", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "darling" version = "0.14.4" @@ -3032,6 +3188,7 @@ dependencies = [ "lock_api", "once_cell", "parking_lot_core 0.9.10", + "serde", ] [[package]] @@ -3060,6 +3217,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "delay_map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df941644b671f05f59433e481ba0d31ac10e3667de725236a4c0d587c496fba1" +dependencies = [ + "futures", + "tokio", + "tokio-util", +] + [[package]] name = "deno_task_shell" version = "0.18.1" @@ -3311,6 +3479,39 @@ dependencies = [ "winapi", ] +[[package]] +name = "discv5" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e6b70634e26c909d1edbb3142b3eaf3b89da0e52f284f00ca7c80d9901ad9e" +dependencies = [ + "aes", + "aes-gcm", + "alloy-rlp", + "arrayvec", + "ctr", + "delay_map", + "enr", + "fnv", + "futures", + "hashlink", + "hex", + "hkdf", + "lazy_static", + "libp2p-identity", + "lru", + "more-asserts", + "multiaddr 0.18.2", + "parking_lot 0.12.3", + "rand", + "smallvec", + "socket2", + "tokio", + "tracing", + "uint 0.10.0", + "zeroize", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -3387,7 +3588,7 @@ dependencies = [ "hyper 0.14.30", "jemalloc-ctl", "jemallocator", - "metrics", + "metrics 0.23.0", "metrics-derive", "metrics-exporter-prometheus", "metrics-process", @@ -3529,6 +3730,31 @@ dependencies = [ "spki", ] +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", + "serde", + "sha2 0.10.8", + "subtle", + "zeroize", +] + [[package]] name = "either" version = "1.13.0" @@ -3605,10 +3831,13 @@ dependencies = [ "alloy-rlp", "base64 0.21.7", "bytes", + "ed25519-dalek", "hex", + "k256", "log", "rand", "secp256k1", + "serde", "sha3", "zeroize", ] @@ -3695,13 +3924,13 @@ dependencies = [ "ctr", "digest 0.10.7", "hex", - "hmac", + "hmac 0.12.1", "pbkdf2", "rand", "scrypt", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "sha3", "thiserror", "uuid 0.8.2", @@ -3731,7 +3960,48 @@ dependencies = [ "impl-rlp", "impl-serde", "primitive-types", - "uint", + "uint 0.9.5", +] + +[[package]] +name = "ethereum_serde_utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70cbccfccf81d67bff0ab36e591fa536c8a935b078a7b0e58c1d00d418332fc9" +dependencies = [ + "alloy-primitives", + "hex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "ethereum_ssz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfbba28f4f3f32d92c06a64f5bf6c4537b5d4e21f28c689bd2bbaecfea4e0d3e" +dependencies = [ + "alloy-primitives", + "derivative", + "ethereum_serde_utils", + "itertools 0.13.0", + "serde", + "serde_derive", + "smallvec", + "typenum", +] + +[[package]] +name = "ethereum_ssz_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d37845ba7c16bf4be8be4b5786f03a2ba5f2fda0d7f9e7cb2282f69cff420d7" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.79", ] [[package]] @@ -3778,7 +4048,13 @@ dependencies = [ ] [[package]] -name = "figment" +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "figment" version = "0.10.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" @@ -3908,7 +4184,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "solang-parser", "svm-rs", "svm-rs-builds", @@ -4007,7 +4283,7 @@ dependencies = [ "path-slash", "regex", "reqwest 0.12.8", - "revm-primitives", + "revm-primitives 10.0.0", "semver 1.0.23", "serde", "serde_json", @@ -4199,6 +4475,7 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ + "serde", "typenum", "version_check", "zeroize", @@ -4217,6 +4494,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + [[package]] name = "gimli" version = "0.31.1" @@ -5153,6 +5440,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "hdrhistogram" version = "7.5.4" @@ -5256,6 +5552,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac 0.12.1", +] + +[[package]] +name = "hmac" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + [[package]] name = "hmac" version = "0.12.1" @@ -5265,6 +5580,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "hmac-drbg" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" +dependencies = [ + "digest 0.9.0", + "generic-array", + "hmac 0.8.1", +] + [[package]] name = "home" version = "0.5.9" @@ -5636,6 +5962,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "if-addrs" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a78a89907582615b19f6f0da1af18abf6ff08be259395669b834b057a7ee92d8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "ignore" version = "0.4.23" @@ -5811,6 +6147,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ + "block-padding", "generic-array", ] @@ -5874,7 +6211,7 @@ dependencies = [ "dirs 4.0.0", "futures", "http 0.2.12", - "multiaddr", + "multiaddr 0.17.1", "multibase", "serde", "serde_json", @@ -6237,26 +6574,27 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "sha2", + "sha2 0.10.8", + "signature", ] [[package]] name = "kakarot-rpc" version = "0.7.5" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-contract", + "alloy-consensus 0.5.4", + "alloy-contract 0.5.4", "alloy-dyn-abi", - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-json-abi", "alloy-primitives", - "alloy-provider 0.4.2", + "alloy-provider 0.5.4", "alloy-rlp", "alloy-rpc-types", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 0.4.2", - "alloy-signer 0.4.2", + "alloy-serde 0.5.4", + "alloy-signer 0.5.4", "alloy-signer-local", "alloy-sol-types", "anyhow", @@ -6305,7 +6643,7 @@ dependencies = [ "reth-transaction-pool", "revm-inspectors", "revm-interpreter", - "revm-primitives", + "revm-primitives 13.0.0", "rstest 0.21.0", "serde", "serde_json", @@ -6352,7 +6690,7 @@ name = "katana-core" version = "1.0.0-alpha.15" source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.15#f56c4f90eca84b92f348303dc85ff6e126609f16" dependencies = [ - "alloy-contract", + "alloy-contract 0.3.6", "alloy-network 0.3.6", "alloy-primitives", "alloy-provider 0.3.6", @@ -6371,7 +6709,7 @@ dependencies = [ "katana-provider", "katana-tasks", "lazy_static", - "metrics", + "metrics 0.23.0", "parking_lot 0.12.3", "reqwest 0.12.8", "serde", @@ -6391,7 +6729,7 @@ dependencies = [ "anyhow", "dojo-metrics", "katana-primitives", - "metrics", + "metrics 0.23.0", "page_size", "parking_lot 0.12.3", "postcard", @@ -6538,7 +6876,7 @@ dependencies = [ "katana-rpc-types", "katana-rpc-types-builder", "katana-tasks", - "metrics", + "metrics 0.23.0", "starknet", "thiserror", "tracing", @@ -6626,6 +6964,21 @@ dependencies = [ "sha3-asm", ] +[[package]] +name = "konst" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330f0e13e6483b8c34885f7e6c9f19b1a7bd449c673fbb948a51c99d66ef74f4" +dependencies = [ + "konst_macro_rules", +] + +[[package]] +name = "konst_macro_rules" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" + [[package]] name = "kqueue" version = "1.0.8" @@ -6694,7 +7047,7 @@ checksum = "bbc2a4da0d9e52ccfe6306801a112e81a8fc0c76aa3e4449fefeda7fef72bb34" dependencies = [ "lambdaworks-math", "serde", - "sha2", + "sha2 0.10.8", "sha3", ] @@ -6745,6 +7098,25 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libp2p-identity" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +dependencies = [ + "asn1_der", + "bs58", + "ed25519-dalek", + "hkdf", + "libsecp256k1", + "multihash 0.19.2", + "quick-protobuf", + "sha2 0.10.8", + "thiserror", + "tracing", + "zeroize", +] + [[package]] name = "libproc" version = "0.14.10" @@ -6767,12 +7139,70 @@ dependencies = [ "redox_syscall 0.5.7", ] +[[package]] +name = "libsecp256k1" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" +dependencies = [ + "arrayref", + "base64 0.13.1", + "digest 0.9.0", + "hmac-drbg", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", + "rand", + "serde", + "sha2 0.9.9", + "typenum", +] + +[[package]] +name = "libsecp256k1-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" +dependencies = [ + "crunchy", + "digest 0.9.0", + "subtle", +] + +[[package]] +name = "libsecp256k1-gen-ecmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" +dependencies = [ + "libsecp256k1-core", +] + +[[package]] +name = "libsecp256k1-gen-genmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" +dependencies = [ + "libsecp256k1-core", +] + [[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", + "serde", +] + [[package]] name = "linkme" version = "0.3.28" @@ -6807,6 +7237,7 @@ checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", + "serde", ] [[package]] @@ -6930,6 +7361,16 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "metrics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" +dependencies = [ + "ahash", + "portable-atomic", +] + [[package]] name = "metrics-derive" version = "0.1.0" @@ -6955,7 +7396,7 @@ dependencies = [ "hyper-util", "indexmap 2.6.0", "ipnet", - "metrics", + "metrics 0.23.0", "metrics-util", "quanta", "thiserror", @@ -6972,7 +7413,7 @@ dependencies = [ "libc", "libproc", "mach2", - "metrics", + "metrics 0.23.0", "once_cell", "procfs", "rlimit", @@ -6990,7 +7431,7 @@ dependencies = [ "crossbeam-utils", "hashbrown 0.14.5", "indexmap 2.6.0", - "metrics", + "metrics 0.23.0", "num_cpus", "ordered-float 4.3.0", "quanta", @@ -7163,7 +7604,7 @@ dependencies = [ "futures-io", "futures-util", "hex", - "hmac", + "hmac 0.12.1", "md-5", "mongodb-internal-macros", "once_cell", @@ -7177,7 +7618,7 @@ dependencies = [ "serde_bytes", "serde_with", "sha-1 0.10.1", - "sha2", + "sha2 0.10.8", "socket2", "stringprep", "strsim 0.11.1", @@ -7202,6 +7643,12 @@ dependencies = [ "syn 2.0.79", ] +[[package]] +name = "more-asserts" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" + [[package]] name = "multiaddr" version = "0.17.1" @@ -7213,11 +7660,30 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash", + "multihash 0.17.0", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint 0.7.2", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "libp2p-identity", + "multibase", + "multihash 0.19.2", "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.8.0", "url", ] @@ -7240,7 +7706,17 @@ checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "core2", "multihash-derive", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "multihash" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" +dependencies = [ + "core2", + "unsigned-varint 0.8.0", ] [[package]] @@ -7326,6 +7802,7 @@ dependencies = [ "libc", "log", "mio 0.8.11", + "serde", "walkdir", "windows-sys 0.48.0", ] @@ -7530,6 +8007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95f06be0417d97f81fe4e5c86d7d01b392655a9cac9c19a848aa033e18937b23" dependencies = [ "alloy-rlp", + "arbitrary", "const-hex", "proptest", "serde", @@ -7550,6 +8028,10 @@ name = "once_cell" version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +dependencies = [ + "critical-section", + "portable-atomic", +] [[package]] name = "oorandom" @@ -7559,15 +8041,16 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea7162170c6f3cad8f67f4dd7108e3f78349fd553da5b8bebff1e7ef8f38896" +checksum = "f26c3b35b7b3e36d15e0563eebffe13c1d9ca16b7aaffcb6a64354633547e16b" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", + "arbitrary", "derive_more 1.0.0", "serde", "spin 0.9.8", @@ -7575,12 +8058,12 @@ dependencies = [ [[package]] name = "op-alloy-genesis" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3d31dfbbd8dd898c7512f8ce7d30103980485416f668566100b0ed0994b958" +checksum = "ccacc2efed3d60d98ea581bddb885df1c6c62a592e55de049cfefd94116112cd" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-sol-types", "serde", @@ -7589,33 +8072,37 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310873e4fbfc41986716c4fb6000a8b49d025d932d2c261af58271c434b05288" +checksum = "f5f8e6ec6b91c6aaeb20860b455a52fd8e300acfe5d534e96e9073a24f853e74" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", + "async-trait", "derive_more 1.0.0", "op-alloy-consensus", "op-alloy-genesis", "serde", + "tracing", + "unsigned-varint 0.8.0", ] [[package]] name = "op-alloy-rpc-types" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323c65880e2561aa87f74f8af260fd15b9cc930c448c88a60ae95af86c88c634" +checksum = "94bae9bf91b620e1e2c2291562e5998bc1247bd8ada011773e1997b31a95de99" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", - "alloy-network-primitives 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-network-primitives 0.5.4", "alloy-primitives", - "alloy-rpc-types-eth 0.4.2", - "alloy-serde 0.4.2", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", + "arbitrary", "op-alloy-consensus", "serde", "serde_json", @@ -7623,16 +8110,18 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349e7b420f45d1a00216ec4c65fcf3f0057a841bc39732c405c85ae782b94121" +checksum = "4b52ee59c86537cff83e8c7f2a6aa287a94f3608bb40c06d442aafd0c2e807a4" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "derive_more 1.0.0", + "ethereum_ssz", "op-alloy-protocol", "serde", + "snap", ] [[package]] @@ -7955,9 +8444,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.7", - "hmac", + "hmac 0.12.1", "password-hash", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -8131,6 +8620,18 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + [[package]] name = "portable-atomic" version = "1.9.0" @@ -8227,7 +8728,7 @@ dependencies = [ "impl-codec", "impl-rlp", "impl-serde", - "uint", + "uint 0.9.5", ] [[package]] @@ -8449,6 +8950,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-protobuf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +dependencies = [ + "byteorder", +] + [[package]] name = "quinn" version = "0.11.5" @@ -8803,14 +9313,15 @@ dependencies = [ [[package]] name = "reth-beacon-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rpc-types-engine", "futures", "itertools 0.13.0", - "metrics", + "metrics 0.24.0", "reth-blockchain-tree-api", "reth-engine-primitives", "reth-errors", @@ -8837,9 +9348,10 @@ dependencies = [ [[package]] name = "reth-blockchain-tree-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips 0.5.4", "alloy-primitives", "reth-consensus", "reth-execution-errors", @@ -8850,14 +9362,14 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "auto_impl", "derive_more 1.0.0", - "metrics", + "metrics 0.24.0", "parking_lot 0.12.3", "pin-project", "reth-chainspec", @@ -8874,14 +9386,14 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-genesis", "alloy-primitives", - "alloy-trie", "auto_impl", "derive_more 1.0.0", "once_cell", @@ -8892,25 +9404,44 @@ dependencies = [ "serde_json", ] +[[package]] +name = "reth-cli-util" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-eips 0.5.4", + "alloy-primitives", + "cfg-if", + "eyre", + "libc", + "rand", + "reth-fs-util", + "secp256k1", + "serde", + "thiserror", +] + [[package]] name = "reth-codecs" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-genesis", "alloy-primitives", "alloy-trie", "bytes", "modular-bitfield", + "op-alloy-consensus", "reth-codecs-derive", + "serde", ] [[package]] name = "reth-codecs-derive" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -8920,8 +9451,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "eyre", "humantime-serde", @@ -8934,9 +9465,10 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips 0.5.4", "alloy-primitives", "auto_impl", "derive_more 1.0.0", @@ -8945,31 +9477,33 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "reth-chainspec", "reth-consensus", "reth-primitives", - "revm-primitives", + "revm-primitives 13.0.0", ] [[package]] name = "reth-db" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bytes", "derive_more 1.0.0", "eyre", - "metrics", + "metrics 0.24.0", "page_size", "paste", "reth-db-api", "reth-fs-util", - "reth-libmdbx 1.1.0", + "reth-libmdbx 1.1.1", "reth-metrics", "reth-nippy-jar", "reth-primitives", @@ -8988,14 +9522,14 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-genesis", "alloy-primitives", "bytes", "derive_more 1.0.0", - "metrics", + "metrics 0.24.0", "modular-bitfield", "parity-scale-codec", "reth-codecs", @@ -9011,50 +9545,182 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bytes", "modular-bitfield", "reth-codecs", - "reth-primitives", + "reth-primitives-traits", "serde", ] [[package]] -name = "reth-engine-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +name = "reth-discv4" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", - "reth-execution-types", - "reth-payload-primitives", - "reth-primitives", - "reth-trie", + "alloy-rlp", + "discv5", + "enr", + "generic-array", + "itertools 0.13.0", + "parking_lot 0.12.3", + "rand", + "reth-ethereum-forks", + "reth-net-banlist", + "reth-net-nat", + "reth-network-peers", + "schnellru", + "secp256k1", "serde", -] - -[[package]] -name = "reth-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" -dependencies = [ - "reth-blockchain-tree-api", - "reth-consensus", - "reth-execution-errors", - "reth-fs-util", - "reth-storage-errors", "thiserror", + "tokio", + "tokio-stream", + "tracing", ] [[package]] -name = "reth-eth-wire-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +name = "reth-discv5" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more 1.0.0", + "discv5", + "enr", + "futures", + "itertools 0.13.0", + "metrics 0.24.0", + "rand", + "reth-chainspec", + "reth-ethereum-forks", + "reth-metrics", + "reth-network-peers", + "secp256k1", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "reth-dns-discovery" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-primitives", + "data-encoding", + "enr", + "linked_hash_set", + "parking_lot 0.12.3", + "reth-ethereum-forks", + "reth-network-peers", + "reth-tokio-util", + "schnellru", + "secp256k1", + "serde", + "serde_with", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "trust-dns-resolver", +] + +[[package]] +name = "reth-ecies" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "aes", + "alloy-primitives", + "alloy-rlp", + "block-padding", + "byteorder", + "cipher", + "concat-kdf", + "ctr", + "digest 0.10.7", + "futures", + "generic-array", + "hmac 0.12.1", + "pin-project", + "rand", + "reth-network-peers", + "secp256k1", + "sha2 0.10.8", + "sha3", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "typenum", +] + +[[package]] +name = "reth-engine-primitives" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-primitives", + "reth-execution-types", + "reth-payload-primitives", + "reth-primitives", + "reth-trie", + "serde", +] + +[[package]] +name = "reth-errors" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "reth-blockchain-tree-api", + "reth-consensus", + "reth-execution-errors", + "reth-fs-util", + "reth-storage-errors", + "thiserror", +] + +[[package]] +name = "reth-eth-wire" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "bytes", + "derive_more 1.0.0", + "futures", + "pin-project", + "reth-chainspec", + "reth-codecs", + "reth-ecies", + "reth-eth-wire-types", + "reth-metrics", + "reth-network-peers", + "reth-primitives", + "serde", + "snap", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + +[[package]] +name = "reth-eth-wire-types" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", "bytes", @@ -9062,14 +9728,17 @@ dependencies = [ "reth-chainspec", "reth-codecs-derive", "reth-primitives", + "serde", "thiserror", ] [[package]] name = "reth-ethereum-consensus" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "reth-chainspec", "reth-consensus", @@ -9080,10 +9749,10 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -9094,13 +9763,13 @@ dependencies = [ "reth-primitives", "reth-rpc-types-compat", "serde", - "sha2", + "sha2 0.10.8", ] [[package]] name = "reth-ethereum-forks" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-chains", "alloy-primitives", @@ -9119,51 +9788,54 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "auto_impl", "futures-util", - "metrics", + "metrics 0.24.0", "reth-chainspec", + "reth-consensus", + "reth-consensus-common", "reth-execution-errors", "reth-execution-types", "reth-metrics", "reth-primitives", "reth-primitives-traits", "reth-prune-types", + "reth-revm", "reth-storage-errors", "revm", - "revm-primitives", + "revm-primitives 13.0.0", ] [[package]] name = "reth-evm-ethereum" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-sol-types", "reth-chainspec", + "reth-consensus", "reth-ethereum-consensus", "reth-ethereum-forks", "reth-evm", - "reth-execution-types", "reth-primitives", - "reth-prune-types", "reth-revm", - "revm-primitives", + "revm-primitives 13.0.0", ] [[package]] name = "reth-execution-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", "derive_more 1.0.0", @@ -9171,28 +9843,29 @@ dependencies = [ "reth-consensus", "reth-prune-types", "reth-storage-errors", - "revm-primitives", + "revm-primitives 13.0.0", ] [[package]] name = "reth-execution-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "reth-execution-errors", "reth-primitives", "reth-trie", "revm", + "serde", ] [[package]] name = "reth-exex-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "reth-chain-state", "reth-execution-types", @@ -9200,8 +9873,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "serde", "serde_json", @@ -9225,8 +9898,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -9234,7 +9907,7 @@ dependencies = [ "derive_more 1.0.0", "indexmap 2.6.0", "parking_lot 0.12.3", - "reth-mdbx-sys 1.1.0", + "reth-mdbx-sys 1.1.1", "smallvec", "thiserror", "tracing", @@ -9252,8 +9925,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "bindgen 0.70.1", "cc", @@ -9261,25 +9934,93 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "metrics", + "futures", + "metrics 0.24.0", "metrics-derive", + "tokio", + "tokio-util", ] [[package]] name = "reth-net-banlist" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", ] +[[package]] +name = "reth-net-nat" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "futures-util", + "if-addrs", + "reqwest 0.12.8", + "serde_with", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "reth-network" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-rlp", + "aquamarine", + "auto_impl", + "derive_more 1.0.0", + "discv5", + "enr", + "futures", + "itertools 0.13.0", + "metrics 0.24.0", + "parking_lot 0.12.3", + "pin-project", + "rand", + "reth-chainspec", + "reth-consensus", + "reth-discv4", + "reth-discv5", + "reth-dns-discovery", + "reth-ecies", + "reth-eth-wire", + "reth-fs-util", + "reth-metrics", + "reth-net-banlist", + "reth-network-api", + "reth-network-p2p", + "reth-network-peers", + "reth-network-types", + "reth-primitives", + "reth-provider", + "reth-storage-api", + "reth-tasks", + "reth-tokio-util", + "reth-transaction-pool", + "rustc-hash 2.0.0", + "schnellru", + "secp256k1", + "serde", + "smallvec", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + [[package]] name = "reth-network-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rpc-types-admin", @@ -9301,10 +10042,10 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "auto_impl", "derive_more 1.0.0", @@ -9321,8 +10062,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9330,13 +10071,14 @@ dependencies = [ "secp256k1", "serde_with", "thiserror", + "tokio", "url", ] [[package]] name = "reth-network-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "humantime-serde", "reth-ethereum-forks", @@ -9349,8 +10091,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "anyhow", "bincode 1.3.3", @@ -9366,46 +10108,99 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-rpc-types-engine", + "eyre", + "reth-beacon-consensus", + "reth-consensus", "reth-engine-primitives", "reth-evm", "reth-network-api", + "reth-node-core", "reth-node-types", "reth-payload-builder", "reth-payload-primitives", "reth-primitives", "reth-provider", - "reth-rpc-eth-api", "reth-tasks", "reth-transaction-pool", ] +[[package]] +name = "reth-node-core" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-rpc-types-engine", + "clap", + "const_format", + "derive_more 1.0.0", + "dirs-next", + "eyre", + "futures", + "humantime", + "rand", + "reth-chainspec", + "reth-cli-util", + "reth-config", + "reth-consensus-common", + "reth-db", + "reth-discv4", + "reth-discv5", + "reth-net-nat", + "reth-network", + "reth-network-p2p", + "reth-network-peers", + "reth-primitives", + "reth-prune-types", + "reth-rpc-eth-types", + "reth-rpc-server-types", + "reth-rpc-types-compat", + "reth-stages-types", + "reth-storage-api", + "reth-storage-errors", + "reth-tracing", + "reth-transaction-pool", + "secp256k1", + "serde", + "shellexpand", + "strum 0.26.3", + "thiserror", + "toml 0.8.19", + "tracing", + "vergen", +] + [[package]] name = "reth-node-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "reth-chainspec", "reth-db-api", "reth-engine-primitives", + "reth-primitives", + "reth-primitives-traits", + "reth-trie-db", ] [[package]] name = "reth-payload-builder" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-primitives", "alloy-rpc-types", "async-trait", "futures-util", - "metrics", + "metrics 0.24.0", "reth-ethereum-engine-primitives", "reth-metrics", "reth-payload-primitives", - "reth-primitives", "reth-provider", "tokio", "tokio-stream", @@ -9414,9 +10209,10 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rpc-types", "async-trait", @@ -9436,8 +10232,8 @@ dependencies = [ [[package]] name = "reth-payload-validator" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-rpc-types", "reth-chainspec", @@ -9447,15 +10243,15 @@ dependencies = [ [[package]] name = "reth-primitives" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", "alloy-rpc-types", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "arbitrary", "bytes", "c-kzg", @@ -9463,8 +10259,8 @@ dependencies = [ "k256", "modular-bitfield", "once_cell", + "op-alloy-consensus", "op-alloy-rpc-types", - "proptest", "rand", "rayon", "reth-codecs", @@ -9472,7 +10268,7 @@ dependencies = [ "reth-primitives-traits", "reth-static-file-types", "reth-trie-common", - "revm-primitives", + "revm-primitives 13.0.0", "secp256k1", "serde", "zstd 0.13.2", @@ -9480,11 +10276,11 @@ dependencies = [ [[package]] name = "reth-primitives-traits" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-genesis", "alloy-primitives", "alloy-rlp", @@ -9496,23 +10292,24 @@ dependencies = [ "proptest", "proptest-arbitrary-interop", "reth-codecs", - "revm-primitives", + "revm-primitives 13.0.0", "roaring", "serde", ] [[package]] name = "reth-provider" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", "dashmap", "itertools 0.13.0", - "metrics", + "metrics 0.24.0", "notify", "parking_lot 0.12.3", "rayon", @@ -9545,12 +10342,12 @@ dependencies = [ [[package]] name = "reth-prune" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "itertools 0.13.0", - "metrics", + "metrics 0.24.0", "rayon", "reth-chainspec", "reth-config", @@ -9571,8 +10368,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bytes", @@ -9585,12 +10382,11 @@ dependencies = [ [[package]] name = "reth-revm" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips 0.5.4", "alloy-primitives", - "reth-chainspec", - "reth-consensus-common", "reth-execution-errors", "reth-primitives", "reth-prune-types", @@ -9601,25 +10397,26 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-consensus 0.4.2", + "alloy-consensus 0.5.4", "alloy-dyn-abi", - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-genesis", - "alloy-network 0.4.2", + "alloy-network 0.5.4", "alloy-primitives", "alloy-rlp", "alloy-rpc-types", "alloy-rpc-types-admin", + "alloy-rpc-types-beacon", "alloy-rpc-types-debug", - "alloy-rpc-types-eth 0.4.2", + "alloy-rpc-types-eth 0.5.4", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 0.4.2", - "alloy-signer 0.4.2", + "alloy-serde 0.5.4", + "alloy-signer 0.5.4", "alloy-signer-local", "async-trait", "derive_more 1.0.0", @@ -9633,13 +10430,15 @@ dependencies = [ "pin-project", "rand", "reth-chainspec", + "reth-consensus", "reth-consensus-common", "reth-errors", + "reth-ethereum-consensus", "reth-evm", "reth-network-api", "reth-network-peers", "reth-network-types", - "reth-node-api", + "reth-payload-validator", "reth-primitives", "reth-provider", "reth-revm", @@ -9654,7 +10453,7 @@ dependencies = [ "reth-trie", "revm", "revm-inspectors", - "revm-primitives", + "revm-primitives 13.0.0", "serde", "serde_json", "thiserror", @@ -9667,11 +10466,11 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", - "alloy-json-rpc 0.4.2", + "alloy-eips 0.5.4", + "alloy-json-rpc 0.5.4", "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-admin", @@ -9679,30 +10478,31 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.4.2", + "alloy-rpc-types-eth 0.5.4", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 0.4.2", + "alloy-serde 0.5.4", "jsonrpsee 0.24.6", "reth-engine-primitives", "reth-network-peers", - "reth-primitives", "reth-rpc-eth-api", + "serde", + "serde_with", ] [[package]] name = "reth-rpc-engine-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rpc-types-engine", "async-trait", "jsonrpsee-core 0.24.6", "jsonrpsee-types 0.24.6", - "metrics", + "metrics 0.24.0", "reth-beacon-consensus", "reth-chainspec", "reth-engine-primitives", @@ -9724,16 +10524,17 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus 0.5.4", "alloy-dyn-abi", - "alloy-eips 0.4.2", - "alloy-json-rpc 0.4.2", - "alloy-network 0.4.2", + "alloy-eips 0.5.4", + "alloy-json-rpc 0.5.4", + "alloy-network 0.5.4", "alloy-primitives", "alloy-rpc-types", - "alloy-rpc-types-eth 0.4.2", + "alloy-rpc-types-eth 0.5.4", "alloy-rpc-types-mev", "async-trait", "auto_impl", @@ -9747,6 +10548,7 @@ dependencies = [ "reth-evm", "reth-execution-types", "reth-network-api", + "reth-node-api", "reth-primitives", "reth-provider", "reth-revm", @@ -9758,28 +10560,28 @@ dependencies = [ "reth-trie", "revm", "revm-inspectors", - "revm-primitives", + "revm-primitives 13.0.0", "tokio", "tracing", ] [[package]] name = "reth-rpc-eth-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rpc-types", - "alloy-rpc-types-eth 0.4.2", - "alloy-serde 0.4.2", + "alloy-rpc-types-eth 0.5.4", "alloy-sol-types", "derive_more 1.0.0", "futures", + "itertools 0.13.0", "jsonrpsee-core 0.24.6", "jsonrpsee-types 0.24.6", - "metrics", + "metrics 0.24.0", "rand", "reth-chain-state", "reth-chainspec", @@ -9797,7 +10599,7 @@ dependencies = [ "reth-trie", "revm", "revm-inspectors", - "revm-primitives", + "revm-primitives 13.0.0", "schnellru", "serde", "thiserror", @@ -9808,46 +10610,47 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rpc-types-engine", "jsonrpsee-core 0.24.6", "jsonrpsee-types 0.24.6", "reth-errors", "reth-network-api", - "reth-primitives", "serde", "strum 0.26.3", ] [[package]] name = "reth-rpc-types-compat" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", "alloy-rpc-types", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.4.2", - "alloy-serde 0.4.2", + "alloy-rpc-types-eth 0.5.4", "reth-primitives", "reth-trie-common", + "serde", ] [[package]] name = "reth-stages-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "aquamarine", "auto_impl", "futures-util", - "metrics", + "metrics 0.24.0", "reth-consensus", "reth-errors", "reth-metrics", @@ -9866,8 +10669,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "bytes", @@ -9879,17 +10682,14 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "parking_lot 0.12.3", "rayon", - "reth-chainspec", "reth-db", "reth-db-api", - "reth-nippy-jar", - "reth-node-types", "reth-provider", "reth-prune-types", "reth-stages-types", @@ -9901,8 +10701,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "derive_more 1.0.0", @@ -9912,10 +10712,11 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "auto_impl", "reth-chainspec", @@ -9931,10 +10732,10 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", "derive_more 1.0.0", @@ -9944,13 +10745,13 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "auto_impl", "dyn-clone", "futures-util", - "metrics", + "metrics 0.24.0", "pin-project", "rayon", "reth-metrics", @@ -9962,11 +10763,11 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-consensus 0.4.2", - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-genesis", "alloy-primitives", "rand", @@ -9976,8 +10777,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "tokio", "tokio-stream", @@ -9986,8 +10787,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "clap", "eyre", @@ -10001,18 +10802,20 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-eips 0.4.2", + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", "alloy-primitives", "alloy-rlp", "aquamarine", "auto_impl", "bitflags 2.6.0", "futures-util", - "metrics", + "metrics 0.24.0", "parking_lot 0.12.3", + "rand", "reth-chain-state", "reth-chainspec", "reth-eth-wire-types", @@ -10035,15 +10838,15 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ + "alloy-consensus 0.5.4", "alloy-primitives", "alloy-rlp", "auto_impl", - "derive_more 1.0.0", "itertools 0.13.0", - "metrics", + "metrics 0.24.0", "rayon", "reth-execution-errors", "reth-metrics", @@ -10052,59 +10855,58 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "revm", + "serde", "tracing", ] [[package]] name = "reth-trie-common" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ - "alloy-consensus 0.4.2", + "alloy-consensus 0.5.4", "alloy-genesis", "alloy-primitives", "alloy-rlp", "alloy-trie", + "arbitrary", "bytes", "derive_more 1.0.0", "itertools 0.13.0", "nybbles", "reth-codecs", "reth-primitives-traits", - "revm-primitives", + "revm-primitives 13.0.0", "serde", ] [[package]] name = "reth-trie-db" -version = "1.1.0" -source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.0#1ba631ba9581973e7c6cadeea92cfe1802aceb4a" +version = "1.1.1" +source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.1.1#15c230bac20e2b1b3532c8b0d470e815fbc0cc22" dependencies = [ "alloy-primitives", "alloy-rlp", - "auto_impl", "derive_more 1.0.0", - "itertools 0.13.0", - "metrics", - "rayon", + "metrics 0.24.0", "reth-db", "reth-db-api", "reth-execution-errors", "reth-metrics", "reth-primitives", - "reth-stages-types", "reth-storage-errors", "reth-trie", "reth-trie-common", "revm", + "serde", "tracing", ] [[package]] name = "revm" -version = "14.0.3" +version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641702b12847f9ed418d552f4fcabe536d867a2c980e96b6e7e25d7b992f929f" +checksum = "055bee6a81aaeee8c2389ae31f0d4de87f44df24f4444a1116f9755fd87a76ad" dependencies = [ "auto_impl", "cfg-if", @@ -10117,12 +10919,12 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c44af0bf801f48d25f7baf25cf72aff4c02d610f83b428175228162fef0246" +checksum = "1e29c662f7887f3b659d4b0fd234673419a8fcbeaa1ecc29bf7034c0a75cc8ea" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 0.4.2", + "alloy-rpc-types-eth 0.5.4", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", @@ -10134,30 +10936,29 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "10.0.3" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5e14002afae20b5bf1566f22316122f42f57517000e559c55b25bf7a49cba2" +checksum = "fac2034454f8bc69dc7d3c94cdb1b57559e27f5ef0518771f1787de543d7d6a1" dependencies = [ - "revm-primitives", + "revm-primitives 13.0.0", "serde", ] [[package]] name = "revm-precompile" -version = "11.0.3" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3198c06247e8d4ad0d1312591edf049b0de4ddffa9fecb625c318fd67db8639b" +checksum = "7a88c8c7c5f9b988a9e65fc0990c6ce859cdb74114db705bd118a96d22d08027" dependencies = [ "aurora-engine-modexp", - "blst", "c-kzg", "cfg-if", "k256", "once_cell", - "revm-primitives", + "revm-primitives 13.0.0", "ripemd", "secp256k1", - "sha2", + "sha2 0.10.8", "substrate-bn", ] @@ -10168,7 +10969,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f1525851a03aff9a9d6a1d018b414d76252d6802ab54695b27093ecd7e7a101" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.1.1", + "alloy-primitives", + "auto_impl", + "bitflags 2.6.0", + "bitvec", + "cfg-if", + "dyn-clone", + "enumn", + "hex", +] + +[[package]] +name = "revm-primitives" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d11fa1e195b0bebaf3fb18596f314a13ba3a4cb1fdd16d3465934d812fd921e" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702 0.3.2", "alloy-primitives", "auto_impl", "bitflags 2.6.0", @@ -10187,7 +11006,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac", + "hmac 0.12.1", "subtle", ] @@ -10728,7 +11547,7 @@ dependencies = [ "serde-value", "serde_json", "serde_repr", - "sha2", + "sha2 0.10.8", "smallvec", "smol_str", "tar", @@ -10860,10 +11679,10 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" dependencies = [ - "hmac", + "hmac 0.12.1", "pbkdf2", "salsa20", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -10898,6 +11717,7 @@ checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "rand", "secp256k1-sys", + "serde", ] [[package]] @@ -11167,6 +11987,19 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + [[package]] name = "sha2" version = "0.10.8" @@ -11213,6 +12046,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs 5.0.1", +] + [[package]] name = "shlex" version = "1.3.0" @@ -11299,6 +12141,7 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" dependencies = [ + "arbitrary", "serde", ] @@ -11311,6 +12154,12 @@ dependencies = [ "serde", ] +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + [[package]] name = "socket2" version = "0.5.7" @@ -11475,12 +12324,12 @@ checksum = "d3f2175b0b3fc24ff2ec6dc07f5a720498994effca7e78b11a6e1c1bd02cad52" dependencies = [ "crypto-bigint", "hex", - "hmac", + "hmac 0.12.1", "num-bigint", "num-integer", "num-traits 0.2.19", "rfc6979", - "sha2", + "sha2 0.10.8", "starknet-crypto-codegen", "starknet-curve 0.3.0", "starknet-ff", @@ -11495,12 +12344,12 @@ checksum = "2e2c30c01e8eb0fc913c4ee3cf676389fffc1d1182bfe5bb9670e4e72e968064" dependencies = [ "crypto-bigint", "hex", - "hmac", + "hmac 0.12.1", "num-bigint", "num-integer", "num-traits 0.2.19", "rfc6979", - "sha2", + "sha2 0.10.8", "starknet-crypto-codegen", "starknet-curve 0.4.2", "starknet-ff", @@ -11515,12 +12364,12 @@ checksum = "60a5064173a8e8d2675e67744fd07f310de44573924b6b7af225a6bdd8102913" dependencies = [ "crypto-bigint", "hex", - "hmac", + "hmac 0.12.1", "num-bigint", "num-integer", "num-traits 0.2.19", "rfc6979", - "sha2", + "sha2 0.10.8", "starknet-curve 0.5.1", "starknet-types-core", "zeroize", @@ -11843,7 +12692,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "tempfile", "thiserror", "url", @@ -12296,6 +13145,7 @@ dependencies = [ "futures-util", "hashbrown 0.14.5", "pin-project-lite", + "slab", "tokio", ] @@ -12607,6 +13457,53 @@ dependencies = [ "tracing-serde", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.3", + "rand", + "resolv-conf", + "serde", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -12674,6 +13571,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "uluru" version = "3.1.0" @@ -12767,12 +13676,28 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "unsigned-varint" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" + [[package]] name = "untrusted" version = "0.7.1" @@ -12835,6 +13760,20 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cargo_metadata", + "cfg-if", + "regex", + "rustversion", + "time", +] + [[package]] name = "version_check" version = "0.9.5" @@ -12955,6 +13894,20 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmtimer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.12.3", + "pin-utils", + "slab", + "wasm-bindgen", +] + [[package]] name = "web-sys" version = "0.3.72" @@ -13470,7 +14423,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "hmac", + "hmac 0.12.1", "pbkdf2", "sha1", "time", diff --git a/Cargo.toml b/Cargo.toml index d48f6c06e..7f64fd070 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,40 +60,40 @@ starknet = { version = "0.12", default-features = false } num-traits = { version = "0.2", default-features = false } # Ethereum dependencies -alloy-consensus = { version = "0.4.2", default-features = false, optional = true } -alloy-contract = { version = "0.3.6", default-features = false } -alloy-provider = { version = "0.4.2", default-features = false, optional = true } +alloy-consensus = { version = "0.5.4", default-features = false } +alloy-contract = { version = "0.5.4", default-features = false } +alloy-provider = { version = "0.5.4", default-features = false, optional = true } alloy-rlp = { version = "0.3.8", default-features = false } -alloy-rpc-types = { version = "0.4.2", features = [ +alloy-rpc-types = { version = "0.5.4", features = [ "eth", "arbitrary", ], default-features = false } -alloy-rpc-types-txpool = { version = "0.4.2", default-features = false } -alloy-rpc-types-trace = { version = "0.4.2", default-features = false } +alloy-rpc-types-txpool = { version = "0.5.4", default-features = false } +alloy-rpc-types-trace = { version = "0.5.4", default-features = false } alloy-sol-types = { version = "0.8.4", default-features = false } jsonrpsee = { version = "0.24", features = ["macros", "server"] } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false, features = [ +reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false, features = [ "std", ] } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false, features = [ +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false, features = [ "std", ] } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false } -reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false } -reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false, features = [ +reth-execution-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false } +reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false } +reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false, features = [ "alloy-compat", "std", "arbitrary", ] } -reth-revm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false, features = [ +reth-revm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false, features = [ "std", ] } -reth-rpc = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false } -reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false } -reth-testing-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false, optional = true } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.0", default-features = false } -revm-inspectors = "0.8.1" +reth-rpc = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false } +reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false } +reth-testing-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false, optional = true } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.1.1", default-features = false } +revm-inspectors = "0.10.0" # Error eyre = { version = "0.6", default-features = false } @@ -152,17 +152,17 @@ pin-project-lite = { version = "0.2", default-features = false } #### Testing crates #### # Ethereum foundry-config = { git = "https://github.com/foundry-rs/foundry", branch = "master", optional = true } -revm-interpreter = { version = "10.0", default-features = false, optional = true } -revm-primitives = { version = "10.0", default-features = false, optional = true } +revm-interpreter = { version = "13.0", default-features = false, optional = true } +revm-primitives = { version = "13.0", default-features = false, optional = true } # Alloy alloy-dyn-abi = { version = "0.8.4", default-features = false } -alloy-eips = { version = "0.4.2", default-features = false } +alloy-eips = { version = "0.5.4", default-features = false } alloy-json-abi = { version = "0.8.4", default-features = false, optional = true } -alloy-primitives = { version = "0.8.4", default-features = false } -alloy-signer-local = { version = "0.4.2", default-features = false, optional = true } -alloy-signer = { version = "0.4.2", default-features = false, optional = true } -alloy-serde = { version = "0.4.2", default-features = false } +alloy-primitives = { version = "0.8.9", default-features = false } +alloy-signer-local = { version = "0.5.4", default-features = false, optional = true } +alloy-signer = { version = "0.5.4", default-features = false, optional = true } +alloy-serde = { version = "0.5.4", default-features = false } # Starknet dojo-test-utils = { git = 'https://github.com/dojoengine/dojo', tag = "v1.0.0-alpha.15", default-features = false, optional = true } @@ -201,7 +201,6 @@ tempfile = "3.8" [features] testing = [ - "alloy-consensus", "alloy-json-abi", "alloy-signer-local", "alloy-signer", diff --git a/src/client/mod.rs b/src/client/mod.rs index 8a3fd59e9..6859cff1e 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -23,9 +23,11 @@ use alloy_eips::eip2718::Encodable2718; use alloy_primitives::{Address, Bytes, B256}; use alloy_rlp::Decodable; use alloy_rpc_types_txpool::TxpoolContent; +use alloy_serde::WithOtherFields; use async_trait::async_trait; use reth_chainspec::ChainSpec; use reth_primitives::{TransactionSigned, TransactionSignedEcRecovered}; +use reth_rpc::eth::EthTxBuilder; use reth_rpc_eth_types::TransactionSource; use reth_transaction_pool::{ blobstore::NoopBlobStore, AllPoolTransactions, EthPooledTransaction, PoolConfig, PoolTransaction, @@ -145,8 +147,11 @@ where ) { content.entry(tx.sender()).or_default().insert( tx.nonce().to_string(), - reth_rpc_types_compat::transaction::from_recovered::( - tx.clone().into_consensus(), + WithOtherFields::new( + reth_rpc_types_compat::transaction::from_recovered::( + tx.clone().into_consensus(), + &EthTxBuilder {}, + ), ), ); } @@ -182,8 +187,10 @@ where .pool .get(&hash) .map(|transaction| { - TransactionSource::Pool(transaction.transaction.transaction().clone()) - .into_transaction::() + WithOtherFields::new( + TransactionSource::Pool(transaction.transaction.transaction().clone()) + .into_transaction(&EthTxBuilder {}), + ) }) .or(self.eth_provider.transaction_by_hash(hash).await?); diff --git a/src/eth_rpc/api/eth_api.rs b/src/eth_rpc/api/eth_api.rs index 737f8fff1..7b0fc122f 100644 --- a/src/eth_rpc/api/eth_api.rs +++ b/src/eth_rpc/api/eth_api.rs @@ -1,4 +1,5 @@ use crate::providers::eth_provider::database::types::receipt::ExtendedTxReceipt; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, Bytes, B256, B64, U256, U64}; use alloy_rpc_types::{ serde_helpers::JsonStorageKey, state::StateOverride, AccessListResult, Block, BlockOverrides, @@ -7,7 +8,6 @@ use alloy_rpc_types::{ }; use alloy_serde::WithOtherFields; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; -use reth_primitives::{BlockId, BlockNumberOrTag}; /// Ethereum JSON-RPC API Trait /// Mostly based on diff --git a/src/eth_rpc/servers/eth_rpc.rs b/src/eth_rpc/servers/eth_rpc.rs index 32c72ae16..fd64a3efd 100644 --- a/src/eth_rpc/servers/eth_rpc.rs +++ b/src/eth_rpc/servers/eth_rpc.rs @@ -8,13 +8,13 @@ use crate::{ BlockProvider, ChainProvider, GasProvider, LogProvider, ReceiptProvider, StateProvider, TransactionProvider, }, }; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, Bytes, B256, B64, U256, U64}; use alloy_rpc_types::{ serde_helpers::JsonStorageKey, state::StateOverride, AccessListResult, BlockOverrides, EIP1186AccountProofResponse, FeeHistory, Filter, FilterChanges, Index, SyncStatus, TransactionRequest, Work, }; use jsonrpsee::core::{async_trait, RpcResult}; -use reth_primitives::{BlockId, BlockNumberOrTag}; use serde_json::Value; use starknet::providers::Provider; use std::sync::Arc; diff --git a/src/models/block.rs b/src/models/block.rs index bee4cb91b..296e9e188 100644 --- a/src/models/block.rs +++ b/src/models/block.rs @@ -2,8 +2,8 @@ use crate::{ into_via_try_wrapper, providers::eth_provider::{constant::STARKNET_MODULUS, error::EthereumDataFormatError}, }; +use alloy_eips::{BlockId as EthereumBlockId, BlockNumberOrTag}; use alloy_primitives::U256; -use reth_primitives::{BlockId as EthereumBlockId, BlockNumberOrTag}; use starknet::core::types::{BlockId as StarknetBlockId, BlockTag}; #[derive(Debug)] diff --git a/src/models/transaction.rs b/src/models/transaction.rs index e85f2ed88..e0c5807a6 100644 --- a/src/models/transaction.rs +++ b/src/models/transaction.rs @@ -3,6 +3,7 @@ use crate::providers::eth_provider::{ starknet::kakarot_core::{ETH_SEND_TRANSACTION, KAKAROT_ADDRESS}, utils::split_u256, }; +use alloy_consensus::transaction::Transaction as _; use alloy_rlp::Encodable; use reth_primitives::{transaction::legacy_parity, Transaction, TransactionSigned}; use starknet::core::types::Felt; @@ -90,9 +91,8 @@ pub fn transaction_data_to_starknet_calldata( mod tests { use super::*; use alloy_consensus::TxEip2930; - use alloy_primitives::{bytes, hex, TxKind, U256}; + use alloy_primitives::{bytes, hex, Signature, TxKind, U256}; use alloy_rlp::Decodable; - use reth_primitives::Signature; use std::str::FromStr; #[test] diff --git a/src/pool/mempool.rs b/src/pool/mempool.rs index 863e96acf..a26f48068 100644 --- a/src/pool/mempool.rs +++ b/src/pool/mempool.rs @@ -8,11 +8,11 @@ use crate::{ pool::constants::ONE_TENTH_ETH, providers::eth_provider::{database::state::EthDatabase, starknet::relayer::Relayer, BlockProvider}, }; +use alloy_eips::BlockNumberOrTag; use alloy_primitives::{Address, U256}; use rand::{seq::SliceRandom, SeedableRng}; use reth_chainspec::ChainSpec; use reth_execution_types::ChangedAccount; -use reth_primitives::BlockNumberOrTag; use reth_revm::DatabaseRef; use reth_transaction_pool::{ blobstore::NoopBlobStore, BlockInfo, CanonicalStateUpdate, CoinbaseTipOrdering, EthPooledTransaction, Pool, diff --git a/src/pool/validate.rs b/src/pool/validate.rs index 31b2d9f05..2210c8476 100644 --- a/src/pool/validate.rs +++ b/src/pool/validate.rs @@ -4,12 +4,10 @@ use crate::providers::eth_provider::{ database::state::EthDatabase, provider::EthereumProvider, starknet::kakarot_core::get_white_listed_eip_155_transaction_hashes, }; +use alloy_consensus::constants::{EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, LEGACY_TX_TYPE_ID}; use alloy_rpc_types::BlockNumberOrTag; use reth_chainspec::ChainSpec; -use reth_primitives::{ - GotExpected, InvalidTransactionError, SealedBlock, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, - LEGACY_TX_TYPE_ID, -}; +use reth_primitives::{GotExpected, InvalidTransactionError, SealedBlock}; use reth_revm::DatabaseRef; use reth_transaction_pool::{ error::InvalidPoolTransactionError, diff --git a/src/providers/alchemy_provider.rs b/src/providers/alchemy_provider.rs index 794d12f2b..8ba5a4f07 100644 --- a/src/providers/alchemy_provider.rs +++ b/src/providers/alchemy_provider.rs @@ -6,13 +6,13 @@ use crate::{ provider::{EthApiResult, EthereumProvider}, }, }; +use alloy_eips::BlockNumberOrTag; use alloy_primitives::{Address, U256}; use async_trait::async_trait; use auto_impl::auto_impl; use eyre::Result; use futures::future::join_all; use mongodb::bson::doc; -use reth_primitives::BlockNumberOrTag; #[async_trait] #[auto_impl(Arc, &)] diff --git a/src/providers/debug_provider.rs b/src/providers/debug_provider.rs index 91482baf8..99794d873 100644 --- a/src/providers/debug_provider.rs +++ b/src/providers/debug_provider.rs @@ -5,14 +5,14 @@ use crate::{ }, tracing::builder::TracerBuilder, }; -use alloy_eips::eip2718::Encodable2718; +use alloy_eips::{eip2718::Encodable2718, BlockId, BlockNumberOrTag}; use alloy_primitives::{Bytes, B256}; use alloy_rlp::Encodable; use alloy_rpc_types::TransactionRequest; use alloy_rpc_types_trace::geth::{GethDebugTracingCallOptions, GethDebugTracingOptions, GethTrace, TraceResult}; use async_trait::async_trait; use auto_impl::auto_impl; -use reth_primitives::{Block, BlockId, BlockNumberOrTag, Header, Log, Receipt, ReceiptWithBloom, TransactionSigned}; +use reth_primitives::{Block, Header, Log, Receipt, ReceiptWithBloom, TransactionSigned}; use std::sync::Arc; #[async_trait] @@ -88,7 +88,7 @@ impl DebugProvider for DebugDataPro let signature = tx.signature.ok_or_else(|| EthApiError::from(SignatureError::MissingSignature))?; let bytes = TransactionSigned::from_transaction_and_signature( tx.try_into()?, - reth_primitives::Signature::from_rs_and_parity( + alloy_primitives::Signature::from_rs_and_parity( signature.r, signature.s, signature.y_parity.map_or(false, |v| v.0), @@ -111,7 +111,7 @@ impl DebugProvider for DebugDataPro let signature = t.signature.ok_or_else(|| EthApiError::from(SignatureError::MissingSignature))?; let bytes = TransactionSigned::from_transaction_and_signature( t.try_into()?, - reth_primitives::Signature::from_rs_and_parity( + alloy_primitives::Signature::from_rs_and_parity( signature.r, signature.s, signature.y_parity.map_or(false, |v| v.0), @@ -157,7 +157,8 @@ impl DebugProvider for DebugDataPro }, bloom: *receipt.inner.inner.logs_bloom(), } - .envelope_encoded(), + .encoded_2718() + .into(), ); } diff --git a/src/providers/eth_provider/blocks.rs b/src/providers/eth_provider/blocks.rs index d96aaf9a9..827b4f010 100644 --- a/src/providers/eth_provider/blocks.rs +++ b/src/providers/eth_provider/blocks.rs @@ -9,12 +9,12 @@ use crate::providers::eth_provider::{ database::ethereum::EthereumTransactionStore, provider::{EthApiResult, EthDataProvider}, }; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{B256, U256, U64}; use alloy_rpc_types::Header; use async_trait::async_trait; use auto_impl::auto_impl; use mongodb::bson::doc; -use reth_primitives::{BlockId, BlockNumberOrTag}; use tracing::Instrument; /// Ethereum block provider trait. #[async_trait] diff --git a/src/providers/eth_provider/contracts/erc20.rs b/src/providers/eth_provider/contracts/erc20.rs index daf9d564d..195327dc9 100644 --- a/src/providers/eth_provider/contracts/erc20.rs +++ b/src/providers/eth_provider/contracts/erc20.rs @@ -5,10 +5,10 @@ use crate::providers::eth_provider::{ provider::{EthApiResult, EthereumProvider}, }; use alloy_dyn_abi::DynSolType; +use alloy_eips::BlockId; use alloy_primitives::{Address, Bytes, TxKind, U256}; use alloy_rpc_types::{request::TransactionInput, TransactionRequest}; use alloy_sol_types::{sol, SolCall}; -use reth_primitives::BlockId; sol! { #[sol(rpc)] diff --git a/src/providers/eth_provider/database/ethereum.rs b/src/providers/eth_provider/database/ethereum.rs index 9fd445de3..0b4ddf63a 100644 --- a/src/providers/eth_provider/database/ethereum.rs +++ b/src/providers/eth_provider/database/ethereum.rs @@ -11,13 +11,14 @@ use crate::providers::eth_provider::{ database::types::transaction::{EthStarknetHashes, StoredEthStarknetTransactionHash}, error::EthApiError, }; +use alloy_consensus::constants::EMPTY_ROOT_HASH; use alloy_primitives::{B256, U256}; use alloy_rlp::Encodable; use alloy_rpc_types::{Block, BlockHashOrNumber, BlockTransactions, Header}; use alloy_serde::WithOtherFields; use async_trait::async_trait; use mongodb::bson::doc; -use reth_primitives::{constants::EMPTY_ROOT_HASH, BlockBody}; +use reth_primitives::BlockBody; use tracing::instrument; /// Trait for interacting with a database that stores Ethereum typed diff --git a/src/providers/eth_provider/database/types/header.rs b/src/providers/eth_provider/database/types/header.rs index 631198047..c198f7f97 100644 --- a/src/providers/eth_provider/database/types/header.rs +++ b/src/providers/eth_provider/database/types/header.rs @@ -5,9 +5,9 @@ use serde::{Deserialize, Serialize}; use std::ops::Deref; #[cfg(any(test, feature = "arbitrary", feature = "testing"))] use { + alloy_consensus::constants::EMPTY_ROOT_HASH, alloy_primitives::{B256, B64, U256}, arbitrary::Arbitrary, - reth_primitives::constants::EMPTY_ROOT_HASH, }; /// Type alias for a block that contains extended transactions and additional fields. diff --git a/src/providers/eth_provider/database/types/receipt.rs b/src/providers/eth_provider/database/types/receipt.rs index 958ba1eb4..aa853557d 100644 --- a/src/providers/eth_provider/database/types/receipt.rs +++ b/src/providers/eth_provider/database/types/receipt.rs @@ -64,7 +64,6 @@ impl<'a> arbitrary::Arbitrary<'a> for StoredTransactionReceipt { from: Address::arbitrary(u)?, to: Some(Address::arbitrary(u)?), contract_address: Some(Address::arbitrary(u)?), - state_root: Some(B256::arbitrary(u)?), inner: match u.int_in_range(0..=3)? { 0 => alloy_consensus::ReceiptEnvelope::Legacy(receipt), 1 => alloy_consensus::ReceiptEnvelope::Eip2930(receipt), diff --git a/src/providers/eth_provider/database/types/transaction.rs b/src/providers/eth_provider/database/types/transaction.rs index ea65f1dc4..47a3fdcad 100644 --- a/src/providers/eth_provider/database/types/transaction.rs +++ b/src/providers/eth_provider/database/types/transaction.rs @@ -6,6 +6,7 @@ use starknet::core::types::Felt; use std::ops::Deref; #[cfg(any(test, feature = "arbitrary", feature = "testing"))] use { + alloy_consensus::Transaction as _, alloy_primitives::U256, arbitrary::Arbitrary, rand::Rng, diff --git a/src/providers/eth_provider/gas.rs b/src/providers/eth_provider/gas.rs index e55087b30..04d9e8ae0 100644 --- a/src/providers/eth_provider/gas.rs +++ b/src/providers/eth_provider/gas.rs @@ -10,13 +10,13 @@ use crate::{ provider::{EthApiResult, EthDataProvider}, }, }; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{U256, U64}; use alloy_rpc_types::{FeeHistory, TransactionRequest}; use async_trait::async_trait; use auto_impl::auto_impl; use eyre::eyre; use mongodb::bson::doc; -use reth_primitives::{BlockId, BlockNumberOrTag}; use tracing::Instrument; #[async_trait] diff --git a/src/providers/eth_provider/provider.rs b/src/providers/eth_provider/provider.rs index bfa88726c..12e562169 100644 --- a/src/providers/eth_provider/provider.rs +++ b/src/providers/eth_provider/provider.rs @@ -17,6 +17,7 @@ use crate::{ sn_provider::StarknetProvider, }, }; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{TxKind, U256}; use alloy_rpc_types::{BlockHashOrNumber, TransactionRequest}; use cainome::cairo_serde::CairoArrayLegacy; @@ -24,7 +25,6 @@ use eyre::Result; use itertools::Itertools; use mongodb::bson::doc; use num_traits::cast::ToPrimitive; -use reth_primitives::{BlockId, BlockNumberOrTag}; use starknet::core::types::Felt; use tracing::{instrument, Instrument}; #[cfg(feature = "hive")] diff --git a/src/providers/eth_provider/receipts.rs b/src/providers/eth_provider/receipts.rs index 854f284a9..b6dae1e7c 100644 --- a/src/providers/eth_provider/receipts.rs +++ b/src/providers/eth_provider/receipts.rs @@ -7,11 +7,11 @@ use crate::providers::eth_provider::{ }, provider::{EthApiResult, EthDataProvider}, }; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::B256; use async_trait::async_trait; use auto_impl::auto_impl; use mongodb::bson::doc; -use reth_primitives::{BlockId, BlockNumberOrTag}; #[async_trait] #[auto_impl(Arc, &)] diff --git a/src/providers/eth_provider/state.rs b/src/providers/eth_provider/state.rs index 7a4490954..293a4059d 100644 --- a/src/providers/eth_provider/state.rs +++ b/src/providers/eth_provider/state.rs @@ -11,6 +11,7 @@ use crate::{ BlockProvider, ChainProvider, }, }; +use alloy_eips::BlockId; use alloy_primitives::{Address, Bytes, B256, U256}; use alloy_rpc_types::{ serde_helpers::JsonStorageKey, @@ -23,7 +24,6 @@ use mongodb::bson::doc; use num_traits::cast::ToPrimitive; use reth_evm_ethereum::EthEvmConfig; use reth_node_api::ConfigureEvm; -use reth_primitives::BlockId; use reth_revm::db::CacheDB; use reth_rpc_eth_types::error::ensure_success; use starknet::core::utils::get_storage_var_address; diff --git a/src/providers/eth_provider/transactions.rs b/src/providers/eth_provider/transactions.rs index 4906c49c9..120fcc532 100644 --- a/src/providers/eth_provider/transactions.rs +++ b/src/providers/eth_provider/transactions.rs @@ -15,12 +15,12 @@ use crate::{ ChainProvider, }, }; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, B256, U256}; use alloy_rpc_types::Index; use async_trait::async_trait; use auto_impl::auto_impl; use mongodb::bson::doc; -use reth_primitives::{BlockId, BlockNumberOrTag}; use tracing::Instrument; #[async_trait] diff --git a/src/test_utils/eoa.rs b/src/test_utils/eoa.rs index 88e8f2d0e..0aab5ed1b 100644 --- a/src/test_utils/eoa.rs +++ b/src/test_utils/eoa.rs @@ -55,7 +55,7 @@ pub trait Eoa { Ok(eth_provider.transaction_count(evm_address, None).await?) } - fn sign_payload(&self, payload: B256) -> Result { + fn sign_payload(&self, payload: B256) -> Result { let pk = self.private_key(); let signature = sign_message(pk, payload)?; Ok(signature) diff --git a/src/test_utils/hive/account.rs b/src/test_utils/hive/account.rs index b52b9083d..46de87277 100644 --- a/src/test_utils/hive/account.rs +++ b/src/test_utils/hive/account.rs @@ -1,7 +1,7 @@ #![allow(unreachable_pub)] use crate::providers::eth_provider::utils::split_u256; +use alloy_consensus::constants::KECCAK_EMPTY; use alloy_primitives::{keccak256, Address, Bytes, U256}; -use reth_primitives::KECCAK_EMPTY; use revm_interpreter::analysis::to_analysed; use revm_primitives::Bytecode; use starknet::core::utils::get_storage_var_address; diff --git a/src/test_utils/katana/mod.rs b/src/test_utils/katana/mod.rs index e0dd89da1..186c09389 100644 --- a/src/test_utils/katana/mod.rs +++ b/src/test_utils/katana/mod.rs @@ -117,8 +117,8 @@ impl<'a> Katana { #[cfg(any(test, feature = "arbitrary", feature = "testing"))] pub async fn new_empty() -> Self { + use alloy_consensus::constants::EMPTY_ROOT_HASH; use alloy_primitives::{B256, B64}; - use reth_primitives::constants::EMPTY_ROOT_HASH; let sequencer = katana_sequencer().await; let starknet_provider = Arc::new(JsonRpcClient::new(HttpTransport::new(sequencer.url()))); diff --git a/src/test_utils/mock_provider.rs b/src/test_utils/mock_provider.rs index b9e3b53b6..33942e90b 100644 --- a/src/test_utils/mock_provider.rs +++ b/src/test_utils/mock_provider.rs @@ -3,11 +3,11 @@ use crate::providers::eth_provider::{ provider::EthApiResult, BlockProvider, ChainProvider, GasProvider, LogProvider, ReceiptProvider, StateProvider, TransactionProvider, }; +use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_primitives::{Address, Bytes, B256, U256, U64}; use alloy_rpc_types::{Filter, FilterChanges, Header, SyncStatus, TransactionRequest}; use async_trait::async_trait; use mockall::mock; -use reth_primitives::{BlockId, BlockNumberOrTag}; mock! { #[derive(Clone, Debug)] diff --git a/src/tracing/mod.rs b/src/tracing/mod.rs index d1381166b..949a0f6d7 100644 --- a/src/tracing/mod.rs +++ b/src/tracing/mod.rs @@ -234,7 +234,7 @@ impl Tracer

{ }; } - let env = env_with_tx(&self.env, tx.clone())?; + let env = env_with_tx(&self.env, &tx)?; let eth_evm_config = EthEvmConfig::new(Arc::new(Default::default())); let mut evm = eth_evm_config.evm_with_env(&mut self.db.0, env); @@ -337,7 +337,7 @@ impl Tracer

{ let mut db = self.db; while let Some(tx) = transactions.next() { - let env = env_with_tx(&self.env, tx.clone())?; + let env = env_with_tx(&self.env, tx)?; let (res, state_changes) = if tx.other.get("reverted").is_some() { (TracingResult::default_failure(&self.tracing_options, tx), HashMap::default()) @@ -370,10 +370,10 @@ impl Tracer

{ /// Returns the environment with the transaction env updated to the given transaction. fn env_with_tx( env: &EnvWithHandlerCfg, - tx: WithOtherFields, + tx: &WithOtherFields, ) -> TracerResult { // Convert the transaction to an ec recovered transaction and update the env with it. - let tx_env = EthEvmConfig::new(Arc::new(Default::default())).tx_env(&tx.try_into()?); + let tx_env = EthEvmConfig::new(Arc::new(Default::default())).tx_env(&tx.clone().try_into()?, tx.from); Ok(EnvWithHandlerCfg { env: Env::boxed(env.env.cfg.clone(), env.env.block.clone(), tx_env), diff --git a/tests/tests/debug_api.rs b/tests/tests/debug_api.rs index c45f3282f..dd264796e 100644 --- a/tests/tests/debug_api.rs +++ b/tests/tests/debug_api.rs @@ -48,7 +48,7 @@ async fn test_raw_transaction(#[future] katana: Katana, _setup: ()) { let transaction = TransactionSigned::decode_2718(&mut rlp_bytes.unwrap().as_ref()).unwrap(); let signer = transaction.recover_signer().unwrap(); - let mut transaction = from_recovered_with_block_context::( + let mut transaction = from_recovered_with_block_context( TransactionSignedEcRecovered::from_signed_transaction(transaction, signer), TransactionInfo { hash: Some(tx.hash), @@ -57,6 +57,7 @@ async fn test_raw_transaction(#[future] katana: Katana, _setup: ()) { base_fee: header.base_fee_per_gas.map(Into::into), index: tx.transaction_index, }, + &reth_rpc::eth::EthTxBuilder {}, ); let res = reqwest_client @@ -84,7 +85,7 @@ async fn test_raw_transaction(#[future] katana: Katana, _setup: ()) { transaction.gas_price = rpc_transaction.gas_price; } - assert_eq!(transaction, WithOtherFields::new(rpc_transaction)); + assert_eq!(transaction, rpc_transaction); drop(server_handle); } @@ -157,7 +158,7 @@ async fn test_raw_transactions(#[future] katana: Katana, _setup: ()) { // Convert the transaction to a primitives transactions and encode it. let rlp_bytes = TransactionSigned::from_transaction_and_signature( tx.try_into().unwrap(), - reth_primitives::Signature::from_rs_and_parity( + alloy_primitives::Signature::from_rs_and_parity( signature.r, signature.s, signature.y_parity.map_or(false, |v| v.0), @@ -240,7 +241,7 @@ async fn test_raw_receipts(#[future] katana: Katana, _setup: ()) { let tx_receipt = eth_provider.transaction_receipt(receipt.transaction_hash).await.unwrap().unwrap(); // Construct a Receipt instance from the transaction receipt data. - let r = ReceiptWithBloom { + let r: Bytes = ReceiptWithBloom { receipt: Receipt { tx_type: Into::::into(tx_receipt.transaction_type()).try_into().unwrap(), success: tx_receipt.inner.status(), @@ -255,7 +256,8 @@ async fn test_raw_receipts(#[future] katana: Katana, _setup: ()) { }, bloom: *receipt.inner.inner.logs_bloom(), } - .envelope_encoded(); + .encoded_2718() + .into(); // Assert the equality of the constructed receipt with the corresponding receipt from both block hash and block number. assert_eq!(rlp_bytes_by_block_number[i], r); diff --git a/tests/tests/eth_provider.rs b/tests/tests/eth_provider.rs index 757dd2df4..2a150b656 100644 --- a/tests/tests/eth_provider.rs +++ b/tests/tests/eth_provider.rs @@ -2,8 +2,8 @@ #![cfg(feature = "testing")] use crate::tests::mempool::create_sample_transactions; use alloy_consensus::{TxEip1559, TxLegacy}; -use alloy_eips::eip2718::Encodable2718; -use alloy_primitives::{address, bytes, Address, Bytes, TxKind, B256, U256, U64}; +use alloy_eips::{eip2718::Encodable2718, BlockNumberOrTag}; +use alloy_primitives::{address, bytes, Address, Bytes, Signature, TxKind, B256, U256, U64}; use alloy_rpc_types::{ request::TransactionInput, serde_helpers::JsonStorageKey, @@ -37,7 +37,7 @@ use kakarot_rpc::{ }, }; use rand::Rng; -use reth_primitives::{sign_message, transaction::Signature, BlockNumberOrTag, Transaction, TransactionSigned}; +use reth_primitives::{sign_message, Transaction, TransactionSigned}; use reth_transaction_pool::{TransactionOrigin, TransactionPool}; use rstest::*; use starknet::{ diff --git a/tests/tests/trace_api.rs b/tests/tests/trace_api.rs index 67cdf064b..2f32fa08f 100644 --- a/tests/tests/trace_api.rs +++ b/tests/tests/trace_api.rs @@ -1,6 +1,8 @@ #![allow(clippy::used_underscore_binding)] #![cfg(feature = "testing")] +use alloy_consensus::Transaction; use alloy_dyn_abi::DynSolValue; +use alloy_eips::BlockId; use alloy_primitives::{Address, TxKind, B256, U256}; use alloy_rpc_types::{request::TransactionInput, TransactionRequest}; use alloy_rpc_types_trace::geth::{ @@ -19,7 +21,6 @@ use kakarot_rpc::{ rpc::{start_kakarot_rpc_server, RawRpcParamsBuilder}, }, }; -use reth_primitives::BlockId; use rstest::*; use serde_json::Value; use starknet::{core::types::MaybePendingBlockWithTxHashes, providers::Provider}; diff --git a/tests/tests/tracer.rs b/tests/tests/tracer.rs index 8bf8b8db9..f0b4f3049 100644 --- a/tests/tests/tracer.rs +++ b/tests/tests/tracer.rs @@ -1,5 +1,6 @@ #![allow(clippy::used_underscore_binding)] #![cfg(feature = "testing")] +use alloy_consensus::Transaction; use alloy_dyn_abi::DynSolValue; use alloy_primitives::{Address, Bytes, B256, B64, U256}; use alloy_rpc_types_trace::{ diff --git a/tests/tests/txpool_api.rs b/tests/tests/txpool_api.rs index ceba43d9a..b1cb2a46e 100644 --- a/tests/tests/txpool_api.rs +++ b/tests/tests/txpool_api.rs @@ -1,6 +1,7 @@ #![allow(clippy::used_underscore_binding)] #![cfg(feature = "testing")] use crate::tests::mempool::create_sample_transactions; +use alloy_consensus::Transaction; use alloy_rpc_types_txpool::{TxpoolContent, TxpoolContentFrom, TxpoolInspect, TxpoolInspectSummary, TxpoolStatus}; use jsonrpsee::server::ServerHandle; use kakarot_rpc::{