chore: remove deprecated swap-endpoint and swap-deployment-gas-price (#5048)

Author: gacevicljubisa

cmd/bee/cmd/cmd.go

@@ -49,13 +49,11 @@ const (
 	optionNamePaymentEarly                 = "payment-early-percent"
 	optionNameResolverEndpoints            = "resolver-options"
 	optionNameBootnodeMode                 = "bootnode-mode"
-	optionNameSwapEndpoint                 = "swap-endpoint" // deprecated: use rpc endpoint instead
 	optionNameBlockchainRpcEndpoint        = "blockchain-rpc-endpoint"
 	optionNameSwapFactoryAddress           = "swap-factory-address"
 	optionNameSwapInitialDeposit           = "swap-initial-deposit"
 	optionNameSwapEnable                   = "swap-enable"
 	optionNameChequebookEnable             = "chequebook-enable"
-	optionNameSwapDeploymentGasPrice       = "swap-deployment-gas-price"
 	optionNameFullNode                     = "full-node"
 	optionNamePostageContractAddress       = "postage-stamp-address"
 	optionNamePostageContractStartBlock    = "postage-stamp-start-block"
@@ -261,7 +259,6 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().Int64(optionNamePaymentEarly, 50, "percentage below the peers payment threshold when we initiate settlement")
 	cmd.Flags().StringSlice(optionNameResolverEndpoints, []string{}, "ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url")
 	cmd.Flags().Bool(optionNameBootnodeMode, false, "cause the node to always accept incoming connections")
-	cmd.Flags().String(optionNameSwapEndpoint, "", "swap blockchain endpoint") // deprecated: use rpc endpoint instead
 	cmd.Flags().String(optionNameBlockchainRpcEndpoint, "", "rpc blockchain endpoint")
 	cmd.Flags().String(optionNameSwapFactoryAddress, "", "swap factory addresses")
 	cmd.Flags().String(optionNameSwapInitialDeposit, "0", "initial deposit if deploying a new chequebook")
@@ -274,7 +271,6 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNameRedistributionAddress, "", "redistribution contract address")
 	cmd.Flags().String(optionNameStakingAddress, "", "staking contract address")
 	cmd.Flags().Uint64(optionNameBlockTime, 5, "chain block time")
-	cmd.Flags().String(optionNameSwapDeploymentGasPrice, "", "gas price in wei to use for deployment and funding")
 	cmd.Flags().Duration(optionWarmUpTime, time.Minute*5, "time to warmup the node before some major protocols can be kicked off")
 	cmd.Flags().Bool(optionNameMainNet, true, "triggers connect to main net bootnodes.")
 	cmd.Flags().Bool(optionNameRetrievalCaching, true, "enable forwarded content caching")

cmd/bee/cmd/deploy.go

@@ -34,12 +34,7 @@ func (c *command) initDeployCmd() error {
 			dataDir := c.config.GetString(optionNameDataDir)
 			factoryAddress := c.config.GetString(optionNameSwapFactoryAddress)
 			swapInitialDeposit := c.config.GetString(optionNameSwapInitialDeposit)
-			swapEndpoint := c.config.GetString(optionNameSwapEndpoint)
 			blockchainRpcEndpoint := c.config.GetString(optionNameBlockchainRpcEndpoint)
-			deployGasPrice := c.config.GetString(optionNameSwapDeploymentGasPrice)
-			if swapEndpoint != "" {
-				blockchainRpcEndpoint = swapEndpoint
-			}
 			stateStore, _, err := node.InitStateStore(logger, dataDir, 1000)
 			if err != nil {
 				return err
@@ -94,7 +89,6 @@ func (c *command) initDeployCmd() error {
 				transactionService,
 				chequebookFactory,
 				swapInitialDeposit,
-				deployGasPrice,
 				erc20Service,
 			)
 			if err != nil {

cmd/bee/cmd/start.go

@@ -273,12 +273,6 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 		return nil, errors.New("static nodes can only be configured on bootnodes")
 	}
 
-	swapEndpoint := c.config.GetString(optionNameSwapEndpoint)
-	blockchainRpcEndpoint := c.config.GetString(optionNameBlockchainRpcEndpoint)
-	if swapEndpoint != "" {
-		blockchainRpcEndpoint = swapEndpoint
-	}
-
 	var neighborhoodSuggester string
 	if networkID == chaincfg.Mainnet.NetworkID {
 		neighborhoodSuggester = c.config.GetString(optionNameNeighborhoodSuggester)
@@ -307,7 +301,7 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 		PaymentEarly:                  c.config.GetInt64(optionNamePaymentEarly),
 		ResolverConnectionCfgs:        resolverCfgs,
 		BootnodeMode:                  bootNode,
-		BlockchainRpcEndpoint:         blockchainRpcEndpoint,
+		BlockchainRpcEndpoint:         c.config.GetString(optionNameBlockchainRpcEndpoint),
 		SwapFactoryAddress:            c.config.GetString(optionNameSwapFactoryAddress),
 		SwapInitialDeposit:            c.config.GetString(optionNameSwapInitialDeposit),
 		SwapEnable:                    c.config.GetBool(optionNameSwapEnable),
@@ -319,7 +313,6 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 		RedistributionContractAddress: c.config.GetString(optionNameRedistributionAddress),
 		StakingContractAddress:        c.config.GetString(optionNameStakingAddress),
 		BlockTime:                     networkConfig.blockTime,
-		DeployGasPrice:                c.config.GetString(optionNameSwapDeploymentGasPrice),
 		WarmupTime:                    c.config.GetDuration(optionWarmUpTime),
 		ChainID:                       networkConfig.chainID,
 		RetrievalCaching:              c.config.GetBool(optionNameRetrievalCaching),

packaging/bee.yaml

@@ -86,12 +86,8 @@ password-file: "/var/lib/bee/password"
 # static-nodes: []
 ## enable storage incentives feature
 # storage-incentives-enable: true
-## gas price in wei to use for deployment and funding
-# swap-deployment-gas-price: ""
 ## enable swap
 # swap-enable: false
-## swap blockchain endpoint
-# swap-endpoint: ""
 ## swap factory addresses
 # swap-factory-address: ""
 ## initial deposit if deploying a new chequebook

packaging/homebrew-amd64/bee.yaml

@@ -86,12 +86,8 @@ password-file: "/usr/local/var/lib/swarm-bee/password"
 # static-nodes: []
 ## enable storage incentives feature
 # storage-incentives-enable: true
-## gas price in wei to use for deployment and funding
-# swap-deployment-gas-price: ""
 ## enable swap
 # swap-enable: false
-## swap blockchain endpoint
-# swap-endpoint: ""
 ## swap factory addresses
 # swap-factory-address: ""
 ## initial deposit if deploying a new chequebook

packaging/homebrew-arm64/bee.yaml

@@ -86,12 +86,8 @@ password-file: "/opt/homebrew/var/lib/swarm-bee/password"
 # static-nodes: []
 ## enable storage incentives feature
 # storage-incentives-enable: true
-## gas price in wei to use for deployment and funding
-# swap-deployment-gas-price: ""
 ## enable swap
 # swap-enable: false
-## swap blockchain endpoint
-# swap-endpoint: ""
 ## swap factory addresses
 # swap-factory-address: ""
 ## initial deposit if deploying a new chequebook

packaging/scoop/bee.yaml

@@ -86,12 +86,8 @@ password-file: "./password"
 # static-nodes: []
 ## enable storage incentives feature
 # storage-incentives-enable: true
-## gas price in wei to use for deployment and funding
-# swap-deployment-gas-price: ""
 ## enable swap
 # swap-enable: false
-## swap blockchain endpoint
-# swap-endpoint: ""
 ## swap factory addresses
 # swap-factory-address: ""
 ## initial deposit if deploying a new chequebook

pkg/node/chain.go

@@ -23,7 +23,6 @@ import (
 	"github.com/ethersphere/bee/v2/pkg/log"
 	"github.com/ethersphere/bee/v2/pkg/p2p/libp2p"
 	"github.com/ethersphere/bee/v2/pkg/postage/postagecontract"
-	"github.com/ethersphere/bee/v2/pkg/sctx"
 	"github.com/ethersphere/bee/v2/pkg/settlement"
 	"github.com/ethersphere/bee/v2/pkg/settlement/swap"
 	"github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook"
@@ -69,7 +68,7 @@ func InitChain(
 		var versionString string
 		err = rpcClient.CallContext(ctx, &versionString, "web3_clientVersion")
 		if err != nil {
-			logger.Info("could not connect to backend; in a swap-enabled network a working blockchain node (for xdai network in production, sepolia in testnet) is required; check your node or specify another node using --swap-endpoint.", "backend_endpoint", endpoint)
+			logger.Info("could not connect to backend; in a swap-enabled network a working blockchain node (for xdai network in production, sepolia in testnet) is required; check your node or specify another node using --blockchain-rpc-endpoint.", "backend_endpoint", endpoint)
 			return nil, common.Address{}, 0, nil, nil, fmt.Errorf("blockchain client get version: %w", err)
 		}
 
@@ -134,7 +133,6 @@ func InitChequebookService(
 	transactionService transaction.Service,
 	chequebookFactory chequebook.Factory,
 	initialDeposit string,
-	deployGasPrice string,
 	erc20Service erc20.Service,
 ) (chequebook.Service, error) {
 	chequeSigner := chequebook.NewChequeSigner(signer, chainID)
@@ -144,14 +142,6 @@ func InitChequebookService(
 		return nil, fmt.Errorf("initial swap deposit \"%s\" cannot be parsed", initialDeposit)
 	}
 
-	if deployGasPrice != "" {
-		gasPrice, ok := new(big.Int).SetString(deployGasPrice, 10)
-		if !ok {
-			return nil, fmt.Errorf("deploy gas price \"%s\" cannot be parsed", deployGasPrice)
-		}
-		ctx = sctx.SetGasPrice(ctx, gasPrice)
-	}
-
 	chequebookService, err := chequebook.Init(
 		ctx,
 		chequebookFactory,
@@ -214,7 +204,6 @@ func InitSwap(
 	chainID int64,
 	transactionService transaction.Service,
 ) (*swap.Service, priceoracle.Service, error) {
-
 	var currentPriceOracleAddress common.Address
 	if priceOracleAddress == "" {
 		chainCfg, found := config.GetByChainID(chainID)
@@ -260,7 +249,6 @@ func InitSwap(
 }
 
 func GetTxHash(stateStore storage.StateStorer, logger log.Logger, trxString string) ([]byte, error) {
-
 	if trxString != "" {
 		txHashTrimmed := strings.TrimPrefix(trxString, "0x")
 		if len(txHashTrimmed) != 64 {
@@ -288,7 +276,6 @@ func GetTxHash(stateStore storage.StateStorer, logger log.Logger, trxString stri
 }
 
 func GetTxNextBlock(ctx context.Context, logger log.Logger, backend transaction.Backend, monitor transaction.Monitor, duration time.Duration, trx []byte, blockHash string) ([]byte, error) {
-
 	if blockHash != "" {
 		blockHashTrimmed := strings.TrimPrefix(blockHash, "0x")
 		if len(blockHashTrimmed) != 64 {
@@ -321,27 +308,35 @@ type noOpChequebookService struct{}
 func (m *noOpChequebookService) Deposit(context.Context, *big.Int) (hash common.Hash, err error) {
 	return hash, postagecontract.ErrChainDisabled
 }
+
 func (m *noOpChequebookService) Withdraw(context.Context, *big.Int) (hash common.Hash, err error) {
 	return hash, postagecontract.ErrChainDisabled
 }
+
 func (m *noOpChequebookService) WaitForDeposit(context.Context, common.Hash) error {
 	return postagecontract.ErrChainDisabled
 }
+
 func (m *noOpChequebookService) Balance(context.Context) (*big.Int, error) {
 	return nil, postagecontract.ErrChainDisabled
 }
+
 func (m *noOpChequebookService) AvailableBalance(context.Context) (*big.Int, error) {
 	return nil, postagecontract.ErrChainDisabled
 }
+
 func (m *noOpChequebookService) Address() common.Address {
 	return common.Address{}
 }
+
 func (m *noOpChequebookService) Issue(context.Context, common.Address, *big.Int, chequebook.SendChequeFunc) (*big.Int, error) {
 	return nil, postagecontract.ErrChainDisabled
 }
+
 func (m *noOpChequebookService) LastCheque(common.Address) (*chequebook.SignedCheque, error) {
 	return nil, postagecontract.ErrChainDisabled
 }
+
 func (m *noOpChequebookService) LastCheques() (map[common.Address]*chequebook.SignedCheque, error) {
 	return nil, postagecontract.ErrChainDisabled
 }
@@ -358,49 +353,63 @@ func (m noOpChainBackend) Metrics() []prometheus.Collector {
 func (m noOpChainBackend) CodeAt(context.Context, common.Address, *big.Int) ([]byte, error) {
 	return common.FromHex(sw3abi.SimpleSwapFactoryDeployedBinv0_6_5), nil
 }
+
 func (m noOpChainBackend) CallContract(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error) {
 	return nil, errors.New("disabled chain backend")
 }
+
 func (m noOpChainBackend) HeaderByNumber(context.Context, *big.Int) (*types.Header, error) {
 	h := new(types.Header)
 	h.Time = uint64(time.Now().Unix())
 	return h, nil
 }
+
 func (m noOpChainBackend) PendingNonceAt(context.Context, common.Address) (uint64, error) {
 	panic("chain no op: PendingNonceAt")
 }
+
 func (m noOpChainBackend) SuggestGasPrice(context.Context) (*big.Int, error) {
 	panic("chain no op: SuggestGasPrice")
 }
+
 func (m noOpChainBackend) SuggestGasTipCap(context.Context) (*big.Int, error) {
 	panic("chain no op: SuggestGasPrice")
 }
+
 func (m noOpChainBackend) EstimateGas(context.Context, ethereum.CallMsg) (uint64, error) {
 	panic("chain no op: EstimateGas")
 }
+
 func (m noOpChainBackend) SendTransaction(context.Context, *types.Transaction) error {
 	panic("chain no op: SendTransaction")
 }
+
 func (m noOpChainBackend) TransactionReceipt(context.Context, common.Hash) (*types.Receipt, error) {
 	r := new(types.Receipt)
 	r.BlockNumber = big.NewInt(1)
 	return r, nil
 }
+
 func (m noOpChainBackend) TransactionByHash(context.Context, common.Hash) (tx *types.Transaction, isPending bool, err error) {
 	panic("chain no op: TransactionByHash")
 }
+
 func (m noOpChainBackend) BlockNumber(context.Context) (uint64, error) {
 	return 4, nil
 }
+
 func (m noOpChainBackend) BalanceAt(context.Context, common.Address, *big.Int) (*big.Int, error) {
 	return nil, postagecontract.ErrChainDisabled
 }
+
 func (m noOpChainBackend) NonceAt(context.Context, common.Address, *big.Int) (uint64, error) {
 	panic("chain no op: NonceAt")
 }
+
 func (m noOpChainBackend) FilterLogs(context.Context, ethereum.FilterQuery) ([]types.Log, error) {
 	panic("chain no op: FilterLogs")
 }
+
 func (m noOpChainBackend) ChainID(context.Context) (*big.Int, error) {
 	return big.NewInt(m.chainID), nil
 }

pkg/node/node.go

@@ -158,7 +158,6 @@ type Options struct {
 	PriceOracleAddress            string
 	RedistributionContractAddress string
 	BlockTime                     time.Duration
-	DeployGasPrice                string
 	WarmupTime                    time.Duration
 	ChainID                       int64
 	Resync                        bool
@@ -258,7 +257,7 @@ func NewBee(
 	if o.ReserveCapacityDoubling < 0 || o.ReserveCapacityDoubling > maxAllowedDoubling {
 		return nil, fmt.Errorf("config reserve capacity doubling has to be between default: 0 and maximum: %d", maxAllowedDoubling)
 	}
-	var shallowReceiptTolerance = maxAllowedDoubling - o.ReserveCapacityDoubling
+	shallowReceiptTolerance := maxAllowedDoubling - o.ReserveCapacityDoubling
 
 	reserveCapacity := (1 << o.ReserveCapacityDoubling) * storer.DefaultReserveCapacity
 
@@ -523,7 +522,6 @@ func NewBee(
 				transactionService,
 				chequebookFactory,
 				o.SwapInitialDeposit,
-				o.DeployGasPrice,
 				erc20Service,
 			)
 			if err != nil {