Skip to content

Commit df01623

Browse files
committed
Remove ALLOWS_PERMIT gas estimation checks
1 parent 65f96ac commit df01623

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

src/handlers/swap.ts

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { BigNumberish } from '@ethersproject/bignumber';
22
import { Block, StaticJsonRpcProvider } from '@ethersproject/providers';
33
import {
4-
ALLOWS_PERMIT,
54
CrosschainQuote,
65
getQuoteExecutionDetails,
76
getRainbowRouterContractAddress,
@@ -86,14 +85,7 @@ const getCrosschainSwapRainbowDefaultGasLimit = (chainId: ChainId) =>
8685
ethereumUtils.getBasicSwapGasLimit(Number(chainId)) * EXTRA_GAS_PADDING;
8786

8887
export const getDefaultGasLimitForTrade = (tradeDetails: Quote, chainId: ChainId): number => {
89-
const allowsPermit =
90-
chainId === ChainId.mainnet && ALLOWS_PERMIT[tradeDetails?.sellTokenAddress?.toLowerCase() as keyof PermitSupportedTokenList];
91-
92-
let defaultGasLimit = tradeDetails?.defaultGasLimit;
93-
94-
if (allowsPermit) {
95-
defaultGasLimit = Math.max(Number(defaultGasLimit), Number(ethUnits.basic_swap_permit) * EXTRA_GAS_PADDING).toString();
96-
}
88+
const defaultGasLimit = tradeDetails?.defaultGasLimit;
9789
return Number(defaultGasLimit || 0) || ethereumUtils.getBasicSwapGasLimit(Number(chainId)) * EXTRA_GAS_PADDING;
9890
};
9991

src/raps/utils.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Block, Provider } from '@ethersproject/abstract-provider';
22
import { MaxUint256 } from '@ethersproject/constants';
33
import { Contract, PopulatedTransaction } from '@ethersproject/contracts';
44
import { StaticJsonRpcProvider } from '@ethersproject/providers';
5-
import { ALLOWS_PERMIT, CrosschainQuote, Quote, getQuoteExecutionDetails, getRainbowRouterContractAddress } from '@rainbow-me/swaps';
5+
import { CrosschainQuote, Quote, getQuoteExecutionDetails, getRainbowRouterContractAddress } from '@rainbow-me/swaps';
66
import { mainnet } from 'viem/chains';
77
import { Chain, erc20Abi } from 'viem';
88
import { GasFeeParamsBySpeed, LegacyGasFeeParamsBySpeed, LegacyTransactionGasParamAmounts, TransactionGasParamAmounts } from '@/entities';
@@ -140,14 +140,7 @@ const getClosestGasEstimate = async (estimationFn: (gasEstimate: number) => Prom
140140
};
141141

142142
export const getDefaultGasLimitForTrade = (quote: Quote, chainId: Chain['id']): string => {
143-
const allowsPermit = chainId === mainnet.id && ALLOWS_PERMIT[quote?.sellTokenAddress?.toLowerCase()];
144-
145-
let defaultGasLimit = quote?.defaultGasLimit;
146-
147-
if (allowsPermit) {
148-
defaultGasLimit = Math.max(Number(defaultGasLimit), Number(multiply(gasUnits.basic_swap_permit, EXTRA_GAS_PADDING))).toString();
149-
}
150-
return defaultGasLimit || multiply(gasUnits.basic_swap[chainId], EXTRA_GAS_PADDING);
143+
return quote?.defaultGasLimit || multiply(gasUnits.basic_swap[chainId], EXTRA_GAS_PADDING);
151144
};
152145

153146
export const estimateSwapGasLimitWithFakeApproval = async (

0 commit comments

Comments
 (0)