diff --git a/beacon_chain/libnimbus_lc/libnimbus_lc.nim b/beacon_chain/libnimbus_lc/libnimbus_lc.nim index c521ea3f9..70597b8b2 100644 --- a/beacon_chain/libnimbus_lc/libnimbus_lc.nim +++ b/beacon_chain/libnimbus_lc/libnimbus_lc.nim @@ -1459,12 +1459,12 @@ proc ETHTransactionsCreateFromJson( return nil # Check fork consistency - static: doAssert totalSerializedFields(TransactionObject) == 21, + static: doAssert totalSerializedFields(TransactionObject) == 22, "Only update this number once code is adjusted to check new fields!" let txType = case data.`type`.get(0.Quantity): of 0.Quantity: - if data.accessList.isSome or + if data.yParity.isSome or data.accessList.isSome or data.maxFeePerGas.isSome or data.maxPriorityFeePerGas.isSome or data.maxFeePerBlobGas.isSome or data.blobVersionedHashes.isSome: return nil @@ -1512,8 +1512,15 @@ proc ETHTransactionsCreateFromJson( return nil if distinctBase(data.gas) > int64.high.uint64: return nil - if data.v.uint64 > int64.high.uint64: + if distinctBase(data.v) > int64.high.uint64: return nil + if data.yParity.isSome: + # This is not always included, but if it is, make sure it's correct + let yParity = data.yParity.get + if distinctBase(yParity) > 1: + return nil + if yParity != data.v: + return nil let tx = ExecutionTransaction( txType: txType, diff --git a/vendor/nim-web3 b/vendor/nim-web3 index 15325bd84..747001250 160000 --- a/vendor/nim-web3 +++ b/vendor/nim-web3 @@ -1 +1 @@ -Subproject commit 15325bd844a38234e4f705b3399d0bbfa3b63a12 +Subproject commit 747001250a27278e0f0f1706fe1dec88ad3ede8d