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

update beacon_validators to be more Nim 2.2-compatible (#6637)

This commit is contained in:
tersec 2024-10-11 13:39:45 +00:00 committed by GitHub
parent b4efaaa573
commit 5608a803d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
beacon_chain/gossip_processing/gossip_validation.nim
View File

@ -849,7 +849,6 @@ proc validateAttestation*(
Future[Result[ Future[Result[
tuple[attesting_index: ValidatorIndex, sig: CookedSig], tuple[attesting_index: ValidatorIndex, sig: CookedSig],
ValidationError]] {.async: (raises: [CancelledError]).} = ValidationError]] {.async: (raises: [CancelledError]).} =
debugComment "should reject a bunch"
# [REJECT] The attestation's epoch matches its target -- i.e. # [REJECT] The attestation's epoch matches its target -- i.e.
# attestation.data.target.epoch == # attestation.data.target.epoch ==
# compute_epoch_at_slot(attestation.data.slot) # compute_epoch_at_slot(attestation.data.slot)

1
beacon_chain/spec/beaconstate.nim
View File

@ -985,7 +985,6 @@ proc check_attestation*(
when on_chain: when on_chain:
var participants_count = 0'u64 var participants_count = 0'u64
debugComment "cache doesn't know about forks"
for index in attestation.committee_bits.oneIndices: for index in attestation.committee_bits.oneIndices:
if not (index.uint64 < get_committee_count_per_slot( if not (index.uint64 < get_committee_count_per_slot(
state, data.target.epoch, cache)): state, data.target.epoch, cache)):

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

@ -1941,8 +1941,6 @@ proc writeValue*(writer: var JsonWriter[RestJson],
proc writeValue*( proc writeValue*(
writer: var JsonWriter[RestJson], value: Web3SignerRequest writer: var JsonWriter[RestJson], value: Web3SignerRequest
) {.raises: [IOError].} = ) {.raises: [IOError].} =
debugComment "electra web3signer needs some EIP-7549 changes"
writer.beginRecord() writer.beginRecord()
case value.kind case value.kind
of Web3SignerRequestKind.AggregationSlot: of Web3SignerRequestKind.AggregationSlot:

2
beacon_chain/validators/beacon_validators.nim
View File

@ -487,7 +487,7 @@ proc makeBeaconBlockForHeadAndSlot*(
withState(state[]): withState(state[]):
when consensusFork >= ConsensusFork.Capella and when consensusFork >= ConsensusFork.Capella and
PayloadType.kind >= ConsensusFork.Capella: PayloadType.kind >= ConsensusFork.Capella:
let withdrawals = List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]( let withdrawals = List[capella.Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD](
get_expected_withdrawals(forkyState.data)) get_expected_withdrawals(forkyState.data))
if withdrawals_root.isNone or if withdrawals_root.isNone or
hash_tree_root(withdrawals) != withdrawals_root.get: hash_tree_root(withdrawals) != withdrawals_root.get: