fix bug finding on ui/ux and docker built image issue

cmd/world/cardinal/cardinal.go

@@ -37,6 +37,7 @@ var BaseCmd = &cobra.Command{
 func init() {
 	// Register subcommands - `world cardinal [subcommand]`
 	BaseCmd.AddCommand(startCmd, devCmd, restartCmd, purgeCmd, stopCmd)
+	registerConfigAndVerboseFlags(startCmd, devCmd, restartCmd, purgeCmd, stopCmd)
 }
 
 func getServices(cfg *config.Config) []service.Builder {

cmd/world/cardinal/common_flag.go

@@ -1,7 +1,19 @@
 package cardinal
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/spf13/cobra"
+
+	"pkg.world.dev/world-cli/common/config"
+	"pkg.world.dev/world-cli/common/logger"
+)
 
 func registerEditorFlag(cmd *cobra.Command, defaultEnable bool) {
 	cmd.Flags().Bool("editor", defaultEnable, "Run Cardinal Editor, useful for prototyping and debugging")
 }
+
+func registerConfigAndVerboseFlags(cmds ...*cobra.Command) {
+	for _, cmd := range cmds {
+		config.AddConfigFlag(cmd)
+		logger.AddVerboseFlag(cmd)
+	}
+}

cmd/world/cardinal/start.go

@@ -33,8 +33,8 @@ const (
 var (
 	// ValidLogLevels Valid log levels for zerolog
 	validLogLevels = strings.Join([]string{
-		zerolog.DebugLevel.String(),
 		zerolog.InfoLevel.String(),
+		zerolog.DebugLevel.String(),
 		zerolog.WarnLevel.String(),
 		zerolog.ErrorLevel.String(),
 		zerolog.FatalLevel.String(),
@@ -158,7 +158,8 @@ func init() {
 	registerEditorFlag(startCmd, true)
 	startCmd.Flags().Bool(flagBuild, true, "Rebuild Docker images before starting")
 	startCmd.Flags().Bool(flagDetach, false, "Run in detached mode")
-	startCmd.Flags().String(flagLogLevel, "", "Set the log level")
+	startCmd.Flags().String(flagLogLevel, "",
+		fmt.Sprintf("Set the log level for Cardinal. Must be one of (%v)", validLogLevels))
 	startCmd.Flags().Bool(flagDebug, false, "Enable delve debugging")
 	startCmd.Flags().Bool(flagTelemetry, false, "Enable tracing, metrics, and profiling")
 }

cmd/world/evm/evm.go

@@ -3,6 +3,8 @@ package evm
 import (
 	"github.com/spf13/cobra"
 
+	"pkg.world.dev/world-cli/common/config"
+	"pkg.world.dev/world-cli/common/logger"
 	"pkg.world.dev/world-cli/common/teacmd"
 	"pkg.world.dev/world-cli/tea/style"
 )
@@ -27,4 +29,12 @@ var BaseCmd = &cobra.Command{
 func init() {
 	// Register subcommands - `world evm [subcommand]`
 	BaseCmd.AddCommand(startCmd, stopCmd)
+	registerConfigAndVerboseFlags(startCmd, stopCmd)
+}
+
+func registerConfigAndVerboseFlags(cmds ...*cobra.Command) {
+	for _, cmd := range cmds {
+		config.AddConfigFlag(cmd)
+		logger.AddVerboseFlag(cmd)
+	}
 }

cmd/world/root/root.go

@@ -19,7 +19,6 @@ import (
 
 	"pkg.world.dev/world-cli/cmd/world/cardinal"
 	"pkg.world.dev/world-cli/cmd/world/evm"
-	"pkg.world.dev/world-cli/common/config"
 	"pkg.world.dev/world-cli/common/logger"
 	"pkg.world.dev/world-cli/tea/style"
 )
@@ -74,9 +73,6 @@ func init() {
 
 	// Remove completion subcommand
 	rootCmd.CompletionOptions.DisableDefaultCmd = true
-
-	config.AddConfigFlag(rootCmd)
-	logger.AddVerboseFlag(rootCmd)
 }
 
 func checkLatestVersion() error {

common/config/config.go

@@ -42,7 +42,7 @@ type Config struct {
 }
 
 func AddConfigFlag(cmd *cobra.Command) {
-	cmd.PersistentFlags().StringVarP(&configFile, flagForConfigFile, "c", "", "a toml encoded config file")
+	cmd.Flags().StringVarP(&configFile, flagForConfigFile, "c", "", "a toml encoded config file")
 }
 
 func GetConfig() (*Config, error) {

common/docker/client_container.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"regexp"
-	"strconv"
 	"sync"
 	"time"
 
@@ -155,7 +154,9 @@ func (c *Client) stopContainer(ctx context.Context, containerName string) error
 	}
 
 	// Stop the container
-	err = c.client.ContainerStop(ctx, containerName, container.StopOptions{})
+	err = c.client.ContainerStop(ctx, containerName, container.StopOptions{
+		Signal: "SIGINT",
+	})
 	if err != nil {
 		return eris.Wrapf(err, "Failed to stop container %s", containerName)
 	}
@@ -198,7 +199,7 @@ func (c *Client) logMultipleContainers(ctx context.Context, services ...service.
 				case <-ctx.Done():
 					return
 				default:
-					err := c.logContainerOutput(ctx, id, strconv.Itoa(i))
+					err := c.logContainerOutput(ctx, id, i)
 					if err != nil && !errors.Is(err, context.Canceled) {
 						fmt.Printf("Error logging container %s: %v. Reattaching...\n", id, err)
 						time.Sleep(2 * time.Second) //nolint:gomnd // Sleep for 2 seconds before reattaching
@@ -212,7 +213,19 @@ func (c *Client) logMultipleContainers(ctx context.Context, services ...service.
 	wg.Wait()
 }
 
-func (c *Client) logContainerOutput(ctx context.Context, containerID, styleNumber string) error {
+func (c *Client) logContainerOutput(ctx context.Context, containerID string, styleNumber int) error {
+	colors := []string{
+		"#00FF00", // Green
+		"#0000FF", // Blue
+		"#00FFFF", // Cyan
+		"#FF00FF", // Magenta
+		"#FFA500", // Orange
+		"#800080", // Purple
+		"#FFC0CB", // Pink
+		"#87CEEB", // Sky Blue
+		"#32CD32", // Lime Green
+	}
+
 	// Create options for logs
 	options := container.LogsOptions{
 		ShowStdout: true,
@@ -258,10 +271,10 @@ func (c *Client) logContainerOutput(ctx context.Context, containerID, styleNumbe
 		// Print the cleaned log message
 		if streamType == 1 { // Stdout
 			// TODO: what content should be printed for stdout?
-			fmt.Printf("[%s] %s", style.ForegroundPrint(containerID, styleNumber), cleanLog)
+			fmt.Printf("[%s] %s", style.ForegroundPrint(containerID, colors[styleNumber]), cleanLog)
 		} else if streamType == 2 { //nolint:gomnd // Stderr
 			// TODO: what content should be printed for stderr?
-			fmt.Printf("[%s] %s", style.ForegroundPrint(containerID, styleNumber), cleanLog)
+			fmt.Printf("[%s] %s", style.ForegroundPrint(containerID, colors[styleNumber]), cleanLog)
 		}
 	}
 

common/docker/client_image.go

@@ -62,6 +62,22 @@ func (c *Client) buildImages(ctx context.Context, dockerServices ...service.Serv
 				Name:  dockerService.Image,
 			})
 
+			// Remove the container
+			err := c.removeContainer(ctx, dockerService.Name)
+			fmt.Printf("Removing container %s\n", dockerService.Image)
+			if err != nil {
+				p.Send(multispinner.ProcessState{
+					Icon:   style.CrossIcon.Render(),
+					State:  "building",
+					Type:   "image",
+					Name:   dockerService.Image,
+					Detail: err.Error(),
+					Done:   true,
+				})
+				errChan <- err
+				return
+			}
+
 			// Start the build process
 			buildResponse, err := c.buildImage(ctx, dockerService)
 			if err != nil {

common/docker/service/cardinal.go

@@ -40,13 +40,65 @@ func Cardinal(cfg *config.Config) Service {
 		dockerfile = strings.ReplaceAll(dockerfile, mountCacheScript, "")
 	}
 
+	// Set env variables
+	const falseValue = "false"
+
+	// Set Base Shard Router Key
+	baseShardRouterKey := cfg.DockerEnv["BASE_SHARD_ROUTER_KEY"]
+	if baseShardRouterKey == "" {
+		baseShardRouterKey = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ01"
+	}
+
+	// Set Cardinal Log Level
+	cardinalLogLevel := cfg.DockerEnv["CARDINAL_LOG_LEVEL"]
+	if cardinalLogLevel == "" {
+		cardinalLogLevel = "info"
+	}
+
+	// Set Cardinal Log Pretty
+	cardinalLogPretty := cfg.DockerEnv["CARDINAL_LOG_PRETTY"]
+	if cardinalLogPretty == "" {
+		cardinalLogPretty = "true"
+	}
+
+	// Set Cardinal Rollup Enabled
+	cardinalRollupEnabled := cfg.DockerEnv["CARDINAL_ROLLUP_ENABLED"]
+	if cardinalRollupEnabled == "" {
+		cardinalRollupEnabled = falseValue
+	}
+
+	// Set Telemetry Profiler Enabled
+	telemetryProfilerEnabled := cfg.DockerEnv["TELEMETRY_PROFILER_ENABLED"]
+	if telemetryProfilerEnabled == "" {
+		telemetryProfilerEnabled = falseValue
+	}
+
+	// Set telemetry trace enabled
+	telemetryTraceEnabled := cfg.DockerEnv["TELEMETRY_TRACE_ENABLED"]
+	if telemetryTraceEnabled == "" {
+		telemetryTraceEnabled = falseValue
+	}
+
+	// Set router key
+	routerKey := cfg.DockerEnv["ROUTER_KEY"]
+	if routerKey == "" {
+		routerKey = "25a0f627050d11b1461b2728ea3f704e141312b1d4f2a21edcec4eccddd940c2"
+	}
+
 	service := Service{
 		Name: getCardinalContainerName(cfg),
 		Config: container.Config{
 			Image: cfg.DockerEnv["CARDINAL_NAMESPACE"],
 			Env: []string{
 				fmt.Sprintf("REDIS_ADDRESS=%s:6379", getRedisContainerName(cfg)),
 				fmt.Sprintf("BASE_SHARD_SEQUENCER_ADDRESS=%s:9601", getEVMContainerName(cfg)),
+				fmt.Sprintf("BASE_SHARD_ROUTER_KEY=%s", baseShardRouterKey),
+				fmt.Sprintf("CARDINAL_LOG_LEVEL=%s", cardinalLogLevel),
+				fmt.Sprintf("CARDINAL_LOG_PRETTY=%s", cardinalLogPretty),
+				fmt.Sprintf("CARDINAL_ROLLUP_ENABLED=%s", cardinalRollupEnabled),
+				fmt.Sprintf("TELEMETRY_PROFILER_ENABLED=%s", telemetryProfilerEnabled),
+				fmt.Sprintf("TELEMETRY_TRACE_ENABLED=%s", telemetryTraceEnabled),
+				fmt.Sprintf("ROUTER_KEY=%s", routerKey),
 			},
 			ExposedPorts: getExposedPorts(exposedPorts),
 		},

common/docker/service/evm.go

@@ -21,6 +21,11 @@ func EVM(cfg *config.Config) Service {
 		daBaseURL = fmt.Sprintf("http://%s", getCelestiaDevNetContainerName(cfg))
 	}
 
+	daNamespaceID := cfg.DockerEnv["DA_NAMESPACE_ID"]
+	if daNamespaceID == "" {
+		daNamespaceID = "67480c4a88c4d12935d4"
+	}
+
 	faucetEnabled := cfg.DockerEnv["FAUCET_ENABLED"]
 	if faucetEnabled == "" {
 		faucetEnabled = "false" //nolint:goconst // default values should be local to the service
@@ -41,17 +46,37 @@ func EVM(cfg *config.Config) Service {
 		baseShardRouterKey = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ01"
 	}
 
+	routerKey := cfg.DockerEnv["ROUTER_KEY"]
+	if routerKey == "" {
+		routerKey = "25a0f627050d11b1461b2728ea3f704e141312b1d4f2a21edcec4eccddd940c2"
+	}
+
+	chainID := cfg.DockerEnv["CHAIN_ID"]
+	if chainID == "" {
+		chainID = "world-420"
+	}
+
+	chainKeyMnemonic := cfg.DockerEnv["CHAIN_KEY_MNEMONIC"]
+	if chainKeyMnemonic == "" {
+		chainKeyMnemonic = "enact adjust liberty squirrel bulk ticket invest tissue antique window" +
+			"thank slam unknown fury script among bread social switch glide wool clog flag enroll"
+	}
+
 	return Service{
 		Name: getEVMContainerName(cfg),
 		Config: container.Config{
 			Image: "ghcr.io/argus-labs/world-engine-evm:1.4.1",
 			Env: []string{
 				fmt.Sprintf("DA_BASE_URL=%s", daBaseURL),
 				fmt.Sprintf("DA_AUTH_TOKEN=%s", cfg.DockerEnv["DA_AUTH_TOKEN"]),
+				fmt.Sprintf("DA_NAMESPACE_ID=%s", daNamespaceID),
 				fmt.Sprintf("FAUCET_ENABLED=%s", faucetEnabled),
 				fmt.Sprintf("FAUCET_ADDRESS=%s", faucetAddress),
 				fmt.Sprintf("FAUCET_AMOUNT=%s", faucetAmount),
 				fmt.Sprintf("BASE_SHARD_ROUTER_KEY=%s", baseShardRouterKey),
+				fmt.Sprintf("ROUTER_KEY=%s", routerKey),
+				fmt.Sprintf("CHAIN_ID=%s", chainID),
+				fmt.Sprintf("CHAIN_KEY_MNEMONIC=%s", chainKeyMnemonic),
 			},
 			ExposedPorts: getExposedPorts([]int{1317, 26657, 9090, 9601}),
 		},

common/docker/service/redis.go

@@ -34,10 +34,7 @@ func Redis(cfg *config.Config) Service {
 	return Service{
 		Name: getRedisContainerName(cfg),
 		Config: container.Config{
-			Image: "redis:latest",
-			Env: []string{
-				fmt.Sprintf("REDIS_PASSWORD=%s", cfg.DockerEnv["REDIS_PASSWORD"]),
-			},
+			Image:        "redis:latest",
 			ExposedPorts: getExposedPorts(exposedPorts),
 		},
 		HostConfig: container.HostConfig{

common/logger/init.go

@@ -64,6 +64,6 @@ func PrintLogs() {
 // AddVerboseFlag set flag --log-debug
 func AddVerboseFlag(cmd ...*cobra.Command) {
 	for _, c := range cmd {
-		c.PersistentFlags().BoolVarP(&verboseMode, "verbose", "v", false, "Enable World CLI debug logs")
+		c.Flags().BoolVarP(&verboseMode, "verbose", "v", false, "Enable World CLI debug logs")
 	}
 }