decentraland · dalkia · Jul 20, 2026 · Jul 20, 2026 · Jul 20, 2026 · Jul 20, 2026
@@ -3,7 +3,6 @@
 using CommunicationData.URLHelpers;
 using DCL.AvatarRendering.Loading.Components;
 using DCL.Ipfs;
-using DCL.Utility;
 using ECS.Prioritization.Components;
 using ECS.StreamableLoading;
 using ECS.StreamableLoading.AssetBundles;
@@ -59,11 +58,12 @@ public readonly URN NewSceneEmoteURN() =>
 
         public void CreateAndAddPromiseToWorld(World world, IPartitionComponent partitionComponent, URLSubdirectory? customStreamingSubdirectory, IEmote emote)
         {
+            // Scene emotes are scene content — resolve to the digest-bearing name so URL and cache identity match the scene's ABs.
             var promise = AssetBundlePromise.Create(world,
                 GetAssetBundleIntention.FromHash(
-                    this.EmoteHash + PlatformUtils.GetCurrentPlatform(),
+                    SceneAssetBundleManifestVersion.GetCdnRequestHash(this.EmoteHash),
+                    SceneAssetBundleManifestVersion,
                     typeof(GameObject),
-                    assetBundleManifestVersion: SceneAssetBundleManifestVersion,
                     parentEntityID: SceneId,
                     permittedSources: this.PermittedSources,
                     customEmbeddedSubDirectory: customStreamingSubdirectory.Value,

@@ -11,7 +11,6 @@
 using DCL.Multiplayer.Connections.DecentralandUrls;
 using DCL.PerformanceAndDiagnostics.Analytics;
 using DCL.SDKComponents.AudioSources;
-using DCL.Utility;
 using DCL.WebRequests;
 using ECS.Prioritization.Components;
 using ECS.StreamableLoading.AssetBundles;
@@ -236,15 +235,17 @@ private bool CreateAssetBundlePromiseIfRequired(IEmote component, in GetEmotesBy
             if (component.AssetResults[intention.BodyShape] == null)
             {
                 // The resolution of the AB promise will be finalized by FinalizeEmoteAssetBundleSystem
+                AssetBundleManifestVersion abManifest = component.DTO.AssetBundleManifestVersionOrFailed;
+
                 var promise = AssetBundlePromise.Create(
                     World!,
                     GetAssetBundleIntention.FromHash(
-                        hash! + PlatformUtils.GetCurrentPlatform(),
+                        abManifest.GetCdnRequestHash(hash!),
+                        abManifest,
                         typeof(GameObject),
                         permittedSources: intention.PermittedSources,
                         customEmbeddedSubDirectory: customStreamingSubdirectory,
                         cancellationTokenSource: intention.CancellationTokenSource,
-                        assetBundleManifestVersion: component.DTO.assetBundleManifestVersion,
                         parentEntityID: component.DTO.id
                     ),
                     partitionComponent

@@ -4,9 +4,9 @@
 using Cysharp.Threading.Tasks;
 using DCL.AvatarRendering.Loading.Components;
 using DCL.Diagnostics;
+using DCL.Ipfs;
 using DCL.Multiplayer.Connections.DecentralandUrls;
 using DCL.Optimization.Pools;
-using DCL.Utility;
 using ECS;
 using ECS.Prioritization.Components;
 using ECS.StreamableLoading.AssetBundles;
@@ -47,8 +47,9 @@ public static void CreateThumbnailABPromise(
                 return;
             }
 
-            var assetBundleManifestVersion = attachment.GetAssetBundleManifestVersion();
-            if (assetBundleManifestVersion != null && (assetBundleManifestVersion.IsLSDAsset || assetBundleManifestVersion.assetBundleManifestRequestFailed))
+            AssetBundleManifestVersion? assetBundleManifestVersion = attachment.GetAssetBundleManifestVersion();
+
+            if (assetBundleManifestVersion == null || assetBundleManifestVersion.IsLSDAsset || assetBundleManifestVersion.assetBundleManifestRequestFailed)
             {
                 ReportHub.Log(
                     ReportCategory.THUMBNAILS,
@@ -63,10 +64,10 @@ public static void CreateThumbnailABPromise(
             var promise = AssetBundlePromise.Create(
                 world,
                 GetAssetBundleIntention.FromHash(
-                    hash: thumbnailPath.Value + PlatformUtils.GetCurrentPlatform(),
-                    typeof(Texture2D),
-                    permittedSources: AssetSource.ALL,
+                    hash: assetBundleManifestVersion.GetCdnRequestHash(thumbnailPath.Value),
                     assetBundleManifestVersion: assetBundleManifestVersion,
+                    expectedAssetType: typeof(Texture2D),
+                    permittedSources: AssetSource.ALL,
                     parentEntityID: attachment.GetEntityId(),
                     cancellationTokenSource: cancellationTokenSource ?? new CancellationTokenSource()
                 ),

@@ -219,14 +219,16 @@ private static void CreatePromise<T>(
             }
             else
             {
+                AssetBundleManifestVersion abManifest = wearable.DTO.AssetBundleManifestVersionOrFailed;
+
                 // An index is added to the promise to know to which slot of the WearableAssets it belongs to
                 var promise = AssetBundlePromise.Create(world,
                     GetAssetBundleIntention.FromHash(
-                        hash + PlatformUtils.GetCurrentPlatform(),
+                        abManifest.GetCdnRequestHash(hash),
+                        abManifest,
                         expectedObjectType,
                         permittedSources: intention.PermittedSources,
                         customEmbeddedSubDirectory: customStreamingSubdirectory,
-                        assetBundleManifestVersion: wearable.DTO.assetBundleManifestVersion,
                         parentEntityID: wearable.DTO.id,
                         cancellationTokenSource: intention.CancellationTokenSource),
                     partitionComponent);

@@ -81,7 +81,6 @@ public static class FeatureFlagsStrings
         public const string NEARBY_VOICE_CHAT = "alfa-nearby-voice-chat";
         public const string AVATAR_CONTEXT_MENU = "alfa-avatar-context-menu";
         public const string DOUBLE_CLICK_WALK = "alfa-double-click-walk";
-        public const string AB_DEPS_DIGEST_CACHE_KEY = "alfa-ab-deps-digest-cache-key";
         public const string BYTE_WEIGHTED_LOADING_PROGRESS = "alfa-byte-weighted-loading-progress";
         public const string NEW_LODS = "new-lods";
         public const string FOUNDATION_COMMUNITY_ID = "alfa-foundation-community-id";

@@ -1,6 +1,7 @@
 using CodeLess.Attributes;
 using Cysharp.Threading.Tasks;
 using Global.AppArgs;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using UnityEngine;
@@ -69,7 +70,6 @@ public FeaturesRegistry(
                 [FeatureId.AVATAR_CONTEXT_MENU] = appArgs.ResolveFeatureFlagArg(AppArgsFlags.AVATAR_CONTEXT_MENU, featureFlags.IsEnabled(FeatureFlagsStrings.AVATAR_CONTEXT_MENU) || Application.isEditor),
                 [FeatureId.DOUBLE_CLICK_WALK] = appArgs.ResolveFeatureFlagArg(AppArgsFlags.DOUBLE_CLICK_WALK, featureFlags.IsEnabled(FeatureFlagsStrings.DOUBLE_CLICK_WALK)),
                 [FeatureId.PULSE] = appArgs.ResolveFeatureFlagArg(AppArgsFlags.PULSE_MULTIPLAYER, featureFlags.IsEnabled(FeatureFlagsStrings.PULSE), requireDebug: false) && !localSceneDevelopment,
-                [FeatureId.AB_DEPS_DIGEST_CACHE_KEY] = featureFlags.IsEnabled(FeatureFlagsStrings.AB_DEPS_DIGEST_CACHE_KEY),
                 [FeatureId.BYTE_WEIGHTED_LOADING_PROGRESS] = appArgs.ResolveFeatureFlagArg(AppArgsFlags.BYTE_WEIGHTED_LOADING_PROGRESS, featureFlags.IsEnabled(FeatureFlagsStrings.BYTE_WEIGHTED_LOADING_PROGRESS) || isEditor),
                 [FeatureId.HARDWARE_FINGERPRINT] = appArgs.ResolveFeatureFlagArg(AppArgsFlags.HARDWARE_FINGERPRINT, featureFlags.IsEnabled(FeatureFlagsStrings.HARDWARE_FINGERPRINT)),
                 // Note: COMMUNITIES feature is not cached here because it depends on user identity
@@ -202,6 +202,7 @@ public enum FeatureId
         AVATAR_CONTEXT_MENU = 60,
         DOUBLE_CLICK_WALK = 61,
         NEARBY_VOICE_CHAT = 62,
+        [Obsolete("The v49 deps-digest scheme is always on (gated by the manifest version itself); the flag is no longer read. Kept to preserve enum ordering.")]
         AB_DEPS_DIGEST_CACHE_KEY = 63,
         BYTE_WEIGHTED_LOADING_PROGRESS = 64,
         PULSE = 65,

@@ -2,7 +2,7 @@
 using Arch.System;
 using Arch.SystemGroups;
 using DCL.Diagnostics;
-using DCL.Utility;
+using DCL.Ipfs;
 using ECS.Abstract;
 using ECS.StreamableLoading;
 using ECS.StreamableLoading.AssetBundles;
@@ -70,14 +70,13 @@ private void Prepare(in Entity entity, ref GetGltfContainerAssetIntention intent
                 World.Add(entity, GetGLTFIntention.Create(intention.Name, intention.Hash));
             else
             {
-                var abIntention = GetAssetBundleIntention.Create(typeof(GameObject), $"{intention.Hash}{PlatformUtils.GetCurrentPlatform()}", intention.Name);
-                // Pre-populate so PrepareAssetBundleLoadingParametersSystem doesn't have to look it up by the
-                // platform-suffixed hash (the digest map is keyed by bare hashes).
-                //This will go away when the urls include the depsDigest
-                if (sceneData.SceneEntityDefinition.assetBundleManifestVersion is { } manifest
-                    && manifest.TryGetDepsDigest(intention.Hash, out string digest))
-                    abIntention.DepsDigest = digest;
-                World.Add(entity, abIntention);
+                AssetBundleManifestVersion abManifest = sceneData.SceneEntityDefinition.AssetBundleManifestVersionOrFailed;
+
+                World.Add(entity, GetAssetBundleIntention.Create(typeof(GameObject),
+                    abManifest.GetCdnRequestHash(intention.Hash),
+                    intention.Name,
+                    abManifest,
+                    sceneData.SceneEntityDefinition.id ?? string.Empty));
             }
         }
 

@@ -58,7 +58,7 @@ private static async UniTask CheckAssetBundleManifestFallbackInternalAsync(World
                 else
                 {
                     assetBundleManifest.TryLogException();
-                    entityDefinition.assetBundleManifestVersion = AssetBundleManifestVersion.CreateFailed();
+                    entityDefinition.assetBundleManifestVersion = AssetBundleManifestVersion.FAILED;
                 }
             }
         }

@@ -1,10 +1,8 @@
 using AssetManagement;
 using CommunicationData.URLHelpers;
 using DCL.Ipfs;
-using DCL.Utility;
 using ECS.StreamableLoading.Cache.Disk.Cacheables;
 using ECS.StreamableLoading.Common.Components;
-using SceneRunner.Scene;
 using System;
 using System.Threading;
 using UnityEngine;
@@ -15,9 +13,11 @@ public struct GetAssetBundleIntention : ILoadingIntention, IEquatable<GetAssetBu
     {
         public string? Hash;
 
-        public AssetBundleManifestVersion? AssetBundleManifestVersion;
         public string ParentEntityID;
 
+        //Backing for AssetBundleManifest — nullable because default-initialized structs zero reference fields; set by every factory.
+        private AssetBundleManifestVersion? assetBundleManifest;
+
         /// <summary>
         ///     If the expected object type is null we don't know which asset will be loaded.
         ///     It's valid for dependencies for which we need to load the asset bundle itself only
@@ -35,20 +35,12 @@ public struct GetAssetBundleIntention : ILoadingIntention, IEquatable<GetAssetBu
         /// </summary>
         internal Hash128? cacheHash;
 
-        /// <summary>
-        ///     Per-file dependency digest from the v49+ scene asset-bundle manifest. Two scenes can request the same
-        ///     <see cref="Hash"/> with different dependency closures; this field disambiguates them in the cache.
-        ///     Empty for legacy (pre-v49) entries — those keep their historical key.
-        /// </summary>
-        public string? DepsDigest;
-
         public bool IsDependency;
         public bool LookForDependencies;
 
-        private GetAssetBundleIntention(Type? expectedObjectType, string? name = null,
+        private GetAssetBundleIntention(Type? expectedObjectType, AssetBundleManifestVersion assetBundle, string? name = null,
             string? hash = null, AssetSource permittedSources = AssetSource.ALL,
             URLSubdirectory customEmbeddedSubDirectory = default,
-            AssetBundleManifestVersion? assetBundleVersion = null,
             string parentEntityID = "",
             bool isDependency = false,
             bool lookForDependencies = false,
@@ -62,10 +54,9 @@ private GetAssetBundleIntention(Type? expectedObjectType, string? name = null,
 
             CommonArguments = new CommonLoadingArguments(URLAddress.EMPTY, customEmbeddedSubDirectory, permittedSources: permittedSources, cancellationTokenSource: cancellationTokenSource);
             cacheHash = null;
-            DepsDigest = null;
 
             ParentEntityID = parentEntityID;
-            AssetBundleManifestVersion = assetBundleVersion;
+            assetBundleManifest = assetBundle;
             IsDependency = isDependency;
             LookForDependencies = lookForDependencies;
         }
@@ -75,37 +66,35 @@ internal GetAssetBundleIntention(CommonLoadingArguments commonArguments) : this(
             CommonArguments = commonArguments;
         }
 
+        /// <summary>An AB can never be requested without a manifest: every factory sets one, and default-initialized structs (which never flow into loading) observe the failed sentinel.</summary>
+        public readonly AssetBundleManifestVersion AssetBundleManifest => assetBundleManifest ?? AssetBundleManifestVersion.FAILED;
+
+        // Hash alone identifies the bundle: v49+ hashes carry the deps digest inside the file name, so two dependency closures never share a Hash.
         public bool Equals(GetAssetBundleIntention other) =>
-            StringComparer.OrdinalIgnoreCase.Equals(Hash, other.Hash)
-            && StringComparer.OrdinalIgnoreCase.Equals(DepsDigest ?? string.Empty, other.DepsDigest ?? string.Empty);
+            StringComparer.OrdinalIgnoreCase.Equals(Hash, other.Hash);
 
         public CommonLoadingArguments CommonArguments { get; set; }
 
         public CancellationTokenSource CancellationTokenSource => CommonArguments.CancellationTokenSource;
 
-        public static GetAssetBundleIntention Create(Type? expectedAssetType, string hash, string name, AssetSource permittedSources = AssetSource.ALL,
+        public static GetAssetBundleIntention Create(Type? expectedAssetType, string hash, string name, AssetBundleManifestVersion assetBundleManifestVersion, string parentEntityID, AssetSource permittedSources = AssetSource.ALL,
             URLSubdirectory customEmbeddedSubDirectory = default) =>
-            new (expectedAssetType, hash: hash, name: name, permittedSources: permittedSources, customEmbeddedSubDirectory: customEmbeddedSubDirectory);
+            new (expectedAssetType, assetBundleManifestVersion, hash: hash, name: name, parentEntityID: parentEntityID, permittedSources: permittedSources, customEmbeddedSubDirectory: customEmbeddedSubDirectory);
 
-        public static GetAssetBundleIntention FromHash(string hash, Type? expectedAssetType = null, AssetSource permittedSources = AssetSource.ALL,
+        public static GetAssetBundleIntention FromHash(string hash, AssetBundleManifestVersion assetBundleManifestVersion, Type? expectedAssetType = null, AssetSource permittedSources = AssetSource.ALL,
             URLSubdirectory customEmbeddedSubDirectory = default, CancellationTokenSource cancellationTokenSource = null,
-            AssetBundleManifestVersion? assetBundleManifestVersion = null, string parentEntityID = "", bool isDependency = false, bool lookForDependencies = false) =>
-            new (expectedAssetType, hash: hash, assetBundleVersion: assetBundleManifestVersion, parentEntityID: parentEntityID, permittedSources: permittedSources, customEmbeddedSubDirectory: customEmbeddedSubDirectory, isDependency: isDependency, lookForDependencies: lookForDependencies, cancellationTokenSource: cancellationTokenSource);
+            string parentEntityID = "", bool isDependency = false, bool lookForDependencies = false) =>
+            new (expectedAssetType, assetBundleManifestVersion, hash: hash, parentEntityID: parentEntityID, permittedSources: permittedSources, customEmbeddedSubDirectory: customEmbeddedSubDirectory, isDependency: isDependency, lookForDependencies: lookForDependencies, cancellationTokenSource: cancellationTokenSource);
 
         public override bool Equals(object obj) =>
             obj is GetAssetBundleIntention other && Equals(other);
 
         public override int GetHashCode() =>
-            HashCode.Combine(
-                StringComparer.OrdinalIgnoreCase.GetHashCode(Hash ?? string.Empty),
-                StringComparer.OrdinalIgnoreCase.GetHashCode(DepsDigest ?? string.Empty));
+            StringComparer.OrdinalIgnoreCase.GetHashCode(Hash ?? string.Empty);
 
         public override string ToString() =>
             $"Get Asset Bundle: {Name} ({Hash})";
 
-        public static string BuildInitialSceneStateURL(string initialSceneStateID) =>
-            $"staticscene_{initialSceneStateID}{PlatformUtils.GetCurrentPlatform()}";
-
         public class DiskHashCompute : AbstractDiskHashCompute<GetAssetBundleIntention>
         {
             public static readonly DiskHashCompute INSTANCE = new ();
@@ -114,11 +103,8 @@ private DiskHashCompute() { }
 
             protected override void FillPayload(IHashKeyPayload keyPayload, in GetAssetBundleIntention asset)
             {
+                // The hash alone keys the on-disk file (v49+ hashes embed the digest); digest-less hashes keep their legacy key so existing entries keep hitting.
                 keyPayload.Put(asset.Hash ?? asset.Name!);
-
-                // Only contribute to the disk key when present so legacy 2-part-filename entries keep their existing on-disk file.
-                if (!string.IsNullOrEmpty(asset.DepsDigest))
-                    keyPayload.Put(asset.DepsDigest);
             }
         }
 

@@ -34,7 +34,7 @@ public GetISSDescriptorIntention(string sceneId, AssetBundleManifestVersion mani
         // Manifest is required: callers reach this only after the scene definition (and therefore its manifest)
         // has been loaded. A valid manifest should be available at this point
         public static GetISSDescriptorIntention For(SceneEntityDefinition definition) =>
-            new (definition.id, definition.assetBundleManifestVersion ?? AssetBundleManifestVersion.CreateFailed());
+            new (definition.id, definition.assetBundleManifestVersion ?? AssetBundleManifestVersion.FAILED);
 
         public bool Equals(GetISSDescriptorIntention other) =>
             SceneId == other.SceneId;
-Original file line number
+Diff line change
@@ Expand Up @@
                     else
                     {
                         assetBundleManifest.TryLogException();
-                        entityDefinition.assetBundleManifestVersion = AssetBundleManifestVersion.CreateFailed();
+                        entityDefinition.assetBundleManifestVersion = AssetBundleManifestVersion.FAILED;
                     }
                 }
             }
@@ Expand Down @@