Merge pull request #5779 from decentraland/release/release-20231009

Release: release 2023 10 09
decentraland · Oct 9, 2023 · 606ec56 · 606ec56
2 parents 60a8fe3 + 87a66a8
commit 606ec56
Show file tree

Hide file tree

Showing 215 changed files with 31,673 additions and 4,766 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,32 +1,35 @@
 
-## **Issue Description:**
+### **Issue Description:**
 <!-- Short description of the observed issue -->
 
 ### **Steps to reproduce:**
 
-1.
-2.
-3.
-4.
-5.
-
-
+  1.
+  2.
+  3.
 
 ### **Expected behaviour:**
 
 
-
 ### **Current behaviour:**
 
 
-
 ### **Reproduction rate:**
-<!-- Values from 5/5 -->
 
 
 ### **Severity:**
 <!-- Cosmetic, Minor, Medium, High, Critical, Blocker -->
-
+- [ ] Cosmetic
+- [ ] Minor
+- [ ] Medium
+- [ ] High
+- [ ] Critical
+- [ ] Blocker
+
+### **Priority:**
+- [ ] High
+- [ ] Medium
+- [ ] Low
 
 ### **Platforms:**
 - [ ] Windows
@@ -37,14 +40,18 @@
 - [ ] Google Chrome
 - [ ] Microsoft Edge
 - [ ] Firefox
+- [ ] Desktop
+- [ ] Not Browser Specific
 
 ### **Environment:**
 - [ ] Production
 - [ ] Branch specific
 - [ ] Release Branch
 
 
-### **Additional Notes:**
+#### **Evidence:**
+
+#### **Additional Notes:**
+
 
-### **Evidence:**
 
diff --git a/browser-interface/packages/shared/analytics/types.ts b/browser-interface/packages/shared/analytics/types.ts
@@ -95,4 +95,6 @@ export type TrackEvents = PositionTrackEvents & {
   ['seamless_login tos accepted']: Record<string, never> // {}
   ['seamless_login tos rejected']: Record<string, never> // {}
   ['seamless_login go to tos']: Record<string, never> // {}
+
+  ['DEFAULT_REALM']: { message: string }
 }
diff --git a/browser-interface/packages/shared/apis/host/PortableExperiences.ts b/browser-interface/packages/shared/apis/host/PortableExperiences.ts
@@ -13,7 +13,7 @@ import type { PortContext } from './context'
 import * as codegen from '@dcl/rpc/dist/codegen'
 
 import { PortableExperiencesServiceDefinition } from 'shared/protocol/decentraland/kernel/apis/portable_experiences.gen'
