@audius/sdk 0.0.35 → 0.0.38

package/dist/sdk/api/generated/default/models/Track.d.ts

@@ -114,4 +114,10 @@ export interface Track {
      * @memberof Track
      */
     permalink?: string;
+    /**
+     *
+     * @type {boolean}
+     * @memberof Track
+     */
+    is_streamable?: boolean;
 }

package/dist/sdk/api/generated/full/models/TrackFull.d.ts

@@ -120,6 +120,12 @@ export interface TrackFull {
      * @memberof TrackFull
      */
     permalink?: string;
+    /**
+     *
+     * @type {boolean}
+     * @memberof TrackFull
+     */
+    is_streamable?: boolean;
     /**
      *
      * @type {number}

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.38",
   "audius": {
-    "releaseSHA": "87ed35aa1374bdcf5632ef58ce55efbdd4031b03"
+    "releaseSHA": "74503074cb96dea181ec2b218c5cb6d528c1db86"
   },
   "description": "",
   "main": "dist/index.cjs.js",
@@ -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'