@talismn/balances 0.0.0-pr2093-20250715143904 → 0.0.0-pr2094-20250715164740

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

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

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

@@ -1502,8 +1502,23 @@ const getRpcQueryPack$ = (connector, networkId, queries, timeout = false) => {
     decodeResult
   }) => decodeResult(stateKeys.map(() => null))));
   return new rxjs.Observable(subscriber => {
+    // first subscription callback includes results for all state keys, but further callbacks will only include the ones that changed
+    // => we need to keep all results in memory and update them after each callback, so we can emit the full result set each time
+    const dicChangesCache = {};
     const promUnsub = connector.subscribe(networkId, "state_subscribeStorage", "state_storage", [allStateKeys], (error, result) => {
-      if (error) subscriber.error(error);else subscriber.next(decodeRpcQueryPack(queries, result));
+      if (error) subscriber.error(error);else if (result) {
+        // update the cache
+        for (const [stateKey, encodedResult] of result.changes) dicChangesCache[stateKey] = encodedResult;
+
+        // regenerate the full changes array
+        const changes = lodashEs.toPairs(dicChangesCache);
+
+        // decode and emit results for all queries
+        subscriber.next(decodeRpcQueryPack(queries, {
+          block: result.block,
+          changes
+        }));
+      }
     }, timeout);
     return () => {
       promUnsub.then(unsub => unsub("state_unsubscribeStorage"));
@@ -6238,10 +6253,6 @@ 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;
@@ -6368,7 +6379,9 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
+      })), rxjs.tap(results => {
+        this.updateStorage$(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,
@@ -6416,7 +6429,9 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
+      })), rxjs.tap(results => {
+        this.updateStorage$(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,72 +6445,20 @@ class BalancesProvider {
       })));
     });
   }
-  updateStoredBalances(balanceIds, balancesResult) {
+  updateStorage$(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 = {
-      ...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;
-    }
+    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
+    }));
   }
   getNetworkMiniMetadatas$(networkId) {
     return util.getSharedObservable(`BalancesProvider.getNetworkMiniMetadatas$`, {
@@ -6547,7 +6510,15 @@ class BalancesProvider {
       // and persist in storage for later reuse
       rxjs.tap(newMiniMetadatas => {
         if (!newMiniMetadatas.length) return;
-        this.updateStoredMiniMetadatas(networkId, newMiniMetadatas);
+        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
+        }));
       }));
     }),
     // emit only when mini metadata changes, as a change here would restart all subscriptions for the network

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

@@ -1502,8 +1502,23 @@ const getRpcQueryPack$ = (connector, networkId, queries, timeout = false) => {
     decodeResult
   }) => decodeResult(stateKeys.map(() => null))));
   return new rxjs.Observable(subscriber => {
+    // first subscription callback includes results for all state keys, but further callbacks will only include the ones that changed
+    // => we need to keep all results in memory and update them after each callback, so we can emit the full result set each time
+    const dicChangesCache = {};
     const promUnsub = connector.subscribe(networkId, "state_subscribeStorage", "state_storage", [allStateKeys], (error, result) => {
-      if (error) subscriber.error(error);else subscriber.next(decodeRpcQueryPack(queries, result));
+      if (error) subscriber.error(error);else if (result) {
+        // update the cache
+        for (const [stateKey, encodedResult] of result.changes) dicChangesCache[stateKey] = encodedResult;
+
+        // regenerate the full changes array
+        const changes = lodashEs.toPairs(dicChangesCache);
+
+        // decode and emit results for all queries
+        subscriber.next(decodeRpcQueryPack(queries, {
+          block: result.block,
+          changes
+        }));
+      }
     }, timeout);
     return () => {
       promUnsub.then(unsub => unsub("state_unsubscribeStorage"));
@@ -6238,10 +6253,6 @@ 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;
@@ -6368,7 +6379,9 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
+      })), rxjs.tap(results => {
+        this.updateStorage$(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,
@@ -6416,7 +6429,9 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), rxjs.tap(results => this.updateStoredBalances(balanceIds, results)),
+      })), rxjs.tap(results => {
+        this.updateStorage$(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,72 +6445,20 @@ class BalancesProvider {
       })));
     });
   }
-  updateStoredBalances(balanceIds, balancesResult) {
+  updateStorage$(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 = {
-      ...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;
-    }
+    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
+    }));
   }
   getNetworkMiniMetadatas$(networkId) {
     return util.getSharedObservable(`BalancesProvider.getNetworkMiniMetadatas$`, {
@@ -6547,7 +6510,15 @@ class BalancesProvider {
       // and persist in storage for later reuse
       rxjs.tap(newMiniMetadatas => {
         if (!newMiniMetadatas.length) return;
-        this.updateStoredMiniMetadatas(networkId, newMiniMetadatas);
+        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
+        }));
       }));
     }),
     // emit only when mini metadata changes, as a change here would restart all subscriptions for the network

