fix: improve custom env support for rollapp and relayer (#1073)

dymensionxyz · Oct 16, 2024 · 3fa7d04 · 3fa7d04
1 parent 55afb56
commit 3fa7d04
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 8 deletions.
diff --git a/cmd/relayer/start/start.go b/cmd/relayer/start/start.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
@@ -79,7 +80,39 @@ Consider using 'services' if you want to run a 'systemd' service instead.
 			_, hd, found := roller.FindHubDataByID(consts.Hubs, hubChainID)
 			if !found {
 				pterm.Error.Println("Hub Data not found for ", hubChainID)
-				return
+				runCustomHub, _ := pterm.DefaultInteractiveConfirm.WithDefaultText("would you like to provide custom hub?").
+					WithDefaultValue(false).
+					Show()
+
+				if !runCustomHub {
+					pterm.Error.Println("cancelled by user")
+					return
+				}
+
+				id, _ := pterm.DefaultInteractiveTextInput.WithDefaultText("provide hub chain id").
+					Show()
+				rpcUrl, _ := pterm.DefaultInteractiveTextInput.WithDefaultText(
+					"provide hub rpc endpoint (including port, example: http://dym.dev:26657)",
+				).Show()
+				restUrl, _ := pterm.DefaultInteractiveTextInput.WithDefaultText(
+					"provide hub rest api endpoint (including port, example: http://dym.dev:1318)",
+				).Show()
+				gasPrice, _ := pterm.DefaultInteractiveTextInput.WithDefaultText("provide gas price").
+					WithDefaultValue("2000000000").
+					Show()
+
+				id = strings.TrimSpace(id)
+				rpcUrl = strings.TrimSpace(rpcUrl)
+				restUrl = strings.TrimSpace(restUrl)
+				gasPrice = strings.TrimSpace(gasPrice)
+
+				hd = consts.HubData{
+					API_URL:         restUrl,
+					ID:              id,
+					RPC_URL:         rpcUrl,
+					ARCHIVE_RPC_URL: rpcUrl,
+					GAS_PRICE:       gasPrice,
+				}
 			}
 
 			getRaCmd := rollapp.GetRollappCmd(raChainID, hd)

diff --git a/cmd/rollapp/init/init.go b/cmd/rollapp/init/init.go
@@ -113,6 +113,11 @@ func Cmd() *cobra.Command {
 				gasPrice, _ := pterm.DefaultInteractiveTextInput.WithDefaultText("provide gas price").
 					WithDefaultValue("2000000000").Show()
 
+				id = strings.TrimSpace(id)
+				rpcUrl = strings.TrimSpace(rpcUrl)
+				restUrl = strings.TrimSpace(restUrl)
+				gasPrice = strings.TrimSpace(gasPrice)
+
 				hd = consts.HubData{
 					API_URL:         restUrl,
 					ID:              id,
@@ -124,6 +129,7 @@ func Cmd() *cobra.Command {
 				dymdCommit, _ := pterm.DefaultInteractiveTextInput.WithDefaultText(
 					"provide dymensionxyz/dymension commit to build (example: 2cd612aaa6c21b473dbbb7dca9fd03b5aaae6583)",
 				).Show()
+				dymdCommit = strings.TrimSpace(dymdCommit)
 
 				dymdDep := types.Dependency{
 					DependencyName:  "dymension",
@@ -186,6 +192,7 @@ func Cmd() *cobra.Command {
 				err := runInit(
 					cmd,
 					env,
+					consts.HubData{},
 					raRespMock,
 				)
 				if err != nil {
@@ -271,7 +278,7 @@ func Cmd() *cobra.Command {
 				return
 			}
 
-			err = runInit(cmd, env, raResponse)
+			err = runInit(cmd, env, hd, raResponse)
 			if err != nil {
 				pterm.Error.Printf("failed to initialize the RollApp: %v\n", err)
 				return

diff --git a/cmd/rollapp/init/utils.go b/cmd/rollapp/init/utils.go
@@ -23,6 +23,7 @@ import (
 func runInit(
 	cmd *cobra.Command,
 	env string,
+	customHubData consts.HubData,
 	raResp rollapp.ShowRollappResponse,
 ) error {
 	raID := raResp.Rollapp.RollappId
@@ -34,7 +35,12 @@ func runInit(
 	}
 	rollerConfigFilePath := filepath.Join(home, consts.RollerConfigFileName)
 
-	hd := consts.Hubs[env]
+	var hd consts.HubData
+	if env != "custom" {
+		hd = consts.Hubs[env]
+	} else {
+		hd = customHubData
+	}
 	// TODO: refactor
 	var initConfigPtr *roller.RollappConfig
 
@@ -141,6 +147,12 @@ func runInit(
 		} else {
 			return fmt.Errorf("unsupported DA backend: %s", daBackend)
 		}
+	case "custom":
+		if daBackend == string(consts.Celestia) {
+			daNetwork = string(consts.CelestiaTestnet)
+		} else {
+			return fmt.Errorf("unsupported DA backend: %s", daBackend)
+		}
 	case "mock":
 		daNetwork = "mock"
 	default:

diff --git a/utils/rollapp/rollapp.go b/utils/rollapp/rollapp.go
@@ -184,12 +184,9 @@ func GetRollappMetadataFromChain(
 	var DA consts.DaData
 
 	switch hd.ID {
-	case consts.PlaygroundHubID:
-		DA = consts.DaNetworks[string(consts.CelestiaTestnet)]
-	// case consts.MainnetHubID:
-	// 	DA = consts.DaNetworks[string(consts.CelestiaMainnet)]
+	case consts.MockHubID:
 	default:
-		fmt.Println("unsupported Hub: ", hd.ID)
+		DA = consts.DaNetworks[string(consts.CelestiaTestnet)]
 	}
 
 	cfg = roller.RollappConfig{