From f3744b342fd4774a7e88399a121fe41eba51045d Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 18 Sep 2024 16:44:24 +0200 Subject: [PATCH] chore: bump alloy (#10989) --- Cargo.lock | 174 +++++++++--------- Cargo.toml | 62 +++---- crates/e2e-test-utils/src/transaction.rs | 16 +- .../engine/invalid-block-hooks/src/witness.rs | 4 +- crates/rpc/rpc/src/debug.rs | 17 +- 5 files changed, 138 insertions(+), 135 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 410929dfe7..3a2990d795 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -111,9 +111,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28ddd17ffb7e4d66ef3a84e7b179072a9320cdc4b26c7f6f44cbf1081631b36" +checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" dependencies = [ "alloy-eips", "alloy-primitives", @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f6c5c0a383f14519531cf58d8440e74f10b938e289f803af870be6f79223110" +checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -190,9 +190,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db0ddc76399bb1a4010f630767f027cafe65ab406cfee8e6040128cd65e8325" +checksum = "3a7a18afb0b318616b6b2b0e2e7ac5529d32a966c673b48091c9919e284e6aca" dependencies = [ "alloy-primitives", "alloy-serde", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7111af869909275cffc5c84d16b6c892d6d512773e40cbe83187d0b9c5235e91" +checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342028392a2d5050b7b93dd32a0715d3b3b9ce30072ecb69a35dd4895c005495" +checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049" dependencies = [ "alloy-consensus", "alloy-eips", @@ -248,9 +248,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e66d78c049dcadd065a926a9f2d9a9b2b10981a7889449e694fac7bccd2c6f" +checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3" dependencies = [ "alloy-eips", "alloy-primitives", @@ -260,9 +260,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41eb6fd2c70b076b0953d05ff1d2814fc370629301676a578519f8769cc2bc82" +checksum = "5988a227293f949525f0a1b3e1ef728d2ef24afa96bad2b7788c6c9617fa3eec" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -303,9 +303,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f14ccc2a3c575cb17b1b4af8c772cf9b5b93b7ce7047d6640e53954abb558d" +checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5" dependencies = [ "alloy-chains", "alloy-consensus", @@ -341,9 +341,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b9f5e85120aab30b8da23354592f7bd2b208d33d3204ffa1d44ac2e3dd5691" +checksum = "2d05f63677e210d758cd5d6d1ce10f20c980c3560ccfbe79ba1997791862a04f" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -382,9 +382,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc79aeca84abb122a2fffbc1c91fdf958dca5c95be3875977bc99672bde0027" +checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -406,9 +406,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22045187a5ebf5b2af3f8b6831b66735b6556c5750ec5790aeeb45935260c1c2" +checksum = "64333d639f2a0cf73491813c629a405744e16343a4bc5640931be707c345ecc5" dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", @@ -418,9 +418,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ea9f282cd1ad5c30d5ed26c4c2ddf4e48403b7322941546d6ec86545312b07" +checksum = "fefd12e99dd6b7de387ed13ad047ce2c90d8950ca62fc48b8a457ebb8f936c61" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -430,9 +430,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578d9ccad4e8510d32cc2810d05e01a232ccd79a4a6df60d257466897b43b013" +checksum = "d25cb45ad7c0930dd62eecf164d2afe4c3d2dd2c82af85680ad1f118e1e5cb83" dependencies = [ "alloy-primitives", "alloy-serde", @@ -441,9 +441,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3005edeaea06e916f4d723e7e275bef44decfb1947438679edbb5b64dd8789" +checksum = "2e7081d2206dca51ce23a06338d78d9b536931cc3f15134fc1c6535eb2b77f18" dependencies = [ "alloy-eips", "alloy-primitives", @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6754e6d7fcb0973611c23a7588cb6adf6887a3a95c079dc733d2edeb5c7e6c62" +checksum = "0f9f9033796bb3078d11cc9c839f00e277431ef997db2849a46045fcffee3835" dependencies = [ "alloy-primitives", "serde", @@ -465,9 +465,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c031a91e94a39f928244bc837c953817be5b8cc61759e1a9123b3abd17560dd" +checksum = "1464c4dd646e1bdfde86ae65ce5ba168dbb29180b478011fe87117ae46b1629b" dependencies = [ "alloy-consensus", "alloy-eips", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238f494727ff861a803bd73b1274ef788a615bf8f8c4bfada4e6df42afa275d2" +checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8" dependencies = [ "alloy-consensus", "alloy-eips", @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb6b5f521b1dc2a1517b46a85b43310bb7bacbf0a2cbea6a574d591c41db31c" +checksum = "922d92389e5022650c4c60ffd2f9b2467c3f853764f0f74ff16a23106f9017d5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -519,9 +519,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca08b0ccc0861055ceb83a1db009c4c8a7f52a259e7cda7ca6ca36ec2b5ce8" +checksum = "98db35cd42c90b484377e6bc44d95377a7a38a5ebee996e67754ac0446d542ab" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -533,9 +533,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "192ad94fe34c12be8ac4413ea00b1170202faa6fdebaa756b6a33555bf86d902" +checksum = "6bac37082c3b21283b3faf5cc0e08974272aee2f756ce1adeb26db56a5fce0d5" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -545,9 +545,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b95b6f024a558593dd3b8628af03f7df2ca50e4c56839293ad0a7546e471db0" +checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa" dependencies = [ "alloy-primitives", "arbitrary", @@ -557,9 +557,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da64740ff0518606c514eb0e03dd0a1daa8ff94d6d491a626fd8e50efd6c4f18" +checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0" dependencies = [ "alloy-primitives", "async-trait", @@ -571,9 +571,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e250010dce0e3caf6a6033e809718e5921391d937d1cbbcffe52653b37cc63" +checksum = "9fabe917ab1778e760b4701628d1cae8e028ee9d52ac6307de4e1e9286ab6b5f" dependencies = [ "alloy-consensus", "alloy-network", @@ -659,9 +659,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7a669caa427abe8802184c8776f5103302f9337bb30a5b36bdebc332946c14" +checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -678,9 +678,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4433ffa97aab6ae643de81c7bde9a2f043496f27368a607405a5c78a610caf74" +checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -693,9 +693,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa02db8751f9c0c37caf8c38ad3eb7aa1cfb09cfea3451a13aacaf06846c7a5" +checksum = "09fd8491249f74d16ec979b1f5672377b12ebb818e6056478ffa386954dbd350" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5c4a0929479bcb85a2df628c01173618a71c807b2f499939a236dbde5d008" +checksum = "a9704761f6297fe482276bee7f77a93cb42bd541c2bd6c1c560b6f3a9ece672e" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -5098,9 +5098,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef361231f72bea90365e441bd97d9c8fd3875603f18bbcad0e04874c6158e53" +checksum = "21aad1fbf80d2bcd7406880efc7ba109365f44bbb72896758ddcbfa46bf1592c" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5114,13 +5114,26 @@ dependencies = [ ] [[package]] -name = "op-alloy-network" -version = "0.2.11" +name = "op-alloy-genesis" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411e1fe4c2d6ea0001523d35cf37d3d4d79d9f86497c2c059fb2f7a0f6b5c015" +checksum = "6e1b8a9b70da0e027242ec1762f0f3a386278b6291d00d12ff5a64929dc19f68" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_repr", +] + +[[package]] +name = "op-alloy-network" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783ce4ebc0a994eee2188431511b16692b704e1e8fff0c77d8c0354d3c2b1fc8" +dependencies = [ + "alloy-consensus", "alloy-network", "alloy-primitives", "alloy-rpc-types-eth", @@ -5130,9 +5143,9 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8340ab59cffa611baeb048ba7e304cf3a99fd759dc516705a66c986503d87f" +checksum = "bf300a82ae2d30e2255bfea87a2259da49f63a25a44db561ae64cc9e3084139f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5141,21 +5154,23 @@ dependencies = [ "alloy-serde", "hashbrown 0.14.5", "op-alloy-consensus", + "op-alloy-genesis", "serde", - "superchain-primitives", ] [[package]] name = "op-alloy-rpc-types" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a65da5f7591acba3d2304b25145ca9942ea90481213269aed9cb28add8e3ff" +checksum = "e281fbfc2198b7c0c16457d6524f83d192662bc9f3df70f24c3038d4521616df" dependencies = [ "alloy-eips", - "alloy-network", + "alloy-network-primitives", "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", + "cfg-if", + "hashbrown 0.14.5", "op-alloy-consensus", "serde", "serde_json", @@ -5163,13 +5178,17 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16990a17db7109eed0692ee16443582bd363fb9cf2768af2bf92c08f56ae4f3e" +checksum = "2947272a81ebf988f4804b6f0f6a7c0b2f6f89a908cb410e36f8f3828f81c778" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "alloy-serde", + "derive_more", + "op-alloy-consensus", + "op-alloy-genesis", "op-alloy-protocol", "serde", ] @@ -8971,9 +8990,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb613fe359e2cebbadd72d0b1c2286021855b627908a46fe29dab3a46186cad0" +checksum = "48294aab02ed5d1940ad9b06f2a3230c3f0d98db6eacd618878cf143e204f6b0" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9950,23 +9969,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "superchain-primitives" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d0cd81318c6ad65932af03168da2095befebef0a851f17391fc773dbf49dbc" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-primitives", - "alloy-serde", - "alloy-sol-types", - "anyhow", - "serde", - "serde_repr", -] - [[package]] name = "symbolic-common" version = "12.11.0" diff --git a/Cargo.toml b/Cargo.toml index 4bbd500472..babad352ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -422,45 +422,45 @@ alloy-rlp = "0.3.4" alloy-sol-types = "0.8.0" alloy-trie = { version = "0.5", default-features = false } -alloy-consensus = { version = "0.3.5", default-features = false } -alloy-eips = { version = "0.3.5", default-features = false } -alloy-genesis = { version = "0.3.5", default-features = false } -alloy-json-rpc = { version = "0.3.5", default-features = false } -alloy-network = { version = "0.3.5", default-features = false } -alloy-network-primitives = { version = "0.3.5", default-features = false } -alloy-node-bindings = { version = "0.3.5", default-features = false } -alloy-provider = { version = "0.3.5", features = [ +alloy-consensus = { version = "0.3.6", default-features = false } +alloy-eips = { version = "0.3.6", default-features = false } +alloy-genesis = { version = "0.3.6", default-features = false } +alloy-json-rpc = { version = "0.3.6", default-features = false } +alloy-network = { version = "0.3.6", default-features = false } +alloy-network-primitives = { version = "0.3.6", default-features = false } +alloy-node-bindings = { version = "0.3.6", default-features = false } +alloy-provider = { version = "0.3.6", features = [ "reqwest", ], default-features = false } -alloy-pubsub = { version = "0.3.5", default-features = false } -alloy-rpc-client = { version = "0.3.5", default-features = false } -alloy-rpc-types = { version = "0.3.5", features = [ +alloy-pubsub = { version = "0.3.6", default-features = false } +alloy-rpc-client = { version = "0.3.6", default-features = false } +alloy-rpc-types = { version = "0.3.6", features = [ "eth", ], default-features = false } -alloy-rpc-types-admin = { version = "0.3.5", default-features = false } -alloy-rpc-types-anvil = { version = "0.3.5", default-features = false } -alloy-rpc-types-beacon = { version = "0.3.5", default-features = false } -alloy-rpc-types-debug = { version = "0.3.5", default-features = false } -alloy-rpc-types-engine = { version = "0.3.5", default-features = false } -alloy-rpc-types-eth = { version = "0.3.5", default-features = false } -alloy-rpc-types-mev = { version = "0.3.5", default-features = false } -alloy-rpc-types-trace = { version = "0.3.5", default-features = false } -alloy-rpc-types-txpool = { version = "0.3.5", default-features = false } -alloy-serde = { version = "0.3.5", default-features = false } -alloy-signer = { version = "0.3.5", default-features = false } -alloy-signer-local = { version = "0.3.5", default-features = false } -alloy-transport = { version = "0.3.5" } -alloy-transport-http = { version = "0.3.5", features = [ +alloy-rpc-types-admin = { version = "0.3.6", default-features = false } +alloy-rpc-types-anvil = { version = "0.3.6", default-features = false } +alloy-rpc-types-beacon = { version = "0.3.6", default-features = false } +alloy-rpc-types-debug = { version = "0.3.6", default-features = false } +alloy-rpc-types-engine = { version = "0.3.6", default-features = false } +alloy-rpc-types-eth = { version = "0.3.6", default-features = false } +alloy-rpc-types-mev = { version = "0.3.6", default-features = false } +alloy-rpc-types-trace = { version = "0.3.6", default-features = false } +alloy-rpc-types-txpool = { version = "0.3.6", default-features = false } +alloy-serde = { version = "0.3.6", default-features = false } +alloy-signer = { version = "0.3.6", default-features = false } +alloy-signer-local = { version = "0.3.6", default-features = false } +alloy-transport = { version = "0.3.6" } +alloy-transport-http = { version = "0.3.6", features = [ "reqwest-rustls-tls", ], default-features = false } -alloy-transport-ipc = { version = "0.3.5", default-features = false } -alloy-transport-ws = { version = "0.3.5", default-features = false } +alloy-transport-ipc = { version = "0.3.6", default-features = false } +alloy-transport-ws = { version = "0.3.6", default-features = false } # op -op-alloy-rpc-types = "0.2.10" -op-alloy-rpc-types-engine = "0.2.10" -op-alloy-network = "0.2.10" -op-alloy-consensus = "0.2.10" +op-alloy-rpc-types = "0.2.12" +op-alloy-rpc-types-engine = "0.2.12" +op-alloy-network = "0.2.12" +op-alloy-consensus = "0.2.12" # misc aquamarine = "0.5" diff --git a/crates/e2e-test-utils/src/transaction.rs b/crates/e2e-test-utils/src/transaction.rs index e3eaf24582..329454e6af 100644 --- a/crates/e2e-test-utils/src/transaction.rs +++ b/crates/e2e-test-utils/src/transaction.rs @@ -1,8 +1,7 @@ -use alloy_consensus::{ - BlobTransactionSidecar, EnvKzgSettings, SidecarBuilder, SimpleCoder, TxEip4844Variant, - TxEnvelope, +use alloy_consensus::{EnvKzgSettings, SidecarBuilder, SimpleCoder, TxEip4844Variant, TxEnvelope}; +use alloy_network::{ + eip2718::Encodable2718, Ethereum, EthereumWallet, TransactionBuilder, TransactionBuilder4844, }; -use alloy_network::{eip2718::Encodable2718, Ethereum, EthereumWallet, TransactionBuilder}; use alloy_primitives::{hex, Address, Bytes, TxKind, B256, U256}; use alloy_rpc_types::{TransactionInput, TransactionRequest}; use alloy_signer_local::PrivateKeySigner; @@ -34,13 +33,8 @@ impl TransactionTestContext { let mut builder = SidecarBuilder::::new(); builder.ingest(b"dummy blob"); - let sidecar: BlobTransactionSidecar = builder.build()?; - - >::set_blob_sidecar(&mut tx, sidecar); - >::set_max_fee_per_blob_gas( - &mut tx, - 15e9 as u128, - ); + tx.set_blob_sidecar(builder.build()?); + tx.set_max_fee_per_blob_gas(15e9 as u128); let signed = Self::sign_tx(wallet, tx).await; Ok(signed) diff --git a/crates/engine/invalid-block-hooks/src/witness.rs b/crates/engine/invalid-block-hooks/src/witness.rs index 343dc6bb31..6ce5513db1 100644 --- a/crates/engine/invalid-block-hooks/src/witness.rs +++ b/crates/engine/invalid-block-hooks/src/witness.rs @@ -155,10 +155,10 @@ where // Generate an execution witness for the aggregated state of accessed accounts. // Destruct the cache database to retrieve the state provider. let state_provider = db.database.into_inner(); - let witness = state_provider.witness(Default::default(), hashed_state.clone())?; + let state = state_provider.witness(Default::default(), hashed_state.clone())?; // Write the witness to the output directory. - let response = ExecutionWitness { witness, state_preimages: Some(state_preimages) }; + let response = ExecutionWitness { state, keys: Some(state_preimages) }; File::create_new(self.output_directory.join(format!( "{}_{}.json", block.number, diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index bb240e18c1..8e4078ea47 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -389,6 +389,11 @@ where .await?; return Ok(frame) } + GethDebugBuiltInTracerType::FlatCallTracer => { + return Err( + EthApiError::Unsupported("Flatcall tracer is not supported yet").into() + ) + } }, #[cfg(not(feature = "js-tracer"))] GethDebugTracerType::JsTracer(_) => { @@ -666,13 +671,10 @@ where // Generate an execution witness for the aggregated state of accessed accounts. // Destruct the cache database to retrieve the state provider. let state_provider = db.database.into_inner(); - let witness = + let state = state_provider.witness(Default::default(), hashed_state).map_err(Into::into)?; - Ok(ExecutionWitness { - witness, - state_preimages: include_preimages.then_some(state_preimages), - }) + Ok(ExecutionWitness { state, keys: include_preimages.then_some(state_preimages) }) }) .await } @@ -755,6 +757,11 @@ where .map_err(Eth::Error::from_eth_err)?; return Ok((frame.into(), res.state)) } + GethDebugBuiltInTracerType::FlatCallTracer => { + return Err( + EthApiError::Unsupported("Flatcall tracer is not supported yet").into() + ) + } }, #[cfg(not(feature = "js-tracer"))] GethDebugTracerType::JsTracer(_) => {