feat: transaction debug mode (#4708)

cmd/bee/cmd/cmd.go

@@ -82,6 +82,7 @@ const (
 	optionNameTargetNeighborhood           = "target-neighborhood"
 	optionNameNeighborhoodSuggester        = "neighborhood-suggester"
 	optionNameWhitelistedWithdrawalAddress = "withdrawal-addresses-whitelist"
+	optionNameTransactionDebugMode         = "transaction-debug-mode"
 )
 
 // nolint:gochecknoinits
@@ -292,6 +293,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNameTargetNeighborhood, "", "neighborhood to target in binary format (ex: 111111001) for mining the initial overlay")
 	cmd.Flags().String(optionNameNeighborhoodSuggester, "https://api.swarmscan.io/v1/network/neighborhoods/suggestion", "suggester for target neighborhood")
 	cmd.Flags().StringSlice(optionNameWhitelistedWithdrawalAddress, []string{}, "withdrawal target addresses")
+	cmd.Flags().Bool(optionNameTransactionDebugMode, false, "skips the gas estimate step for contract transactions")
 }
 
 func newLogger(cmd *cobra.Command, verbosity string) (log.Logger, error) {

cmd/bee/cmd/start.go

@@ -337,6 +337,7 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 		TargetNeighborhood:            c.config.GetString(optionNameTargetNeighborhood),
 		NeighborhoodSuggester:         neighborhoodSuggester,
 		WhitelistedWithdrawalAddress:  c.config.GetStringSlice(optionNameWhitelistedWithdrawalAddress),
+		TrxDebugMode:                  c.config.GetBool(optionNameTransactionDebugMode),
 	})
 
 	return b, err

pkg/node/node.go

