Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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
faridsalau merged 3 commits into from
Aug 1, 2025
Merged

Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0a2937
Update loading state & icon sizes
faridsalau Jul 30, 2025
7273dde
Merge branch 'fs-artist-coins' into fs-artist-coins-swap
faridsalau Jul 30, 2025
904f3b7
Remove TokenRegistry and being refactor
faridsalau Jul 31, 2025
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
1 change: 0 additions & 1 deletion packages/common/src/api/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down
27 changes: 7 additions & 20 deletions packages/common/src/api/tan-query/coins/tokenUtils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
* Transform a CoinMetadata to TokenInfo for UI use
*/
const coinMetadataToTokenInfo = (
coin: CoinMetadata,
icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
symbol: coin.ticker ?? '',
name: coin.tokenInfo?.name ?? coin.ticker ?? '',
decimals: coin.tokenInfo?.decimals ?? 8,
balance: null, // This would come from user's wallet state
address: coin.mint,
icon,
logoURI: coin.tokenInfo?.logoURI ?? '',
isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
artistCoin: Coin,
icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
const coinMetadata = coinFromSDK(artistCoin)
return coinMetadataToTokenInfo(coinMetadata, icon)
return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
artistCoins: Coin[],
iconMap: Record<string, ComponentType<any>> = {}
artistCoins: Coin[]
): Record<string, TokenInfo> => {
const tokenMap: Record<string, TokenInfo> = {}

artistCoins.forEach((coin) => {
const coinMetadata = coinFromSDK(coin)
const ticker = coinMetadata.ticker || ''
const icon = iconMap[ticker]
if (ticker) {
tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
}
})

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
artistCoins: Coin[],
symbol: string,
iconMap: Record<string, ComponentType<any>> = {}
symbol: string
): TokenInfo | undefined => {
const coin = artistCoins.find((c) => c.ticker === symbol)
if (!coin) return undefined

const coinMetadata = coinFromSDK(coin)
const icon = iconMap[symbol]
return coinMetadataToTokenInfo(coinMetadata, icon)
return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down
48 changes: 0 additions & 48 deletions packages/common/src/api/tan-query/jupiter/constants.ts
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion packages/common/src/api/tan-query/jupiter/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
IDLE = 'IDLE',
GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
}
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
mintAddress: string
Expand Down
57 changes: 46 additions & 11 deletions packages/common/src/api/tan-query/jupiter/useSwapTokens.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
getJupiterQuoteByMint,
jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
ClaimableTokenMint,
SwapErrorType,
SwapStatus,
SwapTokensParams,
SwapTokensResult
SwapTokensResult,
UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
tokens: Record<string, TokenInfo>,
address: string
): TokenInfo | undefined => {
return Object.values(tokens).find(
(token) => token.address.toLowerCase() === address.toLowerCase()
)
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
if (token.symbol === 'USDC') return 'USDC'
return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
mintAddress: token.address,
claimableTokenMint: getClaimableTokenMint(token),
decimals: token.decimals
})

