diff --git a/WORKSPACE b/WORKSPACE index 3b6c295a7f..16e8cd0780 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -205,7 +205,7 @@ go_repository( go_repository( name = "com_github_prysmaticlabs_go_ssz", - commit = "72881c4223d824701b737af31cc987968510b228", + commit = "9193cae6b7c3347054706b8466db139b8be90985", importpath = "github.com/prysmaticlabs/go-ssz", ) diff --git a/beacon-chain/blockchain/forkchoice/lmd_ghost_test.yaml b/beacon-chain/blockchain/forkchoice/lmd_ghost_test.yaml index 19267e9720..df21c306ea 100644 --- a/beacon-chain/blockchain/forkchoice/lmd_ghost_test.yaml +++ b/beacon-chain/blockchain/forkchoice/lmd_ghost_test.yaml @@ -44,7 +44,7 @@ test_cases: b1: 5 b2: 6 b3: 6 - head: 'b2' + head: 'b3' # Equal weights children, GHOST chooses b2 because it is higher lexicographically than b1 - blocks: - id: 'b0' diff --git a/beacon-chain/core/blocks/block_operations.go b/beacon-chain/core/blocks/block_operations.go index cbf82ee25c..791e34b7d0 100644 --- a/beacon-chain/core/blocks/block_operations.go +++ b/beacon-chain/core/blocks/block_operations.go @@ -949,7 +949,6 @@ func ProcessDeposit(beaconState *pb.BeaconState, deposit *ethpb.Deposit, valInde amount := deposit.Data.Amount index, ok := valIndexMap[bytesutil.ToBytes32(pubKey)] if !ok { - domain := helpers.Domain(beaconState, helpers.CurrentEpoch(beaconState), params.BeaconConfig().DomainDeposit) depositSig := deposit.Data.Signature if err := verifySigningRoot(deposit.Data, pubKey, depositSig, domain); err != nil { diff --git a/beacon-chain/core/epoch/epoch_processing_test.go b/beacon-chain/core/epoch/epoch_processing_test.go index 0639210ecd..8a63ab2cef 100644 --- a/beacon-chain/core/epoch/epoch_processing_test.go +++ b/beacon-chain/core/epoch/epoch_processing_test.go @@ -400,7 +400,7 @@ func TestWinningCrosslink_CanGetWinningRoot(t *testing.T) { } want := ðpb.Crosslink{StartEpoch: ge, Shard: 1, DataRoot: []byte{'B'}} if !reflect.DeepEqual(winner, want) { - t.Errorf("Did not get wanted crosslink, got: %v", winner) + t.Errorf("Did not get wanted crosslink, got: %v, want %v", winner, want) } } diff --git a/tools/genesis-state-gen/main.go b/tools/genesis-state-gen/main.go index 81c38deef1..c912cf4458 100644 --- a/tools/genesis-state-gen/main.go +++ b/tools/genesis-state-gen/main.go @@ -186,7 +186,7 @@ func createDepositData(privKey *bls.SecretKey, pubKey *bls.PublicKey) (*ethpb.De WithdrawalCredentials: withdrawalCredentialsHash(pubKey.Marshal()), Amount: params.BeaconConfig().MaxEffectiveBalance, } - sr, err := ssz.HashTreeRoot(di) + sr, err := ssz.SigningRoot(di) if err != nil { return nil, err }