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

enable floodsub, update p2p discovery namespace, update registry address mapping to assets

Author: blockchainluffy

package_variants/chiado/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - "24003:24003"
       - "27656:27656"
       - "27660:27660"
-      - "9200:9200"
+      - "9200:9100"
 
   metrics:
     build:

package_variants/gnosis/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - "24003:24003"
       - "27656:27656"
       - "27660:27660"
-      - "9200:9200"
+      - "9200:9100"
 
   metrics:
     build:

shutter/go-shutter-settings/settings/keyper.go

@@ -11,7 +11,7 @@ type KeyperConfig struct {
 	DatabaseURL          string `env:"SHUTTER_DATABASEURL"`
 	BeaconAPIURL         string `env:"SHUTTER_BEACONAPIURL"`
 	MaxNumKeysPerMessage int    `env:"_ASSETS_MAX_NUM_KEYS_PER_MESSAGE"`
-	Chain               struct {
+	Chain                struct {
 		EncryptedGasLimit    int `env:"_ASSETS_ENCRYPTED_GAS_LIMIT"`
 		MaxTxPointerAge      int `env:"_ASSETS_MAX_TX_POINTER_AGE"`
 		GenesisSlotTimestamp int `env:"_ASSETS_GENESIS_SLOT_TIMESTAMP"`
@@ -25,15 +25,18 @@ type KeyperConfig struct {
 		Contracts struct {
 			KeyperSetManager     string `env:"_ASSETS_KEYPER_SET_MANAGER"`
 			KeyBroadcastContract string `env:"_ASSETS_KEY_BROADCAST_CONTRACT"`
-			ShutterRegistry      string `env:"_ASSETS_SHUTTER_REGISTRY"`
+			ShutterRegistry      string `env:"_ASSETS_SHUTTERREGISTRY"`
 		}
 	}
 	P2P struct {
 		P2PKey                   string   `env:"SHUTTER_P2P_KEY"`
 		ListenAddresses          []string `env:"SHUTTER_P2P_LISTENADDRESSES"`
 		AdvertiseAddresses       []string `env:"SHUTTER_P2P_ADVERTISEADDRESSES"`
 		CustomBootstrapAddresses []string `env:"_ASSETS_CUSTOM_BOOTSTRAP_ADDRESSES"`
-		DiscoveryNamespace       string   `env:"_ASSETS_DISCOVERY_NAME_PREFIX"`
+		DiscoveryNamespace       string   `env:"SHUTTER_DISCOVERY_NAMESPACE"`
+		FloodSubDiscovery        struct {
+			Enabled bool `env:"FLOODSUB_DISCOVERY_ENABLED"`
+		}
 	}
 	Shuttermint struct {
 		ShuttermintURL     string `env:"SHUTTER_SHUTTERMINT_SHUTTERMINTURL"`

shutter/scripts/configure_keyper.sh

@@ -20,6 +20,8 @@ export SHUTTER_NETWORK_NODE_ETHEREUMURL=${ETHEREUM_WS}
 echo "[DEBUG | configure] SHUTTER_NETWORK_NODE_ETHEREUMURL is ${SHUTTER_NETWORK_NODE_ETHEREUMURL}"
 export VALIDATOR_PUBLIC_KEY=$(cat "${SHUTTER_CHAIN_DIR}/config/priv_validator_pubkey.hex")
 export SHUTTER_METRICS_ENABLED=${SHUTTER_PUSH_METRICS_ENABLED}
+export FLOODSUB_DISCOVERY_ENABLED=true
+export SHUTTER_DISCOVERY_NAMESPACE="${_ASSETS_DISCOVERY_NAME_PREFIX}-${_ASSETS_INSTANCE_ID}"
 
 echo "[INFO | configure] LISTEN: $SHUTTER_P2P_LISTENADDRESSES"