diff --git a/.gitignore b/.gitignore index 1876805..709f248 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ node_modules *.log profile.json.gz -workdir +workdir* !/schema.json !/dev-genesis.json diff --git a/Cargo.lock b/Cargo.lock index 91f6899..b91f302 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,15 +67,16 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6cfe35f100bc496007c9a00f90b88bdf565f1421d4c707c9f07e0717e2aaad" +checksum = "6e7cdea683d79fab6c208182ba702ea37b9f7422f3de80044d79a210b884c8ca" dependencies = [ "alloy-consensus", "alloy-contract", "alloy-core", "alloy-eips", "alloy-genesis", + "alloy-json-rpc", "alloy-network", "alloy-provider", "alloy-pubsub", @@ -104,9 +105,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59094911f05dbff1cf5b29046a00ef26452eccc8d47136d50a47c0cf22f00c85" +checksum = "f7ea09cffa9ad82f6404e6ab415ea0c41a7674c0f2e2e689cb8683f772b5940d" dependencies = [ "alloy-eips", "alloy-primitives", @@ -115,6 +116,7 @@ dependencies = [ "alloy-trie", "alloy-tx-macros", "auto_impl", + "borsh", "c-kzg", "derive_more 2.0.1", "either", @@ -130,9 +132,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903cb8f728107ca27c816546f15be38c688df3c381d7bd1a4a9f215effc1ddb4" +checksum = "8aafa1f0ddb5cbb6cba6b10e8fa6e31f8c5d5c22e262b30a5d2fa9d336c3b637" dependencies = [ "alloy-consensus", "alloy-eips", @@ -144,9 +146,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03df5cb3b428ac96b386ad64c11d5c6e87a5505682cf1fbd6f8f773e9eda04f6" +checksum = "398c81368b864fdea950071a00b298c22b21506fed1ed8abc7f2902727f987f1" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -167,9 +169,9 @@ dependencies = [ [[package]] name = "alloy-core" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad31216895d27d307369daa1393f5850b50bbbd372478a9fa951c095c210627e" +checksum = "9d4087016b0896051dd3d03e0bedda2f4d4d1689af8addc8450288c63a9e5f68" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -180,9 +182,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b95b3deca680efc7e9cba781f1a1db352fa1ea50e6384a514944dcf4419e652" +checksum = "369f5707b958927176265e8a58627fc6195e5dfa5c55689396e68b241b3a72e6" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -209,32 +211,35 @@ dependencies = [ [[package]] name = "alloy-eip2930" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd" +checksum = "9441120fa82df73e8959ae0e4ab8ade03de2aaae61be313fbf5746277847ce25" dependencies = [ "alloy-primitives", "alloy-rlp", + "borsh", "serde", ] [[package]] name = "alloy-eip7702" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16" +checksum = "2919c5a56a1007492da313e7a3b6d45ef5edc5d33416fdec63c0d7a2702a0d20" dependencies = [ "alloy-primitives", "alloy-rlp", + "borsh", + "k256", "serde", "thiserror 2.0.12", ] [[package]] name = "alloy-eips" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac7f1c9a1ccc7f3e03c36976455751a6166a4f0d2d2c530c3f87dfe7d0cdc836" +checksum = "691fed81bbafefae0f5a6cedd837ebb3fade46e7d91c5b67a463af12ecf5b11a" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -243,6 +248,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "auto_impl", + "borsh", "c-kzg", "derive_more 2.0.1", "either", @@ -254,23 +260,24 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1421f6c9d15e5b86afbfe5865ca84dea3b9f77173a0963c1a2ee4e626320ada9" +checksum = "bf91e325928dfffe90c769c2c758cc6e9ba35331c6e984310fe8276548df4a9e" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-serde", "alloy-trie", + "borsh", "serde", "serde_with", ] [[package]] name = "alloy-json-abi" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15516116086325c157c18261d768a20677f0f699348000ed391d4ad0dcb82530" +checksum = "84e3cf01219c966f95a460c95f1d4c30e12f6c18150c21a30b768af2a2a29142" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -280,9 +287,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f763621707fa09cece30b73ecc607eb43fd7a72451fe3b46f645b905086926" +checksum = "8618cd8431d82d21ed98c300b6072f73fe925dff73b548aa2d4573b5a8d3ca91" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -295,9 +302,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f59a869fa4b4c3a7f08b1c8cb79aec61c29febe6e24a24fe0fcfded8a9b5703" +checksum = "390641d0e7e51d5d39b905be654ef391a89d62b9e6d3a74fd931b4df26daae20" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -321,9 +328,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e9374c667c95c41177602ebe6f6a2edd455193844f011d973d374b65501b38" +checksum = "9badd9de9f310f0c17602c642c043eee40033c0651f45809189e411f6b166e0f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -334,18 +341,18 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6177ed26655d4e84e00b65cb494d4e0b8830e7cae7ef5d63087d445a2600fb55" +checksum = "f6a0fb18dd5fb43ec5f0f6a20be1ce0287c79825827de5744afaa6c957737c33" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", "derive_more 2.0.1", - "foldhash", + "foldhash 0.2.0", "getrandom 0.3.3", - "hashbrown 0.15.3", + "hashbrown 0.16.1", "indexmap 2.10.0", "itoa", "k256", @@ -353,6 +360,7 @@ dependencies = [ "paste", "proptest", "rand 0.9.2", + "rapidhash", "ruint", "rustc-hash", "serde", @@ -362,9 +370,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77818b7348bd5486491a5297579dbfe5f706a81f8e1f5976393025f1e22a7c7d" +checksum = "3b7dcf6452993e31ea728b9fc316ebe4e4e3a820c094f2aad55646041ee812a0" dependencies = [ "alloy-chains", "alloy-consensus", @@ -375,9 +383,11 @@ dependencies = [ "alloy-primitives", "alloy-pubsub", "alloy-rpc-client", + "alloy-rpc-types-anvil", "alloy-rpc-types-debug", "alloy-rpc-types-eth", "alloy-rpc-types-trace", + "alloy-rpc-types-txpool", "alloy-signer", "alloy-sol-types", "alloy-transport", @@ -391,7 +401,7 @@ dependencies = [ "either", "futures", "futures-utils-wasm", - "lru 0.13.0", + "lru 0.16.3", "parking_lot", "pin-project", "reqwest", @@ -406,9 +416,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249b45103a66c9ad60ad8176b076106d03a2399a37f0ee7b0e03692e6b354cb9" +checksum = "040dabce173e246b9522cf189db8e383c811b89cf6bd07a6ab952ec3b822a1e6" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -450,9 +460,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2430d5623e428dd012c6c2156ae40b7fe638d6fca255e3244e0fba51fa698e93" +checksum = "ce4a28b1302733f565a2900a0d7cb3db94ffd1dd58ad7ebf5b0ec302e868ed1e" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -476,23 +486,38 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e131624d08a25cfc40557041e7dc42e1182fa1153e7592d120f769a1edce56" +checksum = "1408505e2a41c71f7b3f83ee52e5ecd0f2a6f2db98046d0a4defb9f85a007a9e" dependencies = [ "alloy-primitives", + "alloy-rpc-types-anvil", "alloy-rpc-types-debug", + "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-rpc-types-trace", + "alloy-rpc-types-txpool", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-rpc-types-anvil" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456a35438dc5631320a747466a0366bf21b03494fc2e33ac903c128504a68edf" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", "alloy-serde", "serde", ] [[package]] name = "alloy-rpc-types-any" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07429a1099cd17227abcddb91b5e38c960aaeb02a6967467f5bb561fbe716ac6" +checksum = "6792425a4a8e74be38e8785f90f497f8f325188f40f13c168a220310fd421d12" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -501,9 +526,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeff305b7d10cc1c888456d023e7bb8a5ea82e9e42b951e37619b88cc1a1486d" +checksum = "f72b891c28aa7376f7e4468c40d2bdcc1013ab47ceae57a2696e78b0cd1e8341" dependencies = [ "alloy-primitives", "derive_more 2.0.1", @@ -512,10 +537,27 @@ dependencies = [ ] [[package]] -name = "alloy-rpc-types-eth" -version = "1.0.37" +name = "alloy-rpc-types-engine" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db46b0901ee16bbb68d986003c66dcb74a12f9d9b3c44f8e85d51974f2458f0f" +checksum = "c7bcd9ead89076095806364327a1b18c2215998b6fff5a45f82c658bfbabf2df" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "derive_more 2.0.1", + "rand 0.8.5", + "serde", + "strum", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b505d6223c88023fb1217ac24eab950e4368f6634405bea3977d34cae6935b" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -534,9 +576,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f10620724bd45f80c79668a8cdbacb6974f860686998abce28f6196ae79444" +checksum = "4ca8db59fa69da9da5bb6b75823c2b07c27b0f626a0f3af72bac32a7c361a418" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -547,10 +589,22 @@ dependencies = [ ] [[package]] -name = "alloy-serde" -version = "1.0.37" +name = "alloy-rpc-types-txpool" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5413814be7a22fbc81e0f04a2401fcc3eb25e56fd53b04683e8acecc6e1fe01b" +checksum = "e14194567368b8c8b7aeef470831bbe90cc8b12ef5f48b18acdda9cf20070ff1" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-serde" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75a755a3cc0297683c2879bbfe2ff22778f35068f07444f0b52b5b87570142b6" dependencies = [ "alloy-primitives", "serde", @@ -559,9 +613,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53410a18a61916e2c073a6519499514e027b01e77eeaf96acd1df7cf96ef6bb2" +checksum = "9d73afcd1fb2d851bf4ba67504a951b73231596f819cc814f50d11126db7ac1b" dependencies = [ "alloy-primitives", "async-trait", @@ -574,9 +628,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6006c4cbfa5d08cadec1fcabea6cb56dc585a30a9fce40bcf81e307d6a71c8e" +checksum = "807b043936012acc788c96cba06b8580609d124bb105dc470a1617051cc4aa63" dependencies = [ "alloy-consensus", "alloy-network", @@ -590,9 +644,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a14f21d053aea4c6630687c2f4ad614bed4c81e14737a9b904798b24f30ea849" +checksum = "09eb18ce0df92b4277291bbaa0ed70545d78b02948df756bbd3d6214bf39a218" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -604,9 +658,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d99282e7c9ef14eb62727981a985a01869e586d1dec729d3bb33679094c100" +checksum = "95d9fa2daf21f59aa546d549943f10b5cce1ae59986774019fbedae834ffe01b" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", @@ -623,9 +677,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda029f955b78e493360ee1d7bd11e1ab9f2a220a5715449babc79d6d0a01105" +checksum = "9396007fe69c26ee118a19f4dee1f5d1d6be186ea75b3881adf16d87f8444686" dependencies = [ "alloy-json-abi", "const-hex", @@ -641,9 +695,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10db1bd7baa35bc8d4a1b07efbf734e73e5ba09f2580fb8cee3483a36087ceb2" +checksum = "af67a0b0dcebe14244fc92002cd8d96ecbf65db4639d479f5fcd5805755a4c27" dependencies = [ "serde", "winnow", @@ -651,9 +705,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58377025a47d8b8426b3e4846a251f2c1991033b27f517aade368146f6ab1dfe" +checksum = "09aeea64f09a7483bdcd4193634c7e5cf9fd7775ee767585270cd8ce2d69dc95" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -663,12 +717,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94ee404368a3d9910dfe61b203e888c6b0e151a50e147f95da8baff9f9c7763" +checksum = "9b84a605484a03959436e5bea194e6d62f77c3caef750196b4b4f1c8d23254df" dependencies = [ "alloy-json-rpc", - "alloy-primitives", "auto_impl", "base64 0.22.1", "derive_more 2.0.1", @@ -687,9 +740,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f8a6338d594f6c6481292215ee8f2fd7b986c80aba23f3f44e761a8658de78" +checksum = "1a400ad5b73590a099111481d4a66a2ca1266ebc85972a844958caf42bfdd37d" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -702,9 +755,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17a37a8ca18006fa0a58c7489645619ff58cfa073f2b29c4e052c9bd114b123a" +checksum = "74adc2ef0cb8c2cad4de2044afec2d4028061bc016148a251704dc204f259477" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -722,15 +775,14 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "679b0122b7bca9d4dc5eb2c0549677a3c53153f6e232f23f4b3ba5575f74ebde" +checksum = "c2c1672b97fef0057f3ca268507fb4f1bc59497531603f39ccaf47cc1e5b9cb4" dependencies = [ "alloy-pubsub", "alloy-transport", "futures", "http 1.3.1", - "rustls 0.23.27", "serde_json", "tokio", "tokio-tungstenite 0.26.2", @@ -740,9 +792,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bada1fc392a33665de0dc50d401a3701b62583c655e3522a323490a5da016962" +checksum = "428aa0f0e0658ff091f8f667c406e034b431cb10abd39de4f507520968acc499" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -756,11 +808,10 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.37" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64c09ec565a90ed8390d82aa08cd3b22e492321b96cb4a3d4f58414683c9e2f" +checksum = "f17272de4df6b8b59889b264f0306eba47a69f23f57f1c08f1366a4617b48c30" dependencies = [ - "alloy-primitives", "darling 0.21.3", "proc-macro2", "quote", @@ -1726,6 +1777,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "borsh" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "bounded-collections" version = "0.2.4" @@ -2839,6 +2913,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3265,10 +3345,23 @@ checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", "serde", ] +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", + "serde", + "serde_core", +] + [[package]] name = "heck" version = "0.5.0" @@ -3506,6 +3599,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.2", "tower-service", + "webpki-roots 1.0.2", ] [[package]] @@ -4428,13 +4522,19 @@ dependencies = [ [[package]] name = "lru" -version = "0.13.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" +checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" dependencies = [ - "hashbrown 0.15.3", + "hashbrown 0.16.1", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "macro-string" version = "0.1.4" @@ -5325,6 +5425,61 @@ dependencies = [ "byteorder", ] +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.27", + "socket2 0.6.0", + "thiserror 2.0.12", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.3", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash", + "rustls 0.23.27", + "rustls-pki-types", + "slab", + "thiserror 2.0.12", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.6.0", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.40" @@ -5417,6 +5572,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rapidhash" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8b5b858a440a0bc02625b62dd95131b9201aa9f69f411195dd4a7cfb1de3d7" +dependencies = [ + "rand 0.9.2", + "rustversion", +] + [[package]] name = "rayon" version = "1.10.0" @@ -5554,6 +5719,8 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", + "rustls 0.23.27", "rustls-pki-types", "serde", "serde_json", @@ -5561,6 +5728,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", + "tokio-rustls 0.26.2", "tower 0.5.2", "tower-http 0.6.4", "tower-service", @@ -5568,6 +5736,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots 1.0.2", ] [[package]] @@ -5595,7 +5764,6 @@ dependencies = [ "semver 1.0.26", "serde", "strum", - "tokio", ] [[package]] @@ -5806,13 +5974,14 @@ dependencies = [ [[package]] name = "ruint" -version = "1.15.0" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11256b5fe8c68f56ac6f39ef0720e592f33d2367a4782740d9c9142e889c7fb4" +checksum = "c141e807189ad38a07276942c6623032d3753c8859c146104ac2e4d68865945a" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", "ark-ff 0.4.2", + "ark-ff 0.5.0", "bytes", "fastrlp 0.3.1", "fastrlp 0.4.0", @@ -5826,7 +5995,7 @@ dependencies = [ "rand 0.9.2", "rlp", "ruint-macro", - "serde", + "serde_core", "valuable", "zeroize", ] @@ -5955,6 +6124,7 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ + "web-time", "zeroize", ] @@ -7738,9 +7908,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.2.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ac494e7266fcdd2ad80bf4375d55d27a117ea5c866c26d0e97fe5b3caeeb75" +checksum = "5f92d01b5de07eaf324f7fca61cc6bd3d82bbc1de5b6c963e6fe79e86f36580d" dependencies = [ "paste", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 9f602b7..dd251c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ revive-dt-node-pool = { version = "0.1.0", path = "crates/node-pool" } revive-dt-report = { version = "0.1.0", path = "crates/report" } revive-dt-solc-binaries = { version = "0.1.0", path = "crates/solc-binaries" } +alloy = { version = "1.4.1", features = ["full", "genesis", "json-rpc"] } ansi_term = "0.12.1" anyhow = "1.0" bson = { version = "2.15.0" } @@ -78,27 +79,6 @@ revive-differential = { git = "https://github.com/paritytech/revive", rev = "338 zombienet-sdk = { git = "https://github.com/paritytech/zombienet-sdk.git", rev = "891f6554354ce466abd496366dbf8b4f82141241" } -[workspace.dependencies.alloy] -version = "1.0.37" -default-features = false -features = [ - "json-abi", - "providers", - "provider-ws", - "provider-ipc", - "provider-http", - "provider-debug-api", - "reqwest", - "rpc-types", - "signer-local", - "std", - "network", - "serde", - "rpc-types-eth", - "genesis", - "sol-types", -] - [profile.bench] inherits = "release" lto = true diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index f637162..b2af42c 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -19,7 +19,6 @@ semver = { workspace = true } serde = { workspace = true } schemars = { workspace = true } strum = { workspace = true } -tokio = { workspace = true, default-features = false, features = ["time"] } [lints] workspace = true diff --git a/crates/common/src/futures/mod.rs b/crates/common/src/futures/mod.rs deleted file mode 100644 index 17a83b2..0000000 --- a/crates/common/src/futures/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -mod poll; - -pub use poll::*; diff --git a/crates/common/src/futures/poll.rs b/crates/common/src/futures/poll.rs deleted file mode 100644 index 8551cb7..0000000 --- a/crates/common/src/futures/poll.rs +++ /dev/null @@ -1,72 +0,0 @@ -use std::ops::ControlFlow; -use std::time::Duration; - -use anyhow::{Context as _, Result, anyhow}; - -const EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION: Duration = Duration::from_secs(60); - -/// A function that polls for a fallible future for some period of time and errors if it fails to -/// get a result after polling. -/// -/// Given a future that returns a [`Result>`], this function calls the future -/// repeatedly (with some wait period) until the future returns a [`ControlFlow::Break`] or until it -/// returns an [`Err`] in which case the function stops polling and returns the error. -/// -/// If the future keeps returning [`ControlFlow::Continue`] and fails to return a [`Break`] within -/// the permitted polling duration then this function returns an [`Err`] -/// -/// [`Break`]: ControlFlow::Break -/// [`Continue`]: ControlFlow::Continue -pub async fn poll( - polling_duration: Duration, - polling_wait_behavior: PollingWaitBehavior, - mut future: impl FnMut() -> F, -) -> Result -where - F: Future>>, -{ - let mut retries = 0; - let mut total_wait_duration = Duration::ZERO; - let max_allowed_wait_duration = polling_duration; - - loop { - if total_wait_duration >= max_allowed_wait_duration { - break Err(anyhow!( - "Polling failed after {} retries and a total of {:?} of wait time", - retries, - total_wait_duration - )); - } - - match future() - .await - .context("Polled future returned an error during polling loop")? - { - ControlFlow::Continue(()) => { - let next_wait_duration = match polling_wait_behavior { - PollingWaitBehavior::Constant(duration) => duration, - PollingWaitBehavior::ExponentialBackoff => { - Duration::from_secs(2u64.pow(retries)) - .min(EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION) - } - }; - let next_wait_duration = - next_wait_duration.min(max_allowed_wait_duration - total_wait_duration); - total_wait_duration += next_wait_duration; - retries += 1; - - tokio::time::sleep(next_wait_duration).await; - } - ControlFlow::Break(output) => { - break Ok(output); - } - } - } -} - -#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] -pub enum PollingWaitBehavior { - Constant(Duration), - #[default] - ExponentialBackoff, -} diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs index 60d360c..6572874 100644 --- a/crates/common/src/lib.rs +++ b/crates/common/src/lib.rs @@ -3,7 +3,6 @@ pub mod cached_fs; pub mod fs; -pub mod futures; pub mod iterators; pub mod macros; pub mod types; diff --git a/crates/core/src/differential_tests/driver.rs b/crates/core/src/differential_tests/driver.rs index d7fdcef..20493e9 100644 --- a/crates/core/src/differential_tests/driver.rs +++ b/crates/core/src/differential_tests/driver.rs @@ -409,7 +409,6 @@ where .handle_function_call_execution(step, deployment_receipts) .await .context("Failed to handle the function call execution")?; - tracing::Span::current().record("block_number", execution_receipt.block_number); let tracing_result = self .handle_function_call_call_frame_tracing(execution_receipt.transaction_hash) .await diff --git a/crates/node/src/node_implementations/geth.rs b/crates/node/src/node_implementations/geth.rs index fbf2433..fd0efef 100644 --- a/crates/node/src/node_implementations/geth.rs +++ b/crates/node/src/node_implementations/geth.rs @@ -3,7 +3,6 @@ use std::{ fs::{File, create_dir_all, remove_dir_all}, io::Read, - ops::ControlFlow, path::PathBuf, pin::Pin, process::{Command, Stdio}, @@ -35,12 +34,9 @@ use anyhow::Context as _; use futures::{FutureExt, Stream, StreamExt}; use revive_common::EVMVersion; use tokio::sync::OnceCell; -use tracing::{Instrument, error, instrument}; +use tracing::{error, instrument}; -use revive_dt_common::{ - fs::clear_directory, - futures::{PollingWaitBehavior, poll}, -}; +use revive_dt_common::fs::clear_directory; use revive_dt_config::*; use revive_dt_format::traits::ResolverApi; use revive_dt_node_interaction::EthereumNode; @@ -90,12 +86,6 @@ impl GethNode { const READY_MARKER: &str = "IPC endpoint opened"; const ERROR_MARKER: &str = "Fatal:"; - const TRANSACTION_INDEXING_ERROR: &str = "transaction indexing is in progress"; - const TRANSACTION_TRACING_ERROR: &str = "historical state not available in path scheme yet"; - - const RECEIPT_POLLING_DURATION: Duration = Duration::from_secs(5 * 60); - const TRACE_POLLING_DURATION: Duration = Duration::from_secs(60); - pub fn new( context: impl AsRef + AsRef @@ -341,62 +331,15 @@ impl EthereumNode for GethNode { transaction: TransactionRequest, ) -> Pin> + '_>> { Box::pin(async move { - let provider = self - .provider() + self.provider() .await - .context("Failed to create provider for transaction submission")?; - - let pending_transaction = provider + .context("Failed to create provider for transaction submission")? .send_transaction(transaction) .await - .inspect_err( - |err| error!(%err, "Encountered an error when submitting the transaction"), - ) - .context("Failed to submit transaction to geth node")?; - let transaction_hash = *pending_transaction.tx_hash(); - - // The following is a fix for the "transaction indexing is in progress" error that we used - // to get. You can find more information on this in the following GH issue in geth - // https://github.com/ethereum/go-ethereum/issues/28877. To summarize what's going on, - // before we can get the receipt of the transaction it needs to have been indexed by the - // node's indexer. Just because the transaction has been confirmed it doesn't mean that it - // has been indexed. When we call alloy's `get_receipt` it checks if the transaction was - // confirmed. If it has been, then it will call `eth_getTransactionReceipt` method which - // _might_ return the above error if the tx has not yet been indexed yet. So, we need to - // implement a retry mechanism for the receipt to keep retrying to get it until it - // eventually works, but we only do that if the error we get back is the "transaction - // indexing is in progress" error or if the receipt is None. - // - // Getting the transaction indexed and taking a receipt can take a long time especially when - // a lot of transactions are being submitted to the node. Thus, while initially we only - // allowed for 60 seconds of waiting with a 1 second delay in polling, we need to allow for - // a larger wait time. Therefore, in here we allow for 5 minutes of waiting with exponential - // backoff each time we attempt to get the receipt and find that it's not available. - poll( - Self::RECEIPT_POLLING_DURATION, - PollingWaitBehavior::Constant(Duration::from_millis(200)), - move || { - let provider = provider.clone(); - async move { - match provider.get_transaction_receipt(transaction_hash).await { - Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)), - Ok(None) => Ok(ControlFlow::Continue(())), - Err(error) => { - let error_string = error.to_string(); - match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) { - true => Ok(ControlFlow::Continue(())), - false => Err(error.into()), - } - } - } - } - }, - ) - .instrument(tracing::info_span!( - "Awaiting transaction receipt", - ?transaction_hash - )) - .await + .context("Encountered an error when submitting a transaction")? + .get_receipt() + .await + .context("Failed to get the receipt for the transaction") }) } @@ -407,34 +350,12 @@ impl EthereumNode for GethNode { trace_options: GethDebugTracingOptions, ) -> Pin> + '_>> { Box::pin(async move { - let provider = self - .provider() + self.provider() .await - .context("Failed to create provider for tracing")?; - poll( - Self::TRACE_POLLING_DURATION, - PollingWaitBehavior::Constant(Duration::from_millis(200)), - move || { - let provider = provider.clone(); - let trace_options = trace_options.clone(); - async move { - match provider - .debug_trace_transaction(tx_hash, trace_options) - .await - { - Ok(trace) => Ok(ControlFlow::Break(trace)), - Err(error) => { - let error_string = error.to_string(); - match error_string.contains(Self::TRANSACTION_TRACING_ERROR) { - true => Ok(ControlFlow::Continue(())), - false => Err(error.into()), - } - } - } - } - }, - ) - .await + .context("Failed to create provider for tracing")? + .debug_trace_transaction(tx_hash, trace_options) + .await + .context("Failed to get the transaction trace") }) } diff --git a/crates/node/src/node_implementations/lighthouse_geth.rs b/crates/node/src/node_implementations/lighthouse_geth.rs index b59bd4a..b213045 100644 --- a/crates/node/src/node_implementations/lighthouse_geth.rs +++ b/crates/node/src/node_implementations/lighthouse_geth.rs @@ -12,7 +12,6 @@ use std::{ collections::{BTreeMap, HashSet}, fs::{File, create_dir_all}, io::Read, - ops::ControlFlow, path::PathBuf, pin::Pin, process::{Command, Stdio}, @@ -48,12 +47,9 @@ use revive_common::EVMVersion; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde_with::serde_as; use tokio::sync::OnceCell; -use tracing::{Instrument, info, instrument}; +use tracing::{info, instrument}; -use revive_dt_common::{ - fs::clear_directory, - futures::{PollingWaitBehavior, poll}, -}; +use revive_dt_common::fs::clear_directory; use revive_dt_config::*; use revive_dt_format::traits::ResolverApi; use revive_dt_node_interaction::EthereumNode; @@ -116,12 +112,6 @@ impl LighthouseGethNode { const CONFIG_FILE_NAME: &str = "config.yaml"; - const TRANSACTION_INDEXING_ERROR: &str = "transaction indexing is in progress"; - const TRANSACTION_TRACING_ERROR: &str = "historical state not available in path scheme yet"; - - const RECEIPT_POLLING_DURATION: Duration = Duration::from_secs(5 * 60); - const TRACE_POLLING_DURATION: Duration = Duration::from_secs(60); - const VALIDATOR_MNEMONIC: &str = "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete"; pub fn new( @@ -481,73 +471,6 @@ impl LighthouseGethNode { Ok(()) } - fn internal_execute_transaction<'a>( - transaction: TransactionRequest, - provider: FillProvider< - impl TxFiller + 'a, - impl Provider + Clone + 'a, - Ethereum, - >, - ) -> Pin> + 'a>> { - Box::pin(async move { - let pending_transaction = provider - .send_transaction(transaction) - .await - .inspect_err(|err| { - tracing::error!( - %err, - "Encountered an error when submitting the transaction" - ) - }) - .context("Failed to submit transaction to geth node")?; - let transaction_hash = *pending_transaction.tx_hash(); - - // The following is a fix for the "transaction indexing is in progress" error that we - // used to get. You can find more information on this in the following GH issue in geth - // https://github.com/ethereum/go-ethereum/issues/28877. To summarize what's going on, - // before we can get the receipt of the transaction it needs to have been indexed by the - // node's indexer. Just because the transaction has been confirmed it doesn't mean that - // it has been indexed. When we call alloy's `get_receipt` it checks if the transaction - // was confirmed. If it has been, then it will call `eth_getTransactionReceipt` method - // which _might_ return the above error if the tx has not yet been indexed yet. So, we - // need to implement a retry mechanism for the receipt to keep retrying to get it until - // it eventually works, but we only do that if the error we get back is the "transaction - // indexing is in progress" error or if the receipt is None. - // - // Getting the transaction indexed and taking a receipt can take a long time especially - // when a lot of transactions are being submitted to the node. Thus, while initially we - // only allowed for 60 seconds of waiting with a 1 second delay in polling, we need to - // allow for a larger wait time. Therefore, in here we allow for 5 minutes of waiting - // with exponential backoff each time we attempt to get the receipt and find that it's - // not available. - poll( - Self::RECEIPT_POLLING_DURATION, - PollingWaitBehavior::Constant(Duration::from_millis(500)), - move || { - let provider = provider.clone(); - async move { - match provider.get_transaction_receipt(transaction_hash).await { - Ok(Some(receipt)) => Ok(ControlFlow::Break(receipt)), - Ok(None) => Ok(ControlFlow::Continue(())), - Err(error) => { - let error_string = error.to_string(); - match error_string.contains(Self::TRANSACTION_INDEXING_ERROR) { - true => Ok(ControlFlow::Continue(())), - false => Err(error.into()), - } - } - } - } - }, - ) - .instrument(tracing::info_span!( - "Awaiting transaction receipt", - ?transaction_hash - )) - .await - }) - } - pub fn node_genesis(mut genesis: Genesis, wallet: &EthereumWallet) -> Genesis { for signer_address in NetworkWallet::::signer_addresses(&wallet) { genesis @@ -626,11 +549,15 @@ impl EthereumNode for LighthouseGethNode { transaction: TransactionRequest, ) -> Pin> + '_>> { Box::pin(async move { - let provider = self - .http_provider() + self.provider() .await - .context("Failed to create provider for transaction execution")?; - Self::internal_execute_transaction(transaction, provider).await + .context("Failed to create provider for transaction submission")? + .send_transaction(transaction) + .await + .context("Encountered an error when submitting a transaction")? + .get_receipt() + .await + .context("Failed to get the receipt for the transaction") }) } @@ -641,35 +568,12 @@ impl EthereumNode for LighthouseGethNode { trace_options: GethDebugTracingOptions, ) -> Pin> + '_>> { Box::pin(async move { - let provider = Arc::new( - self.http_provider() - .await - .context("Failed to create provider for tracing")?, - ); - poll( - Self::TRACE_POLLING_DURATION, - PollingWaitBehavior::Constant(Duration::from_millis(200)), - move || { - let provider = provider.clone(); - let trace_options = trace_options.clone(); - async move { - match provider - .debug_trace_transaction(tx_hash, trace_options) - .await - { - Ok(trace) => Ok(ControlFlow::Break(trace)), - Err(error) => { - let error_string = error.to_string(); - match error_string.contains(Self::TRANSACTION_TRACING_ERROR) { - true => Ok(ControlFlow::Continue(())), - false => Err(error.into()), - } - } - } - } - }, - ) - .await + self.provider() + .await + .context("Failed to create provider for tracing")? + .debug_trace_transaction(tx_hash, trace_options) + .await + .context("Failed to get the transaction trace") }) } diff --git a/crates/node/src/node_implementations/polkadot_omni_node.rs b/crates/node/src/node_implementations/polkadot_omni_node.rs index def6e2e..e3a17e3 100644 --- a/crates/node/src/node_implementations/polkadot_omni_node.rs +++ b/crates/node/src/node_implementations/polkadot_omni_node.rs @@ -50,10 +50,7 @@ use crate::{ Node, constants::INITIAL_BALANCE, helpers::{Process, ProcessReadinessWaitBehavior}, - provider_utils::{ - ConcreteProvider, FallbackGasFiller, construct_concurrency_limited_provider, - execute_transaction, - }, + provider_utils::{ConcreteProvider, FallbackGasFiller, construct_concurrency_limited_provider}, }; static NODE_COUNT: AtomicU32 = AtomicU32::new(0); @@ -464,11 +461,15 @@ impl EthereumNode for PolkadotOmnichainNode { transaction: TransactionRequest, ) -> Pin> + '_>> { Box::pin(async move { - let provider = self - .provider() + self.provider() .await - .context("Failed to create the provider")?; - execute_transaction(provider, transaction).await + .context("Failed to create provider for transaction submission")? + .send_transaction(transaction) + .await + .context("Encountered an error when submitting a transaction")? + .get_receipt() + .await + .context("Failed to get the receipt for the transaction") }) } diff --git a/crates/node/src/node_implementations/substrate.rs b/crates/node/src/node_implementations/substrate.rs index f29a706..a25ea80 100644 --- a/crates/node/src/node_implementations/substrate.rs +++ b/crates/node/src/node_implementations/substrate.rs @@ -49,10 +49,7 @@ use crate::{ Node, constants::INITIAL_BALANCE, helpers::{Process, ProcessReadinessWaitBehavior}, - provider_utils::{ - ConcreteProvider, FallbackGasFiller, construct_concurrency_limited_provider, - execute_transaction, - }, + provider_utils::{ConcreteProvider, FallbackGasFiller, construct_concurrency_limited_provider}, }; static NODE_COUNT: AtomicU32 = AtomicU32::new(0); @@ -434,11 +431,15 @@ impl EthereumNode for SubstrateNode { transaction: TransactionRequest, ) -> Pin> + '_>> { Box::pin(async move { - let provider = self - .provider() + self.provider() .await - .context("Failed to create the provider")?; - execute_transaction(provider, transaction).await + .context("Failed to create provider for transaction submission")? + .send_transaction(transaction) + .await + .context("Encountered an error when submitting a transaction")? + .get_receipt() + .await + .context("Failed to get the receipt for the transaction") }) } diff --git a/crates/node/src/node_implementations/zombienet.rs b/crates/node/src/node_implementations/zombienet.rs index 3d1ed3e..ace8469 100644 --- a/crates/node/src/node_implementations/zombienet.rs +++ b/crates/node/src/node_implementations/zombienet.rs @@ -76,10 +76,7 @@ use crate::{ Node, constants::INITIAL_BALANCE, helpers::{Process, ProcessReadinessWaitBehavior}, - provider_utils::{ - ConcreteProvider, FallbackGasFiller, construct_concurrency_limited_provider, - execute_transaction, - }, + provider_utils::{ConcreteProvider, FallbackGasFiller, construct_concurrency_limited_provider}, }; static NODE_COUNT: AtomicU32 = AtomicU32::new(0); @@ -433,14 +430,18 @@ impl EthereumNode for ZombienetNode { fn execute_transaction( &self, - transaction: alloy::rpc::types::TransactionRequest, + transaction: TransactionRequest, ) -> Pin> + '_>> { Box::pin(async move { - let provider = self - .provider() + self.provider() .await - .context("Failed to create the provider")?; - execute_transaction(provider, transaction).await + .context("Failed to create provider for transaction submission")? + .send_transaction(transaction) + .await + .context("Encountered an error when submitting a transaction")? + .get_receipt() + .await + .context("Failed to get the receipt for the transaction") }) } diff --git a/crates/node/src/provider_utils/fallback_gas_filler.rs b/crates/node/src/provider_utils/fallback_gas_filler.rs index 39eb790..afe2e2e 100644 --- a/crates/node/src/provider_utils/fallback_gas_filler.rs +++ b/crates/node/src/provider_utils/fallback_gas_filler.rs @@ -1,5 +1,3 @@ -use std::{borrow::Cow, fmt::Display}; - use alloy::{ eips::BlockNumberOrTag, network::{Network, TransactionBuilder}, @@ -111,28 +109,23 @@ where }, state_overrides: Default::default(), block_overrides: Default::default(), + tx_index: Default::default(), }, ) .await? .try_into_call_frame() .map_err(|err| { - RpcError::LocalUsageError( - FallbackGasFillerError::new(format!( - "Expected a callframe trace, but got: {err:?}" - )) - .boxed(), + RpcError::local_usage_str( + format!("Expected a callframe trace, but got: {err:?}").as_str(), ) })?; let gas_used = u64::try_from(trace.gas_used).map_err(|_| { - RpcError::LocalUsageError( - FallbackGasFillerError::new( - "Transaction trace returned a value of gas used that exceeds u64", - ) - .boxed(), + RpcError::local_usage_str( + "Transaction trace returned a value of gas used that exceeds u64", ) })?; - let gas_limit = gas_used.saturating_mul(120) / 100; + let gas_limit = gas_used.saturating_mul(2); if let Some(gas_price) = tx.gas_price() { return Ok(GasFillable::Legacy { @@ -174,24 +167,3 @@ impl Default for FallbackGasFiller { Self::new() } } - -#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] -struct FallbackGasFillerError(Cow<'static, str>); - -impl FallbackGasFillerError { - pub fn new(string: impl Into>) -> Self { - Self(string.into()) - } - - pub fn boxed(self) -> Box { - Box::new(self) - } -} - -impl Display for FallbackGasFillerError { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - Display::fmt(&self.0, f) - } -} - -impl std::error::Error for FallbackGasFillerError {} diff --git a/crates/node/src/provider_utils/mod.rs b/crates/node/src/provider_utils/mod.rs index c556a71..2610d62 100644 --- a/crates/node/src/provider_utils/mod.rs +++ b/crates/node/src/provider_utils/mod.rs @@ -1,7 +1,9 @@ mod concurrency_limiter; mod fallback_gas_filler; mod provider; +mod receipt_retry_layer; pub use concurrency_limiter::*; pub use fallback_gas_filler::*; pub use provider::*; +pub use receipt_retry_layer::*; diff --git a/crates/node/src/provider_utils/provider.rs b/crates/node/src/provider_utils/provider.rs index f10b3b6..23e1c5e 100644 --- a/crates/node/src/provider_utils/provider.rs +++ b/crates/node/src/provider_utils/provider.rs @@ -1,18 +1,16 @@ -use std::{ops::ControlFlow, sync::LazyLock, time::Duration}; +use std::sync::LazyLock; use alloy::{ - network::{Ethereum, Network, NetworkWallet, TransactionBuilder4844}, + network::{Network, NetworkWallet, TransactionBuilder4844}, providers::{ - Identity, PendingTransactionBuilder, Provider, ProviderBuilder, RootProvider, + Identity, ProviderBuilder, RootProvider, fillers::{ChainIdFiller, FillProvider, JoinFill, NonceFiller, TxFiller, WalletFiller}, }, rpc::client::ClientBuilder, }; use anyhow::{Context, Result}; -use revive_dt_common::futures::{PollingWaitBehavior, poll}; -use tracing::{Instrument, debug, info, info_span}; -use crate::provider_utils::{ConcurrencyLimiterLayer, FallbackGasFiller}; +use crate::provider_utils::{ConcurrencyLimiterLayer, FallbackGasFiller, RetryLayer}; pub type ConcreteProvider = FillProvider< JoinFill< @@ -48,6 +46,7 @@ where let client = ClientBuilder::default() .layer(GLOBAL_CONCURRENCY_LIMITER_LAYER.clone()) + .layer(RetryLayer::default()) .connect(rpc_url) .await .context("Failed to construct the RPC client")?; @@ -63,70 +62,3 @@ where Ok(provider) } - -pub async fn execute_transaction( - provider: ConcreteProvider, - transaction: N::TransactionRequest, -) -> Result -where - N: Network< - TransactionRequest: TransactionBuilder4844, - TxEnvelope = ::TxEnvelope, - >, - W: NetworkWallet, - Identity: TxFiller, - FallbackGasFiller: TxFiller, - ChainIdFiller: TxFiller, - NonceFiller: TxFiller, - WalletFiller: TxFiller, -{ - let sendable_transaction = provider - .fill(transaction) - .await - .context("Failed to fill transaction")?; - - let transaction_envelope = sendable_transaction - .try_into_envelope() - .context("Failed to convert transaction into an envelope")?; - let tx_hash = *transaction_envelope.tx_hash(); - - let mut pending_transaction = match provider.send_tx_envelope(transaction_envelope).await { - Ok(pending_transaction) => pending_transaction, - Err(error) => { - let error_string = error.to_string(); - - if error_string.contains("Transaction Already Imported") { - PendingTransactionBuilder::::new(provider.root().clone(), tx_hash) - } else { - return Err(error).context(format!("Failed to submit transaction {tx_hash}")); - } - } - }; - debug!(%tx_hash, "Submitted Transaction"); - - pending_transaction.set_timeout(Some(Duration::from_secs(120))); - let tx_hash = pending_transaction.watch().await.context(format!( - "Transaction inclusion watching timeout for {tx_hash}" - ))?; - - poll( - Duration::from_secs(60), - PollingWaitBehavior::Constant(Duration::from_secs(3)), - || { - let provider = provider.clone(); - - async move { - match provider.get_transaction_receipt(tx_hash).await { - Ok(Some(receipt)) => { - info!("Found the transaction receipt"); - Ok(ControlFlow::Break(receipt)) - } - _ => Ok(ControlFlow::Continue(())), - } - } - }, - ) - .instrument(info_span!("Polling for receipt", %tx_hash)) - .await - .context(format!("Polling for receipt failed for {tx_hash}")) -} diff --git a/crates/node/src/provider_utils/receipt_retry_layer.rs b/crates/node/src/provider_utils/receipt_retry_layer.rs new file mode 100644 index 0000000..a751b87 --- /dev/null +++ b/crates/node/src/provider_utils/receipt_retry_layer.rs @@ -0,0 +1,158 @@ +use std::time::Duration; + +use alloy::{ + network::{AnyNetwork, Network}, + rpc::json_rpc::{RequestPacket, ResponsePacket}, + transports::{TransportError, TransportErrorKind, TransportFut}, +}; +use tokio::time::{interval, timeout}; +use tower::{Layer, Service}; + +/// A layer that allows for automatic retries for getting the receipt. +/// +/// There are certain cases where getting the receipt of a committed transaction might fail. In Geth +/// this can happen if the transaction has been committed to the ledger but has not been indexed, in +/// the substrate and revive stack it can also happen for other reasons. +/// +/// Therefore, just because the first attempt to get the receipt (after transaction confirmation) +/// has failed it doesn't mean that it will continue to fail. This layer can be added to any alloy +/// provider to allow the provider to retry getting the receipt for some period of time before it +/// considers that a timeout. It attempts to poll for the receipt for the `polling_duration` with an +/// interval of `polling_interval` between each poll. If by the end of the `polling_duration` it was +/// not able to get the receipt successfully then this is considered to be a timeout. +/// +/// Additionally, this layer allows for retries for other rpc methods such as all tracing methods. +#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] +pub struct RetryLayer { + /// The amount of time to keep polling for the receipt before considering it a timeout. + polling_duration: Duration, + + /// The interval of time to wait between each poll for the receipt. + polling_interval: Duration, +} + +impl RetryLayer { + pub fn new(polling_duration: Duration, polling_interval: Duration) -> Self { + Self { + polling_duration, + polling_interval, + } + } + + pub fn with_polling_duration(mut self, polling_duration: Duration) -> Self { + self.polling_duration = polling_duration; + self + } + + pub fn with_polling_interval(mut self, polling_interval: Duration) -> Self { + self.polling_interval = polling_interval; + self + } +} + +impl Default for RetryLayer { + fn default() -> Self { + Self { + polling_duration: Duration::from_secs(90), + polling_interval: Duration::from_millis(500), + } + } +} + +impl Layer for RetryLayer { + type Service = RetryService; + + fn layer(&self, inner: S) -> Self::Service { + RetryService { + service: inner, + polling_duration: self.polling_duration, + polling_interval: self.polling_interval, + } + } +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] +pub struct RetryService { + /// The internal service. + service: S, + + /// The amount of time to keep polling for the receipt before considering it a timeout. + polling_duration: Duration, + + /// The interval of time to wait between each poll for the receipt. + polling_interval: Duration, +} + +impl Service for RetryService +where + S: Service, Error = TransportError> + + Send + + 'static + + Clone, +{ + type Response = ResponsePacket; + type Error = TransportError; + type Future = TransportFut<'static>; + + fn poll_ready( + &mut self, + cx: &mut std::task::Context<'_>, + ) -> std::task::Poll> { + self.service.poll_ready(cx) + } + + #[allow(clippy::nonminimal_bool)] + fn call(&mut self, req: RequestPacket) -> Self::Future { + type ReceiptOutput = ::ReceiptResponse; + + let mut service = self.service.clone(); + let polling_interval = self.polling_interval; + let polling_duration = self.polling_duration; + + Box::pin(async move { + let request = req.as_single().ok_or_else(|| { + TransportErrorKind::custom_str("Retry layer doesn't support batch requests") + })?; + let method = request.method(); + let requires_retries = method == "eth_getTransactionReceipt" + || (method.contains("debug") && method.contains("trace")); + + if !requires_retries { + return service.call(req).await; + } + + timeout(polling_duration, async { + let mut interval = interval(polling_interval); + + loop { + interval.tick().await; + + let Ok(resp) = service.call(req.clone()).await else { + continue; + }; + let response = resp.as_single().expect("Can't fail"); + if response.is_error() { + continue; + } + + if method == "eth_getTransactionReceipt" + && response + .payload() + .clone() + .deserialize_success::() + .ok() + .and_then(|resp| resp.try_into_success().ok()) + .is_some() + || method != "eth_getTransactionReceipt" + { + return resp; + } else { + continue; + } + } + }) + .await + .map_err(|_| TransportErrorKind::custom_str("Timeout when retrying request")) + }) + } +}