update default factory and add support for legacy factories

cmd/bee/cmd/cmd.go

@@ -17,44 +17,45 @@ import (
 )
 
 const (
-	optionNameDataDir                   = "data-dir"
-	optionNameDBCapacity                = "db-capacity"
-	optionNameDBOpenFilesLimit          = "db-open-files-limit"
-	optionNameDBBlockCacheCapacity      = "db-block-cache-capacity"
-	optionNameDBWriteBufferSize         = "db-write-buffer-size"
-	optionNameDBDisableSeeksCompaction  = "db-disable-seeks-compaction"
-	optionNamePassword                  = "password"
-	optionNamePasswordFile              = "password-file"
-	optionNameAPIAddr                   = "api-addr"
-	optionNameP2PAddr                   = "p2p-addr"
-	optionNameNATAddr                   = "nat-addr"
-	optionNameP2PWSEnable               = "p2p-ws-enable"
-	optionNameP2PQUICEnable             = "p2p-quic-enable"
-	optionNameDebugAPIEnable            = "debug-api-enable"
-	optionNameDebugAPIAddr              = "debug-api-addr"
-	optionNameBootnodes                 = "bootnode"
-	optionNameNetworkID                 = "network-id"
-	optionWelcomeMessage                = "welcome-message"
-	optionCORSAllowedOrigins            = "cors-allowed-origins"
-	optionNameStandalone                = "standalone"
-	optionNameTracingEnabled            = "tracing-enable"
-	optionNameTracingEndpoint           = "tracing-endpoint"
-	optionNameTracingServiceName        = "tracing-service-name"
-	optionNameVerbosity                 = "verbosity"
-	optionNameGlobalPinningEnabled      = "global-pinning-enable"
-	optionNamePaymentThreshold          = "payment-threshold"
-	optionNamePaymentTolerance          = "payment-tolerance"
-	optionNamePaymentEarly              = "payment-early"
-	optionNameResolverEndpoints         = "resolver-options"
-	optionNameBootnodeMode              = "bootnode-mode"
-	optionNameGatewayMode               = "gateway-mode"
-	optionNameClefSignerEnable          = "clef-signer-enable"
-	optionNameClefSignerEndpoint        = "clef-signer-endpoint"
-	optionNameClefSignerEthereumAddress = "clef-signer-ethereum-address"
-	optionNameSwapEndpoint              = "swap-endpoint"
-	optionNameSwapFactoryAddress        = "swap-factory-address"
-	optionNameSwapInitialDeposit        = "swap-initial-deposit"
-	optionNameSwapEnable                = "swap-enable"
+	optionNameDataDir                    = "data-dir"
+	optionNameDBCapacity                 = "db-capacity"
+	optionNameDBOpenFilesLimit           = "db-open-files-limit"
+	optionNameDBBlockCacheCapacity       = "db-block-cache-capacity"
+	optionNameDBWriteBufferSize          = "db-write-buffer-size"
+	optionNameDBDisableSeeksCompaction   = "db-disable-seeks-compaction"
+	optionNamePassword                   = "password"
+	optionNamePasswordFile               = "password-file"
+	optionNameAPIAddr                    = "api-addr"
+	optionNameP2PAddr                    = "p2p-addr"
+	optionNameNATAddr                    = "nat-addr"
+	optionNameP2PWSEnable                = "p2p-ws-enable"
+	optionNameP2PQUICEnable              = "p2p-quic-enable"
+	optionNameDebugAPIEnable             = "debug-api-enable"
+	optionNameDebugAPIAddr               = "debug-api-addr"
+	optionNameBootnodes                  = "bootnode"
+	optionNameNetworkID                  = "network-id"
+	optionWelcomeMessage                 = "welcome-message"
+	optionCORSAllowedOrigins             = "cors-allowed-origins"
+	optionNameStandalone                 = "standalone"
+	optionNameTracingEnabled             = "tracing-enable"
+	optionNameTracingEndpoint            = "tracing-endpoint"
+	optionNameTracingServiceName         = "tracing-service-name"
+	optionNameVerbosity                  = "verbosity"
+	optionNameGlobalPinningEnabled       = "global-pinning-enable"
+	optionNamePaymentThreshold           = "payment-threshold"
+	optionNamePaymentTolerance           = "payment-tolerance"
+	optionNamePaymentEarly               = "payment-early"
+	optionNameResolverEndpoints          = "resolver-options"
+	optionNameBootnodeMode               = "bootnode-mode"
+	optionNameGatewayMode                = "gateway-mode"
+	optionNameClefSignerEnable           = "clef-signer-enable"
+	optionNameClefSignerEndpoint         = "clef-signer-endpoint"
+	optionNameClefSignerEthereumAddress  = "clef-signer-ethereum-address"
+	optionNameSwapEndpoint               = "swap-endpoint"
+	optionNameSwapFactoryAddress         = "swap-factory-address"
+	optionNameSwapLegacyFactoryAddresses = "swap-legacy-factory-addresses"
+	optionNameSwapInitialDeposit         = "swap-initial-deposit"
+	optionNameSwapEnable                 = "swap-enable"
 )
 
 func init() {
@@ -217,7 +218,8 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNameClefSignerEndpoint, "", "clef signer endpoint")
 	cmd.Flags().String(optionNameClefSignerEthereumAddress, "", "ethereum address to use from clef signer")
 	cmd.Flags().String(optionNameSwapEndpoint, "http://localhost:8545", "swap ethereum blockchain endpoint")
