fix: add genesis account to genesis file (#815)

dymensionxyz · Jul 16, 2024 · 2eb6a09 · 2eb6a09
1 parent db2fd80
commit 2eb6a09
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/cmd/config/init/genesis.go b/cmd/config/init/genesis.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/dymensionxyz/roller/cmd/consts"
 	"github.com/dymensionxyz/roller/cmd/utils"
+	"github.com/dymensionxyz/roller/config"
 )
 
 const (
@@ -33,11 +34,6 @@ func getDefaultGenesisParams(
 ) []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"},
@@ -82,13 +78,34 @@ func UpdateGenesisParams(home string) error {
 	if err != nil {
 		return err
 	}
+	cfg, err := config.LoadConfigFromTOML(home)
+	if err != nil {
+		return err
+	}
 
 	sa, err := getSequencerAddress(home)
 	if err != nil {
 		return err
 	}
 	params := getDefaultGenesisParams(sa, oa)
 
+	addGenAccountCmd := exec.Command(
+		consts.Executables.RollappEVM,
+		"add-genesis-account",
+		sa,
+		fmt.Sprintf("%s%s", consts.DefaultTokenSupply, cfg.BaseDenom),
+		"--home",
+		fmt.Sprintf("%s/%s", home, consts.ConfigDirName.Rollapp),
+		"--keyring-backend",
+		"test",
+	)
+
+	fmt.Println(addGenAccountCmd.String())
+	_, err = utils.ExecBashCommandWithStdout(addGenAccountCmd)
+	if err != nil {
+		return err
+	}
+
 	genesisFilePath := filepath.Join(home, consts.ConfigDirName.Rollapp, "config", "genesis.json")
 	return UpdateJSONParams(genesisFilePath, params)
 }

diff --git a/cmd/config/init/local_hub.go b/cmd/config/init/local_hub.go
@@ -1,16 +1,16 @@
 package initconfig
 
-//
 // import (
 // 	"fmt"
 // 	"os/exec"
 // 	"path/filepath"
 //
+// 	"github.com/pelletier/go-toml"
+//
 // 	"github.com/dymensionxyz/roller/cmd/consts"
 // 	"github.com/dymensionxyz/roller/cmd/utils"
 // 	"github.com/dymensionxyz/roller/config"
 // 	global_utils "github.com/dymensionxyz/roller/utils"
-// 	"github.com/pelletier/go-toml"
 // )
 //
 // const validatorKeyID = "local-user"

diff --git a/cmd/keys/keys.go b/cmd/keys/keys.go
@@ -1,9 +1,10 @@
 package keys
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/dymensionxyz/roller/cmd/keys/export"
 	"github.com/dymensionxyz/roller/cmd/keys/list"
-	"github.com/spf13/cobra"
 )
 
 func Cmd() *cobra.Command {

diff --git a/cmd/rollapp/start/start.go b/cmd/rollapp/start/start.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"math/big"
+	"os/exec"
 	"path/filepath"
 	"strings"
 
@@ -35,15 +36,13 @@ func Cmd() *cobra.Command {
 			seq := sequencer.GetInstance(rollappConfig)
 			startRollappCmd := seq.GetStartCmd()
 
-			c := seq.GetStartCmd()
-			fmt.Println(c.String())
 			LogPath = filepath.Join(rollappConfig.Home, consts.ConfigDirName.Rollapp, "rollapp.log")
 			RollappDirPath = filepath.Join(rollappConfig.Home, consts.ConfigDirName.Rollapp)
 
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 			go utils.RunBashCmdAsync(ctx, startRollappCmd, func() {
-				printOutput(rollappConfig)
+				printOutput(rollappConfig, startRollappCmd)
 			}, parseError,
 				utils.WithLogging(utils.GetSequencerLogPath(rollappConfig)))
 			select {}
@@ -52,7 +51,7 @@ func Cmd() *cobra.Command {
 	return cmd
 }
 
-func printOutput(rlpCfg config.RollappConfig) {
+func printOutput(rlpCfg config.RollappConfig, cmd *exec.Cmd) {
 	seq := sequencer.GetInstance(rlpCfg)
 	fmt.Println("💈 The Rollapp sequencer is running on your local machine!")
 	fmt.Println("💈 Endpoints:")
@@ -63,6 +62,7 @@ func printOutput(rlpCfg config.RollappConfig) {
 
 	fmt.Println("💈 Log file path: ", LogPath)
 	fmt.Println("💈 Rollapp root dir: ", RollappDirPath)
+	fmt.Println("💈 PID: ", cmd.Process.Pid)
 }
 
 func parseError(errMsg string) string {