Skip to content

fix: use transaction blockhash for Jupiter swap confirmation #31

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

Closed
0x-SquidSol wants to merge 1 commit into from
Closed

fix: use transaction blockhash for Jupiter swap confirmation #31

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
9 changes: 5 additions & 4 deletions electron/services/WalletService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,12 +855,13 @@ export async function executeSwap(
maxRetries: 3,
})

// Confirm the transaction
const latestBlockhash = await connection.getLatestBlockhash()
// Confirm using the blockhash embedded in the transaction by Jupiter
const txBlockhash = transaction.message.recentBlockhash
const { lastValidBlockHeight } = await connection.getLatestBlockhash()
await connection.confirmTransaction({
signature,
blockhash: latestBlockhash.blockhash,
lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
blockhash: txBlockhash,
lastValidBlockHeight,
})

db.prepare('UPDATE transaction_history SET signature = ?, status = ? WHERE id = ?').run(signature, 'confirmed', txId)
Expand Down