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.

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

Prysmctl add eth1Data to genesis state #12125

Merged
merged 4 commits into from
Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 5 additions & 0 deletions cmd/prysmctl/testnet/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@ go_library(
"//beacon-chain/state/state-native:go_default_library",
"//cmd/flags:go_default_library",
"//config/params:go_default_library",
"//contracts/deposit:go_default_library",
"//io/file:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//runtime/interop:go_default_library",
"//runtime/version:go_default_library",
"@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library",
"@com_github_ethereum_go_ethereum//common:go_default_library",
"@com_github_ethereum_go_ethereum//ethclient:go_default_library",
"@com_github_ethereum_go_ethereum//rpc:go_default_library",
"@com_github_ghodss_yaml//:go_default_library",
"@com_github_pkg_errors//:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
Expand Down
79 changes: 66 additions & 13 deletions cmd/prysmctl/testnet/generate_genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,49 @@ package testnet

import (
"context"
"encoding/binary"
"encoding/hex"
"encoding/json"
"fmt"
"io"
"os"
"strings"

"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/prysmaticlabs/prysm/v3/beacon-chain/core/altair"
"github.com/prysmaticlabs/prysm/v3/beacon-chain/core/capella"
"github.com/prysmaticlabs/prysm/v3/beacon-chain/core/execution"
"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
state_native "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/state-native"
"github.com/prysmaticlabs/prysm/v3/cmd/flags"
"github.com/prysmaticlabs/prysm/v3/runtime/version"

"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/prysmaticlabs/prysm/v3/config/params"
"github.com/prysmaticlabs/prysm/v3/contracts/deposit"
"github.com/prysmaticlabs/prysm/v3/io/file"
ethpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/v3/runtime/interop"
"github.com/prysmaticlabs/prysm/v3/runtime/version"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

var (
generateGenesisStateFlags = struct {
DepositJsonFile string
ChainConfigFile string
ConfigName string
NumValidators uint64
GenesisTime uint64
OutputSSZ string
OutputJSON string
OutputYaml string
ForkName string
DepositJsonFile string
ChainConfigFile string
ConfigName string
NumValidators uint64
GenesisTime uint64
OutputSSZ string
OutputJSON string
OutputYaml string
ForkName string
OverrideEth1Data bool
ExecutionEndpoint string
}{}
log = logrus.WithField("prefix", "genesis")
outputSSZFlag = &cli.StringFlag{
Expand Down Expand Up @@ -95,6 +102,18 @@ var (
Destination: &generateGenesisStateFlags.GenesisTime,
Usage: "Unix timestamp seconds used as the genesis time in the genesis state. If unset, defaults to now()",
},
&cli.BoolFlag{
Name: "override-eth1data",
Destination: &generateGenesisStateFlags.OverrideEth1Data,
Usage: "Overrides Eth1Data with values from execution client. If unset, defaults to false",
Value: false,
},
&cli.StringFlag{
Name: "execution-endpoint",
Destination: &generateGenesisStateFlags.ExecutionEndpoint,
Usage: "Endpoint to preferred execution client. If unset, defaults to Geth",
Value: "http://localhost:8545",
},
flags.EnumValue{
Name: "fork",
Usage: fmt.Sprintf("Name of the BeaconState schema to use in output encoding [%s]", strings.Join(versionNames(), ",")),
Expand Down Expand Up @@ -238,6 +257,7 @@ func generateGenesis(ctx context.Context) (*ethpb.BeaconState, error) {
genesisTime := generateGenesisStateFlags.GenesisTime
numValidators := generateGenesisStateFlags.NumValidators
depositJsonFile := generateGenesisStateFlags.DepositJsonFile
eth1Data := generateGenesisStateFlags.OverrideEth1Data
if depositJsonFile != "" {
expanded, err := file.ExpandPath(depositJsonFile)
if err != nil {
Expand Down Expand Up @@ -265,6 +285,39 @@ func generateGenesis(ctx context.Context) (*ethpb.BeaconState, error) {
if err != nil {
return nil, err
}
if eth1Data {
log.Print("Overriding Eth1Data with data from execution client")
conn, err := rpc.Dial(generateGenesisStateFlags.ExecutionEndpoint)
if err != nil {
return nil, errors.Wrapf(
err,
"could not dial %s please make sure you are running your execution client",
generateGenesisStateFlags.ExecutionEndpoint)
}
client := ethclient.NewClient(conn)
header, err := client.HeaderByNumber(ctx, nil)
if err != nil {
return nil, errors.Wrap(err, "could not get header by number")
}
depositContract, err := deposit.NewDepositContract(
common.HexToAddress(params.BeaconConfig().DepositContractAddress), client)
if err != nil {
return nil, errors.Wrap(err, "could not get deposit contract address")
}
depositRoot, err := depositContract.GetDepositRoot(&bind.CallOpts{})
if err != nil {
return nil, errors.Wrap(err, "could not get deposit root")
}
depositCount, err := depositContract.GetDepositCount(&bind.CallOpts{})
if err != nil {
return nil, errors.Wrap(err, "could not get deposit count")
}
genesisState.Eth1Data = &ethpb.Eth1Data{
DepositRoot: depositRoot[:],
DepositCount: binary.LittleEndian.Uint64(depositCount),
BlockHash: header.Hash().Bytes(),
}
}
return genesisState, err
}

Expand Down