Skip to content

fix: fixed evm incorrectly assigning gas fee tip #30

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
webster-swift merged 1 commit into from
Oct 28, 2025
Merged

fix: fixed evm incorrectly assigning gas fee tip #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 24 additions & 17 deletions pkg/walletsdk/evm/estimate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (s *EVM) EstimateTransfer(ctx context.Context, fromAddress, toAddress, asse
return nil, fmt.Errorf("failed to estimate fee: %w", err)
}

if assetIdentifier == s.config.Blockchain.GetAssetIdentifier() { //nolint:nestif
if assetIdentifier == s.config.Blockchain.GetAssetIdentifier() {
estimatedGas, err := s.node.EstimateGas(ctx, ethereum.CallMsg{
From: common.HexToAddress(fromAddress),
To: utils.Pointer(common.HexToAddress(toAddress)),
Expand All @@ -44,11 +44,6 @@ func (s *EVM) EstimateTransfer(ctx context.Context, fromAddress, toAddress, asse

gasAmount = decimal.NewFromUint64(estimatedGas)
gasTipCap = estimate.SuggestGasTipCap

if gasTipCap.GreaterThan(estimate.MaxFeePerGas) {
gasTipCap = estimate.MaxFeePerGas
}

totalGasPrice = estimate.MaxFeePerGas.Add(gasTipCap)
totalFeeAmount = totalGasPrice.Mul(gasAmount)
} else {
Expand All @@ -70,11 +65,6 @@ func (s *EVM) EstimateTransfer(ctx context.Context, fromAddress, toAddress, asse

gasAmount = decimal.NewFromUint64(estimatedGas)
gasTipCap = estimate.SuggestGasTipCap

if gasTipCap.GreaterThan(estimate.MaxFeePerGas) {
gasTipCap = estimate.MaxFeePerGas
}

totalGasPrice = estimate.MaxFeePerGas.Add(gasTipCap)
totalFeeAmount = totalGasPrice.Mul(gasAmount)
}
Expand Down Expand Up @@ -137,19 +127,36 @@ func (s *EVM) EstimateFee(ctx context.Context) (*EstimateFeeResult, error) {
SuggestGasPrice: suggestGasPrice,
}

if s.config.Blockchain == wconstants.BlockchainTypeEthereum {
fee.SuggestGasTipCap = UnitMap[EtherUnitGWei]
}

if fee.SuggestGasTipCap.LessThan(UnitMap[EtherUnitGWei]) {
fee.SuggestGasTipCap = UnitMap[EtherUnitGWei]
// Apply blockchain-specific minimum gas tip caps
minGasTipCap := getMinGasTipCapByBlockchain(s.config.Blockchain)
if fee.SuggestGasTipCap.LessThan(minGasTipCap) {
fee.SuggestGasTipCap = minGasTipCap
}

fee.MaxFeePerGas = GetBaseFeeMultiplier(fee.SuggestGasPrice)

return fee, nil
}

// getMinGasTipCapByBlockchain returns the minimum gas tip cap for a given blockchain in Wei.
func getMinGasTipCapByBlockchain(blockchain wconstants.BlockchainType) decimal.Decimal {
switch blockchain {
case wconstants.BlockchainTypeBinanceSmartChain:
return UnitMap[EtherUnitGWei].Div(decimal.NewFromInt(10))
case wconstants.BlockchainTypeEthereum:
return UnitMap[EtherUnitGWei]
case wconstants.BlockchainTypePolygon:
return decimal.NewFromInt(30).Mul(UnitMap[EtherUnitGWei])
case wconstants.BlockchainTypeArbitrum,
wconstants.BlockchainTypeOptimism,
wconstants.BlockchainTypeLinea:
return UnitMap[EtherUnitGWei].Div(decimal.NewFromInt(100))
default:
// Default: 1 Gwei
return UnitMap[EtherUnitGWei]
}
}

func GetBaseFeeMultiplier(baseFeeWei decimal.Decimal) decimal.Decimal {
items := []struct {
threshold int64
Expand Down