-	cmd.Flags().String(optionNameSwapFactoryAddress, "", "swap factory address")
+	cmd.Flags().String(optionNameSwapFactoryAddress, "", "swap factory addresses")
+	cmd.Flags().StringSlice(optionNameSwapLegacyFactoryAddresses, nil, "legacy swap factory addresses")
 	cmd.Flags().String(optionNameSwapInitialDeposit, "100000000000000000", "initial deposit if deploying a new chequebook")
 	cmd.Flags().Bool(optionNameSwapEnable, true, "enable swap")
 }

cmd/bee/cmd/deploy.go

@@ -85,6 +85,7 @@ func (c *command) initDeployCmd() error {
 				chainID,
 				transactionService,
 				factoryAddress,
+				nil,
 			)
 			if err != nil {
 				return err

cmd/bee/cmd/start.go

@@ -121,37 +121,38 @@ Welcome to the Swarm.... Bzzz Bzzzz Bzzzz
 			}
 
 			b, err := node.NewBee(c.config.GetString(optionNameP2PAddr), signerConfig.address, *signerConfig.publicKey, signerConfig.signer, c.config.GetUint64(optionNameNetworkID), logger, signerConfig.libp2pPrivateKey, signerConfig.pssPrivateKey, node.Options{
-				DataDir:                  c.config.GetString(optionNameDataDir),
-				DBCapacity:               c.config.GetUint64(optionNameDBCapacity),
-				DBOpenFilesLimit:         c.config.GetUint64(optionNameDBOpenFilesLimit),
-				DBBlockCacheCapacity:     c.config.GetUint64(optionNameDBBlockCacheCapacity),
-				DBWriteBufferSize:        c.config.GetUint64(optionNameDBWriteBufferSize),
-				DBDisableSeeksCompaction: c.config.GetBool(optionNameDBDisableSeeksCompaction),
-				APIAddr:                  c.config.GetString(optionNameAPIAddr),
-				DebugAPIAddr:             debugAPIAddr,
-				Addr:                     c.config.GetString(optionNameP2PAddr),
-				NATAddr:                  c.config.GetString(optionNameNATAddr),
-				EnableWS:                 c.config.GetBool(optionNameP2PWSEnable),
-				EnableQUIC:               c.config.GetBool(optionNameP2PQUICEnable),
-				WelcomeMessage:           c.config.GetString(optionWelcomeMessage),
-				Bootnodes:                c.config.GetStringSlice(optionNameBootnodes),
-				CORSAllowedOrigins:       c.config.GetStringSlice(optionCORSAllowedOrigins),
-				Standalone:               c.config.GetBool(optionNameStandalone),
-				TracingEnabled:           c.config.GetBool(optionNameTracingEnabled),
-				TracingEndpoint:          c.config.GetString(optionNameTracingEndpoint),
-				TracingServiceName:       c.config.GetString(optionNameTracingServiceName),
-				Logger:                   logger,
-				GlobalPinningEnabled:     c.config.GetBool(optionNameGlobalPinningEnabled),
-				PaymentThreshold:         c.config.GetString(optionNamePaymentThreshold),
-				PaymentTolerance:         c.config.GetString(optionNamePaymentTolerance),
-				PaymentEarly:             c.config.GetString(optionNamePaymentEarly),
-				ResolverConnectionCfgs:   resolverCfgs,
-				GatewayMode:              c.config.GetBool(optionNameGatewayMode),
-				BootnodeMode:             c.config.GetBool(optionNameBootnodeMode),
-				SwapEndpoint:             c.config.GetString(optionNameSwapEndpoint),
-				SwapFactoryAddress:       c.config.GetString(optionNameSwapFactoryAddress),
-				SwapInitialDeposit:       c.config.GetString(optionNameSwapInitialDeposit),
-				SwapEnable:               c.config.GetBool(optionNameSwapEnable),
+				DataDir:                    c.config.GetString(optionNameDataDir),
+				DBCapacity:                 c.config.GetUint64(optionNameDBCapacity),
+				DBOpenFilesLimit:           c.config.GetUint64(optionNameDBOpenFilesLimit),
+				DBBlockCacheCapacity:       c.config.GetUint64(optionNameDBBlockCacheCapacity),
+				DBWriteBufferSize:          c.config.GetUint64(optionNameDBWriteBufferSize),
+				DBDisableSeeksCompaction:   c.config.GetBool(optionNameDBDisableSeeksCompaction),
+				APIAddr:                    c.config.GetString(optionNameAPIAddr),
+				DebugAPIAddr:               debugAPIAddr,
+				Addr:                       c.config.GetString(optionNameP2PAddr),
+				NATAddr:                    c.config.GetString(optionNameNATAddr),
+				EnableWS:                   c.config.GetBool(optionNameP2PWSEnable),
+				EnableQUIC:                 c.config.GetBool(optionNameP2PQUICEnable),
+				WelcomeMessage:             c.config.GetString(optionWelcomeMessage),
+				Bootnodes:                  c.config.GetStringSlice(optionNameBootnodes),
+				CORSAllowedOrigins:         c.config.GetStringSlice(optionCORSAllowedOrigins),
+				Standalone:                 c.config.GetBool(optionNameStandalone),
+				TracingEnabled:             c.config.GetBool(optionNameTracingEnabled),
+				TracingEndpoint:            c.config.GetString(optionNameTracingEndpoint),
+				TracingServiceName:         c.config.GetString(optionNameTracingServiceName),
+				Logger:                     logger,
+				GlobalPinningEnabled:       c.config.GetBool(optionNameGlobalPinningEnabled),
+				PaymentThreshold:           c.config.GetString(optionNamePaymentThreshold),
+				PaymentTolerance:           c.config.GetString(optionNamePaymentTolerance),
+				PaymentEarly:               c.config.GetString(optionNamePaymentEarly),
+				ResolverConnectionCfgs:     resolverCfgs,
+				GatewayMode:                c.config.GetBool(optionNameGatewayMode),
+				BootnodeMode:               c.config.GetBool(optionNameBootnodeMode),
+				SwapEndpoint:               c.config.GetString(optionNameSwapEndpoint),
+				SwapFactoryAddress:         c.config.GetString(optionNameSwapFactoryAddress),
+				SwapLegacyFactoryAddresses: c.config.GetStringSlice(optionNameSwapLegacyFactoryAddresses),
+				SwapInitialDeposit:         c.config.GetString(optionNameSwapInitialDeposit),
+				SwapEnable:                 c.config.GetBool(optionNameSwapEnable),
 			})
 			if err != nil {
 				return err

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/coreos/go-semver v0.3.0
 	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/ethereum/go-ethereum v1.9.23
-	github.com/ethersphere/go-sw3-abi v0.3.2
+	github.com/ethersphere/go-sw3-abi v0.4.0
 	github.com/ethersphere/langos v1.0.0
 	github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15
 	github.com/gogo/protobuf v1.3.1

go.sum

@@ -148,6 +148,7 @@ github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUn
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf h1:sh8rkQZavChcmakYiSlqu2425CHyFXLZZnvm7PDpU8M=
 github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -165,8 +166,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ethereum/go-ethereum v1.9.23 h1:SIKhg/z4Q7AbvqcxuPYvMxf36che/Rq/Pp0IdYEkbtw=
 github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM=
-github.com/ethersphere/go-sw3-abi v0.3.2 h1:BVTuSZ9Ph/JJBglU9pCRSch3gDq4g5QEto6KzMYP/08=
-github.com/ethersphere/go-sw3-abi v0.3.2/go.mod h1:BmpsvJ8idQZdYEtWnvxA8POYQ8Rl/NhyCdF0zLMOOJU=
+github.com/ethersphere/go-sw3-abi v0.4.0 h1:T3ANY+ktWrPAwe2U0tZi+DILpkHzto5ym/XwV/Bbz8g=
+github.com/ethersphere/go-sw3-abi v0.4.0/go.mod h1:BmpsvJ8idQZdYEtWnvxA8POYQ8Rl/NhyCdF0zLMOOJU=
 github.com/ethersphere/langos v1.0.0 h1:NBtNKzXTTRSue95uOlzPN4py7Aofs0xWPzyj4AI1Vcc=
 github.com/ethersphere/langos v1.0.0/go.mod h1:dlcN2j4O8sQ+BlCaxeBu43bgr4RQ+inJ+pHwLeZg5Tw=
 github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=

pkg/node/chain.go

@@ -79,26 +79,43 @@ func InitChequebookFactory(
 	chainID int64,
 	transactionService transaction.Service,
 	factoryAddress string,
+	legacyFactoryAddresses []string,
 ) (chequebook.Factory, error) {
-	var addr common.Address
+	var currentFactory common.Address
+	var legacyFactories []common.Address
+
+	foundFactory, foundLegacyFactories, found := chequebook.DiscoverFactoryAddress(chainID)
 	if factoryAddress == "" {
-		var found bool
-		addr, found = chequebook.DiscoverFactoryAddress(chainID)
 		if !found {
 			return nil, errors.New("no known factory address for this network")
 		}
-		logger.Infof("using default factory address for chain id %d: %x", chainID, addr)
+		currentFactory = foundFactory
+		logger.Infof("using default factory address for chain id %d: %x", chainID, currentFactory)
 	} else if !common.IsHexAddress(factoryAddress) {
 		return nil, errors.New("malformed factory address")
 	} else {
-		addr = common.HexToAddress(factoryAddress)
-		logger.Infof("using custom factory address: %x", addr)
+		currentFactory = common.HexToAddress(factoryAddress)
+		logger.Infof("using custom factory address: %x", currentFactory)
+	}
+
+	if legacyFactories == nil {
+		if found {
+			legacyFactories = foundLegacyFactories
+		}
+	} else {
+		for _, legacyAddress := range legacyFactoryAddresses {
+			if !common.IsHexAddress(legacyAddress) {
+				return nil, errors.New("malformed factory address")
+			}
+			legacyFactories = append(legacyFactories, common.HexToAddress(legacyAddress))
+		}
 	}
 
 	return chequebook.NewFactory(
 		backend,
 		transactionService,
-		addr,
+		currentFactory,
+		legacyFactories,
 	), nil
 }
 

pkg/node/node.go

@@ -83,37 +83,38 @@ type Bee struct {
 }
 
 type Options struct {
-	DataDir                  string
-	DBCapacity               uint64
-	DBOpenFilesLimit         uint64
-	DBWriteBufferSize        uint64
-	DBBlockCacheCapacity     uint64
-	DBDisableSeeksCompaction bool
-	APIAddr                  string
-	DebugAPIAddr             string
-	Addr                     string
-	NATAddr                  string
-	EnableWS                 bool
-	EnableQUIC               bool
-	WelcomeMessage           string
-	Bootnodes                []string
-	CORSAllowedOrigins       []string
-	Logger                   logging.Logger
-	Standalone               bool
-	TracingEnabled           bool
-	TracingEndpoint          string
-	TracingServiceName       string
-	GlobalPinningEnabled     bool
-	PaymentThreshold         string
-	PaymentTolerance         string
-	PaymentEarly             string
-	ResolverConnectionCfgs   []multiresolver.ConnectionConfig
-	GatewayMode              bool
-	BootnodeMode             bool
-	SwapEndpoint             string
-	SwapFactoryAddress       string
-	SwapInitialDeposit       string
-	SwapEnable               bool
+	DataDir                    string
+	DBCapacity                 uint64
+	DBOpenFilesLimit           uint64
+	DBWriteBufferSize          uint64
+	DBBlockCacheCapacity       uint64
+	DBDisableSeeksCompaction   bool
+	APIAddr                    string
+	DebugAPIAddr               string
+	Addr                       string
+	NATAddr                    string
+	EnableWS                   bool
+	EnableQUIC                 bool
+	WelcomeMessage             string
+	Bootnodes                  []string
+	CORSAllowedOrigins         []string
+	Logger                     logging.Logger
+	Standalone                 bool
+	TracingEnabled             bool
+	TracingEndpoint            string
+	TracingServiceName         string
+	GlobalPinningEnabled       bool
+	PaymentThreshold           string
+	PaymentTolerance           string
+	PaymentEarly               string
+	ResolverConnectionCfgs     []multiresolver.ConnectionConfig
+	GatewayMode                bool
+	BootnodeMode               bool
+	SwapEndpoint               string
+	SwapFactoryAddress         string
+	SwapLegacyFactoryAddresses []string
+	SwapInitialDeposit         string
+	SwapEnable                 bool
 }
 
 func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey, signer crypto.Signer, networkID uint64, logger logging.Logger, libp2pPrivateKey, pssPrivateKey *ecdsa.PrivateKey, o Options) (b *Bee, err error) {
@@ -216,6 +217,7 @@ func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey,
 			chainID,
 			transactionService,
 			o.SwapFactoryAddress,
+			o.SwapLegacyFactoryAddresses,
 		)
 		if err != nil {
 			return nil, err

pkg/settlement/swap/chequebook/cashout_test.go

@@ -256,7 +256,7 @@ func TestCashoutStatusReverted(t *testing.T) {
 		),
 		transactionmock.New(
 			transactionmock.WithABISend(&chequebookABI, txHash, chequebookAddress, big.NewInt(0), "cashChequeBeneficiary", recipientAddress, cheque.CumulativePayout, cheque.Signature),
-			transactionmock.WithABICall(&chequebookABI, onChainPaidOut.FillBytes(make([]byte, 32)), "paidOut", beneficiary),
+			transactionmock.WithABICall(&chequebookABI, chequebookAddress, onChainPaidOut.FillBytes(make([]byte, 32)), "paidOut", beneficiary),
 		),
 		chequestoremock.NewChequeStore(
 			chequestoremock.WithLastChequeFunc(func(c common.Address) (*chequebook.SignedCheque, error) {