github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update fastssz: Attempt 2 (#7115)

Browse Source 
* Revert "Revert "Update fastssz" (#7100)"

This reverts commit b954db9704.
* Preston's patch
* Merge branch 'master' of github.com:prysmaticlabs/prysm into revert-7100-revert-6760-update-fssz
* Update fssz, add regression test case
* more HTR with fssz
* fix some tests
* only one test left
* Make it so that HTR will work
* gofmt, imports
* gofmt, imports
* fix
* Merge branch 'master' of github.com:prysmaticlabs/prysm into revert-7100-revert-6760-update-fssz
* fix
* Merge branch 'master' into revert-7100-revert-6760-update-fssz
* Merge refs/heads/master into revert-7100-revert-6760-update-fssz
* gaz
* Merge branch 'revert-7100-revert-6760-update-fssz' of github.com:prysmaticlabs/prysm into revert-7100-revert-6760-update-fssz
* Merge refs/heads/master into revert-7100-revert-6760-update-fssz
* fix test
* Merge branch 'revert-7100-revert-6760-update-fssz' of github.com:prysmaticlabs/prysm into revert-7100-revert-6760-update-fssz
* Merge refs/heads/master into revert-7100-revert-6760-update-fssz
This commit is contained in:
Preston Van Loon
2020-08-27 11:13:32 -07:00
committed by GitHub
parent 7d28146e1e
commit b7175b3482
194 changed files with 4696 additions and 3029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
beacon-chain/sync/pending_blocks_queue.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/pkg/errors"
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/rand"
@@ -84,7 +83,7 @@ func (s *Service) processPendingBlocks(ctx context.Context) error {
inPendingQueue := s.seenPendingBlocks[bytesutil.ToBytes32(b.Block.ParentRoot)]
s.pendingQueueLock.RUnlock()
blkRoot, err := stateutil.BlockRoot(b.Block)
blkRoot, err := b.Block.HashTreeRoot()
if err != nil {
traceutil.AnnotateError(span, err)
span.End()
@@ -225,7 +224,7 @@ func (s *Service) validatePendingSlots() error {
epoch := helpers.SlotToEpoch(slot)
// remove all descendant blocks of old blocks
if oldBlockRoots[bytesutil.ToBytes32(b.Block.ParentRoot)] {
root, err := stateutil.BlockRoot(b.Block)
root, err := b.Block.HashTreeRoot()
if err != nil {
return err
}
@@ -235,7 +234,7 @@ func (s *Service) validatePendingSlots() error {
}
// don't process old blocks
if finalizedEpoch > 0 && epoch <= finalizedEpoch {
blkRoot, err := stateutil.BlockRoot(b.Block)
blkRoot, err := b.Block.HashTreeRoot()
if err != nil {
return err
}