Skip to content

fix: set gas floor for swaps to prevent out of gas #930

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

Open
owen-eth wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: set gas floor for swaps to prevent out of gas #930

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
8 changes: 6 additions & 2 deletions tools/preconf-rpc/fastswap/fastswap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ type sourceFee struct {

// ============ Service ============

// minGasLimit prevents OOG from the EIP-150 63/64 cascade on simple routes
// where Barter's small GasEstimation produces a tight gasLimit.
const minGasLimit = 400_000

// Mainnet WETH address
var mainnetWETH = common.HexToAddress("0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2")

Expand Down Expand Up @@ -393,7 +397,7 @@ func (s *Service) HandleSwap(ctx context.Context, req SwapRequest) (*SwapResult,
// Barter's GasEstimation covers their swap routing gas. We add 135k for
// settlement contract + permit2 overhead, then apply 2.5x on the estimation
// to cover variance across different swap routes.
gasLimit := uint64(float64(barterResp.Route.GasEstimation)*2.5) + 135000
gasLimit := max(uint64(float64(barterResp.Route.GasEstimation)*2.5)+135000, minGasLimit)

// 4. Get nonce for executor wallet
// Use same logic as sender's hasCorrectNonce
Expand Down Expand Up @@ -737,7 +741,7 @@ func (s *Service) HandleETHSwap(ctx context.Context, req ETHSwapRequest) (*ETHSw

// 3. Calculate gas limit from Barter's gas estimation + settlement overhead.
// ETH path has additional WETH wrap overhead (~17k) on top of permit path overhead.
gasLimit := uint64(float64(barterResp.Route.GasEstimation)*2.5) + 152000
gasLimit := max(uint64(float64(barterResp.Route.GasEstimation)*2.5)+152000, minGasLimit)

s.logger.Info("ETH swap request processed",
"sender", req.Sender.Hex(),
Expand Down
Loading