Skip to content
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

fix(eth-flow): set chainId explicitly when sending ethFlow tx #5244

Merged
merged 1 commit into from
Dec 20, 2024
Merged

fix(eth-flow): set chainId explicitly when sending ethFlow tx #5244

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
34 changes: 21 additions & 13 deletions apps/cowswap-frontend/src/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function signEthFlowOrderStep(
orderId: string,
orderParams: PostOrderParams,
ethFlowContract: CoWSwapEthFlow,
addInFlightOrderId: (orderId: string) => void
addInFlightOrderId: (orderId: string) => void,
): Promise<EthFlowResponse> {
logTradeFlow('ETH FLOW', '[EthFlow::SignEthFlowOrderStep] - signing orderParams onchain', orderParams)

Expand All @@ -58,21 +58,29 @@ export async function signEthFlowOrderStep(
}

const ethTxOptions = { value: etherValue.quotient.toString() }
const estimatedGas = await ethFlowContract.estimateGas
.createOrder(ethOrderParams, { value: etherValue.quotient.toString() })
.catch((error) => {
logTradeFlowError(
'ETH FLOW',
'[EthFlow::SignEthFlowOrderStep] Error estimating createOrder gas. Using default ' + GAS_LIMIT_DEFAULT,
error
)
return GAS_LIMIT_DEFAULT
})

const txReceipt = await ethFlowContract.createOrder(ethOrderParams, {
const estimatedGas = await ethFlowContract.estimateGas.createOrder(ethOrderParams, ethTxOptions).catch((error) => {
logTradeFlowError(
'ETH FLOW',
'[EthFlow::SignEthFlowOrderStep] Error estimating createOrder gas. Using default ' + GAS_LIMIT_DEFAULT,
error,
)
return GAS_LIMIT_DEFAULT
})

// This used to be done with a higher level of abstraction like this:
alfetopito marked this conversation as resolved.
Show resolved Hide resolved
// const txReceipt = await ethFlowContract.createOrder(ethOrderParams, {
// ...ethTxOptions,
// gasLimit: calculateGasMargin(estimatedGas),
// })
// However, to **try** to prevent wallet issues, we want to explicitly send along the chainId
// But that wrapper doesn't accept it.
// So we must build the tx first, then send it using the contract's signer
const tx = await ethFlowContract.populateTransaction.createOrder(ethOrderParams, {
...ethTxOptions,
gasLimit: calculateGasMargin(estimatedGas),
})
const txReceipt = await ethFlowContract.signer.sendTransaction({ ...tx, chainId: orderParams.chainId })
alfetopito marked this conversation as resolved.
Show resolved Hide resolved

addInFlightOrderId(orderId)

logTradeFlow('ETH FLOW', '[EthFlow::SignEthFlowOrderStep] Sent transaction onchain', orderId, txReceipt)
Expand Down
Loading