PROTO-1328: always default to discovery relay (#8247)

AudiusProject · Apr 30, 2024 · 4503cc7 · 4503cc7
1 parent f42c6cd
commit 4503cc7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 38 deletions.
diff --git a/.changeset/nervous-rules-shop.md b/.changeset/nervous-rules-shop.md
@@ -0,0 +1,5 @@
+---
+"@audius/sdk": patch
+---
+
+Using discovery relay for ACDC is not the default behavior.
diff --git a/packages/common/src/services/audius-backend/AudiusBackend.ts b/packages/common/src/services/audius-backend/AudiusBackend.ts
@@ -677,15 +677,6 @@ export const audiusBackend = ({
       monitoringCallbacks.contentNode
     )
 
-    const useDiscoveryRelay = await getFeatureEnabled(
-      FeatureFlags.DISCOVERY_RELAY
-    )
-
-    console.info(
-      { useDiscoveryRelay },
-      `discovery relay${useDiscoveryRelay ? ' ' : ' not '}enabled`
-    )
-
     try {
       const newAudiusLibs = new AudiusLibs({
         localStorage,
@@ -734,17 +725,12 @@ export const audiusBackend = ({
         preferHigherPatchForSecondaries: await getFeatureEnabled(
           FeatureFlags.PREFER_HIGHER_PATCH_FOR_SECONDARIES
         ),
-        hedgehogConfig,
-        useDiscoveryRelay
+        hedgehogConfig
       })
       await newAudiusLibs.init()
       audiusLibs = newAudiusLibs
       onLibsInit(audiusLibs)
-
-      if (useDiscoveryRelay) {
-        // libs not respecting the flag, mod web3 manager manually
-        audiusLibs.web3Manager.discoveryProvider = audiusLibs.discoveryProvider
-      }
+      audiusLibs.web3Manager.discoveryProvider = audiusLibs.discoveryProvider
 
       sanityChecks(audiusLibs)
     } catch (err) {

diff --git a/packages/common/src/services/remote-config/feature-flags.ts b/packages/common/src/services/remote-config/feature-flags.ts
@@ -47,7 +47,6 @@ export enum FeatureFlags {
   USDC_PURCHASES_UPLOAD = 'usdc_purchases_upload',
   AUDIO_MATCHING_CHALLENGES = 'audio_matching_challenges',
   NEW_PLAYLIST_ROUTES = 'new_playlist_routes',
-  DISCOVERY_RELAY = 'discovery_relay',
   FEATURE_FLAG_ACCESS = 'feature_flag_access',
   BUY_USDC_VIA_SOL = 'buy_usdc_via_sol',
   IOS_USDC_PURCHASE_ENABLED = 'ios_usdc_purchase_enabled',
@@ -126,7 +125,6 @@ export const flagDefaults: FlagDefaults = {
   [FeatureFlags.USDC_PURCHASES_UPLOAD]: false,
   [FeatureFlags.AUDIO_MATCHING_CHALLENGES]: false,
   [FeatureFlags.NEW_PLAYLIST_ROUTES]: false,
-  [FeatureFlags.DISCOVERY_RELAY]: false,
   [FeatureFlags.FEATURE_FLAG_ACCESS]: false,
   [FeatureFlags.BUY_USDC_VIA_SOL]: false,
   [FeatureFlags.IOS_USDC_PURCHASE_ENABLED]: true,

diff --git a/packages/libs/src/AudiusLibs.ts b/packages/libs/src/AudiusLibs.ts
@@ -361,7 +361,7 @@ export class AudiusLibs {
     preferHigherPatchForPrimary = true,
     preferHigherPatchForSecondaries = true,
     localStorage,
-    useDiscoveryRelay = false
+    useDiscoveryRelay = true
   }: AudiusLibsConfig) {
     // set version
 
@@ -545,16 +545,8 @@ export class AudiusLibs {
       })
       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.info(
-            'useDiscoveryRelay is set to true but web3Manager is not configured'
-          )
-        } else {
-          this.web3Manager?.setDiscoveryProvider(this.discoveryProvider)
-        }
+      if (this.web3Manager != null) {
+        this.web3Manager.discoveryProvider = this.discoveryProvider
       }
     }
 

diff --git a/packages/libs/src/sdk/services/EntityManager/EntityManager.test.ts b/packages/libs/src/sdk/services/EntityManager/EntityManager.test.ts
@@ -63,7 +63,7 @@ const discoveryNodeSelector = new DiscoveryNodeSelector({
 
 const mswHandlers = [
   rest.post(
-    `${developmentConfig.identityServiceUrl}/relay`,
+    `${discoveryNode}/relay`,
     (_req, res, ctx) => {
       return res(
         ctx.status(200),
@@ -192,14 +192,14 @@ describe('EntityManager', () => {
       const discoveryRelayUrl = await discoveryEntityManager.getRelayEndpoint()
       const identityRelayUrlUndefined =
         await relayEntityManagerUndefined.getRelayEndpoint()
-      const identityRelayUrlFalse =
+        const identityRelayUrlFalse =
         await relayEntityManagerFalse.getRelayEndpoint()
 
       expect(discoveryRelayUrl).toEqual(discoveryNode)
       expect(identityRelayUrlUndefined).toEqual(
-        developmentConfig.identityServiceUrl
+        discoveryRelayUrl
       )
-      expect(identityRelayUrlUndefined).toEqual(identityRelayUrlFalse)
+      expect(discoveryRelayUrl).toEqual(identityRelayUrlFalse)
     })
   })
 })
diff --git a/packages/libs/src/sdk/services/EntityManager/EntityManager.ts b/packages/libs/src/sdk/services/EntityManager/EntityManager.ts
@@ -197,10 +197,6 @@ export class EntityManager implements EntityManagerService {
   }
 
   public async getRelayEndpoint(): Promise<string> {
-    const useDiscoveryRelay = this.config.useDiscoveryRelay
-    if (useDiscoveryRelay === undefined || !useDiscoveryRelay) {
-      return this.config.identityServiceUrl
-    }
     const discoveryEndpoint =
       await this.discoveryNodeSelector.getSelectedEndpoint()
     if (discoveryEndpoint === null) {

diff --git a/packages/libs/src/sdk/services/EntityManager/constants.ts b/packages/libs/src/sdk/services/EntityManager/constants.ts
@@ -7,7 +7,7 @@ export const defaultEntityManagerConfig: EntityManagerConfigInternal = {
   contractAddress: productionConfig.entityManagerContractAddress,
   web3ProviderUrl: productionConfig.web3ProviderUrl,
   identityServiceUrl: productionConfig.identityServiceUrl,
-  useDiscoveryRelay: false,
+  useDiscoveryRelay: true,
   logger: new Logger()
 }