fix(eibc): eibc existing roller config (#1120)

dymensionxyz · Nov 20, 2024 · 77f3bf5 · 77f3bf5
1 parent 25d0dd6
commit 77f3bf5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/cmd/eibc/init/init.go b/cmd/eibc/init/init.go
@@ -294,7 +294,7 @@ func Cmd() *cobra.Command {
 
 			var runForExisting bool
 			var raID string
-			rollerConfigFilePath := filepath.Join(home, consts.RollerConfigFileName)
+			rollerConfigFilePath := filepath.Join(roller.GetRootDir(), consts.RollerConfigFileName)
 			var rollerData roller.RollappConfig
 
 			_, err = os.Stat(rollerConfigFilePath)
@@ -321,7 +321,8 @@ func Cmd() *cobra.Command {
 				if rollerRaID != "" {
 					msg := fmt.Sprintf(
 						"the retrieved RollApp ID is: %s, would you like to initialize the eibc client for this RollApp?",
-						rollerRaID,
+						pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+							Sprint(rollerRaID),
 					)
 					rlyFromRoller, _ = pterm.DefaultInteractiveConfirm.WithDefaultText(msg).Show()
 					if rlyFromRoller {

diff --git a/cmd/eibc/start/start.go b/cmd/eibc/start/start.go
@@ -40,7 +40,7 @@ func Cmd() *cobra.Command {
 			c := eibcutils.GetStartCmd()
 			err = bash.ExecCmdFollow(c, nil)
 			if err != nil {
-				pterm.Error.Println("failed to create mongodb container:", err)
+				pterm.Error.Println("failed to start the eibc client:", err)
 				return
 			}
 		},

diff --git a/utils/eibc/types.go b/utils/eibc/types.go
@@ -14,26 +14,26 @@ type Config struct {
 	NodeAddress string `yaml:"node_address"`
 
 	OperatorConfig operatorConfig           `yaml:"operator"`
-	OrderPolling   OrderPollingConfig       `yaml:"order_polling"`
-	Rollapps       map[string]RollappConfig `yaml:"rollapps"`
+	OrderPolling   orderPollingConfig       `yaml:"order_polling"`
+	Rollapps       map[string]rollappConfig `yaml:"rollapps"`
 
 	SlackConfig slackConfig      `yaml:"slack"`
 	Validation  validationConfig `yaml:"validation"`
 }
 
-type OrderPollingConfig struct {
+type orderPollingConfig struct {
 	IndexerURL string        `yaml:"indexer_url"`
 	Interval   time.Duration `yaml:"interval"`
 	Enabled    bool          `yaml:"enabled"`
 }
 
-type RollappConfig struct {
+type rollappConfig struct {
 	FullNodes        []string `yaml:"full_nodes"`
 	MinConfirmations string   `yaml:"min_confirmations"`
 }
 
 type GasConfig struct {
-	Prices string `yaml:"prices"`
+	Fees string `yaml:"fees"`
 }
 
 type fulfillerConfig struct {
@@ -53,12 +53,9 @@ type operatorConfig struct {
 }
 
 type validationConfig struct {
-	FallbackLevel      string `yaml:"fallback_level"`
-	ValidationWaitTime string `yaml:"validation_wait_time"`
-}
-
-type fulfillCriteria struct {
-	MinFeePercentage minFeePercentage `yaml:"min_fee_percentage"`
+	FallbackLevel string `yaml:"fallback_level"`
+	WaitTime      string `yaml:"wait_time"`
+	Interval      string `yaml:"wait_time"`
 }
 
 type minFeePercentage struct {