@audius/sdk 0.0.0 → 0.0.3-beta.1

package/examples/initAudiusLibs.js

@@ -43,9 +43,9 @@ async function initAudiusLibs(
         ethWeb3ProviderEndpoint,
         ethWallet
       ),
-      discoveryProviderConfig: AudiusLibs.configDiscoveryProvider(
-        new Set(['http://docker.for.mac.localhost:5000'])
-      ),
+      discoveryProviderConfig: {
+        whitelist: new Set(['http://docker.for.mac.localhost:5000'])
+      },
       isServer,
       isDebug
     }
@@ -63,7 +63,7 @@ async function initAudiusLibs(
         ethContractsConfig.ownerWallet
       ),
       creatorNodeConfig: AudiusLibs.configCreatorNode(creatorNodeEndpoint),
-      discoveryProviderConfig: AudiusLibs.configDiscoveryProvider(),
+      discoveryProviderConfig: {},
       identityServiceConfig: AudiusLibs.configIdentityService(
         identityServiceEndpoint
       ),

package/examples/initializeVersions.js

@@ -2,7 +2,8 @@ const Web3 = require('../src/web3')
 const AudiusLibs = require('../src/index')
 const serviceTypeList = ['discovery-node', 'content-node']
 const dataWeb3ProviderEndpoint = 'https://sokol.poa.network:443'
-const ethWeb3ProviderEndpoint = 'https://ropsten.infura.io/v3/c569c6faf4f14d15a49d0044e7ddd668'
+const ethWeb3ProviderEndpoint =
+  'https://ropsten.infura.io/v3/c569c6faf4f14d15a49d0044e7ddd668'
 const dataRegistryAddress = '0x09033761774Fe45F40A47191DdF873F18B62DE05'
 const ethRegistryAddress = '0xB631ABAA63a26311366411b2025F0cAca00DE27F'
 const ethTokenAddress = '0xF8e679Aa54361467B12c7394BFF57Eb890f6d934'
@@ -10,7 +11,7 @@ let latestVersionStr = '0.1.0'
 
 const isServer = true
 
