@talismn/balances 0.0.0-pr2092-20250715131755 → 0.0.0-pr2093-20250715143904

package/dist/declarations/src/BalancesProvider.d.ts

@@ -21,7 +21,9 @@ export declare class BalancesProvider {
     private getNetworkBalances$;
     private getPolkadotNetworkModuleBalances$;
     private getEthereumNetworkModuleBalances$;
-    private updateStorage$;
+    private updateStoredBalances;
+    private updateStoredMiniMetadatas;
+    private processStorageUpdatesQueue;
     private getNetworkMiniMetadatas$;
     private getNetworkSpecVersion$;
     private getMiniMetadatas$;

package/dist/talismn-balances.cjs.dev.js

@@ -6238,6 +6238,10 @@ class BalancesProvider {
   #chaindataProvider;
   #chainConnectors;
   #storage;
+
+  // storage is updated at high frequency, use a queue to avoid race conditions
+  #updateStorageQueue = [];
+  #isProcessingStorageUpdates = false;
   constructor(chaindataProvider, chainConnectors, storage = DEFAULT_STORAGE) {
     this.#chaindataProvider = chaindataProvider;
     this.#chainConnectors = chainConnectors;
@@ -6364,9 +6368,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       rxjs.shareReplay({
         refCount: true,
@@ -6414,9 +6416,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       rxjs.shareReplay({
         refCount: true,
@@ -6430,20 +6430,72 @@ class BalancesProvider {
       })));
     });
   }
-  updateStorage$(balanceIds, balancesResult) {
+  updateStoredBalances(balanceIds, balancesResult) {
     if (balancesResult.status !== "live") return;
+    this.#updateStorageQueue.push({
+      type: "balances",
+      balanceIds,
+      balances: balancesResult.balances
+    });
+    this.processStorageUpdatesQueue();
+  }
+  updateStoredMiniMetadatas(networkId, miniMetadatas) {
+    this.#updateStorageQueue.push({
+      type: "miniMetadatas",
+      networkId,
+      miniMetadatas
+    });
+    this.processStorageUpdatesQueue();
+  }
+  processStorageUpdatesQueue() {
+    if (this.#updateStorageQueue.length > 1) log.warn("[balances] this message is the proof that there are sometimes racing conditions, and that we avoided them :)");
+    if (this.#isProcessingStorageUpdates || !this.#updateStorageQueue.length) return;
+    this.#isProcessingStorageUpdates = true;
     const storage = this.#storage.getValue();
-    const balances = lodashEs.assign({}, storage.balances,
-    // delete all balances expected in the result set. because if they are not present it means they are empty.
-    lodashEs.fromPairs(balanceIds.map(balanceId => [balanceId, undefined])), lodashEs.keyBy(
-    // storage balances must have status "cache", because they are used as start value when initialising subsequent subscriptions
-    balancesResult.balances.map(b => ({
-      ...b,
-      status: "cache"
-    })), b => getBalanceId(b)));
-    this.#storage.next(lodashEs.assign({}, storage, {
-      balances
-    }));
+    const balances = {
+      ...storage.balances
+    };
+    const miniMetadatas = {
+      ...storage.miniMetadatas
+    };
+    while (this.#updateStorageQueue.length) {
+      const queueItem = this.#updateStorageQueue.shift();
+      switch (queueItem?.type) {
+        case "miniMetadatas":
+          {
+            const {
+              networkId,
+              miniMetadatas: newMiniMetadatas
+            } = queueItem;
+
+            // remove old miniMetadatas for the network
+            for (const miniMetadata of lodashEs.values(miniMetadatas)) if (miniMetadata.chainId === networkId) delete miniMetadatas[miniMetadata.id];
+
+            // add new ones
+            for (const miniMetadata of newMiniMetadatas) miniMetadatas[miniMetadata.id] = miniMetadata;
+            break;
+          }
+        case "balances":
+          {
+            const {
+              balanceIds,
+              balances: newBalances
+            } = queueItem;
+
+            // remove all balances expected in the result set
+            for (const balanceId of balanceIds) delete balances[balanceId];
+
+            // add new ones
+            for (const balance of newBalances) balances[getBalanceId(balance)] = balance;
+            break;
+          }
+      }
+      this.#storage.next({
+        balances,
+        miniMetadatas
+      });
+      this.#isProcessingStorageUpdates = false;
+    }
   }
   getNetworkMiniMetadatas$(networkId) {
     return util.getSharedObservable(`BalancesProvider.getNetworkMiniMetadatas$`, {
@@ -6495,15 +6547,7 @@ class BalancesProvider {
       // and persist in storage for later reuse
       rxjs.tap(newMiniMetadatas => {
         if (!newMiniMetadatas.length) return;
-        const storage = this.#storage.getValue();
-        const miniMetadatas = lodashEs.assign(
-        // keep minimetadatas of other networks
-        lodashEs.keyBy(lodashEs.values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
-        // add the ones for our network
-        lodashEs.keyBy(newMiniMetadatas, m => m.id));
-        this.#storage.next(lodashEs.assign({}, storage, {
-          miniMetadatas
-        }));
+        this.updateStoredMiniMetadatas(networkId, newMiniMetadatas);
       }));
     }),
     // emit only when mini metadata changes, as a change here would restart all subscriptions for the network

