fix: default network config (#2232)

cmd/bee/cmd/cmd.go

@@ -210,7 +210,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNameNATAddr, "", "NAT exposed address")
 	cmd.Flags().Bool(optionNameP2PWSEnable, false, "enable P2P WebSocket transport")
 	cmd.Flags().Bool(optionNameP2PQUICEnable, false, "enable P2P QUIC transport")
-	cmd.Flags().StringSlice(optionNameBootnodes, []string{}, "initial nodes to connect to")
+	cmd.Flags().StringSlice(optionNameBootnodes, []string{"/dnsaddr/testnet.ethswarm.org"}, "initial nodes to connect to")
 	cmd.Flags().Bool(optionNameDebugAPIEnable, false, "enable debug HTTP API")
 	cmd.Flags().String(optionNameDebugAPIAddr, ":1635", "debug HTTP API listen address")
 	cmd.Flags().Uint64(optionNameNetworkID, 10, "ID of the Swarm network")

cmd/bee/cmd/start.go

@@ -128,18 +128,28 @@ inability to use, or your interaction with other nodes or the software.`)
 			}
 
 			mainnet := c.config.GetBool(optionNameMainNet)
-
 			networkID := c.config.GetUint64(optionNameNetworkID)
-			networkID, err = parseNetworks(mainnet, networkID)
-			if err != nil {
-				return err
+
+			if mainnet {
+				userHasSetNetworkID := c.config.IsSet(optionNameNetworkID)
+				if userHasSetNetworkID && networkID != 1 {
+					return errors.New("provided network ID does not match mainnet")
+				}
+				networkID = 1
 			}
 
 			bootnodes := c.config.GetStringSlice(optionNameBootnodes)
-			bootnodes = parseBootnodes(logger, mainnet, networkID, bootnodes)
-
 			blockTime := c.config.GetUint64(optionNameBlockTime)
-			blockTime = parseBlockTime(mainnet, blockTime)
+
+			networkConfig := getConfigByNetworkID(networkID, blockTime)
+
+			if c.config.IsSet(optionNameBootnodes) {
+				networkConfig.bootNodes = bootnodes
+			}
+
+			if c.config.IsSet(optionNameBlockTime) && blockTime != 0 {
+				networkConfig.blockTime = blockTime
+			}
 
 			b, err := node.NewBee(c.config.GetString(optionNameP2PAddr), signerConfig.publicKey, signerConfig.signer, networkID, logger, signerConfig.libp2pPrivateKey, signerConfig.pssPrivateKey, &node.Options{
 				DataDir:                    c.config.GetString(optionNameDataDir),
@@ -155,7 +165,7 @@ inability to use, or your interaction with other nodes or the software.`)
 				EnableWS:                   c.config.GetBool(optionNameP2PWSEnable),
 				EnableQUIC:                 c.config.GetBool(optionNameP2PQUICEnable),
 				WelcomeMessage:             c.config.GetString(optionWelcomeMessage),
-				Bootnodes:                  bootnodes,
+				Bootnodes:                  networkConfig.bootNodes,
 				CORSAllowedOrigins:         c.config.GetStringSlice(optionCORSAllowedOrigins),
 				Standalone:                 c.config.GetBool(optionNameStandalone),
 				TracingEnabled:             c.config.GetBool(optionNameTracingEnabled),
