Skip to content
This repository has been archived by the owner on May 11, 2024. It is now read-only.

Commit

Permalink
feat(proposer): add --proposeBlockTxGasTipCap flag (#349)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtaikocha committed Aug 5, 2023
1 parent 9f575b9 commit e7a41c1
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
6 changes: 6 additions & 0 deletions cmd/flags/proposer.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ var (
Usage: "Gas tip multiplier when replacing a TaikoL1.proposeBlock transaction with same nonce",
Category: proposerCategory,
}
ProposeBlockTxGasTipCap = &cli.Uint64Flag{
Name: "proposeBlockTxGasTipCap",
Usage: "Gas tip cap (in wei) for a TaikoL1.proposeBlock transaction when doing the transaction replacement",
Category: proposerCategory,
}
)

// All proposer flags.
Expand All @@ -88,4 +93,5 @@ var ProposerFlags = MergeFlags(CommonFlags, []cli.Flag{
MaxProposedTxListsPerEpoch,
ProposeBlockTxGasLimit,
ProposeBlockTxReplacementMultiplier,
ProposeBlockTxGasTipCap,
})
9 changes: 8 additions & 1 deletion proposer/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package proposer
import (
"crypto/ecdsa"
"fmt"
"math/big"
"strings"
"time"

Expand Down Expand Up @@ -31,6 +32,7 @@ type Config struct {
BackOffRetryInterval time.Duration
ProposeBlockTxReplacementMultiplier uint64
RPCTimeout *time.Duration
ProposeBlockTxGasTipCap *big.Int
}

// NewConfigFromCliContext initializes a Config instance from
Expand Down Expand Up @@ -92,12 +94,16 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
}

var timeout *time.Duration

if c.IsSet(flags.RPCTimeout.Name) {
duration := time.Duration(c.Uint64(flags.RPCTimeout.Name)) * time.Second
timeout = &duration
}

var proposeBlockTxGasTipCap *big.Int
if c.IsSet(flags.ProposeBlockTxGasTipCap.Name) {
proposeBlockTxGasTipCap = new(big.Int).SetUint64(c.Uint64(flags.ProposeBlockTxGasTipCap.Name))
}

return &Config{
L1Endpoint: c.String(flags.L1WSEndpoint.Name),
L2Endpoint: c.String(flags.L2HTTPEndpoint.Name),
Expand All @@ -116,5 +122,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
BackOffRetryInterval: time.Duration(c.Uint64(flags.BackOffRetryInterval.Name)) * time.Second,
ProposeBlockTxReplacementMultiplier: proposeBlockTxReplacementMultiplier,
RPCTimeout: timeout,
ProposeBlockTxGasTipCap: proposeBlockTxGasTipCap,
}, nil
}
18 changes: 16 additions & 2 deletions proposer/proposer.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/cenkalti/backoff/v4"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/txpool"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
Expand Down Expand Up @@ -54,6 +55,7 @@ type Proposer struct {
maxProposedTxListsPerEpoch uint64
proposeBlockTxGasLimit *uint64
txReplacementTipMultiplier uint64
proposeBlockTxGasTipCap *big.Int

// Protocol configurations
protocolConfigs *bindings.TaikoDataConfig
Expand Down Expand Up @@ -90,6 +92,7 @@ func InitFromConfig(ctx context.Context, p *Proposer, cfg *Config) (err error) {
p.commitSlot = cfg.CommitSlot
p.maxProposedTxListsPerEpoch = cfg.MaxProposedTxListsPerEpoch
p.txReplacementTipMultiplier = cfg.ProposeBlockTxReplacementMultiplier
p.proposeBlockTxGasTipCap = cfg.ProposeBlockTxGasTipCap
p.ctx = ctx

// RPC clients
Expand Down Expand Up @@ -349,14 +352,25 @@ func (p *Proposer) sendProposeBlockTx(
"Original transaction to replace",
"sender", p.l1ProposerAddress,
"nonce", nonce,
"tx", originalTx,
"gasTipCap", originalTx.GasTipCap(),
"gasFeeCap", originalTx.GasFeeCap(),
)

opts.GasTipCap = new(big.Int).Mul(
originalTx.GasTipCap(),
new(big.Int).SetUint64(p.txReplacementTipMultiplier),
)
}

if p.proposeBlockTxGasTipCap != nil && opts.GasTipCap.Cmp(p.proposeBlockTxGasTipCap) > 0 {
log.Info(
"New gasTipCap exceeds limit, keep waiting",
"multiplier", p.txReplacementTipMultiplier,
"newGasTipCap", opts.GasTipCap,
"maxTipCap", p.proposeBlockTxGasTipCap,
)
return nil, txpool.ErrReplaceUnderpriced
}
}

proposeTx, err := p.rpc.TaikoL1.ProposeBlock(opts, inputs, txListBytes)
Expand Down Expand Up @@ -387,7 +401,7 @@ func (p *Proposer) ProposeTxList(
}
if tx, err = p.sendProposeBlockTx(ctx, meta, txListBytes, nonce, isReplacement); err != nil {
log.Warn("Failed to send propose block transaction, retrying", "error", err)
if strings.Contains(err.Error(), "replacement transaction underpriced") {
if strings.Contains(err.Error(), txpool.ErrReplaceUnderpriced.Error()) {
isReplacement = true
} else {
isReplacement = false
Expand Down

0 comments on commit e7a41c1

Please sign in to comment.