Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
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" + '
feat: Add BONK token support to backend and SDK by faridsalau · Pull Request #12489 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
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('^' + ".*" + ' feat: Add BONK token support to backend and SDK by faridsalau · Pull Request #12489 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
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('^' + ".*" + ' feat: Add BONK token support to backend and SDK by faridsalau · Pull Request #12489 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
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" + ' feat: Add BONK token support to backend and SDK by faridsalau · Pull Request #12489 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
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('^' + ".*" + ' feat: Add BONK token support to backend and SDK by faridsalau · Pull Request #12489 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
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('^' + ".*" + ' feat: Add BONK token support to backend and SDK by faridsalau · Pull Request #12489 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
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); } })(); })(); feat: Add BONK token support to backend and SDK by faridsalau · Pull Request #12489 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import dotenv from 'dotenv'
import { cleanEnv, str, num, json } from 'envalid'

import { logger } from './logger'
import { backendTokenConfigs, BackendTokenConfig } from './config/tokenConfig'

export const LISTENS_RATE_LIMIT_IP_PREFIX = 'listens-rate-limit-ip'
export const LISTENS_RATE_LIMIT_TRACK_PREFIX = 'listens-rate-limit-track'
Expand DownExpand Up@@ -45,6 +46,7 @@ type Config = {
usdcMintAddress: string
waudioMintAddress: string
bonkMintAddress: string
tokens: Record<string, BackendTokenConfig & { address: string }>
solanaFeePayerWallets: Keypair[]
delegatePrivateKey: Buffer
ipdataApiKey: string | null
Expand DownExpand Up@@ -161,6 +163,16 @@ const readConfig = (): Config => {
? Buffer.from(env.audius_delegate_private_key, 'hex')
: Buffer.from([])

// Build token configurations from environment variables
const tokens: Record<string, BackendTokenConfig & { address: string }> = {}
backendTokenConfigs.forEach(tokenConfig => {
const envValue = (env as any)[tokenConfig.envKey]
tokens[tokenConfig.symbol] = {
...tokenConfig,
address: envValue
}
})

cachedConfig = {
environment: env.audius_discprov_env,
endpoint: env.audius_discprov_url,
Expand All@@ -178,6 +190,7 @@ const readConfig = (): Config => {
usdcMintAddress: env.audius_solana_usdc_mint,
waudioMintAddress: env.audius_solana_waudio_mint,
bonkMintAddress: env.audius_solana_bonk_mint,
tokens,
solanaFeePayerWallets,
delegatePrivateKey,
ipdataApiKey:
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
/**
* Token configuration for the Solana relay backend
*/

export interface BackendTokenConfig {
symbol: string
name: string
envKey: string
hasUserbank: boolean
jupiterEnabled: boolean
defaultDevAddress: string
defaultStagingAddress: string
defaultProdAddress: string
}

/**
* Backend token configurations
*/
export const backendTokenConfigs: BackendTokenConfig[] = [
{
symbol: 'USDC',
name: 'USD Coin',
envKey: 'audius_solana_usdc_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '26Q7gP8UfkDzi7GMFEQxTJaNJ8D2ybCUjex58M5MLu8y',
defaultStagingAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
defaultProdAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
},
{
symbol: 'wAUDIO',
name: 'Wrapped Audius',
envKey: 'audius_solana_waudio_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: '37RCjhgV1qGV2Q54EHFScdxZ22ydRMdKMtVgod47fDP3',
defaultStagingAddress: 'BELGiMZQ34SDE6x2FUaML2UHDAgBLS64xvhXjX5tBBZo',
defaultProdAddress: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM'
},
{
symbol: 'BONK',
name: 'Bonk',
envKey: 'audius_solana_bonk_mint',
hasUserbank: true,
jupiterEnabled: true,
defaultDevAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultStagingAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
defaultProdAddress: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263'
}
]

/**
* Get token configuration by symbol
*/
export const getTokenConfigBySymbol = (symbol: string): BackendTokenConfig | undefined => {
return backendTokenConfigs.find(config => config.symbol === symbol)
}

/**
* Get all userbank-enabled tokens
*/
export const getUserbankTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.hasUserbank)
}

/**
* Get all Jupiter-enabled tokens
*/
export const getJupiterTokenConfigs = (): BackendTokenConfig[] => {
return backendTokenConfigs.filter(config => config.jupiterEnabled)
}

/**
* Get all supported token symbols
*/
export const getSupportedTokenSymbols = (): string[] => {
return backendTokenConfigs.map(config => config.symbol)
}

/**
* Get environment variable keys for all tokens
*/
export const getTokenEnvKeys = (): string[] => {
return backendTokenConfigs.map(config => config.envKey)
}
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
import {
decodeAssociatedTokenAccountInstruction,
ClaimableTokensProgram,
RewardManagerProgram,
Secp256k1Program,
decodeAssociatedTokenAccountInstruction,
isCreateAssociatedTokenAccountIdempotentInstruction,
isCreateAssociatedTokenAccountInstruction,
Secp256k1Program
isCreateAssociatedTokenAccountInstruction
} from '@audius/spl'
import { Users } from '@pedalboard/storage'
import {
NATIVE_MINT,
ASSOCIATED_TOKEN_PROGRAM_ID,
NATIVE_MINT,
TOKEN_PROGRAM_ID,
decodeInstruction,
getAssociatedTokenAddressSync,
isCloseAccountInstruction,
isTransferCheckedInstruction,
isSyncNativeInstruction,
getAssociatedTokenAddressSync
isTransferCheckedInstruction
} from '@solana/spl-token'
import {
ComputeBudgetProgram,
PublicKey,
TransactionInstruction,
SystemProgram,
SystemInstruction,
ComputeBudgetProgram
SystemProgram,
TransactionInstruction
} from '@solana/web3.js'
import bs58 from 'bs58'

import { config } from '../../config'
import { rateLimitTokenAccountCreation } from '../../redis'

import { InvalidRelayInstructionError } from './InvalidRelayInstructionError'
import {
deriveUserBank,
getClaimableTokenAuthorities,
getJupiterAllowedMints,
getSupportedTokenAddresses
} from './tokenUtils'

const MEMO_PROGRAM_ID = 'Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo'
const MEMO_V2_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr'
Expand All@@ -41,48 +46,22 @@ const JUPITER_AGGREGATOR_V6_PROGRAM_ID =
'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4'
const COINFLOW_PROGRAM_ID = 'FD1amxhTsDpwzoVX41dxp2ygAESURV2zdUACzxM1Dfw9'

const waudioMintAddress = config.waudioMintAddress
const usdcMintAddress = config.usdcMintAddress
const bonkMintAddress = config.bonkMintAddress

const REWARD_MANAGER = config.rewardsManagerAccountAddress

const deriveTokenAuthority = (mint: string) =>
PublicKey.findProgramAddressSync(
[new PublicKey(mint).toBytes().slice(0, 32)],
new PublicKey(CLAIMABLE_TOKEN_PROGRAM_ID)
)[0]

const claimableTokenAuthorities = {
usdc: deriveTokenAuthority(usdcMintAddress),
waudio: deriveTokenAuthority(waudioMintAddress),
bonk: deriveTokenAuthority(bonkMintAddress)
}

const deriveUserBank = async (
ethAddress: string,
claimableTokenAuthority: PublicKey
) => {
const ethAddressArray = Uint8Array.from(
Buffer.from(ethAddress.substring(2), 'hex')
)
return await PublicKey.createWithSeed(
claimableTokenAuthority,
bs58.encode(ethAddressArray),
TOKEN_PROGRAM_ID
)
}

const PAYMENT_ROUTER_WALLET = PublicKey.findProgramAddressSync(
[Buffer.from('payment_router')],
new PublicKey(PAYMENT_ROUTER_PROGRAM_ID)
)[0]

const PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT = getAssociatedTokenAddressSync(
new PublicKey(usdcMintAddress),
PAYMENT_ROUTER_WALLET,
true
)
// Get payment router token account for USDC
const getPaymentRouterUsdcTokenAccount = () => {
const tokens = config.tokens
return getAssociatedTokenAddressSync(
new PublicKey(tokens.usdc.address),
PAYMENT_ROUTER_WALLET,
true
)
}

/**
* Only allow the createTokenAccount instruction of the Associated Token
Expand All@@ -104,9 +83,7 @@ const assertAllowedAssociatedTokenAccountProgramInstruction = async (
) {
const allowedMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
...getSupportedTokenAddresses()
]
const mintAddress = decodedInstruction.keys.mint.pubkey.toBase58()
if (!allowedMints.includes(mintAddress)) {
Expand DownExpand Up@@ -195,21 +172,23 @@ const assertAllowedTokenProgramInstruction = async (
)
}
const destination = decodedInstruction.keys.destination.pubkey
const usdcUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.usdc
)
const bonkUserbank = await deriveUserBank(
wallet,
claimableTokenAuthorities.bonk
const claimableTokenAuthorities = getClaimableTokenAuthorities()

// Get all userbank addresses for this wallet
const userbankAddresses = await Promise.all(
Object.values(claimableTokenAuthorities).map((authority) =>
deriveUserBank(wallet, authority)
)
)

const paymentRouterUsdcAccount = getPaymentRouterUsdcTokenAccount()

// Check that destination is either a userbank or a payment router token account
if (
!destination.equals(usdcUserbank) &&
!destination.equals(bonkUserbank) &&
!destination.equals(PAYMENT_ROUTER_USDC_TOKEN_ACCOUNT)
) {
const isValidDestination =
userbankAddresses.some((userbank) => destination.equals(userbank)) ||

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice refactor

destination.equals(paymentRouterUsdcAccount)

if (!isValidDestination) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination account: ${destination.toBase58()}`
Expand DownExpand Up@@ -256,11 +235,13 @@ const assertAllowedClaimableTokenProgramInstruction = async (
const decodedInstruction =
ClaimableTokensProgram.decodeInstruction(instruction)
const authority = decodedInstruction.keys.authority.pubkey
if (
!authority.equals(claimableTokenAuthorities.usdc) &&
!authority.equals(claimableTokenAuthorities.waudio) &&
!authority.equals(claimableTokenAuthorities.bonk)
) {
const claimableTokenAuthorities = getClaimableTokenAuthorities()

const isValidAuthority = Object.values(claimableTokenAuthorities).some(
(validAuthority) => authority.equals(validAuthority)
)

if (!isValidAuthority) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid Claimable Token Authority: ${authority}`
Expand All@@ -285,19 +266,6 @@ const JupiterSharedSwapAccountIndex = {
PLATFORM_FEE_ACCOUNT: 9,
TOKEN_2022_PROGRAM: 10
}
// Only allow swaps from USDC (for withdrawals) or SOL (for userbank purchases)
const allowedSourceMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
const allowedDestinationMints = [
NATIVE_MINT.toBase58(),
usdcMintAddress,
waudioMintAddress,
bonkMintAddress
]
// Only allow swaps to SOL (for withdrawals) or USDC, AUDIO, or BONK (for userbank purchases)
const assertAllowedJupiterProgramInstruction = async (
instructionIndex: number,
Expand All@@ -323,14 +291,16 @@ const assertAllowedJupiterProgramInstruction = async (
JupiterSharedSwapAccountIndex.USER_TRANSFER_AUTHORITY
].pubkey.toBase58()

if (!allowedSourceMints.includes(sourceMint)) {
const allowedMints = [NATIVE_MINT.toBase58(), ...getJupiterAllowedMints()]

if (!allowedMints.includes(sourceMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid source mint: ${sourceMint}`
)
}

if (!allowedDestinationMints.includes(destinationMint)) {
if (!allowedMints.includes(destinationMint)) {
throw new InvalidRelayInstructionError(
instructionIndex,
`Invalid destination mint: ${destinationMint}`
Expand Down
Loading