mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2025-01-11 12:10:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better eth1data equals (#4712)

Browse Source 
* Better eth1data equals
* Merge branch 'master' into better-eth1-data-equal
This commit is contained in:
Preston Van Loon 2020-02-01 17:03:21 -08:00 committed by GitHub
parent 79434fc2d1
commit b7e6012628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon-chain/core/blocks/block_operations.go
View File

@ -117,6 +117,12 @@ func ProcessEth1DataInBlock(beaconState *stateTrie.BeaconState, block *ethpb.Bea
return beaconState, nil return beaconState, nil
} }
func areEth1DataEqual(a, b *ethpb.Eth1Data) bool {
return a.DepositCount == b.DepositCount &&
bytes.Equal(a.BlockHash, b.BlockHash) &&
bytes.Equal(a.DepositRoot, b.DepositRoot)
}
// Eth1DataHasEnoughSupport returns true when the given eth1data has more than 50% votes in the // Eth1DataHasEnoughSupport returns true when the given eth1data has more than 50% votes in the
// eth1 voting period. A vote is cast by including eth1data in a block and part of state processing // eth1 voting period. A vote is cast by including eth1data in a block and part of state processing
// appends eth1data to the state in the Eth1DataVotes list. Iterating through this list checks the // appends eth1data to the state in the Eth1DataVotes list. Iterating through this list checks the
@ -139,7 +145,7 @@ func Eth1DataHasEnoughSupport(beaconState *stateTrie.BeaconState, data *ethpb.Et
} }
if voteCount == 0 { if voteCount == 0 {
for _, vote := range beaconState.Eth1DataVotes() { for _, vote := range beaconState.Eth1DataVotes() {
if proto.Equal(vote, data) { if areEth1DataEqual(vote, data) {
voteCount++ voteCount++
} }
} }