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

fix: add sequencer addresses to the generated genesis file #808

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix: add sequencer addresses to the generated genesis file #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
254 changes: 116 additions & 138 deletions cmd/config/init/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
package initconfig

import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"

"github.com/tidwall/sjson"

"github.com/dymensionxyz/roller/cmd/consts"
"github.com/dymensionxyz/roller/cmd/utils"
)

const (
Expand All @@ -15,108 +22,40 @@ type PathValue struct {
Value interface{}
}

// func initializeRollappGenesis(initConfig config.RollappConfig) error {
// totalTokenSupply, success := new(big.Int).SetString(initConfig.TokenSupply, 10)
// if !success {
// return fmt.Errorf("invalid token supply")
// }
// totalTokenSupply = totalTokenSupply.Mul(totalTokenSupply, new(big.Int).Exp(big.NewInt(10),
// new(big.Int).SetUint64(uint64(initConfig.Decimals)), nil))
// relayerGenesisBalance := new(big.Int).Div(totalTokenSupply, big.NewInt(10))
// sequencerGenesisBalance := new(big.Int).Sub(totalTokenSupply, relayerGenesisBalance)
// sequencerBalanceStr := sequencerGenesisBalance.String() + initConfig.Denom
// relayerBalanceStr := relayerGenesisBalance.String() + initConfig.Denom
// rollappConfigDirPath := filepath.Join(initConfig.Home, consts.ConfigDirName.Rollapp)
// genesisSequencerAccountCmd := exec.Command(
// initConfig.RollappBinary,
// "add-genesis-account",
// consts.KeysIds.RollappSequencer,
// sequencerBalanceStr,
// "--keyring-backend",
// "test",
// "--home",
// rollappConfigDirPath,
// )
// _, err := utils.ExecBashCommandWithStdout(genesisSequencerAccountCmd)
// if err != nil {
// return err
// }
// rlyRollappAddress, err := utils.GetRelayerAddress(initConfig.Home, initConfig.RollappID)
// if err != nil {
// return err
// }
// genesisRelayerAccountCmd := exec.Command(
// initConfig.RollappBinary,
// "add-genesis-account",
// rlyRollappAddress,
// relayerBalanceStr,
// "--keyring-backend",
// "test",
// "--home",
// rollappConfigDirPath,
// )
// _, err = utils.ExecBashCommandWithStdout(genesisRelayerAccountCmd)
// if err != nil {
// return err
// }
//
// err = updateGenesisParams(
// GetGenesisFilePath(initConfig.Home),
// initConfig.Denom,
// initConfig.Decimals,
// initConfig.Home,
// )
// if err != nil {
// return err
// }
//
// err = generateGenesisTx(initConfig)
// if err != nil {
// return err
// }
//
// err = createTokenMetadaJSON(
// filepath.Join(RollappConfigDir(initConfig.Home), "tokenmetadata.json"),
// initConfig.Denom,
// initConfig.Decimals,
// )
// if err != nil {
// return err
// }
//
// return nil
// }
//
// func GetGenesisFilePath(root string) string {
// return filepath.Join(RollappConfigDir(root),
// "genesis.json")
// }
//
// // TODO(#130): fix to support epochs
// func getDefaultGenesisParams(
//
// denom string,
// decimals uint,
// genesisOperatorAddress string,
//
// ) []PathValue {
// return []PathValue{
// {"app_state.mint.params.mint_denom", denom},
// {"app_state.staking.params.bond_denom", denom},
// {"app_state.crisis.constant_fee.denom", denom},
// {"app_state.evm.params.evm_denom", denom},
// {"app_state.gov.deposit_params.min_deposit.0.denom", denom},
// {"consensus_params.block.max_gas", "40000000"},
// {"app_state.feemarket.params.no_base_fee", true},
// {"app_state.feemarket.params.min_gas_price", "0.0"},
// {"app_state.distribution.params.base_proposer_reward", "0.8"},
// {"app_state.distribution.params.community_tax", "0.00002"},
// {"app_state.gov.voting_params.voting_period", "300s"},
// {"app_state.staking.params.unbonding_time", "3628800s"},
// // {"app_state.bank.denom_metadata", getBankDenomMetadata(denom, decimals)},
// {"app_state.sequencers.genesis_operator_address", genesisOperatorAddress},
// }
// }
func GetGenesisFilePath(root string) string {
return filepath.Join(RollappConfigDir(root),
"genesis.json")
}

// TODO(#130): fix to support epochs
func getDefaultGenesisParams(
sequencerAddr, genesisOperatorAddress string,
) []PathValue {
return []PathValue{
// these should be injected from the genesis creator
// {"app_state.mint.params.mint_denom", denom},
// {"app_state.staking.params.bond_denom", denom},
// {"app_state.crisis.constant_fee.denom", denom},
// {"app_state.evm.params.evm_denom", denom},
// {"app_state.gov.deposit_params.min_deposit.0.denom", denom},
// {"consensus_params.block.max_gas", "40000000"},
// {"app_state.feemarket.params.no_base_fee", true},
// {"app_state.feemarket.params.min_gas_price", "0.0"},
// {"app_state.distribution.params.base_proposer_reward", "0.8"},
// {"app_state.distribution.params.community_tax", "0.00002"},
// {"app_state.gov.voting_params.voting_period", "300s"},
// {"app_state.staking.params.unbonding_time", "3628800s"},
// {"app_state.bank.denom_metadata", getBankDenomMetadata(denom, decimals)},

{"app_state.sequencers.genesis_operator_address", genesisOperatorAddress},
{
"app_state.hubgenesis.params.genesis_triggerer_allowlist.0",
map[string]string{"address": sequencerAddr},
},
{"app_state.denommetadata.params.allowed_addresses.0", sequencerAddr},
}
}

func UpdateJSONParams(jsonFilePath string, params []PathValue) error {
jsonFileContent, err := os.ReadFile(jsonFilePath)
if err != nil {
Expand All @@ -138,41 +77,78 @@ func UpdateJSONParams(jsonFilePath string, params []PathValue) error {
return nil
}

//
// func updateGenesisParams(genesisFilePath string, denom string, decimals uint, home string) error {
// oa, err := getGenesisOperatorAddress(home)
// if err != nil {
// return err
// }
// params := getDefaultGenesisParams(denom, decimals, oa)
// return UpdateJSONParams(genesisFilePath, params)
// }
//
// func getGenesisOperatorAddress(home string) (string, error) {
// rollappConfigDirPath := filepath.Join(home, consts.ConfigDirName.Rollapp)
// getOperatorAddrCommand := exec.Command(
// consts.Executables.RollappEVM,
// "keys",
// "show",
// consts.KeysIds.RollappSequencer,
// "-a",
// "--keyring-backend",
// "test",
// "--home",
// rollappConfigDirPath,
// "--bech",
// "val",
// )
//
// addr, err := utils.ExecBashCommandWithStdout(getOperatorAddrCommand)
// if err != nil {
// return "", err
// }
//
// a := strings.TrimSpace(addr.String())
// return a, nil
// }
//
func UpdateGenesisParams(home string) error {
oa, err := getGenesisOperatorAddress(home)
if err != nil {
return err
}

sa, err := getSequencerAddress(home)
if err != nil {
return err
}
params := getDefaultGenesisParams(sa, oa)

genesisFilePath := filepath.Join(home, consts.ConfigDirName.Rollapp, "config", "genesis.json")
return UpdateJSONParams(genesisFilePath, params)
}

func getGenesisOperatorAddress(home string) (string, error) {
rollappConfigDirPath := filepath.Join(home, consts.ConfigDirName.Rollapp)
getOperatorAddrCommand := exec.Command(
consts.Executables.RollappEVM,
"keys",
"show",
consts.KeysIds.RollappSequencer,
"-a",
"--keyring-backend",
"test",
"--home",
rollappConfigDirPath,
"--bech",
"val",
)

fmt.Println(getOperatorAddrCommand.String())

addr, err := utils.ExecBashCommandWithStdout(getOperatorAddrCommand)
if err != nil {
fmt.Println("val addr failed")
return "", err
}

a := strings.TrimSpace(addr.String())
fmt.Println(a)
return a, nil
}

func getSequencerAddress(home string) (string, error) {
rollappConfigDirPath := filepath.Join(home, consts.ConfigDirName.Rollapp)
getOperatorAddrCommand := exec.Command(
consts.Executables.RollappEVM,
"keys",
"show",
consts.KeysIds.RollappSequencer,
"-a",
"--keyring-backend",
"test",
"--home",
rollappConfigDirPath,
)

fmt.Println(getOperatorAddrCommand.String())

addr, err := utils.ExecBashCommandWithStdout(getOperatorAddrCommand)
if err != nil {
fmt.Println("seq addr failed")
return "", err
}

a := strings.TrimSpace(addr.String())
fmt.Println(a)
return a, nil
}

// func generateGenesisTx(initConfig config.RollappConfig) error {
// err := registerSequencerAsGoverner(initConfig)
// if err != nil {
Expand All @@ -197,14 +173,16 @@ func UpdateJSONParams(jsonFilePath string, params []PathValue) error {
// // currently it sets the staking amount to half of the total token supply.
// // TODO: make the staking amount configurable
// func registerSequencerAsGoverner(initConfig config.RollappConfig) error {
// totalSupply, err := strconv.Atoi(initConfig.TokenSupply)
// totalSupply, err := strconv.Atoi(consts.DefaultTokenSupply)
// if err != nil {
// return fmt.Errorf("error converting string to integer: %w", err)
// }
//
// // Convert to token supply with decimals
// stakedSupply := big.NewInt(int64(totalSupply / totalSupplyToStakingRatio))
// multiplier := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(initConfig.Decimals)), nil)
// stakedSupply.Mul(stakedSupply, multiplier)
//
// // Build and run the gentx command
// rollappConfigDirPath := filepath.Join(initConfig.Home, consts.ConfigDirName.Rollapp)
// gentxCmd := exec.Command(
Expand Down
5 changes: 4 additions & 1 deletion cmd/consts/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import (
"github.com/dymensionxyz/roller/config"
)

const binsDir = "/usr/local/bin"
const (
binsDir = "/usr/local/bin"
DefaultTokenSupply = "1000000000"
)

var internalBinsDir = fmt.Sprintf("%s/roller_bins", binsDir)

Expand Down
5 changes: 5 additions & 0 deletions cmd/rollapp/init/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,11 @@ func runInit(cmd *cobra.Command, args []string, configArchivePath string) error
return err
}

err = initconfig.UpdateGenesisParams(home)
if err != nil {
return err
}

// 20240607 genesis is generated using the genesis-creator
// err = initializeRollappGenesis(initConfig)
// if err != nil {
Expand Down
Loading