-import { isDclEns } from '../../realm/resolver'
+import { isEns } from '../../realm/resolver'
 
 export function registerPortableExperiencesServiceServerImplementation(port: RpcServerPort<PortContext>) {
   codegen.registerService(port, PortableExperiencesServiceDefinition, async () => ({
@@ -30,7 +30,7 @@ export function registerPortableExperiencesServiceServerImplementation(port: Rpc
         return px
       }
       // Load via Worlds ENS url
-      if (!isDclEns(req.ens)) throw new Error('Invalid ens name')
+      if (!isEns(req.ens)) throw new Error('Invalid ens name')
       const px = await spawnPortableExperienceFromEns(req.ens, ctx.sceneData.id)
       return { ...px, ens: req.ens }
     },

diff --git a/browser-interface/packages/shared/apis/host/Runtime.ts b/browser-interface/packages/shared/apis/host/Runtime.ts
@@ -29,7 +29,7 @@ export function registerRuntimeServiceServerImplementation(port: RpcServerPort<P
           baseUrl,
           realmName: realmAdapter.about.configurations?.realmName ?? '',
           networkId: realmAdapter.about.configurations?.networkId ?? 1,
-          commsAdapter: realmAdapter.about.comms?.fixedAdapter ?? '',
+          commsAdapter: realmAdapter.about.comms?.adapter ?? '',
           isPreview: PREVIEW
         }
       }

diff --git a/browser-interface/packages/shared/comms/sagas.ts b/browser-interface/packages/shared/comms/sagas.ts
@@ -196,7 +196,6 @@ function* pingerProcess() {
 function* handleConnectToComms(action: ConnectToCommsAction) {
   try {
     const identity: ExplorerIdentity = yield select(getCurrentIdentity)
-
     yield put(setCommsIsland(action.payload.event.islandId))
 
     const adapter: RoomConnection = yield call(connectAdapter, action.payload.event.connStr, identity)
@@ -294,7 +293,7 @@ async function connectAdapter(connStr: string, identity: ExplorerIdentity): Prom
         logger: commsLogger,
         url: theUrl.origin + theUrl.pathname,
         token,
-        globalAudioStream: await getGlobalAudioStream(),
+        globalAudioStream: await getGlobalAudioStream()
       })
 
       store.dispatch(setLiveKitAdapter(livekitAdapter))

diff --git a/browser-interface/packages/shared/dao/index.ts b/browser-interface/packages/shared/dao/index.ts
@@ -66,7 +66,7 @@ export async function fetchCatalystStatus(
     aboutResponse.status === ServerConnectionStatus.OK &&
     result &&
     result.comms &&
-    result.configurations && 
+    result.configurations &&
     result.configurations.realmName &&
     result.bff &&
     result.content &&
@@ -170,7 +170,7 @@ async function resolveOfflineRealmAboutFromConnectionString(
         comms: {
           healthy: false,
           protocol: params.get('protocol') || 'offline',
-          fixedAdapter: params.get('fixedAdapter') || 'offline:offline'
+          adapter: params.get('adapter') || params.get('fixedAdapter') || 'offline:offline'
         },
         configurations: {
           realmName: realmString,
@@ -231,7 +231,6 @@ export async function changeRealm(realmString: string, forceChange: boolean = fa
   commsLogger.info('Connecting to realm', realmString)
 
   const newAdapter = await adapterForRealmConfig(realmConfig.baseUrl, realmConfig.about, identity)
-
   if (newAdapter) {
     store.dispatch(setRealmAdapter(newAdapter))
   } else {

diff --git a/browser-interface/packages/shared/dao/sagas.ts b/browser-interface/packages/shared/dao/sagas.ts
@@ -108,7 +108,6 @@ function clearQsRealm() {
 
 function* tryConnectRealm(realm: string) {
   const realmConfig = yield call(resolveRealmConfigFromString, realm)
-
   const lastConnectedCandidates = yield select(getLastConnectedCandidates)
   lastConnectedCandidates.set(realmConfig.baseUrl, Date.now())
   yield put(setLastConnectedCandidates(lastConnectedCandidates))

diff --git a/browser-interface/packages/shared/meta/sagas.ts b/browser-interface/packages/shared/meta/sagas.ts
@@ -35,7 +35,6 @@ export function* metaSaga(): any {
     ...config,
     featureFlagsV2: flagsAndVariants
   }
-
   yield put(metaConfigurationInitialized(merge))
 }
 

diff --git a/browser-interface/packages/shared/realm/connections/ArchipelagoConnection.ts b/browser-interface/packages/shared/realm/connections/ArchipelagoConnection.ts
@@ -23,16 +23,14 @@ function craftMessage(packet: ClientPacket): Uint8Array {
 
 export async function createArchipelagoConnection(
   baseUrl: string,
+  archipelagoUrl: string,
   about: AboutResponse,
   identity: ExplorerIdentity
 ): Promise<IRealmAdapter> {
   const logger = createLogger('Archipelago handshake: ')
   const address = identity.address
-  const url = new URL('/archipelago/ws', baseUrl).toString()
-  const wsUrl = url.replace(/^http/, 'ws')
-
   const connected = future<void>()
-  const ws = new WebSocket(wsUrl, 'archipelago')
+  const ws = new WebSocket(archipelagoUrl, 'archipelago')
   ws.binaryType = 'arraybuffer'
   ws.onopen = () => connected.resolve()
 

diff --git a/browser-interface/packages/shared/realm/logic.ts b/browser-interface/packages/shared/realm/logic.ts
@@ -5,8 +5,12 @@ export function hookConnectToFixedAdaptersIfNecessary(realm: IRealmAdapter) {
   let connStr: string | undefined = undefined
 
   if (realm.about.comms?.fixedAdapter) {
-    connStr = realm.about.comms?.fixedAdapter
-  } else if (realm.about.comms?.protocol === 'v3' && !realm.about.bff?.healthy) {
+    connStr = realm.about.comms?.fixedAdapter as string
+  } else if (realm.about.comms?.adapter && realm.about.comms?.adapter.startsWith('fixed-adapter')) {
+    const adapter = realm.about.comms?.adapter
+    const ix = adapter.indexOf(':')
+    connStr = adapter.substring(ix + 1)
+  } else if (realm.about.comms?.protocol === 'v3' && !realm.about.comms?.healthy) {
     connStr = `offline`
   }
 

diff --git a/browser-interface/packages/shared/realm/resolver.ts b/browser-interface/packages/shared/realm/resolver.ts
@@ -46,7 +46,14 @@ export async function adapterForRealmConfig(
   }
 
   if (about.bff?.healthy) {
-    return createArchipelagoConnection(baseUrl, about, identity)
+    if (about.comms?.adapter && about.comms.adapter.startsWith('archipelago:archipelago')) {
+      const archipelagoUrl = about.comms.adapter.substring('archipelago:archipelago:'.length)
+      return createArchipelagoConnection(baseUrl, archipelagoUrl, about, identity)
+    } else {
+      const url = baseUrl + '/archipelago/ws'
+      const wsUrl = url.replace(/^http/, 'ws')
+      return createArchipelagoConnection(baseUrl, wsUrl, about, identity)
+    }
   }
 
   // return a mocked Archipelago
@@ -64,8 +71,8 @@ export function prettyRealmName(realm: string, candidates: Candidate[]) {
   return realm
 }
 
-export function isDclEns(str: string | undefined): str is `${string}.dcl.eth` {
-  return !!str?.match(/^[a-zA-Z0-9]+\.dcl\.eth$/)?.length
+export function isEns(str: string | undefined): str is `${string}.eth` {
+  return !!str?.match(/^[a-zA-Z0-9.]+\.eth$/)?.length
 }
 
 export function dclWorldUrl(dclName: string) {
@@ -79,7 +86,7 @@ export function realmToConnectionString(realm: IRealmAdapter) {
     return realmName
   }
 
-  if (isDclEns(realmName) && realm.baseUrl === dclWorldUrl(realmName)) {
+  if (isEns(realmName) && realm.baseUrl === dclWorldUrl(realmName)) {
     return realmName
   }
 
@@ -98,7 +105,7 @@ export function resolveRealmBaseUrlFromRealmQueryParameter(realmString: string,
     }
   }
 
-  if (isDclEns(realmString)) {
+  if (isEns(realmString)) {
     return dclWorldUrl(realmString)
   }
 

diff --git a/browser-interface/test/sceneEvents/comms.spec.ts b/browser-interface/test/sceneEvents/comms.spec.ts
@@ -20,7 +20,7 @@ import { reducers } from 'shared/store/rootReducer'
 import { allScenesEvent } from 'shared/world/parcelSceneManager'
 
 const about: AboutResponse = {
-  comms: { healthy: false, protocol: 'v2' },
+  comms: { healthy: false, protocol: 'v2', adapter: 'offline' },
   configurations: {
     scenesUrn: [],
     globalScenesUrn: [],

diff --git a/browser-interface/test/unit/comms-resolver.test.tsx b/browser-interface/test/unit/comms-resolver.test.tsx
@@ -19,7 +19,7 @@ describe('Comms resolver', () => {
         comms: {
           healthy: false,
           protocol: 'offline',
-          fixedAdapter: 'offline:offline'
+          adapter: 'offline:offline'
         },
         configurations: {
           realmName: 'offline',
@@ -48,7 +48,7 @@ describe('Comms resolver', () => {
         comms: {
           healthy: false,
           protocol: 'offline',
-          fixedAdapter: 'offline:offline'
+          adapter: 'offline:offline'
         },
         configurations: {
           realmName: 'offline?baseUrl=peer.decentraland.zone',
@@ -76,7 +76,7 @@ describe('Comms resolver', () => {
         comms: {
           healthy: false,
           protocol: 'offline',
-          fixedAdapter: 'offline:offline'
+          adapter: 'offline:offline'
         },
         configurations: {
           realmName: 'offline?baseUrl=https://peer.decentraland.zone',
@@ -104,7 +104,7 @@ describe('Comms resolver', () => {
         comms: {
           healthy: false,
           protocol: 'offline',
-          fixedAdapter: 'offline:offline'
+          adapter: 'offline:offline'
         },
         configurations: {
           realmName: 'offline?baseUrl=http://peer.decentraland.zone',

diff --git a/renderer-protocol/proto/decentraland/renderer/about.proto b/renderer-protocol/proto/decentraland/renderer/about.proto
@@ -5,7 +5,7 @@ message AboutResponse {
   bool healthy = 1;
   AboutConfiguration configurations = 2;
   ContentInfo content = 3;
-  CommsInfo comms = 4;
+  optional CommsInfo comms = 4;
   LambdasInfo lambdas = 5;
   optional BffInfo bff = 6;
   bool accepting_users = 7;
@@ -61,7 +61,9 @@ message AboutResponse {
     // specific properties
     string protocol = 50;
     optional int32 users_count = 51;
-    optional string fixed_adapter = 52;
+    // Deprecated: Use adapter instead. This field may be removed in the future.
+    optional string fixed_adapter = 52 [deprecated = true];
+    string adapter = 53;
   }
   message BffInfo {
     // common properties
@@ -73,4 +75,4 @@ message AboutResponse {
     optional int32 user_count = 51;
     optional string protocol_version = 52;
   }
-}
+}
diff --git a/unity-renderer/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/unity-renderer/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: AddressableAssetSettings
   m_EditorClassIdentifier: 
   m_DefaultGroup: 2ba95c866c28abd43a150e06c782a8a7
-  m_CachedHash:
+  m_currentHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
@@ -32,11 +32,14 @@ MonoBehaviour:
   m_ShaderBundleNaming: 0
   m_ShaderBundleCustomNaming: 
   m_MonoScriptBundleNaming: 0
+  m_CheckForContentUpdateRestrictionsOption: 0
   m_MonoScriptBundleCustomNaming: 
   m_RemoteCatalogBuildPath:
     m_Id: 8b2418b529ba0964b80e889a36a5c2fe
   m_RemoteCatalogLoadPath:
     m_Id: 57100c7a11f6c74499fda4a46a939cc0
+  m_ContentStateBuildPathProfileVariableName: 
+  m_CustomContentStateBuildPath: 
   m_ContentStateBuildPath: 
   m_BuildAddressablesWithPlayerBuild: 0
   m_overridePlayerVersion: 
@@ -61,6 +64,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 90968b9c92a084c9c8a44c744ce97b08, type: 2}
   - {fileID: 11400000, guid: 5b335e2b63a3fce4da2bd4f9c6045770, type: 2}
   - {fileID: 11400000, guid: 888bff1f4e4860648a92ed3de601e6da, type: 2}
+  - {fileID: 11400000, guid: 06506309e25210e49a3e8f6f591053ad, type: 2}
+  - {fileID: 11400000, guid: 1148056255f8c314a9ea6d6e03cd556b, type: 2}
   m_BuildSettings:
     m_CompileScriptsInVirtualMode: 0
     m_CleanupStreamingAssetsAfterBuilds: 1
@@ -123,3 +128,4 @@ MonoBehaviour:
     m_Settings: {fileID: 11400000}
     m_NextInstanceId: 0
     m_RegisteredServiceTypeRefs: []
+    m_PingTimeoutInMilliseconds: 5000