diff --git a/cmd/consts/consts.go b/cmd/consts/consts.go index 64392677..0379a47f 100644 --- a/cmd/consts/consts.go +++ b/cmd/consts/consts.go @@ -5,10 +5,11 @@ import ( ) const ( - binsDir = "/usr/local/bin" - DefaultTokenSupply = "1000000000000000000000000000" - DefaultFee = 2000000000000000000 // 2 - DefaultTxFee = 10000000000000000 // 0.01 + binsDir = "/usr/local/bin" + DefaultTokenSupply = "1000000000000000000000000000" + DefaultFee = 2000000000000000000 // 2 + DefaultTxFee = 10000000000000000 // 0.01 + DefaultAdditionalFunding = "10000000000000000000" // 10, this amount is added to the necessary sequencer balance ) var InternalBinsDir = fmt.Sprintf("%s/roller_bins", binsDir) diff --git a/cmd/consts/dymension.go b/cmd/consts/dymension.go index cf865207..8c241afa 100644 --- a/cmd/consts/dymension.go +++ b/cmd/consts/dymension.go @@ -72,7 +72,7 @@ const ( const ( MockHubID = "mock" LocalHubID = "dymension_100-1" - PlaygroundHubID = "dymension_2019-1" + PlaygroundHubID = "dymension_1405-1" TestnetHubID = "blumbus_111-1" MainnetHubID = "dymension_1100-1" ) diff --git a/cmd/rollapp/setup/setup.go b/cmd/rollapp/setup/setup.go index c46a63c2..5f955fcf 100644 --- a/cmd/rollapp/setup/setup.go +++ b/cmd/rollapp/setup/setup.go @@ -264,10 +264,26 @@ RollApp's IRO time: %v`, cosmossdkmath.NewInt(consts.DefaultTxFee), ) + af, _ := cosmossdkmath.NewIntFromString(consts.DefaultAdditionalFunding) + necessaryBalance = necessaryBalance.Add( + af, + ) + + blnc, _ := sequencer.BaseDenomToDenom(*balance, 18) + oneDym, _ := cosmossdkmath.NewIntFromString("1000000000000000000") + + nb := cosmossdktypes.Coin{ + Denom: consts.Denoms.Hub, + Amount: necessaryBalance.Add(oneDym), + } + necBlnc, _ := sequencer.BaseDenomToDenom(nb, 18) + pterm.Info.Printf( - "current balance: %s\nnecessary balance: %s\n", + "current balance: %s (%s)\nnecessary balance: %s (%s)\n", balance.String(), + blnc.String(), fmt.Sprintf("%s%s", necessaryBalance.String(), consts.Denoms.Hub), + necBlnc.String(), ) // check whether balance is bigger or equal to the necessaryBalance @@ -303,11 +319,14 @@ RollApp's IRO time: %v`, pterm.Error.Println("failed to get address balance: ", err) return } + blnc, _ = sequencer.BaseDenomToDenom(*balance, 18) pterm.Info.Printf( - "current balance: %s\nnecessary balance: %s\n", + "current balance: %s (%s)\nnecessary balance: %s (%s)\n", balance.String(), + blnc.String(), fmt.Sprintf("%s%s", necessaryBalance.String(), consts.Denoms.Hub), + necBlnc.String(), ) // check whether balance is bigger or equal to the necessaryBalance @@ -762,7 +781,7 @@ func populateSequencerMetadata(raCfg roller.RollappConfig) error { X: "", } - var defaultGasPrice cosmossdktypes.Int + var defaultGasPrice cosmossdkmath.Int var ok bool if raCfg.HubData.GasPrice != "" {