merge queue: embarking main (1894329), #4101 and #4100 together

.mergify.yml

@@ -8,31 +8,32 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - base = main
     merge_method: merge
+    autosquash: true   
 
   - name: backport-0.46-queue
     batch_size: 3
     queue_conditions:
       - "#approved-reviews-by >= 1"
       - base = maint-0.46
     merge_method: merge
+    autosquash: true   
 
 pull_request_rules:
   - name: automatic merge to main or backport branch
     conditions:
-        - label = "merge"
-        - label != "do-not-merge"
-        - "#approved-reviews-by >= 1"
-        - or:
-          - base = main
-          - base = maint-0.46
+      - label = "merge"
+      - label != "do-not-merge"
+      - "#approved-reviews-by >= 1"
+      - or:
+        - base = main
+        - base = maint-0.46
     actions:
       queue:
-        autosquash: true   
 
   - name: notify when a PR is removed from the queue
     conditions:
-    - queue-dequeue-reason != none
-    - queue-dequeue-reason != pr-merged
+      - queue-dequeue-reason != none
+      - queue-dequeue-reason != pr-merged
     actions:
       comment:
         message: >

crates/shielded_token/src/masp/shielded_wallet.rs

@@ -472,6 +472,11 @@ pub trait ShieldedApi<U: ShieldedUtils + MaybeSend + MaybeSync>:
     ) -> Option<AssetData> {
         // Try to find the decoding in the cache
         if let decoded @ Some(_) = self.asset_types.get(&asset_type) {
+            tracing::debug!(
+                "Asset type: {}, found cached data: {:#?}",
+                asset_type,
+                decoded
+            );
             return decoded.cloned();
         }
         // Query for the ID of the last accepted transaction
@@ -1701,6 +1706,10 @@ pub trait ShieldedApi<U: ShieldedUtils + MaybeSend + MaybeSync>:
         if self.decode_asset_type(client, asset_type).await.is_none() {
             // If we fail to decode the epoched asset type, then remove the
             // epoch
+            tracing::debug!(
+                "Failed to decode epoched asset type, undating it: {:#?}",
+                decoded
+            );
             decoded.undate();
             asset_type = decoded
                 .encode()