status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-10 14:26:26 +00:00
Code Issues Projects Releases Wiki Activity

update get_attesting_indices(...) to 0.8.3; mark IndexedAttestation, Attestation, PendingAttestation, and get_randao_mix(...) as 0.8.3; rm duplicate/dead code get_unslashed_attesting_indices(...) (#391)

Browse Source
This commit is contained in:
Dustin Brody 2019-09-06 19:58:38 +00:00 committed by Mamy Ratsimbazafy
parent e3bd4410d8
commit 0c174036a5
4 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_chain/spec/beaconstate.nim
View File

@ -414,19 +414,17 @@ func is_valid_indexed_attestation*(
),
)
# https://github.com/ethereum/eth2.0-specs/blob/v0.7.1/specs/core/0_beacon-chain.md#get_attesting_indices
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.3/specs/core/0_beacon-chain.md#get_attesting_indices
func get_attesting_indices*(state: BeaconState,
attestation_data: AttestationData,
data: AttestationData,
bits: CommitteeValidatorsBits,
stateCache: var StateCache):
HashSet[ValidatorIndex] =
## Return the sorted attesting indices corresponding to ``attestation_data``
## and ``bitfield``.
# Return the set of attesting indices corresponding to ``data`` and ``bits``.
result = initSet[ValidatorIndex]()
let committee =
get_crosslink_committee(
state, attestation_data.target.epoch, attestation_data.crosslink.shard,
stateCache)
state, data.target.epoch, data.crosslink.shard, stateCache)
for i, index in committee:
if bits[i]:
result.incl index

42
beacon_chain/spec/datatypes.nim
View File

@ -100,33 +100,25 @@ type
CustodyBitIndices* = List[uint64, MAX_VALIDATORS_PER_COMMITTEE]
# https://github.com/ethereum/eth2.0-specs/blob/v0.7.1/specs/core/0_beacon-chain.md#indexedattestation
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.3/specs/core/0_beacon-chain.md#indexedattestation
IndexedAttestation* = object
# These probably should be seq[ValidatorIndex], but that throws RLP errors
custody_bit_0_indices*: CustodyBitIndices
custody_bit_1_indices*: CustodyBitIndices
custody_bit_0_indices*: CustodyBitIndices ##\
## Indices with custody bit equal to 0
data*: AttestationData ## \
## Attestation data
custody_bit_1_indices*: CustodyBitIndices ##\
## Indices with custody bit equal to 1
signature*: ValidatorSig ## \
## Aggregate signature
data*: AttestationData
signature*: ValidatorSig
CommitteeValidatorsBits* = BitList[MAX_VALIDATORS_PER_COMMITTEE]
# https://github.com/ethereum/eth2.0-specs/blob/v0.7.1/specs/core/0_beacon-chain.md#attestation
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.3/specs/core/0_beacon-chain.md#attestation
Attestation* = object
aggregation_bits*: CommitteeValidatorsBits ##\
## Attester aggregation bitfield
data*: AttestationData ##\
## Attestation data
custody_bits*: CommitteeValidatorsBits ##\
## Custody bitfield
signature*: ValidatorSig ##\
## BLS aggregate signature
aggregation_bits*: CommitteeValidatorsBits
data*: AttestationData
custody_bits*: CommitteeValidatorsBits
signature*: ValidatorSig
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.3/specs/core/0_beacon-chain.md#checkpoint
Checkpoint* = object
@ -356,12 +348,12 @@ type
data_root*: Eth2Digest
# https://github.com/ethereum/eth2.0-specs/blob/v0.7.1/specs/core/0_beacon-chain.md#pendingattestation
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.3/specs/core/0_beacon-chain.md#pendingattestation
PendingAttestation* = object
aggregation_bits*: CommitteeValidatorsBits ## Attester participation bitfield
data*: AttestationData ## Attestation data
inclusion_delay*: uint64 ## Inclusion delay
proposer_index*: uint64 ## Proposer index
aggregation_bits*: CommitteeValidatorsBits
data*: AttestationData
inclusion_delay*: uint64
proposer_index*: uint64
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.3/specs/core/0_beacon-chain.md#historicalbatch
HistoricalBatch* = object

2
beacon_chain/spec/helpers.nim
View File

@ -98,7 +98,7 @@ func get_current_epoch*(state: BeaconState): Epoch =
doAssert state.slot >= GENESIS_SLOT, $state.slot
compute_epoch_of_slot(state.slot)
# https://github.com/ethereum/eth2.0-specs/blob/v0.7.1/specs/core/0_beacon-chain.md#get_randao_mix
# https://github.com/ethereum/eth2.0-specs/blob/v0.8.3/specs/core/0_beacon-chain.md#get_randao_mix
func get_randao_mix*(state: BeaconState,
epoch: Epoch): Eth2Digest =
## Returns the randao mix at a recent ``epoch``.

8
beacon_chain/spec/state_transition_block.nim
View File

@ -247,14 +247,6 @@ func get_attesting_indices(
result = result.union(get_attesting_indices(
state, a.data, a.aggregation_bits, stateCache))
func get_unslashed_attesting_indices(
state: BeaconState, attestations: openarray[PendingAttestation],
stateCache: var StateCache): HashSet[ValidatorIndex] =
result = get_attesting_indices(state, attestations, stateCache)
for index in result:
if state.validators[index].slashed:
result.excl index
# https://github.com/ethereum/eth2.0-specs/blob/v0.6.3/specs/core/0_beacon-chain.md#attestations
proc processAttestations*(
state: var BeaconState, blck: BeaconBlock, flags: UpdateFlags,