@audius/sdk 3.0.8-beta.4 → 3.0.8-beta.6

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@audius/sdk",
-  "version": "3.0.8-beta.4",
+  "version": "3.0.8-beta.6",
   "audius": {
-    "releaseSHA": "92e68fd0dbb7b71d7fc1d6d9e2a6b57009e96c44"
+    "releaseSHA": "ea2ae182bca1fca4f27f02f9fa991789e42fe6cf"
   },
   "description": "Audius SDK",
   "keywords": [

package/src/AudiusLibs.ts

@@ -86,6 +86,7 @@ type AudiusLibsConfig = {
   preferHigherPatchForPrimary: boolean
   preferHigherPatchForSecondaries: boolean
   localStorage: LocalStorage
+  useDiscoveryRelay: boolean
 }
 
 export class AudiusLibs {
@@ -332,6 +333,7 @@ export class AudiusLibs {
   preferHigherPatchForPrimary: boolean
   preferHigherPatchForSecondaries: boolean
   localStorage: LocalStorage
+  useDiscoveryRelay: boolean
 
   /**
    * Constructs an Audius Libs instance with configs.
@@ -358,7 +360,8 @@ export class AudiusLibs {
     isDebug = false,
     preferHigherPatchForPrimary = true,
     preferHigherPatchForSecondaries = true,
-    localStorage = getPlatformLocalStorage()
+    localStorage = getPlatformLocalStorage(),
+    useDiscoveryRelay = false,
   }: AudiusLibsConfig) {
     // set version
 
@@ -409,6 +412,7 @@ export class AudiusLibs {
     this.preferHigherPatchForPrimary = preferHigherPatchForPrimary
     this.preferHigherPatchForSecondaries = preferHigherPatchForSecondaries
     this.localStorage = localStorage
+    this.useDiscoveryRelay = useDiscoveryRelay
 
     // Schemas
     const schemaValidator = new SchemaValidator()
@@ -536,6 +540,16 @@ export class AudiusLibs {
         ...this.discoveryProviderConfig
       })
       await this.discoveryProvider.init()
+
+      // set discovery provider in web3 for relay
+      if (this.web3Config && this.useDiscoveryRelay) {
+        const web3Manager = this.web3Manager
+        if (web3Manager === undefined || web3Manager === null) {
+          console.warn("useDiscoveryRelay is set to true but web3Manager is not configured")
+        } else {
+          this.web3Manager?.setDiscoveryProvider(this.discoveryProvider)
+        }
+      }
     }
 
     /** Creator Node */

package/src/services/discoveryProvider/DiscoveryProvider.ts

@@ -22,6 +22,7 @@ import type { EthContracts } from '../ethContracts'
 import type { Web3Manager } from '../web3Manager'
 import { DiscoveryNodeSelector, FetchError, Middleware } from '../../sdk'
 import fetch from 'cross-fetch'
+import type { TransactionReceipt } from 'web3-core'
 
 const MAX_MAKE_REQUEST_RETRY_COUNT = 5
 const MAX_MAKE_REQUEST_RETRIES_WITH_404 = 2
@@ -93,6 +94,17 @@ type DiscoveryNodeChallenge = {
   completed_blocknumber: number
 }
 
+export type DiscoveryRelayBody = {
+  contractRegistryKey?: string | null;
+  contractAddress?: string | null;
+  senderAddress?: string | null;
+  encodedABI?: string | null;
+  gasLimit?: number | null;
+  handle?: string | null;
+  nethermindContractAddress?: string | null;
+  nethermindEncodedAbi?: string | null;
+}
+
 /**
  * Constructs a service class for a discovery node
  * @param whitelist whether or not to only include specified nodes in selection
@@ -1068,6 +1080,15 @@ export class DiscoveryProvider {
     )
   }
 
+  async relay(data: DiscoveryRelayBody): Promise<{ receipt: TransactionReceipt } | null | undefined> {
+    const req = {
+      endpoint: 'relay',
+      method: 'post',
+      data
+    }
+    return await this._makeRequest(req, true, 0, true)
+  }
+
   /**
    * Retrieves an unclaimed ID
    * @return encoded ID

package/src/services/web3Manager/Web3Manager.ts

@@ -18,6 +18,7 @@ import type { HttpProvider, TransactionReceipt, EventLog } from 'web3-core'
 import type { EIP712TypedData } from 'eth-sig-util'
 import type { DecodedLog } from 'abi-decoder'
 import type { AudiusLibs } from '../../AudiusLibs'
+import type { DiscoveryProvider } from '../discoveryProvider'
 
 const DEFAULT_GAS_LIMIT = 2000000
 
@@ -40,18 +41,21 @@ export class Web3Manager {
   ownerWallet?: EthereumWallet
   // Need to maintain the user's provided handle for anti-abuse measures on relay
   userSuppliedHandle?: string
+  discoveryProvider: Nullable<DiscoveryProvider>
+
 
   constructor({
     web3Config,
     identityService,
     hedgehog,
-    isServer = false
+    isServer = false,
   }: Web3ManagerConfig) {
     this.web3Config = web3Config
     this.isServer = isServer
 
     // Unset if externalWeb3 = true
     this.identityService = identityService
+    this.discoveryProvider = null
     this.hedgehog = hedgehog
     this.AudiusABIDecoder = AudiusABIDecoder
   }
@@ -116,6 +120,14 @@ export class Web3Manager {
     this.web3 = web3
   }
 
+  setDiscoveryProvider(discoveryProvider: DiscoveryProvider) {
+    this.discoveryProvider = discoveryProvider
+  }
+
+  useDiscoveryRelay() {
+    return !(this.discoveryProvider === null)
+  }
+
   getWalletAddress() {
     if (this.useExternalWeb3) {
       // Lowercase the owner wallet. Consider using the checksum address.
@@ -231,16 +243,34 @@ export class Web3Manager {
       const response = await retry(
         async (bail) => {
           try {
-            return await this.identityService?.relay(
-              contractRegistryKey,
-              contractAddress,
-              this.ownerWallet!.getAddressString(),
-              encodedABI,
-              gasLimit,
-              this.userSuppliedHandle,
-              nethermindContractAddress,
-              nethermindEncodedAbi
-            )
+            if (this.useDiscoveryRelay()) {
+              // use discovery relay
+              const res = await this.discoveryProvider?.relay({
+                contractRegistryKey,
+                contractAddress,
+                senderAddress: this.ownerWallet!.getAddressString(),
+                encodedABI,
+                gasLimit,
+                handle: this.userSuppliedHandle,
+                nethermindContractAddress,
+                nethermindEncodedAbi
+              })
+              if (res === null || res === undefined) {
+                throw new Error("discovery relay returned empty response")
+              }
+              return res
+            } else {
+              return await this.identityService?.relay(
+                contractRegistryKey,
+                contractAddress,
+                this.ownerWallet!.getAddressString(),
+                encodedABI,
+                gasLimit,
+                this.userSuppliedHandle,
+                nethermindContractAddress,
+                nethermindEncodedAbi
+              )
+            }
           } catch (e: any) {
             // If forbidden, don't retry
             if (e.response.status === 403) {