From b0e83fb8d8ce007c086841b6466848a67e83545c Mon Sep 17 00:00:00 2001 From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:20:54 -0800 Subject: [PATCH] Fix usages of getTokenAccountInfo to conform to new types --- packages/common/src/services/audius-backend/solana.ts | 3 --- packages/common/src/store/buy-crypto/sagas.ts | 4 +--- packages/common/src/store/buy-usdc/sagas.ts | 5 +---- packages/common/src/store/buy-usdc/utils.ts | 3 +-- packages/common/src/store/purchase-content/sagas.ts | 2 -- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/packages/common/src/services/audius-backend/solana.ts b/packages/common/src/services/audius-backend/solana.ts index 586c8f677f9..296bbbb0c09 100644 --- a/packages/common/src/services/audius-backend/solana.ts +++ b/packages/common/src/services/audius-backend/solana.ts @@ -201,7 +201,6 @@ export const getUserbankAccountInfo = async ( return getTokenAccountInfo(audiusBackendInstance, { tokenAccount, - mint, commitment }) } @@ -295,7 +294,6 @@ export const pollForTokenBalanceChange = async ( const debugTokenName = mint.toUpperCase() let retries = 0 let tokenAccountInfo = await getTokenAccountInfo(audiusBackendInstance, { - mint, tokenAccount }) while ( @@ -317,7 +315,6 @@ export const pollForTokenBalanceChange = async ( } await delay(retryDelayMs) tokenAccountInfo = await getTokenAccountInfo(audiusBackendInstance, { - mint, tokenAccount }) } diff --git a/packages/common/src/store/buy-crypto/sagas.ts b/packages/common/src/store/buy-crypto/sagas.ts index 75fe3c2374b..5735bddcc9f 100644 --- a/packages/common/src/store/buy-crypto/sagas.ts +++ b/packages/common/src/store/buy-crypto/sagas.ts @@ -507,7 +507,6 @@ function* doBuyCryptoViaSol({ // Save pre swap token balance const account = yield* call(getTokenAccountInfo, audiusBackendInstance, { - mint, tokenAccount: userbank }) const preSwapTokenBalance = account?.amount ?? BigInt(0) @@ -778,8 +777,7 @@ function* recoverBuyCryptoViaSolIfNecessary() { // Get pre swap token balance const account = yield* call(getTokenAccountInfo, audiusBackendInstance, { - tokenAccount: userbank, - mint + tokenAccount: userbank }) // Get a quote for swapping the entire balance diff --git a/packages/common/src/store/buy-usdc/sagas.ts b/packages/common/src/store/buy-usdc/sagas.ts index 0caa7be8ef1..5e45ed96aee 100644 --- a/packages/common/src/store/buy-usdc/sagas.ts +++ b/packages/common/src/store/buy-usdc/sagas.ts @@ -85,7 +85,6 @@ function* purchaseStep({ getTokenAccountInfo, audiusBackendInstance, { - mint: 'usdc', tokenAccount } ) @@ -429,7 +428,6 @@ function* recoverPurchaseIfNecessary() { getTokenAccountInfo, audiusBackendInstance, { - mint: 'usdc', tokenAccount: usdcTokenAccount } ) @@ -440,8 +438,7 @@ function* recoverPurchaseIfNecessary() { const userBank = yield* getOrCreateUSDCUserBank() const userBankAccountInfo = yield* call(pollForTokenAccountInfo, { - tokenAccount: userBank, - mint: 'usdc' + tokenAccount: userBank }) const userBankInitialBalance = userBankAccountInfo?.amount ?? BigInt(0) diff --git a/packages/common/src/store/buy-usdc/utils.ts b/packages/common/src/store/buy-usdc/utils.ts index b50e05781b1..b948567db9a 100644 --- a/packages/common/src/store/buy-usdc/utils.ts +++ b/packages/common/src/store/buy-usdc/utils.ts @@ -1,7 +1,7 @@ import { PublicKey } from '@solana/web3.js' import { call, delay, select } from 'typed-redux-saga' -import { getTokenAccountInfo, MintName } from '~/services/audius-backend/solana' +import { getTokenAccountInfo } from '~/services/audius-backend/solana' import { IntKeys } from '~/services/remote-config' import { MAX_CONTENT_PRICE_CENTS, @@ -54,7 +54,6 @@ export function* pollForTokenAccountInfo({ ...getTokenAccountInfoArgs }: { tokenAccount: PublicKey - mint?: MintName retryDelayMs?: number maxRetryCount?: number }) { diff --git a/packages/common/src/store/purchase-content/sagas.ts b/packages/common/src/store/purchase-content/sagas.ts index 8ac332f3877..c69533667a7 100644 --- a/packages/common/src/store/purchase-content/sagas.ts +++ b/packages/common/src/store/purchase-content/sagas.ts @@ -668,7 +668,6 @@ function* doStartPurchaseContentFlow({ const userBank = yield* call(getOrCreateUSDCUserBank) const tokenAccountInfo = yield* call(pollForTokenAccountInfo, { - mint: 'usdc', tokenAccount: userBank }) @@ -923,7 +922,6 @@ function* purchaseWithAnything({ // Get the USDC user bank const usdcUserBank = yield* call(getOrCreateUSDCUserBank) const usdcUserBankTokenAccount = yield* call(pollForTokenAccountInfo, { - mint: 'usdc', tokenAccount: usdcUserBank }) if (!usdcUserBankTokenAccount) {