@@ -167,6 +167,7 @@ type Options struct {
 	TargetNeighborhood            string
 	NeighborhoodSuggester         string
 	WhitelistedWithdrawalAddress  []string
+	TrxDebugMode                  bool
 }
 
 const (
@@ -656,6 +657,7 @@ func NewBee(
 		post,
 		batchStore,
 		chainEnabled,
+		o.TrxDebugMode,
 	)
 
 	eventListener = listener.New(b.syncingStopped, logger, chainBackend, postageStampContractAddress, postageStampContractABI, o.BlockTime, postageSyncingStallingTimeout, postageSyncingBackoffTimeout)
@@ -966,7 +968,7 @@ func NewBee(
 		stakingContractAddress = common.HexToAddress(o.StakingContractAddress)
 	}
 
-	stakingContract := staking.New(overlayEthAddress, stakingContractAddress, abiutil.MustParseABI(chainCfg.StakingABI), bzzTokenAddress, transactionService, common.BytesToHash(nonce))
+	stakingContract := staking.New(overlayEthAddress, stakingContractAddress, abiutil.MustParseABI(chainCfg.StakingABI), bzzTokenAddress, transactionService, common.BytesToHash(nonce), o.TrxDebugMode)
 
 	if chainEnabled && changedOverlay {
 		stake, err := stakingContract.GetStake(ctx)
@@ -1009,7 +1011,7 @@ func NewBee(
 				return localStore.ReserveSize() >= reserveTreshold && pullerService.SyncRate() == 0
 			}
 
-			redistributionContract := redistribution.New(overlayEthAddress, logger, transactionService, redistributionContractAddress, abiutil.MustParseABI(chainCfg.RedistributionABI))
+			redistributionContract := redistribution.New(overlayEthAddress, logger, transactionService, redistributionContractAddress, abiutil.MustParseABI(chainCfg.RedistributionABI), o.TrxDebugMode)
 			agent, err = storageincentives.New(
 				swarmAddress,
 				overlayEthAddress,

pkg/postage/postagecontract/contract.go

@@ -64,6 +64,8 @@ type postageContract struct {
 	batchCreatedTopic       common.Hash
 	batchTopUpTopic         common.Hash
 	batchDepthIncreaseTopic common.Hash
+
+	gasLimit uint64
 }
 
 func New(
@@ -75,11 +77,17 @@ func New(
 	postageService postage.Service,
 	postageStorer postage.Storer,
 	chainEnabled bool,
+	setGasLimit bool,
 ) Interface {
 	if !chainEnabled {
 		return new(noOpPostageContract)
 	}
 
+	var gasLimit uint64
+	if setGasLimit {
+		gasLimit = transaction.DefaultGasLimit
+	}
+
 	return &postageContract{
 		owner:                       owner,
 		postageStampContractAddress: postageStampContractAddress,
@@ -92,6 +100,8 @@ func New(
 		batchCreatedTopic:       postageStampContractABI.Events["BatchCreated"].ID,
 		batchTopUpTopic:         postageStampContractABI.Events["BatchTopUp"].ID,
 		batchDepthIncreaseTopic: postageStampContractABI.Events["BatchDepthIncrease"].ID,
+
+		gasLimit: gasLimit,
 	}
 }
 
@@ -194,7 +204,7 @@ func (c *postageContract) sendTransaction(ctx context.Context, callData []byte,
 		To:          &c.postageStampContractAddress,
 		Data:        callData,
 		GasPrice:    sctx.GetGasPrice(ctx),
-		GasLimit:    sctx.GetGasLimit(ctx),
+		GasLimit:    max(sctx.GetGasLimit(ctx), c.gasLimit),
 		Value:       big.NewInt(0),
 		Description: desc,
 	}

pkg/postage/postagecontract/contract_test.go

@@ -122,6 +122,7 @@ func TestCreateBatch(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		_, returnedID, err := contract.CreateBatch(ctx, initialBalance, depth, false, label)
@@ -155,6 +156,7 @@ func TestCreateBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		_, _, err := contract.CreateBatch(ctx, initialBalance, depth, false, label)
@@ -183,6 +185,7 @@ func TestCreateBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		_, _, err := contract.CreateBatch(ctx, initialBalance, depth, false, label)
@@ -290,6 +293,7 @@ func TestTopUpBatch(t *testing.T) {
 			postageMock,
 			batchStoreMock,
 			true,
+			false,
 		)
 
 		_, err = contract.TopUpBatch(ctx, batch.ID, topupBalance)
@@ -318,6 +322,7 @@ func TestTopUpBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(postagestoreMock.WithGetErr(errNotFound, 0)),
 			true,
+			false,
 		)
 
 		_, err := contract.TopUpBatch(ctx, postagetesting.MustNewID(), topupBalance)
@@ -347,6 +352,7 @@ func TestTopUpBatch(t *testing.T) {
 			postageMock.New(),
 			batchStoreMock,
 			true,
+			false,
 		)
 
 		_, err := contract.TopUpBatch(ctx, batch.ID, topupBalance)
@@ -476,6 +482,7 @@ func TestDiluteBatch(t *testing.T) {
 			postageMock,
 			batchStoreMock,
 			true,
+			false,
 		)
 
 		_, err = contract.DiluteBatch(ctx, batch.ID, newDepth)
@@ -504,6 +511,7 @@ func TestDiluteBatch(t *testing.T) {
 			postageMock.New(),
 			postagestoreMock.New(postagestoreMock.WithGetErr(errNotFound, 0)),
 			true,
+			false,
 		)
 
 		_, err := contract.DiluteBatch(ctx, postagetesting.MustNewID(), uint8(17))
@@ -526,6 +534,7 @@ func TestDiluteBatch(t *testing.T) {
 			postageMock.New(),
 			batchStoreMock,
 			true,
+			false,
 		)
 
 		_, err := contract.DiluteBatch(ctx, batch.ID, batch.Depth-1)
@@ -602,6 +611,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -635,6 +645,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -668,6 +679,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -744,6 +756,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -778,6 +791,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -814,6 +828,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		err = contract.ExpireBatches(ctx)
@@ -863,6 +878,7 @@ func TestBatchExpirer(t *testing.T) {
 			postageMock,
 			postagestoreMock.New(),
 			true,
+			false,
 		)
 
 		err = contract.ExpireBatches(ctx)

pkg/storageincentives/redistribution/redistribution.go

@@ -33,6 +33,7 @@ type contract struct {
 	txService                 transaction.Service
 	incentivesContractAddress common.Address
 	incentivesContractABI     abi.ABI
+	gasLimit                  uint64
 }
 
 func New(
@@ -41,13 +42,21 @@ func New(
 	txService transaction.Service,
 	incentivesContractAddress common.Address,
 	incentivesContractABI abi.ABI,
+	setGasLimit bool,
 ) Contract {
+
+	var gasLimit uint64
+	if setGasLimit {
+		gasLimit = transaction.DefaultGasLimit
+	}
+
 	return &contract{
 		owner:                     owner,
 		logger:                    logger.WithName(loggerName).Register(),
 		txService:                 txService,
 		incentivesContractAddress: incentivesContractAddress,
 		incentivesContractABI:     incentivesContractABI,
+		gasLimit:                  gasLimit,
 	}
 }
 
@@ -100,7 +109,7 @@ func (c *contract) Claim(ctx context.Context, proofs ChunkInclusionProofs) (comm
 		To:                   &c.incentivesContractAddress,
 		Data:                 callData,
 		GasPrice:             sctx.GetGasPrice(ctx),
-		GasLimit:             sctx.GetGasLimit(ctx),
+		GasLimit:             max(sctx.GetGasLimit(ctx), c.gasLimit),
 		MinEstimatedGasLimit: 500_000,
 		Value:                big.NewInt(0),
 		Description:          "claim win transaction",
@@ -123,7 +132,7 @@ func (c *contract) Commit(ctx context.Context, obfusHash []byte, round uint64) (
 		To:                   &c.incentivesContractAddress,
 		Data:                 callData,
 		GasPrice:             sctx.GetGasPrice(ctx),
-		GasLimit:             sctx.GetGasLimit(ctx),
+		GasLimit:             max(sctx.GetGasLimit(ctx), c.gasLimit),
 		MinEstimatedGasLimit: 500_000,
 		Value:                big.NewInt(0),
 		Description:          "commit transaction",
@@ -146,7 +155,7 @@ func (c *contract) Reveal(ctx context.Context, storageDepth uint8, reserveCommit
 		To:                   &c.incentivesContractAddress,
 		Data:                 callData,
 		GasPrice:             sctx.GetGasPrice(ctx),
-		GasLimit:             sctx.GetGasLimit(ctx),
+		GasLimit:             max(sctx.GetGasLimit(ctx), c.gasLimit),
 		MinEstimatedGasLimit: 500_000,
 		Value:                big.NewInt(0),
 		Description:          "reveal transaction",

pkg/storageincentives/redistribution/redistribution_test.go

@@ -85,6 +85,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		isPlaying, err := contract.IsPlaying(ctx, depth)
@@ -115,6 +116,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		isPlaying, err := contract.IsPlaying(ctx, depth)
@@ -143,6 +145,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		isWinner, err := contract.IsWinner(ctx)
@@ -169,6 +172,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		isWinner, err := contract.IsWinner(ctx)
@@ -213,6 +217,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		_, err = contract.Claim(ctx, proofs)
@@ -253,6 +258,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		_, err = contract.Claim(ctx, proofs)
@@ -294,6 +300,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		_, err = contract.Commit(ctx, testobfus, 0)
@@ -337,6 +344,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		_, err = contract.Reveal(ctx, depth, common.Hex2Bytes("hash"), common.Hex2Bytes("nonce"))
@@ -362,6 +370,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		salt, err := contract.ReserveSalt(ctx)
@@ -390,6 +399,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		_, err := contract.IsPlaying(ctx, depth)
@@ -421,6 +431,7 @@ func TestRedistribution(t *testing.T) {
 			),
 			redistributionContractAddress,
 			redistributionContractABI,
+			false,
 		)
 
 		_, err = contract.Commit(ctx, common.Hex2Bytes("hash"), 0)