remove a few miscellaneous libs references

packages/web/src/pages/private-key-exporter-page/AdvancedWalletDetails.tsx

@@ -1,5 +1,6 @@
 import { useCallback, useContext, useEffect, useState } from 'react'
 
+import { useAudiusQueryContext } from '@audius/common/audius-query'
 import { Name } from '@audius/common/models'
 import { accountSelectors } from '@audius/common/store'
 import { Nullable, shortenSPLAddress } from '@audius/common/utils'
@@ -9,7 +10,6 @@ import pkg from 'bs58'
 import { make, useRecord } from 'common/store/analytics/actions'
 import { ToastContext } from 'components/toast/ToastContext'
 import { useIsMobile } from 'hooks/useIsMobile'
-import { waitForLibsInit } from 'services/audius-backend/eagerLoadUtils'
 import { copyToClipboard } from 'utils/clipboardUtil'
 import { useSelector } from 'utils/reducer'
 
@@ -91,23 +91,18 @@ export const AdvancedWalletDetails = () => {
   const [publicKey, setPublicKey] = useState<Nullable<string>>(null)
   const [encodedPrivateKey, setEncodedPrivateKey] =
     useState<Nullable<string>>(null)
+  const { solanaWalletService } = useAudiusQueryContext()
 
   useEffect(() => {
     const fetchKeypair = async () => {
-      await waitForLibsInit()
-      const libs = window.audiusLibs
-      const privateKey = libs.Account?.hedgehog?.wallet?.getPrivateKey()
-      if (privateKey) {
-        const keypair =
-          libs.solanaWeb3Manager?.solanaWeb3?.Keypair?.fromSeed(privateKey)
-        if (keypair) {
-          setPublicKey(keypair.publicKey.toString())
-          setEncodedPrivateKey(pkg.encode(keypair.secretKey))
-        }
+      const keypair = await solanaWalletService.getKeypair()
+      if (keypair) {
+        setPublicKey(keypair.publicKey.toString())
+        setEncodedPrivateKey(pkg.encode(keypair.secretKey))
       }
     }
     fetchKeypair()
-  }, [])
+  }, [solanaWalletService])
 
   if (!publicKey || !encodedPrivateKey) {
     return null

packages/web/src/services/audius-backend/BuyAudio.ts

@@ -13,7 +13,7 @@ import {
   TransactionInstruction
 } from '@solana/web3.js'
 
-import { getLibs } from 'services/audius-libs'
+import { env } from 'services/env'
 import { getSolanaConnection } from 'services/solana/solana'
 
 import { audiusBackendInstance } from './audius-backend-instance'
@@ -210,8 +210,7 @@ export const createTransferToUserBankTransaction = async ({
   amount: bigint
   memo: string
 }) => {
-  const libs = await getLibs()
-  const mintPublicKey = new PublicKey(libs.solanaWeb3Config.mintAddress)
+  const mintPublicKey = new PublicKey(env.WAUDIO_MINT_ADDRESS)
   const associatedTokenAccount = await getAudioAccount({
     rootAccount: fromAccount
   })

packages/web/src/services/solana/solana.ts

@@ -3,12 +3,10 @@ import { DEFAULT_MINT, MintName } from '@audius/common/services'
 import {
   Account,
   getMinimumBalanceForRentExemptAccount,
-  getAccount,
-  getAssociatedTokenAddressSync
+  getAccount
 } from '@solana/spl-token'
 import { PublicKey, Transaction } from '@solana/web3.js'
 
-import { getLibs } from 'services/audius-libs'
 import { audiusSdk } from 'services/audius-sdk'
 
 export const ROOT_ACCOUNT_SIZE = 0 // Root account takes 0 bytes, but still pays rent!
@@ -119,19 +117,6 @@ export const getAssociatedTokenAccountRent = async () => {
   return await getMinimumBalanceForRentExemptAccount(connection)
 }
 
-/**
- * Returns the associated USDC token account for the given solana account.
- */
-export const getUSDCAssociatedTokenAccount = async (
-  solanaRootAccountPubkey: PublicKey
-) => {
-  const libs = await getLibs()
-  return getAssociatedTokenAddressSync(
-    libs.solanaWeb3Manager!.mints.usdc,
-    solanaRootAccountPubkey
-  )
-}
-
 /**
  * Returns the owner of the token acccount, if the provided account
  * is a token account. Otherwise, just returns the account