bump nim-eth to `d8fda55c79dd48ba564f3cb540b968f4a1c1aae6` (#6405)
* bump nim-eth to `d8fda55c79dd48ba564f3cb540b968f4a1c1aae6` - Overhaul of ENR implementation - part I - Rework of ENR decoding code - Update discv5 to use non deprecated ENR calls and simplify code - simplify .nimble file - avoid warnings when processing `GasInt` for RLP - define Electra types and RLP encoding * explicitly indicate consensus types over nim-eth types in EL manager
This commit is contained in:
parent
9f654690b8
commit
abf818a9f3
|
@ -504,23 +504,25 @@ func asConsensusType*(rpcExecutionPayload: ExecutionPayloadV4):
|
||||||
template getTransaction(tt: TypedTransaction): bellatrix.Transaction =
|
template getTransaction(tt: TypedTransaction): bellatrix.Transaction =
|
||||||
bellatrix.Transaction.init(tt.distinctBase)
|
bellatrix.Transaction.init(tt.distinctBase)
|
||||||
|
|
||||||
template getDepositRequest(dr: DepositRequestV1): DepositRequest =
|
template getDepositRequest(
|
||||||
DepositRequest(
|
dr: DepositRequestV1): electra.DepositRequest =
|
||||||
|
electra.DepositRequest(
|
||||||
pubkey: ValidatorPubKey(blob: dr.pubkey.distinctBase),
|
pubkey: ValidatorPubKey(blob: dr.pubkey.distinctBase),
|
||||||
withdrawal_credentials: dr.withdrawalCredentials.asEth2Digest,
|
withdrawal_credentials: dr.withdrawalCredentials.asEth2Digest,
|
||||||
amount: dr.amount.Gwei,
|
amount: dr.amount.Gwei,
|
||||||
signature: ValidatorSig(blob: dr.signature.distinctBase),
|
signature: ValidatorSig(blob: dr.signature.distinctBase),
|
||||||
index: dr.index.uint64)
|
index: dr.index.uint64)
|
||||||
|
|
||||||
template getWithdrawalRequest(wr: WithdrawalRequestV1): WithdrawalRequest =
|
template getWithdrawalRequest(
|
||||||
WithdrawalRequest(
|
wr: WithdrawalRequestV1): electra.WithdrawalRequest =
|
||||||
|
electra.WithdrawalRequest(
|
||||||
source_address: ExecutionAddress(data: wr.sourceAddress.distinctBase),
|
source_address: ExecutionAddress(data: wr.sourceAddress.distinctBase),
|
||||||
validator_pubkey: ValidatorPubKey(blob: wr.validatorPubkey.distinctBase),
|
validator_pubkey: ValidatorPubKey(blob: wr.validatorPubkey.distinctBase),
|
||||||
amount: wr.amount.Gwei)
|
amount: wr.amount.Gwei)
|
||||||
|
|
||||||
template getConsolidationRequest(cr: ConsolidationRequestV1):
|
template getConsolidationRequest(
|
||||||
ConsolidationRequest =
|
cr: ConsolidationRequestV1): electra.ConsolidationRequest =
|
||||||
ConsolidationRequest(
|
electra.ConsolidationRequest(
|
||||||
source_address: ExecutionAddress(data: cr.sourceAddress.distinctBase),
|
source_address: ExecutionAddress(data: cr.sourceAddress.distinctBase),
|
||||||
source_pubkey: ValidatorPubKey(blob: cr.sourcePubkey.distinctBase),
|
source_pubkey: ValidatorPubKey(blob: cr.sourcePubkey.distinctBase),
|
||||||
target_pubkey: ValidatorPubKey(blob: cr.targetPubkey.distinctBase))
|
target_pubkey: ValidatorPubKey(blob: cr.targetPubkey.distinctBase))
|
||||||
|
@ -659,7 +661,8 @@ func asEngineExecutionPayload*(executionPayload: electra.ExecutionPayload):
|
||||||
template getTypedTransaction(tt: bellatrix.Transaction): TypedTransaction =
|
template getTypedTransaction(tt: bellatrix.Transaction): TypedTransaction =
|
||||||
TypedTransaction(tt.distinctBase)
|
TypedTransaction(tt.distinctBase)
|
||||||
|
|
||||||
template getDepositRequest(dr: DepositRequest): DepositRequestV1 =
|
template getDepositRequest(
|
||||||
|
dr: electra.DepositRequest): DepositRequestV1 =
|
||||||
DepositRequestV1(
|
DepositRequestV1(
|
||||||
pubkey: FixedBytes[RawPubKeySize](dr.pubkey.blob),
|
pubkey: FixedBytes[RawPubKeySize](dr.pubkey.blob),
|
||||||
withdrawalCredentials: FixedBytes[32](dr.withdrawal_credentials.data),
|
withdrawalCredentials: FixedBytes[32](dr.withdrawal_credentials.data),
|
||||||
|
@ -667,14 +670,15 @@ func asEngineExecutionPayload*(executionPayload: electra.ExecutionPayload):
|
||||||
signature: FixedBytes[RawSigSize](dr.signature.blob),
|
signature: FixedBytes[RawSigSize](dr.signature.blob),
|
||||||
index: dr.index.Quantity)
|
index: dr.index.Quantity)
|
||||||
|
|
||||||
template getWithdrawalRequest(wr: WithdrawalRequest): WithdrawalRequestV1 =
|
template getWithdrawalRequest(
|
||||||
|
wr: electra.WithdrawalRequest): WithdrawalRequestV1 =
|
||||||
WithdrawalRequestV1(
|
WithdrawalRequestV1(
|
||||||
sourceAddress: Address(wr.source_address.data),
|
sourceAddress: Address(wr.source_address.data),
|
||||||
validatorPubkey: FixedBytes[RawPubKeySize](wr.validator_pubkey.blob),
|
validatorPubkey: FixedBytes[RawPubKeySize](wr.validator_pubkey.blob),
|
||||||
amount: wr.amount.Quantity)
|
amount: wr.amount.Quantity)
|
||||||
|
|
||||||
template getConsolidationRequest(cr: ConsolidationRequest):
|
template getConsolidationRequest(
|
||||||
ConsolidationRequestV1 =
|
cr: electra.ConsolidationRequest): ConsolidationRequestV1 =
|
||||||
ConsolidationRequestV1(
|
ConsolidationRequestV1(
|
||||||
sourceAddress: Address(cr.source_address.data),
|
sourceAddress: Address(cr.source_address.data),
|
||||||
sourcePubkey: FixedBytes[RawPubKeySize](cr.source_pubkey.blob),
|
sourcePubkey: FixedBytes[RawPubKeySize](cr.source_pubkey.blob),
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 26212c881b464ed64cac20442fb45144d3ecd3b3
|
Subproject commit d8fda55c79dd48ba564f3cb540b968f4a1c1aae6
|
Loading…
Reference in New Issue