@audius/sdk 3.0.8-beta.12 → 3.0.8-beta.13

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@audius/sdk",
-  "version": "3.0.8-beta.12",
+  "version": "3.0.8-beta.13",
   "audius": {
-    "releaseSHA": "1119e8535700beff7e3bef81d78df65bb3e33b0e"
+    "releaseSHA": "473c515045520b748c27a58060a426eba8a3fc19"
   },
   "description": "Audius SDK",
   "keywords": [
@@ -72,8 +72,8 @@
     "@noble/secp256k1": "1.7.0",
     "@project-serum/anchor": "0.24.1",
     "@scure/base": "1.1.1",
-    "@solana/spl-token": "0.1.8",
-    "@solana/web3.js": "1.37.1",
+    "@solana/spl-token": "0.3.8",
+    "@solana/web3.js": "1.78.4",
     "abi-decoder": "2.4.0",
     "ajv": "6.12.2",
     "assert": "2.0.0",

package/src/services/solana/SolanaWeb3Manager.ts

@@ -239,10 +239,7 @@ export class SolanaWeb3Manager {
     mint?: MintName
   } = {}) {
     const userbank = await this.deriveUserBank({ ethAddress, mint })
-    const tokenAccount = await this.getTokenAccountInfo(
-      userbank.toString(),
-      mint
-    )
+    const tokenAccount = await this.getTokenAccountInfo(userbank.toString())
     return !!tokenAccount
   }
 
@@ -292,7 +289,7 @@ export class SolanaWeb3Manager {
     | { error: string; errorCode: string | number | null }
     | {
         didExist: boolean
-        userbank: solanaWeb3.PublicKey
+        userbank: PublicKey
       }
   > {
     const didExist = await this.doesUserbankExist({ ethAddress, mint })
@@ -378,15 +375,10 @@ export class SolanaWeb3Manager {
    * Gets the info for a user bank/wAudio token account given a spl-token address.
    * If the address is not a valid token account, returns `null`
    */
-  async getTokenAccountInfo(
-    solanaAddress: string,
-    mint: MintName = DEFAULT_MINT
-  ) {
+  async getTokenAccountInfo(solanaAddress: string) {
     try {
       const res = await getTokenAccountInfo({
         tokenAccountAddressKey: new PublicKey(solanaAddress),
-        mintKey: this.mints[mint],
-        solanaTokenProgramKey: this.solanaTokenKey,
         connection: this.connection
       })
       return res
@@ -418,7 +410,7 @@ export class SolanaWeb3Manager {
 
       // Multiply by 10^10 to maintain same decimals as eth $AUDIO
       const decimals = AUDIO_DECMIALS - WAUDIO_DECMIALS
-      return tokenAccount.amount.mul(Utils.toBN('1'.padEnd(decimals + 1, '0')))
+      return tokenAccount.amount * BigInt('1'.padEnd(decimals + 1, '0'))
     } catch (e) {
       return null
     }

package/src/services/solana/tokenAccount.ts

@@ -1,11 +1,11 @@
-import { ASSOCIATED_TOKEN_PROGRAM_ID, Token } from '@solana/spl-token'
+import { ASSOCIATED_TOKEN_PROGRAM_ID, getAccount } from '@solana/spl-token'
 import {
   PublicKey,
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
   Connection
 } from '@solana/web3.js'
-import { Nullable, randomKeyPair } from '../../utils'
+import type { Nullable } from '../../utils'
 import type { IdentityService } from '../identity'
 
 type FindAssociatedTokenAddressConfig = {
@@ -35,8 +35,6 @@ export async function findAssociatedTokenAddress({
 
 type GetTokenAccountInfoConfig = {
   tokenAccountAddressKey: PublicKey
-  mintKey: PublicKey
-  solanaTokenProgramKey: PublicKey
   connection: Connection
 }
 
@@ -45,23 +43,10 @@ type GetTokenAccountInfoConfig = {
  */
 export async function getTokenAccountInfo({
   tokenAccountAddressKey,
-  mintKey,
-  solanaTokenProgramKey,
   connection
 }: GetTokenAccountInfoConfig) {
-  const token = new Token(
-    connection,
-    mintKey,
-    solanaTokenProgramKey,
-    randomKeyPair
-  )
-
   // Fetch token info with 'processed commitment to get any recently changed amounts.
-  // NOTE: Our version of spl-token omits the second argument
-  // in the type definitions even though it's actually available,
-  // so we suppress error until we can upgrade.
-  // @ts-expect-error
-  const info = await token.getAccountInfo(tokenAccountAddressKey, 'processed')
+  const info = await getAccount(connection, tokenAccountAddressKey, 'processed')
   return info
 }