Merge pull request #14 from PowerLoom/dockerify

Merge setup for trusted sequencer list

config/settings.example.json

@@ -4,6 +4,5 @@
   "SignerAccountAddress": "SIGNER_ACCOUNT_ADDRESS",
   "LocalCollectorPort": "LOCAL_COLLECTOR_PORT",
   "TrustedRelayersListUrl" : "TRUSTED_RELAYERS_LIST_URL",
-  "SequencerNetworkPath" : "SEQUENCER_MULTIADDR",
   "DataMarketAddress" : "DATA_MARKET_CONTRACT"
 }

config/settings.go

@@ -2,9 +2,10 @@ package config
 
 import (
 	"encoding/json"
-	log "github.com/sirupsen/logrus"
 	"os"
 	"strings"
+
+	log "github.com/sirupsen/logrus"
 )
 
 var SettingsObj *Settings
@@ -18,7 +19,6 @@ type Settings struct {
 	SignerAccountAddress   string `json:"SignerAccountAddress"`
 	PortNumber             string `json:"LocalCollectorPort"`
 	TrustedRelayersListUrl string `json:"TrustedRelayersListUrl"`
-	SequencerNetworkPath   string `json:"Sequencers"`
 	DataMarketAddress      string `json:"DataMarketAddress"`
 }
 

pkgs/service/discovery.go

@@ -3,13 +3,13 @@ package service
 import (
 	"context"
 	"encoding/json"
-	"github.com/pkg/errors"
 	"io"
 	"net/http"
 	"proto-snapshot-server/config"
 	"sync"
 
-	"github.com/cenkalti/backoff/v4"
+	"github.com/pkg/errors"
+
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/network"
@@ -112,19 +112,11 @@ func AddPeerConnection(ctx context.Context, host host.Host, relayerAddr string)
 	if err != nil {
 		log.Errorf("Failed to connect to relayer %s: %s", peerInfo.ID, err)
 		return false
-		if err := backoff.Retry(func() error { return host.Connect(ctx, *peerInfo) }, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 1)); err != nil {
-			log.Errorf("Failed to connect to relayer %s: %s", peerInfo.ID, err)
-		} else {
-			log.Infof("Connected to new relayer: %s", peerInfo.ID)
-			return true
-		}
 	} else {
 		log.Infof("Connected to new relayer: %s", peerInfo.ID)
 		log.Infoln("Connected: ", host.Network().ConnsToPeer(peerInfo.ID))
 		return true
 	}
-
-	return false
 }
 
 func ConnectToTrustedRelayers(ctx context.Context, host host.Host) []Relayer {

pkgs/service/msg_server.go

@@ -78,7 +78,7 @@ func mustSetStream(s *server) error {
 		}
 		return nil
 	}
-	return backoff.Retry(operation, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 3))
+	return backoff.Retry(operation, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 1))
 }
 
 func TryConnection(s *server) error {

pkgs/service/relay.go

@@ -150,25 +150,17 @@ func ConnectToSequencer() {
 	var sequencerAddr ma.Multiaddr
 	var err error
 
-	if config.SettingsObj.SequencerNetworkPath != "" {
-		sequencerAddr, err = ma.NewMultiaddr(config.SettingsObj.SequencerNetworkPath)
-		if err != nil {
-			log.Debugln(err.Error())
-			return
-		}
-	} else {
-		sequencer, err := fetchSequencer("https://raw.githubusercontent.com/PowerLoom/snapshotter-lite-local-collector/feat/trusted-relayers/sequencers.json", config.SettingsObj.DataMarketAddress)
-		if err != nil {
-			log.Debugln(err.Error())
-		}
-		config.SettingsObj.SequencerNetworkPath = sequencer.Maddr
-		sequencerAddr, err = ma.NewMultiaddr(sequencer.Maddr)
-		if err != nil {
-			log.Debugln(err.Error())
-			return
-		}
+
+	sequencer, err := fetchSequencer("https://raw.githubusercontent.com/PowerLoom/snapshotter-lite-local-collector/feat/trusted-relayers/sequencers.json", config.SettingsObj.DataMarketAddress)
+	if err != nil {
+		log.Debugln(err.Error())
 	}
-
+	sequencerAddr, err = ma.NewMultiaddr(sequencer.Maddr)
+	if err != nil {
+		log.Debugln(err.Error())
+		return
+	}
+
 	sequencerInfo, err := peer.AddrInfoFromP2pAddr(sequencerAddr)
 
 	if err != nil {

server_autofill.sh

@@ -34,7 +34,6 @@ sed -i'.backup' -e "s#POWERLOOM_REPORTING_URL#$POWERLOOM_REPORTING_URL#" \
                 -e "s#SIGNER_ACCOUNT_ADDRESS#$SIGNER_ACCOUNT_ADDRESS#" \
                 -e "s#LOCAL_COLLECTOR_PORT#$LOCAL_COLLECTOR_PORT#" \
                 -e "s#RELAYER_PRIVATE_KEY#$RELAYER_PRIVATE_KEY#" settings.json \
-                -e "s#SEQUENCER_MULTIADDR#$SEQUENCER_MULTIADDR#" \
                 -e "s#TRUSTED_RELAYERS_LIST_URL#$TRUSTED_RELAYERS_LIST_URL#" settings.json \
                 -e "s#DATA_MARKET_CONTRACT#$DATA_MARKET_CONTRACT#" settings.json