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

Move State Protos Into V2 Namespace (#9257)

Browse Source 
* move state protos

* regen ssz

* edit v1 code

* fix imports

* building

* beacon chain builds

* validator and shared builds

* fuzz builds

* changes

* spectest builds

* tools build

* remove import cycle

* generate ssz

* pcli

* gaz

* kafka

* gaz
This commit is contained in:
Raul Jordan
2021-07-23 08:07:40 -05:00
committed by GitHub
parent 526596a679
commit 2d10bcf179
270 changed files with 1548 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,9 @@ go_library(
"//beacon-chain/core/state:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//proto/prysm/v1alpha1/wrapper:go_default_library",
"//proto/prysm/v2/state:go_default_library",
"//shared/benchutil:go_default_library",
"//shared/fileutil:go_default_library",
"//shared/interop:go_default_library",

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

@@ -14,9 +14,9 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
statepb "github.com/prysmaticlabs/prysm/proto/prysm/v2/state"
"github.com/prysmaticlabs/prysm/shared/benchutil"
"github.com/prysmaticlabs/prysm/shared/fileutil"
"github.com/prysmaticlabs/prysm/shared/interop"
@@ -211,7 +211,7 @@ func genesisBeaconState() (iface.BeaconState, error) {
if err != nil {
return nil, errors.Wrap(err, "cannot read genesis state file")
}
genesisState := &pb.BeaconState{}
genesisState := &statepb.BeaconState{}
if err := genesisState.UnmarshalSSZ(beaconBytes); err != nil {
return nil, errors.Wrap(err, "cannot unmarshal genesis state file")
}

2
tools/bootnode/BUILD.bazel
View File

@@ -11,7 +11,7 @@ go_library(
visibility = ["//visibility:private"],
deps = [
"//beacon-chain/core/helpers:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/prysm/v2:go_default_library",
"//shared/bytesutil:go_default_library",
"//shared/iputils:go_default_library",
"//shared/logutil:go_default_library",

2
tools/bootnode/bootnode.go
View File

@@ -33,7 +33,7 @@ import (
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/iputils"
"github.com/prysmaticlabs/prysm/shared/logutil"

2
tools/exploredb/BUILD.bazel
View File

@@ -9,8 +9,8 @@ go_library(
deps = [
"//beacon-chain/db/kv:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//proto/prysm/v2/state:go_default_library",
"//shared/bytesutil:go_default_library",
"@com_github_dustin_go_humanize//:go_default_library",
"@com_github_prysmaticlabs_eth2_types//:go_default_library",

4
tools/exploredb/main.go
View File

@@ -20,8 +20,8 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/db/kv"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
statepb "github.com/prysmaticlabs/prysm/proto/prysm/v2/state"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
log "github.com/sirupsen/logrus"
"github.com/status-im/keycard-go/hexutils"
@@ -421,7 +421,7 @@ func sizeAndCountGeneric(genericItems interface{}, err error) (uint64, uint64) {
size += uint64(item.SizeSSZ())
}
count = uint64(len(items))
case []*pbp2p.PendingAttestation:
case []*statepb.PendingAttestation:
for _, item := range items {
size += uint64(item.SizeSSZ())
}

2
tools/genesis-state-gen/BUILD.bazel
View File

@@ -10,8 +10,8 @@ go_library(
importpath = "github.com/prysmaticlabs/prysm/tools/genesis-state-gen",
visibility = ["//visibility:private"],
deps = [
"//proto/beacon/p2p/v1:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//proto/prysm/v2/state:go_default_library",
"//shared/fileutil:go_default_library",
"//shared/interop:go_default_library",
"//shared/params:go_default_library",

6
tools/genesis-state-gen/main.go
View File

@@ -12,8 +12,8 @@ import (
"strings"
"github.com/ghodss/yaml"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
statepb "github.com/prysmaticlabs/prysm/proto/prysm/v2/state"
"github.com/prysmaticlabs/prysm/shared/fileutil"
"github.com/prysmaticlabs/prysm/shared/interop"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -55,7 +55,7 @@ func main() {
if !*useMainnetConfig {
params.OverrideBeaconConfig(params.MinimalSpecConfig())
}
var genesisState *pb.BeaconState
var genesisState *statepb.BeaconState
var err error
if *depositJSONFile != "" {
inputFile := *depositJSONFile
@@ -131,7 +131,7 @@ func main() {
}
}
func genesisStateFromJSONValidators(r io.Reader, genesisTime uint64) (*pb.BeaconState, error) {
func genesisStateFromJSONValidators(r io.Reader, genesisTime uint64) (*statepb.BeaconState, error) {
enc, err := ioutil.ReadAll(r)
if err != nil {
return nil, err

2
tools/pcli/BUILD.bazel
View File

@@ -12,9 +12,9 @@ go_library(
deps = [
"//beacon-chain/core/state:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//proto/prysm/v1alpha1/wrapper:go_default_library",
"//proto/prysm/v2/state:go_default_library",
"//shared/sszutil:go_default_library",
"//shared/version:go_default_library",
"@com_github_ferranbt_fastssz//:go_default_library",

10
tools/pcli/main.go
View File

@@ -13,9 +13,9 @@ import (
"github.com/kr/pretty"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper"
statepb "github.com/prysmaticlabs/prysm/proto/prysm/v2/state"
"github.com/prysmaticlabs/prysm/shared/sszutil"
"github.com/prysmaticlabs/prysm/shared/version"
log "github.com/sirupsen/logrus"
@@ -82,7 +82,7 @@ func main() {
case "deposit":
data = &ethpb.Deposit{}
case "deposit_message":
data = &pb.DepositMessage{}
data = &statepb.DepositMessage{}
case "proposer_slashing":
data = &ethpb.ProposerSlashing{}
case "signed_block_header":
@@ -92,7 +92,7 @@ func main() {
case "voluntary_exit":
data = &ethpb.VoluntaryExit{}
case "state":
data = &pb.BeaconState{}
data = &statepb.BeaconState{}
default:
log.Fatal("Invalid type")
}
@@ -156,7 +156,7 @@ func main() {
}
preStatePath = text
}
preState := &pb.BeaconState{}
preState := &statepb.BeaconState{}
if err := dataFetcher(preStatePath, preState); err != nil {
log.Fatal(err)
}
@@ -188,7 +188,7 @@ func main() {
// Diff the state if a post state is provided.
if expectedPostStatePath != "" {
expectedState := &pb.BeaconState{}
expectedState := &statepb.BeaconState{}
if err := dataFetcher(expectedPostStatePath, expectedState); err != nil {
log.Fatal(err)
}