package/dist/talismn-balances.cjs.prod.js

@@ -6238,6 +6238,10 @@ class BalancesProvider {
   #chaindataProvider;
   #chainConnectors;
   #storage;
+
+  // storage is updated at high frequency, use a queue to avoid race conditions
+  #updateStorageQueue = [];
+  #isProcessingStorageUpdates = false;
   constructor(chaindataProvider, chainConnectors, storage = DEFAULT_STORAGE) {
     this.#chaindataProvider = chaindataProvider;
     this.#chainConnectors = chainConnectors;
@@ -6364,9 +6368,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       rxjs.shareReplay({
         refCount: true,
@@ -6414,9 +6416,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       rxjs.shareReplay({
         refCount: true,
@@ -6430,20 +6430,72 @@ class BalancesProvider {
       })));
     });
   }
-  updateStorage$(balanceIds, balancesResult) {
+  updateStoredBalances(balanceIds, balancesResult) {
     if (balancesResult.status !== "live") return;
+    this.#updateStorageQueue.push({
+      type: "balances",
+      balanceIds,
+      balances: balancesResult.balances
+    });
+    this.processStorageUpdatesQueue();
+  }
+  updateStoredMiniMetadatas(networkId, miniMetadatas) {
+    this.#updateStorageQueue.push({
+      type: "miniMetadatas",
+      networkId,
+      miniMetadatas
+    });
+    this.processStorageUpdatesQueue();
+  }
+  processStorageUpdatesQueue() {
+    if (this.#updateStorageQueue.length > 1) log.warn("[balances] this message is the proof that there are sometimes racing conditions, and that we avoided them :)");
+    if (this.#isProcessingStorageUpdates || !this.#updateStorageQueue.length) return;
+    this.#isProcessingStorageUpdates = true;
     const storage = this.#storage.getValue();
-    const balances = lodashEs.assign({}, storage.balances,
-    // delete all balances expected in the result set. because if they are not present it means they are empty.
-    lodashEs.fromPairs(balanceIds.map(balanceId => [balanceId, undefined])), lodashEs.keyBy(
-    // storage balances must have status "cache", because they are used as start value when initialising subsequent subscriptions
-    balancesResult.balances.map(b => ({
-      ...b,
-      status: "cache"
-    })), b => getBalanceId(b)));
-    this.#storage.next(lodashEs.assign({}, storage, {
-      balances
-    }));
+    const balances = {
+      ...storage.balances
+    };
+    const miniMetadatas = {
+      ...storage.miniMetadatas
+    };
+    while (this.#updateStorageQueue.length) {
+      const queueItem = this.#updateStorageQueue.shift();
+      switch (queueItem?.type) {
+        case "miniMetadatas":
+          {
+            const {
+              networkId,
+              miniMetadatas: newMiniMetadatas
+            } = queueItem;
+
+            // remove old miniMetadatas for the network
+            for (const miniMetadata of lodashEs.values(miniMetadatas)) if (miniMetadata.chainId === networkId) delete miniMetadatas[miniMetadata.id];
+
+            // add new ones
+            for (const miniMetadata of newMiniMetadatas) miniMetadatas[miniMetadata.id] = miniMetadata;
+            break;
+          }
+        case "balances":
+          {
+            const {
+              balanceIds,
+              balances: newBalances
+            } = queueItem;
+
+            // remove all balances expected in the result set
+            for (const balanceId of balanceIds) delete balances[balanceId];
+
+            // add new ones
+            for (const balance of newBalances) balances[getBalanceId(balance)] = balance;
+            break;
+          }
+      }
+      this.#storage.next({
+        balances,
+        miniMetadatas
+      });
+      this.#isProcessingStorageUpdates = false;
+    }
   }
   getNetworkMiniMetadatas$(networkId) {
     return util.getSharedObservable(`BalancesProvider.getNetworkMiniMetadatas$`, {
@@ -6495,15 +6547,7 @@ class BalancesProvider {
       // and persist in storage for later reuse
       rxjs.tap(newMiniMetadatas => {
         if (!newMiniMetadatas.length) return;
-        const storage = this.#storage.getValue();
-        const miniMetadatas = lodashEs.assign(
-        // keep minimetadatas of other networks
-        lodashEs.keyBy(lodashEs.values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
-        // add the ones for our network
-        lodashEs.keyBy(newMiniMetadatas, m => m.id));
-        this.#storage.next(lodashEs.assign({}, storage, {
-          miniMetadatas
-        }));
+        this.updateStoredMiniMetadatas(networkId, newMiniMetadatas);
       }));
     }),
     // emit only when mini metadata changes, as a change here would restart all subscriptions for the network

