Skip to content

fix(sender): make sure gas price is above baseFee #1531

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
colinlyguo merged 7 commits into from
Nov 21, 2024
Merged

fix(sender): make sure gas price is above baseFee #1531

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
228319e
fix: fix sender gas price
0xmountaintop Oct 8, 2024
8ae34c3
chore: auto version bump [bot]
0xmountaintop Oct 8, 2024
30a7b47
revert
0xmountaintop Oct 9, 2024
7fd3a17
Merge branch 'develop' into haoyu/basefee
colinlyguo Nov 15, 2024
92e2dfc
Merge branch 'develop' into haoyu/basefee
colinlyguo Nov 18, 2024
57bf5c3
chore: auto version bump [bot]
colinlyguo Nov 18, 2024
d5d6390
Merge branch 'develop' into haoyu/basefee
colinlyguo Nov 21, 2024
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
2 changes: 1 addition & 1 deletion common/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"runtime/debug"
)

var tag = "v4.4.64"
var tag = "v4.4.65"

var commit = func() string {
if info, ok := debug.ReadBuildInfo(); ok {
Expand Down
15 changes: 14 additions & 1 deletion rollup/internal/controller/sender/sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,16 @@ func (s *Sender) SendConfirmation(cfm *Confirmation) {
func (s *Sender) getFeeData(target *common.Address, data []byte, sidecar *gethTypes.BlobTxSidecar, baseFee, blobBaseFee uint64, fallbackGasLimit uint64) (*FeeData, error) {
switch s.config.TxType {
case LegacyTxType:
return s.estimateLegacyGas(target, data, fallbackGasLimit)
feeData, err := s.estimateLegacyGas(target, data, fallbackGasLimit)
if err != nil {
return nil, err
}
baseFeeInt := new(big.Int).SetUint64(baseFee)
maxGasPrice := new(big.Int).SetUint64(s.config.MaxGasPrice)
if feeData.gasPrice.Cmp(baseFeeInt) < 0 && baseFeeInt.Cmp(maxGasPrice) <= 0 {
feeData.gasPrice = baseFeeInt
}
return feeData, nil
case DynamicFeeTxType:
if sidecar == nil {
return s.estimateDynamicGas(target, data, baseFee, fallbackGasLimit)
Expand Down Expand Up @@ -357,6 +366,10 @@ func (s *Sender) resubmitTransaction(tx *gethTypes.Transaction, baseFee, blobBas
originalGasPrice := tx.GasPrice()
gasPrice := new(big.Int).Mul(originalGasPrice, escalateMultipleNum)
gasPrice = new(big.Int).Div(gasPrice, escalateMultipleDen)
baseFeeInt := new(big.Int).SetUint64(baseFee)
if gasPrice.Cmp(baseFeeInt) < 0 {
gasPrice = baseFeeInt
}
if gasPrice.Cmp(maxGasPrice) > 0 {
gasPrice = maxGasPrice
}
Expand Down