-const getEnv = env => {
+const getEnv = (env) => {
   const value = process.env[env]
   if (typeof value === 'undefined') {
     console.log(`${env} has not been set.`)
@@ -25,7 +26,7 @@ const getEnv = env => {
    export AUDIUS_OWNER_WALLET=
  * */
 
-async function initializeVersionServiceProviderContracts () {
+async function initializeVersionServiceProviderContracts() {
   let audiusLibsConfig
   let privateKey = getEnv('AUDIUS_PRIVATE_KEY')
   let ownerWallet = getEnv('AUDIUS_OWNER_WALLET')
@@ -36,7 +37,9 @@ async function initializeVersionServiceProviderContracts () {
   console.log(privateKey)
   console.log(ownerWallet)
 
-  const dataWeb3 = new Web3(new Web3.providers.HttpProvider(dataWeb3ProviderEndpoint))
+  const dataWeb3 = new Web3(
+    new Web3.providers.HttpProvider(dataWeb3ProviderEndpoint)
+  )
   let web3DataContractConfig = {
     registryAddress: dataRegistryAddress,
     useExternalWeb3: true,
@@ -46,7 +49,9 @@ async function initializeVersionServiceProviderContracts () {
     }
   }
 
-  const ethWeb3 = new Web3(new Web3.providers.HttpProvider(ethWeb3ProviderEndpoint))
+  const ethWeb3 = new Web3(
+    new Web3.providers.HttpProvider(ethWeb3ProviderEndpoint)
+  )
   audiusLibsConfig = {
     web3Config: web3DataContractConfig,
     ethWeb3Config: AudiusLibs.configEthWeb3(
@@ -55,7 +60,7 @@ async function initializeVersionServiceProviderContracts () {
       ethWeb3,
       ownerWallet
     ),
-    discoveryProviderConfig: AudiusLibs.configDiscoveryProvider(),
+    discoveryProviderConfig: {},
     isServer: isServer
   }
   let audiusLibs = new AudiusLibs(audiusLibsConfig)
@@ -84,9 +89,17 @@ async function initializeVersionServiceProviderContracts () {
   }
   */
   for (const serviceType of serviceTypeList) {
-    let versionTx = await audiusLibs.ethContracts.ServiceTypeManagerClient.getCurrentVersion(serviceType)
-    let numVersionsTx = await audiusLibs.ethContracts.ServiceTypeManagerClient.getNumberOfVersions(serviceType)
-    console.log(`${serviceType} | current version: ${versionTx} | number of versions : ${numVersionsTx}`)
+    let versionTx =
+      await audiusLibs.ethContracts.ServiceTypeManagerClient.getCurrentVersion(
+        serviceType
+      )
+    let numVersionsTx =
+      await audiusLibs.ethContracts.ServiceTypeManagerClient.getNumberOfVersions(
+        serviceType
+      )
+    console.log(
+      `${serviceType} | current version: ${versionTx} | number of versions : ${numVersionsTx}`
+    )
   }
 
   console.log('/----version init---')

package/initScripts/mainnet.js

@@ -34,29 +34,47 @@ const run = async () => {
         const versionStr = args[5]
         let dryRun = true
         // if args[6] is defined and the value is either bool or string false, set dryRun to false
-        if (args[6] && (['false', false].includes(args[6]))) {
+        if (args[6] && ['false', false].includes(args[6])) {
           dryRun = false
         }
         if (!serviceType || !versionStr) {
-          throw new Error('missing arguments - format: node mainnet.js setversion <serviceType> <versionStr>')
+          throw new Error(
+            'missing arguments - format: node mainnet.js setversion <serviceType> <versionStr>'
+          )
         }
-        await setServiceVersion(audiusLibs, serviceType, versionStr, privateKey, dryRun)
+        await setServiceVersion(
+          audiusLibs,
+          serviceType,
+          versionStr,
+          privateKey,
+          dryRun
+        )
         break
       case 'addservicetype':
         const newServiceType = args[4]
         const serviceTypeMin = args[5]
         const serviceTypeMax = args[6]
         if (!newServiceType || !serviceTypeMin || !serviceTypeMax) {
-          throw new Error('missing arguments - format: node mainnet.js addservicetype <serviceType> <serviceTypeMin> <serviceTypeMax>')
+          throw new Error(
+            'missing arguments - format: node mainnet.js addservicetype <serviceType> <serviceTypeMin> <serviceTypeMax>'
+          )
         }
-        await addServiceType(audiusLibs, newServiceType, serviceTypeMin, serviceTypeMax, privateKey)
+        await addServiceType(
+          audiusLibs,
+          newServiceType,
+          serviceTypeMin,
+          serviceTypeMax,
+          privateKey
+        )
         break
       case 'getclaim':
         await getClaimInfo(audiusLibs)
         break
       case 'fundclaim':
         if (!args[4]) {
-          throw new Error('missing argument - format: node mainnet.js fundclaim <amountOfAuds>')
+          throw new Error(
+            'missing argument - format: node mainnet.js fundclaim <amountOfAuds>'
+          )
         }
 
         const amountOfAuds = args[4]
@@ -77,7 +95,7 @@ const run = async () => {
 
 run()
 
-function getLibsConfig (config, privateKey, ownerWallet) {
+function getLibsConfig(config, privateKey, ownerWallet) {
   let audiusLibsConfig
   if (!privateKey || !ownerWallet) {
     throw new Error('Missing private key or owner wallet')
@@ -86,7 +104,9 @@ function getLibsConfig (config, privateKey, ownerWallet) {
   console.log(privateKey)
   console.log(ownerWallet)
 
-  const dataWeb3 = new Web3(new Web3.providers.HttpProvider(config.dataWeb3ProviderEndpoint))
+  const dataWeb3 = new Web3(
+    new Web3.providers.HttpProvider(config.dataWeb3ProviderEndpoint)
+  )
   const web3DataContractConfig = {
     registryAddress: config.dataRegistryAddress,
     useExternalWeb3: true,
@@ -96,7 +116,9 @@ function getLibsConfig (config, privateKey, ownerWallet) {
     }
   }
 
-  const ethWeb3 = new Web3(new Web3.providers.HttpProvider(config.ethWeb3ProviderEndpoint))
+  const ethWeb3 = new Web3(
+    new Web3.providers.HttpProvider(config.ethWeb3ProviderEndpoint)
+  )
   audiusLibsConfig = {
     web3Config: web3DataContractConfig,
     ethWeb3Config: AudiusLibs.configEthWeb3(
@@ -105,20 +127,20 @@ function getLibsConfig (config, privateKey, ownerWallet) {
       ethWeb3,
       ownerWallet
     ),
-    discoveryProviderConfig: AudiusLibs.configDiscoveryProvider(),
+    discoveryProviderConfig: {},
     isServer: isServer
   }
   return audiusLibsConfig
 }
 
-async function getAudiusLibs (config, privateKey, ownerWallet) {
+async function getAudiusLibs(config, privateKey, ownerWallet) {
   const audiusLibsConfig = getLibsConfig(config, privateKey, ownerWallet)
   const audiusLibs = new AudiusLibs(audiusLibsConfig)
   await audiusLibs.init()
   return audiusLibs
 }
 
-function _getEnv (env) {
+function _getEnv(env) {
   const value = process.env[env]
   if (typeof value === 'undefined') {
     throw new Error(`${env} has not been set.`)
@@ -126,6 +148,8 @@ function _getEnv (env) {
   return value
 }
 
-function _throwArgError () {
-  throw new Error('missing argument - format: node mainnet.js <configFilePath> [setversion, fundclaim, getclaim, stakeinfo] [additional options]')
+function _throwArgError() {
+  throw new Error(
+    'missing argument - format: node mainnet.js <configFilePath> [setversion, fundclaim, getclaim, stakeinfo] [additional options]'
+  )
 }

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@audius/sdk",
-  "version": "0.0.0",
+  "version": "0.0.3-beta.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/types.d.ts",
   "browser": "dist/browser.js",
+  "sdkBrowserDistFile": "dist/sdk.js",
+  "sdkBrowserDistFileMini": "dist/sdk.min.js",
   "legacy": "dist/legacy.js",
   "legacyTypes": "dist/legacy.d.ts",
   "core": "dist/core.js",
@@ -26,13 +28,14 @@
   "dependencies": {
     "@audius/anchor-audius-data": "0.0.2",
     "@audius/hedgehog": "1.0.12",
+    "@babel/runtime": "^7.18.3",
     "@certusone/wormhole-sdk": "0.1.1",
     "@ethersproject/solidity": "5.0.5",
     "@improbable-eng/grpc-web-node-http-transport": "0.15.0",
     "@project-serum/anchor": "0.24.1",
     "@solana/spl-token": "0.1.6",
     "@solana/web3.js": "1.37.1",
-    "abi-decoder": "1.2.0",
+    "abi-decoder": "2.4.0",
     "ajv": "6.12.2",
     "async-retry": "1.3.1",
     "axios": "0.19.2",
@@ -61,9 +64,11 @@
     "secp256k1": "4.0.2",
     "semver": "6.3.0",
     "stream-browserify": "3.0.0",
-    "web3": "1.7.1"
+    "web3": "1.7.1",
+    "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
+    "@babel/plugin-transform-runtime": "^7.18.2",
     "@babel/preset-env": "7.16.11",
     "@openzeppelin/test-helpers": "0.5.6",
     "@rollup/plugin-alias": "3.1.9",
@@ -103,6 +108,7 @@
     "rollup-plugin-dts": "4.2.0",
     "rollup-plugin-ignore": "1.0.10",
     "rollup-plugin-polyfill-node": "0.9.0",
+    "rollup-plugin-terser": "^7.0.2",
     "sinon": "9.0.2",
     "standard": "16.0.4",
     "ts-mocha": "9.0.2",

package/rollup.config.js

@@ -3,6 +3,7 @@ import babel from '@rollup/plugin-babel'
 import json from '@rollup/plugin-json'
 import resolve from '@rollup/plugin-node-resolve'
 import typescript from '@rollup/plugin-typescript'
+import { terser } from 'rollup-plugin-terser'
 import dts from 'rollup-plugin-dts'
 import nodePolyfills from 'rollup-plugin-polyfill-node'
 import alias from '@rollup/plugin-alias'
@@ -73,6 +74,33 @@ const browserConfig = {
   external: external.filter((dep) => !browserInternal.includes(dep))
 }
 
+const browserDistFileConfig = {
+  plugins: [
+    ignore(['web3', 'graceful-fs', 'node-localstorage']),
+    resolve({ extensions, preferBuiltins: false, browser: true }),
+    commonjs({
+      extensions,
+      transformMixedEsModules: true,
+      dynamicRequireTargets: [
+        'data-contracts/ABIs/*.json',
+        'eth-contracts/ABIs/*.json'
+      ]
+    }),
+    alias({
+      entries: [{ find: 'stream', replacement: 'stream-browserify' }]
+    }),
+    nodePolyfills(),
+    babel({
+      babelHelpers: 'runtime',
+      extensions,
+      plugins: ['@babel/plugin-transform-runtime']
+    }),
+    json(),
+    typescript()
+  ],
+  external: ['web3']
+}
+
 const browserLegacyConfig = {
   plugins: [
     ignore(['web3', 'graceful-fs', 'node-localstorage']),
@@ -128,6 +156,27 @@ export default [
     ...browserConfig
   },
 
+  /**
+   * SDK bundled for prebuilt package file to be used in browser
+   * Does not include libs but does include polyfills and all deps/dev deps
+   */
+  {
+    input: 'src/sdk/sdkBrowserDist.ts',
+    output: [
+      {
+        file: pkg.sdkBrowserDistFile,
+        globals: {
+          web3: 'window.Web3'
+        },
+        format: 'iife',
+        esModule: false,
+        sourcemap: true,
+        plugins: [terser()]
+      }
+    ],
+    ...browserDistFileConfig
+  },
+
   /**
    * Legacy bundle for a browser environment
    * Includes libs but does not include polyfills

package/src/api/base.d.ts

@@ -0,0 +1,4 @@
+// Placeholder type for base.js
+declare const Base: any
+
+export { Base }

package/src/api/reactions.ts

@@ -0,0 +1,39 @@
+import { Base } from './base'
+
+export class Reactions extends Base {
+  constructor(...args: any[]) {
+    super(...args)
+    this.submitReaction = this.submitReaction.bind(this)
+  }
+
+  /**
+   * Submit a user's reaction, represented by a numberic ID,
+   * to an entity e.g. a notification for a received tip.
+   */
+  async submitReaction({
+    reactedTo,
+    reactionValue,
+    logger = console
+  }: {
+    reactedTo: string
+    reactionValue: number
+    logger: any
+  }): Promise<{ success: boolean; error: string | null }> {
+    try {
+      await this.identityService.submitReaction({
+        reactedTo,
+        reactionValue
+      })
+      logger.info(
+        `Successfully submitted reaction for entity ${reactedTo} and reaction value ${reactionValue}.`
+      )
+      return { success: true, error: null }
+    } catch (e) {
+      const errorMessage = (e as Error).message
+      logger.error(
+        `Could not successfully submit reaction for entity ${reactedTo} and reaction value ${reactionValue}. Error: ${errorMessage}`
+      )
+      return { success: false, error: errorMessage }
+    }
+  }
+}

package/src/libs.js

@@ -5,7 +5,7 @@ const { SolanaAudiusData } = require('./services/solanaAudiusData/index')
 const { Web3Manager } = require('./services/web3Manager')
 const { EthContracts } = require('./services/ethContracts')
 const SolanaWeb3Manager = require('./services/solanaWeb3Manager/index')
-const { AudiusContracts } = require('./services/dataContracts/index')
+const { AudiusContracts } = require('./services/dataContracts')
 const { IdentityService } = require('./services/identity')
 const { Comstock } = require('./services/comstock')
 const { Hedgehog } = require('./services/hedgehog')
@@ -33,51 +33,15 @@ const { PublicKey } = require('@solana/web3.js')
 const {
   RewardsAttester
 } = require('./services/solanaWeb3Manager/rewardsAttester')
-class AudiusLibs {
-  /**
-   * Configures a discovery provider wrapper
-   * @param {Set<string>?} whitelist whether or not to include only specified nodes (default no whitelist)
-   * @param {Set<string>?} blacklist whether or not to exclude specified nodes (default no blacklist)
-   * @param {number?} reselectTimeout timeout to clear locally cached discovery providers
-   * @param {(selection: string) => void?} selectionCallback invoked with the select discovery provider
-   * @param {object?} monitoringCallbacks callbacks to be invoked with metrics from requests sent to a service
-   *  @param {function} monitoringCallbacks.request
-   *  @param {function} monitoringCallbacks.healthCheck
-   * @param {number?} selectionRequestTimeout the amount of time (ms) an individual request should take before reselecting
-   * @param {number?} selectionRequestRetries the number of retries to a given discovery node we make before reselecting
-   * @param {number?} unhealthySlotDiffPlays the number of slots we would consider a discovery node unhealthy
-   * @param {number?} unhealthyBlockDiff the number of missed blocks after which we would consider a discovery node unhealthy
-   */
-  static configDiscoveryProvider(
-    whitelist = null,
-    blacklist = null,
-    reselectTimeout = null,
-    selectionCallback = null,
-    monitoringCallbacks = {},
-    selectionRequestTimeout = null,
-    selectionRequestRetries = null,
-    unhealthySlotDiffPlays = null,
-    unhealthyBlockDiff = null
-  ) {
-    return {
-      whitelist,
-      blacklist,
-      reselectTimeout,
-      selectionCallback,
-      monitoringCallbacks,
-      selectionRequestTimeout,
-      selectionRequestRetries,
-      unhealthySlotDiffPlays,
-      unhealthyBlockDiff
-    }
-  }
+const { Reactions } = require('./api/reactions')
 
+class AudiusLibs {
   /**
    * Configures an identity service wrapper
    * @param {string} url
    * @param {boolean?} useHedgehogLocalStorage whether or not to read hedgehog entropy in local storage
    */
-  static configIdentityService(url, useHedgehogLocalStorage = true) {
+  static configIdentityService (url, useHedgehogLocalStorage = true) {
     return { url, useHedgehogLocalStorage }
   }
 
@@ -85,7 +49,7 @@ class AudiusLibs {
    * Configures an identity service wrapper
    * @param {string} url
    */
-  static configComstock(url) {
+  static configComstock (url) {
     return { url }
   }
 
@@ -100,7 +64,7 @@ class AudiusLibs {
    * @param {function} monitoringCallbacks.request
    * @param {function} monitoringCallbacks.healthCheck
    */
-  static configCreatorNode(
+  static configCreatorNode (
     fallbackUrl,
     lazyConnect = false,
     passList = null,
@@ -124,7 +88,7 @@ class AudiusLibs {
    * @param {?string} walletOverride wallet address to force use instead of the first wallet on the provided web3
    * @param {?number} walletIndex if using a wallet returned from web3, pick the wallet at this index
    */
-  static async configExternalWeb3(
+  static async configExternalWeb3 (
     registryAddress,
     web3Provider,
     networkId,
@@ -150,7 +114,7 @@ class AudiusLibs {
    * @param {string} registryAddress
    * @param {string | Web3 | Array<string>} providers web3 provider endpoint(s)
    */
-  static configInternalWeb3(registryAddress, providers, privateKey) {
+  static configInternalWeb3 (registryAddress, providers, privateKey) {
     let providerList
     if (typeof providers === 'string') {
       providerList = providers.split(',')
@@ -183,7 +147,7 @@ class AudiusLibs {
    * @param {string?} claimDistributionContractAddress
    * @param {string?} wormholeContractAddress
    */
-  static configEthWeb3(
+  static configEthWeb3 (
     tokenAddress,
     registryAddress,
     providers,
@@ -223,7 +187,7 @@ class AudiusLibs {
    * @param {string} config.ethBridgeAddress
    * @param {string} config.ethTokenBridgeAddress
    */
-  static configWormhole({
+  static configWormhole ({
     rpcHosts,
     solBridgeAddress,
     solTokenBridgeAddress,
@@ -267,7 +231,7 @@ class AudiusLibs {
    * @param {PublicKey|string} audiusDataProgramId program ID for the audius-data Anchor program
    * @param {Idl} audiusDataIdl IDL for the audius-data Anchor program.
    */
-  static configSolanaWeb3({
+  static configSolanaWeb3 ({
     solanaClusterEndpoint,
     mintAddress,
     solanaTokenAddress,
@@ -319,7 +283,7 @@ class AudiusLibs {
    * @param {string} config.programId Program ID of the audius data program
    * @param {string} config.adminAccount Public Key of admin account
    */
-  static configSolanaAudiusData({ programId, adminAccount }) {
+  static configSolanaAudiusData ({ programId, adminAccount }) {
     return {
       programId,
       adminAccount
@@ -331,12 +295,12 @@ class AudiusLibs {
    * Unless default-valued, all configs are optional.
    * @example
    *  const audius = AudiusLibs({
-   *    discoveryProviderConfig: configDiscoveryProvider(),
+   *    discoveryProviderConfig: {},
    *    creatorNodeConfig: configCreatorNode('https://my-creator.node')
    *  })
    *  await audius.init()
    */
-  constructor({
+  constructor ({
     web3Config,
     ethWeb3Config,
     solanaWeb3Config,
@@ -394,6 +358,7 @@ class AudiusLibs {
     this.Playlist = null
     this.File = null
     this.Rewards = null
+    this.Reactions = null
 
     this.preferHigherPatchForPrimary = preferHigherPatchForPrimary
     this.preferHigherPatchForSecondaries = preferHigherPatchForSecondaries
@@ -405,7 +370,7 @@ class AudiusLibs {
   }
 
   /** Init services based on presence of a relevant config. */
-  async init() {
+  async init () {
     this.userStateManager = new UserStateManager()
     // Config external web3 is an async function, so await it here in case it needs to be
     this.web3Config = await this.web3Config
@@ -525,21 +490,10 @@ class AudiusLibs {
     /** Discovery Provider */
     if (this.discoveryProviderConfig) {
       this.discoveryProvider = new DiscoveryProvider({
-        whitelist: this.discoveryProviderConfig.whitelist,
-        blacklist: this.discoveryProviderConfig.blacklist,
         userStateManager: this.userStateManager,
         ethContracts: this.ethContracts,
         web3Manager: this.web3Manager,
-        reselectTimeout: this.discoveryProviderConfig.reselectTimeout,
-        selectionCallback: this.discoveryProviderConfig.selectionCallback,
-        monitoringCallbacks: this.discoveryProviderConfig.monitoringCallbacks,
-        selectionRequestTimeout:
-          this.discoveryProviderConfig.selectionRequestTimeout,
-        selectionRequestRetries:
-          this.discoveryProviderConfig.selectionRequestRetries,
-        unhealthySlothDiffPlays:
-          this.discoveryProviderConfig.unhealthySlotDiffPlays,
-        unhealthBlockDiff: this.discoveryProviderConfig.unhealthyBlockDiff
+        ...this.discoveryProviderConfig
       })
       await this.discoveryProvider.init()
     }
@@ -602,6 +556,7 @@ class AudiusLibs {
     this.Playlist = new Playlist(...services)
     this.File = new File(this.User, ...services)
     this.Rewards = new Rewards(this.ServiceProvider, ...services)
+    this.Reactions = new Reactions(...services)
   }
 }
 

package/src/sdk/oauth/Oauth.ts

@@ -105,13 +105,13 @@ const OAUTH_URL = 'https://audius.co/oauth/auth'
 const CSRF_TOKEN_KEY = 'audiusOauthState'
 
 type OauthConfig = {
-  appName?: string
+  appName: string
   discoveryProvider: DiscoveryProvider
 }
 
 export class Oauth {
   discoveryProvider: DiscoveryProvider
-  appName: string | null
+  appName: string
   activePopupWindow: null | Window
   popupCheckInterval: NodeJS.Timer | null
   loginSuccessCallback: LoginSuccessCallback | null
@@ -125,7 +125,7 @@ export class Oauth {
       )
     }
     this.discoveryProvider = discoveryProvider
-    this.appName = appName ?? null
+    this.appName = appName
     this.activePopupWindow = null
     this.loginSuccessCallback = null
     this.loginErrorCallback = null

package/src/sdk/sdk.ts

@@ -34,14 +34,14 @@ type SdkConfig = {
 /**
  * The Audius SDK
  */
-export const sdk = async (config?: SdkConfig) => {
+export const sdk = async (config: SdkConfig) => {
   const {
     appName,
     discoveryNodeConfig,
     ethContractsConfig,
     ethWeb3Config,
     identityServiceConfig
-  } = config ?? {}
+  } = config
 
   /** Initialize services */
 

package/src/sdk/sdkBrowserDist.ts

@@ -0,0 +1,3 @@
+import { sdk } from './sdk'
+
+window.audiusSdk = sdk

package/src/services/discoveryProvider/DiscoveryProvider.ts

@@ -50,7 +50,10 @@ export type UserProfile = {
   name: string
   handle: string
   verified: boolean
-  imageURL?: string
+  profilePicture:
+    | { '150x150': string; '480x480': string; '1000x1000': string }
+    | null
+    | undefined
   sub: number
   iat: string
 }
@@ -615,11 +618,11 @@ export class DiscoveryProvider {
    */
   async verifyToken(token: string): Promise<UserProfile | false> {
     const req = Requests.verifyToken(token)
-    const res = await this._makeRequest<UserProfile[]>(req)
-    if (res == null || res[0] == null) {
+    const res = await this._makeRequest<UserProfile | null>(req)
+    if (res == null) {
       return false
     } else {
-      return res[0]
+      return res
     }
   }
 

package/src/services/ethWeb3Manager/EthWeb3Manager.ts

@@ -46,15 +46,13 @@ export class EthWeb3Manager {
     this.identityService = identityService
     this.hedgehog = hedgehog
 
-    // Hedgehog might not exist (in the case of @audius/sdk)
-    if (this.hedgehog) {
-      if (this.web3Config.ownerWallet) {
-        this.ownerWallet = this.web3Config.ownerWallet
-      } else {
-        const storedWallet = this.hedgehog.getWallet()
-        if (storedWallet) {
-          this.ownerWallet = storedWallet
-        }
+    if (this.web3Config.ownerWallet) {
+      this.ownerWallet = this.web3Config.ownerWallet
+    } else if (this.hedgehog) {
+      // Hedgehog might not exist (in the case of @audius/sdk)
+      const storedWallet = this.hedgehog.getWallet()
+      if (storedWallet) {
+        this.ownerWallet = storedWallet
       }
     }
   }