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

refactor(cli): Refactor CollectGenesisDeposits to be callable from runtime #2464

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+56 −53
Open

refactor(cli): Refactor CollectGenesisDeposits to be callable from runtime #2464

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c45fbd8
Update collect.go
rezbera Feb 3, 2025
b747c43
Merge branch 'main' into minor-genesis-deposits-refactor
abi87 Feb 4, 2025
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
109 changes: 56 additions & 53 deletions cli/commands/genesis/collect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/berachain/beacon-kit/consensus-types/types"
"github.com/berachain/beacon-kit/errors"
"github.com/berachain/beacon-kit/primitives/encoding/json"
cmtcfg "github.com/cometbft/cometbft/config"
"github.com/cosmos/cosmos-sdk/x/genutil"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
"github.com/spf13/afero"
Expand All @@ -43,64 +44,66 @@ func CollectGenesisDepositsCmd() *cobra.Command {
Short: "adds a validator to the genesis file",
RunE: func(cmd *cobra.Command, _ []string) error {
config := context.GetConfigFromCmd(cmd)

appGenesis, err := genutiltypes.AppGenesisFromFile(
config.GenesisFile(),
)
if err != nil {
return errors.Wrap(err, "failed to read genesis doc from file")
}

// create the app state
appGenesisState, err := genutiltypes.GenesisStateFromAppGenesis(
appGenesis,
)
if err != nil {
return err
}

var deposits []*types.Deposit
if deposits, err = CollectValidatorJSONFiles(
filepath.Join(config.RootDir, "config", "premined-deposits"),
appGenesis,
); err != nil {
return errors.Wrap(
err,
"failed to collect validator json files",
)
}

genesisInfo := &types.Genesis{}

if err = json.Unmarshal(
appGenesisState["beacon"], genesisInfo,
); err != nil {
return errors.Wrap(err, "failed to unmarshal beacon genesis")
}

for i, deposit := range deposits {
deposit.Index = uint64(i) // #nosec G115 -- won't realistically overflow.
genesisInfo.Deposits = append(genesisInfo.Deposits, deposit)
}

appGenesisState["beacon"], err = json.Marshal(genesisInfo)
if err != nil {
return errors.Wrap(err, "failed to marshal beacon genesis")
}

if appGenesis.AppState, err = json.MarshalIndent(
appGenesisState, "", " ",
); err != nil {
return err
}

return genutil.ExportGenesisFile(appGenesis, config.GenesisFile())
return CollectGenesisDeposits(config)
},
}

return cmd
}

func CollectGenesisDeposits(config *cmtcfg.Config) error {
appGenesis, err := genutiltypes.AppGenesisFromFile(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copy paste of logic

config.GenesisFile(),
)
if err != nil {
return errors.Wrap(err, "failed to read genesis doc from file")
}

// create the app state
appGenesisState, err := genutiltypes.GenesisStateFromAppGenesis(
appGenesis,
)
if err != nil {
return err
}

var deposits []*types.Deposit
if deposits, err = CollectValidatorJSONFiles(
filepath.Join(config.RootDir, "config", "premined-deposits"),
appGenesis,
); err != nil {
return errors.Wrap(
err,
"failed to collect validator json files",
)
}

genesisInfo := &types.Genesis{}

if err = json.Unmarshal(
appGenesisState["beacon"], genesisInfo,
); err != nil {
return errors.Wrap(err, "failed to unmarshal beacon genesis")
}

for i, deposit := range deposits {
deposit.Index = uint64(i) // #nosec G115 -- won't realistically overflow.
genesisInfo.Deposits = append(genesisInfo.Deposits, deposit)
}

appGenesisState["beacon"], err = json.Marshal(genesisInfo)
if err != nil {
return errors.Wrap(err, "failed to marshal beacon genesis")
}

if appGenesis.AppState, err = json.MarshalIndent(
appGenesisState, "", " ",
); err != nil {
return err
}

return genutil.ExportGenesisFile(appGenesis, config.GenesisFile())
}

// CollectValidatorJSONFiles collects JSON files from the specified directory
// and unmarshals them into a list of Deposit objects.
func CollectValidatorJSONFiles(
Expand Down
Loading