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

ETH2 Types: Slot (#8408)

Browse Source 
* update shared/params

* update eth2-types deps

* update protobufs

* update shared/*

* fix testutil/state

* update beacon-chain/state

* update beacon-chain/db

* update tests

* fix test

* update beacon-chain/core

* update beacon-chain/blockchain

* update beacon-chain/cache

* beacon-chain/forkchoice

* update beacon-chain/operations

* update beacon-chain/p2p

* update beacon-chain/rpc

* update sync/initial-sync

* update deps

* update deps

* go fmt

* update beacon-chain/sync

* update endtoend/

* bazel build //beacon-chain - works w/o issues

* update slasher code

* udpate tools/

* update validator/

* update fastssz

* fix build

* fix test building

* update tests

* update ethereumapis deps

* fix tests

* update state/stategen

* fix build

* fix test

* add FarFutureSlot

* go imports

* Radek's suggestions

* Ivan's suggestions

* type conversions

* Nishant's suggestions

* add more tests to rpc_send_request

* fix test

* clean up

* fix conflicts

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
Co-authored-by: nisdas <nishdas93@gmail.com>
This commit is contained in:
Victor Farazdagi
2021-02-16 10:45:34 +03:00
committed by GitHub
parent aef5a7b428
commit a069738c20
294 changed files with 3071 additions and 2449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/benchmark-files-gen/BUILD.bazel
View File

@@ -18,6 +18,7 @@ go_library(
"//shared/params:go_default_library",
"//shared/testutil:go_default_library",
"@com_github_pkg_errors//:go_default_library",
"@com_github_prysmaticlabs_eth2_types//:go_default_library",
"@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library",
],
)

14
tools/benchmark-files-gen/main.go
View File

@@ -8,15 +8,15 @@ import (
"os"
"path"
stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state"
"github.com/prysmaticlabs/prysm/shared/fileutil"
"github.com/pkg/errors"
"github.com/prysmaticlabs/eth2-types"
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/benchutil"
"github.com/prysmaticlabs/prysm/shared/fileutil"
"github.com/prysmaticlabs/prysm/shared/interop"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil"
@@ -96,7 +96,7 @@ func generateMarshalledFullStateAndBlock() error {
conf := &testutil.BlockGenConfig{}
slotsPerEpoch := params.BeaconConfig().SlotsPerEpoch
// Small offset for the beacon state so we dont process a block on an epoch.
slotOffset := uint64(2)
slotOffset := types.Slot(2)
block, err := testutil.GenerateFullBlock(beaconState, privs, conf, slotsPerEpoch+slotOffset)
if err != nil {
return err
@@ -107,7 +107,7 @@ func generateMarshalledFullStateAndBlock() error {
}
attConfig := &testutil.BlockGenConfig{
NumAttestations: benchutil.AttestationsPerEpoch / slotsPerEpoch,
NumAttestations: benchutil.AttestationsPerEpoch / uint64(slotsPerEpoch),
}
var atts []*ethpb.Attestation
@@ -182,10 +182,10 @@ func generate2FullEpochState() error {
}
attConfig := &testutil.BlockGenConfig{
NumAttestations: benchutil.AttestationsPerEpoch / params.BeaconConfig().SlotsPerEpoch,
NumAttestations: benchutil.AttestationsPerEpoch / uint64(params.BeaconConfig().SlotsPerEpoch),
}
for i := uint64(0); i < params.BeaconConfig().SlotsPerEpoch*2-1; i++ {
for i := types.Slot(0); i < params.BeaconConfig().SlotsPerEpoch*2-1; i++ {
block, err := testutil.GenerateFullBlock(beaconState, privs, attConfig, beaconState.Slot())
if err != nil {
return err

1
tools/blocktree/BUILD.bazel
View File

@@ -12,6 +12,7 @@ go_library(
"//beacon-chain/db/kv:go_default_library",
"//shared/bytesutil:go_default_library",
"@com_github_emicklei_dot//:go_default_library",
"@com_github_prysmaticlabs_eth2_types//:go_default_library",
],
)

5
tools/blocktree/main.go
View File

@@ -16,6 +16,7 @@ import (
"strconv"
"github.com/emicklei/dot"
"github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
"github.com/prysmaticlabs/prysm/beacon-chain/db/kv"
@@ -47,8 +48,8 @@ func main() {
graph.Attr("rankdir", "RL")
graph.Attr("labeljust", "l")
startSlot := uint64(*startSlot)
endSlot := uint64(*endSlot)
startSlot := types.Slot(*startSlot)
endSlot := types.Slot(*endSlot)
filter := filters.NewFilter().SetStartSlot(startSlot).SetEndSlot(endSlot)
blks, roots, err := db.Blocks(context.Background(), filter)
if err != nil {

1
tools/extractor/BUILD.bazel
View File

@@ -11,6 +11,7 @@ go_library(
"//beacon-chain/db:go_default_library",
"//beacon-chain/db/kv:go_default_library",
"//shared/featureconfig:go_default_library",
"@com_github_prysmaticlabs_eth2_types//:go_default_library",
],
)

3
tools/extractor/main.go
View File

@@ -5,6 +5,7 @@ import (
"flag"
"fmt"
"github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop"
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/db/kv"
@@ -28,7 +29,7 @@ func main() {
panic(err)
}
ctx := context.Background()
slot := uint64(*state)
slot := types.Slot(*state)
_, roots, err := d.BlockRootsBySlot(ctx, slot)
if err != nil {
panic(err)