package/dist/talismn-balances.esm.js

@@ -6229,6 +6229,10 @@ class BalancesProvider {
   #chaindataProvider;
   #chainConnectors;
   #storage;
+
+  // storage is updated at high frequency, use a queue to avoid race conditions
+  #updateStorageQueue = [];
+  #isProcessingStorageUpdates = false;
   constructor(chaindataProvider, chainConnectors, storage = DEFAULT_STORAGE) {
     this.#chaindataProvider = chaindataProvider;
     this.#chainConnectors = chainConnectors;
@@ -6355,9 +6359,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       shareReplay({
         refCount: true,
@@ -6405,9 +6407,7 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), tap(results => {
-        this.updateStorage$(balanceIds, results);
-      }),
+      })), tap(results => this.updateStoredBalances(balanceIds, results)),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       shareReplay({
         refCount: true,
@@ -6421,20 +6421,72 @@ class BalancesProvider {
       })));
     });
   }
-  updateStorage$(balanceIds, balancesResult) {
+  updateStoredBalances(balanceIds, balancesResult) {
     if (balancesResult.status !== "live") return;
+    this.#updateStorageQueue.push({
+      type: "balances",
+      balanceIds,
+      balances: balancesResult.balances
+    });
+    this.processStorageUpdatesQueue();
+  }
+  updateStoredMiniMetadatas(networkId, miniMetadatas) {
+    this.#updateStorageQueue.push({
+      type: "miniMetadatas",
+      networkId,
+      miniMetadatas
+    });
+    this.processStorageUpdatesQueue();
+  }
+  processStorageUpdatesQueue() {
+    if (this.#updateStorageQueue.length > 1) log.warn("[balances] this message is the proof that there are sometimes racing conditions, and that we avoided them :)");
+    if (this.#isProcessingStorageUpdates || !this.#updateStorageQueue.length) return;
+    this.#isProcessingStorageUpdates = true;
     const storage = this.#storage.getValue();
-    const balances = assign({}, storage.balances,
-    // delete all balances expected in the result set. because if they are not present it means they are empty.
-    fromPairs(balanceIds.map(balanceId => [balanceId, undefined])), keyBy(
-    // storage balances must have status "cache", because they are used as start value when initialising subsequent subscriptions
-    balancesResult.balances.map(b => ({
-      ...b,
-      status: "cache"
-    })), b => getBalanceId(b)));
-    this.#storage.next(assign({}, storage, {
-      balances
-    }));
+    const balances = {
+      ...storage.balances
+    };
+    const miniMetadatas = {
+      ...storage.miniMetadatas
+    };
+    while (this.#updateStorageQueue.length) {
+      const queueItem = this.#updateStorageQueue.shift();
+      switch (queueItem?.type) {
+        case "miniMetadatas":
+          {
+            const {
+              networkId,
+              miniMetadatas: newMiniMetadatas
+            } = queueItem;
+
+            // remove old miniMetadatas for the network
+            for (const miniMetadata of values(miniMetadatas)) if (miniMetadata.chainId === networkId) delete miniMetadatas[miniMetadata.id];
+
+            // add new ones
+            for (const miniMetadata of newMiniMetadatas) miniMetadatas[miniMetadata.id] = miniMetadata;
+            break;
+          }
+        case "balances":
+          {
+            const {
+              balanceIds,
+              balances: newBalances
+            } = queueItem;
+
+            // remove all balances expected in the result set
+            for (const balanceId of balanceIds) delete balances[balanceId];
+
+            // add new ones
+            for (const balance of newBalances) balances[getBalanceId(balance)] = balance;
+            break;
+          }
+      }
+      this.#storage.next({
+        balances,
+        miniMetadatas
+      });
+      this.#isProcessingStorageUpdates = false;
+    }
   }
   getNetworkMiniMetadatas$(networkId) {
     return getSharedObservable(`BalancesProvider.getNetworkMiniMetadatas$`, {
@@ -6486,15 +6538,7 @@ class BalancesProvider {
       // and persist in storage for later reuse
       tap(newMiniMetadatas => {
         if (!newMiniMetadatas.length) return;
-        const storage = this.#storage.getValue();
-        const miniMetadatas = assign(
-        // keep minimetadatas of other networks
-        keyBy(values(storage.miniMetadatas).filter(m => m.chainId !== networkId), m => m.id),
-        // add the ones for our network
-        keyBy(newMiniMetadatas, m => m.id));
-        this.#storage.next(assign({}, storage, {
-          miniMetadatas
-        }));
+        this.updateStoredMiniMetadatas(networkId, newMiniMetadatas);
       }));
     }),
     // emit only when mini metadata changes, as a change here would restart all subscriptions for the network

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.0.0-pr2092-20250715131755",
+  "version": "0.0.0-pr2093-20250715143904",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -34,13 +34,13 @@
     "scale-ts": "^1.6.1",
     "viem": "^2.27.3",
     "zod": "^3.25.62",
