gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-06 10:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ethers-core from execution_layer (#8149)

Browse Source 
#6022


  Use `alloy_rpc_types::Transaction` to replace the `ethers_core::Transaction` inside the execution block generator.


Co-Authored-By: Mac L <mjladson@pm.me>
This commit is contained in:
Mac L
2025-11-10 10:25:59 +04:00
committed by GitHub
parent 1bd4ac2113
commit 93b8f4686d
6 changed files with 460 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

482
Cargo.lock generated
View File

@@ -140,21 +140,43 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]]
name = "alloy-consensus"
version = "0.14.0"
version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2179ba839ac532f50279f5da2a6c5047f791f03f6f808b4dfab11327b97902f"
checksum = "3abecb92ba478a285fbf5689100dbafe4003ded4a09bf4b5ef62cca87cd4f79e"
dependencies = [
"alloy-eips",
"alloy-primitives",
"alloy-rlp",
"alloy-serde",
"alloy-trie",
"alloy-tx-macros",
"auto_impl 1.2.1",
"c-kzg",
"derive_more 2.0.1",
"either",
"k256 0.13.4",
"once_cell",
"rand 0.8.5",
"secp256k1",
"serde",
"serde_json",
"thiserror 2.0.12",
]
[[package]]
name = "alloy-consensus-any"
version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e864d4f11d1fb8d3ac2fd8f3a15f1ee46d55ec6d116b342ed1b2cb737f25894"
dependencies = [
"alloy-consensus",
"alloy-eips",
"alloy-primitives",
"alloy-rlp",
"alloy-serde",
"serde",
]
[[package]]
name = "alloy-eip2124"
version = "0.2.0"
@@ -164,6 +186,7 @@ dependencies = [
"alloy-primitives",
"alloy-rlp",
"crc",
"serde",
"thiserror 2.0.12",
]
@@ -175,52 +198,71 @@ checksum = "dbe3e16484669964c26ac48390245d84c410b1a5f968976076c17184725ef235"
dependencies = [
"alloy-primitives",
"alloy-rlp",
"serde",
]
[[package]]
name = "alloy-eip7702"
version = "0.6.0"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "804cefe429015b4244966c006d25bda5545fa9db5990e9c9079faf255052f50a"
checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
dependencies = [
"alloy-primitives",
"alloy-rlp",
"serde",
"thiserror 2.0.12",
]
[[package]]
name = "alloy-eips"
version = "0.14.0"
version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "609515c1955b33af3d78d26357540f68c5551a90ef58fd53def04f2aa074ec43"
checksum = "07d9a64522a0db6ebcc4ff9c904e329e77dd737c2c25d30f1bdc32ca6c6ce334"
dependencies = [
"alloy-eip2124",
"alloy-eip2930",
"alloy-eip7702",
"alloy-primitives",
"alloy-rlp",
"alloy-serde",
"auto_impl 1.2.1",
"c-kzg",
"derive_more 2.0.1",
"either",
"serde",
"serde_with",
"sha2 0.10.8",
"thiserror 2.0.12",
]
[[package]]
name = "alloy-network-primitives"
version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "219dccd2cf753a43bd9b0fbb7771a16927ffdb56e43e3a15755bef1a74d614aa"
dependencies = [
"alloy-consensus",
"alloy-eips",
"alloy-primitives",
"alloy-serde",
"serde",
]
[[package]]
name = "alloy-primitives"
version = "1.0.0"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70b98b99c1dcfbe74d7f0b31433ff215e7d1555e367d90e62db904f3c9d4ff53"
checksum = "355bf68a433e0fd7f7d33d5a9fc2583fde70bf5c530f63b80845f8da5505cf28"
dependencies = [
"alloy-rlp",
"arbitrary",
"bytes",
"cfg-if",
"const-hex",
"derive_arbitrary",
"derive_more 2.0.1",
"foldhash",
"foldhash 0.2.0",
"getrandom 0.3.1",
"hashbrown 0.15.2",
"hashbrown 0.16.0",
"indexmap 2.8.0",
"itoa",
"k256 0.13.4",
@@ -238,9 +280,9 @@ dependencies = [
[[package]]
name = "alloy-rlp"
version = "0.3.11"
version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6c1d995bff8d011f7cd6c81820d51825e6e06d6db73914c1630ecf544d83d6"
checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4"
dependencies = [
"alloy-rlp-derive",
"arrayvec",
@@ -249,9 +291,9 @@ dependencies = [
[[package]]
name = "alloy-rlp-derive"
version = "0.3.11"
version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943"
checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
dependencies = [
"proc-macro2",
"quote",
@@ -259,20 +301,122 @@ dependencies = [
]
[[package]]
name = "alloy-trie"
version = "0.8.1"
name = "alloy-rpc-types-eth"
version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500"
checksum = "0185f68a0f8391ab996d335a887087d7ccdbc97952efab3516f6307d456ba2cd"
dependencies = [
"alloy-consensus",
"alloy-consensus-any",
"alloy-eips",
"alloy-network-primitives",
"alloy-primitives",
"alloy-rlp",
"alloy-serde",
"alloy-sol-types",
"itertools 0.14.0",
"serde",
"serde_json",
"thiserror 2.0.12",
]
[[package]]
name = "alloy-serde"
version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "596cfa360922ba9af901cc7370c68640e4f72adb6df0ab064de32f21fec498d7"
dependencies = [
"alloy-primitives",
"serde",
"serde_json",
]
[[package]]
name = "alloy-sol-macro"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3ce480400051b5217f19d6e9a82d9010cdde20f1ae9c00d53591e4a1afbb312"
dependencies = [
"alloy-sol-macro-expander",
"alloy-sol-macro-input",
"proc-macro-error2",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "alloy-sol-macro-expander"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d792e205ed3b72f795a8044c52877d2e6b6e9b1d13f431478121d8d4eaa9028"
dependencies = [
"alloy-sol-macro-input",
"const-hex",
"heck 0.5.0",
"indexmap 2.8.0",
"proc-macro-error2",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn-solidity",
"tiny-keccak",
]
[[package]]
name = "alloy-sol-macro-input"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bd1247a8f90b465ef3f1207627547ec16940c35597875cdc09c49d58b19693c"
dependencies = [
"const-hex",
"dunce",
"heck 0.5.0",
"macro-string",
"proc-macro2",
"quote",
"syn 2.0.100",
"syn-solidity",
]
[[package]]
name = "alloy-sol-types"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70319350969a3af119da6fb3e9bddb1bce66c9ea933600cb297c8b1850ad2a3c"
dependencies = [
"alloy-primitives",
"alloy-sol-macro",
]
[[package]]
name = "alloy-trie"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5"
dependencies = [
"alloy-primitives",
"alloy-rlp",
"arrayvec",
"derive_more 2.0.1",
"nybbles",
"serde",
"smallvec",
"tracing",
]
[[package]]
name = "alloy-tx-macros"
version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab54221eccefa254ce9f65b079c097b1796e48c21c7ce358230f8988d75392fb"
dependencies = [
"darling 0.21.3",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "android-tzdata"
version = "0.1.1"
@@ -412,6 +556,26 @@ dependencies = [
"zeroize",
]
[[package]]
name = "ark-ff"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70"
dependencies = [
"ark-ff-asm 0.5.0",
"ark-ff-macros 0.5.0",
"ark-serialize 0.5.0",
"ark-std 0.5.0",
"arrayvec",
"digest 0.10.7",
"educe",
"itertools 0.13.0",
"num-bigint",
"num-traits",
"paste",
"zeroize",
]
[[package]]
name = "ark-ff-asm"
version = "0.3.0"
@@ -432,6 +596,16 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "ark-ff-asm"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
dependencies = [
"quote",
"syn 2.0.100",
]
[[package]]
name = "ark-ff-macros"
version = "0.3.0"
@@ -457,6 +631,19 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "ark-ff-macros"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3"
dependencies = [
"num-bigint",
"num-traits",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "ark-serialize"
version = "0.3.0"
@@ -478,6 +665,18 @@ dependencies = [
"num-bigint",
]
[[package]]
name = "ark-serialize"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
dependencies = [
"ark-std 0.5.0",
"arrayvec",
"digest 0.10.7",
"num-bigint",
]
[[package]]
name = "ark-std"
version = "0.3.0"
@@ -498,6 +697,16 @@ dependencies = [
"rand 0.8.5",
]
[[package]]
name = "ark-std"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
dependencies = [
"num-traits",
"rand 0.8.5",
]
[[package]]
name = "arraydeque"
version = "0.5.1"
@@ -515,6 +724,9 @@ name = "arrayvec"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
dependencies = [
"serde",
]
[[package]]
name = "asn1-rs"
@@ -1043,6 +1255,22 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
[[package]]
name = "bitcoin-io"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
[[package]]
name = "bitcoin_hashes"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
dependencies = [
"bitcoin-io",
"hex-conservative",
]
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -1307,6 +1535,8 @@ dependencies = [
"glob",
"hex",
"libc",
"once_cell",
"serde",
]
[[package]]
@@ -2075,6 +2305,16 @@ dependencies = [
"darling_macro 0.20.10",
]
[[package]]
name = "darling"
version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
dependencies = [
"darling_core 0.21.3",
"darling_macro 0.21.3",
]
[[package]]
name = "darling_core"
version = "0.13.4"
@@ -2103,6 +2343,21 @@ dependencies = [
"syn 2.0.100",
]
[[package]]
name = "darling_core"
version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"serde",
"strsim 0.11.1",
"syn 2.0.100",
]
[[package]]
name = "darling_macro"
version = "0.13.4"
@@ -2125,6 +2380,17 @@ dependencies = [
"syn 2.0.100",
]
[[package]]
name = "darling_macro"
version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
dependencies = [
"darling_core 0.21.3",
"quote",
"syn 2.0.100",
]
[[package]]
name = "darwin-libproc"
version = "0.1.2"
@@ -2471,6 +2737,12 @@ version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
[[package]]
name = "dunce"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "ecdsa"
version = "0.14.8"
@@ -2493,6 +2765,7 @@ dependencies = [
"digest 0.10.7",
"elliptic-curve 0.13.8",
"rfc6979 0.4.0",
"serdect",
"signature 2.2.0",
"spki 0.7.3",
]
@@ -2602,6 +2875,9 @@ name = "either"
version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
dependencies = [
"serde",
]
[[package]]
name = "ekzg-bls12-381"
@@ -2724,6 +3000,7 @@ dependencies = [
"pkcs8 0.10.2",
"rand_core 0.6.4",
"sec1 0.7.3",
"serdect",
"subtle",
"zeroize",
]
@@ -3346,13 +3623,13 @@ dependencies = [
"alloy-consensus",
"alloy-primitives",
"alloy-rlp",
"alloy-rpc-types-eth",
"arc-swap",
"builder_client",
"bytes",
"eth2",
"ethereum_serde_utils",
"ethereum_ssz",
"ethers-core",
"fixed_bytes",
"fork_choice",
"hash-db",
@@ -3553,6 +3830,12 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
[[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"
@@ -3987,7 +4270,16 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash",
"foldhash 0.1.4",
]
[[package]]
name = "hashbrown"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
dependencies = [
"foldhash 0.2.0",
"serde",
]
@@ -4113,6 +4405,15 @@ dependencies = [
"serde",
]
[[package]]
name = "hex-conservative"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
dependencies = [
"arrayvec",
]
[[package]]
name = "hex_fmt"
version = "0.3.0"
@@ -4974,6 +5275,7 @@ dependencies = [
"ecdsa 0.16.9",
"elliptic-curve 0.13.8",
"once_cell",
"serdect",
"sha2 0.10.8",
"signature 2.2.0",
]
@@ -5842,6 +6144,17 @@ dependencies = [
"libc",
]
[[package]]
name = "macro-string"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "malloc_utils"
version = "0.1.0"
@@ -6525,11 +6838,13 @@ dependencies = [
[[package]]
name = "nybbles"
version = "0.3.4"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8983bb634df7248924ee0c4c3a749609b5abcb082c28fffe3254b3eb3602b307"
checksum = "2c4b5ecbd0beec843101bffe848217f770e8b8da81d8355b7d6e226f2199b3dc"
dependencies = [
"const-hex",
"cfg-if",
"ruint",
"serde",
"smallvec",
]
@@ -7227,6 +7542,28 @@ dependencies = [
"version_check",
]
[[package]]
name = "proc-macro-error-attr2"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
dependencies = [
"proc-macro2",
"quote",
]
[[package]]
name = "proc-macro-error2"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
dependencies = [
"proc-macro-error-attr2",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "proc-macro2"
version = "1.0.94"
@@ -7310,9 +7647,9 @@ dependencies = [
[[package]]
name = "proptest-derive"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30"
dependencies = [
"proc-macro2",
"quote",
@@ -7542,6 +7879,7 @@ dependencies = [
"libc",
"rand_chacha 0.3.1",
"rand_core 0.6.4",
"serde",
]
[[package]]
@@ -7926,14 +8264,15 @@ dependencies = [
[[package]]
name = "ruint"
version = "1.14.0"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78a46eb779843b2c4f21fac5773e25d6d5b7c8f0922876c91541790d2ca27eef"
checksum = "a68df0380e5c9d20ce49534f292a36a7514ae21350726efe1865bdb1fa91d278"
dependencies = [
"alloy-rlp",
"arbitrary",
"ark-ff 0.3.0",
"ark-ff 0.4.2",
"ark-ff 0.5.0",
"bytes",
"fastrlp 0.3.1",
"fastrlp 0.4.0",
@@ -7947,7 +8286,7 @@ dependencies = [
"rand 0.9.0",
"rlp",
"ruint-macro",
"serde",
"serde_core",
"valuable",
"zeroize",
]
@@ -8373,10 +8712,32 @@ dependencies = [
"der 0.7.9",
"generic-array 0.14.7",
"pkcs8 0.10.2",
"serdect",
"subtle",
"zeroize",
]
[[package]]
name = "secp256k1"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
dependencies = [
"bitcoin_hashes",
"rand 0.8.5",
"secp256k1-sys",
"serde",
]
[[package]]
name = "secp256k1-sys"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
dependencies = [
"cc",
]
[[package]]
name = "security-framework"
version = "2.11.1"
@@ -8458,10 +8819,11 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.219"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
dependencies = [
"serde_core",
"serde_derive",
]
@@ -8497,10 +8859,19 @@ dependencies = [
]
[[package]]
name = "serde_derive"
version = "1.0.219"
name = "serde_core"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
@@ -8542,6 +8913,28 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_with"
version = "3.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
dependencies = [
"serde_core",
"serde_with_macros",
]
[[package]]
name = "serde_with_macros"
version = "3.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
dependencies = [
"darling 0.21.3",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "serde_yaml"
version = "0.9.34+deprecated"
@@ -8555,6 +8948,16 @@ dependencies = [
"unsafe-libyaml",
]
[[package]]
name = "serdect"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
dependencies = [
"base16ct 0.2.0",
"serde",
]
[[package]]
name = "sha1"
version = "0.10.6"
@@ -8826,6 +9229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
dependencies = [
"arbitrary",
"serde",
]
[[package]]
@@ -9075,6 +9479,18 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "syn-solidity"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff790eb176cc81bb8936aed0f7b9f14fc4670069a2d371b3e3b0ecce908b2cb3"
dependencies = [
"paste",
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "sync_wrapper"
version = "0.1.2"

7
Cargo.toml
View File

@@ -97,9 +97,10 @@ version = "8.0.0"
[workspace.dependencies]
account_utils = { path = "common/account_utils" }
alloy-consensus = { version = "0.14.0", default-features = false }
alloy-primitives = { version = "1.0", features = ["rlp", "getrandom"] }
alloy-rlp = "0.3.4"
alloy-consensus = { version = "=1.0.42", default-features = false }
alloy-primitives = { version = "=1.4.1", default-features = false, features = ["rlp", "getrandom"] }
alloy-rlp = { version = "=0.3.12", default-features = false }
alloy-rpc-types-eth = { version = "=1.0.42", default-features = false, features = ["serde"] }
anyhow = "1"
arbitrary = { version = "1", features = ["derive"] }
async-channel = "1.9.0"

2
beacon_node/execution_layer/Cargo.toml
View File

@@ -8,13 +8,13 @@ edition = { workspace = true }
alloy-consensus = { workspace = true }
alloy-primitives = { workspace = true }
alloy-rlp = { workspace = true }
alloy-rpc-types-eth = { workspace = true }
arc-swap = "1.6.0"
builder_client = { path = "../builder_client" }
bytes = { workspace = true }
eth2 = { workspace = true }
ethereum_serde_utils = { workspace = true }
ethereum_ssz = { workspace = true }
ethers-core = { workspace = true }
fixed_bytes = { workspace = true }
fork_choice = { workspace = true }
hash-db = "0.15.2"

1
beacon_node/execution_layer/src/lib.rs
View File

@@ -18,7 +18,6 @@ use engines::{Engine, EngineError};
pub use engines::{EngineState, ForkchoiceState};
use eth2::types::{BlobsBundle, FullPayloadContents};
use eth2::types::{ForkVersionedResponse, builder_bid::SignedBuilderBid};
use ethers_core::types::Transaction as EthersTransaction;
use fixed_bytes::UintExtended;
use fork_choice::ForkchoiceUpdateParameters;
use logging::crit;

8
beacon_node/execution_layer/src/test_utils/execution_block_generator.rs
View File

@@ -1,4 +1,3 @@
use crate::EthersTransaction;
use crate::engine_api::{
ExecutionBlock, PayloadAttributes, PayloadId, PayloadStatusV1, PayloadStatusV1Status,
json_structures::{
@@ -6,6 +5,8 @@ use crate::engine_api::{
},
};
use crate::engines::ForkchoiceState;
use alloy_consensus::TxEnvelope;
use alloy_rpc_types_eth::Transaction as AlloyTransaction;
use eth2::types::BlobsBundle;
use kzg::{Kzg, KzgCommitment, KzgProof};
use parking_lot::Mutex;
@@ -833,7 +834,7 @@ pub fn generate_blobs<E: EthSpec>(
pub fn static_valid_tx<E: EthSpec>() -> Result<Transaction<E::MaxBytesPerTransaction>, String> {
// This is a real transaction hex encoded, but we don't care about the contents of the transaction.
let transaction: EthersTransaction = serde_json::from_str(
let transaction: AlloyTransaction = serde_json::from_str(
r#"{
"blockHash":"0x1d59ff54b1eb26b013ce3cb5fc9dab3705b415a67127a003c3e61eb445bb8df2",
"blockNumber":"0x5daf3b",
@@ -852,7 +853,8 @@ pub fn static_valid_tx<E: EthSpec>() -> Result<Transaction<E::MaxBytesPerTransac
}"#,
)
.unwrap();
VariableList::new(transaction.rlp().to_vec())
VariableList::new(alloy_rlp::encode::<TxEnvelope>(transaction.into()).to_vec())
.map_err(|e| format!("Failed to convert transaction to SSZ: {:?}", e))
}

2
consensus/types/Cargo.toml
View File

@@ -25,7 +25,7 @@ portable = ["bls/supranational-portable"]
[dependencies]
alloy-primitives = { workspace = true }
alloy-rlp = { version = "0.3.4", features = ["derive"] }
alloy-rlp = { workspace = true, features = ["derive"] }
arbitrary = { workspace = true, features = ["derive"], optional = true }
bls = { workspace = true }
compare_fields = { workspace = true }