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: Fixed spinner cursor removal bug #188

Merged
merged 2 commits into from
Jul 4, 2023
Merged

fix: Fixed spinner cursor removal bug #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccc1d48
Fixed cursor bug on roller config init
ItayLevyOfficial Jul 4, 2023
e93d4a6
Spinner now not remove terminal cursor
ItayLevyOfficial Jul 4, 2023
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
183 changes: 111 additions & 72 deletions cmd/config/init/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ package initconfig

import (
"fmt"
"os"

"github.com/dymensionxyz/roller/cmd/consts"
"github.com/dymensionxyz/roller/cmd/utils"
"github.com/dymensionxyz/roller/config"
datalayer "github.com/dymensionxyz/roller/data_layer"
"github.com/spf13/cobra"
"os"
)

func InitCmd() *cobra.Command {
Expand Down Expand Up @@ -41,76 +40,7 @@ func InitCmd() *cobra.Command {
return nil
},
Run: func(cmd *cobra.Command, args []string) {
initConfig, err := GetInitConfig(cmd, args)
utils.PrettifyErrorIfExists(err)

spin := utils.GetLoadingSpinner()
spin.Suffix = consts.SpinnerMsgs.UniqueIdVerification
spin.Start()

err = initConfig.Validate()
utils.PrettifyErrorIfExists(err, func() {
fmt.Println(requiredFlagsUsage())
})

utils.PrettifyErrorIfExists(VerifyUniqueRollappID(initConfig.RollappID, initConfig))
isRootExist, err := dirNotEmpty(initConfig.Home)
utils.PrettifyErrorIfExists(err)
if isRootExist {
spin.Stop()
shouldOverwrite, err := promptOverwriteConfig(initConfig.Home)
utils.PrettifyErrorIfExists(err)
if shouldOverwrite {
utils.PrettifyErrorIfExists(os.RemoveAll(initConfig.Home))
} else {
os.Exit(0)
}
spin.Start()
}
utils.PrettifyErrorIfExists(os.MkdirAll(initConfig.Home, 0755))

//TODO: create all dirs here
spin.Suffix = " Initializing RollApp configuration files..."
spin.Restart()
/* ---------------------------- Initilize relayer --------------------------- */
utils.PrettifyErrorIfExists(initializeRelayerConfig(ChainConfig{
ID: initConfig.RollappID,
RPC: consts.DefaultRollappRPC,
Denom: initConfig.Denom,
AddressPrefix: consts.AddressPrefixes.Rollapp,
}, ChainConfig{
ID: initConfig.HubData.ID,
RPC: initConfig.HubData.RPC_URL,
Denom: consts.Denoms.Hub,
AddressPrefix: consts.AddressPrefixes.Hub,
}, initConfig))

/* ------------------------------ Generate keys ----------------------------- */
addresses, err := generateKeys(initConfig)
utils.PrettifyErrorIfExists(err)

/* ------------------------ Initialize DA light node ------------------------ */
damanager := datalayer.NewDAManager(initConfig.DA, initConfig.Home)
err = damanager.InitializeLightNodeConfig()
utils.PrettifyErrorIfExists(err)
daAddress, err := damanager.GetDAAccountAddress()
utils.PrettifyErrorIfExists(err)

if daAddress != "" {
addresses = append(addresses, utils.AddressData{
Name: consts.KeysIds.DALightNode,
Addr: daAddress,
})
}

/* --------------------------- Initiailize Rollapp -------------------------- */
utils.PrettifyErrorIfExists(initializeRollappConfig(initConfig))
utils.PrettifyErrorIfExists(initializeRollappGenesis(initConfig))
utils.PrettifyErrorIfExists(config.WriteConfigToTOML(initConfig))

/* ------------------------------ Print output ------------------------------ */
spin.Stop()
printInitOutput(initConfig, addresses, initConfig.RollappID)
utils.PrettifyErrorIfExists(runInit(cmd, args))
},
}

Expand All @@ -130,3 +60,112 @@ A valid RollApp ID should follow the format 'name_uniqueID-revision', where