/**
* Hook for executing token swaps using Jupiter.
* Swaps any supported SPL token (or SOL) for another.
*/
export const useSwapTokens = () => {
const queryClient = useQueryClient()
const { solanaWalletService, reportToSentry, audiusSdk, env } =
useQueryContext()
const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
const { data: user } = useCurrentAccountUser()
const { tokens } = useTokens()

return useMutation<SwapTokensResult, Error, SwapTokensParams>({
mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
})

// ---------- 3. Prepare Transaction Instructions ----------
const userBankManagedTokens = createUserBankManagedTokens(env)
const inputTokenConfig =
userBankManagedTokens[inputMintUiAddress.toUpperCase()]
const outputTokenConfig =
userBankManagedTokens[outputMintUiAddress.toUpperCase()]
// Find input and output tokens from our backend-driven token data
const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

if (!inputToken || !outputToken) {
return {
status: SwapStatus.ERROR,
error: {
type: SwapErrorType.BUILD_FAILED,
message: 'Token not found in available tokens'
}
}
}

// Create UserBankManagedTokenInfo objects
const inputTokenConfig = createTokenConfig(inputToken)
const outputTokenConfig = createTokenConfig(outputToken)

// --- 3a. Handle Input Token (if user bank managed) ---
errorStage = 'INPUT_TOKEN_PREPARATION'

const sourceAtaForJupiter = await addUserBankToAtaInstructions({
tokenInfo: inputTokenConfig!,
tokenInfo: inputTokenConfig,
userPublicKey,
ethAddress: ethAddress!,
amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
const result =
await sdk.services.claimableTokensClient.getOrCreateUserBank({
ethWallet: ethAddress!,
mint: outputTokenConfig!.claimableTokenMint
mint: outputTokenConfig.claimableTokenMint
})
const outputUserBankAddress = result.userBank
const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down
8 changes: 2 additions & 6 deletions packages/common/src/hooks/useArtistCoinMessageHeader.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
let artistCoin
if (!!coins && coins.length > 0) {
artistCoin = coins[0]
if (artistCoin.mint) {
const tokenRegistry = getTokenRegistry()
const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
artistCoinSymbol = token?.symbol
}
// Get symbol directly from the coin data
artistCoinSymbol = artistCoin.ticker
}

return artistCoinSymbol
Expand Down
15 changes: 10 additions & 5 deletions packages/common/src/services/audius-backend/AudiusBackend.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
}

function getMintAddress(mint: MintName): PublicKey {
const token = getTokenBySymbol(env, mint)
if (!token) {
throw new Error(`Token not found: ${mint}`)
// Simple mapping for the fixed set of mint names
const mintAddresses: Record<MintName, string> = {
wAUDIO: env.WAUDIO_MINT_ADDRESS,
USDC: env.USDC_MINT_ADDRESS
}
return new PublicKey(token.address)

const address = mintAddresses[mint]
if (!address) {
throw new Error(`Token address not found for mint: ${mint}`)
}
return new PublicKey(address)
}

async function recordTrackListen({
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/services/audius-backend/solana.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down
1 change: 0 additions & 1 deletion packages/common/src/services/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'
76 changes: 0 additions & 76 deletions packages/common/src/services/tokens/TokenRegistry.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions packages/common/src/services/tokens/index.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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

faridsalau
merged 3 commits into

from

Aug 1, 2025
 Merged


Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c0a2937

Update loading state & icon sizes


faridsalau Jul 30, 2025
7273dde

Merge branch 'fs-artist-coins' into fs-artist-coins-swap


faridsalau Jul 30, 2025
904f3b7

Remove TokenRegistry and being refactor


faridsalau Jul 31, 2025

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


1 change: 0 additions & 1 deletion
packages/common/src/api/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down

27 changes: 7 additions & 20 deletions
packages/common/src/api/tan-query/coins/tokenUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
 * Transform a CoinMetadata to TokenInfo for UI use
 */
const coinMetadataToTokenInfo = (
 coin: CoinMetadata,
 icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
 symbol: coin.ticker ?? '',
 name: coin.tokenInfo?.name ?? coin.ticker ?? '',
 decimals: coin.tokenInfo?.decimals ?? 8,
 balance: null, // This would come from user's wallet state
 address: coin.mint,
 icon,
 logoURI: coin.tokenInfo?.logoURI ?? '',
 isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
 artistCoin: Coin,
 icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
 const coinMetadata = coinFromSDK(artistCoin)
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
 artistCoins: Coin[],
 iconMap: Record<string, ComponentType<any>> = {}
 artistCoins: Coin[]
): Record<string, TokenInfo> => {
 const tokenMap: Record<string, TokenInfo> = {}

 artistCoins.forEach((coin) => {
 const coinMetadata = coinFromSDK(coin)
 const ticker = coinMetadata.ticker || ''
 const icon = iconMap[ticker]
 if (ticker) {
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
 }
 })

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
 artistCoins: Coin[],
 symbol: string,
 iconMap: Record<string, ComponentType<any>> = {}
 symbol: string
): TokenInfo | undefined => {
 const coin = artistCoins.find((c) => c.ticker === symbol)
 if (!coin) return undefined

 const coinMetadata = coinFromSDK(coin)
 const icon = iconMap[symbol]
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down

48 changes: 0 additions & 48 deletions
packages/common/src/api/tan-query/jupiter/constants.ts

View file


Open in desktop


This file was deleted.


7 changes: 6 additions & 1 deletion
packages/common/src/api/tan-query/jupiter/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
 IDLE = 'IDLE',
 GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
 }
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
 mintAddress: string
Expand Down

57 changes: 46 additions & 11 deletions
packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
 getJupiterQuoteByMint,
 jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
 ClaimableTokenMint,
 SwapErrorType,
 SwapStatus,
 SwapTokensParams,
 SwapTokensResult
 SwapTokensResult,
 UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
 tokens: Record<string, TokenInfo>,
 address: string
): TokenInfo | undefined => {
 return Object.values(tokens).find(
 (token) => token.address.toLowerCase() === address.toLowerCase()
 )
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
 if (token.symbol === 'USDC') return 'USDC'
 return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
 mintAddress: token.address,
 claimableTokenMint: getClaimableTokenMint(token),
 decimals: token.decimals
})

/**
 * Hook for executing token swaps using Jupiter.
 * Swaps any supported SPL token (or SOL) for another.
 */
export const useSwapTokens = () => {
 const queryClient = useQueryClient()
 const { solanaWalletService, reportToSentry, audiusSdk, env } =
 useQueryContext()
 const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
 const { data: user } = useCurrentAccountUser()
 const { tokens } = useTokens()

 return useMutation<SwapTokensResult, Error, SwapTokensParams>({
 mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
 })

 // ---------- 3. Prepare Transaction Instructions ----------
 const userBankManagedTokens = createUserBankManagedTokens(env)
 const inputTokenConfig =
 userBankManagedTokens[inputMintUiAddress.toUpperCase()]
 const outputTokenConfig =
 userBankManagedTokens[outputMintUiAddress.toUpperCase()]
 // Find input and output tokens from our backend-driven token data
 const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
 const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

 if (!inputToken || !outputToken) {
 return {
 status: SwapStatus.ERROR,
 error: {
 type: SwapErrorType.BUILD_FAILED,
 message: 'Token not found in available tokens'
 }
 }
 }

 // Create UserBankManagedTokenInfo objects
 const inputTokenConfig = createTokenConfig(inputToken)
 const outputTokenConfig = createTokenConfig(outputToken)

 // --- 3a. Handle Input Token (if user bank managed) ---
 errorStage = 'INPUT_TOKEN_PREPARATION'

 const sourceAtaForJupiter = await addUserBankToAtaInstructions({
 tokenInfo: inputTokenConfig!,
 tokenInfo: inputTokenConfig,
 userPublicKey,
 ethAddress: ethAddress!,
 amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
 const result =
 await sdk.services.claimableTokensClient.getOrCreateUserBank({
 ethWallet: ethAddress!,
 mint: outputTokenConfig!.claimableTokenMint
 mint: outputTokenConfig.claimableTokenMint
 })
 const outputUserBankAddress = result.userBank
 const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down

8 changes: 2 additions & 6 deletions
packages/common/src/hooks/useArtistCoinMessageHeader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
 let artistCoin
 if (!!coins && coins.length > 0) {
 artistCoin = coins[0]
 if (artistCoin.mint) {
 const tokenRegistry = getTokenRegistry()
 const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
 artistCoinSymbol = token?.symbol
 }
 // Get symbol directly from the coin data
 artistCoinSymbol = artistCoin.ticker
 }

 return artistCoinSymbol
Expand Down

15 changes: 10 additions & 5 deletions
packages/common/src/services/audius-backend/AudiusBackend.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
 PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
 }

 function getMintAddress(mint: MintName): PublicKey {
 const token = getTokenBySymbol(env, mint)
 if (!token) {
 throw new Error(`Token not found: ${mint}`)
 // Simple mapping for the fixed set of mint names
 const mintAddresses: Record<MintName, string> = {
 wAUDIO: env.WAUDIO_MINT_ADDRESS,
 USDC: env.USDC_MINT_ADDRESS
 }
 return new PublicKey(token.address)

 const address = mintAddresses[mint]
 if (!address) {
 throw new Error(`Token address not found for mint: ${mint}`)
 }
 return new PublicKey(address)
 }

 async function recordTrackListen({
Expand Down

2 changes: 1 addition & 1 deletion
packages/common/src/services/audius-backend/solana.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down

1 change: 0 additions & 1 deletion
packages/common/src/services/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'

76 changes: 0 additions & 76 deletions
packages/common/src/services/tokens/TokenRegistry.ts

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
packages/common/src/services/tokens/index.ts

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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

faridsalau
merged 3 commits into

from

Aug 1, 2025
 Merged


Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c0a2937

Update loading state & icon sizes


faridsalau Jul 30, 2025
7273dde

Merge branch 'fs-artist-coins' into fs-artist-coins-swap


faridsalau Jul 30, 2025
904f3b7

Remove TokenRegistry and being refactor


faridsalau Jul 31, 2025

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


1 change: 0 additions & 1 deletion
packages/common/src/api/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down

27 changes: 7 additions & 20 deletions
packages/common/src/api/tan-query/coins/tokenUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
 * Transform a CoinMetadata to TokenInfo for UI use
 */
const coinMetadataToTokenInfo = (
 coin: CoinMetadata,
 icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
 symbol: coin.ticker ?? '',
 name: coin.tokenInfo?.name ?? coin.ticker ?? '',
 decimals: coin.tokenInfo?.decimals ?? 8,
 balance: null, // This would come from user's wallet state
 address: coin.mint,
 icon,
 logoURI: coin.tokenInfo?.logoURI ?? '',
 isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
 artistCoin: Coin,
 icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
 const coinMetadata = coinFromSDK(artistCoin)
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
 artistCoins: Coin[],
 iconMap: Record<string, ComponentType<any>> = {}
 artistCoins: Coin[]
): Record<string, TokenInfo> => {
 const tokenMap: Record<string, TokenInfo> = {}

 artistCoins.forEach((coin) => {
 const coinMetadata = coinFromSDK(coin)
 const ticker = coinMetadata.ticker || ''
 const icon = iconMap[ticker]
 if (ticker) {
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
 }
 })

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
 artistCoins: Coin[],
 symbol: string,
 iconMap: Record<string, ComponentType<any>> = {}
 symbol: string
): TokenInfo | undefined => {
 const coin = artistCoins.find((c) => c.ticker === symbol)
 if (!coin) return undefined

 const coinMetadata = coinFromSDK(coin)
 const icon = iconMap[symbol]
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down

48 changes: 0 additions & 48 deletions
packages/common/src/api/tan-query/jupiter/constants.ts

View file


Open in desktop


This file was deleted.


7 changes: 6 additions & 1 deletion
packages/common/src/api/tan-query/jupiter/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
 IDLE = 'IDLE',
 GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
 }
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
 mintAddress: string
Expand Down

57 changes: 46 additions & 11 deletions
packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
 getJupiterQuoteByMint,
 jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
 ClaimableTokenMint,
 SwapErrorType,
 SwapStatus,
 SwapTokensParams,
 SwapTokensResult
 SwapTokensResult,
 UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
 tokens: Record<string, TokenInfo>,
 address: string
): TokenInfo | undefined => {
 return Object.values(tokens).find(
 (token) => token.address.toLowerCase() === address.toLowerCase()
 )
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
 if (token.symbol === 'USDC') return 'USDC'
 return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
 mintAddress: token.address,
 claimableTokenMint: getClaimableTokenMint(token),
 decimals: token.decimals
})

/**
 * Hook for executing token swaps using Jupiter.
 * Swaps any supported SPL token (or SOL) for another.
 */
export const useSwapTokens = () => {
 const queryClient = useQueryClient()
 const { solanaWalletService, reportToSentry, audiusSdk, env } =
 useQueryContext()
 const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
 const { data: user } = useCurrentAccountUser()
 const { tokens } = useTokens()

 return useMutation<SwapTokensResult, Error, SwapTokensParams>({
 mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
 })

 // ---------- 3. Prepare Transaction Instructions ----------
 const userBankManagedTokens = createUserBankManagedTokens(env)
 const inputTokenConfig =
 userBankManagedTokens[inputMintUiAddress.toUpperCase()]
 const outputTokenConfig =
 userBankManagedTokens[outputMintUiAddress.toUpperCase()]
 // Find input and output tokens from our backend-driven token data
 const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
 const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

 if (!inputToken || !outputToken) {
 return {
 status: SwapStatus.ERROR,
 error: {
 type: SwapErrorType.BUILD_FAILED,
 message: 'Token not found in available tokens'
 }
 }
 }

 // Create UserBankManagedTokenInfo objects
 const inputTokenConfig = createTokenConfig(inputToken)
 const outputTokenConfig = createTokenConfig(outputToken)

 // --- 3a. Handle Input Token (if user bank managed) ---
 errorStage = 'INPUT_TOKEN_PREPARATION'

 const sourceAtaForJupiter = await addUserBankToAtaInstructions({
 tokenInfo: inputTokenConfig!,
 tokenInfo: inputTokenConfig,
 userPublicKey,
 ethAddress: ethAddress!,
 amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
 const result =
 await sdk.services.claimableTokensClient.getOrCreateUserBank({
 ethWallet: ethAddress!,
 mint: outputTokenConfig!.claimableTokenMint
 mint: outputTokenConfig.claimableTokenMint
 })
 const outputUserBankAddress = result.userBank
 const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down

8 changes: 2 additions & 6 deletions
packages/common/src/hooks/useArtistCoinMessageHeader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
 let artistCoin
 if (!!coins && coins.length > 0) {
 artistCoin = coins[0]
 if (artistCoin.mint) {
 const tokenRegistry = getTokenRegistry()
 const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
 artistCoinSymbol = token?.symbol
 }
 // Get symbol directly from the coin data
 artistCoinSymbol = artistCoin.ticker
 }

 return artistCoinSymbol
Expand Down

15 changes: 10 additions & 5 deletions
packages/common/src/services/audius-backend/AudiusBackend.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
 PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
 }

 function getMintAddress(mint: MintName): PublicKey {
 const token = getTokenBySymbol(env, mint)
 if (!token) {
 throw new Error(`Token not found: ${mint}`)
 // Simple mapping for the fixed set of mint names
 const mintAddresses: Record<MintName, string> = {
 wAUDIO: env.WAUDIO_MINT_ADDRESS,
 USDC: env.USDC_MINT_ADDRESS
 }
 return new PublicKey(token.address)

 const address = mintAddresses[mint]
 if (!address) {
 throw new Error(`Token address not found for mint: ${mint}`)
 }
 return new PublicKey(address)
 }

 async function recordTrackListen({
Expand Down

2 changes: 1 addition & 1 deletion
packages/common/src/services/audius-backend/solana.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down

1 change: 0 additions & 1 deletion
packages/common/src/services/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'

76 changes: 0 additions & 76 deletions
packages/common/src/services/tokens/TokenRegistry.ts

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
packages/common/src/services/tokens/index.ts

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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

faridsalau
merged 3 commits into

from

Aug 1, 2025
 Merged


Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c0a2937

Update loading state & icon sizes


faridsalau Jul 30, 2025
7273dde

Merge branch 'fs-artist-coins' into fs-artist-coins-swap


faridsalau Jul 30, 2025
904f3b7

Remove TokenRegistry and being refactor


faridsalau Jul 31, 2025

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


1 change: 0 additions & 1 deletion
packages/common/src/api/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down

27 changes: 7 additions & 20 deletions
packages/common/src/api/tan-query/coins/tokenUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
 * Transform a CoinMetadata to TokenInfo for UI use
 */
const coinMetadataToTokenInfo = (
 coin: CoinMetadata,
 icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
 symbol: coin.ticker ?? '',
 name: coin.tokenInfo?.name ?? coin.ticker ?? '',
 decimals: coin.tokenInfo?.decimals ?? 8,
 balance: null, // This would come from user's wallet state
 address: coin.mint,
 icon,
 logoURI: coin.tokenInfo?.logoURI ?? '',
 isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
 artistCoin: Coin,
 icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
 const coinMetadata = coinFromSDK(artistCoin)
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
 artistCoins: Coin[],
 iconMap: Record<string, ComponentType<any>> = {}
 artistCoins: Coin[]
): Record<string, TokenInfo> => {
 const tokenMap: Record<string, TokenInfo> = {}

 artistCoins.forEach((coin) => {
 const coinMetadata = coinFromSDK(coin)
 const ticker = coinMetadata.ticker || ''
 const icon = iconMap[ticker]
 if (ticker) {
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
 }
 })

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
 artistCoins: Coin[],
 symbol: string,
 iconMap: Record<string, ComponentType<any>> = {}
 symbol: string
): TokenInfo | undefined => {
 const coin = artistCoins.find((c) => c.ticker === symbol)
 if (!coin) return undefined

 const coinMetadata = coinFromSDK(coin)
 const icon = iconMap[symbol]
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down

48 changes: 0 additions & 48 deletions
packages/common/src/api/tan-query/jupiter/constants.ts

View file


Open in desktop


This file was deleted.


7 changes: 6 additions & 1 deletion
packages/common/src/api/tan-query/jupiter/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
 IDLE = 'IDLE',
 GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
 }
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
 mintAddress: string
Expand Down

57 changes: 46 additions & 11 deletions
packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
 getJupiterQuoteByMint,
 jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
 ClaimableTokenMint,
 SwapErrorType,
 SwapStatus,
 SwapTokensParams,
 SwapTokensResult
 SwapTokensResult,
 UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
 tokens: Record<string, TokenInfo>,
 address: string
): TokenInfo | undefined => {
 return Object.values(tokens).find(
 (token) => token.address.toLowerCase() === address.toLowerCase()
 )
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
 if (token.symbol === 'USDC') return 'USDC'
 return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
 mintAddress: token.address,
 claimableTokenMint: getClaimableTokenMint(token),
 decimals: token.decimals
})

/**
 * Hook for executing token swaps using Jupiter.
 * Swaps any supported SPL token (or SOL) for another.
 */
export const useSwapTokens = () => {
 const queryClient = useQueryClient()
 const { solanaWalletService, reportToSentry, audiusSdk, env } =
 useQueryContext()
 const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
 const { data: user } = useCurrentAccountUser()
 const { tokens } = useTokens()

 return useMutation<SwapTokensResult, Error, SwapTokensParams>({
 mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
 })

 // ---------- 3. Prepare Transaction Instructions ----------
 const userBankManagedTokens = createUserBankManagedTokens(env)
 const inputTokenConfig =
 userBankManagedTokens[inputMintUiAddress.toUpperCase()]
 const outputTokenConfig =
 userBankManagedTokens[outputMintUiAddress.toUpperCase()]
 // Find input and output tokens from our backend-driven token data
 const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
 const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

 if (!inputToken || !outputToken) {
 return {
 status: SwapStatus.ERROR,
 error: {
 type: SwapErrorType.BUILD_FAILED,
 message: 'Token not found in available tokens'
 }
 }
 }

 // Create UserBankManagedTokenInfo objects
 const inputTokenConfig = createTokenConfig(inputToken)
 const outputTokenConfig = createTokenConfig(outputToken)

 // --- 3a. Handle Input Token (if user bank managed) ---
 errorStage = 'INPUT_TOKEN_PREPARATION'

 const sourceAtaForJupiter = await addUserBankToAtaInstructions({
 tokenInfo: inputTokenConfig!,
 tokenInfo: inputTokenConfig,
 userPublicKey,
 ethAddress: ethAddress!,
 amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
 const result =
 await sdk.services.claimableTokensClient.getOrCreateUserBank({
 ethWallet: ethAddress!,
 mint: outputTokenConfig!.claimableTokenMint
 mint: outputTokenConfig.claimableTokenMint
 })
 const outputUserBankAddress = result.userBank
 const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down

8 changes: 2 additions & 6 deletions
packages/common/src/hooks/useArtistCoinMessageHeader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
 let artistCoin
 if (!!coins && coins.length > 0) {
 artistCoin = coins[0]
 if (artistCoin.mint) {
 const tokenRegistry = getTokenRegistry()
 const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
 artistCoinSymbol = token?.symbol
 }
 // Get symbol directly from the coin data
 artistCoinSymbol = artistCoin.ticker
 }

 return artistCoinSymbol
Expand Down

15 changes: 10 additions & 5 deletions
packages/common/src/services/audius-backend/AudiusBackend.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
 PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
 }

 function getMintAddress(mint: MintName): PublicKey {
 const token = getTokenBySymbol(env, mint)
 if (!token) {
 throw new Error(`Token not found: ${mint}`)
 // Simple mapping for the fixed set of mint names
 const mintAddresses: Record<MintName, string> = {
 wAUDIO: env.WAUDIO_MINT_ADDRESS,
 USDC: env.USDC_MINT_ADDRESS
 }
 return new PublicKey(token.address)

 const address = mintAddresses[mint]
 if (!address) {
 throw new Error(`Token address not found for mint: ${mint}`)
 }
 return new PublicKey(address)
 }

 async function recordTrackListen({
Expand Down

2 changes: 1 addition & 1 deletion
packages/common/src/services/audius-backend/solana.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down

1 change: 0 additions & 1 deletion
packages/common/src/services/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'

76 changes: 0 additions & 76 deletions
packages/common/src/services/tokens/TokenRegistry.ts

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
packages/common/src/services/tokens/index.ts

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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

faridsalau
merged 3 commits into

from

Aug 1, 2025
 Merged


Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c0a2937

Update loading state & icon sizes


faridsalau Jul 30, 2025
7273dde

Merge branch 'fs-artist-coins' into fs-artist-coins-swap


faridsalau Jul 30, 2025
904f3b7

Remove TokenRegistry and being refactor


faridsalau Jul 31, 2025

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


1 change: 0 additions & 1 deletion
packages/common/src/api/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down

27 changes: 7 additions & 20 deletions
packages/common/src/api/tan-query/coins/tokenUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
 * Transform a CoinMetadata to TokenInfo for UI use
 */
const coinMetadataToTokenInfo = (
 coin: CoinMetadata,
 icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
 symbol: coin.ticker ?? '',
 name: coin.tokenInfo?.name ?? coin.ticker ?? '',
 decimals: coin.tokenInfo?.decimals ?? 8,
 balance: null, // This would come from user's wallet state
 address: coin.mint,
 icon,
 logoURI: coin.tokenInfo?.logoURI ?? '',
 isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
 artistCoin: Coin,
 icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
 const coinMetadata = coinFromSDK(artistCoin)
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
 artistCoins: Coin[],
 iconMap: Record<string, ComponentType<any>> = {}
 artistCoins: Coin[]
): Record<string, TokenInfo> => {
 const tokenMap: Record<string, TokenInfo> = {}

 artistCoins.forEach((coin) => {
 const coinMetadata = coinFromSDK(coin)
 const ticker = coinMetadata.ticker || ''
 const icon = iconMap[ticker]
 if (ticker) {
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
 }
 })

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
 artistCoins: Coin[],
 symbol: string,
 iconMap: Record<string, ComponentType<any>> = {}
 symbol: string
): TokenInfo | undefined => {
 const coin = artistCoins.find((c) => c.ticker === symbol)
 if (!coin) return undefined

 const coinMetadata = coinFromSDK(coin)
 const icon = iconMap[symbol]
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down

48 changes: 0 additions & 48 deletions
packages/common/src/api/tan-query/jupiter/constants.ts

View file


Open in desktop


This file was deleted.


7 changes: 6 additions & 1 deletion
packages/common/src/api/tan-query/jupiter/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
 IDLE = 'IDLE',
 GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
 }
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
 mintAddress: string
Expand Down

57 changes: 46 additions & 11 deletions
packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
 getJupiterQuoteByMint,
 jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
 ClaimableTokenMint,
 SwapErrorType,
 SwapStatus,
 SwapTokensParams,
 SwapTokensResult
 SwapTokensResult,
 UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
 tokens: Record<string, TokenInfo>,
 address: string
): TokenInfo | undefined => {
 return Object.values(tokens).find(
 (token) => token.address.toLowerCase() === address.toLowerCase()
 )
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
 if (token.symbol === 'USDC') return 'USDC'
 return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
 mintAddress: token.address,
 claimableTokenMint: getClaimableTokenMint(token),
 decimals: token.decimals
})

/**
 * Hook for executing token swaps using Jupiter.
 * Swaps any supported SPL token (or SOL) for another.
 */
export const useSwapTokens = () => {
 const queryClient = useQueryClient()
 const { solanaWalletService, reportToSentry, audiusSdk, env } =
 useQueryContext()
 const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
 const { data: user } = useCurrentAccountUser()
 const { tokens } = useTokens()

 return useMutation<SwapTokensResult, Error, SwapTokensParams>({
 mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
 })

 // ---------- 3. Prepare Transaction Instructions ----------
 const userBankManagedTokens = createUserBankManagedTokens(env)
 const inputTokenConfig =
 userBankManagedTokens[inputMintUiAddress.toUpperCase()]
 const outputTokenConfig =
 userBankManagedTokens[outputMintUiAddress.toUpperCase()]
 // Find input and output tokens from our backend-driven token data
 const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
 const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

 if (!inputToken || !outputToken) {
 return {
 status: SwapStatus.ERROR,
 error: {
 type: SwapErrorType.BUILD_FAILED,
 message: 'Token not found in available tokens'
 }
 }
 }

 // Create UserBankManagedTokenInfo objects
 const inputTokenConfig = createTokenConfig(inputToken)
 const outputTokenConfig = createTokenConfig(outputToken)

 // --- 3a. Handle Input Token (if user bank managed) ---
 errorStage = 'INPUT_TOKEN_PREPARATION'

 const sourceAtaForJupiter = await addUserBankToAtaInstructions({
 tokenInfo: inputTokenConfig!,
 tokenInfo: inputTokenConfig,
 userPublicKey,
 ethAddress: ethAddress!,
 amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
 const result =
 await sdk.services.claimableTokensClient.getOrCreateUserBank({
 ethWallet: ethAddress!,
 mint: outputTokenConfig!.claimableTokenMint
 mint: outputTokenConfig.claimableTokenMint
 })
 const outputUserBankAddress = result.userBank
 const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down

8 changes: 2 additions & 6 deletions
packages/common/src/hooks/useArtistCoinMessageHeader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
 let artistCoin
 if (!!coins && coins.length > 0) {
 artistCoin = coins[0]
 if (artistCoin.mint) {
 const tokenRegistry = getTokenRegistry()
 const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
 artistCoinSymbol = token?.symbol
 }
 // Get symbol directly from the coin data
 artistCoinSymbol = artistCoin.ticker
 }

 return artistCoinSymbol
Expand Down

15 changes: 10 additions & 5 deletions
packages/common/src/services/audius-backend/AudiusBackend.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
 PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
 }

 function getMintAddress(mint: MintName): PublicKey {
 const token = getTokenBySymbol(env, mint)
 if (!token) {
 throw new Error(`Token not found: ${mint}`)
 // Simple mapping for the fixed set of mint names
 const mintAddresses: Record<MintName, string> = {
 wAUDIO: env.WAUDIO_MINT_ADDRESS,
 USDC: env.USDC_MINT_ADDRESS
 }
 return new PublicKey(token.address)

 const address = mintAddresses[mint]
 if (!address) {
 throw new Error(`Token address not found for mint: ${mint}`)
 }
 return new PublicKey(address)
 }

 async function recordTrackListen({
Expand Down

2 changes: 1 addition & 1 deletion
packages/common/src/services/audius-backend/solana.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down

1 change: 0 additions & 1 deletion
packages/common/src/services/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'

76 changes: 0 additions & 76 deletions
packages/common/src/services/tokens/TokenRegistry.ts

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
packages/common/src/services/tokens/index.ts

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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

faridsalau
merged 3 commits into

from

Aug 1, 2025
 Merged


Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c0a2937

Update loading state & icon sizes


faridsalau Jul 30, 2025
7273dde

Merge branch 'fs-artist-coins' into fs-artist-coins-swap


faridsalau Jul 30, 2025
904f3b7

Remove TokenRegistry and being refactor


faridsalau Jul 31, 2025

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


1 change: 0 additions & 1 deletion
packages/common/src/api/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down

27 changes: 7 additions & 20 deletions
packages/common/src/api/tan-query/coins/tokenUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
 * Transform a CoinMetadata to TokenInfo for UI use
 */
const coinMetadataToTokenInfo = (
 coin: CoinMetadata,
 icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
 symbol: coin.ticker ?? '',
 name: coin.tokenInfo?.name ?? coin.ticker ?? '',
 decimals: coin.tokenInfo?.decimals ?? 8,
 balance: null, // This would come from user's wallet state
 address: coin.mint,
 icon,
 logoURI: coin.tokenInfo?.logoURI ?? '',
 isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
 artistCoin: Coin,
 icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
 const coinMetadata = coinFromSDK(artistCoin)
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
 artistCoins: Coin[],
 iconMap: Record<string, ComponentType<any>> = {}
 artistCoins: Coin[]
): Record<string, TokenInfo> => {
 const tokenMap: Record<string, TokenInfo> = {}

 artistCoins.forEach((coin) => {
 const coinMetadata = coinFromSDK(coin)
 const ticker = coinMetadata.ticker || ''
 const icon = iconMap[ticker]
 if (ticker) {
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
 }
 })

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
 artistCoins: Coin[],
 symbol: string,
 iconMap: Record<string, ComponentType<any>> = {}
 symbol: string
): TokenInfo | undefined => {
 const coin = artistCoins.find((c) => c.ticker === symbol)
 if (!coin) return undefined

 const coinMetadata = coinFromSDK(coin)
 const icon = iconMap[symbol]
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down

48 changes: 0 additions & 48 deletions
packages/common/src/api/tan-query/jupiter/constants.ts

View file


Open in desktop


This file was deleted.


7 changes: 6 additions & 1 deletion
packages/common/src/api/tan-query/jupiter/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
 IDLE = 'IDLE',
 GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
 }
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
 mintAddress: string
Expand Down

57 changes: 46 additions & 11 deletions
packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
 getJupiterQuoteByMint,
 jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
 ClaimableTokenMint,
 SwapErrorType,
 SwapStatus,
 SwapTokensParams,
 SwapTokensResult
 SwapTokensResult,
 UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
 tokens: Record<string, TokenInfo>,
 address: string
): TokenInfo | undefined => {
 return Object.values(tokens).find(
 (token) => token.address.toLowerCase() === address.toLowerCase()
 )
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
 if (token.symbol === 'USDC') return 'USDC'
 return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
 mintAddress: token.address,
 claimableTokenMint: getClaimableTokenMint(token),
 decimals: token.decimals
})

/**
 * Hook for executing token swaps using Jupiter.
 * Swaps any supported SPL token (or SOL) for another.
 */
export const useSwapTokens = () => {
 const queryClient = useQueryClient()
 const { solanaWalletService, reportToSentry, audiusSdk, env } =
 useQueryContext()
 const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
 const { data: user } = useCurrentAccountUser()
 const { tokens } = useTokens()

 return useMutation<SwapTokensResult, Error, SwapTokensParams>({
 mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
 })

 // ---------- 3. Prepare Transaction Instructions ----------
 const userBankManagedTokens = createUserBankManagedTokens(env)
 const inputTokenConfig =
 userBankManagedTokens[inputMintUiAddress.toUpperCase()]
 const outputTokenConfig =
 userBankManagedTokens[outputMintUiAddress.toUpperCase()]
 // Find input and output tokens from our backend-driven token data
 const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
 const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

 if (!inputToken || !outputToken) {
 return {
 status: SwapStatus.ERROR,
 error: {
 type: SwapErrorType.BUILD_FAILED,
 message: 'Token not found in available tokens'
 }
 }
 }

 // Create UserBankManagedTokenInfo objects
 const inputTokenConfig = createTokenConfig(inputToken)
 const outputTokenConfig = createTokenConfig(outputToken)

 // --- 3a. Handle Input Token (if user bank managed) ---
 errorStage = 'INPUT_TOKEN_PREPARATION'

 const sourceAtaForJupiter = await addUserBankToAtaInstructions({
 tokenInfo: inputTokenConfig!,
 tokenInfo: inputTokenConfig,
 userPublicKey,
 ethAddress: ethAddress!,
 amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
 const result =
 await sdk.services.claimableTokensClient.getOrCreateUserBank({
 ethWallet: ethAddress!,
 mint: outputTokenConfig!.claimableTokenMint
 mint: outputTokenConfig.claimableTokenMint
 })
 const outputUserBankAddress = result.userBank
 const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down

8 changes: 2 additions & 6 deletions
packages/common/src/hooks/useArtistCoinMessageHeader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
 let artistCoin
 if (!!coins && coins.length > 0) {
 artistCoin = coins[0]
 if (artistCoin.mint) {
 const tokenRegistry = getTokenRegistry()
 const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
 artistCoinSymbol = token?.symbol
 }
 // Get symbol directly from the coin data
 artistCoinSymbol = artistCoin.ticker
 }

 return artistCoinSymbol
Expand Down

15 changes: 10 additions & 5 deletions
packages/common/src/services/audius-backend/AudiusBackend.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
 PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
 }

 function getMintAddress(mint: MintName): PublicKey {
 const token = getTokenBySymbol(env, mint)
 if (!token) {
 throw new Error(`Token not found: ${mint}`)
 // Simple mapping for the fixed set of mint names
 const mintAddresses: Record<MintName, string> = {
 wAUDIO: env.WAUDIO_MINT_ADDRESS,
 USDC: env.USDC_MINT_ADDRESS
 }
 return new PublicKey(token.address)

 const address = mintAddresses[mint]
 if (!address) {
 throw new Error(`Token address not found for mint: ${mint}`)
 }
 return new PublicKey(address)
 }

 async function recordTrackListen({
Expand Down

2 changes: 1 addition & 1 deletion
packages/common/src/services/audius-backend/solana.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down

1 change: 0 additions & 1 deletion
packages/common/src/services/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'

76 changes: 0 additions & 76 deletions
packages/common/src/services/tokens/TokenRegistry.ts

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
packages/common/src/services/tokens/index.ts

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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

faridsalau
merged 3 commits into

from

Aug 1, 2025
 Merged


Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c0a2937

Update loading state & icon sizes


faridsalau Jul 30, 2025
7273dde

Merge branch 'fs-artist-coins' into fs-artist-coins-swap


faridsalau Jul 30, 2025
904f3b7

Remove TokenRegistry and being refactor


faridsalau Jul 31, 2025

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


1 change: 0 additions & 1 deletion
packages/common/src/api/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down

27 changes: 7 additions & 20 deletions
packages/common/src/api/tan-query/coins/tokenUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
 * Transform a CoinMetadata to TokenInfo for UI use
 */
const coinMetadataToTokenInfo = (
 coin: CoinMetadata,
 icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
 symbol: coin.ticker ?? '',
 name: coin.tokenInfo?.name ?? coin.ticker ?? '',
 decimals: coin.tokenInfo?.decimals ?? 8,
 balance: null, // This would come from user's wallet state
 address: coin.mint,
 icon,
 logoURI: coin.tokenInfo?.logoURI ?? '',
 isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
 artistCoin: Coin,
 icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
 const coinMetadata = coinFromSDK(artistCoin)
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
 artistCoins: Coin[],
 iconMap: Record<string, ComponentType<any>> = {}
 artistCoins: Coin[]
): Record<string, TokenInfo> => {
 const tokenMap: Record<string, TokenInfo> = {}

 artistCoins.forEach((coin) => {
 const coinMetadata = coinFromSDK(coin)
 const ticker = coinMetadata.ticker || ''
 const icon = iconMap[ticker]
 if (ticker) {
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
 }
 })

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
 artistCoins: Coin[],
 symbol: string,
 iconMap: Record<string, ComponentType<any>> = {}
 symbol: string
): TokenInfo | undefined => {
 const coin = artistCoins.find((c) => c.ticker === symbol)
 if (!coin) return undefined

 const coinMetadata = coinFromSDK(coin)
 const icon = iconMap[symbol]
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down

48 changes: 0 additions & 48 deletions
packages/common/src/api/tan-query/jupiter/constants.ts

View file


Open in desktop


This file was deleted.


7 changes: 6 additions & 1 deletion
packages/common/src/api/tan-query/jupiter/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
 IDLE = 'IDLE',
 GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
 }
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
 mintAddress: string
Expand Down

57 changes: 46 additions & 11 deletions
packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
 getJupiterQuoteByMint,
 jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
 ClaimableTokenMint,
 SwapErrorType,
 SwapStatus,
 SwapTokensParams,
 SwapTokensResult
 SwapTokensResult,
 UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
 tokens: Record<string, TokenInfo>,
 address: string
): TokenInfo | undefined => {
 return Object.values(tokens).find(
 (token) => token.address.toLowerCase() === address.toLowerCase()
 )
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
 if (token.symbol === 'USDC') return 'USDC'
 return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
 mintAddress: token.address,
 claimableTokenMint: getClaimableTokenMint(token),
 decimals: token.decimals
})

/**
 * Hook for executing token swaps using Jupiter.
 * Swaps any supported SPL token (or SOL) for another.
 */
export const useSwapTokens = () => {
 const queryClient = useQueryClient()
 const { solanaWalletService, reportToSentry, audiusSdk, env } =
 useQueryContext()
 const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
 const { data: user } = useCurrentAccountUser()
 const { tokens } = useTokens()

 return useMutation<SwapTokensResult, Error, SwapTokensParams>({
 mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
 })

 // ---------- 3. Prepare Transaction Instructions ----------
 const userBankManagedTokens = createUserBankManagedTokens(env)
 const inputTokenConfig =
 userBankManagedTokens[inputMintUiAddress.toUpperCase()]
 const outputTokenConfig =
 userBankManagedTokens[outputMintUiAddress.toUpperCase()]
 // Find input and output tokens from our backend-driven token data
 const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
 const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

 if (!inputToken || !outputToken) {
 return {
 status: SwapStatus.ERROR,
 error: {
 type: SwapErrorType.BUILD_FAILED,
 message: 'Token not found in available tokens'
 }
 }
 }

 // Create UserBankManagedTokenInfo objects
 const inputTokenConfig = createTokenConfig(inputToken)
 const outputTokenConfig = createTokenConfig(outputToken)

 // --- 3a. Handle Input Token (if user bank managed) ---
 errorStage = 'INPUT_TOKEN_PREPARATION'

 const sourceAtaForJupiter = await addUserBankToAtaInstructions({
 tokenInfo: inputTokenConfig!,
 tokenInfo: inputTokenConfig,
 userPublicKey,
 ethAddress: ethAddress!,
 amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
 const result =
 await sdk.services.claimableTokensClient.getOrCreateUserBank({
 ethWallet: ethAddress!,
 mint: outputTokenConfig!.claimableTokenMint
 mint: outputTokenConfig.claimableTokenMint
 })
 const outputUserBankAddress = result.userBank
 const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down

8 changes: 2 additions & 6 deletions
packages/common/src/hooks/useArtistCoinMessageHeader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
 let artistCoin
 if (!!coins && coins.length > 0) {
 artistCoin = coins[0]
 if (artistCoin.mint) {
 const tokenRegistry = getTokenRegistry()
 const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
 artistCoinSymbol = token?.symbol
 }
 // Get symbol directly from the coin data
 artistCoinSymbol = artistCoin.ticker
 }

 return artistCoinSymbol
Expand Down

15 changes: 10 additions & 5 deletions
packages/common/src/services/audius-backend/AudiusBackend.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
 PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
 }

 function getMintAddress(mint: MintName): PublicKey {
 const token = getTokenBySymbol(env, mint)
 if (!token) {
 throw new Error(`Token not found: ${mint}`)
 // Simple mapping for the fixed set of mint names
 const mintAddresses: Record<MintName, string> = {
 wAUDIO: env.WAUDIO_MINT_ADDRESS,
 USDC: env.USDC_MINT_ADDRESS
 }
 return new PublicKey(token.address)

 const address = mintAddresses[mint]
 if (!address) {
 throw new Error(`Token address not found for mint: ${mint}`)
 }
 return new PublicKey(address)
 }

 async function recordTrackListen({
Expand Down

2 changes: 1 addition & 1 deletion
packages/common/src/services/audius-backend/solana.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down

1 change: 0 additions & 1 deletion
packages/common/src/services/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'

76 changes: 0 additions & 76 deletions
packages/common/src/services/tokens/TokenRegistry.ts

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
packages/common/src/services/tokens/index.ts

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620

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

faridsalau
merged 3 commits into

from

Aug 1, 2025
 Merged


Update buy/sell flow to use API driven approach and get rid of TokenRegistry#12620
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c0a2937

Update loading state & icon sizes


faridsalau Jul 30, 2025
7273dde

Merge branch 'fs-artist-coins' into fs-artist-coins-swap


faridsalau Jul 30, 2025
904f3b7

Remove TokenRegistry and being refactor


faridsalau Jul 31, 2025

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


1 change: 0 additions & 1 deletion
packages/common/src/api/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,6 @@ export * from './tan-query/wallets/useTokenBalance'
export * from './tan-query/jupiter/useSwapTokens'
export * from './tan-query/jupiter/useTokenExchangeRate'
export * from './tan-query/jupiter/utils'
export * from './tan-query/jupiter/constants'

// Saga fetch utils, remove when migration is complete
export * from './tan-query/saga-utils'
Expand Down

27 changes: 7 additions & 20 deletions
packages/common/src/api/tan-query/coins/tokenUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
import type { ComponentType } from 'react'

import type { Coin } from '@audius/sdk'

import { coinFromSDK, type CoinMetadata } from '~/adapters'
Expand All@@ -8,40 +6,31 @@ import { TokenInfo } from '~/store/ui/buy-sell/types'
/**
 * Transform a CoinMetadata to TokenInfo for UI use
 */
const coinMetadataToTokenInfo = (
 coin: CoinMetadata,
 icon?: ComponentType<any>
): TokenInfo => ({
const coinMetadataToTokenInfo = (coin: CoinMetadata): TokenInfo => ({
 symbol: coin.ticker ?? '',
 name: coin.tokenInfo?.name ?? coin.ticker ?? '',
 decimals: coin.tokenInfo?.decimals ?? 8,
 balance: null, // This would come from user's wallet state
 address: coin.mint,
 icon,
 logoURI: coin.tokenInfo?.logoURI ?? '',
 isStablecoin: false // API tokens are never stablecoins, only USDC is (which is frontend-only)
})

export const transformArtistCoinToTokenInfo = (
 artistCoin: Coin,
 icon?: ComponentType<any>
): TokenInfo => {
export const transformArtistCoinToTokenInfo = (artistCoin: Coin): TokenInfo => {
 const coinMetadata = coinFromSDK(artistCoin)
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const transformArtistCoinsToTokenInfoMap = (
 artistCoins: Coin[],
 iconMap: Record<string, ComponentType<any>> = {}
 artistCoins: Coin[]
): Record<string, TokenInfo> => {
 const tokenMap: Record<string, TokenInfo> = {}

 artistCoins.forEach((coin) => {
 const coinMetadata = coinFromSDK(coin)
 const ticker = coinMetadata.ticker || ''
 const icon = iconMap[ticker]
 if (ticker) {
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata, icon)
 tokenMap[ticker] = coinMetadataToTokenInfo(coinMetadata)
 }
 })

Expand All@@ -50,15 +39,13 @@ export const transformArtistCoinsToTokenInfoMap = (

export const getTokenInfoBySymbol = (
 artistCoins: Coin[],
 symbol: string,
 iconMap: Record<string, ComponentType<any>> = {}
 symbol: string
): TokenInfo | undefined => {
 const coin = artistCoins.find((c) => c.ticker === symbol)
 if (!coin) return undefined

 const coinMetadata = coinFromSDK(coin)
 const icon = iconMap[symbol]
 return coinMetadataToTokenInfo(coinMetadata, icon)
 return coinMetadataToTokenInfo(coinMetadata)
}

export const getAllTokenSymbols = (artistCoins: Coin[]): string[] => {
Expand Down

48 changes: 0 additions & 48 deletions
packages/common/src/api/tan-query/jupiter/constants.ts

View file


Open in desktop


This file was deleted.


7 changes: 6 additions & 1 deletion
packages/common/src/api/tan-query/jupiter/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
import { PublicKey } from '@solana/web3.js'

// SDK TokenName enum values that are accepted by the SDK
type TokenName = 'wAUDIO' | 'USDC'

export enum SwapStatus {
 IDLE = 'IDLE',
 GETTING_QUOTE = 'GETTING_QUOTE',
Expand DownExpand Up@@ -41,7 +46,7 @@ export type SwapTokensResult = {
 }
}

export type ClaimableTokenMint = 'wAUDIO' | 'USDC' | 'BONK'
export type ClaimableTokenMint = TokenName | PublicKey

export interface UserBankManagedTokenInfo {
 mintAddress: string
Expand Down

57 changes: 46 additions & 11 deletions
packages/common/src/api/tan-query/jupiter/useSwapTokens.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,28 +13,51 @@ import {
 getJupiterQuoteByMint,
 jupiterInstance
} from '~/services/Jupiter'
import { useTokens } from '~/store/ui/buy-sell'
import { TokenInfo } from '~/store/ui/buy-sell/types'

import { QUERY_KEYS } from '../queryKeys'

import { createUserBankManagedTokens } from './constants'
import { updateAudioBalanceOptimistically } from './optimisticUpdates'
import {
 ClaimableTokenMint,
 SwapErrorType,
 SwapStatus,
 SwapTokensParams,
 SwapTokensResult
 SwapTokensResult,
 UserBankManagedTokenInfo
} from './types'
import { addUserBankToAtaInstructions, getSwapErrorResponse } from './utils'

const findTokenByAddress = (
 tokens: Record<string, TokenInfo>,
 address: string
): TokenInfo | undefined => {
 return Object.values(tokens).find(
 (token) => token.address.toLowerCase() === address.toLowerCase()
 )
}

const getClaimableTokenMint = (token: TokenInfo): ClaimableTokenMint => {
 if (token.symbol === 'USDC') return 'USDC'
 return new PublicKey(token.address)
}

const createTokenConfig = (token: TokenInfo): UserBankManagedTokenInfo => ({
 mintAddress: token.address,
 claimableTokenMint: getClaimableTokenMint(token),
 decimals: token.decimals
})

/**
 * Hook for executing token swaps using Jupiter.
 * Swaps any supported SPL token (or SOL) for another.
 */
export const useSwapTokens = () => {
 const queryClient = useQueryClient()
 const { solanaWalletService, reportToSentry, audiusSdk, env } =
 useQueryContext()
 const { solanaWalletService, reportToSentry, audiusSdk } = useQueryContext()
 const { data: user } = useCurrentAccountUser()
 const { tokens } = useTokens()

 return useMutation<SwapTokensResult, Error, SwapTokensParams>({
 mutationFn: async (params): Promise<SwapTokensResult> => {
Expand DownExpand Up@@ -84,17 +107,29 @@ export const useSwapTokens = () => {
 })

 // ---------- 3. Prepare Transaction Instructions ----------
 const userBankManagedTokens = createUserBankManagedTokens(env)
 const inputTokenConfig =
 userBankManagedTokens[inputMintUiAddress.toUpperCase()]
 const outputTokenConfig =
 userBankManagedTokens[outputMintUiAddress.toUpperCase()]
 // Find input and output tokens from our backend-driven token data
 const inputToken = findTokenByAddress(tokens, inputMintUiAddress)
 const outputToken = findTokenByAddress(tokens, outputMintUiAddress)

 if (!inputToken || !outputToken) {
 return {
 status: SwapStatus.ERROR,
 error: {
 type: SwapErrorType.BUILD_FAILED,
 message: 'Token not found in available tokens'
 }
 }
 }

 // Create UserBankManagedTokenInfo objects
 const inputTokenConfig = createTokenConfig(inputToken)
 const outputTokenConfig = createTokenConfig(outputToken)

 // --- 3a. Handle Input Token (if user bank managed) ---
 errorStage = 'INPUT_TOKEN_PREPARATION'

 const sourceAtaForJupiter = await addUserBankToAtaInstructions({
 tokenInfo: inputTokenConfig!,
 tokenInfo: inputTokenConfig,
 userPublicKey,
 ethAddress: ethAddress!,
 amountLamports: BigInt(quoteResult.inputAmount.amount),
Expand All@@ -109,7 +144,7 @@ export const useSwapTokens = () => {
 const result =
 await sdk.services.claimableTokensClient.getOrCreateUserBank({
 ethWallet: ethAddress!,
 mint: outputTokenConfig!.claimableTokenMint
 mint: outputTokenConfig.claimableTokenMint
 })
 const outputUserBankAddress = result.userBank
 const preferredJupiterDestination = outputUserBankAddress.toBase58()
Expand Down

8 changes: 2 additions & 6 deletions
packages/common/src/hooks/useArtistCoinMessageHeader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import { ChatBlastAudience } from '@audius/sdk'

import { useArtistCoins } from '~/api/tan-query/coins/useArtistCoins'
import { ID } from '~/models'
import { getTokenRegistry } from '~/services/tokens/TokenRegistry'

import { FeatureFlags } from '../services'

Expand DownExpand Up@@ -33,11 +32,8 @@ export const useArtistCoinMessageHeader = ({
 let artistCoin
 if (!!coins && coins.length > 0) {
 artistCoin = coins[0]
 if (artistCoin.mint) {
 const tokenRegistry = getTokenRegistry()
 const token = tokenRegistry.getTokenByAddress(artistCoin.mint)
 artistCoinSymbol = token?.symbol
 }
 // Get symbol directly from the coin data
 artistCoinSymbol = artistCoin.ticker
 }

 return artistCoinSymbol
Expand Down

15 changes: 10 additions & 5 deletions
packages/common/src/services/audius-backend/AudiusBackend.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,6 @@ import {
 PushNotifications
} from '../../store'
import { getErrorMessage, uuid, Maybe, Nullable } from '../../utils'
import { getTokenBySymbol } from '../tokens'

import { MintName } from './solana'
import { MonitoringCallbacks } from './types'
Expand DownExpand Up@@ -166,11 +165,17 @@ export const audiusBackend = ({
 }

 function getMintAddress(mint: MintName): PublicKey {
 const token = getTokenBySymbol(env, mint)
 if (!token) {
 throw new Error(`Token not found: ${mint}`)
 // Simple mapping for the fixed set of mint names
 const mintAddresses: Record<MintName, string> = {
 wAUDIO: env.WAUDIO_MINT_ADDRESS,
 USDC: env.USDC_MINT_ADDRESS
 }
 return new PublicKey(token.address)

 const address = mintAddresses[mint]
 if (!address) {
 throw new Error(`Token address not found for mint: ${mint}`)
 }
 return new PublicKey(address)
 }

 async function recordTrackListen({
Expand Down

2 changes: 1 addition & 1 deletion
packages/common/src/services/audius-backend/solana.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export const MEMO_PROGRAM_ID = new PublicKey(
 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
)

export type MintName = 'wAUDIO' | 'USDC' | 'BONK'
export type MintName = 'wAUDIO' | 'USDC'
export const DEFAULT_MINT: MintName = 'wAUDIO'

type UserBankConfig = {
Expand Down

1 change: 0 additions & 1 deletion
packages/common/src/services/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,3 @@ export * from './oauth'
export * from './location'
export * from './sdk'
export * from './solana'
export * from './tokens'

76 changes: 0 additions & 76 deletions
packages/common/src/services/tokens/TokenRegistry.ts

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
packages/common/src/services/tokens/index.ts

View file


Open in desktop


This file was deleted.

Loading