Skip to content

[QA-1504] Fix payout wallet set default #9467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raymondjacobson merged 3 commits into from
Aug 16, 2024
Merged

[QA-1504] Fix payout wallet set default #9467

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ead51b2
[QA-1504] Fix payout wallet set default
raymondjacobson Aug 15, 2024
1866b4f
Merge remote-tracking branch 'origin/main' into rj-qa-1504
raymondjacobson Aug 15, 2024
a887630
Fix types
raymondjacobson Aug 16, 2024
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
172 changes: 88 additions & 84 deletions packages/web/src/components/payout-wallet-modal/PayoutWalletModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,102 +189,106 @@ export const PayoutWalletModal = () => {
setIsSubmitting(true)
const sdk = await audiusSdk()
try {
if (!address || !user) {
throw new Error('No user or address')
if (!user) {
throw new Error('No user found')
}

const usdcMint = new PublicKey(env.USDC_MINT_ADDRESS)
const addressPubkey = new PublicKey(address)
const connection = sdk.services.solanaClient.connection
const info = await connection.getAccountInfo(addressPubkey)
const updatedUser = { ...user }

let usdcAta: string | null = null
if (option === 'default') {
updatedUser.spl_usdc_payout_wallet = null
} else {
if (!address) {
throw new Error('No address set')
}

const isRootWallet =
(!info || info?.owner.equals(SystemProgram.programId)) &&
PublicKey.isOnCurve(addressPubkey)
const usdcMint = new PublicKey(env.USDC_MINT_ADDRESS)
const addressPubkey = new PublicKey(address)
const connection = sdk.services.solanaClient.connection
const info = await connection.getAccountInfo(addressPubkey)

if (!isRootWallet) {
// If not a root wallet, maybe it's a USDC account
try {
const unpacked = unpackAccount(
addressPubkey,
info,
TOKEN_PROGRAM_ID
)
if (unpacked.mint.equals(usdcMint)) {
usdcAta = address
}
} catch (e) {
console.debug(`Account ${address} is not a token account`, e)
// fall through
}
} else {
// It's a root wallet - check for USDC mint ATA
const ataPubkey = getAssociatedTokenAddressSync(
usdcMint,
addressPubkey
)
try {
const account = await getAccount(connection, ataPubkey)
if (account.mint.equals(usdcMint)) {
usdcAta = ataPubkey.toBase58()
let usdcAta: string | null = null

const isRootWallet =
(!info || info?.owner.equals(SystemProgram.programId)) &&
PublicKey.isOnCurve(addressPubkey)

if (!isRootWallet) {
// If not a root wallet, maybe it's a USDC account
try {
const unpacked = unpackAccount(
addressPubkey,
info,
TOKEN_PROGRAM_ID
)
if (unpacked.mint.equals(usdcMint)) {
usdcAta = address
}
} catch (e) {
console.debug(`Account ${address} is not a token account`, e)
// fall through
}
} catch (e) {
// No USDC mint ATA. Make one if possible.
if (e instanceof TokenAccountNotFoundError) {
const payer = await sdk.services.solanaRelay.getFeePayer()
const res = await connection.getLatestBlockhash()
const transaction =
await sdk.services.solanaClient.buildTransaction({
recentBlockhash: res.blockhash,
instructions: [
createAssociatedTokenAccountIdempotentInstruction(
payer,
ataPubkey,
addressPubkey,
usdcMint
)
]
})
} else {
// It's a root wallet - check for USDC mint ATA
const ataPubkey = getAssociatedTokenAddressSync(
usdcMint,
addressPubkey
)
try {
const account = await getAccount(connection, ataPubkey)
if (account.mint.equals(usdcMint)) {
usdcAta = ataPubkey.toBase58()
}
} catch (e) {
// No USDC mint ATA. Make one if possible.
if (e instanceof TokenAccountNotFoundError) {
const payer = await sdk.services.solanaRelay.getFeePayer()
const res = await connection.getLatestBlockhash()
const transaction =
await sdk.services.solanaClient.buildTransaction({
recentBlockhash: res.blockhash,
instructions: [
createAssociatedTokenAccountIdempotentInstruction(
payer,
ataPubkey,
addressPubkey,
usdcMint
)
]
})

const { signature } = await sdk.services.solanaRelay.relay({
transaction
})
usdcAta = ataPubkey.toBase58()
await connection.confirmTransaction({
signature,
blockhash: res.blockhash,
lastValidBlockHeight: res.lastValidBlockHeight
})
let owner = null
let retryCount = 0
// Obscene max retry count is intentional
while (owner === null && retryCount < 10000) {
try {
owner = await getAssociatedTokenAccountOwner(
usdcAta as SolanaWalletAddress
)
} catch (e) {
console.debug(
'Retry getAssociatedTokenAccountOwner...',
retryCount++
)
await new Promise((resolve) => setTimeout(resolve, 500))
const { signature } = await sdk.services.solanaRelay.relay({
transaction
})
usdcAta = ataPubkey.toBase58()
await connection.confirmTransaction({
signature,
blockhash: res.blockhash,
lastValidBlockHeight: res.lastValidBlockHeight
})
let owner = null
let retryCount = 0
// Obscene max retry count is intentional
while (owner === null && retryCount < 10000) {
try {
owner = await getAssociatedTokenAccountOwner(
usdcAta as SolanaWalletAddress
)
} catch (e) {
console.debug(
'Retry getAssociatedTokenAccountOwner...',
retryCount++
)
await new Promise((resolve) => setTimeout(resolve, 500))
}
}
}
}
}
}

if (!usdcAta) {
throw new Error('Cannot create USDC token account')
}

const updatedUser = { ...user }
if (option === 'default') {
updatedUser.spl_usdc_payout_wallet = null
} else {
if (!usdcAta) {
throw new Error('Cannot create USDC token account')
}
updatedUser.spl_usdc_payout_wallet = usdcAta as SolanaWalletAddress
}
dispatch(profilePageActions.updateProfile(updatedUser))
Expand Down