Merge pull request #4 from shutter-network/shutter-version-update

use same ports for host and containers, update for chain's p2p port

Author: ylembachar

shutter/go-shutter-settings/settings/chain.go

@@ -8,26 +8,27 @@ import (
 )
 
 type ChainConfig struct {
-	Moniker    string `env:"KEYPER_NAME"`
-    Genesis_file string `env:"ASSETS_GENESIS_FILE"`
-    P2P struct {
-        Seeds string `env:"_ASSETS_SHUTTERMINT_SEED_NODES"`
-        External_address string `env:"SHUTTER_EXTERNAL_ADDRESS"`
-        Addr_book_strict bool `env:"SHUTTER_ADDR_BOOK_STRICT"`
-        Pex bool `env:"SHUTTER_P2P_PEX"`
-    }
-    Instrumentation struct {
-        Prometheus bool `env:"SHUTTER_PUSH_METRICS_ENABLED"`
-        Prometheus_listen_addr string `env:"SHUTTER_PROMETHEUS_LISTEN_ADDR"`
-    }
+	Moniker      string `env:"KEYPER_NAME"`
+	Genesis_file string `env:"ASSETS_GENESIS_FILE"`
+	P2P          struct {
+		Seeds            string `env:"_ASSETS_SHUTTERMINT_SEED_NODES"`
+		External_address string `env:"SHUTTER_EXTERNAL_ADDRESS"`
+		Addr_book_strict bool   `env:"SHUTTER_ADDR_BOOK_STRICT"`
+		Pex              bool   `env:"SHUTTER_P2P_PEX"`
+		Laddr            string `env:"SHUTTER_P2P_LADDR"`
+	}
+	Instrumentation struct {
+		Prometheus             bool   `env:"SHUTTER_PUSH_METRICS_ENABLED"`
+		Prometheus_listen_addr string `env:"SHUTTER_PROMETHEUS_LISTEN_ADDR"`
+	}
 }
 
 func AddSettingsToChain(generatedFilePath, outputFilePath string) error {
-    var generatedConfig map[string]interface{}
+	var generatedConfig map[string]interface{}
 
-    fmt.Println("Adding user settings to chain...")
+	fmt.Println("Adding user settings to chain...")
 
-    if _, err := os.Stat(generatedFilePath); os.IsNotExist(err) {
+	if _, err := os.Stat(generatedFilePath); os.IsNotExist(err) {
 		return fmt.Errorf("generated file does not exist: %s", generatedFilePath)
 	}
 
@@ -36,21 +37,21 @@ func AddSettingsToChain(generatedFilePath, outputFilePath string) error {
 		return err
 	}
 
-    chainConfig := getChainConfigFromEnvs()
+	chainConfig := getChainConfigFromEnvs()
 
-    // ToLower is used because chain cofig file fields are lower case, but the struct
-    // fields are upper case to be exported
-    ApplyConfigToGenerated(reflect.ValueOf(chainConfig), &generatedConfig, strings.ToLower)
+	// ToLower is used because chain cofig file fields are lower case, but the struct
+	// fields are upper case to be exported
+	ApplyConfigToGenerated(reflect.ValueOf(chainConfig), &generatedConfig, strings.ToLower)
 
-    MarshalToFile(outputFilePath, generatedConfig)
+	MarshalToFile(outputFilePath, generatedConfig)
 
-    fmt.Println("Chain TOML file modified successfully and saved to", outputFilePath)
+	fmt.Println("Chain TOML file modified successfully and saved to", outputFilePath)
 
-    return nil
+	return nil
 }
 
 func getChainConfigFromEnvs() ChainConfig {
 	chainConfig := ChainConfig{}
 	PopulateFromEnv(&chainConfig)
 	return chainConfig
-}
+}

shutter/scripts/configure_shuttermint.sh

@@ -16,8 +16,9 @@ ln -s "$ASSETS_GENESIS_FILE" "$CHAIN_GENESIS_FILE"
 
 export SHUTTER_ADDR_BOOK_STRICT=true
 export SHUTTER_P2P_PEX=true
-export SHUTTER_PROMETHEUS_LISTEN_ADDR="0.0.0.0:26660"
+export SHUTTER_PROMETHEUS_LISTEN_ADDR="0.0.0.0:27660"
 export SHUTTER_EXTERNAL_ADDRESS="${_DAPPNODE_GLOBAL_PUBLIC_IP}:${CHAIN_PORT}"
+export SHUTTER_P2P_LADDR="tcp://0.0.0.0:${CHAIN_PORT}"
 
 # KEYPER_NAME=${KEYPER_NAME:-$(openssl rand -hex 8)}