Skip to content

Fix: Use gas limit estimate by default #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renatomaia merged 7 commits into from
Jul 10, 2026
Merged

Fix: Use gas limit estimate by default #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24e44f2
fix(cli): show error cause on failed transaction
renatomaia Jun 28, 2026
5de0ee5
fix(cli): use estimated gas limit by default
renatomaia Jun 28, 2026
6571b8b
fix(ethclient): use the proper 'context.Context' on chain trasactions
renatomaia Jul 2, 2026
8402563
fix(test): add missing 'context.Context' argument to mocked function
renatomaia Jul 7, 2026
d1fe2d0
fix(test): setup a context on mocks of the claimer service
renatomaia Jul 7, 2026
a43b6d6
feat(claimer): impose timeout in 'context.Context' used for claim tra…
renatomaia Jul 7, 2026
7d231d0
feat(prt): impose timeout in 'context.Context' used for Dave consensu…
renatomaia Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cmd/cartesi-rollups-cli/root/deploy/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/util"
"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/internal/model"
"github.com/cartesi/rollups-node/internal/repository/factory"
"github.com/cartesi/rollups-node/pkg/contracts/iapplicationfactory"
Expand Down Expand Up @@ -146,7 +145,7 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
chainId, err := client.ChainID(ctx)
cobra.CheckErr(err)

txOpts, err := auth.GetTransactOpts(ctx, chainId)
txOpts, err := cli.GetTransactOpts(ctx, chainId)
cobra.CheckErr(err)