-    "@talismn/chain-connector": "0.0.0-pr2092-20250715131755",
-    "@talismn/chain-connector-evm": "0.0.0-pr2092-20250715131755",
-    "@talismn/chaindata-provider": "0.0.0-pr2092-20250715131755",
-    "@talismn/sapi": "0.0.0-pr2092-20250715131755",
-    "@talismn/token-rates": "0.0.0-pr2092-20250715131755",
-    "@talismn/util": "0.0.0-pr2092-20250715131755",
-    "@talismn/scale": "0.0.0-pr2092-20250715131755"
+    "@talismn/chain-connector": "0.0.0-pr2093-20250715143904",
+    "@talismn/chain-connector-evm": "0.0.0-pr2093-20250715143904",
+    "@talismn/chaindata-provider": "0.0.0-pr2093-20250715143904",
+    "@talismn/sapi": "0.0.0-pr2093-20250715143904",
+    "@talismn/scale": "0.0.0-pr2093-20250715143904",
+    "@talismn/token-rates": "0.0.0-pr2093-20250715143904",
+    "@talismn/util": "0.0.0-pr2093-20250715143904"
   },
   "devDependencies": {
     "@polkadot/api-contract": "16.1.2",
@@ -55,8 +55,8 @@
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
     "typescript": "^5.6.3",
-    "@talismn/tsconfig": "0.0.2",
-    "@talismn/eslint-config": "0.0.3"
+    "@talismn/eslint-config": "0.0.3",
+    "@talismn/tsconfig": "0.0.2"
   },
   "peerDependencies": {
     "@polkadot/api-contract": "*",