Skip to content

Fix jupiter instruction#7849

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

Merged
raymondjacobson merged 1 commit into from
Mar 15, 2024
Merged

Fix jupiter instruction #7849

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
18 changes: 12 additions & 6 deletions packages/web/src/services/audius-backend/Jupiter.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,11 @@ import { TOKEN_LISTING_MAP, JupiterTokenSymbol } from '@audius/common/store'
import { convertBigIntToAmountObject } from '@audius/common/utils'
import { TransactionHandler } from '@audius/sdk/dist/core'
import { createJupiterApiClient, Instruction, QuoteResponse } from '@jup-ag/api'
import { ComputeBudgetProgram, PublicKey, TransactionInstruction } from '@solana/web3.js'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction
} from '@solana/web3.js'

let _jup: ReturnType<typeof createJupiterApiClient>

Expand DownExpand Up@@ -126,10 +130,7 @@ const getSwapInstructions = async ({
...computeBudgetInstructions,
...setupInstructions,
swapInstruction,
cleanupInstruction,
ComputeBudgetProgram.setComputeUnitPrice({
microLamports: 100000
})
cleanupInstruction
]
.filter((i): i is Instruction => i !== undefined)
.map((i) => {
Expand All@@ -146,7 +147,12 @@ const getSwapInstructions = async ({
} as TransactionInstruction
})
return {
instructions: instructionsFlattened,
instructions: [
...instructionsFlattened,
ComputeBudgetProgram.setComputeUnitPrice({

@rickyromborickyromboMar 15, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't there already exist a compute budget instr?

@raymondjacobsonraymondjacobsonMar 15, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed it above and added here because the filter/map above doesn't work with it

@raymondjacobsonraymondjacobsonMar 15, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait I see

@rickyromborickyromboMar 15, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It already exists though. Jupiter returns one. See line 126

@rickyromborickyromboMar 15, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry i missed this in the earlier review!

@raymondjacobsonraymondjacobsonMar 15, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure that includes a priority fee though?

@raymondjacobsonraymondjacobsonMar 15, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we would need to call jup with a microLamports specified here https://station.jup.ag/api-v6/post-swap-instructions

@rickyromborickyromboMar 15, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it doesn't unless you do that - but if you do both it'll fail:

Caution: Transactions can only contain one of each type of compute budget instruction. Duplicate types will result in an TransactionError::DuplicateInstruction error, and ultimately transaction failure.

https://solana.com/docs/intro/transaction_fees

So either replace theirs with our own or put that in the request I think

@raymondjacobsonraymondjacobsonMar 15, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works though 🤔 anyway, here's a better change: #7851

microLamports: 100000
})
],
response,
lookupTableAddresses: addressLookupTableAddresses
}
Expand Down