Allow direct DBC swaps

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)

packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

@@ -14,8 +14,9 @@ import {
 import { Feature } from '~/models'
 import {
  convertJupiterInstructions,
- getJupiterQuoteByMint,
- jupiterInstance
+ getJupiterQuoteByMintWithRetry,
+ jupiterInstance,
+ JupiterQuoteResult
 } from '~/services/Jupiter'
 import { useTokens } from '~/store/ui/buy-sell'
 import { TokenInfo } from '~/store/ui/buy-sell/types'
@@ -28,7 +29,11 @@ import {
  SwapTokensResult,
  UserBankManagedTokenInfo
 } from './types'
-import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'
+import {
+ addUserBankToAtaInstructions,
+ addJupiterOutputAtaInstruction,
+ getSwapErrorResponse
+} from './utils'
 
 const SWAP_LOOKUP_TABLE_ADDRESS = new PublicKey(
  '2WB87JxGZieRd7hi3y87wq6HAsPLyb9zrSx8B5z1QEzM'
@@ -74,7 +79,7 @@ export const useSwapTokens = () => {
  const slippageBps = params.slippageBps ?? 50
  const wrapUnwrapSol = params.wrapUnwrapSol ?? true
 
- let quoteResult
+ let quoteResult: JupiterQuoteResult | undefined
  let signature: string | undefined
  let errorStage = 'UNKNOWN'
  const instructions: TransactionInstruction[] = []
@@ -117,7 +122,7 @@ export const useSwapTokens = () => {
 
  // ---------- 3. Get Quote from Jupiter ----------
  errorStage = 'QUOTE_RETRIEVAL'
- quoteResult= await getJupiterQuoteByMint({
+const { quoteResult: quote } = await getJupiterQuoteByMintWithRetry({
  inputMint: inputMintUiAddress,
  outputMint: outputMintUiAddress,
  inputDecimals: inputToken.decimals,
@@ -127,6 +132,7 @@ export const useSwapTokens = () => {
  swapMode: 'ExactIn',
  onlyDirectRoutes: false
  })
+ quoteResult = quote
 
  // ---------- 4. Prepare Transaction Instructions ----------
 
@@ -146,6 +152,7 @@ export const useSwapTokens = () => {
  feePayer,
  instructions
  })
+ let outputAtaForJupiter: PublicKey | undefined
 
  // --- 3b. Determine Jupiter's Destination Token Account ---
  errorStage = 'OUTPUT_TOKEN_PREPARATION'
@@ -160,34 +167,63 @@ export const useSwapTokens = () => {
 
  // --- 3c. Get Jupiter Swap Instructions ---
  errorStage = 'SWAP_INSTRUCTION_RETRIEVAL'
+ let swapInstructionsResult
+ const swapRequestParams = {
+ quoteResponse: quoteResult.quote,
+ userPublicKey: userPublicKey.toBase58(),
+ destinationTokenAccount: preferredJupiterDestination,
+ wrapAndUnwrapSol: wrapUnwrapSol
+ }
+ try {
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: true
+ }
+ })
+ } catch (e) {
+ // In the case of simple AMMs, we will see an error that looks like this:
+ // {
+ // error: "Simple AMMs are not supported with shared accounts"
+ // errorCode: "NOT_SUPPORTED"
+ // }
+ // We can retry with useSharedAccounts: false and bail out if that still errors
+ swapInstructionsResult = await jupiterInstance.swapInstructionsPost({
+ swapRequest: {
+ ...swapRequestParams,
+ useSharedAccounts: false
+ }
+ })
+ // If getting the instruction succeeded, we need to manually handle
+ // the intermediary account for the output mint
+ outputAtaForJupiter = addJupiterOutputAtaInstruction({
+ tokenConfig: outputTokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+ })
+ }
  const {
  tokenLedgerInstruction,
  swapInstruction,
  addressLookupTableAddresses
- } = await jupiterInstance.swapInstructionsPost({
- swapRequest: {
- quoteResponse: quoteResult.quote,
- userPublicKey: userPublicKey.toBase58(),
- destinationTokenAccount: preferredJupiterDestination,
- wrapAndUnwrapSol: wrapUnwrapSol,
- useSharedAccounts: true
- }
- })
-
+ } = swapInstructionsResult
  const jupiterInstructions = convertJupiterInstructions([
  tokenLedgerInstruction,
  swapInstruction
  ])
-
  instructions.push(...jupiterInstructions)
 
  // --- 3f. Add Cleanup Instructions for Temporary ATAs ---
  const atasToClose: PublicKey[] = []
-
  // Add source ATA if it's temporary
  if (sourceAtaForJupiter) {
  atasToClose.push(sourceAtaForJupiter)
  }
+ // Add output ATA if it's temporary
+ if (outputAtaForJupiter) {
+ atasToClose.push(outputAtaForJupiter)
+ }
 
  // Add close account instructions for all ATAs that need to be closed
  for (const ataToClose of atasToClose) {

packages/common/src/api/tan-query/jupiter/useTokenExchangeRate.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { QuoteResponse, SwapMode } from '@jup-ag/api'
 import { useQuery } from '@tanstack/react-query'
 
-import { getJupiterQuoteByMint } from '~/services/Jupiter'
+import { getJupiterQuoteByMint, MAX_ALLOWED_ACCOUNTS } from '~/services/Jupiter'
 
 import { QUERY_KEYS } from '../queryKeys'
 import { QueryOptions, type QueryKey } from '../types'
@@ -103,7 +103,8 @@ export const useTokenExchangeRate = (
  amountUi: safeInputAmount,
  slippageBps: SLIPPAGE_BPS,
  swapMode: params.swapMode ?? 'ExactIn',
- onlyDirectRoutes: false
+ onlyDirectRoutes: false,
+ maxAccounts: MAX_ALLOWED_ACCOUNTS
  })
 
  // Calculate exchange rate (how many output tokens per 1 input token)

packages/common/src/api/tan-query/jupiter/utils.ts

@@ -103,6 +103,45 @@ export async function addAtaToUserBankInstructions({
  return userBankAddress
 }
 
+/**
+ * Creates an Associated Token Account (ATA) for Jupiter when shared accounts are not supported.
+ * This is used as a fallback when Jupiter's shared account system fails for simple AMMs.
+ *
+ * @param tokenConfig - The token configuration containing mint address
+ * @param userPublicKey - The user's public key
+ * @param feePayer - The fee payer's public key
+ * @param instructions - Array to push the ATA creation instruction to
+ * @returns The created ATA public key
+ */
+export function addJupiterOutputAtaInstruction({
+ tokenConfig,
+ userPublicKey,
+ feePayer,
+ instructions
+}: {
+ tokenConfig: UserBankManagedTokenInfo
+ userPublicKey: PublicKey
+ feePayer: PublicKey
+ instructions: TransactionInstruction[]
+}): PublicKey {
+ const outputAtaForJupiter = getAssociatedTokenAddressSync(
+ new PublicKey(tokenConfig.mintAddress),
+ userPublicKey,
+ true
+ )
+
+ instructions.push(
+ createAssociatedTokenAccountIdempotentInstruction(
+ feePayer,
+ outputAtaForJupiter,
+ userPublicKey,
+ new PublicKey(tokenConfig.mintAddress)
+ )
+ )
+
+ return outputAtaForJupiter
+}
+
 /**
  * Get the appropriate error response for a swap error based on the error stage.
  */

packages/common/src/services/Jupiter.ts

@@ -20,7 +20,8 @@ export const SLIPPAGE_TOLERANCE_EXCEEDED_ERROR = 6001
 // Define JupiterTokenSymbol type here since we can't import it directly
 export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP
 
-const MAX_ACCOUNTS = 20
+export const DEFAULT_MAX_ACCOUNTS = 20
+export const MAX_ALLOWED_ACCOUNTS = 64
 
 let _jup: ReturnType<typeof createJupiterApiClient>
 
@@ -99,7 +100,7 @@ export const getJupiterQuoteByMint = async ({
  slippageBps,
  swapMode = 'ExactIn',
  onlyDirectRoutes = false,
- maxAccounts = MAX_ACCOUNTS
+ maxAccounts = DEFAULT_MAX_ACCOUNTS
 }: JupiterMintQuoteParams): Promise<JupiterQuoteResult> => {
  const amount =
  swapMode === 'ExactIn'
@@ -137,6 +138,66 @@ export const getJupiterQuoteByMint = async ({
  }
 }
 
+export type JupiterQuoteWithRetryResult = {
+ maxAccountsValue: number
+ quoteResult: JupiterQuoteResult
+}
+
+/**
+ * Gets a Jupiter quote with automatic retry logic for maxAccounts
+ * Starts with DEFAULT_MAX_ACCOUNTS and increments by 10 until MAX_ALLOWED_ACCOUNTS
+ * Returns the successful quote along with the maxAccounts value that worked
+ */
+export const getJupiterQuoteByMintWithRetry = async ({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode = 'ExactIn',
+ onlyDirectRoutes = false
+}: Omit<
+ JupiterMintQuoteParams,
+ 'maxAccounts'
+>): Promise<JupiterQuoteWithRetryResult> => {
+ let maxAccounts = DEFAULT_MAX_ACCOUNTS
+ let lastError
+ let quoteResult: JupiterQuoteResult | null = null
+
+ while (maxAccounts <= MAX_ALLOWED_ACCOUNTS) {
+ try {
+ quoteResult = await getJupiterQuoteByMint({
+ inputMint,
+ outputMint,
+ inputDecimals,
+ outputDecimals,
+ amountUi,
+ slippageBps,
+ swapMode,
+ onlyDirectRoutes,
+ maxAccounts
+ })
+ break
+ } catch (err) {
+ lastError = err
+ maxAccounts += 10
+ if (maxAccounts > MAX_ALLOWED_ACCOUNTS) {
+ throw lastError
+ }
+ }
+ }
+
+ if (quoteResult === null) {
+ throw lastError
+ }
+
+ return {
+ maxAccountsValue: maxAccounts,
+ quoteResult
+ }
+}
+
 /**
  * Converts an array of Jupiter instructions to Solana TransactionInstructions
  * Filters out undefined instructions and handles the conversion

packages/discovery-provider/plugins/pedalboard/apps/solana-relay/README.md

@@ -0,0 +1,46 @@
+# Solana Relay Plugin
+
+Plugin to facilitate sending Audius-related Solana transactions
+
+## Dev
+
+Create a file `dev.env` and add the following
+
+```
+audius_discprov_env
+audius_discprov_url
+audius_db_url
+audius_redis_url
+audius_solana_endpoint
+audius_solana_listen_rpc_url
+audius_solana_track_listen_count_address
+audius_solana_waudio_mint
+audius_solana_usdc_mint
+audius_solana_bonk_mint
+audius_solana_user_bank_program_address
+audius_solana_payment_router_program_address
+audius_solana_rewards_manager_program_address
+audius_solana_rewards_manager_account
+audius_solana_fee_payer_wallets
+audius_delegate_private_key
+audius_ipdata_api_key
+audius_solana_eth_registry_program
+audius_solana_listens_valid_signer
+audius_solana_signer_private_key
+audius_identity_relayer_public_key
+audius_solana_listens_ip_hourly_rate_limit
+audius_solana_listens_ip_daily_rate_limit
+audius_solana_listens_ip_weekly_rate_limit
+audius_solana_listens_track_hourly_rate_limit
+audius_solana_listens_track_daily_rate_limit
+audius_solana_listens_track_weekly_rate_limit
+audius_anti_abuse_oracle
+```
+
+Then
+
+```
+npm run dev
+```
+
+If using with the web app, updat the `SOLANA_RELAY_ENDPOINT` value in `packages/web/src/services/env/env.<env>.ts` to point to the localhost port that the relay server is running on (i.e. localhost:6002)