A valid denom should consist of exactly 3 English alphabet letters, for example 'btc', 'eth'`
}

func runInit(cmd *cobra.Command, args []string) error {
initConfig, err := GetInitConfig(cmd, args)
if err != nil {
return err
}
spin := utils.GetLoadingSpinner()
spin.Suffix = consts.SpinnerMsgs.UniqueIdVerification
utils.RunOnInterrupt(spin.Stop)
spin.Start()
defer spin.Stop()
err = initConfig.Validate()
if err != nil {
return err
}
err = VerifyUniqueRollappID(initConfig.RollappID, initConfig)
if err != nil {
return err
}
isRootExist, err := dirNotEmpty(initConfig.Home)
if err != nil {
return err
}
if isRootExist {
spin.Stop()
shouldOverwrite, err := promptOverwriteConfig(initConfig.Home)
if err != nil {
return err
}
if shouldOverwrite {
err = os.RemoveAll(initConfig.Home)
if err != nil {
return err
}
} else {
os.Exit(0)
}
spin.Start()
}
err = os.MkdirAll(initConfig.Home, 0755)
if err != nil {
return err
}
//TODO: create all dirs here
spin.Suffix = " Initializing RollApp configuration files..."
spin.Restart()
/* ---------------------------- Initialize relayer --------------------------- */
err = initializeRelayerConfig(ChainConfig{
ID: initConfig.RollappID,
RPC: consts.DefaultRollappRPC,
Denom: initConfig.Denom,
AddressPrefix: consts.AddressPrefixes.Rollapp,
}, ChainConfig{
ID: initConfig.HubData.ID,
RPC: initConfig.HubData.RPC_URL,
Denom: consts.Denoms.Hub,
AddressPrefix: consts.AddressPrefixes.Hub,
}, initConfig)
if err != nil {
return err
}

/* ------------------------------ Generate keys ----------------------------- */
addresses, err := generateKeys(initConfig)
if err != nil {
return err
}

/* ------------------------ Initialize DA light node ------------------------ */
damanager := datalayer.NewDAManager(initConfig.DA, initConfig.Home)
err = damanager.InitializeLightNodeConfig()
if err != nil {
return err
}

daAddress, err := damanager.GetDAAccountAddress()
if err != nil {
return err
}

if daAddress != "" {
addresses = append(addresses, utils.AddressData{
Name: consts.KeysIds.DALightNode,
Addr: daAddress,
})
}

/* --------------------------- Initialize Rollapp -------------------------- */
err = initializeRollappConfig(initConfig)
if err != nil {
return err
}

err = initializeRollappGenesis(initConfig)
if err != nil {
return err
}

err = config.WriteConfigToTOML(initConfig)
if err != nil {
return err
}

/* ------------------------------ Print output ------------------------------ */
spin.Stop()
printInitOutput(initConfig, addresses, initConfig.RollappID)

return nil
}
70 changes: 45 additions & 25 deletions cmd/register/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ package register

import (
"bytes"
"encoding/json"
"errors"
"fmt"
"github.com/dymensionxyz/roller/cmd/consts"
"math/big"
"strings"

"encoding/json"

initconfig "github.com/dymensionxyz/roller/cmd/config/init"
"github.com/dymensionxyz/roller/cmd/utils"
"github.com/dymensionxyz/roller/config"
Expand All @@ -24,35 +23,56 @@ func Cmd() *cobra.Command {
Use: "register",
Short: "Registers the rollapp and the sequencer to the Dymension hub.",
Run: func(cmd *cobra.Command, args []string) {
spin := utils.GetLoadingSpinner()
spin.Suffix = consts.SpinnerMsgs.BalancesVerification
spin.Start()
home := cmd.Flag(utils.FlagNames.Home).Value.String()
rollappConfig, err := config.LoadConfigFromTOML(home)
utils.PrettifyErrorIfExists(err)
notFundedAddrs, err := utils.GetSequencerInsufficientAddrs(rollappConfig, *registerUdymPrice)
utils.PrettifyErrorIfExists(err)
utils.PrintInsufficientBalancesIfAny(notFundedAddrs)
spin.Suffix = consts.SpinnerMsgs.UniqueIdVerification
spin.Restart()
utils.PrettifyErrorIfExists(initconfig.VerifyUniqueRollappID(rollappConfig.RollappID, rollappConfig))
spin.Suffix = " Registering RollApp to hub...\n"
spin.Restart()
utils.PrettifyErrorIfExists(registerRollapp(rollappConfig))
registerSequencerCmd, err := getRegisterSequencerCmd(rollappConfig)
utils.PrettifyErrorIfExists(err)
spin.Suffix = " Registering RollApp sequencer...\n"
spin.Restart()
_, err = utils.ExecBashCommand(registerSequencerCmd)
utils.PrettifyErrorIfExists(err)
spin.Stop()
printRegisterOutput(rollappConfig)
utils.PrettifyErrorIfExists(register(cmd, args))
},
}

return registerCmd
}

func register(cmd *cobra.Command, args []string) error {
spin := utils.GetLoadingSpinner()
spin.Suffix = consts.SpinnerMsgs.BalancesVerification
spin.Start()
defer spin.Stop()
utils.RunOnInterrupt(spin.Stop)
home := cmd.Flag(utils.FlagNames.Home).Value.String()
rollappConfig, err := config.LoadConfigFromTOML(home)
if err != nil {
return err
}
notFundedAddrs, err := utils.GetSequencerInsufficientAddrs(rollappConfig, *registerUdymPrice)
if err != nil {
return err
}
if len(notFundedAddrs) > 0 {
spin.Stop()
utils.PrintInsufficientBalancesIfAny(notFundedAddrs)
}
spin.Suffix = consts.SpinnerMsgs.UniqueIdVerification
spin.Restart()
if err := initconfig.VerifyUniqueRollappID(rollappConfig.RollappID, rollappConfig); err != nil {
return err
}
spin.Suffix = " Registering RollApp to hub...\n"
spin.Restart()
if err := registerRollapp(rollappConfig); err != nil {
return err
}
registerSequencerCmd, err := getRegisterSequencerCmd(rollappConfig)
if err != nil {
return err
}
spin.Suffix = " Registering RollApp sequencer...\n"
spin.Restart()
_, err = utils.ExecBashCommand(registerSequencerCmd)
if err != nil {
return err
}
printRegisterOutput(rollappConfig)
return nil
}

func registerRollapp(rollappConfig config.RollappConfig) error {
cmd := getRegisterRollappCmd(rollappConfig)
var stdout bytes.Buffer
Expand Down
11 changes: 11 additions & 0 deletions cmd/utils/error_handling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package utils
import (
"github.com/fatih/color"
"os"
"os/signal"
)

func PrettifyErrorIfExists(err error, printAdditionalInfo ...func()) {
Expand All @@ -21,3 +22,13 @@ func PrettifyErrorIfExists(err error, printAdditionalInfo ...func()) {
panic(err)
}
}

func RunOnInterrupt(funcToRun func()) {
go func() {
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
<-c
funcToRun()
os.Exit(0)
}()
}