status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use correct decimal or hex encoding/decoding for REST GetSpec (#5371)

This commit is contained in:
tersec 2023-08-30 09:43:25 +00:00 committed by GitHub
parent f2d3859d80
commit 6c42cfa79e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/rpc/rest_config_api.nim
View File

@ -221,11 +221,11 @@ proc installConfigApiHandlers*(router: var RestRouter, node: BeaconNode) =
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/altair/beacon-chain.md#constants # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/altair/beacon-chain.md#constants
TIMELY_SOURCE_FLAG_INDEX: TIMELY_SOURCE_FLAG_INDEX:
to0xHex([byte(TIMELY_SOURCE_FLAG_INDEX)]), Base10.toString(uint64(ord(TIMELY_SOURCE_FLAG_INDEX))),
TIMELY_TARGET_FLAG_INDEX: TIMELY_TARGET_FLAG_INDEX:
to0xHex([byte(TIMELY_TARGET_FLAG_INDEX)]), Base10.toString(uint64(ord(TIMELY_TARGET_FLAG_INDEX))),
TIMELY_HEAD_FLAG_INDEX: TIMELY_HEAD_FLAG_INDEX:
to0xHex([byte(TIMELY_HEAD_FLAG_INDEX)]), Base10.toString(uint64(ord(TIMELY_HEAD_FLAG_INDEX))),
TIMELY_SOURCE_WEIGHT: TIMELY_SOURCE_WEIGHT:
Base10.toString(uint64(TIMELY_SOURCE_WEIGHT)), Base10.toString(uint64(TIMELY_SOURCE_WEIGHT)),
TIMELY_TARGET_WEIGHT: TIMELY_TARGET_WEIGHT:

5
beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim
View File

@ -921,10 +921,11 @@ proc readValue*(reader: var JsonReader[RestJson], T: type GraffitiBytes): T
except ValueError as err: except ValueError as err:
reader.raiseUnexpectedValue err.msg reader.raiseUnexpectedValue err.msg
## Version | ForkDigest | DomainType | GraffitiBytes ## Version | ForkDigest | DomainType | GraffitiBytes | RestWithdrawalPrefix
proc readValue*( proc readValue*(
reader: var JsonReader[RestJson], reader: var JsonReader[RestJson],
value: var (Version | ForkDigest | DomainType | GraffitiBytes)) {. value: var (Version | ForkDigest | DomainType | GraffitiBytes |
RestWithdrawalPrefix)) {.
raises: [IOError, SerializationError].} = raises: [IOError, SerializationError].} =
try: try:
hexToByteArray(reader.readValue(string), distinctBase(value)) hexToByteArray(reader.readValue(string), distinctBase(value))

8
beacon_chain/spec/eth2_apis/rest_types.nim
View File

@ -273,6 +273,8 @@ type
index*: ValidatorIndex index*: ValidatorIndex
is_live*: bool is_live*: bool
RestWithdrawalPrefix* = distinct array[1, byte]
# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/capella/beacon-chain.md#executionpayload # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/capella/beacon-chain.md#executionpayload
RestExecutionPayload* = object RestExecutionPayload* = object
# Execution block header fields # Execution block header fields
@ -441,8 +443,8 @@ type
# DEPOSIT_CONTRACT_TREE_DEPTH # DEPOSIT_CONTRACT_TREE_DEPTH
# JUSTIFICATION_BITS_LENGTH # JUSTIFICATION_BITS_LENGTH
# ENDIANNESS # ENDIANNESS
BLS_WITHDRAWAL_PREFIX*: byte BLS_WITHDRAWAL_PREFIX*: RestWithdrawalPrefix
ETH1_ADDRESS_WITHDRAWAL_PREFIX*: byte ETH1_ADDRESS_WITHDRAWAL_PREFIX*: RestWithdrawalPrefix
DOMAIN_BEACON_PROPOSER*: DomainType DOMAIN_BEACON_PROPOSER*: DomainType
DOMAIN_BEACON_ATTESTER*: DomainType DOMAIN_BEACON_ATTESTER*: DomainType
DOMAIN_RANDAO*: DomainType DOMAIN_RANDAO*: DomainType
@ -998,3 +1000,5 @@ func init*(t: typedesc[RestSignedContributionAndProof],
message.contribution message.contribution
), ),
signature: signature) signature: signature)
func len*(p: RestWithdrawalPrefix): int = sizeof(p)