Skip to content

Commit 5d940b4

Browse files
authored
Bump nim-eth to 66297c5c0a8c22ec3f16c899e902d79aa00df575 (#6669)
1 parent 250a80e commit 5d940b4

File tree

3 files changed

+9
-25
lines changed

3 files changed

+9
-25
lines changed

beacon_chain/libnimbus_lc/libnimbus_lc.nim

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import
1111
std/[json, sequtils, times],
1212
eth/common/eth_types_rlp,
13-
eth/keys,
13+
eth/common/keys,
1414
eth/p2p/discoveryv5/random2,
1515
eth/rlp,
1616
eth/trie/ordered_trie,
@@ -1188,9 +1188,7 @@ type
11881188
requestsHash: Eth2Digest
11891189

11901190
template append*(
1191-
w: var RlpWriter, v:
1192-
ETHWithdrawal | ETHDepositRequest | ETHWithdrawalRequest |
1193-
ETHConsolidationRequest) =
1191+
w: var RlpWriter, v: ETHWithdrawal) =
11941192
w.appendRawBytes(v.bytes)
11951193

11961194
proc ETHExecutionBlockHeaderCreateFromJson(

beacon_chain/spec/helpers.nim

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -446,29 +446,15 @@ proc computeTransactionsTrieRoot(
446446
payload: ForkyExecutionPayload): EthHash32 =
447447
orderedTrieRoot(payload.transactions.asSeq)
448448

449-
func append*(w: var RlpWriter, request: electra.DepositRequest) =
450-
w.append EthDepositRequest(
451-
pubkey: Bytes48 request.pubkey.blob,
452-
withdrawalCredentials: Bytes32 request.withdrawal_credentials.data,
453-
amount: distinctBase(request.amount),
454-
signature: Bytes96 request.signature.blob,
455-
index: request.index)
456-
457-
func append*(w: var RlpWriter, request: electra.WithdrawalRequest) =
458-
w.append EthWithdrawalRequest(
459-
sourceAddress: Address request.source_address.data,
460-
validatorPubkey: Bytes48 request.validator_pubkey.blob,
461-
amount: distinctBase(request.amount))
462-
463-
func append*(w: var RlpWriter, request: electra.ConsolidationRequest) =
464-
w.append EthConsolidationRequest(
465-
sourceAddress: Address request.source_address.data,
466-
sourcePubkey: Bytes48 request.source_pubkey.blob,
467-
targetPubkey: Bytes48 request.target_pubkey.blob)
468-
469449
# https://eips.ethereum.org/EIPS/eip-7685
470450
func computeRequestsHash(
471451
requests: electra.ExecutionRequests): EthHash32 =
452+
453+
const
454+
DEPOSIT_REQUEST_TYPE = 0x00'u8 # EIP-6110
455+
WITHDRAWAL_REQUEST_TYPE = 0x01'u8 # EIP-7002
456+
CONSOLIDATION_REQUEST_TYPE = 0x02'u8 # EIP-7251
457+
472458
let requestsHash = computeDigest:
473459
template mixInRequests(requestType, requestList): untyped =
474460
block:

0 commit comments

Comments
 (0)