@talismn/balances 0.0.0-pr2075-20250708110002 → 0.0.0-pr2075-20250708125508

package/dist/declarations/src/modules/substrate-native/queries/buildBaseQueries.d.ts

@@ -1,7 +1,7 @@
 import { AnyMiniMetadata } from "@talismn/chaindata-provider";
 import { IBalance } from "../../../types";
 import { BalanceDef } from "../../shared";
-import { RpcQueryPack } from "../../util/RpcStateQueriesHelper";
+import { RpcQueryPack } from "../../util/rpcQueryPack";
 import { MiniMetadataExtra } from "../config";
 export type NomPoolMemberInfo = {
     points: string;

package/dist/declarations/src/modules/substrate-native/queries/buildNomPoolQueries.d.ts

@@ -1,6 +1,6 @@
 import { AnyMiniMetadata } from "@talismn/chaindata-provider";
 import { IBalance } from "../../../types";
-import { RpcQueryPack } from "../../util/RpcStateQueriesHelper";
+import { RpcQueryPack } from "../../util/rpcQueryPack";
 import { MiniMetadataExtra } from "../config";
 import { BaseBalance } from "./buildBaseQueries";
 export declare const buildNomPoolQueries: (networkId: string, partialBalances: BaseBalance[], miniMetadata: Omit<AnyMiniMetadata, "extra"> & {

package/dist/declarations/src/modules/util/rpcQueryPack.d.ts

@@ -0,0 +1,11 @@
+import { ChainConnector } from "@talismn/chain-connector";
+import { DotNetworkId } from "@talismn/chaindata-provider";
+import { Observable } from "rxjs";
+type MaybeStateKey = `0x${string}` | null;
+export type RpcQueryPack<T> = {
+    stateKeys: MaybeStateKey[];
+    decodeResult: (changes: MaybeStateKey[]) => T;
+};
+export declare const fetchRpcQueryPack: <T>(connector: ChainConnector, networkId: DotNetworkId, queries: RpcQueryPack<T>[]) => Promise<T[]>;
+export declare const getRpcQueryPack$: <T>(connector: ChainConnector, networkId: DotNetworkId, queries: RpcQueryPack<T>[], timeout?: number | false) => Observable<T[]>;
+export {};

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

@@ -1779,7 +1779,7 @@ const getTransferCallData$8 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$8 = 6_000;
+const SUBSCRIPTION_INTERVAL$7 = 6_000;
 const subscribeBalances$8 = ({
   networkId,
   tokensWithAddresses,
@@ -1797,7 +1797,7 @@ const subscribeBalances$8 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$8);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$7);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$8,
@@ -1993,7 +1993,7 @@ const getTransferCallData$7 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$7 = 6_000;
+const SUBSCRIPTION_INTERVAL$6 = 6_000;
 const subscribeBalances$7 = ({
   networkId,
   tokensWithAddresses,
@@ -2011,7 +2011,7 @@ const subscribeBalances$7 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$7);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$6);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$7,
@@ -2326,7 +2326,7 @@ const getTransferCallData$6 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$6 = 6_000;
+const SUBSCRIPTION_INTERVAL$5 = 6_000;
 const subscribeBalances$6 = ({
   networkId,
   tokensWithAddresses,
@@ -2344,7 +2344,7 @@ const subscribeBalances$6 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$6);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$5);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$6,
@@ -3477,7 +3477,7 @@ const fetchBalances$6 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$5} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -3847,7 +3847,7 @@ const getTransferAllEncodedArgs$2 = (assetId, to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$5 = 6_000;
+const SUBSCRIPTION_INTERVAL$4 = 6_000;
 const subscribeBalances$5 = ({
   networkId,
   tokensWithAddresses,
@@ -3870,7 +3870,7 @@ const subscribeBalances$5 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$5);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$5,
@@ -3916,7 +3916,7 @@ const fetchBalances$5 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$4} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -4245,7 +4245,7 @@ const getTransferAllEncodedArgs$1 = (onChainId, to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$4 = 6_000;
+const SUBSCRIPTION_INTERVAL$3 = 6_000;
 const subscribeBalances$4 = ({
   networkId,
   tokensWithAddresses,
@@ -4268,7 +4268,7 @@ const subscribeBalances$4 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$4,
@@ -4344,7 +4344,7 @@ const fetchBalances$4 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$3} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -4591,7 +4591,7 @@ const getTransferCallData$3 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$3 = 6_000;
+const SUBSCRIPTION_INTERVAL$2 = 6_000;
 const subscribeBalances$3 = ({
   networkId,
   tokensWithAddresses,
@@ -4614,7 +4614,7 @@ const subscribeBalances$3 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$2);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$3,
@@ -4646,140 +4646,54 @@ const SubHydrationBalanceModule = {
 const MODULE_TYPE$2 = chaindataProvider.SubNativeTokenSchema.shape.type.value;
 const PLATFORM$2 = chaindataProvider.SubNativeTokenSchema.shape.platform.value;
 
-/**
- * Pass some these into an `RpcStateQueryHelper` in order to easily batch multiple state queries into the one rpc call.
- */
-
-const fetchQueriesPack = async (connector, networkId, queries) => {
+const fetchRpcQueryPack = async (connector, networkId, queries) => {
   const allStateKeys = queries.flatMap(({
     stateKeys
   }) => stateKeys).filter(util.isNotNil);
 
-  // doing a query with only null keys would throw an error => return early
+  // doing a query without keys would throw an error => return early
   if (!allStateKeys.length) return queries.map(({
     stateKeys,
     decodeResult
   }) => decodeResult(stateKeys.map(() => null)));
-  const response = await connector.send(networkId, "state_queryStorageAt", [allStateKeys]);
-  const results = queries.reduce((acc, {
+  const [result] = await connector.send(networkId, "state_queryStorageAt", [allStateKeys]);
+  return decodeRpcQueryPack(queries, result);
+};
+const getRpcQueryPack$ = (connector, networkId, queries, timeout = false) => {
+  const allStateKeys = queries.flatMap(({
+    stateKeys
+  }) => stateKeys).filter(util.isNotNil);
+
+  // doing a query without keys would throw an error => return early
+  if (!allStateKeys.length) return rxjs.of(queries.map(({
+    stateKeys,
+    decodeResult
+  }) => decodeResult(stateKeys.map(() => null))));
+  return new rxjs.Observable(subscriber => {
+    const promUnsub = connector.subscribe(networkId, "state_subscribeStorage", "state_storage", [allStateKeys], (error, result) => {
+      if (error) subscriber.error(error);else subscriber.next(decodeRpcQueryPack(queries, result));
+    }, timeout);
+    return () => {
+      promUnsub.then(unsub => unsub("state_unsubscribeStorage"));
+    };
+  });
+};
+const decodeRpcQueryPack = (queries, result) => {
+  return queries.reduce((acc, {
     stateKeys,
     decodeResult
   }) => {
     const changes = stateKeys.map(stateKey => {
       if (!stateKey) return null;
-      const change = response[0].changes.find(([key]) => key === stateKey);
+      const change = result.changes.find(([key]) => key === stateKey);
       if (!change) return null;
       return change[1];
     });
     acc.push(decodeResult(changes));
     return acc;
   }, []);
-  return results;
 };
 
-/**
- * Used by a variety of balance modules to help batch multiple state queries into the one rpc call.
- */
-// export class RpcStateQueriesHelper<T> {
-//   #connector: ChainConnector
-//   #queries: Array<RpcStateQueries<T>>
-
-//   constructor(connector: ChainConnector, queries: Array<RpcStateQueries<T>>) {
-//     this.#connector = connector
-//     this.#queries = queries
-//   }
-
-//   async subscribe(
-//     networkId: DotNetworkId,
-//     callback: SubscriptionCallback<T[]>,
-//     timeout: number | false = false,
-//     subscribeMethod = "state_subscribeStorage",
-//     responseMethod = "state_storage",
-//     unsubscribeMethod = "state_unsubscribeStorage",
-//   ): Promise<UnsubscribeFn> {
-//     const params = [this.#queries.flatMap(({ stateKeys }) => stateKeys)]
-
-//     const unsub = this.#connector.subscribe(
-//       networkId,
-//       subscribeMethod,
-//       responseMethod,
-//       params,
-//       (error, result) => {
-//         error
-//           ? callback(error)
-//           : callback(null, this.#distributeChangesToQueryDecoders.call(this, chainId, result))
-//       },
-//       timeout,
-//     )
-
-//     const subscriptions = queries.map(([chainId, queries]) => {
-//       const params = [queries.map(({ stateKey }) => stateKey)]
-
-//       const unsub = this.#connector.subscribe(
-//         networkId,
-//         subscribeMethod,
-//         responseMethod,
-//         params,
-//         (error, result) => {
-//           error
-//             ? callback(error)
-//             : callback(null, this.#distributeChangesToQueryDecoders.call(this, chainId, result))
-//         },
-//         timeout,
-//       )
-
-//       return () => unsub.then((unsubscribe) => unsubscribe(unsubscribeMethod))
-//     })
-
-//     return () => subscriptions.forEach((unsubscribe) => unsubscribe())
-//   }
-
-//   async fetch(method = "state_queryStorageAt"): Promise<T[]> {
-//     const queriesByChain = groupBy(this.#queries, "chainId")
-
-//     const resultsByChain = await Promise.all(
-//       Object.entries(queriesByChain).map(async ([chainId, queries]) => {
-//         const params = [queries.map(({ stateKey }) => stateKey)]
-
-//         const result = (await this.#connector.send(chainId, method, params))[0]
-//         return this.#distributeChangesToQueryDecoders.call(this, chainId, result)
-//       }),
-//     )
-
-//     return resultsByChain.flatMap((result) => result)
-//   }
-
-//   #distributeChangesToQueryDecoders(chainId: DotNetworkId, result: unknown): T[] {
-//     if (typeof result !== "object" || result === null) return []
-//     if (!hasOwnProperty(result, "changes") || typeof result.changes !== "object") return []
-//     if (!Array.isArray(result.changes)) return []
-
-//     return result.changes.flatMap(([reference, change]: [unknown, unknown]): [T] | [] => {
-//       if (typeof reference !== "string") {
-//         log.warn(`Received non-string reference in RPC result: ${reference}`)
-//         return []
-//       }
-
-//       if (typeof change !== "string" && change !== null) {
-//         log.warn(`Received non-string and non-null change in RPC result: ${reference} | ${change}`)
-//         return []
-//       }
-
-//       const query = this.#queries.find(
-//         ({ chainId: cId, stateKey }) => cId === chainId && stateKey === reference,
-//       )
-//       if (!query) {
-//         log.warn(
-//           `Failed to find query:\n${reference} in\n${this.#queries.map(({ stateKey }) => stateKey)}`,
-//         )
-//         return []
-//       }
-
-//       return [query.decodeResult(change)]
-//     })
-//   }
-// }
-
 const SUBTENSOR_ROOT_NETUID$1 = 0;
 const SUBTENSOR_MIN_STAKE_AMOUNT_PLANK$1 = 1000000n;
 const TAO_DECIMALS$1 = 9n;
@@ -5499,7 +5413,7 @@ const fetchBalances$3 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$2} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -5531,12 +5445,12 @@ const fetchBalances$3 = async ({
       }))
     };
   }
-  const queries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
-  const partialBalances = await fetchQueriesPack(connector, networkId, queries);
+  const baseQueries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
+  const partialBalances = await fetchRpcQueryPack(connector, networkId, baseQueries);
 
   // now for each balance that includes nomPoolStaking, we need to fetch the metadata for the pool
   const nomPoolQueries = buildNomPoolQueries(networkId, partialBalances, miniMetadata);
-  const balances = await fetchQueriesPack(connector, networkId, nomPoolQueries);
+  const balances = await fetchRpcQueryPack(connector, networkId, nomPoolQueries);
 
   // TODO ⚠️ dedupe locks
 
@@ -5772,46 +5686,32 @@ const getTransferAllEncodedArgs = (to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$2 = 6_000;
 const subscribeBalances$2 = ({
   networkId,
   tokensWithAddresses,
   connector,
   miniMetadata
 }) => {
-  return new rxjs.Observable(subscriber => {
-    const abortController = new AbortController();
-
-    // on hydration balances are fetched using a runtimeApi, which can't be subscribed to.
-    // => poll values for each block
-    const poll = async () => {
-      try {
-        if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$3({
-          networkId,
-          tokensWithAddresses: tokensWithAddresses,
-          connector,
-          miniMetadata
-        });
-        if (abortController.signal.aborted) return;
-        subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$2);
-      } catch (error) {
-        log.error("Error", {
-          module: MODULE_TYPE$2,
-          networkId,
-          miniMetadata,
-          addressesByToken: tokensWithAddresses,
-          error
-        });
-        subscriber.error(error);
-      }
-    };
-    poll();
-    return () => {
-      abortController.abort();
+  // could be use as shared observable key if we decide to cache the sub
+  const balanceDefs = getBalanceDefs(tokensWithAddresses);
+  const baseQueries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
+  const baseBalances$ = getRpcQueryPack$(connector, networkId, baseQueries).pipe(rxjs.switchMap(partialBalances => {
+    // now for each balance that includes nomPoolStaking, we need to fetch the metadata for the pool
+    const nomPoolQueries = buildNomPoolQueries(networkId, partialBalances, miniMetadata);
+    return getRpcQueryPack$(connector, networkId, nomPoolQueries);
+  }));
+  const subtensorBalancesByAddress$ = getSubtensorStakingBalances$(connector, networkId, balanceDefs, miniMetadata);
+  return rxjs.combineLatest([baseBalances$, subtensorBalancesByAddress$]).pipe(rxjs.map(([baseBalances, subtensorBalancesByAddress]) => {
+    // add subtensor balances to base balances
+    for (const [address, subtensorBalances] of lodash.toPairs(subtensorBalancesByAddress)) {
+      const balance = baseBalances.find(b => b.address === address);
+      if (balance?.values) balance.values.push(...subtensorBalances);
+    }
+    return {
+      success: baseBalances,
+      errors: []
     };
-  }).pipe(rxjs.distinctUntilChanged(lodash.isEqual));
+  }));
 };
 
 const SubNativeBalanceModule = {
@@ -7251,7 +7151,7 @@ const fetchBalances$1 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({

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

@@ -1779,7 +1779,7 @@ const getTransferCallData$8 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$8 = 6_000;
+const SUBSCRIPTION_INTERVAL$7 = 6_000;
 const subscribeBalances$8 = ({
   networkId,
   tokensWithAddresses,
@@ -1797,7 +1797,7 @@ const subscribeBalances$8 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$8);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$7);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$8,
@@ -1993,7 +1993,7 @@ const getTransferCallData$7 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$7 = 6_000;
+const SUBSCRIPTION_INTERVAL$6 = 6_000;
 const subscribeBalances$7 = ({
   networkId,
   tokensWithAddresses,
@@ -2011,7 +2011,7 @@ const subscribeBalances$7 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$7);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$6);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$7,
@@ -2326,7 +2326,7 @@ const getTransferCallData$6 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$6 = 6_000;
+const SUBSCRIPTION_INTERVAL$5 = 6_000;
 const subscribeBalances$6 = ({
   networkId,
   tokensWithAddresses,
@@ -2344,7 +2344,7 @@ const subscribeBalances$6 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$6);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$5);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$6,
@@ -3477,7 +3477,7 @@ const fetchBalances$6 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$5} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -3847,7 +3847,7 @@ const getTransferAllEncodedArgs$2 = (assetId, to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$5 = 6_000;
+const SUBSCRIPTION_INTERVAL$4 = 6_000;
 const subscribeBalances$5 = ({
   networkId,
   tokensWithAddresses,
@@ -3870,7 +3870,7 @@ const subscribeBalances$5 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$5);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$5,
@@ -3916,7 +3916,7 @@ const fetchBalances$5 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$4} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -4245,7 +4245,7 @@ const getTransferAllEncodedArgs$1 = (onChainId, to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$4 = 6_000;
+const SUBSCRIPTION_INTERVAL$3 = 6_000;
 const subscribeBalances$4 = ({
   networkId,
   tokensWithAddresses,
@@ -4268,7 +4268,7 @@ const subscribeBalances$4 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$4,
@@ -4344,7 +4344,7 @@ const fetchBalances$4 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$3} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -4591,7 +4591,7 @@ const getTransferCallData$3 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$3 = 6_000;
+const SUBSCRIPTION_INTERVAL$2 = 6_000;
 const subscribeBalances$3 = ({
   networkId,
   tokensWithAddresses,
@@ -4614,7 +4614,7 @@ const subscribeBalances$3 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$2);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$3,
@@ -4646,140 +4646,54 @@ const SubHydrationBalanceModule = {
 const MODULE_TYPE$2 = chaindataProvider.SubNativeTokenSchema.shape.type.value;
 const PLATFORM$2 = chaindataProvider.SubNativeTokenSchema.shape.platform.value;
 
-/**
- * Pass some these into an `RpcStateQueryHelper` in order to easily batch multiple state queries into the one rpc call.
- */
-
-const fetchQueriesPack = async (connector, networkId, queries) => {
+const fetchRpcQueryPack = async (connector, networkId, queries) => {
   const allStateKeys = queries.flatMap(({
     stateKeys
   }) => stateKeys).filter(util.isNotNil);
 
-  // doing a query with only null keys would throw an error => return early
+  // doing a query without keys would throw an error => return early
   if (!allStateKeys.length) return queries.map(({
     stateKeys,
     decodeResult
   }) => decodeResult(stateKeys.map(() => null)));
-  const response = await connector.send(networkId, "state_queryStorageAt", [allStateKeys]);
-  const results = queries.reduce((acc, {
+  const [result] = await connector.send(networkId, "state_queryStorageAt", [allStateKeys]);
+  return decodeRpcQueryPack(queries, result);
+};
+const getRpcQueryPack$ = (connector, networkId, queries, timeout = false) => {
+  const allStateKeys = queries.flatMap(({
+    stateKeys
+  }) => stateKeys).filter(util.isNotNil);
+
+  // doing a query without keys would throw an error => return early
+  if (!allStateKeys.length) return rxjs.of(queries.map(({
+    stateKeys,
+    decodeResult
+  }) => decodeResult(stateKeys.map(() => null))));
+  return new rxjs.Observable(subscriber => {
+    const promUnsub = connector.subscribe(networkId, "state_subscribeStorage", "state_storage", [allStateKeys], (error, result) => {
+      if (error) subscriber.error(error);else subscriber.next(decodeRpcQueryPack(queries, result));
+    }, timeout);
+    return () => {
+      promUnsub.then(unsub => unsub("state_unsubscribeStorage"));
+    };
+  });
+};
+const decodeRpcQueryPack = (queries, result) => {
+  return queries.reduce((acc, {
     stateKeys,
     decodeResult
   }) => {
     const changes = stateKeys.map(stateKey => {
       if (!stateKey) return null;
-      const change = response[0].changes.find(([key]) => key === stateKey);
+      const change = result.changes.find(([key]) => key === stateKey);
       if (!change) return null;
       return change[1];
     });
     acc.push(decodeResult(changes));
     return acc;
   }, []);
-  return results;
 };
 
-/**
- * Used by a variety of balance modules to help batch multiple state queries into the one rpc call.
- */
-// export class RpcStateQueriesHelper<T> {
-//   #connector: ChainConnector
-//   #queries: Array<RpcStateQueries<T>>
-
-//   constructor(connector: ChainConnector, queries: Array<RpcStateQueries<T>>) {
-//     this.#connector = connector
-//     this.#queries = queries
-//   }
-
-//   async subscribe(
-//     networkId: DotNetworkId,
-//     callback: SubscriptionCallback<T[]>,
-//     timeout: number | false = false,
-//     subscribeMethod = "state_subscribeStorage",
-//     responseMethod = "state_storage",
-//     unsubscribeMethod = "state_unsubscribeStorage",
-//   ): Promise<UnsubscribeFn> {
-//     const params = [this.#queries.flatMap(({ stateKeys }) => stateKeys)]
-
-//     const unsub = this.#connector.subscribe(
-//       networkId,
-//       subscribeMethod,
-//       responseMethod,
-//       params,
-//       (error, result) => {
-//         error
-//           ? callback(error)
-//           : callback(null, this.#distributeChangesToQueryDecoders.call(this, chainId, result))
-//       },
-//       timeout,
-//     )
-
-//     const subscriptions = queries.map(([chainId, queries]) => {
-//       const params = [queries.map(({ stateKey }) => stateKey)]
-
-//       const unsub = this.#connector.subscribe(
-//         networkId,
-//         subscribeMethod,
-//         responseMethod,
-//         params,
-//         (error, result) => {
-//           error
-//             ? callback(error)
-//             : callback(null, this.#distributeChangesToQueryDecoders.call(this, chainId, result))
-//         },
-//         timeout,
-//       )
-
-//       return () => unsub.then((unsubscribe) => unsubscribe(unsubscribeMethod))
-//     })
-
-//     return () => subscriptions.forEach((unsubscribe) => unsubscribe())
-//   }
-
-//   async fetch(method = "state_queryStorageAt"): Promise<T[]> {
-//     const queriesByChain = groupBy(this.#queries, "chainId")
-
-//     const resultsByChain = await Promise.all(
-//       Object.entries(queriesByChain).map(async ([chainId, queries]) => {
-//         const params = [queries.map(({ stateKey }) => stateKey)]
-
-//         const result = (await this.#connector.send(chainId, method, params))[0]
-//         return this.#distributeChangesToQueryDecoders.call(this, chainId, result)
-//       }),
-//     )
-
-//     return resultsByChain.flatMap((result) => result)
-//   }
-
-//   #distributeChangesToQueryDecoders(chainId: DotNetworkId, result: unknown): T[] {
-//     if (typeof result !== "object" || result === null) return []
-//     if (!hasOwnProperty(result, "changes") || typeof result.changes !== "object") return []
-//     if (!Array.isArray(result.changes)) return []
-
-//     return result.changes.flatMap(([reference, change]: [unknown, unknown]): [T] | [] => {
-//       if (typeof reference !== "string") {
-//         log.warn(`Received non-string reference in RPC result: ${reference}`)
-//         return []
-//       }
-
-//       if (typeof change !== "string" && change !== null) {
-//         log.warn(`Received non-string and non-null change in RPC result: ${reference} | ${change}`)
-//         return []
-//       }
-
-//       const query = this.#queries.find(
-//         ({ chainId: cId, stateKey }) => cId === chainId && stateKey === reference,
-//       )
-//       if (!query) {
-//         log.warn(
-//           `Failed to find query:\n${reference} in\n${this.#queries.map(({ stateKey }) => stateKey)}`,
-//         )
-//         return []
-//       }
-
-//       return [query.decodeResult(change)]
-//     })
-//   }
-// }
-
 const SUBTENSOR_ROOT_NETUID$1 = 0;
 const SUBTENSOR_MIN_STAKE_AMOUNT_PLANK$1 = 1000000n;
 const TAO_DECIMALS$1 = 9n;
@@ -5499,7 +5413,7 @@ const fetchBalances$3 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$2} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -5531,12 +5445,12 @@ const fetchBalances$3 = async ({
       }))
     };
   }
-  const queries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
-  const partialBalances = await fetchQueriesPack(connector, networkId, queries);
+  const baseQueries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
+  const partialBalances = await fetchRpcQueryPack(connector, networkId, baseQueries);
 
   // now for each balance that includes nomPoolStaking, we need to fetch the metadata for the pool
   const nomPoolQueries = buildNomPoolQueries(networkId, partialBalances, miniMetadata);
-  const balances = await fetchQueriesPack(connector, networkId, nomPoolQueries);
+  const balances = await fetchRpcQueryPack(connector, networkId, nomPoolQueries);
 
   // TODO ⚠️ dedupe locks
 
@@ -5772,46 +5686,32 @@ const getTransferAllEncodedArgs = (to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$2 = 6_000;
 const subscribeBalances$2 = ({
   networkId,
   tokensWithAddresses,
   connector,
   miniMetadata
 }) => {
-  return new rxjs.Observable(subscriber => {
-    const abortController = new AbortController();
-
-    // on hydration balances are fetched using a runtimeApi, which can't be subscribed to.
-    // => poll values for each block
-    const poll = async () => {
-      try {
-        if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$3({
-          networkId,
-          tokensWithAddresses: tokensWithAddresses,
-          connector,
-          miniMetadata
-        });
-        if (abortController.signal.aborted) return;
-        subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$2);
-      } catch (error) {
-        log.error("Error", {
-          module: MODULE_TYPE$2,
-          networkId,
-          miniMetadata,
-          addressesByToken: tokensWithAddresses,
-          error
-        });
-        subscriber.error(error);
-      }
-    };
-    poll();
-    return () => {
-      abortController.abort();
+  // could be use as shared observable key if we decide to cache the sub
+  const balanceDefs = getBalanceDefs(tokensWithAddresses);
+  const baseQueries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
+  const baseBalances$ = getRpcQueryPack$(connector, networkId, baseQueries).pipe(rxjs.switchMap(partialBalances => {
+    // now for each balance that includes nomPoolStaking, we need to fetch the metadata for the pool
+    const nomPoolQueries = buildNomPoolQueries(networkId, partialBalances, miniMetadata);
+    return getRpcQueryPack$(connector, networkId, nomPoolQueries);
+  }));
+  const subtensorBalancesByAddress$ = getSubtensorStakingBalances$(connector, networkId, balanceDefs, miniMetadata);
+  return rxjs.combineLatest([baseBalances$, subtensorBalancesByAddress$]).pipe(rxjs.map(([baseBalances, subtensorBalancesByAddress]) => {
+    // add subtensor balances to base balances
+    for (const [address, subtensorBalances] of lodash.toPairs(subtensorBalancesByAddress)) {
+      const balance = baseBalances.find(b => b.address === address);
+      if (balance?.values) balance.values.push(...subtensorBalances);
+    }
+    return {
+      success: baseBalances,
+      errors: []
     };
-  }).pipe(rxjs.distinctUntilChanged(lodash.isEqual));
+  }));
 };
 
 const SubNativeBalanceModule = {
@@ -7251,7 +7151,7 @@ const fetchBalances$1 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({

package/dist/talismn-balances.esm.js

@@ -11,7 +11,7 @@ import pako from 'pako';
 import { parseAbi, erc20Abi, getContract, ContractFunctionExecutionError, hexToString, erc20Abi_bytes32, encodeFunctionData, isHex, hexToBigInt, withRetry } from 'viem';
 import { assign, omit, isEqual, fromPairs, toPairs, keys, keyBy, uniq, values, groupBy as groupBy$1 } from 'lodash';
 import z from 'zod/v4';
-import { Observable, distinctUntilChanged, of, timer, switchMap, from, firstValueFrom, scan, share, map, switchAll, combineLatest, mergeMap, toArray, interval, startWith, exhaustMap, BehaviorSubject, debounceTime, takeUntil, withLatestFrom, concatMap, tap } from 'rxjs';
+import { Observable, distinctUntilChanged, of, timer, switchMap, from, firstValueFrom, combineLatest, map, scan, share, switchAll, mergeMap, toArray, interval, startWith, exhaustMap, BehaviorSubject, debounceTime, takeUntil, withLatestFrom, concatMap, tap } from 'rxjs';
 import isEqual$1 from 'lodash/isEqual';
 import { unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, decodeScale, parseMetadataRpc, getStorageKeyPrefix, compactMetadata, encodeMetadata, papiParse, papiStringify, toHex, getMetadataVersion, encodeStateKey } from '@talismn/scale';
 import { Metadata, TypeRegistry } from '@polkadot/types';
@@ -1766,7 +1766,7 @@ const getTransferCallData$8 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$8 = 6_000;
+const SUBSCRIPTION_INTERVAL$7 = 6_000;
 const subscribeBalances$8 = ({
   networkId,
   tokensWithAddresses,
@@ -1784,7 +1784,7 @@ const subscribeBalances$8 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$8);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$7);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$8,
@@ -1980,7 +1980,7 @@ const getTransferCallData$7 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$7 = 6_000;
+const SUBSCRIPTION_INTERVAL$6 = 6_000;
 const subscribeBalances$7 = ({
   networkId,
   tokensWithAddresses,
@@ -1998,7 +1998,7 @@ const subscribeBalances$7 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$7);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$6);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$7,
@@ -2313,7 +2313,7 @@ const getTransferCallData$6 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$6 = 6_000;
+const SUBSCRIPTION_INTERVAL$5 = 6_000;
 const subscribeBalances$6 = ({
   networkId,
   tokensWithAddresses,
@@ -2331,7 +2331,7 @@ const subscribeBalances$6 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$6);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$5);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$6,
@@ -3464,7 +3464,7 @@ const fetchBalances$6 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$5} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -3834,7 +3834,7 @@ const getTransferAllEncodedArgs$2 = (assetId, to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$5 = 6_000;
+const SUBSCRIPTION_INTERVAL$4 = 6_000;
 const subscribeBalances$5 = ({
   networkId,
   tokensWithAddresses,
@@ -3857,7 +3857,7 @@ const subscribeBalances$5 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$5);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$5,
@@ -3903,7 +3903,7 @@ const fetchBalances$5 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$4} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -4232,7 +4232,7 @@ const getTransferAllEncodedArgs$1 = (onChainId, to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$4 = 6_000;
+const SUBSCRIPTION_INTERVAL$3 = 6_000;
 const subscribeBalances$4 = ({
   networkId,
   tokensWithAddresses,
@@ -4255,7 +4255,7 @@ const subscribeBalances$4 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$4,
@@ -4331,7 +4331,7 @@ const fetchBalances$4 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$3} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -4578,7 +4578,7 @@ const getTransferCallData$3 = ({
   };
 };
 
-const SUBSCRIPTION_INTERVAL$3 = 6_000;
+const SUBSCRIPTION_INTERVAL$2 = 6_000;
 const subscribeBalances$3 = ({
   networkId,
   tokensWithAddresses,
@@ -4601,7 +4601,7 @@ const subscribeBalances$3 = ({
         });
         if (abortController.signal.aborted) return;
         subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$3);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$2);
       } catch (error) {
         log.error("Error", {
           module: MODULE_TYPE$3,
@@ -4633,140 +4633,54 @@ const SubHydrationBalanceModule = {
 const MODULE_TYPE$2 = SubNativeTokenSchema.shape.type.value;
 const PLATFORM$2 = SubNativeTokenSchema.shape.platform.value;
 
-/**
- * Pass some these into an `RpcStateQueryHelper` in order to easily batch multiple state queries into the one rpc call.
- */
-
-const fetchQueriesPack = async (connector, networkId, queries) => {
+const fetchRpcQueryPack = async (connector, networkId, queries) => {
   const allStateKeys = queries.flatMap(({
     stateKeys
   }) => stateKeys).filter(isNotNil);
 
-  // doing a query with only null keys would throw an error => return early
+  // doing a query without keys would throw an error => return early
   if (!allStateKeys.length) return queries.map(({
     stateKeys,
     decodeResult
   }) => decodeResult(stateKeys.map(() => null)));
-  const response = await connector.send(networkId, "state_queryStorageAt", [allStateKeys]);
-  const results = queries.reduce((acc, {
+  const [result] = await connector.send(networkId, "state_queryStorageAt", [allStateKeys]);
+  return decodeRpcQueryPack(queries, result);
+};
+const getRpcQueryPack$ = (connector, networkId, queries, timeout = false) => {
+  const allStateKeys = queries.flatMap(({
+    stateKeys
+  }) => stateKeys).filter(isNotNil);
+
+  // doing a query without keys would throw an error => return early
+  if (!allStateKeys.length) return of(queries.map(({
+    stateKeys,
+    decodeResult
+  }) => decodeResult(stateKeys.map(() => null))));
+  return new Observable(subscriber => {
+    const promUnsub = connector.subscribe(networkId, "state_subscribeStorage", "state_storage", [allStateKeys], (error, result) => {
+      if (error) subscriber.error(error);else subscriber.next(decodeRpcQueryPack(queries, result));
+    }, timeout);
+    return () => {
+      promUnsub.then(unsub => unsub("state_unsubscribeStorage"));
+    };
+  });
+};
+const decodeRpcQueryPack = (queries, result) => {
+  return queries.reduce((acc, {
     stateKeys,
     decodeResult
   }) => {
     const changes = stateKeys.map(stateKey => {
       if (!stateKey) return null;
-      const change = response[0].changes.find(([key]) => key === stateKey);
+      const change = result.changes.find(([key]) => key === stateKey);
       if (!change) return null;
       return change[1];
     });
     acc.push(decodeResult(changes));
     return acc;
   }, []);
-  return results;
 };
 
-/**
- * Used by a variety of balance modules to help batch multiple state queries into the one rpc call.
- */
-// export class RpcStateQueriesHelper<T> {
-//   #connector: ChainConnector
-//   #queries: Array<RpcStateQueries<T>>
-
-//   constructor(connector: ChainConnector, queries: Array<RpcStateQueries<T>>) {
-//     this.#connector = connector
-//     this.#queries = queries
-//   }
-
-//   async subscribe(
-//     networkId: DotNetworkId,
-//     callback: SubscriptionCallback<T[]>,
-//     timeout: number | false = false,
-//     subscribeMethod = "state_subscribeStorage",
-//     responseMethod = "state_storage",
-//     unsubscribeMethod = "state_unsubscribeStorage",
-//   ): Promise<UnsubscribeFn> {
-//     const params = [this.#queries.flatMap(({ stateKeys }) => stateKeys)]
-
-//     const unsub = this.#connector.subscribe(
-//       networkId,
-//       subscribeMethod,
-//       responseMethod,
-//       params,
-//       (error, result) => {
-//         error
-//           ? callback(error)
-//           : callback(null, this.#distributeChangesToQueryDecoders.call(this, chainId, result))
-//       },
-//       timeout,
-//     )
-
-//     const subscriptions = queries.map(([chainId, queries]) => {
-//       const params = [queries.map(({ stateKey }) => stateKey)]
-
-//       const unsub = this.#connector.subscribe(
-//         networkId,
-//         subscribeMethod,
-//         responseMethod,
-//         params,
-//         (error, result) => {
-//           error
-//             ? callback(error)
-//             : callback(null, this.#distributeChangesToQueryDecoders.call(this, chainId, result))
-//         },
-//         timeout,
-//       )
-
-//       return () => unsub.then((unsubscribe) => unsubscribe(unsubscribeMethod))
-//     })
-
-//     return () => subscriptions.forEach((unsubscribe) => unsubscribe())
-//   }
-
-//   async fetch(method = "state_queryStorageAt"): Promise<T[]> {
-//     const queriesByChain = groupBy(this.#queries, "chainId")
-
-//     const resultsByChain = await Promise.all(
-//       Object.entries(queriesByChain).map(async ([chainId, queries]) => {
-//         const params = [queries.map(({ stateKey }) => stateKey)]
-
-//         const result = (await this.#connector.send(chainId, method, params))[0]
-//         return this.#distributeChangesToQueryDecoders.call(this, chainId, result)
-//       }),
-//     )
-
-//     return resultsByChain.flatMap((result) => result)
-//   }
-
-//   #distributeChangesToQueryDecoders(chainId: DotNetworkId, result: unknown): T[] {
-//     if (typeof result !== "object" || result === null) return []
-//     if (!hasOwnProperty(result, "changes") || typeof result.changes !== "object") return []
-//     if (!Array.isArray(result.changes)) return []
-
-//     return result.changes.flatMap(([reference, change]: [unknown, unknown]): [T] | [] => {
-//       if (typeof reference !== "string") {
-//         log.warn(`Received non-string reference in RPC result: ${reference}`)
-//         return []
-//       }
-
-//       if (typeof change !== "string" && change !== null) {
-//         log.warn(`Received non-string and non-null change in RPC result: ${reference} | ${change}`)
-//         return []
-//       }
-
-//       const query = this.#queries.find(
-//         ({ chainId: cId, stateKey }) => cId === chainId && stateKey === reference,
-//       )
-//       if (!query) {
-//         log.warn(
-//           `Failed to find query:\n${reference} in\n${this.#queries.map(({ stateKey }) => stateKey)}`,
-//         )
-//         return []
-//       }
-
-//       return [query.decodeResult(change)]
-//     })
-//   }
-// }
-
 const SUBTENSOR_ROOT_NETUID$1 = 0;
 const SUBTENSOR_MIN_STAKE_AMOUNT_PLANK$1 = 1000000n;
 const TAO_DECIMALS$1 = 9n;
@@ -5486,7 +5400,7 @@ const fetchBalances$3 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$2} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({
@@ -5518,12 +5432,12 @@ const fetchBalances$3 = async ({
       }))
     };
   }
-  const queries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
-  const partialBalances = await fetchQueriesPack(connector, networkId, queries);
+  const baseQueries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
+  const partialBalances = await fetchRpcQueryPack(connector, networkId, baseQueries);
 
   // now for each balance that includes nomPoolStaking, we need to fetch the metadata for the pool
   const nomPoolQueries = buildNomPoolQueries(networkId, partialBalances, miniMetadata);
-  const balances = await fetchQueriesPack(connector, networkId, nomPoolQueries);
+  const balances = await fetchRpcQueryPack(connector, networkId, nomPoolQueries);
 
   // TODO ⚠️ dedupe locks
 
@@ -5759,46 +5673,32 @@ const getTransferAllEncodedArgs = (to, codec) => {
   })]);
 };
 
-const SUBSCRIPTION_INTERVAL$2 = 6_000;
 const subscribeBalances$2 = ({
   networkId,
   tokensWithAddresses,
   connector,
   miniMetadata
 }) => {
-  return new Observable(subscriber => {
-    const abortController = new AbortController();
-
-    // on hydration balances are fetched using a runtimeApi, which can't be subscribed to.
-    // => poll values for each block
-    const poll = async () => {
-      try {
-        if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$3({
-          networkId,
-          tokensWithAddresses: tokensWithAddresses,
-          connector,
-          miniMetadata
-        });
-        if (abortController.signal.aborted) return;
-        subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$2);
-      } catch (error) {
-        log.error("Error", {
-          module: MODULE_TYPE$2,
-          networkId,
-          miniMetadata,
-          addressesByToken: tokensWithAddresses,
-          error
-        });
-        subscriber.error(error);
-      }
-    };
-    poll();
-    return () => {
-      abortController.abort();
+  // could be use as shared observable key if we decide to cache the sub
+  const balanceDefs = getBalanceDefs(tokensWithAddresses);
+  const baseQueries = buildBaseQueries(networkId, balanceDefs, miniMetadata);
+  const baseBalances$ = getRpcQueryPack$(connector, networkId, baseQueries).pipe(switchMap(partialBalances => {
+    // now for each balance that includes nomPoolStaking, we need to fetch the metadata for the pool
+    const nomPoolQueries = buildNomPoolQueries(networkId, partialBalances, miniMetadata);
+    return getRpcQueryPack$(connector, networkId, nomPoolQueries);
+  }));
+  const subtensorBalancesByAddress$ = getSubtensorStakingBalances$(connector, networkId, balanceDefs, miniMetadata);
+  return combineLatest([baseBalances$, subtensorBalancesByAddress$]).pipe(map(([baseBalances, subtensorBalancesByAddress]) => {
+    // add subtensor balances to base balances
+    for (const [address, subtensorBalances] of toPairs(subtensorBalancesByAddress)) {
+      const balance = baseBalances.find(b => b.address === address);
+      if (balance?.values) balance.values.push(...subtensorBalances);
+    }
+    return {
+      success: baseBalances,
+      errors: []
     };
-  }).pipe(distinctUntilChanged(isEqual));
+  }));
 };
 
 const SubNativeBalanceModule = {
@@ -7238,7 +7138,7 @@ const fetchBalances$1 = async ({
 }) => {
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
   if (!miniMetadata?.data) {
-    log.warn("MiniMetadata is required for fetching balances");
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE} balances on ${networkId}.`);
     return {
       success: [],
       errors: balanceDefs.map(def => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.0.0-pr2075-20250708110002",
+  "version": "0.0.0-pr2075-20250708125508",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -35,13 +35,13 @@
     "scale-ts": "^1.6.1",
     "viem": "^2.27.3",
     "zod": "^3.25.62",
-    "@talismn/chain-connector": "0.0.0-pr2075-20250708110002",
-    "@talismn/chain-connector-evm": "0.0.0-pr2075-20250708110002",
-    "@talismn/sapi": "0.0.0-pr2075-20250708110002",
-    "@talismn/scale": "0.0.0-pr2075-20250708110002",
-    "@talismn/chaindata-provider": "0.0.0-pr2075-20250708110002",
-    "@talismn/token-rates": "0.0.0-pr2075-20250708110002",
-    "@talismn/util": "0.0.0-pr2075-20250708110002"
+    "@talismn/chain-connector": "0.0.0-pr2075-20250708125508",
+    "@talismn/chaindata-provider": "0.0.0-pr2075-20250708125508",
+    "@talismn/chain-connector-evm": "0.0.0-pr2075-20250708125508",
+    "@talismn/sapi": "0.0.0-pr2075-20250708125508",
+    "@talismn/scale": "0.0.0-pr2075-20250708125508",
+    "@talismn/token-rates": "0.0.0-pr2075-20250708125508",
+    "@talismn/util": "0.0.0-pr2075-20250708125508"
   },
   "devDependencies": {
     "@polkadot/api-contract": "16.1.2",

package/dist/declarations/src/modules/util/RpcStateQueriesHelper.d.ts

@@ -1,12 +0,0 @@
-import { ChainConnector } from "@talismn/chain-connector";
-/**
- * Pass some these into an `RpcStateQueryHelper` in order to easily batch multiple state queries into the one rpc call.
- */
-export type RpcQueryPack<T> = {
-    stateKeys: (`0x${string}` | null)[];
-    decodeResult: (changes: (`0x${string}` | null)[]) => T;
-};
-export declare const fetchQueriesPack: <T>(connector: ChainConnector, networkId: string, queries: RpcQueryPack<T>[]) => Promise<T[]>;
-/**
- * Used by a variety of balance modules to help batch multiple state queries into the one rpc call.
- */