fix swap on opposite side

This commit is contained in:
tjs 2022-12-26 12:14:34 -05:00
parent 9d552521cd
commit d21c5ac383
1 changed files with 9 additions and 6 deletions

View File

@ -82,7 +82,8 @@ const fetchJupiterTransaction = async (
selectedRoute: RouteInfo, selectedRoute: RouteInfo,
userPublicKey: PublicKey, userPublicKey: PublicKey,
slippage: number, slippage: number,
inputMint: PublicKey inputMint: PublicKey,
outputMint: PublicKey
): Promise<[TransactionInstruction[], AddressLookupTableAccount[]]> => { ): Promise<[TransactionInstruction[], AddressLookupTableAccount[]]> => {
const transactions = await ( const transactions = await (
await fetch('https://quote-api.jup.ag/v4/swap', { await fetch('https://quote-api.jup.ag/v4/swap', {
@ -118,13 +119,14 @@ const fetchJupiterTransaction = async (
return ( return (
ix.programId.toString() === ix.programId.toString() ===
'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL' && 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL' &&
ix.keys[3].pubkey.toString() === inputMint.toString() (ix.keys[3].pubkey.toString() === inputMint.toString() ||
ix.keys[3].pubkey.toString() === outputMint.toString())
) )
} }
const filtered_jup_ixs = ixs.filter( const filtered_jup_ixs = ixs
(ix) => !isSetupIx(ix.programId) && !isDuplicateAta(ix) .filter((ix) => !isSetupIx(ix.programId))
) .filter((ix) => !isDuplicateAta(ix))
console.log('ixs: ', ixs) console.log('ixs: ', ixs)
console.log('filtered ixs: ', filtered_jup_ixs) console.log('filtered ixs: ', filtered_jup_ixs)
@ -219,7 +221,8 @@ const SwapReviewRouteInfo = ({
selectedRoute, selectedRoute,
mangoAccount.owner, mangoAccount.owner,
slippage, slippage,
inputBank.mint inputBank.mint,
outputBank.mint
) )
try { try {