Skip to content

Fix incompatible uint64 chain ID remenants #7011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tersec merged 1 commit into from
Mar 13, 2025
Merged

Fix incompatible uint64 chain ID remenants #7011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions beacon_chain/libnimbus_lc/libnimbus_lc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,11 @@ const ETHTransaction *ETHTransactionsGet(
ETH_RESULT_USE_CHECK
const ETHRoot *ETHTransactionGetHash(const ETHTransaction *transaction);

/**
* Chain ID.
*/
typedef ETHUInt256 ETHChainId;

/**
* Obtains the chain ID of a transaction.
*
Expand All @@ -1218,7 +1223,7 @@ const ETHRoot *ETHTransactionGetHash(const ETHTransaction *transaction);
* @return Chain ID.
*/
ETH_RESULT_USE_CHECK
const uint64_t *ETHTransactionGetChainId(const ETHTransaction *transaction);
const ETHChainId *ETHTransactionGetChainId(const ETHTransaction *transaction);

/**
* Obtains the from address of a transaction.
Expand Down Expand Up @@ -1570,7 +1575,7 @@ const ETHAuthorization *ETHAuthorizationListGet(
* @return Chain ID.
*/
ETH_RESULT_USE_CHECK
const uint64_t *ETHAuthorizationGetChainId(
const ETHChainId *ETHAuthorizationGetChainId(
const ETHAuthorization *authorization);

/**
Expand Down
13 changes: 5 additions & 8 deletions beacon_chain/libnimbus_lc/libnimbus_lc.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,15 +1421,15 @@ type
storageKeys: seq[Eth2Digest]

ETHAuthorization = object
chainId: UInt256
chainId: ChainId
address: ExecutionAddress
nonce: uint64
authority: ExecutionAddress
signature: seq[byte]

ETHTransaction = object
hash: Eth2Digest
chainId: UInt256
chainId: ChainId
`from`: ExecutionAddress
nonce: uint64
maxPriorityFeePerGas: uint64
Expand Down Expand Up @@ -1539,8 +1539,6 @@ proc ETHTransactionsCreateFromJson(

# Construct transaction
static:
doAssert sizeof(UInt256) == sizeof(ChainId)
doAssert sizeof(UInt256) == sizeof(data.chainId.get)
doAssert sizeof(uint64) == sizeof(data.gas)
doAssert sizeof(uint64) == sizeof(data.gasPrice)
doAssert sizeof(uint64) == sizeof(data.maxPriorityFeePerGas.get)
Expand All @@ -1556,13 +1554,12 @@ proc ETHTransactionsCreateFromJson(
return nil
if data.authorizationList.isSome:
for authorization in data.authorizationList.get:
static: doAssert sizeof(UInt256) == sizeof(authorization.chainId)
if authorization.v > uint8.high:
return nil
let
tx = eth_types.EthTransaction(
txType: txType,
chainId: data.chainId.get(0.u256),
chainId: data.chainId.get(0.chainId),
nonce: distinctBase(data.nonce),
gasPrice: data.gasPrice.GasInt,
maxPriorityFeePerGas:
Expand Down Expand Up @@ -1755,7 +1752,7 @@ func ETHTransactionGetHash(
addr transaction[].hash

func ETHTransactionGetChainId(
transaction: ptr ETHTransaction): ptr UInt256 {.exported.} =
transaction: ptr ETHTransaction): ptr ChainId {.exported.} =
## Obtains the chain ID of a transaction.
##
## * The returned value is allocated in the given transaction.
Expand Down Expand Up @@ -2115,7 +2112,7 @@ func ETHAuthorizationListGet(
addr authorizationList[][authorizationIndex.int]

func ETHAuthorizationGetChainId(
authorization: ptr ETHAuthorization): ptr UInt256 {.exported.} =
authorization: ptr ETHAuthorization): ptr ChainId {.exported.} =
## Obtains the chain ID of an authorization tuple.
##
## * The returned value is allocated in the given authorization tuple.
Expand Down
6 changes: 3 additions & 3 deletions beacon_chain/libnimbus_lc/test_libnimbus_lc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* beacon_chain
* Copyright (c) 2023-2024 Status Research & Development GmbH
* Copyright (c) 2023-2025 Status Research & Development GmbH
* Licensed and distributed under either of
* * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
* * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
Expand Down Expand Up @@ -464,7 +464,7 @@ int main(void)
printHexString(transactionHash, sizeof *transactionHash);
printf("\n");

const uint64_t *transactionChainId = ETHTransactionGetChainId(transaction);
const ETHChainId *transactionChainId = ETHTransactionGetChainId(transaction);
printf(" - chain_id: ");
printHexStringReversed(transactionChainId, sizeof *transactionChainId);
printf("\n");
Expand Down Expand Up @@ -558,7 +558,7 @@ int main(void)
printHexString(authority, sizeof *authority);
printf("\n");

const uint64_t *chainId = ETHAuthorizationGetChainId(authorization);
const ETHChainId *chainId = ETHAuthorizationGetChainId(authorization);
printf(" - chain_id: ");
printHexStringReversed(chainId, sizeof *chainId);
printf("\n");
Expand Down