@@ -179,9 +189,10 @@ inability to use, or your interaction with other nodes or the software.`)
 				BlockHash:                  c.config.GetString(optionNameBlockHash),
 				PostageContractAddress:     c.config.GetString(optionNamePostageContractAddress),
 				PriceOracleAddress:         c.config.GetString(optionNamePriceOracleAddress),
-				BlockTime:                  blockTime,
+				BlockTime:                  networkConfig.blockTime,
 				DeployGasPrice:             c.config.GetString(optionNameSwapDeploymentGasPrice),
 				WarmupTime:                 c.config.GetDuration(optionWarmUpTime),
+				ChainID:                    networkConfig.chainID,
 			})
 			if err != nil {
 				return err
@@ -420,36 +431,28 @@ func (c *command) configureSigner(cmd *cobra.Command, logger logging.Logger) (co
 	}, nil
 }
 
-func parseNetworks(main bool, networkID uint64) (uint64, error) {
-	if main && networkID != 1 {
-		return 0, errors.New("provided network ID does not match mainnet")
-	}
-
-	return networkID, nil
+type networkConfig struct {
+	bootNodes []string
+	blockTime uint64
+	chainID   int64
 }
 
-func parseBootnodes(log logging.Logger, main bool, networkID uint64, bootnodes []string) []string {
-	if len(bootnodes) > 0 {
-		return bootnodes // use provided values
-	}
-
-	if main {
-		return []string{"/dnsaddr/mainnet.ethswarm.org"}
-	}
-
-	if networkID == 10 {
-		return []string{"/dnsaddr/testnet.ethswarm.org"}
+func getConfigByNetworkID(networkID uint64, defaultBlockTime uint64) *networkConfig {
+	var config = networkConfig{
+		blockTime: uint64(time.Duration(defaultBlockTime) * time.Second),
 	}
-
-	log.Warning("no bootnodes defined for network ID", networkID)
-
-	return bootnodes
-}
-
-func parseBlockTime(main bool, blockTime uint64) uint64 {
-	if main {
-		return uint64(5 * time.Second)
+	switch networkID {
+	case 1:
+		config.bootNodes = []string{"/dnsaddr/mainnet.ethswarm.org"}
+		config.blockTime = uint64(5 * time.Second)
+		config.chainID = 100
+	case 5: //staging
+		config.chainID = 5
+	case 10: //test
+		config.chainID = 5
+	default: //will use the value provided by the chain
+		config.chainID = -1
 	}
 
-	return blockTime
+	return &config
 }

pkg/config/chain.go

+package config
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+)
+
+var (
+	// chain ID
+	goerliChainID = int64(5)
+	xdaiChainID   = int64(100)
+	// start block
+	goerliStartBlock = uint64(4933174)
+	xdaiStartBlock   = uint64(16515648)
+	// factory address
+	goerliContractAddress      = common.HexToAddress("0x0c9de531dcb38b758fe8a2c163444a5e54ee0db2")
+	xdaiContractAddress        = common.HexToAddress("0x0FDc5429C50e2a39066D8A94F3e2D2476fcc3b85")
+	goerliFactoryAddress       = common.HexToAddress("0x73c412512E1cA0be3b89b77aB3466dA6A1B9d273")
+	xdaiFactoryAddress         = common.HexToAddress("0xc2d5a532cf69aa9a1378737d8ccdef884b6e7420")
+	goerliLegacyFactoryAddress = common.HexToAddress("0xf0277caffea72734853b834afc9892461ea18474")
+	// postage stamp
+	goerliPostageStampContractAddress = common.HexToAddress("0x621e455C4a139f5C4e4A8122Ce55Dc21630769E4")
+	xdaiPostageStampContractAddress   = common.HexToAddress("0x6a1a21eca3ab28be85c7ba22b2d6eae5907c900e")
+)
+
+type ChainConfig struct {
+	StartBlock         uint64
+	LegacyFactories    []common.Address
+	PostageStamp       common.Address
+	CurrentFactory     common.Address
+	PriceOracleAddress common.Address
+}
+
+func GetChainConfig(chainID int64) (*ChainConfig, bool) {
+	var cfg ChainConfig
+	switch chainID {
+	case goerliChainID:
+		cfg.PostageStamp = goerliPostageStampContractAddress
+		cfg.StartBlock = goerliStartBlock
+		cfg.CurrentFactory = goerliFactoryAddress
+		cfg.LegacyFactories = []common.Address{
+			goerliLegacyFactoryAddress,
+		}
+		cfg.PriceOracleAddress = goerliContractAddress
+		return &cfg, true
+	case xdaiChainID:
+		cfg.PostageStamp = xdaiPostageStampContractAddress
+		cfg.StartBlock = xdaiStartBlock
+		cfg.CurrentFactory = xdaiFactoryAddress
+		cfg.LegacyFactories = []common.Address{}
+		cfg.PriceOracleAddress = xdaiContractAddress
+		return &cfg, true
+	default:
+		return &cfg, false
+	}
+}

pkg/node/chain.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethersphere/bee/pkg/config"
 	"github.com/ethersphere/bee/pkg/crypto"
 	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/p2p/libp2p"
@@ -82,7 +83,9 @@ func InitChequebookFactory(
 	var currentFactory common.Address
 	var legacyFactories []common.Address
 
-	foundFactory, foundLegacyFactories, found := chequebook.DiscoverFactoryAddress(chainID)
+	chainCfg, found := config.GetChainConfig(chainID)
+
+	foundFactory, foundLegacyFactories := chainCfg.CurrentFactory, chainCfg.LegacyFactories
 	if factoryAddress == "" {
 		if !found {
 			return nil, fmt.Errorf("no known factory address for this network (chain id: %d)", chainID)
@@ -211,8 +214,8 @@ func InitSwap(
 
 	var currentPriceOracleAddress common.Address
 	if priceOracleAddress == "" {
-		var found bool
-		currentPriceOracleAddress, found = priceoracle.DiscoverPriceOracleAddress(chainID)
+		chainCfg, found := config.GetChainConfig(chainID)
+		currentPriceOracleAddress = chainCfg.PriceOracleAddress
 		if !found {
 			return nil, nil, errors.New("no known price oracle address for this network")
 		}

pkg/node/node.go

@@ -29,6 +29,7 @@ import (
 	"github.com/ethersphere/bee/pkg/accounting"
 	"github.com/ethersphere/bee/pkg/addressbook"
 	"github.com/ethersphere/bee/pkg/api"
+	"github.com/ethersphere/bee/pkg/config"
 	"github.com/ethersphere/bee/pkg/crypto"
 	"github.com/ethersphere/bee/pkg/debugapi"
 	"github.com/ethersphere/bee/pkg/feeds/factory"
@@ -151,6 +152,7 @@ type Options struct {
 	BlockTime                  uint64
 	DeployGasPrice             string
 	WarmupTime                 time.Duration
+	ChainID                    int64
 }
 
 const (
@@ -225,6 +227,10 @@ func NewBee(addr string, publicKey *ecdsa.PublicKey, signer crypto.Signer, netwo
 		b.ethClientCloser = swapBackend.Close
 		b.transactionCloser = tracerCloser
 		b.transactionMonitorCloser = transactionMonitor
+
+		if o.ChainID != -1 && o.ChainID != chainID {
+			return nil, fmt.Errorf("connected to wrong ethereum network: got chainID %d, want %d", chainID, o.ChainID)
+		}
 	}
 
 	var debugAPIService *debugapi.Service
@@ -417,7 +423,8 @@ func NewBee(addr string, publicKey *ecdsa.PublicKey, signer crypto.Signer, netwo
 
 	var postageSyncStart uint64 = 0
 	if !o.Standalone {
-		postageContractAddress, startBlock, found := listener.DiscoverAddresses(chainID)
+		chainCfg, found := config.GetChainConfig(chainID)
+		postageContractAddress, startBlock := chainCfg.PostageStamp, chainCfg.StartBlock
 		if o.PostageContractAddress != "" {
 			if !common.IsHexAddress(o.PostageContractAddress) {
 				return nil, errors.New("malformed postage stamp address")

pkg/postage/listener/listener.go

@@ -327,27 +327,6 @@ type priceUpdateEvent struct {
 	Price *big.Int
 }
 
-var (
-	GoerliChainID                     = int64(5)
-	GoerliPostageStampContractAddress = common.HexToAddress("0x621e455C4a139f5C4e4A8122Ce55Dc21630769E4")
-	GoerliStartBlock                  = uint64(4933174)
-	XDaiChainID                       = int64(100)
-	XDaiPostageStampContractAddress   = common.HexToAddress("0x6a1a21eca3ab28be85c7ba22b2d6eae5907c900e")
-	XDaiStartBlock                    = uint64(16515648)
-)
-
-// DiscoverAddresses returns the canonical contracts for this chainID
-func DiscoverAddresses(chainID int64) (postageStamp common.Address, startBlock uint64, found bool) {
-	switch chainID {
-	case GoerliChainID:
-		return GoerliPostageStampContractAddress, GoerliStartBlock, true
-	case XDaiChainID:
-		return XDaiPostageStampContractAddress, XDaiStartBlock, true
-	default:
-		return common.Address{}, 0, false
-	}
-}
-
 func totalTimeMetric(metric prometheus.Counter, start time.Time) {
 	totalTime := time.Since(start)
 	metric.Add(float64(totalTime))

pkg/settlement/swap/chequebook/factory.go

@@ -227,27 +227,3 @@ func (c *factory) ERC20Address(ctx context.Context) (common.Address, error) {
 	}
 	return *erc20Address, nil
 }
-
-var (
-	GoerliChainID              = int64(5)
-	GoerliFactoryAddress       = common.HexToAddress("0x73c412512E1cA0be3b89b77aB3466dA6A1B9d273")
-	GoerliLegacyFactoryAddress = common.HexToAddress("0xf0277caffea72734853b834afc9892461ea18474")
-	XDaiChainID                = int64(100)
-	XDaiFactoryAddress         = common.HexToAddress("0xc2d5a532cf69aa9a1378737d8ccdef884b6e7420")
-)
-
-// DiscoverFactoryAddress returns the canonical factory for this chainID
-func DiscoverFactoryAddress(chainID int64) (currentFactory common.Address, legacyFactories []common.Address, found bool) {
-	switch chainID {
-	case GoerliChainID:
-		// goerli
-		return GoerliFactoryAddress, []common.Address{
-			GoerliLegacyFactoryAddress,
-		}, true
-	case XDaiChainID:
-		// xdai
-		return XDaiFactoryAddress, []common.Address{}, true
-	default:
-		return common.Address{}, nil, false
-	}
-}

pkg/settlement/swap/priceoracle/priceoracle.go

@@ -145,21 +145,3 @@ func (s *service) Close() error {
 	close(s.quitC)
 	return nil
 }
-
-var (
-	goerliChainID         = int64(5)
-	goerliContractAddress = common.HexToAddress("0x0c9de531dcb38b758fe8a2c163444a5e54ee0db2")
-	xdaiChainID           = int64(100)
-	xdaiContractAddress   = common.HexToAddress("0x0FDc5429C50e2a39066D8A94F3e2D2476fcc3b85")
-)
-
-// DiscoverPriceOracleAddress returns the canonical price oracle for this chainID
-func DiscoverPriceOracleAddress(chainID int64) (priceOracleAddress common.Address, found bool) {
-	switch chainID {
-	case goerliChainID:
-		return goerliContractAddress, true
-	case xdaiChainID:
-		return xdaiContractAddress, true
-	}
-	return common.Address{}, false
-}