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

feat: adding --force flag for sequencer registration #203

Merged
merged 2 commits into from
Jul 6, 2023
Merged

feat: adding --force flag for sequencer registration #203

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0e902b
adding --force flag
mtsitrin Jul 6, 2023
8291d24
Merge remote-tracking branch 'origin/main' into mtsitrin/199-allow-to…
mtsitrin Jul 6, 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
32 changes: 19 additions & 13 deletions cmd/register/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"errors"
"fmt"
"math/big"
"os/exec"
"strings"

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

initconfig "github.com/dymensionxyz/roller/cmd/config/init"
"github.com/dymensionxyz/roller/cmd/utils"
"github.com/dymensionxyz/roller/config"
"github.com/spf13/cobra"
Expand All @@ -19,6 +19,10 @@ import (
// TODO: Test registration on 35-C and update the price
var registerUdymPrice = big.NewInt(1)

const (
flagForceSeqRegistration = "force"
)

func Cmd() *cobra.Command {
registerCmd := &cobra.Command{
Use: "register",
Expand All @@ -28,6 +32,7 @@ func Cmd() *cobra.Command {
},
}

registerCmd.Flags().BoolP(flagForceSeqRegistration, "f", false, "force sequencer registration even if the rollapp is already registered")
return registerCmd
}

Expand All @@ -50,23 +55,24 @@ func register(cmd *cobra.Command, args []string) error {
spin.Stop()
utils.PrintInsufficientBalancesIfAny(notFundedAddrs, rollappConfig)
}
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
registerRollappCmd := getRegisterRollappCmd(rollappConfig)
if err := runcCommandWithErrorChecking(registerRollappCmd); err != nil {
if cmd.Flag(flagForceSeqRegistration).Changed {
fmt.Println("RollApp is already registered. Attemting to register sequencer anyway...")
} else {
return err
}
}
registerSequencerCmd, err := getRegisterSequencerCmd(rollappConfig)
if err != nil {
return err
}
spin.Suffix = " Registering RollApp sequencer...\n"
spin.Restart()
_, err = utils.ExecBashCommand(registerSequencerCmd)
err = runcCommandWithErrorChecking(registerSequencerCmd)
if err != nil {
return err
}
Expand All @@ -75,8 +81,8 @@ func register(cmd *cobra.Command, args []string) error {
return nil
}

func registerRollapp(rollappConfig config.RollappConfig) error {
cmd := getRegisterRollappCmd(rollappConfig)
// TODO: probably should be moved to utils
func runcCommandWithErrorChecking(cmd *exec.Cmd) error {
var stdout bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &stdout
Expand All @@ -88,7 +94,7 @@ func registerRollapp(rollappConfig config.RollappConfig) error {
if cmdExecErr != nil {
return cmdExecErr
}
if err := handleStdOut(stdout, rollappConfig); err != nil {
if err := handleStdOut(stdout); err != nil {
return err
}
return nil
Expand All @@ -98,7 +104,7 @@ type Response struct {
RawLog string `json:"raw_log"`
}

func handleStdOut(stdout bytes.Buffer, rollappConfig config.RollappConfig) error {
func handleStdOut(stdout bytes.Buffer) error {
var response Response

err := json.NewDecoder(&stdout).Decode(&response)
Expand Down