Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add in Proposer Index to Custom HTR #5269

Merged
merged 9 commits into from
Apr 1, 2020
Merged

Add in Proposer Index to Custom HTR #5269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7127b0b
fix test
nisdas Apr 1, 2020
ef4cbe2
Update beacon-chain/state/stateutil/blocks_test.go
terencechain Apr 1, 2020
724c6a4
Merge refs/heads/v0.11 into addInProposerIndex
prylabs-bulldozer[bot] Apr 1, 2020
33750a4
Merge refs/heads/v0.11 into addInProposerIndex
prylabs-bulldozer[bot] Apr 1, 2020
093c317
Merge refs/heads/v0.11 into addInProposerIndex
prylabs-bulldozer[bot] Apr 1, 2020
6d958b0
Merge refs/heads/v0.11 into addInProposerIndex
prylabs-bulldozer[bot] Apr 1, 2020
09d0f3d
Merge refs/heads/v0.11 into addInProposerIndex
prylabs-bulldozer[bot] Apr 1, 2020
b148d7d
Merge refs/heads/v0.11 into addInProposerIndex
prylabs-bulldozer[bot] Apr 1, 2020
939edfa
Merge refs/heads/v0.11 into addInProposerIndex
prylabs-bulldozer[bot] Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions beacon-chain/state/stateutil/blocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,25 @@ func BlockRoot(blk *ethpb.BeaconBlock) ([32]byte, error) {
if !featureconfig.Get().EnableBlockHTR {
return ssz.HashTreeRoot(blk)
}
fieldRoots := make([][32]byte, 4)
fieldRoots := make([][32]byte, 5)
if blk != nil {
headerSlotBuf := make([]byte, 8)
binary.LittleEndian.PutUint64(headerSlotBuf, blk.Slot)
headerSlotRoot := bytesutil.ToBytes32(headerSlotBuf)
fieldRoots[0] = headerSlotRoot
proposerIdxBuf := make([]byte, 8)
binary.LittleEndian.PutUint64(proposerIdxBuf, blk.ProposerIndex)
proposerIndexRoot := bytesutil.ToBytes32(proposerIdxBuf)
fieldRoots[1] = proposerIndexRoot
parentRoot := bytesutil.ToBytes32(blk.ParentRoot)
fieldRoots[1] = parentRoot
fieldRoots[2] = parentRoot
stateRoot := bytesutil.ToBytes32(blk.StateRoot)
fieldRoots[2] = stateRoot
fieldRoots[3] = stateRoot
bodyRoot, err := BlockBodyRoot(blk.Body)
if err != nil {
return [32]byte{}, err
}
fieldRoots[3] = bodyRoot
fieldRoots[4] = bodyRoot
}
return bitwiseMerkleizeArrays(hashutil.CustomSHA256Hasher(), fieldRoots, uint64(len(fieldRoots)), uint64(len(fieldRoots)))
}
Expand Down
5 changes: 5 additions & 0 deletions beacon-chain/state/stateutil/blocks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@ package stateutil_test
import (
"testing"

"github.com/prysmaticlabs/prysm/shared/featureconfig"

terencechain marked this conversation as resolved.
Show resolved Hide resolved
"github.com/prysmaticlabs/go-ssz"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
"github.com/prysmaticlabs/prysm/shared/testutil"
)

func TestBlockRoot(t *testing.T) {
f := featureconfig.Get()
f.EnableBlockHTR = true
featureconfig.Init(f)
genState, keys := testutil.DeterministicGenesisState(t, 100)
blk, err := testutil.GenerateFullBlock(genState, keys, testutil.DefaultBlockGenConfig(), 10)
if err != nil {
Expand Down