// pre deployment checks
Expand Down Expand Up @@ -238,7 +237,7 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
if verboseParam || !asJSONParam {
fmt.Fprint(os.Stderr, "deploying...")
}
_, result, err := deployment.Deploy(ctx, client, txOpts)
_, result, err := deployment.Deploy(ctx, client, ethutil.NewStaticTransactOptsFactory(txOpts))
// The revert surface spans the variant's factory plus the constructors it
// invokes; selectors are content-matched, so passing every factory ABI is
// harmless and covers all three deployment variants.
Expand Down
3 changes: 1 addition & 2 deletions cmd/cartesi-rollups-cli/root/deploy/authority.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/pkg/contracts/iauthorityfactory"
"github.com/cartesi/rollups-node/pkg/ethutil"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
Expand Down Expand Up @@ -73,7 +72,7 @@ func runDeployAuthority(cmd *cobra.Command, args []string) {
chainId, err := client.ChainID(ctx)
cobra.CheckErr(err)

txOpts, err := auth.GetTransactOpts(ctx, chainId)
txOpts, err := cli.GetTransactOpts(ctx, chainId)
cobra.CheckErr(err)

deployment, err := buildAuthorityDeployment(cmd, txOpts)
Expand Down
3 changes: 1 addition & 2 deletions cmd/cartesi-rollups-cli/root/deploy/quorum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/pkg/contracts/iquorumfactory"
"github.com/cartesi/rollups-node/pkg/ethutil"
"github.com/ethereum/go-ethereum/common"
Expand Down Expand Up @@ -73,7 +72,7 @@ func runDeployQuorum(cmd *cobra.Command, args []string) {
chainID, err := client.ChainID(ctx)
cobra.CheckErr(err)

txOpts, err := auth.GetTransactOpts(ctx, chainID)
txOpts, err := cli.GetTransactOpts(ctx, chainID)
cobra.CheckErr(err)

deployment, err := buildQuorumDeployment(cmd)
Expand Down
7 changes: 3 additions & 4 deletions cmd/cartesi-rollups-cli/root/deposit/deposit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/util"
"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/pkg/contracts/iapplication"
"github.com/cartesi/rollups-node/pkg/contracts/ierc20errors"
"github.com/cartesi/rollups-node/pkg/contracts/ierc20metadata"
Expand Down Expand Up @@ -114,7 +113,7 @@ func runERC20(cmd *cobra.Command, args []string) {
cobra.CheckErr(err)
chainID, err := client.ChainID(ctx)
cobra.CheckErr(err)
txOpts, err := auth.GetTransactOpts(ctx, chainID)
txOpts, err := cli.GetTransactOpts(ctx, chainID)
cobra.CheckErr(err)

if !skipConfirmation {
Expand All @@ -138,7 +137,7 @@ func runERC20(cmd *cobra.Command, args []string) {
if approveParam {
token, err := ierc20metadata.NewIERC20Metadata(tokenAddr, client)
cobra.CheckErr(err)
approveOpts, err := auth.GetTransactOpts(ctx, chainID)
approveOpts, err := cli.GetTransactOpts(ctx, chainID)
cobra.CheckErr(err)
tx, err := token.Approve(approveOpts, portalAddr, amount)
cobra.CheckErr(cli.DecorateRevert(err,
Expand All @@ -154,7 +153,7 @@ func runERC20(cmd *cobra.Command, args []string) {

portal, err := ierc20portal.NewIERC20Portal(portalAddr, client)
cobra.CheckErr(err)
depositOpts, err := auth.GetTransactOpts(ctx, chainID)
depositOpts, err := cli.GetTransactOpts(ctx, chainID)
cobra.CheckErr(err)
tx, err := portal.DepositERC20Tokens(depositOpts, tokenAddr, appAddr, amount, execData)
// The revert can come from three layers: the portal itself
Expand Down
5 changes: 2 additions & 3 deletions cmd/cartesi-rollups-cli/root/execute/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/internal/repository/factory"
"github.com/cartesi/rollups-node/pkg/contracts/iapplication"
"github.com/cartesi/rollups-node/pkg/ethutil"
Expand Down Expand Up @@ -99,7 +98,7 @@ func run(cmd *cobra.Command, args []string) {
chainId, err := client.ChainID(ctx)
cobra.CheckErr(err)

txOpts, err := auth.GetTransactOpts(ctx, chainId)
txOpts, err := cli.GetTransactOpts(ctx, chainId)
cobra.CheckErr(err)

if !skipConfirmation {
Expand All @@ -117,7 +116,7 @@ func run(cmd *cobra.Command, args []string) {
txHash, err := ethutil.ExecuteOutput(
ctx,
client,
txOpts,
ethutil.NewStaticTransactOptsFactory(txOpts),
app.IApplicationAddress,
outputIndex,
output.RawData,
Expand Down
3 changes: 1 addition & 2 deletions cmd/cartesi-rollups-cli/root/foreclose/foreclose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/util"
"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/pkg/contracts/iapplication"
)

Expand Down Expand Up @@ -90,7 +89,7 @@ func run(cmd *cobra.Command, args []string) {
chainId, err := client.ChainID(ctx)
cobra.CheckErr(err)

txOpts, err := auth.GetTransactOpts(ctx, chainId)
txOpts, err := cli.GetTransactOpts(ctx, chainId)
cobra.CheckErr(err)

appContract, err := iapplication.NewIApplication(appAddr, client)
Expand Down
3 changes: 1 addition & 2 deletions cmd/cartesi-rollups-cli/root/provedriveroot/provedriveroot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/util"
"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/pkg/contracts/iapplication"
)

Expand Down Expand Up @@ -102,7 +101,7 @@ func run(cmd *cobra.Command, args []string) {

chainID, err := client.ChainID(ctx)
cobra.CheckErr(err)
txOpts, err := auth.GetTransactOpts(ctx, chainID)
txOpts, err := cli.GetTransactOpts(ctx, chainID)
cobra.CheckErr(err)

appContract, err := iapplication.NewIApplication(appAddr, client)
Expand Down
7 changes: 7 additions & 0 deletions cmd/cartesi-rollups-cli/root/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var (
verbose bool
databaseConnection string
blockchainEndpoint string
gasLimit uint64
inputBoxAddress string
)

Expand All @@ -56,6 +57,12 @@ func init() {
cobra.CheckErr(viper.BindPFlag(config.BLOCKCHAIN_HTTP_ENDPOINT, Cmd.PersistentFlags().Lookup("blockchain-http-endpoint")))
cobra.CheckErr(Cmd.PersistentFlags().MarkHidden("blockchain-http-endpoint"))

// Blockchain gas limit
Cmd.PersistentFlags().Uint64Var(&gasLimit, "gas-limit", 0,
"Blockchain gas limit")
cobra.CheckErr(viper.BindPFlag(config.BLOCKCHAIN_GAS_LIMIT, Cmd.PersistentFlags().Lookup("gas-limit")))
cobra.CheckErr(Cmd.PersistentFlags().MarkHidden("gas-limit"))

// Input box address flag
Cmd.PersistentFlags().StringVar(&inputBoxAddress, "inputbox", "",
"Input Box contract address")
Expand Down
9 changes: 5 additions & 4 deletions cmd/cartesi-rollups-cli/root/send/send.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/internal/repository/factory"
"github.com/cartesi/rollups-node/pkg/contracts/iapplication"
"github.com/cartesi/rollups-node/pkg/contracts/iinputbox"
Expand Down Expand Up @@ -143,9 +142,11 @@ func run(cmd *cobra.Command, args []string) {
chainId, err := client.ChainID(ctx)
cobra.CheckErr(err)

txOpts, err := auth.GetTransactOpts(ctx, chainId)
txOpts, err := cli.GetTransactOpts(ctx, chainId)
cobra.CheckErr(err)

txOptsFactory := ethutil.NewStaticTransactOptsFactory(txOpts)

// Ask for confirmation unless --yes flag is set
if !skipConfirmation {
fmt.Printf("Preparing to send input to application %v (%v) with account %v\n",
Expand All @@ -159,7 +160,7 @@ func run(cmd *cobra.Command, args []string) {
}

if asyncMode {
txHash, err := ethutil.AddInputAsync(ctx, client, txOpts, iboxAddr, app.IApplicationAddress, payload)
txHash, err := ethutil.AddInputAsync(ctx, client, txOptsFactory, iboxAddr, app.IApplicationAddress, payload)
cobra.CheckErr(cli.DecorateRevert(err, iinputbox.IInputBoxMetaData, iapplication.IApplicationMetaData))
if asJSONParam {
result := cli.SendResult{
Expand All @@ -175,7 +176,7 @@ func run(cmd *cobra.Command, args []string) {
return
}

inputIndex, blockNumber, txHash, err := ethutil.AddInput(ctx, client, txOpts, iboxAddr, app.IApplicationAddress, payload)
inputIndex, blockNumber, txHash, err := ethutil.AddInput(ctx, client, txOptsFactory, iboxAddr, app.IApplicationAddress, payload)
cobra.CheckErr(cli.DecorateRevert(err, iinputbox.IInputBoxMetaData, iapplication.IApplicationMetaData))

if asJSONParam {
Expand Down
3 changes: 1 addition & 2 deletions cmd/cartesi-rollups-cli/root/withdraw/withdraw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/util"
"github.com/cartesi/rollups-node/internal/cli"
"github.com/cartesi/rollups-node/internal/config"
"github.com/cartesi/rollups-node/internal/config/auth"
"github.com/cartesi/rollups-node/pkg/contracts/iapplication"
"github.com/cartesi/rollups-node/pkg/ethutil"
)
Expand Down Expand Up @@ -109,7 +108,7 @@ func run(cmd *cobra.Command, args []string) {

chainID, err := client.ChainID(ctx)
cobra.CheckErr(err)
txOpts, err := auth.GetTransactOpts(ctx, chainID)
txOpts, err := cli.GetTransactOpts(ctx, chainID)
cobra.CheckErr(err)

appContract, err := iapplication.NewIApplication(appAddr, client)
Expand Down
4 changes: 3 additions & 1 deletion internal/claimer/accept.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,9 @@ func (s *Service) broadcastAcceptClaimOrReconcileRevert(
return claimRetryLater(err)
}

txHash, err := s.blockchain.acceptClaimOnBlockchain(app, currEpoch)
txCtx, cancel := context.WithTimeout(s.Context, s.submissionTimeout)
defer cancel()
txHash, err := s.blockchain.acceptClaimOnBlockchain(txCtx, app, currEpoch)
if err != nil {
outcome, stateErr := s.handleAcceptClaimRevert(err, app, currEpoch)
switch outcome {
Expand Down
Loading