package/dist/talismn-balances.esm.js

@@ -2,7 +2,7 @@ import { EvmErc20TokenSchema, parseTokenId, parseEvmErc20TokenId, evmErc20TokenI
 export { MINIMETADATA_VERSION } from '@talismn/chaindata-provider';
 import { isEthereumAddress, isNotNil, BigMath, isArrayOf, isBigInt, planckToTokens, isAbortError, getSharedObservable, keepAlive, isTruthy, normalizeAddress } from '@talismn/util';
 import { parseAbi, erc20Abi, getContract, ContractFunctionExecutionError, hexToString, erc20Abi_bytes32, encodeFunctionData, withRetry } from 'viem';
-import { assign, omit, isEqual, uniq, keyBy, keys, fromPairs, values, toPairs } from 'lodash-es';
+import { assign, omit, isEqual, uniq, keyBy, toPairs, keys, fromPairs, values } from 'lodash-es';
 import z from 'zod/v4';
 import anylogger from 'anylogger';
 import { of, Observable, distinctUntilChanged, map, timer, switchMap, from, firstValueFrom, combineLatest, BehaviorSubject, shareReplay, startWith, filter, defer, catchError, EMPTY, tap } from 'rxjs';
@@ -1493,8 +1493,23 @@ const getRpcQueryPack$ = (connector, networkId, queries, timeout = false) => {
     decodeResult
   }) => decodeResult(stateKeys.map(() => null))));
   return new Observable(subscriber => {
+    // first subscription callback includes results for all state keys, but further callbacks will only include the ones that changed
+    // => we need to keep all results in memory and update them after each callback, so we can emit the full result set each time
+    const dicChangesCache = {};
     const promUnsub = connector.subscribe(networkId, "state_subscribeStorage", "state_storage", [allStateKeys], (error, result) => {
-      if (error) subscriber.error(error);else subscriber.next(decodeRpcQueryPack(queries, result));
+      if (error) subscriber.error(error);else if (result) {
+        // update the cache
+        for (const [stateKey, encodedResult] of result.changes) dicChangesCache[stateKey] = encodedResult;
+
+        // regenerate the full changes array
+        const changes = toPairs(dicChangesCache);
+
+        // decode and emit results for all queries
+        subscriber.next(decodeRpcQueryPack(queries, {
+          block: result.block,
+          changes
+        }));
+      }
     }, timeout);
     return () => {
       promUnsub.then(unsub => unsub("state_unsubscribeStorage"));
@@ -6229,10 +6244,6 @@ 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;
@@ -6359,7 +6370,9 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), tap(results => this.updateStoredBalances(balanceIds, results)),
+      })), tap(results => {
+        this.updateStorage$(balanceIds, results);
+      }),
       // shareReplay + keepAlive(0) keep the subscription alive while root observable is being unsubscribed+resubscribed, in case any input change
       shareReplay({
         refCount: true,
@@ -6407,7 +6420,9 @@ class BalancesProvider {
         status: "live",
         // exclude zero balances
         balances: results.success.filter(b => new Balance(b).total.planck > 0n)
-      })), tap(results => this.updateStoredBalances(balanceIds, results)),
+      })), tap(results => {
+        this.updateStorage$(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,72 +6436,20 @@ class BalancesProvider {
       })));
     });
   }
-  updateStoredBalances(balanceIds, balancesResult) {
+  updateStorage$(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 = {
-      ...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;
-    }
+    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
+    }));
   }
   getNetworkMiniMetadatas$(networkId) {
     return getSharedObservable(`BalancesProvider.getNetworkMiniMetadatas$`, {
@@ -6538,7 +6501,15 @@ class BalancesProvider {
       // and persist in storage for later reuse
       tap(newMiniMetadatas => {
         if (!newMiniMetadatas.length) return;
-        this.updateStoredMiniMetadatas(networkId, newMiniMetadatas);
+        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
+        }));
       }));
     }),
     // 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-pr2093-20250715143904",
+  "version": "0.0.0-pr2094-20250715164740",
   "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-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"
+    "@talismn/chain-connector": "0.0.0-pr2094-20250715164740",
+    "@talismn/chain-connector-evm": "0.0.0-pr2094-20250715164740",
+    "@talismn/chaindata-provider": "0.0.0-pr2094-20250715164740",
+    "@talismn/sapi": "0.0.0-pr2094-20250715164740",
+    "@talismn/util": "0.0.0-pr2094-20250715164740",
+    "@talismn/token-rates": "0.0.0-pr2094-20250715164740",
+    "@talismn/scale": "0.0.0-pr2094-20250715164740"
   },
   "devDependencies": {
     "@polkadot/api-contract": "16.1.2",