status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-18 17:37:33 +00:00
Code Issues Projects Releases Wiki Activity

fix effective merge conflict between #s 4357 and 4358 around Withdrawal symbol ambiguity (#4370)

Browse Source
This commit is contained in:
tersec 2022-11-29 11:04:36 +00:00 committed by GitHub
parent 6c07c6e625
commit 9572bb8721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/eth1/eth1_monitor.nim
View File

@ -354,8 +354,8 @@ func asConsensusExecutionPayload*(rpcExecutionPayload: ExecutionPayloadV2):
capella.ExecutionPayload = capella.ExecutionPayload =
template getTransaction(tt: TypedTransaction): bellatrix.Transaction = template getTransaction(tt: TypedTransaction): bellatrix.Transaction =
bellatrix.Transaction.init(tt.distinctBase) bellatrix.Transaction.init(tt.distinctBase)
template getConsensusWithdrawal(w: WithdrawalV1): Withdrawal = template getConsensusWithdrawal(w: WithdrawalV1): capella.Withdrawal =
Withdrawal( capella.Withdrawal(
index: w.index.uint64, index: w.index.uint64,
validator_index: w.validatorIndex.uint64, validator_index: w.validatorIndex.uint64,
address: ExecutionAddress(data: w.address.distinctBase), address: ExecutionAddress(data: w.address.distinctBase),
@ -380,7 +380,7 @@ func asConsensusExecutionPayload*(rpcExecutionPayload: ExecutionPayloadV2):
block_hash: rpcExecutionPayload.blockHash.asEth2Digest, block_hash: rpcExecutionPayload.blockHash.asEth2Digest,
transactions: List[bellatrix.Transaction, MAX_TRANSACTIONS_PER_PAYLOAD].init( transactions: List[bellatrix.Transaction, MAX_TRANSACTIONS_PER_PAYLOAD].init(
mapIt(rpcExecutionPayload.transactions, it.getTransaction)), mapIt(rpcExecutionPayload.transactions, it.getTransaction)),
withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD].init( withdrawals: List[capella.Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD].init(
mapIt(rpcExecutionPayload.withdrawals, it.getConsensusWithdrawal))) mapIt(rpcExecutionPayload.withdrawals, it.getConsensusWithdrawal)))
func asEngineExecutionPayload*(executionPayload: bellatrix.ExecutionPayload): func asEngineExecutionPayload*(executionPayload: bellatrix.ExecutionPayload):