From 9572bb87218c8daf1545838d6a25fd4572e5fe63 Mon Sep 17 00:00:00 2001 From: tersec Date: Tue, 29 Nov 2022 11:04:36 +0000 Subject: [PATCH] fix effective merge conflict between #s 4357 and 4358 around Withdrawal symbol ambiguity (#4370) --- beacon_chain/eth1/eth1_monitor.nim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/beacon_chain/eth1/eth1_monitor.nim b/beacon_chain/eth1/eth1_monitor.nim index 6cc4dac14..676b71358 100644 --- a/beacon_chain/eth1/eth1_monitor.nim +++ b/beacon_chain/eth1/eth1_monitor.nim @@ -354,8 +354,8 @@ func asConsensusExecutionPayload*(rpcExecutionPayload: ExecutionPayloadV2): capella.ExecutionPayload = template getTransaction(tt: TypedTransaction): bellatrix.Transaction = bellatrix.Transaction.init(tt.distinctBase) - template getConsensusWithdrawal(w: WithdrawalV1): Withdrawal = - Withdrawal( + template getConsensusWithdrawal(w: WithdrawalV1): capella.Withdrawal = + capella.Withdrawal( index: w.index.uint64, validator_index: w.validatorIndex.uint64, address: ExecutionAddress(data: w.address.distinctBase), @@ -380,7 +380,7 @@ func asConsensusExecutionPayload*(rpcExecutionPayload: ExecutionPayloadV2): block_hash: rpcExecutionPayload.blockHash.asEth2Digest, transactions: List[bellatrix.Transaction, MAX_TRANSACTIONS_PER_PAYLOAD].init( 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))) func asEngineExecutionPayload*(executionPayload: bellatrix.ExecutionPayload):