fix(transaction): improve gas estimation reliability and error handling

cmd/bee/cmd/cmd.go

@@ -83,6 +83,7 @@ const (
 	optionReserveCapacityDoubling          = "reserve-capacity-doubling"
 	optionSkipPostageSnapshot              = "skip-postage-snapshot"
 	optionNameMinimumGasTipCap             = "minimum-gas-tip-cap"
+	optionNameGasLimitFallback             = "gas-limit-fallback"
 	optionNameP2PWSSEnable                 = "p2p-wss-enable"
 	optionP2PWSSAddr                       = "p2p-wss-addr"
 	optionNATWSSAddr                       = "nat-wss-addr"
@@ -299,6 +300,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().Int(optionReserveCapacityDoubling, 0, "reserve capacity doubling")
 	cmd.Flags().Bool(optionSkipPostageSnapshot, false, "skip postage snapshot")
 	cmd.Flags().Uint64(optionNameMinimumGasTipCap, 0, "minimum gas tip cap in wei for transactions, 0 means use suggested gas tip cap")
+	cmd.Flags().Uint64(optionNameGasLimitFallback, 500_000, "gas limit fallback when estimation fails for contract transactions")
 	cmd.Flags().Bool(optionNameP2PWSSEnable, false, "Enable Secure WebSocket P2P connections")
 	cmd.Flags().String(optionP2PWSSAddr, ":1635", "p2p wss address")
 	cmd.Flags().String(optionNATWSSAddr, "", "WSS NAT exposed address")

cmd/bee/cmd/deploy.go

@@ -60,6 +60,7 @@ func (c *command) initDeployCmd() error {
 				blocktime,
 				true,
 				c.config.GetUint64(optionNameMinimumGasTipCap),
+				c.config.GetUint64(optionNameGasLimitFallback),
 			)
 			if err != nil {
 				return err

cmd/bee/cmd/start.go

@@ -306,6 +306,7 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 		FullNodeMode:                  fullNode,
 		Logger:                        logger,
 		MinimumGasTipCap:              c.config.GetUint64(optionNameMinimumGasTipCap),
+		GasLimitFallback:              c.config.GetUint64(optionNameGasLimitFallback),
 		MinimumStorageRadius:          c.config.GetUint(optionMinimumStorageRadius),
 		MutexProfile:                  c.config.GetBool(optionNamePProfMutex),
 		NATAddr:                       c.config.GetString(optionNameNATAddr),

pkg/node/chain.go

@@ -51,6 +51,7 @@ func InitChain(
 	pollingInterval time.Duration,
 	chainEnabled bool,
 	minimumGasTipCap uint64,
+	fallbackGasLimit uint64,
 ) (transaction.Backend, common.Address, int64, transaction.Monitor, transaction.Service, error) {
 	backend := backendnoop.New(chainID)
 
@@ -91,7 +92,7 @@ func InitChain(
 
 	transactionMonitor := transaction.NewMonitor(logger, backend, overlayEthAddress, pollingInterval, cancellationDepth)
 
-	transactionService, err := transaction.NewService(logger, overlayEthAddress, backend, signer, stateStore, backendChainID, transactionMonitor)
+	transactionService, err := transaction.NewService(logger, overlayEthAddress, backend, signer, stateStore, backendChainID, transactionMonitor, fallbackGasLimit)
 	if err != nil {
 		return nil, common.Address{}, 0, nil, nil, fmt.Errorf("transaction service: %w", err)
 	}

pkg/node/node.go

@@ -152,6 +152,7 @@ type Options struct {
 	AutoTLSDomain                 string
 	AutoTLSRegistrationEndpoint   string
 	FullNodeMode                  bool
+	GasLimitFallback              uint64
 	Logger                        log.Logger
 	MinimumGasTipCap              uint64
 	MinimumStorageRadius          uint
@@ -410,6 +411,7 @@ func NewBee(
 		o.BlockTime,
 		chainEnabled,
 		o.MinimumGasTipCap,
+		o.GasLimitFallback,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("init chain: %w", err)
@@ -724,6 +726,13 @@ func NewBee(
 		return nil, fmt.Errorf("lookup erc20 postage address: %w", err)
 	}
 
+	// Compute gas limit for contract transactions: when TrxDebugMode is enabled,
+	// gas estimation is skipped and DefaultGasLimit is used for all contract calls.
+	var contractGasLimit uint64
+	if o.TrxDebugMode {
+		contractGasLimit = transaction.DefaultGasLimit
+	}
+
 	postageStampContractService = postagecontract.New(
 		overlayEthAddress,
 		postageStampContractAddress,
@@ -733,7 +742,7 @@ func NewBee(
 		post,
 		batchStore,
 		chainEnabled,
-		o.TrxDebugMode,
+		contractGasLimit,
 	)
 
 	eventListener = listener.New(b.syncingStopped, logger, chainBackend, postageStampContractAddress, postageStampContractABI, o.BlockTime, postageSyncingStallingTimeout, postageSyncingBackoffTimeout)
@@ -1114,7 +1123,7 @@ func NewBee(
 		stakingContractAddress = common.HexToAddress(o.StakingContractAddress)
 	}
 
-	stakingContract := staking.New(overlayEthAddress, stakingContractAddress, abiutil.MustParseABI(chainCfg.StakingABI), bzzTokenAddress, transactionService, common.BytesToHash(nonce), o.TrxDebugMode, uint8(o.ReserveCapacityDoubling))
+	stakingContract := staking.New(overlayEthAddress, stakingContractAddress, abiutil.MustParseABI(chainCfg.StakingABI), bzzTokenAddress, transactionService, common.BytesToHash(nonce), contractGasLimit, uint8(o.ReserveCapacityDoubling))
 
 	if chainEnabled {
 
@@ -1204,7 +1213,7 @@ func NewBee(
 				redistributionContractAddress = common.HexToAddress(o.RedistributionContractAddress)
 			}
 
-			redistributionContract := redistribution.New(swarmAddress, overlayEthAddress, logger, transactionService, redistributionContractAddress, abiutil.MustParseABI(chainCfg.RedistributionABI), o.TrxDebugMode)
+			redistributionContract := redistribution.New(swarmAddress, overlayEthAddress, logger, transactionService, redistributionContractAddress, abiutil.MustParseABI(chainCfg.RedistributionABI), contractGasLimit)
 
 			isFullySynced := func() bool {
 				reserveThreshold := reserveCapacity * 5 / 10

pkg/postage/postagecontract/contract.go

@@ -79,17 +79,12 @@ func New(
 	postageService postage.Service,
 	postageStorer postage.Storer,
 	chainEnabled bool,
-	setGasLimit bool,
+	gasLimit uint64,
 ) Interface {
 	if !chainEnabled {
 		return new(noOpPostageContract)
 	}
 
-	var gasLimit uint64
-	if setGasLimit {
-		gasLimit = transaction.DefaultGasLimit
-	}
-
 	return &postageContract{
 		owner:                       owner,
 		postageStampContractAddress: postageStampContractAddress,

pkg/postage/postagecontract/contract_test.go

@@ -141,7 +141,7 @@ func TestCreateBatch(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		_, returnedID, err := contract.CreateBatch(ctx, initialBalance, depth, false, label)
@@ -175,7 +175,7 @@ func TestCreateBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		_, _, err := contract.CreateBatch(ctx, initialBalance, depth, false, label)
@@ -204,7 +204,7 @@ func TestCreateBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		_, _, err := contract.CreateBatch(ctx, initialBalance, depth, false, label)
@@ -249,7 +249,7 @@ func TestCreateBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		_, _, err = contract.CreateBatch(ctx, initialBalance, depth, false, label)
@@ -360,7 +360,7 @@ func TestTopUpBatch(t *testing.T) {
 			postageMock,
 			batchStoreMock,
 			true,
-			false,
+			0,
 		)
 
 		_, err = contract.TopUpBatch(ctx, batch.ID, topupBalance)
@@ -389,7 +389,7 @@ func TestTopUpBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(postagestoreMock.WithGetErr(errNotFound, 0)),
 			true,
-			false,
+			0,
 		)
 
 		_, err := contract.TopUpBatch(ctx, postagetesting.MustNewID(), topupBalance)
@@ -419,7 +419,7 @@ func TestTopUpBatch(t *testing.T) {
 			postageMock.New(),
 			batchStoreMock,
 			true,
-			false,
+			0,
 		)
 
 		_, err := contract.TopUpBatch(ctx, batch.ID, topupBalance)
@@ -549,7 +549,7 @@ func TestDiluteBatch(t *testing.T) {
 			postageMock,
 			batchStoreMock,
 			true,
-			false,
+			0,
 		)
 
 		_, err = contract.DiluteBatch(ctx, batch.ID, newDepth)
@@ -578,7 +578,7 @@ func TestDiluteBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(postagestoreMock.WithGetErr(errNotFound, 0)),
 			true,
-			false,
+			0,
 		)
 
 		_, err := contract.DiluteBatch(ctx, postagetesting.MustNewID(), uint8(17))
@@ -601,7 +601,7 @@ func TestDiluteBatch(t *testing.T) {
 			postageMock.New(),
 			batchStoreMock,
 			true,
-			false,
+			0,
 		)
 
 		_, err := contract.DiluteBatch(ctx, batch.ID, batch.Depth-1)
@@ -678,7 +678,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -712,7 +712,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -746,7 +746,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -823,7 +823,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -858,7 +858,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -895,7 +895,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -945,7 +945,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
-			false,
+			0,
 		)
 
 		err = contract.ExpireBatches(ctx)

pkg/storageincentives/redistribution/redistribution.go

@@ -48,13 +48,8 @@ func New(
 	txService transaction.Service,
 	incentivesContractAddress common.Address,
 	incentivesContractABI abi.ABI,
-	setGasLimit bool,
+	gasLimit uint64,
 ) Contract {
-	var gasLimit uint64
-	if setGasLimit {
-		gasLimit = transaction.DefaultGasLimit
-	}
-
 	return &contract{
 		overlay:                   overlay,
 		owner:                     owner,

pkg/storageincentives/redistribution/redistribution_test.go

@@ -88,7 +88,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		isPlaying, err := contract.IsPlaying(ctx, depth)
@@ -120,7 +120,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		isPlaying, err := contract.IsPlaying(ctx, depth)
@@ -150,7 +150,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		isWinner, err := contract.IsWinner(ctx)
@@ -177,7 +177,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		isWinner, err := contract.IsWinner(ctx)
@@ -223,7 +223,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		_, err = contract.Claim(ctx, proofs)
@@ -265,7 +265,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		_, err = contract.Claim(ctx, proofs)
@@ -308,7 +308,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		_, err = contract.Commit(ctx, testobfus, 0)
@@ -353,7 +353,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		_, err = contract.Reveal(ctx, depth, common.Hex2Bytes("hash"), common.Hex2Bytes("nonce"))
@@ -380,7 +380,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		salt, err := contract.ReserveSalt(ctx)
@@ -410,7 +410,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		_, err := contract.IsPlaying(ctx, depth)
@@ -443,7 +443,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
-			false,
+			0,
 		)
 
 		_, err = contract.Commit(ctx, common.Hex2Bytes("hash"), 0)