@audius/sdk 0.0.35 → 0.0.36

package/dist/services/solana/SolanaWeb3Manager.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import solanaWeb3, { Connection, Keypair, PublicKey } from '@solana/web3.js';
+import * as solanaWeb3 from '@solana/web3.js';
+import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import type BN from 'bn.js';
 import splToken from '@solana/spl-token';
 import anchor, { Address, Idl, Program } from '@project-serum/anchor';

package/dist/services/web3Manager/Web3Config.d.ts

@@ -2,6 +2,7 @@ import type Web3 from 'web3';
 import type Wallet from 'ethereumjs-wallet';
 export declare type Web3Config = {
     registryAddress: string;
+    entityManagerAddress: string;
     useExternalWeb3: boolean;
     internalWeb3Config: {
         web3ProviderEndpoints: string[];

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@audius/sdk",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "audius": {
-    "releaseSHA": "87ed35aa1374bdcf5632ef58ce55efbdd4031b03"
+    "releaseSHA": "6d1ca16dfb4944e5e5b83ee30e302fa4e6811da4"
   },
   "description": "",
   "main": "dist/index.cjs.js",
@@ -45,7 +45,7 @@
     "@improbable-eng/grpc-web-node-http-transport": "0.15.0",
     "@project-serum/anchor": "0.24.1",
     "@solana/spl-token": "0.1.8",
-    "@solana/web3.js": "1.37.1",
+    "@solana/web3.js": "1.53.0",
     "abi-decoder": "2.4.0",
     "ajv": "6.12.2",
     "async-retry": "1.3.1",
@@ -98,6 +98,7 @@
     "@types/expect": "24.3.0",
     "@types/form-data": "^2.5.0",
     "@types/hashids": "2.0.1",
+    "@types/lodash": "4.14.149",
     "@types/mocha": "9.1.0",
     "@types/node-localstorage": "1.3.0",
     "@types/pify": "^5.0.1",

package/src/NativeAudiusLibs.ts

@@ -1,7 +1,6 @@
 import type { provider } from 'web3-core'
 import Web3 from './LibsWeb3'
 import { version } from './version'
-import type { SolanaWeb3Config } from './services/solana'
 import { Hedgehog, HedgehogConfig } from './services/hedgehog'
 import type { Hedgehog as HedgehogBase } from '@audius/hedgehog'
 import { CreatorNode, CreatorNodeConfig } from './services/creatorNode'
@@ -14,12 +13,19 @@ import { UserStateManager } from './userStateManager'
 import type { Logger, CaptchaConfig, Nullable } from './utils'
 import { Captcha, Utils } from './utils'
 
+import { Keypair, PublicKey } from '@solana/web3.js'
+
 import { getPlatformLocalStorage, LocalStorage } from './utils/localStorage'
 import { Web3Config, Web3Manager } from './services/web3Manager'
 import { EthWeb3Config, EthWeb3Manager } from './services/ethWeb3Manager'
 import { Comstock } from './services/comstock'
 import { IdentityService } from './services/identity'
 import { EthContracts } from './services/ethContracts'
+import {
+  SolanaWeb3Manager,
+  SolanaUtils,
+  SolanaWeb3Config
+} from './services/solana'
 import { AudiusContracts } from './services/dataContracts'
 import { Account } from './api/Account'
 import { Users } from './api/Users'
@@ -42,6 +48,11 @@ type LibsHedgehogConfig = Omit<
   'identityService' | 'localStorage'
 >
 
+type LibsSolanaWeb3Config = SolanaWeb3Config & {
+  // fee payer secret keys, if client wants to switch between different fee payers during relay
+  feePayerSecretKeys?: Uint8Array[]
+}
+
 type LibsDiscoveryProviderConfig = Omit<
   DiscoveryProviderConfig,
   'userStateManager' | 'ethContracts' | 'web3Manager'
@@ -217,10 +228,51 @@ export class AudiusLibs {
 
   /**
    * Configures a solana web3
-   * This is a stubbed version for native
    */
-  static configSolanaWeb3() {
-    return {}
+  static configSolanaWeb3({
+    solanaClusterEndpoint,
+    mintAddress,
+    solanaTokenAddress,
+    claimableTokenPDA,
+    feePayerAddress,
+    claimableTokenProgramAddress,
+    rewardsManagerProgramId,
+    rewardsManagerProgramPDA,
+    rewardsManagerTokenPDA,
+    useRelay,
+    feePayerSecretKeys,
+    confirmationTimeout,
+    audiusDataAdminStorageKeypairPublicKey,
+    audiusDataProgramId,
+    audiusDataIdl
+  }: LibsSolanaWeb3Config): SolanaWeb3Config {
+    if (audiusDataAdminStorageKeypairPublicKey instanceof String) {
+      audiusDataAdminStorageKeypairPublicKey = new PublicKey(
+        audiusDataAdminStorageKeypairPublicKey
+      )
+    }
+    if (audiusDataProgramId instanceof String) {
+      audiusDataProgramId = new PublicKey(audiusDataProgramId)
+    }
+    return {
+      solanaClusterEndpoint,
+      mintAddress,
+      solanaTokenAddress,
+      claimableTokenPDA,
+      feePayerAddress,
+      claimableTokenProgramAddress,
+      rewardsManagerProgramId,
+      rewardsManagerProgramPDA,
+      rewardsManagerTokenPDA,
+      useRelay,
+      feePayerKeypairs: feePayerSecretKeys?.map((key) =>
+        Keypair.fromSecretKey(key)
+      ),
+      confirmationTimeout,
+      audiusDataAdminStorageKeypairPublicKey,
+      audiusDataProgramId,
+      audiusDataIdl
+    }
   }
 
   /**
@@ -254,7 +306,7 @@ export class AudiusLibs {
   ethWeb3Manager: Nullable<EthWeb3Manager>
   ethContracts: Nullable<EthContracts>
   web3Manager: Nullable<Web3Manager>
-  // solanaWeb3Manager: Nullable<SolanaWeb3Manager>
+  solanaWeb3Manager: Nullable<SolanaWeb3Manager>
   contracts: Nullable<AudiusContracts>
   creatorNode: Nullable<CreatorNode>
   captcha: Nullable<Captcha>
@@ -327,7 +379,7 @@ export class AudiusLibs {
     this.ethWeb3Manager = null
     this.ethContracts = null
     this.web3Manager = null
-    // this.solanaWeb3Manager = null
+    this.solanaWeb3Manager = null
     this.contracts = null
     this.creatorNode = null
     this.captcha = null
@@ -404,6 +456,14 @@ export class AudiusLibs {
         this.identityService.setWeb3Manager(this.web3Manager)
       }
     }
+    if (this.solanaWeb3Config) {
+      this.solanaWeb3Manager = new SolanaWeb3Manager(
+        this.solanaWeb3Config,
+        this.identityService,
+        this.web3Manager
+      )
+      await this.solanaWeb3Manager.init()
+    }
 
     /** Contracts - Eth and Data Contracts */
     const contractsToInit = []
@@ -489,7 +549,7 @@ export class AudiusLibs {
       this.contracts,
       this.ethWeb3Manager,
       this.ethContracts,
-      null as any,
+      this.solanaWeb3Manager,
       null as any,
       null as any,
       this.creatorNode,
@@ -515,5 +575,7 @@ export class AudiusLibs {
   }
 }
 
+export { SolanaUtils }
+
 export { Utils } from './utils'
 export { SanityChecks } from './sanityChecks'

package/src/api/entityManager.ts

@@ -99,6 +99,7 @@ export class EntityManager extends Base {
     isAlbum,
     isPrivate,
     coverArt,
+    coverArtSizes,
     logger = console
   }: {
     playlistId: number
@@ -108,6 +109,7 @@ export class EntityManager extends Base {
     isAlbum: boolean
     isPrivate: boolean
     coverArt: string
+    coverArtSizes: string
     logger: Console
   }): Promise<PlaylistOperationResponse> {
     const responseValues: PlaylistOperationResponse =
@@ -123,10 +125,14 @@ export class EntityManager extends Base {
       const createAction = Action.CREATE
       const entityType = EntityType.PLAYLIST
       this.REQUIRES(Services.CREATOR_NODE)
-      const updatedPlaylistImage = await this.creatorNode.uploadImage(
-        coverArt,
-        true // square
-      )
+      let dirCID
+      if (coverArt) {
+        const updatedPlaylistImage = await this.creatorNode.uploadImage(
+          coverArt,
+          true // square
+        )
+        dirCID = updatedPlaylistImage.dirCID
+      }
       const web3 = this.web3Manager.getWeb3()
       const currentBlockNumber = await web3.eth.getBlockNumber()
       const currentBlock = await web3.eth.getBlock(currentBlockNumber)
@@ -134,12 +140,11 @@ export class EntityManager extends Base {
         track: trackId,
         time: currentBlock.timestamp as number
       }))
-      const dirCID = updatedPlaylistImage.dirCID
       const metadata: PlaylistMetadata = {
         playlist_id: playlistId,
         playlist_contents: { track_ids: tracks },
         playlist_name: playlistName,
-        playlist_image_sizes_multihash: dirCID,
+        playlist_image_sizes_multihash: dirCID ?? coverArtSizes,
         description,
         is_album: isAlbum,
         is_private: isPrivate

package/src/services/solana/SolanaWeb3Manager.ts

@@ -1,7 +1,8 @@
-import solanaWeb3, { Connection, Keypair, PublicKey } from '@solana/web3.js'
+import * as solanaWeb3 from '@solana/web3.js'
+import { Connection, Keypair, PublicKey } from '@solana/web3.js'
 import type BN from 'bn.js'
 import splToken from '@solana/spl-token'
-import anchor, { Address, Idl, Program } from '@project-serum/anchor'
+import anchor, { Address, Idl, Program, Wallet } from '@project-serum/anchor'
 import { idl } from '@audius/anchor-audius-data'
 
 import { transferWAudioBalance } from './transfer'
@@ -166,7 +167,7 @@ export class SolanaWeb3Manager {
     } = this.solanaWeb3Config
 
     this.solanaClusterEndpoint = solanaClusterEndpoint
-    this.connection = new solanaWeb3.Connection(this.solanaClusterEndpoint, {
+    this.connection = new Connection(this.solanaClusterEndpoint, {
       confirmTransactionInitialTimeout:
         confirmationTimeout || DEFAULT_CONNECTION_CONFIRMATION_TIMEOUT_MS
     })
@@ -230,14 +231,13 @@ export class SolanaWeb3Manager {
       this.audiusDataAdminStorageKeypairPublicKey &&
       this.audiusDataIdl
     ) {
-      const connection = new solanaWeb3.Connection(
+      const connection = new Connection(
         this.solanaClusterEndpoint,
         anchor.AnchorProvider.defaultOptions()
       )
       const anchorProvider = new anchor.AnchorProvider(
         connection,
-        // @ts-expect-error weirdness with 3rd party types
-        solanaWeb3.Keypair.generate(),
+        Keypair.generate() as unknown as Wallet,
         anchor.AnchorProvider.defaultOptions()
       )
       this.anchorProgram = new anchor.Program(

package/src/services/web3Manager/Web3Config.ts

@@ -3,6 +3,7 @@ import type Wallet from 'ethereumjs-wallet'
 
 export type Web3Config = {
   registryAddress: string
+  entityManagerAddress: string
   useExternalWeb3: boolean
   internalWeb3Config: {
     web3ProviderEndpoints: string[]

package/src/services/wormhole/Wormhole.ts

@@ -1,4 +1,5 @@
 import type { Hedgehog } from '@audius/hedgehog'
+import { Keypair } from '@solana/web3.js'
 import type { EthContracts } from '../ethContracts'
 import type { ContractReceipt } from 'ethers'
 import type { EthWeb3Manager } from '../ethWeb3Manager'
@@ -269,10 +270,9 @@ export class Wormhole {
       const wAudioAmount = wAudioFromWeiAudio(amount)
       // Generate a solana keypair derived from the hedgehog private key
       // NOTE: The into to fromSeed is a 32 bytes Uint8Array
-      const rootSolanaAccount =
-        this.solanaWeb3Manager.solanaWeb3.Keypair.fromSeed(
-          this.hedgehog.wallet?.getPrivateKey() as Uint8Array
-        )
+      const rootSolanaAccount = Keypair.fromSeed(
+        this.hedgehog.wallet?.getPrivateKey() as Uint8Array
+      )
 
       const solanaAddress = rootSolanaAccount.publicKey.toString()
       logs.push(`Root Solana Account: ${solanaAddress}`)