@talismn/balances 0.0.0-pr2075-20250709135256 → 0.0.0-pr2075-20250710032705

package/dist/talismn-balances.esm.js

@@ -1,16 +1,14 @@
-import { Dexie } from 'dexie';
-import anylogger from 'anylogger';
-import { evmErc20TokenId, MINIMETADATA_VERSION, EvmErc20TokenSchema, parseTokenId, parseEvmErc20TokenId, isTokenOfType, TokenBaseSchema, EvmNativeTokenSchema, evmNativeTokenId, EvmUniswapV2TokenSchema, evmUniswapV2TokenId, SubAssetsTokenSchema, subAssetTokenId, SubForeignAssetsTokenSchema, subForeignAssetTokenId, SubHydrationTokenSchema, subHydrationTokenId, SubNativeTokenSchema, subNativeTokenId, SubPsp22TokenSchema, subPsp22TokenId, SubTokensTokenSchema, subTokensTokenId, isNetworkDot } from '@talismn/chaindata-provider';
+import { EvmErc20TokenSchema, parseTokenId, parseEvmErc20TokenId, evmErc20TokenId, isTokenOfType, TokenBaseSchema, EvmNativeTokenSchema, evmNativeTokenId, EvmUniswapV2TokenSchema, evmUniswapV2TokenId, SubAssetsTokenSchema, subAssetTokenId, MINIMETADATA_VERSION, SubForeignAssetsTokenSchema, subForeignAssetTokenId, SubHydrationTokenSchema, subHydrationTokenId, SubNativeTokenSchema, subNativeTokenId, SubPsp22TokenSchema, subPsp22TokenId, SubTokensTokenSchema, subTokensTokenId, isNetworkDot } from '@talismn/chaindata-provider';
 export { MINIMETADATA_VERSION } from '@talismn/chaindata-provider';
-import { newTokenRates } from '@talismn/token-rates';
-import { isBigInt, BigMath, planckToTokens, isArrayOf, isTruthy, isEthereumAddress, isNotNil, isAbortError, getSharedObservable } from '@talismn/util';
-import BigNumber from 'bignumber.js';
-import { toHex, Twox64Concat, parseMetadataRpc, unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, decodeScale, getStorageKeyPrefix, compactMetadata, encodeMetadata, papiParse, papiStringify } from '@talismn/scale';
-import pako from 'pako';
+import { isEthereumAddress, isNotNil, BigMath, isArrayOf, isBigInt, planckToTokens, isAbortError, getSharedObservable } from '@talismn/util';
 import { parseAbi, erc20Abi, getContract, ContractFunctionExecutionError, hexToString, erc20Abi_bytes32, encodeFunctionData, withRetry } from 'viem';
 import { assign, omit, isEqual, keyBy, keys, uniq, fromPairs, values, toPairs } from 'lodash';
 import z from 'zod/v4';
+import anylogger from 'anylogger';
 import { of, Observable, distinctUntilChanged, map, timer, switchMap, from, firstValueFrom, combineLatest, BehaviorSubject, startWith, filter, tap } from 'rxjs';
+import { parseMetadataRpc, toHex, unifyMetadata, decAnyMetadata, getDynamicBuilder, getLookupFn, decodeScale, getStorageKeyPrefix, Twox64Concat, compactMetadata, encodeMetadata, papiParse, papiStringify } from '@talismn/scale';
+import { newTokenRates } from '@talismn/token-rates';
+import BigNumber from 'bignumber.js';
 import { mergeUint8 } from '@polkadot-api/utils';
 import { Binary, Enum, AccountId } from 'polkadot-api';
 import upperFirst from 'lodash/upperFirst';
@@ -21,876 +19,12 @@ import { u8aToHex, u8aConcatStrict, u8aToString, hexToNumber } from '@polkadot/u
 import PQueue from 'p-queue';
 import { fetchBestMetadata } from '@talismn/sapi';
 
-var packageJson = {
-	name: "@talismn/balances"};
-
-var log = anylogger(packageJson.name);
-
-function excludeFromTransferableAmount(locks) {
-  if (typeof locks === "string") return BigInt(locks);
-  if (!Array.isArray(locks)) locks = [locks];
-  return locks.filter(lock => lock.includeInTransferable !== true).map(lock => lock.amount.planck).reduce((max, lock) => BigMath.max(max, lock), 0n);
-}
-function excludeFromFeePayableLocks(locks) {
-  if (typeof locks === "string") return [];
-  if (!Array.isArray(locks)) locks = [locks];
-  return locks.filter(lock => lock.excludeFromFeePayable);
-}
-function includeInTotalExtraAmount(extra) {
-  if (!extra) return 0n;
-  if (!Array.isArray(extra)) extra = [extra];
-  return extra.filter(extra => extra.includeInTotal).map(extra => extra.amount.planck).reduce((a, b) => a + b, 0n);
-}
-
-/**
- * Have the importing library define its Token and BalanceJson enums (as a sum type of all plugins) and pass them into some
- * internal global typescript context, which is then picked up on by this module.
- */
-
-/** A utility type used to extract the underlying `BalanceType` of a specific source from a generalised `BalanceJson` */
-
-/** TODO: Remove this in favour of a frontend-friendly `ChaindataProvider` */
-
-/**
- * A collection of balances.
- */
-class Balances {
-  //
-  // Properties
-  //
-
-  #balances = [];
-
-  //
-  // Methods
-  //
-
-  constructor(balances, hydrate) {
-    // handle Balances (convert to Balance[])
-    if (balances instanceof Balances) return new Balances(balances.each, hydrate);
-
-    // handle Balance (convert to Balance[])
-    if (balances instanceof Balance) return new Balances([balances], hydrate);
-
-    // handle BalanceJsonList (the only remaining non-array type of balances) (convert to BalanceJson[])
-    if (!Array.isArray(balances)) return new Balances(Object.values(balances), hydrate);
-
-    // handle no balances
-    if (balances.length === 0) return this;
-
-    // handle BalanceJson[]
-    if (!isArrayOf(balances, Balance)) return new Balances(balances.map(storage => new Balance(storage)), hydrate);
-
-    // handle Balance[]
-    this.#balances = balances;
-    if (hydrate !== undefined) this.hydrate(hydrate);
-  }
-
-  /**
-   * Calling toJSON on a collection of balances will return the underlying BalanceJsonList.
-   */
-  toJSON = () => Object.fromEntries(this.#balances.map(balance => {
-    try {
-      return [balance.id, balance.toJSON()];
-    } catch (error) {
-      log.error("Failed to convert balance to JSON", error, {
-        id: balance.id,
-        balance
-      });
-      return null;
-    }
-  }).filter(Array.isArray));
-
-  /**
-   * Allows the collection to be iterated over.
-   *
-   * @example
-   * [...balances].forEach(balance => { // do something // })
-   *
-   * @example
-   * for (const balance of balances) {
-   *   // do something
-   * }
-   */
-  [Symbol.iterator] = () =>
-  // Create an array of the balances in this collection and return the result of its iterator.
-  this.#balances[Symbol.iterator]();
-
-  /**
-   * Hydrates all balances in this collection.
-   *
-   * @param sources - The sources to hydrate from.
-   */
-  hydrate = sources => {
-    this.#balances.map(balance => balance.hydrate(sources));
-  };
-
-  /**
-   * Retrieve a balance from this collection by id.
-   *
-   * @param id - The id of the balance to fetch.
-   * @returns The balance if one exists, or none.
-   */
-  get = id => this.#balances.find(balance => balance.id === id) ?? null;
-
-  /**
-   * Retrieve balances from this collection by search query.
-   *
-   * @param query - The search query.
-   * @returns All balances which match the query.
-   */
-  find = query => {
-    // construct filter
-    const queryArray = Array.isArray(query) ? query : [query];
-    const orQueries = queryArray.map(query => typeof query === "function" ? query : Object.entries(query));
-
-    // filter balances
-    const filter = balance => orQueries.some(query => typeof query === "function" ? query(balance) : query.every(([key, value]) => balance[key] === value));
-
-    // return filter matches
-    return new Balances([...this].filter(filter));
-  };
-
-  /**
-   * Filters this collection to exclude token balances where the token has a `mirrorOf` field
-   * and another balance exists in this collection for the token specified by the `mirrorOf` field.
-   */
-  filterMirrorTokens = () => new Balances([...this].filter(filterMirrorTokens));
-
-  /**
-   * Filters this collection to only include balances which are not zero AND have a fiat conversion rate.
-   */
-  filterNonZeroFiat = (type, currency) => {
-    const filter = balance => (balance[type].fiat(currency) ?? 0) > 0;
-    return this.find(filter);
-  };
-
-  /**
-   * Add some balances to this collection.
-   * Added balances take priority over existing balances.
-   * The aggregation of the two collections is returned.
-   * The original collection is not mutated.
-   *
-   * @param balances - Either a balance or collection of balances to add.
-   * @returns The new collection of balances.
-   */
-  add = balances => {
-    // handle single balance
-    if (balances instanceof Balance) return this.add(new Balances(balances));
-
-    // merge balances
-    const mergedBalances = Object.fromEntries(this.#balances.map(balance => [balance.id, balance]));
-    balances.each.forEach(balance => mergedBalances[balance.id] = balance);
-
-    // return new balances
-    return new Balances(Object.values(mergedBalances));
-  };
-
-  /**
-   * Remove balances from this collection by id.
-   * A new collection without these balances is returned.
-   * The original collection is not mutated.
-   *
-   * @param ids - The id(s) of the balances to remove.
-   * @returns The new collection of balances.
-   */
-  remove = ids => {
-    // handle single id
-    if (!Array.isArray(ids)) return this.remove([ids]);
-
-    // merge and return new balances
-    return new Balances(this.#balances.filter(balance => !ids.includes(balance.id)));
-  };
-
-  // TODO: Add some more useful aggregator methods
-
-  get each() {
-    return [...this];
-  }
-
-  /** @deprecated use each instead */
-  get sorted() {
-    return this.each;
-  }
-
-  /**
-   * Get the number of balances in this collection.
-   *
-   * @returns The number of balances in this collection.
-   */
-  get count() {
-    return [...this].length;
-  }
-
-  /**
-   * Get the summed value of balances in this collection.
-   * TODO: Sum up token amounts AND fiat amounts
-   *
-   * @example
-   * // Get the sum of all transferable balances in usd.
-   * balances.sum.fiat('usd').transferable
-   */
-  get sum() {
-    return new SumBalancesFormatter(this);
-  }
-}
-const getBalanceId = balance => {
-  const {
-    address,
-    tokenId
-  } = balance;
-  return [address, tokenId].join("::");
-};
-
-/**
- * An individual balance.
- */
-class Balance {
-  //
-  // Properties
-  //
+const MODULE_TYPE$8 = EvmErc20TokenSchema.shape.type.value;
+const PLATFORM$8 = EvmErc20TokenSchema.shape.platform.value;
 
-  /** The underlying data for this balance */
-  #storage;
-  #valueGetter;
-  #db = null;
+const abiMulticall = parseAbi(["struct Call { address target; bytes callData; }", "struct Call3 { address target; bool allowFailure; bytes callData; }", "struct Call3Value { address target; bool allowFailure; uint256 value; bytes callData; }", "struct Result { bool success; bytes returnData; }", "function aggregate(Call[] calldata calls) public payable returns (uint256 blockNumber, bytes[] memory returnData)", "function aggregate3(Call3[] calldata calls) public payable returns (Result[] memory returnData)", "function aggregate3Value(Call3Value[] calldata calls) public payable returns (Result[] memory returnData)", "function blockAndAggregate(Call[] calldata calls) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData)", "function getBasefee() view returns (uint256 basefee)", "function getBlockHash(uint256 blockNumber) view returns (bytes32 blockHash)", "function getBlockNumber() view returns (uint256 blockNumber)", "function getChainId() view returns (uint256 chainid)", "function getCurrentBlockCoinbase() view returns (address coinbase)", "function getCurrentBlockDifficulty() view returns (uint256 difficulty)", "function getCurrentBlockGasLimit() view returns (uint256 gaslimit)", "function getCurrentBlockTimestamp() view returns (uint256 timestamp)", "function getEthBalance(address addr) view returns (uint256 balance)", "function getLastBlockHash() view returns (bytes32 blockHash)", "function tryAggregate(bool requireSuccess, Call[] calldata calls) public payable returns (Result[] memory returnData)", "function tryBlockAndAggregate(bool requireSuccess, Call[] calldata calls) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData)"]);
 
-  //
-  // Methods
-  //
-
-  constructor(storage, hydrate) {
-    this.#storage = storage;
-    this.#valueGetter = new BalanceValueGetter(this.#storage);
-    if (hydrate !== undefined) this.hydrate(hydrate);
-  }
-  toJSON = () => this.#storage;
-  isSource = source => this.#storage.source === source;
-  // // TODO: Fix this method, the types don't work with our plugin architecture.
-  // // Specifically, the `BalanceJson` type is compiled down to `IBalance` in the following way:
-  // //
-  // //     toJSON: () => BalanceJson // works
-  // //     isSource: (source: BalanceSource) => boolean // works
-  // //     asSource: <P extends string>(source: P) => NarrowBalanceType<IBalance, P> | null // Doesn't work! IBalance should just be BalanceJson!
-  // //
-  // // `IBalance` won't match the type of `BalanceSource` after `PluginBalanceTypes` has been extended by balance plugins.
-  // // As a result, typescript will think that the returned #storage is not a BalanceJson.
-  // asSource = <P extends BalanceSource>(source: P): NarrowBalanceType<BalanceJson, P> | null => {
-  //   if (this.#storage.source === source) return this.#storage as NarrowBalanceType<BalanceJson, P>
-  //   return null
-  // }
-
-  hydrate = hydrate => {
-    if (hydrate !== undefined) this.#db = hydrate;
-  };
-  #format = balance => new BalanceFormatter(isBigInt(balance) ? balance.toString() : balance, this.decimals || undefined, this.rates);
-
-  //
-  // Accessors
-  //
-
-  get id() {
-    return getBalanceId(this.#storage);
-  }
-  get source() {
-    return this.#storage.source;
-  }
-  get status() {
-    return this.#storage.status;
-  }
-  get address() {
-    return this.#storage.address;
-  }
-  get networkId() {
-    return this.#storage.networkId;
-  }
-  get network() {
-    return this.#db?.networks?.[this.networkId] || null;
-  }
-  get tokenId() {
-    return this.#storage.tokenId;
-  }
-  get token() {
-    return this.#db?.tokens?.[this.tokenId] || null;
-  }
-  get decimals() {
-    return this.token?.decimals || null;
-  }
-  get rates() {
-    // uniswap v2 lp tokens need the rates from the underlying pool assets
-    //
-    // To note: `@talismn/token-rates` knows to fetch the `coingeckoId0` and `coingeckoId1` rates for evm-uniswapv2 tokens.
-    // They are then stored in `this.#db.tokenRates` using the `tokenId0` and `tokenId1` keys.
-    //
-    // This means that those rates are always available for calculating the uniswapv2 rates,
-    // regardless of whether or not the underlying erc20s are actually in chaindata and enabled.
-    if (this.isSource("evm-uniswapv2") && this.token?.type === "evm-uniswapv2") {
-      const tokenId0 = evmErc20TokenId(this.networkId, this.token.tokenAddress0);
-      const tokenId1 = evmErc20TokenId(this.networkId, this.token.tokenAddress1);
-      const decimals = this.token.decimals;
-      const decimals0 = this.token.decimals0;
-      const decimals1 = this.token.decimals1;
-      const rates0 = this.#db?.tokenRates && this.#db.tokenRates[tokenId0];
-      const rates1 = this.#db?.tokenRates && this.#db.tokenRates[tokenId1];
-      if (rates0 === undefined || rates1 === undefined) return null;
-      const extra = this.#valueGetter.get("extra");
-      const extras = Array.isArray(extra) ? extra : extra !== undefined ? [extra] : [];
-      const totalSupply = extras.find(extra => extra.label === "totalSupply")?.amount ?? "0";
-      const reserve0 = extras.find(extra => extra.label === "reserve0")?.amount ?? "0";
-      const reserve1 = extras.find(extra => extra.label === "reserve1")?.amount ?? "0";
-      const totalSupplyTokens = BigNumber(totalSupply).times(Math.pow(10, -1 * decimals));
-      const reserve0Tokens = BigNumber(reserve0).times(Math.pow(10, -1 * decimals0));
-      const reserve1Tokens = BigNumber(reserve1).times(Math.pow(10, -1 * decimals1));
-      const rates0Currencies = new Set(Object.keys(rates0));
-      const rates1Currencies = new Set(Object.keys(rates1));
-      // `Set.prototype.intersection` can eventually replace this
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set/intersection
-      const currencies = [...rates0Currencies].filter(c => rates1Currencies.has(c));
-      const totalValueLocked = currencies.map(currency => [currency,
-      // tvl (in a given currency) == reserve0*currencyRate0 + reserve1*currencyRate1
-      BigNumber.sum(reserve0Tokens.times(rates0[currency]?.price ?? 0), reserve1Tokens.times(rates1[currency]?.price ?? 0))]);
-      const lpTokenRates = newTokenRates();
-      totalValueLocked.forEach(([currency, tvl]) => {
-        // divide `the value of all lp tokens` by `the number of lp tokens` to get `the value per token`
-        if (!totalSupplyTokens.eq(0)) lpTokenRates[currency] = {
-          price: tvl.div(totalSupplyTokens).toNumber()
-        };
-      });
-      return lpTokenRates;
-    }
-
-    // other tokens can just pick from the tokenRates db using the tokenId
-    return this.#db?.tokenRates && this.#db.tokenRates[this.tokenId] || null;
-  }
-
-  /**
-   * A general method to get formatted values matching a certain type from this balance.
-   * @param valueType - The type of value to get.
-   * @returns An array of the values matching the type with formatted amounts.
-   */
-  getValue(valueType) {
-    return this.getRawValue(valueType).map(value => ({
-      ...value,
-      amount: this.#format(value.amount)
-    }));
-  }
-
-  /**
-   * A general method to get values matching a certain type from this balance.
-   * @param valueType - The type of value to get.
-   * @returns An array of the values matching the type.
-   */
-  getRawValue(valueType) {
-    return this.#valueGetter.get(valueType);
-  }
-
-  /**
-   * A general method to add a value to the array of values for this balance.
-   * @param valueType - The type of value to add.
-   * @returns A function which can be used to add a value to the array of values for this balance.
-   */
-  addValue(valueType) {
-    return value => this.#valueGetter.add(valueType, value);
-  }
-  /**
-   * The total balance of this token.
-   * Includes the free and the reserved amount.
-   * The balance will be reaped if this goes below the existential deposit.
-   */
-  get total() {
-    const extra = this.getValue("extra");
-
-    // if there is a DelegatedStaking hold (new model: polkadot, kusama), nom pool staked amount is included in reserved
-    // if not (old model: vara, avail, cere), staked amount is not in the account and it needs to be added to the total
-    const nomPoolStakedPlancks = this.locks.some(lock => lock.source === "substrate-native-holds" && lock.label === "DelegatedStaking") ? 0n : this.nompools.map(({
-      amount
-    }) => amount.planck).reduce((a, b) => a + b, 0n);
-    return this.#format(this.free.planck + this.reserved.planck + nomPoolStakedPlancks + this.subtensor.map(({
-      amount
-    }) => amount.planck).reduce((a, b) => a + b, 0n) + includeInTotalExtraAmount(extra));
-  }
-  /** The non-reserved balance of this token. Includes the frozen amount. Is included in the total. */
-  get free() {
-    // for simple balances
-    if ("value" in this.#storage && this.#storage.value) return this.#format(this.#storage.value);
-
-    // for complex balances
-    const freeValues = this.getValue("free");
-    const totalFree = freeValues.map(({
-      amount
-    }) => amount.planck).reduce((a, b) => a + b, 0n);
-    return this.#format(totalFree);
-  }
-  /** The reserved balance of this token. Is included in the total. */
-  get reserved() {
-    const reservedValues = this.getValue("reserved");
-    if (reservedValues.length === 0) return this.#format(0n);
-    return this.#format(reservedValues.map(({
-      amount
-    }) => amount.planck).reduce((a, b) => a + b, 0n));
-  }
-  get reserves() {
-    return this.getValue("reserved");
-  }
-  /** The frozen balance of this token. Is included in the free amount. */
-  get locked() {
-    return this.#format(this.locks.map(({
-      amount
-    }) => amount.planck).reduce((a, b) => BigMath.max(a, b), 0n));
-  }
-  get locks() {
-    return this.getValue("locked");
-  }
-  get nompools() {
-    return this.getValue("nompool");
-  }
-  get subtensor() {
-    return this.getValue("subtensor");
-  }
-
-  /** The extra balance of this token */
-  get extra() {
-    const extra = this.getRawValue("extra");
-    if (extra.length > 0) return extra;
-    return undefined;
-  }
-
-  /** @deprecated Use balance.locked */
-  get frozen() {
-    return this.locked;
-  }
-  /** The transferable balance of this token. Is generally the free amount - the miscFrozen amount. */
-  get transferable() {
-    /**
-     * As you can see here, `locked` is subtracted from `free` in order to derive `transferable`.
-     *
-     * |--------------------------total--------------------------|
-     * |-------------------free-------------------|---reserved---|
-     * |----locked-----|-------transferable-------|
-     */
-    const oldTransferableCalculation = () => {
-      // if no locks exist, transferable is equal to the free amount
-      if (this.locks.length === 0) return this.free;
-
-      // find the largest lock (but ignore any locks which are marked as `includeInTransferable`)
-      const excludeAmount = excludeFromTransferableAmount(this.locks);
-
-      // subtract the lock from the free amount (but don't go below 0)
-      return this.#format(BigMath.max(this.free.planck - excludeAmount, 0n));
-    };
-
-    /**
-     * As you can see here, `locked` is subtracted from `free + reserved` in order to derive `transferable`.
-     *
-     * Alternatively, `reserved` is subtracted from `locked` in order to derive `untouchable`,
-     * which is then subtracted from `free` in order to derive `transferable`.
-     *
-     * |--------------------------total--------------------------|
-     * |---reserved---|-------------------free-------------------|
-     *                |--untouchable--|
-     * |------------locked------------|-------transferable-------|
-     */
-    const newTransferableCalculation = () => {
-      // if no locks exist, transferable is equal to the free amount
-      if (this.locks.length === 0) return this.free;
-
-      // find the largest lock (but ignore any locks which are marked as `includeInTransferable`)
-      // subtract the reserved amount, because locks now act upon the total balance - not just the free balance
-      const untouchableAmount = BigMath.max(excludeFromTransferableAmount(this.locks) - this.reserved.planck, 0n);
-
-      // subtract the untouchable amount from the free amount (but don't go below 0)
-      return this.#format(BigMath.max(this.free.planck - untouchableAmount, 0n));
-    };
-    if (this.#storage.useLegacyTransferableCalculation) return oldTransferableCalculation();
-    return newTransferableCalculation();
-  }
-  /**
-   * The unavailable balance of this token.
-   * Prior to the Fungible trait, this was the locked amount + the reserved amount, i.e. `locked + reserved`.
-   * Now, it is the bigger of the locked amount and the reserved amounts, i.e. `max(locked, reserved)`.
-   */
-  get unavailable() {
-    const oldCalculation = () => this.locked.planck + this.reserved.planck;
-    const newCalculation = () => BigMath.max(this.locked.planck, this.reserved.planck);
-    const baseUnavailable = this.#storage.useLegacyTransferableCalculation ? oldCalculation() : newCalculation();
-
-    // if there is a DelegatedStaking hold (new model: polkadot, kusama), nom pool staked amount is included in reserved
-    // if not (old model: vara, avail, cere), staked amount is not in the account and it needs to be added to the total
-    const nomPoolStakedPlancks = this.locks.some(lock => lock.source === "substrate-native-holds" && lock.label === "DelegatedStaking") ? 0n : this.nompools.map(({
-      amount
-    }) => amount.planck).reduce((a, b) => a + b, 0n);
-    const otherUnavailable = nomPoolStakedPlancks + this.subtensor.reduce((total, each) => total + each.amount.planck, 0n);
-    return this.#format(baseUnavailable + otherUnavailable);
-  }
-
-  /** The feePayable balance of this token. Is generally the free amount - the feeFrozen amount. */
-  get feePayable() {
-    // if no locks exist, feePayable is equal to the free amount
-    if (this.locks.length === 0) return this.free;
-
-    // find the largest lock which can't be used to pay tx fees
-    const excludeAmount = excludeFromFeePayableLocks(this.locked.planck.toString()).map(lock => BigInt(lock.amount)).reduce((max, lock) => BigMath.max(max, lock), 0n);
-
-    // subtract the lock from the free amount (but don't go below 0)
-    return this.#format(BigMath.max(this.free.planck - excludeAmount, 0n));
-  }
-}
-class BalanceValueGetter {
-  #storage;
-  constructor(storage) {
-    this.#storage = storage;
-  }
-  get(valueType) {
-    if ("values" in this.#storage && this.#storage.values) return this.#storage.values.filter(({
-      type
-    }) => type === valueType);
-    return [];
-  }
-  add(valueType, amount) {
-    if ("values" in this.#storage && this.#storage.values) this.#storage.values.push({
-      type: valueType,
-      ...amount
-    });
-  }
-}
-class BalanceFormatter {
-  #planck;
-  #decimals;
-  #tokenRates;
-  constructor(planck, decimals, fiatRatios) {
-    this.#planck = isBigInt(planck) ? planck.toString() : planck ?? "0";
-    this.#decimals = decimals || 0;
-    this.#tokenRates = fiatRatios || null;
-  }
-  toJSON = () => this.#planck;
-  get planck() {
-    return BigInt(this.#planck);
-  }
-  get tokens() {
-    return planckToTokens(this.#planck, this.#decimals);
-  }
-  fiat(currency) {
-    if (!this.#tokenRates) return null;
-    const ratio = this.#tokenRates[currency];
-    if (!ratio) return null;
-    return parseFloat(this.tokens) * ratio.price;
-  }
-}
-class PlanckSumBalancesFormatter {
-  #balances;
-  constructor(balances) {
-    this.#balances = balances;
-  }
-  #sum = balanceField => {
-    // a function to get a planck amount from a balance
-    const planck = balance => balance[balanceField].planck ?? 0n;
-    return this.#balances.filterMirrorTokens().each.reduce(
-    // add the total amount to the planck amount of each balance
-    (total, balance) => total + planck(balance),
-    // start with a total of 0
-    0n);
-  };
-
-  /**
-   * The total balance of these tokens. Includes the free and the reserved amount.
-   */
-  get total() {
-    return this.#sum("total");
-  }
-  /** The non-reserved balance of these tokens. Includes the frozen amount. Is included in the total. */
-  get free() {
-    return this.#sum("free");
-  }
-  /** The reserved balance of these tokens. Is included in the total. */
-  get reserved() {
-    return this.#sum("reserved");
-  }
-  /** The frozen balance of these tokens. Is included in the free amount. */
-  get locked() {
-    return this.#sum("locked");
-  }
-  /** @deprecated Use balances.locked */
-  get frozen() {
-    return this.locked;
-  }
-  /** The transferable balance of these tokens. Is generally the free amount - the miscFrozen amount. */
-  get transferable() {
-    return this.#sum("transferable");
-  }
-  /** The unavailable balance of these tokens. */
-  get unavailable() {
-    return this.#sum("unavailable");
-  }
-
-  /** The feePayable balance of these tokens. Is generally the free amount - the feeFrozen amount. */
-  get feePayable() {
-    return this.#sum("feePayable");
-  }
-}
-class FiatSumBalancesFormatter {
-  #balances;
-  #currency;
-  constructor(balances, currency) {
-    this.#balances = balances;
-    this.#currency = currency;
-  }
-  #sum = balanceField => {
-    // a function to get a fiat amount from a balance
-    const fiat = balance => balance[balanceField].fiat(this.#currency) ?? 0;
-    return this.#balances.filterMirrorTokens().each.reduce(
-    // add the total amount to the fiat amount of each balance
-    (total, balance) => total + fiat(balance),
-    // start with a total of 0
-    0);
-  };
-
-  /**
-   * The total balance of these tokens. Includes the free and the reserved amount.
-   */
-  get total() {
-    return this.#sum("total");
-  }
-  /** The non-reserved balance of these tokens. Includes the frozen amount. Is included in the total. */
-  get free() {
-    return this.#sum("free");
-  }
-  /** The reserved balance of these tokens. Is included in the total. */
-  get reserved() {
-    return this.#sum("reserved");
-  }
-  /** The frozen balance of these tokens. Is included in the free amount. */
-  get locked() {
-    return this.#sum("locked");
-  }
-  /** @deprecated Use balances.locked */
-  get frozen() {
-    return this.locked;
-  }
-  /** The transferable balance of these tokens. Is generally the free amount - the miscFrozen amount. */
-  get transferable() {
-    return this.#sum("transferable");
-  }
-  /** The unavailable balance of these tokens. */
-  get unavailable() {
-    return this.#sum("unavailable");
-  }
-  /** The feePayable balance of these tokens. Is generally the free amount - the feeFrozen amount. */
-  get feePayable() {
-    return this.#sum("feePayable");
-  }
-}
-class SumBalancesFormatter {
-  #balances;
-  constructor(balances) {
-    this.#balances = balances;
-  }
-  get planck() {
-    return new PlanckSumBalancesFormatter(this.#balances);
-  }
-  fiat(currency) {
-    return new FiatSumBalancesFormatter(this.#balances, currency);
-  }
-  change24h(currency) {
-    return new Change24hCurrencyFormatter(this.#balances, currency);
-  }
-}
-class Change24hCurrencyFormatter {
-  #balances;
-  #currency;
-  constructor(balances, currency) {
-    this.#balances = balances;
-    this.#currency = currency;
-  }
-  #change24h = balanceField => {
-    const output = this.#balances.filterMirrorTokens().each.reduce(
-    // add the total amount to the fiat amount of each balance
-    (acc, balance) => {
-      const change24h = balance.rates?.[this.#currency]?.change24h;
-      if (typeof change24h !== "number") return acc;
-      const fiat = balance[balanceField].fiat(this.#currency);
-      if (!fiat) return acc;
-      return {
-        totalFiatDiff: acc.totalFiatDiff + fiat * change24h,
-        totalFiat: acc.totalFiat + fiat
-      };
-    },
-    // start with a total of 0
-    {
-      totalFiatDiff: 0,
-      totalFiat: 0
-    });
-    return output.totalFiat === 0 ? null : {
-      diff: output.totalFiatDiff / 100,
-      ratio: output.totalFiatDiff / output.totalFiat
-    };
-  };
-  get total() {
-    return this.#change24h("total");
-  }
-  get free() {
-    return this.#change24h("free");
-  }
-  get reserved() {
-    return this.#change24h("reserved");
-  }
-  get locked() {
-    return this.#change24h("locked");
-  }
-  get frozen() {
-    return this.#change24h("frozen");
-  }
-  get transferable() {
-    return this.#change24h("transferable");
-  }
-  get unavailable() {
-    return this.#change24h("unavailable");
-  }
-  get feePayable() {
-    return this.#change24h("feePayable");
-  }
-}
-const filterMirrorTokens = (balance, i, balances) => {
-  const mirrorOf = balance.token?.mirrorOf;
-  return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
-};
-
-/** `IBalance` is a common interface which all balance types must implement. */
-
-/** A collection of `BalanceJson` objects */
-
-/** An unlabelled amount of a balance */
-
-/** A labelled amount of a balance */
-
-const getValueId = amount => {
-  const getMetaId = () => {
-    const meta = amount.meta;
-    if (!meta) return "";
-    if (amount.type === "nompool") return meta.poolId?.toString() ?? "";
-    if (amount.type === "subtensor") {
-      const {
-        hotkey,
-        netuid
-      } = meta;
-      if (hotkey && netuid !== undefined) return `${hotkey.toString()}${netuid.toString()}`;
-    }
-    return "";
-  };
-  return [amount.label, amount.type, amount.source, getMetaId()].join("::");
-};
-
-/** A labelled locked amount of a balance */
-
-/** A labelled extra amount of a balance */
-
-/** Used by plugins to help define their custom `BalanceType` */
-
-/** For fast db access, you can calculate the primary key for a miniMetadata using this method */
-const deriveMiniMetadataId = ({
-  source,
-  chainId,
-  specVersion
-}) => toHex(Twox64Concat(new TextEncoder().encode(`${source}${chainId}${specVersion}${MINIMETADATA_VERSION}`))).slice(-64);
-
-// for DB version 3, Wallet version 1.21.0
-const upgradeRemoveSymbolFromNativeTokenId = async tx => {
-  const balancesTable = tx.table("balances");
-  try {
-    await balancesTable.toCollection().modify(balance => {
-      if (balance?.tokenId?.includes?.("-substrate-native-")) {
-        balance.tokenId = balance.tokenId.replace(/-substrate-native-.+$/, "-substrate-native");
-        balance.id = new Balance(balance).id;
-      }
-      if (balance?.tokenId?.includes?.("-evm-native-")) {
-        balance.tokenId = balance.tokenId.replace(/-evm-native-.+$/, "-evm-native");
-        balance.id = new Balance(balance).id;
-      }
-    });
-  } catch (err) {
-    // error most likely due to duplicate ids => clear the db
-    log.error("Failed to upgrade balances native token ids", {
-      err
-    });
-    await balancesTable.clear();
-  }
-};
-
-// "locks": [{"label":"fees","amount":"0","includeInTransferable":true,"excludeFromFeePayable":true},{"label":"misc","amount":"0"}]
-// "reserves":[{"label":"reserved","amount":"0"}]
-
-// for DB version 4, Wallet version 1.26.0
-// converts the structured balances data to a single compressed string
-const upgradeBalancesDataBlob = async tx => {
-  const balancesTable = tx.table("balances");
-  const balancesData = await balancesTable.toCollection().toArray();
-  // migrate to new format
-  const complexBalanceTypes = ["substrate-native", "substrate-tokens", "substrate-assets"];
-  const migratedData = balancesData.map(balance => {
-    if (complexBalanceTypes.includes(balance.source)) {
-      // too complicated to migrate subsource balances, so just clear them
-      if ("subSource" in balance) return false;
-      if (balance.free && balance.free !== "0") balance.values = [{
-        amount: balance.free,
-        type: "free",
-        label: "free"
-      }];else return false;
-    } else {
-      if (balance.free && balance.free !== "0") balance.value = balance.free;else return false;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const {
-      locks,
-      reserves,
-      extra,
-      ...stuffToKeep
-    } = balance;
-    return stuffToKeep;
-  }).filter(isTruthy);
-  const output = pako.deflate(JSON.stringify(migratedData));
-  // now write the compressed data back to the db and clear the old one
-  await tx.table("balancesBlob").put({
-    data: output,
-    id: Date.now().toString()
-  });
-  await tx.table("balances").clear();
-};
-
-class TalismanBalancesDatabase extends Dexie {
-  constructor() {
-    super("TalismanBalances");
-    // https://dexie.org/docs/Tutorial/Design#database-versioning
-    // You only need to specify properties that you wish to index.
-
-    // The object store will allow any properties on your stored objects but you can only query them by indexed properties
-    // https://dexie.org/docs/API-Reference#declare-database
-    //
-    // Never index properties containing images, movies or large (huge) strings. Store them in IndexedDB, yes! but just don’t index them!
-    // https://dexie.org/docs/Version/Version.stores()#warning
-
-    this.version(5).stores({
-      balancesBlob: "id",
-      miniMetadatas: "id, source, chainId, specName, specVersion",
-      balances: null
-    });
-    this.version(4).stores({
-      balances: "id",
-      balancesBlob: "id",
-      miniMetadatas: "id, source, chainId, specName, specVersion"
-    }).upgrade(upgradeBalancesDataBlob);
-    this.version(3).stores({
-      balances: "id, source, address, tokenId",
-      miniMetadatas: "id, source, chainId, specName, specVersion"
-    }).upgrade(upgradeRemoveSymbolFromNativeTokenId);
-  }
-}
-const db = new TalismanBalancesDatabase();
-
-const MODULE_TYPE$8 = EvmErc20TokenSchema.shape.type.value;
-const PLATFORM$8 = EvmErc20TokenSchema.shape.platform.value;
-
-const abiMulticall = parseAbi(["struct Call { address target; bytes callData; }", "struct Call3 { address target; bool allowFailure; bytes callData; }", "struct Call3Value { address target; bool allowFailure; uint256 value; bytes callData; }", "struct Result { bool success; bytes returnData; }", "function aggregate(Call[] calldata calls) public payable returns (uint256 blockNumber, bytes[] memory returnData)", "function aggregate3(Call3[] calldata calls) public payable returns (Result[] memory returnData)", "function aggregate3Value(Call3Value[] calldata calls) public payable returns (Result[] memory returnData)", "function blockAndAggregate(Call[] calldata calls) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData)", "function getBasefee() view returns (uint256 basefee)", "function getBlockHash(uint256 blockNumber) view returns (bytes32 blockHash)", "function getBlockNumber() view returns (uint256 blockNumber)", "function getChainId() view returns (uint256 chainid)", "function getCurrentBlockCoinbase() view returns (address coinbase)", "function getCurrentBlockDifficulty() view returns (uint256 difficulty)", "function getCurrentBlockGasLimit() view returns (uint256 gaslimit)", "function getCurrentBlockTimestamp() view returns (uint256 timestamp)", "function getEthBalance(address addr) view returns (uint256 balance)", "function getLastBlockHash() view returns (bytes32 blockHash)", "function tryAggregate(bool requireSuccess, Call[] calldata calls) public payable returns (Result[] memory returnData)", "function tryBlockAndAggregate(bool requireSuccess, Call[] calldata calls) public payable returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData)"]);
-
-const erc20BalancesAggregatorAbi = parseAbi(["struct AccountToken {address account; address token;}", "function balances(AccountToken[] memory accountTokens) public view returns (uint256[] memory)"]);
+const erc20BalancesAggregatorAbi = parseAbi(["struct AccountToken {address account; address token;}", "function balances(AccountToken[] memory accountTokens) public view returns (uint256[] memory)"]);
 
 const uniswapV2PairAbi = [{
   anonymous: false,
@@ -1584,6 +718,11 @@ const fetchWithAggregator$1 = async (client, balanceDefs, erc20BalancesAggregato
   }
 };
 
+var packageJson = {
+	name: "@talismn/balances"};
+
+var log = anylogger(packageJson.name);
+
 const getErc20ContractData$1 = async (client, contractAddress) => {
   try {
     const contract = getTypedContract$1(client, erc20Abi, contractAddress);
@@ -1699,20 +838,240 @@ const getTransferCallData$8 = ({
   if (!isTokenOfType(token, MODULE_TYPE$8)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$8}.`);
   if (!isEthereumAddress(from)) throw new Error("Invalid from address");
   if (!isEthereumAddress(to)) throw new Error("Invalid to address");
-  const data = encodeFunctionData({
-    abi: erc20Abi,
-    functionName: "transfer",
-    args: [to, BigInt(value)]
-  });
+  const data = encodeFunctionData({
+    abi: erc20Abi,
+    functionName: "transfer",
+    args: [to, BigInt(value)]
+  });
+  return {
+    from,
+    to: token.contractAddress,
+    data
+  };
+};
+
+const SUBSCRIPTION_INTERVAL$4 = 6_000;
+const subscribeBalances$8 = ({
+  networkId,
+  tokensWithAddresses,
+  connector
+}) => {
+  if (!tokensWithAddresses.length) return of({
+    success: [],
+    errors: []
+  });
+  return new Observable(subscriber => {
+    const abortController = new AbortController();
+    const poll = async () => {
+      try {
+        if (abortController.signal.aborted) return;
+        const balances = await fetchBalances$8({
+          networkId,
+          tokensWithAddresses: tokensWithAddresses,
+          connector
+        });
+        if (abortController.signal.aborted) return;
+        subscriber.next(balances);
+        setTimeout(poll, SUBSCRIPTION_INTERVAL$4);
+      } catch (error) {
+        log.error("Error", {
+          module: MODULE_TYPE$8,
+          networkId,
+          addressesByToken: tokensWithAddresses,
+          error
+        });
+        subscriber.error(error);
+      }
+    };
+    poll();
+    return () => {
+      abortController.abort();
+    };
+  }).pipe(distinctUntilChanged(isEqual));
+};
+
+const EvmErc20BalanceModule = {
+  type: MODULE_TYPE$8,
+  platform: PLATFORM$8,
+  getMiniMetadata: getMiniMetadata$8,
+  fetchTokens: fetchTokens$8,
+  fetchBalances: fetchBalances$8,
+  subscribeBalances: subscribeBalances$8,
+  getTransferCallData: getTransferCallData$8
+};
+
+const TokenConfigBaseSchema = TokenBaseSchema.partial().omit({
+  id: true
+});
+
+// to be used by chaindata too
+const EvmErc20TokenConfigSchema = z.strictObject({
+  contractAddress: EvmErc20TokenSchema.shape.contractAddress,
+  ...TokenConfigBaseSchema.shape
+});
+
+const MODULE_TYPE$7 = EvmNativeTokenSchema.shape.type.value;
+const PLATFORM$7 = EvmNativeTokenSchema.shape.platform.value;
+
+const fetchBalances$7 = async ({
+  networkId,
+  tokensWithAddresses,
+  connector
+}) => {
+  if (!tokensWithAddresses.length) return {
+    success: [],
+    errors: []
+  };
+  const client = await connector.getPublicClientForEvmNetwork(networkId);
+  if (!client) throw new Error(`Could not get rpc provider for evm network ${networkId}`);
+  for (const [token, addresses] of tokensWithAddresses) {
+    if (token.type !== MODULE_TYPE$7 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
+    for (const address of addresses) if (!isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
+  }
+  const balanceDefs = getBalanceDefs(tokensWithAddresses);
+  if (client.chain?.contracts?.multicall3 && balanceDefs.length > 1) {
+    const multicall3 = client.chain.contracts.multicall3;
+    return fetchWithMulticall(client, balanceDefs, multicall3.address);
+  }
+  return fetchWithoutMulticall(client, balanceDefs);
+};
+const fetchWithoutMulticall = async (client, balanceDefs) => {
+  if (balanceDefs.length === 0) return {
+    success: [],
+    errors: []
+  };
+  const results = await Promise.allSettled(balanceDefs.map(async ({
+    token,
+    address
+  }) => {
+    try {
+      const result = await client.getBalance({
+        address
+      });
+      const balance = {
+        address,
+        tokenId: token.id,
+        value: result.toString(),
+        source: MODULE_TYPE$7,
+        networkId: parseTokenId(token.id).networkId,
+        status: "live"
+      };
+      return balance;
+    } catch (err) {
+      throw new BalanceFetchError(`Failed to get balance for token ${token.id} and address ${address} on chain ${client.chain?.id}`, token.id, address, err);
+    }
+  }));
+  return results.reduce((acc, result) => {
+    if (result.status === "fulfilled") acc.success.push(result.value);else {
+      const error = result.reason;
+      acc.errors.push({
+        tokenId: error.tokenId,
+        address: error.address,
+        error
+      });
+    }
+    return acc;
+  }, {
+    success: [],
+    errors: []
+  });
+};
+const fetchWithMulticall = async (client, balanceDefs, multicall3Address) => {
+  if (balanceDefs.length === 0) return {
+    success: [],
+    errors: []
+  };
+  try {
+    const callResults = await client.multicall({
+      contracts: balanceDefs.map(({
+        address
+      }) => ({
+        address: multicall3Address,
+        abi: abiMulticall,
+        functionName: "getEthBalance",
+        args: [address]
+      }))
+    });
+    return callResults.reduce((acc, result, index) => {
+      if (result.status === "success") {
+        acc.success.push({
+          address: balanceDefs[index].address,
+          tokenId: balanceDefs[index].token.id,
+          value: result.result.toString(),
+          source: MODULE_TYPE$7,
+          networkId: parseTokenId(balanceDefs[index].token.id).networkId,
+          status: "live"
+        });
+      }
+      if (result.status === "failure") {
+        acc.errors.push({
+          tokenId: balanceDefs[index].token.id,
+          address: balanceDefs[index].address,
+          error: new BalanceFetchError(`Failed to get balance for token ${balanceDefs[index].token.id} and address ${balanceDefs[index].address} on chain ${client.chain?.id}`, balanceDefs[index].token.id, balanceDefs[index].address, result.error)
+        });
+      }
+      return acc;
+    }, {
+      success: [],
+      errors: []
+    });
+  } catch (err) {
+    const errors = balanceDefs.map(balanceDef => ({
+      tokenId: balanceDef.token.id,
+      address: balanceDef.address,
+      error: new BalanceFetchNetworkError(`Failed to get balances for evm-erc20 tokens on chain ${client.chain?.id}`, String(client.chain?.id), err)
+    }));
+    return {
+      success: [],
+      errors
+    };
+  }
+};
+
+const fetchTokens$7 = async ({
+  networkId,
+  tokens
+}) => {
+  // assume there is one and only one token in the array
+  if (tokens.length !== 1) throw new Error("EVM Native module expects the nativeCurrency to be passed as a single token in the array");
+  const token = assign({
+    id: evmNativeTokenId(networkId),
+    type: MODULE_TYPE$7,
+    platform: PLATFORM$7,
+    networkId,
+    isDefault: true
+  }, tokens[0]);
+  const parsed = EvmNativeTokenSchema.safeParse(token);
+  if (!parsed.success) {
+    log.warn("Ignoring token with invalid schema", token);
+    return [];
+  }
+  return [parsed.data];
+};
+
+const getMiniMetadata$7 = () => {
+  throw new Error("MiniMetadata is not supported for ethereum tokens");
+};
+
+const getTransferCallData$7 = ({
+  from,
+  to,
+  value,
+  token
+}) => {
+  if (!isTokenOfType(token, MODULE_TYPE$7)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$7}.`);
+  if (!isEthereumAddress(from)) throw new Error("Invalid from address");
+  if (!isEthereumAddress(to)) throw new Error("Invalid to address");
   return {
     from,
-    to: token.contractAddress,
-    data
+    to,
+    value,
+    data: "0x"
   };
 };
 
-const SUBSCRIPTION_INTERVAL$4 = 6_000;
-const subscribeBalances$8 = ({
+const SUBSCRIPTION_INTERVAL$3 = 6_000;
+const subscribeBalances$7 = ({
   networkId,
   tokensWithAddresses,
   connector
@@ -1726,17 +1085,17 @@ const subscribeBalances$8 = ({
     const poll = async () => {
       try {
         if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$8({
+        const balances = await fetchBalances$7({
           networkId,
           tokensWithAddresses: tokensWithAddresses,
           connector
         });
         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$8,
+          module: MODULE_TYPE$7,
           networkId,
           addressesByToken: tokensWithAddresses,
           error
@@ -1751,30 +1110,25 @@ const subscribeBalances$8 = ({
   }).pipe(distinctUntilChanged(isEqual));
 };
 
-const EvmErc20BalanceModule = {
-  type: MODULE_TYPE$8,
-  platform: PLATFORM$8,
-  getMiniMetadata: getMiniMetadata$8,
-  fetchTokens: fetchTokens$8,
-  fetchBalances: fetchBalances$8,
-  subscribeBalances: subscribeBalances$8,
-  getTransferCallData: getTransferCallData$8
+const EvmNativeBalanceModule = {
+  type: MODULE_TYPE$7,
+  platform: PLATFORM$7,
+  getMiniMetadata: getMiniMetadata$7,
+  fetchTokens: fetchTokens$7,
+  fetchBalances: fetchBalances$7,
+  subscribeBalances: subscribeBalances$7,
+  getTransferCallData: getTransferCallData$7
 };
 
-const TokenConfigBaseSchema = TokenBaseSchema.partial().omit({
-  id: true
-});
-
 // to be used by chaindata too
-const EvmErc20TokenConfigSchema = z.strictObject({
-  contractAddress: EvmErc20TokenSchema.shape.contractAddress,
+const EvmNativeTokenConfigSchema = z.strictObject({
   ...TokenConfigBaseSchema.shape
 });
 
-const MODULE_TYPE$7 = EvmNativeTokenSchema.shape.type.value;
-const PLATFORM$7 = EvmNativeTokenSchema.shape.platform.value;
+const MODULE_TYPE$6 = EvmUniswapV2TokenSchema.shape.type.value;
+const PLATFORM$6 = EvmUniswapV2TokenSchema.shape.platform.value;
 
-const fetchBalances$7 = async ({
+const fetchBalances$6 = async ({
   networkId,
   tokensWithAddresses,
   connector
@@ -1786,17 +1140,17 @@ const fetchBalances$7 = async ({
   const client = await connector.getPublicClientForEvmNetwork(networkId);
   if (!client) throw new Error(`Could not get rpc provider for evm network ${networkId}`);
   for (const [token, addresses] of tokensWithAddresses) {
-    if (token.type !== MODULE_TYPE$7 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
+    if (token.type !== MODULE_TYPE$6 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
     for (const address of addresses) if (!isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
   }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
-  if (client.chain?.contracts?.multicall3 && balanceDefs.length > 1) {
-    const multicall3 = client.chain.contracts.multicall3;
-    return fetchWithMulticall(client, balanceDefs, multicall3.address);
+  if (client.chain?.contracts?.erc20Aggregator && balanceDefs.length > 1) {
+    const erc20Aggregator = client.chain.contracts.erc20Aggregator;
+    return fetchWithAggregator(client, balanceDefs, erc20Aggregator.address);
   }
-  return fetchWithoutMulticall(client, balanceDefs);
+  return fetchWithoutAggregator(client, balanceDefs);
 };
-const fetchWithoutMulticall = async (client, balanceDefs) => {
+const fetchWithoutAggregator = async (client, balanceDefs) => {
   if (balanceDefs.length === 0) return {
     success: [],
     errors: []
@@ -1806,14 +1160,17 @@ const fetchWithoutMulticall = async (client, balanceDefs) => {
     address
   }) => {
     try {
-      const result = await client.getBalance({
-        address
+      const result = await client.readContract({
+        abi: erc20Abi,
+        address: token.contractAddress,
+        functionName: "balanceOf",
+        args: [address]
       });
       const balance = {
         address,
         tokenId: token.id,
         value: result.toString(),
-        source: MODULE_TYPE$7,
+        source: MODULE_TYPE$6,
         networkId: parseTokenId(token.id).networkId,
         status: "live"
       };
@@ -1837,45 +1194,33 @@ const fetchWithoutMulticall = async (client, balanceDefs) => {
     errors: []
   });
 };
-const fetchWithMulticall = async (client, balanceDefs, multicall3Address) => {
+const fetchWithAggregator = async (client, balanceDefs, erc20BalancesAggregatorAddress) => {
   if (balanceDefs.length === 0) return {
     success: [],
     errors: []
   };
   try {
-    const callResults = await client.multicall({
-      contracts: balanceDefs.map(({
-        address
-      }) => ({
-        address: multicall3Address,
-        abi: abiMulticall,
-        functionName: "getEthBalance",
-        args: [address]
-      }))
+    const erc20Balances = await client.readContract({
+      abi: erc20BalancesAggregatorAbi,
+      address: erc20BalancesAggregatorAddress,
+      functionName: "balances",
+      args: [balanceDefs.map(b => ({
+        account: b.address,
+        token: b.token.contractAddress
+      }))]
     });
-    return callResults.reduce((acc, result, index) => {
-      if (result.status === "success") {
-        acc.success.push({
-          address: balanceDefs[index].address,
-          tokenId: balanceDefs[index].token.id,
-          value: result.result.toString(),
-          source: MODULE_TYPE$7,
-          networkId: parseTokenId(balanceDefs[index].token.id).networkId,
-          status: "live"
-        });
-      }
-      if (result.status === "failure") {
-        acc.errors.push({
-          tokenId: balanceDefs[index].token.id,
-          address: balanceDefs[index].address,
-          error: new BalanceFetchError(`Failed to get balance for token ${balanceDefs[index].token.id} and address ${balanceDefs[index].address} on chain ${client.chain?.id}`, balanceDefs[index].token.id, balanceDefs[index].address, result.error)
-        });
-      }
-      return acc;
-    }, {
-      success: [],
+    const success = balanceDefs.map((balanceDef, index) => ({
+      address: balanceDef.address,
+      tokenId: balanceDef.token.id,
+      value: erc20Balances[index].toString(),
+      source: MODULE_TYPE$6,
+      networkId: parseTokenId(balanceDef.token.id).networkId,
+      status: "live"
+    }));
+    return {
+      success,
       errors: []
-    });
+    };
   } catch (err) {
     const errors = balanceDefs.map(balanceDef => ({
       tokenId: balanceDef.token.id,
@@ -1889,50 +1234,183 @@ const fetchWithMulticall = async (client, balanceDefs, multicall3Address) => {
   }
 };
 
-const fetchTokens$7 = async ({
-  networkId,
-  tokens
-}) => {
-  // assume there is one and only one token in the array
-  if (tokens.length !== 1) throw new Error("EVM Native module expects the nativeCurrency to be passed as a single token in the array");
-  const token = assign({
-    id: evmNativeTokenId(networkId),
-    type: MODULE_TYPE$7,
-    platform: PLATFORM$7,
-    networkId,
-    isDefault: true
-  }, tokens[0]);
-  const parsed = EvmNativeTokenSchema.safeParse(token);
-  if (!parsed.success) {
-    log.warn("Ignoring token with invalid schema", token);
-    return [];
-  }
-  return [parsed.data];
-};
-
-const getMiniMetadata$7 = () => {
+const getErc20ContractData = async (client, contractAddress) => {
+  try {
+    const contract = getTypedContract(client, erc20Abi, contractAddress);
+
+    // eslint-disable-next-line no-var
+    var [symbol, decimals, name] = await Promise.all([contract.read.symbol(), contract.read.decimals(), contract.read.name()]);
+  } catch (e) {
+    if (e instanceof ContractFunctionExecutionError) {
+      // try to perform the contract read with bytes32 symbol
+      const contract = getTypedContract(client, erc20Abi_bytes32, contractAddress);
+
+      // eslint-disable-next-line no-var
+      var [bytesSymbol, decimals, nameSymbol] = await Promise.all([contract.read.symbol(), contract.read.decimals(), contract.read.name()]);
+      symbol = hexToString(bytesSymbol).replace(/\0/g, "").trim(); // remove NULL characters
+      name = hexToString(nameSymbol).replace(/\0/g, "").trim(); // remove NULL characters
+    } else throw e;
+  }
+  return {
+    symbol,
+    decimals,
+    name
+  };
+};
+const getTypedContract = (client, abi, contractAddress) => getContract({
+  address: contractAddress,
+  abi,
+  client: {
+    public: client
+  }
+});
+const getUniswapV2PairContractData = async (client, contractAddress) => {
+  const contract = getTypedContract(client, uniswapV2PairAbi, contractAddress);
+
+  // eslint-disable-next-line no-var
+  var [token0, token1, decimals, name] = await Promise.all([contract.read.token0(), contract.read.token1(), contract.read.decimals(), contract.read.name()]);
+  return {
+    token0,
+    token1,
+    decimals,
+    name
+  };
+};
+
+// const TokenCacheSchema = EvmUniswapV2TokenSchema.pick({
+//   id: true,
+//   symbol: true,
+//   decimals: true,
+//   name: true,
+//   tokenAddress0: true,
+//   tokenAddress1: true,
+//   decimals0: true,
+//   decimals1: true,
+//   symbol0: true,
+//   symbol1: true,
+// })
+
+const TokenCacheSchema = z.discriminatedUnion("isValid", [z.strictObject({
+  id: EvmUniswapV2TokenSchema.shape.id,
+  isValid: z.literal(true),
+  ...EvmUniswapV2TokenSchema.pick({
+    symbol: true,
+    decimals: true,
+    name: true,
+    tokenAddress0: true,
+    tokenAddress1: true,
+    decimals0: true,
+    decimals1: true,
+    symbol0: true,
+    symbol1: true
+  }).shape
+}), z.strictObject({
+  id: EvmUniswapV2TokenSchema.shape.id,
+  isValid: z.literal(false)
+})]);
+const fetchTokens$6 = async ({
+  networkId,
+  tokens,
+  connector,
+  cache
+}) => {
+  const result = [];
+  for (const tokenConfig of tokens) {
+    const tokenId = evmUniswapV2TokenId(networkId, tokenConfig.contractAddress);
+    const cached = cache[tokenId] && TokenCacheSchema.safeParse(cache[tokenId]).data;
+    if (!cached) {
+      const client = await connector.getPublicClientForEvmNetwork(networkId);
+      if (!client) {
+        log.warn(`No client found for network ${networkId} while fetching EVM ERC20 tokens`);
+        continue;
+      }
+      try {
+        const {
+          token0,
+          token1,
+          name,
+          decimals
+        } = await getUniswapV2PairContractData(client, tokenConfig.contractAddress);
+        const {
+          symbol: symbol0,
+          decimals: decimals0
+        } = await getErc20ContractData(client, token0);
+        const {
+          symbol: symbol1,
+          decimals: decimals1
+        } = await getErc20ContractData(client, token1);
+        cache[tokenId] = TokenCacheSchema.parse({
+          id: tokenId,
+          symbol: `${symbol0}/${symbol1}`,
+          decimals,
+          name,
+          tokenAddress0: token0,
+          tokenAddress1: token1,
+          decimals0,
+          decimals1,
+          symbol0,
+          symbol1,
+          isValid: true
+        });
+      } catch (err) {
+        const msg = err.shortMessage;
+        if (msg.includes("returned no data") || msg.includes("is out of bounds") || msg.includes("reverted")) {
+          cache[tokenId] = {
+            id: tokenId,
+            isValid: false
+          };
+        } else {
+          log.warn(`Failed to fetch UniswapV2 token data for ${tokenConfig.contractAddress}`, err.shortMessage);
+        }
+        continue;
+      }
+    }
+    const base = {
+      id: tokenId,
+      type: MODULE_TYPE$6,
+      platform: PLATFORM$6,
+      networkId
+    };
+    const cached2 = cache[tokenId] && TokenCacheSchema.safeParse(cache[tokenId]).data;
+    if (cached2?.isValid === false) continue;
+    const token = assign(base, cached2?.isValid ? omit(cached2, ["isValid"]) : {}, tokenConfig);
+    const parsed = EvmUniswapV2TokenSchema.safeParse(token);
+    if (!parsed.success) {
+      log.warn("Ignoring token with invalid schema", token);
+      continue;
+    }
+    result.push(parsed.data);
+  }
+  return result;
+};
+
+const getMiniMetadata$6 = () => {
   throw new Error("MiniMetadata is not supported for ethereum tokens");
 };
 
-const getTransferCallData$7 = ({
+const getTransferCallData$6 = ({
   from,
   to,
   value,
   token
 }) => {
-  if (!isTokenOfType(token, MODULE_TYPE$7)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$7}.`);
+  if (!isTokenOfType(token, MODULE_TYPE$6)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$6}.`);
   if (!isEthereumAddress(from)) throw new Error("Invalid from address");
   if (!isEthereumAddress(to)) throw new Error("Invalid to address");
+  const data = encodeFunctionData({
+    abi: erc20Abi,
+    functionName: "transfer",
+    args: [to, BigInt(value)]
+  });
   return {
     from,
-    to,
-    value,
-    data: "0x"
+    to: token.contractAddress,
+    data
   };
 };
 
-const SUBSCRIPTION_INTERVAL$3 = 6_000;
-const subscribeBalances$7 = ({
+const SUBSCRIPTION_INTERVAL$2 = 6_000;
+const subscribeBalances$6 = ({
   networkId,
   tokensWithAddresses,
   connector
@@ -1946,17 +1424,17 @@ const subscribeBalances$7 = ({
     const poll = async () => {
       try {
         if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$7({
+        const balances = await fetchBalances$6({
           networkId,
           tokensWithAddresses: tokensWithAddresses,
           connector
         });
         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$7,
+          module: MODULE_TYPE$6,
           networkId,
           addressesByToken: tokensWithAddresses,
           error
@@ -1964,715 +1442,1142 @@ const subscribeBalances$7 = ({
         subscriber.error(error);
       }
     };
-    poll();
-    return () => {
-      abortController.abort();
+    poll();
+    return () => {
+      abortController.abort();
+    };
+  }).pipe(distinctUntilChanged(isEqual));
+};
+
+const EvmUniswapV2BalanceModule = {
+  type: MODULE_TYPE$6,
+  platform: PLATFORM$6,
+  getMiniMetadata: getMiniMetadata$6,
+  fetchTokens: fetchTokens$6,
+  fetchBalances: fetchBalances$6,
+  subscribeBalances: subscribeBalances$6,
+  getTransferCallData: getTransferCallData$6
+};
+
+// to be used by chaindata too
+const EvmUniswapV2TokenConfigSchema = z.strictObject({
+  contractAddress: EvmUniswapV2TokenSchema.shape.contractAddress,
+  ...TokenConfigBaseSchema.shape
+});
+
+const MODULE_TYPE$5 = SubAssetsTokenSchema.shape.type.value;
+const PLATFORM$5 = SubAssetsTokenSchema.shape.platform.value;
+
+const fetchRpcQueryPack = async (connector, networkId, queries) => {
+  const allStateKeys = queries.flatMap(({
+    stateKeys
+  }) => stateKeys).filter(isNotNil);
+
+  // doing a query without keys would throw an error => return early
+  if (!allStateKeys.length) return queries.map(({
+    stateKeys,
+    decodeResult
+  }) => decodeResult(stateKeys.map(() => null)));
+  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 = result.changes.find(([key]) => key === stateKey);
+      if (!change) return null;
+      return change[1];
+    });
+    acc.push(decodeResult(changes));
+    return acc;
+  }, []);
+};
+
+const fetchRuntimeCallResult = async (connector, networkId, metadataRpc, apiName, method, args) => {
+  const {
+    builder
+  } = parseMetadataRpc(metadataRpc);
+  const call = builder.buildRuntimeCall(apiName, method);
+  const hex = await connector.send(networkId, "state_call", [`${apiName}_${method}`, toHex(call.args.enc(args))]);
+  return call.value.dec(hex);
+};
+
+const getConstantValue = (metadataRpc, pallet, constant) => {
+  const {
+    unifiedMetadata,
+    builder
+  } = parseMetadataRpc(metadataRpc);
+  const codec = builder.buildConstant(pallet, constant);
+  const encodedValue = unifiedMetadata.pallets.find(({
+    name
+  }) => name === pallet)?.constants.find(({
+    name
+  }) => name === constant)?.value;
+  if (!encodedValue) throw new Error(`Constant ${pallet}.${constant} not found`);
+  return codec.dec(encodedValue);
+};
+
+const tryGetConstantValue = (metadataRpc, pallet, constant) => {
+  const {
+    unifiedMetadata,
+    builder
+  } = parseMetadataRpc(metadataRpc);
+  const encodedValue = unifiedMetadata.pallets.find(({
+    name
+  }) => name === pallet)?.constants.find(({
+    name
+  }) => name === constant)?.value;
+  if (!encodedValue) return null;
+  const codec = builder.buildConstant(pallet, constant);
+  return codec.dec(encodedValue);
+};
+
+const hasStorageItem = (metadata, palletName, itemName) => {
+  const pallet = metadata.pallets.find(p => p.name === palletName);
+  if (!pallet || !pallet.storage) return false;
+  return pallet.storage.items.some(item => item.name === itemName);
+};
+const hasStorageItems = (metadata, palletName, itemNames) => {
+  const pallet = metadata.pallets.find(p => p.name === palletName);
+  if (!pallet || !pallet.storage) return false;
+  return itemNames.every(itemName => pallet.storage?.items.some(item => item.name === itemName));
+};
+const hasRuntimeApi = (metadata, apiName, method) => {
+  const api = metadata.apis.find(api => api.name === apiName);
+  if (!api || !api.methods) return false;
+  return api.methods.some(m => m.name === method);
+};
+
+const buildNetworkStorageCoders = (chainId, miniMetadata, coders) => {
+  if (!miniMetadata.data) return null;
+  const metadata = unifyMetadata(decAnyMetadata(miniMetadata.data));
+  try {
+    const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
+    const builtCoders = Object.fromEntries(Object.entries(coders).flatMap(([key, moduleMethodOrFn]) => {
+      const [module, method] = typeof moduleMethodOrFn === "function" ? moduleMethodOrFn({
+        chainId
+      }) : moduleMethodOrFn;
+      try {
+        return [[key, scaleBuilder.buildStorage(module, method)]];
+      } catch (cause) {
+        log.trace(`Failed to build SCALE coder for chain ${chainId} (${module}::${method})`, cause);
+        return [];
+      }
+    }));
+    return builtCoders;
+  } catch (cause) {
+    log.error(`Failed to build SCALE coders for chain ${chainId} (${JSON.stringify(coders)})`, cause);
+  }
+  return null;
+};
+
+const buildQueries$2 = (networkId, balanceDefs, miniMetadata) => {
+  const networkStorageCoders = buildNetworkStorageCoders(networkId, miniMetadata, {
+    storage: ["Assets", "Account"]
+  });
+  return balanceDefs.map(({
+    token,
+    address
+  }) => {
+    const scaleCoder = networkStorageCoders?.storage;
+    const stateKey = tryEncode(scaleCoder, Number(token.assetId), address) ??
+    // Asset Hub
+    tryEncode(scaleCoder, BigInt(token.assetId), address); // Astar
+
+    if (!stateKey) {
+      log.warn(`Invalid assetId / address in ${networkId} storage query ${token.assetId} / ${address}`);
+      return null;
+    }
+    const decodeResult = changes => {
+      /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
+
+      const decoded = decodeScale(scaleCoder, changes[0], `Failed to decode substrate-assets balance on chain ${networkId}`) ?? {
+        balance: 0n,
+        status: {
+          type: "Liquid"
+        }};
+      const isFrozen = decoded?.status?.type === "Frozen";
+      const amount = (decoded?.balance ?? 0n).toString();
+
+      // due to the following balance calculations, which are made in the `Balance` type:
+      //
+      // total balance        = (free balance) + (reserved balance)
+      // transferable balance = (free balance) - (frozen balance)
+      //
+      // when `isFrozen` is true we need to set **both** the `free` and `frozen` amounts
+      // of this balance to the value we received from the RPC.
+      //
+      // if we only set the `frozen` amount, then the `total` calculation will be incorrect!
+      const free = amount;
+      const frozen = token.isFrozen || isFrozen ? amount : "0";
+
+      // include balance values even if zero, so that newly-zero values overwrite old values
+      const balanceValues = [{
+        type: "free",
+        label: "free",
+        amount: free.toString()
+      }, {
+        type: "locked",
+        label: "frozen",
+        amount: frozen.toString()
+      }];
+      const balance = {
+        source: "substrate-assets",
+        status: "live",
+        address,
+        networkId,
+        tokenId: token.id,
+        values: balanceValues
+      };
+      return balance;
+    };
+    return {
+      stateKeys: [stateKey],
+      decodeResult
     };
-  }).pipe(distinctUntilChanged(isEqual));
+  }).filter(isNotNil);
 };
-
-const EvmNativeBalanceModule = {
-  type: MODULE_TYPE$7,
-  platform: PLATFORM$7,
-  getMiniMetadata: getMiniMetadata$7,
-  fetchTokens: fetchTokens$7,
-  fetchBalances: fetchBalances$7,
-  subscribeBalances: subscribeBalances$7,
-  getTransferCallData: getTransferCallData$7
+const tryEncode = (scaleCoder, ...args) => {
+  try {
+    return scaleCoder?.keys?.enc?.(...args);
+  } catch {
+    return null;
+  }
 };
 
-// to be used by chaindata too
-const EvmNativeTokenConfigSchema = z.strictObject({
-  ...TokenConfigBaseSchema.shape
-});
-
-const MODULE_TYPE$6 = EvmUniswapV2TokenSchema.shape.type.value;
-const PLATFORM$6 = EvmUniswapV2TokenSchema.shape.platform.value;
-
-const fetchBalances$6 = async ({
+const fetchBalances$5 = async ({
   networkId,
   tokensWithAddresses,
-  connector
+  connector,
+  miniMetadata
 }) => {
   if (!tokensWithAddresses.length) return {
     success: [],
     errors: []
   };
-  const client = await connector.getPublicClientForEvmNetwork(networkId);
-  if (!client) throw new Error(`Could not get rpc provider for evm network ${networkId}`);
-  for (const [token, addresses] of tokensWithAddresses) {
-    if (token.type !== MODULE_TYPE$6 || token.networkId !== networkId) throw new Error(`Invalid token type or networkId for EVM ERC20 balance module: ${token.type} on ${token.networkId}`);
-    for (const address of addresses) if (!isEthereumAddress(address)) throw new Error(`Invalid ethereum address for EVM ERC20 balance module: ${address} for token ${token.id}`);
-  }
   const balanceDefs = getBalanceDefs(tokensWithAddresses);
-  if (client.chain?.contracts?.erc20Aggregator && balanceDefs.length > 1) {
-    const erc20Aggregator = client.chain.contracts.erc20Aggregator;
-    return fetchWithAggregator(client, balanceDefs, erc20Aggregator.address);
+  if (!miniMetadata?.data) {
+    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$5} balances on ${networkId}.`);
+    return {
+      success: [],
+      errors: balanceDefs.map(def => ({
+        tokenId: def.token.id,
+        address: def.address,
+        error: new Error("Minimetadata is required for fetching balances")
+      }))
+    };
   }
-  return fetchWithoutAggregator(client, balanceDefs);
-};
-const fetchWithoutAggregator = async (client, balanceDefs) => {
-  if (balanceDefs.length === 0) return {
-    success: [],
-    errors: []
-  };
-  const results = await Promise.allSettled(balanceDefs.map(async ({
-    token,
-    address
-  }) => {
-    try {
-      const result = await client.readContract({
-        abi: erc20Abi,
-        address: token.contractAddress,
-        functionName: "balanceOf",
-        args: [address]
-      });
-      const balance = {
-        address,
-        tokenId: token.id,
-        value: result.toString(),
-        source: MODULE_TYPE$6,
-        networkId: parseTokenId(token.id).networkId,
-        status: "live"
-      };
-      return balance;
-    } catch (err) {
-      throw new BalanceFetchError(`Failed to get balance for token ${token.id} and address ${address} on chain ${client.chain?.id}`, token.id, address, err);
-    }
-  }));
-  return results.reduce((acc, result) => {
-    if (result.status === "fulfilled") acc.success.push(result.value);else {
-      const error = result.reason;
-      acc.errors.push({
-        tokenId: error.tokenId,
-        address: error.address,
-        error
-      });
-    }
+  if (miniMetadata.source !== MODULE_TYPE$5) {
+    log.warn(`Ignoring miniMetadata with source ${miniMetadata.source} in ${MODULE_TYPE$5}.`);
+    return {
+      success: [],
+      errors: balanceDefs.map(def => ({
+        tokenId: def.token.id,
+        address: def.address,
+        error: new Error(`Invalid request: miniMetadata source is not ${MODULE_TYPE$5}`)
+      }))
+    };
+  }
+  if (miniMetadata.chainId !== networkId) {
+    log.warn(`Ignoring miniMetadata with chainId ${miniMetadata.chainId} in ${MODULE_TYPE$5}. Expected chainId is ${networkId}`);
+    return {
+      success: [],
+      errors: balanceDefs.map(def => ({
+        tokenId: def.token.id,
+        address: def.address,
+        error: new Error(`Invalid request: Expected chainId is ${networkId}`)
+      }))
+    };
+  }
+  const queries = buildQueries$2(networkId, balanceDefs, miniMetadata);
+  const balances = await fetchRpcQueryPack(connector, networkId, queries);
+  return balanceDefs.reduce((acc, def) => {
+    const balance = balances.find(b => b?.address === def.address && b?.tokenId === def.token.id);
+    if (balance) acc.success.push(balance);
+    //if no entry consider empty balance
+    else acc.success.push({
+      address: def.address,
+      networkId,
+      tokenId: def.token.id,
+      source: MODULE_TYPE$5,
+      status: "live",
+      values: [{
+        type: "free",
+        label: "free",
+        amount: "0"
+      }, {
+        type: "locked",
+        label: "frozen",
+        amount: "0"
+      }]
+    });
     return acc;
   }, {
     success: [],
     errors: []
   });
 };
-const fetchWithAggregator = async (client, balanceDefs, erc20BalancesAggregatorAddress) => {
-  if (balanceDefs.length === 0) return {
-    success: [],
-    errors: []
-  };
-  try {
-    const erc20Balances = await client.readContract({
-      abi: erc20BalancesAggregatorAbi,
-      address: erc20BalancesAggregatorAddress,
-      functionName: "balances",
-      args: [balanceDefs.map(b => ({
-        account: b.address,
-        token: b.token.contractAddress
-      }))]
-    });
-    const success = balanceDefs.map((balanceDef, index) => ({
-      address: balanceDef.address,
-      tokenId: balanceDef.token.id,
-      value: erc20Balances[index].toString(),
-      source: MODULE_TYPE$6,
-      networkId: parseTokenId(balanceDef.token.id).networkId,
-      status: "live"
-    }));
+
+const fetchTokens$5 = async ({
+  networkId,
+  tokens,
+  connector,
+  miniMetadata
+}) => {
+  const anyMiniMetadata = miniMetadata;
+  if (!anyMiniMetadata?.data) return [];
+  const {
+    builder
+  } = parseMetadataRpc(anyMiniMetadata.data);
+  const assetCodec = builder.buildStorage("Assets", "Asset");
+  const metadataCodec = builder.buildStorage("Assets", "Metadata");
+  const [allAssetStorageKeys, allMetadataStorageKeys] = await Promise.all([connector.send(networkId, "state_getKeys", [getStorageKeyPrefix("Assets", "Asset")]), connector.send(networkId, "state_getKeys", [getStorageKeyPrefix("Assets", "Metadata")])]);
+  const [assetStorageResults, metadataStorageResults] = await Promise.all([connector.send(networkId, "state_queryStorageAt", [allAssetStorageKeys]), connector.send(networkId, "state_queryStorageAt", [allMetadataStorageKeys])]);
+  const assetStorageEntries = assetStorageResults[0].changes;
+  const metadataStorageEntries = metadataStorageResults[0].changes;
+  const assetByAssetId = keyBy(assetStorageEntries.map(([key, value]) => {
+    const [assetId] = assetCodec.keys.dec(key);
+    const asset = assetCodec.value.dec(value);
     return {
-      success,
-      errors: []
+      assetId,
+      existentialDeposit: asset.min_balance,
+      isSufficient: asset.is_sufficient
     };
-  } catch (err) {
-    const errors = balanceDefs.map(balanceDef => ({
-      tokenId: balanceDef.token.id,
-      address: balanceDef.address,
-      error: new BalanceFetchNetworkError(`Failed to get balances for evm-erc20 tokens on chain ${client.chain?.id}`, String(client.chain?.id), err)
-    }));
+  }), a => a.assetId);
+  const metadataByAssetId = keyBy(metadataStorageEntries.map(([key, value]) => {
+    const [assetId] = metadataCodec.keys.dec(key);
+    const metadata = metadataCodec.value.dec(value);
     return {
-      success: [],
-      errors
+      assetId,
+      decimals: metadata.decimals,
+      isFrozen: metadata.is_frozen,
+      name: metadata.name?.asText(),
+      symbol: metadata.symbol?.asText()
     };
-  }
+  }), a => a.assetId);
+  const allTokens = keys(assetByAssetId).map(assetId => assign({}, assetByAssetId[assetId], metadataByAssetId[assetId] ?? undefined));
+  const configTokenByAssetId = keyBy(tokens, t => t.assetId);
+  return allTokens.map(asset => ({
+    id: subAssetTokenId(networkId, String(asset.assetId)),
+    type: MODULE_TYPE$5,
+    platform: "polkadot",
+    networkId,
+    assetId: String(asset.assetId),
+    isSufficient: asset.isSufficient,
+    isFrozen: asset.isFrozen,
+    name: asset.name,
+    symbol: asset.symbol,
+    decimals: asset.decimals ?? 0,
+    existentialDeposit: String(asset.existentialDeposit),
+    isDefault: true
+  }))
+  // keep all tokens listed in the config + all tokens marked as sufficient
+  .filter(token => {
+    const configToken = configTokenByAssetId[token.assetId];
+    return configToken || token.isSufficient;
+  })
+  // apply config overrides
+  .map(token => {
+    const configToken = configTokenByAssetId[token.assetId];
+    return configToken ? assign({}, token, configToken) : token;
+  })
+  // validate results
+  .filter(t => {
+    const parsed = SubAssetsTokenSchema.safeParse(t);
+    if (!parsed.success) log.warn(`Ignoring invalid token ${MODULE_TYPE$5}`, t);
+    return parsed.success;
+  });
 };
 
-const getErc20ContractData = async (client, contractAddress) => {
-  try {
-    const contract = getTypedContract(client, erc20Abi, contractAddress);
+function excludeFromTransferableAmount(locks) {
+  if (typeof locks === "string") return BigInt(locks);
+  if (!Array.isArray(locks)) locks = [locks];
+  return locks.filter(lock => lock.includeInTransferable !== true).map(lock => lock.amount.planck).reduce((max, lock) => BigMath.max(max, lock), 0n);
+}
+function excludeFromFeePayableLocks(locks) {
+  if (typeof locks === "string") return [];
+  if (!Array.isArray(locks)) locks = [locks];
+  return locks.filter(lock => lock.excludeFromFeePayable);
+}
+function includeInTotalExtraAmount(extra) {
+  if (!extra) return 0n;
+  if (!Array.isArray(extra)) extra = [extra];
+  return extra.filter(extra => extra.includeInTotal).map(extra => extra.amount.planck).reduce((a, b) => a + b, 0n);
+}
 
-    // eslint-disable-next-line no-var
-    var [symbol, decimals, name] = await Promise.all([contract.read.symbol(), contract.read.decimals(), contract.read.name()]);
-  } catch (e) {
-    if (e instanceof ContractFunctionExecutionError) {
-      // try to perform the contract read with bytes32 symbol
-      const contract = getTypedContract(client, erc20Abi_bytes32, contractAddress);
+/**
+ * Have the importing library define its Token and BalanceJson enums (as a sum type of all plugins) and pass them into some
+ * internal global typescript context, which is then picked up on by this module.
+ */
 
-      // eslint-disable-next-line no-var
-      var [bytesSymbol, decimals, nameSymbol] = await Promise.all([contract.read.symbol(), contract.read.decimals(), contract.read.name()]);
-      symbol = hexToString(bytesSymbol).replace(/\0/g, "").trim(); // remove NULL characters
-      name = hexToString(nameSymbol).replace(/\0/g, "").trim(); // remove NULL characters
-    } else throw e;
-  }
-  return {
-    symbol,
-    decimals,
-    name
-  };
-};
-const getTypedContract = (client, abi, contractAddress) => getContract({
-  address: contractAddress,
-  abi,
-  client: {
-    public: client
+/** A utility type used to extract the underlying `BalanceType` of a specific source from a generalised `BalanceJson` */
+
+/** TODO: Remove this in favour of a frontend-friendly `ChaindataProvider` */
+
+/**
+ * A collection of balances.
+ */
+class Balances {
+  //
+  // Properties
+  //
+
+  #balances = [];
+
+  //
+  // Methods
+  //
+
+  constructor(balances, hydrate) {
+    // handle Balances (convert to Balance[])
+    if (balances instanceof Balances) return new Balances(balances.each, hydrate);
+
+    // handle Balance (convert to Balance[])
+    if (balances instanceof Balance) return new Balances([balances], hydrate);
+
+    // handle BalanceJsonList (the only remaining non-array type of balances) (convert to BalanceJson[])
+    if (!Array.isArray(balances)) return new Balances(Object.values(balances), hydrate);
+
+    // handle no balances
+    if (balances.length === 0) return this;
+
+    // handle BalanceJson[]
+    if (!isArrayOf(balances, Balance)) return new Balances(balances.map(storage => new Balance(storage)), hydrate);
+
+    // handle Balance[]
+    this.#balances = balances;
+    if (hydrate !== undefined) this.hydrate(hydrate);
   }
-});
-const getUniswapV2PairContractData = async (client, contractAddress) => {
-  const contract = getTypedContract(client, uniswapV2PairAbi, contractAddress);
 
-  // eslint-disable-next-line no-var
-  var [token0, token1, decimals, name] = await Promise.all([contract.read.token0(), contract.read.token1(), contract.read.decimals(), contract.read.name()]);
-  return {
-    token0,
-    token1,
-    decimals,
-    name
+  /**
+   * Calling toJSON on a collection of balances will return the underlying BalanceJsonList.
+   */
+  toJSON = () => Object.fromEntries(this.#balances.map(balance => {
+    try {
+      return [balance.id, balance.toJSON()];
+    } catch (error) {
+      log.error("Failed to convert balance to JSON", error, {
+        id: balance.id,
+        balance
+      });
+      return null;
+    }
+  }).filter(Array.isArray));
+
+  /**
+   * Allows the collection to be iterated over.
+   *
+   * @example
+   * [...balances].forEach(balance => { // do something // })
+   *
+   * @example
+   * for (const balance of balances) {
+   *   // do something
+   * }
+   */
+  [Symbol.iterator] = () =>
+  // Create an array of the balances in this collection and return the result of its iterator.
+  this.#balances[Symbol.iterator]();
+
+  /**
+   * Hydrates all balances in this collection.
+   *
+   * @param sources - The sources to hydrate from.
+   */
+  hydrate = sources => {
+    this.#balances.map(balance => balance.hydrate(sources));
   };
-};
 
-// const TokenCacheSchema = EvmUniswapV2TokenSchema.pick({
-//   id: true,
-//   symbol: true,
-//   decimals: true,
-//   name: true,
-//   tokenAddress0: true,
-//   tokenAddress1: true,
-//   decimals0: true,
-//   decimals1: true,
-//   symbol0: true,
-//   symbol1: true,
-// })
+  /**
+   * Retrieve a balance from this collection by id.
+   *
+   * @param id - The id of the balance to fetch.
+   * @returns The balance if one exists, or none.
+   */
+  get = id => this.#balances.find(balance => balance.id === id) ?? null;
 
-const TokenCacheSchema = z.discriminatedUnion("isValid", [z.strictObject({
-  id: EvmUniswapV2TokenSchema.shape.id,
-  isValid: z.literal(true),
-  ...EvmUniswapV2TokenSchema.pick({
-    symbol: true,
-    decimals: true,
-    name: true,
-    tokenAddress0: true,
-    tokenAddress1: true,
-    decimals0: true,
-    decimals1: true,
-    symbol0: true,
-    symbol1: true
-  }).shape
-}), z.strictObject({
-  id: EvmUniswapV2TokenSchema.shape.id,
-  isValid: z.literal(false)
-})]);
-const fetchTokens$6 = async ({
-  networkId,
-  tokens,
-  connector,
-  cache
-}) => {
-  const result = [];
-  for (const tokenConfig of tokens) {
-    const tokenId = evmUniswapV2TokenId(networkId, tokenConfig.contractAddress);
-    const cached = cache[tokenId] && TokenCacheSchema.safeParse(cache[tokenId]).data;
-    if (!cached) {
-      const client = await connector.getPublicClientForEvmNetwork(networkId);
-      if (!client) {
-        log.warn(`No client found for network ${networkId} while fetching EVM ERC20 tokens`);
-        continue;
-      }
-      try {
-        const {
-          token0,
-          token1,
-          name,
-          decimals
-        } = await getUniswapV2PairContractData(client, tokenConfig.contractAddress);
-        const {
-          symbol: symbol0,
-          decimals: decimals0
-        } = await getErc20ContractData(client, token0);
-        const {
-          symbol: symbol1,
-          decimals: decimals1
-        } = await getErc20ContractData(client, token1);
-        cache[tokenId] = TokenCacheSchema.parse({
-          id: tokenId,
-          symbol: `${symbol0}/${symbol1}`,
-          decimals,
-          name,
-          tokenAddress0: token0,
-          tokenAddress1: token1,
-          decimals0,
-          decimals1,
-          symbol0,
-          symbol1,
-          isValid: true
-        });
-      } catch (err) {
-        const msg = err.shortMessage;
-        if (msg.includes("returned no data") || msg.includes("is out of bounds") || msg.includes("reverted")) {
-          cache[tokenId] = {
-            id: tokenId,
-            isValid: false
-          };
-        } else {
-          log.warn(`Failed to fetch UniswapV2 token data for ${tokenConfig.contractAddress}`, err.shortMessage);
-        }
-        continue;
-      }
-    }
-    const base = {
-      id: tokenId,
-      type: MODULE_TYPE$6,
-      platform: PLATFORM$6,
-      networkId
-    };
-    const cached2 = cache[tokenId] && TokenCacheSchema.safeParse(cache[tokenId]).data;
-    if (cached2?.isValid === false) continue;
-    const token = assign(base, cached2?.isValid ? omit(cached2, ["isValid"]) : {}, tokenConfig);
-    const parsed = EvmUniswapV2TokenSchema.safeParse(token);
-    if (!parsed.success) {
-      log.warn("Ignoring token with invalid schema", token);
-      continue;
-    }
-    result.push(parsed.data);
+  /**
+   * Retrieve balances from this collection by search query.
+   *
+   * @param query - The search query.
+   * @returns All balances which match the query.
+   */
+  find = query => {
+    // construct filter
+    const queryArray = Array.isArray(query) ? query : [query];
+    const orQueries = queryArray.map(query => typeof query === "function" ? query : Object.entries(query));
+
+    // filter balances
+    const filter = balance => orQueries.some(query => typeof query === "function" ? query(balance) : query.every(([key, value]) => balance[key] === value));
+
+    // return filter matches
+    return new Balances([...this].filter(filter));
+  };
+
+  /**
+   * Filters this collection to exclude token balances where the token has a `mirrorOf` field
+   * and another balance exists in this collection for the token specified by the `mirrorOf` field.
+   */
+  filterMirrorTokens = () => new Balances([...this].filter(filterMirrorTokens));
+
+  /**
+   * Filters this collection to only include balances which are not zero AND have a fiat conversion rate.
+   */
+  filterNonZeroFiat = (type, currency) => {
+    const filter = balance => (balance[type].fiat(currency) ?? 0) > 0;
+    return this.find(filter);
+  };
+
+  /**
+   * Add some balances to this collection.
+   * Added balances take priority over existing balances.
+   * The aggregation of the two collections is returned.
+   * The original collection is not mutated.
+   *
+   * @param balances - Either a balance or collection of balances to add.
+   * @returns The new collection of balances.
+   */
+  add = balances => {
+    // handle single balance
+    if (balances instanceof Balance) return this.add(new Balances(balances));
+
+    // merge balances
+    const mergedBalances = Object.fromEntries(this.#balances.map(balance => [balance.id, balance]));
+    balances.each.forEach(balance => mergedBalances[balance.id] = balance);
+
+    // return new balances
+    return new Balances(Object.values(mergedBalances));
+  };
+
+  /**
+   * Remove balances from this collection by id.
+   * A new collection without these balances is returned.
+   * The original collection is not mutated.
+   *
+   * @param ids - The id(s) of the balances to remove.
+   * @returns The new collection of balances.
+   */
+  remove = ids => {
+    // handle single id
+    if (!Array.isArray(ids)) return this.remove([ids]);
+
+    // merge and return new balances
+    return new Balances(this.#balances.filter(balance => !ids.includes(balance.id)));
+  };
+
+  // TODO: Add some more useful aggregator methods
+
+  get each() {
+    return [...this];
   }
-  return result;
-};
 
-const getMiniMetadata$6 = () => {
-  throw new Error("MiniMetadata is not supported for ethereum tokens");
+  /** @deprecated use each instead */
+  get sorted() {
+    return this.each;
+  }
+
+  /**
+   * Get the number of balances in this collection.
+   *
+   * @returns The number of balances in this collection.
+   */
+  get count() {
+    return [...this].length;
+  }
+
+  /**
+   * Get the summed value of balances in this collection.
+   * TODO: Sum up token amounts AND fiat amounts
+   *
+   * @example
+   * // Get the sum of all transferable balances in usd.
+   * balances.sum.fiat('usd').transferable
+   */
+  get sum() {
+    return new SumBalancesFormatter(this);
+  }
+}
+const getBalanceId = balance => {
+  const {
+    address,
+    tokenId
+  } = balance;
+  return [address, tokenId].join("::");
 };
 
-const getTransferCallData$6 = ({
-  from,
-  to,
-  value,
-  token
-}) => {
-  if (!isTokenOfType(token, MODULE_TYPE$6)) throw new Error(`Token type ${token.type} is not ${MODULE_TYPE$6}.`);
-  if (!isEthereumAddress(from)) throw new Error("Invalid from address");
-  if (!isEthereumAddress(to)) throw new Error("Invalid to address");
-  const data = encodeFunctionData({
-    abi: erc20Abi,
-    functionName: "transfer",
-    args: [to, BigInt(value)]
-  });
-  return {
-    from,
-    to: token.contractAddress,
-    data
+/**
+ * An individual balance.
+ */
+class Balance {
+  //
+  // Properties
+  //
+
+  /** The underlying data for this balance */
+  #storage;
+  #valueGetter;
+  #db = null;
+
+  //
+  // Methods
+  //
+
+  constructor(storage, hydrate) {
+    this.#storage = storage;
+    this.#valueGetter = new BalanceValueGetter(this.#storage);
+    if (hydrate !== undefined) this.hydrate(hydrate);
+  }
+  toJSON = () => this.#storage;
+  isSource = source => this.#storage.source === source;
+  // // TODO: Fix this method, the types don't work with our plugin architecture.
+  // // Specifically, the `BalanceJson` type is compiled down to `IBalance` in the following way:
+  // //
+  // //     toJSON: () => BalanceJson // works
+  // //     isSource: (source: BalanceSource) => boolean // works
+  // //     asSource: <P extends string>(source: P) => NarrowBalanceType<IBalance, P> | null // Doesn't work! IBalance should just be BalanceJson!
+  // //
+  // // `IBalance` won't match the type of `BalanceSource` after `PluginBalanceTypes` has been extended by balance plugins.
+  // // As a result, typescript will think that the returned #storage is not a BalanceJson.
+  // asSource = <P extends BalanceSource>(source: P): NarrowBalanceType<BalanceJson, P> | null => {
+  //   if (this.#storage.source === source) return this.#storage as NarrowBalanceType<BalanceJson, P>
+  //   return null
+  // }
+
+  hydrate = hydrate => {
+    if (hydrate !== undefined) this.#db = hydrate;
   };
-};
+  #format = balance => new BalanceFormatter(isBigInt(balance) ? balance.toString() : balance, this.decimals || undefined, this.rates);
 
-const SUBSCRIPTION_INTERVAL$2 = 6_000;
-const subscribeBalances$6 = ({
-  networkId,
-  tokensWithAddresses,
-  connector
-}) => {
-  if (!tokensWithAddresses.length) return of({
-    success: [],
-    errors: []
-  });
-  return new Observable(subscriber => {
-    const abortController = new AbortController();
-    const poll = async () => {
-      try {
-        if (abortController.signal.aborted) return;
-        const balances = await fetchBalances$6({
-          networkId,
-          tokensWithAddresses: tokensWithAddresses,
-          connector
-        });
-        if (abortController.signal.aborted) return;
-        subscriber.next(balances);
-        setTimeout(poll, SUBSCRIPTION_INTERVAL$2);
-      } catch (error) {
-        log.error("Error", {
-          module: MODULE_TYPE$6,
-          networkId,
-          addressesByToken: tokensWithAddresses,
-          error
-        });
-        subscriber.error(error);
-      }
-    };
-    poll();
-    return () => {
-      abortController.abort();
-    };
-  }).pipe(distinctUntilChanged(isEqual));
-};
+  //
+  // Accessors
+  //
+
+  get id() {
+    return getBalanceId(this.#storage);
+  }
+  get source() {
+    return this.#storage.source;
+  }
+  get status() {
+    return this.#storage.status;
+  }
+  get address() {
+    return this.#storage.address;
+  }
+  get networkId() {
+    return this.#storage.networkId;
+  }
+  get network() {
+    return this.#db?.networks?.[this.networkId] || null;
+  }
+  get tokenId() {
+    return this.#storage.tokenId;
+  }
+  get token() {
+    return this.#db?.tokens?.[this.tokenId] || null;
+  }
+  get decimals() {
+    return this.token?.decimals || null;
+  }
+  get rates() {
+    // uniswap v2 lp tokens need the rates from the underlying pool assets
+    //
+    // To note: `@talismn/token-rates` knows to fetch the `coingeckoId0` and `coingeckoId1` rates for evm-uniswapv2 tokens.
+    // They are then stored in `this.#db.tokenRates` using the `tokenId0` and `tokenId1` keys.
+    //
+    // This means that those rates are always available for calculating the uniswapv2 rates,
+    // regardless of whether or not the underlying erc20s are actually in chaindata and enabled.
+    if (this.isSource("evm-uniswapv2") && this.token?.type === "evm-uniswapv2") {
+      const tokenId0 = evmErc20TokenId(this.networkId, this.token.tokenAddress0);
+      const tokenId1 = evmErc20TokenId(this.networkId, this.token.tokenAddress1);
+      const decimals = this.token.decimals;
+      const decimals0 = this.token.decimals0;
+      const decimals1 = this.token.decimals1;
+      const rates0 = this.#db?.tokenRates && this.#db.tokenRates[tokenId0];
+      const rates1 = this.#db?.tokenRates && this.#db.tokenRates[tokenId1];
+      if (rates0 === undefined || rates1 === undefined) return null;
+      const extra = this.#valueGetter.get("extra");
+      const extras = Array.isArray(extra) ? extra : extra !== undefined ? [extra] : [];
+      const totalSupply = extras.find(extra => extra.label === "totalSupply")?.amount ?? "0";
+      const reserve0 = extras.find(extra => extra.label === "reserve0")?.amount ?? "0";
+      const reserve1 = extras.find(extra => extra.label === "reserve1")?.amount ?? "0";
+      const totalSupplyTokens = BigNumber(totalSupply).times(Math.pow(10, -1 * decimals));
+      const reserve0Tokens = BigNumber(reserve0).times(Math.pow(10, -1 * decimals0));
+      const reserve1Tokens = BigNumber(reserve1).times(Math.pow(10, -1 * decimals1));
+      const rates0Currencies = new Set(Object.keys(rates0));
+      const rates1Currencies = new Set(Object.keys(rates1));
+      // `Set.prototype.intersection` can eventually replace this
+      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set/intersection
+      const currencies = [...rates0Currencies].filter(c => rates1Currencies.has(c));
+      const totalValueLocked = currencies.map(currency => [currency,
+      // tvl (in a given currency) == reserve0*currencyRate0 + reserve1*currencyRate1
+      BigNumber.sum(reserve0Tokens.times(rates0[currency]?.price ?? 0), reserve1Tokens.times(rates1[currency]?.price ?? 0))]);
+      const lpTokenRates = newTokenRates();
+      totalValueLocked.forEach(([currency, tvl]) => {
+        // divide `the value of all lp tokens` by `the number of lp tokens` to get `the value per token`
+        if (!totalSupplyTokens.eq(0)) lpTokenRates[currency] = {
+          price: tvl.div(totalSupplyTokens).toNumber()
+        };
+      });
+      return lpTokenRates;
+    }
 
-const EvmUniswapV2BalanceModule = {
-  type: MODULE_TYPE$6,
-  platform: PLATFORM$6,
-  getMiniMetadata: getMiniMetadata$6,
-  fetchTokens: fetchTokens$6,
-  fetchBalances: fetchBalances$6,
-  subscribeBalances: subscribeBalances$6,
-  getTransferCallData: getTransferCallData$6
-};
+    // other tokens can just pick from the tokenRates db using the tokenId
+    return this.#db?.tokenRates && this.#db.tokenRates[this.tokenId] || null;
+  }
 
-// to be used by chaindata too
-const EvmUniswapV2TokenConfigSchema = z.strictObject({
-  contractAddress: EvmUniswapV2TokenSchema.shape.contractAddress,
-  ...TokenConfigBaseSchema.shape
-});
+  /**
+   * A general method to get formatted values matching a certain type from this balance.
+   * @param valueType - The type of value to get.
+   * @returns An array of the values matching the type with formatted amounts.
+   */
+  getValue(valueType) {
+    return this.getRawValue(valueType).map(value => ({
+      ...value,
+      amount: this.#format(value.amount)
+    }));
+  }
 
-const MODULE_TYPE$5 = SubAssetsTokenSchema.shape.type.value;
-const PLATFORM$5 = SubAssetsTokenSchema.shape.platform.value;
+  /**
+   * A general method to get values matching a certain type from this balance.
+   * @param valueType - The type of value to get.
+   * @returns An array of the values matching the type.
+   */
+  getRawValue(valueType) {
+    return this.#valueGetter.get(valueType);
+  }
 
-const fetchRpcQueryPack = async (connector, networkId, queries) => {
-  const allStateKeys = queries.flatMap(({
-    stateKeys
-  }) => stateKeys).filter(isNotNil);
+  /**
+   * A general method to add a value to the array of values for this balance.
+   * @param valueType - The type of value to add.
+   * @returns A function which can be used to add a value to the array of values for this balance.
+   */
+  addValue(valueType) {
+    return value => this.#valueGetter.add(valueType, value);
+  }
+  /**
+   * The total balance of this token.
+   * Includes the free and the reserved amount.
+   * The balance will be reaped if this goes below the existential deposit.
+   */
+  get total() {
+    const extra = this.getValue("extra");
 
-  // doing a query without keys would throw an error => return early
-  if (!allStateKeys.length) return queries.map(({
-    stateKeys,
-    decodeResult
-  }) => decodeResult(stateKeys.map(() => null)));
-  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);
+    // if there is a DelegatedStaking hold (new model: polkadot, kusama), nom pool staked amount is included in reserved
+    // if not (old model: vara, avail, cere), staked amount is not in the account and it needs to be added to the total
+    const nomPoolStakedPlancks = this.locks.some(lock => lock.source === "substrate-native-holds" && lock.label === "DelegatedStaking") ? 0n : this.nompools.map(({
+      amount
+    }) => amount.planck).reduce((a, b) => a + b, 0n);
+    return this.#format(this.free.planck + this.reserved.planck + nomPoolStakedPlancks + this.subtensor.map(({
+      amount
+    }) => amount.planck).reduce((a, b) => a + b, 0n) + includeInTotalExtraAmount(extra));
+  }
+  /** The non-reserved balance of this token. Includes the frozen amount. Is included in the total. */
+  get free() {
+    // for simple balances
+    if ("value" in this.#storage && this.#storage.value) return this.#format(this.#storage.value);
 
-  // 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 = result.changes.find(([key]) => key === stateKey);
-      if (!change) return null;
-      return change[1];
-    });
-    acc.push(decodeResult(changes));
-    return acc;
-  }, []);
-};
+    // for complex balances
+    const freeValues = this.getValue("free");
+    const totalFree = freeValues.map(({
+      amount
+    }) => amount.planck).reduce((a, b) => a + b, 0n);
+    return this.#format(totalFree);
+  }
+  /** The reserved balance of this token. Is included in the total. */
+  get reserved() {
+    const reservedValues = this.getValue("reserved");
+    if (reservedValues.length === 0) return this.#format(0n);
+    return this.#format(reservedValues.map(({
+      amount
+    }) => amount.planck).reduce((a, b) => a + b, 0n));
+  }
+  get reserves() {
+    return this.getValue("reserved");
+  }
+  /** The frozen balance of this token. Is included in the free amount. */
+  get locked() {
+    return this.#format(this.locks.map(({
+      amount
+    }) => amount.planck).reduce((a, b) => BigMath.max(a, b), 0n));
+  }
+  get locks() {
+    return this.getValue("locked");
+  }
+  get nompools() {
+    return this.getValue("nompool");
+  }
+  get subtensor() {
+    return this.getValue("subtensor");
+  }
 
-const fetchRuntimeCallResult = async (connector, networkId, metadataRpc, apiName, method, args) => {
-  const {
-    builder
-  } = parseMetadataRpc(metadataRpc);
-  const call = builder.buildRuntimeCall(apiName, method);
-  const hex = await connector.send(networkId, "state_call", [`${apiName}_${method}`, toHex(call.args.enc(args))]);
-  return call.value.dec(hex);
-};
+  /** The extra balance of this token */
+  get extra() {
+    const extra = this.getRawValue("extra");
+    if (extra.length > 0) return extra;
+    return undefined;
+  }
 
-const getConstantValue = (metadataRpc, pallet, constant) => {
-  const {
-    unifiedMetadata,
-    builder
-  } = parseMetadataRpc(metadataRpc);
-  const codec = builder.buildConstant(pallet, constant);
-  const encodedValue = unifiedMetadata.pallets.find(({
-    name
-  }) => name === pallet)?.constants.find(({
-    name
-  }) => name === constant)?.value;
-  if (!encodedValue) throw new Error(`Constant ${pallet}.${constant} not found`);
-  return codec.dec(encodedValue);
-};
+  /** @deprecated Use balance.locked */
+  get frozen() {
+    return this.locked;
+  }
+  /** The transferable balance of this token. Is generally the free amount - the miscFrozen amount. */
+  get transferable() {
+    /**
+     * As you can see here, `locked` is subtracted from `free` in order to derive `transferable`.
+     *
+     * |--------------------------total--------------------------|
+     * |-------------------free-------------------|---reserved---|
+     * |----locked-----|-------transferable-------|
+     */
+    const oldTransferableCalculation = () => {
+      // if no locks exist, transferable is equal to the free amount
+      if (this.locks.length === 0) return this.free;
 
-const tryGetConstantValue = (metadataRpc, pallet, constant) => {
-  const {
-    unifiedMetadata,
-    builder
-  } = parseMetadataRpc(metadataRpc);
-  const encodedValue = unifiedMetadata.pallets.find(({
-    name
-  }) => name === pallet)?.constants.find(({
-    name
-  }) => name === constant)?.value;
-  if (!encodedValue) return null;
-  const codec = builder.buildConstant(pallet, constant);
-  return codec.dec(encodedValue);
-};
+      // find the largest lock (but ignore any locks which are marked as `includeInTransferable`)
+      const excludeAmount = excludeFromTransferableAmount(this.locks);
 
-const hasStorageItem = (metadata, palletName, itemName) => {
-  const pallet = metadata.pallets.find(p => p.name === palletName);
-  if (!pallet || !pallet.storage) return false;
-  return pallet.storage.items.some(item => item.name === itemName);
-};
-const hasStorageItems = (metadata, palletName, itemNames) => {
-  const pallet = metadata.pallets.find(p => p.name === palletName);
-  if (!pallet || !pallet.storage) return false;
-  return itemNames.every(itemName => pallet.storage?.items.some(item => item.name === itemName));
-};
-const hasRuntimeApi = (metadata, apiName, method) => {
-  const api = metadata.apis.find(api => api.name === apiName);
-  if (!api || !api.methods) return false;
-  return api.methods.some(m => m.name === method);
-};
+      // subtract the lock from the free amount (but don't go below 0)
+      return this.#format(BigMath.max(this.free.planck - excludeAmount, 0n));
+    };
+
+    /**
+     * As you can see here, `locked` is subtracted from `free + reserved` in order to derive `transferable`.
+     *
+     * Alternatively, `reserved` is subtracted from `locked` in order to derive `untouchable`,
+     * which is then subtracted from `free` in order to derive `transferable`.
+     *
+     * |--------------------------total--------------------------|
+     * |---reserved---|-------------------free-------------------|
+     *                |--untouchable--|
+     * |------------locked------------|-------transferable-------|
+     */
+    const newTransferableCalculation = () => {
+      // if no locks exist, transferable is equal to the free amount
+      if (this.locks.length === 0) return this.free;
+
+      // find the largest lock (but ignore any locks which are marked as `includeInTransferable`)
+      // subtract the reserved amount, because locks now act upon the total balance - not just the free balance
+      const untouchableAmount = BigMath.max(excludeFromTransferableAmount(this.locks) - this.reserved.planck, 0n);
+
+      // subtract the untouchable amount from the free amount (but don't go below 0)
+      return this.#format(BigMath.max(this.free.planck - untouchableAmount, 0n));
+    };
+    if (this.#storage.useLegacyTransferableCalculation) return oldTransferableCalculation();
+    return newTransferableCalculation();
+  }
+  /**
+   * The unavailable balance of this token.
+   * Prior to the Fungible trait, this was the locked amount + the reserved amount, i.e. `locked + reserved`.
+   * Now, it is the bigger of the locked amount and the reserved amounts, i.e. `max(locked, reserved)`.
+   */
+  get unavailable() {
+    const oldCalculation = () => this.locked.planck + this.reserved.planck;
+    const newCalculation = () => BigMath.max(this.locked.planck, this.reserved.planck);
+    const baseUnavailable = this.#storage.useLegacyTransferableCalculation ? oldCalculation() : newCalculation();
 
-const buildNetworkStorageCoders = (chainId, miniMetadata, coders) => {
-  if (!miniMetadata.data) return null;
-  const metadata = unifyMetadata(decAnyMetadata(miniMetadata.data));
-  try {
-    const scaleBuilder = getDynamicBuilder(getLookupFn(metadata));
-    const builtCoders = Object.fromEntries(Object.entries(coders).flatMap(([key, moduleMethodOrFn]) => {
-      const [module, method] = typeof moduleMethodOrFn === "function" ? moduleMethodOrFn({
-        chainId
-      }) : moduleMethodOrFn;
-      try {
-        return [[key, scaleBuilder.buildStorage(module, method)]];
-      } catch (cause) {
-        log.trace(`Failed to build SCALE coder for chain ${chainId} (${module}::${method})`, cause);
-        return [];
-      }
-    }));
-    return builtCoders;
-  } catch (cause) {
-    log.error(`Failed to build SCALE coders for chain ${chainId} (${JSON.stringify(coders)})`, cause);
+    // if there is a DelegatedStaking hold (new model: polkadot, kusama), nom pool staked amount is included in reserved
+    // if not (old model: vara, avail, cere), staked amount is not in the account and it needs to be added to the total
+    const nomPoolStakedPlancks = this.locks.some(lock => lock.source === "substrate-native-holds" && lock.label === "DelegatedStaking") ? 0n : this.nompools.map(({
+      amount
+    }) => amount.planck).reduce((a, b) => a + b, 0n);
+    const otherUnavailable = nomPoolStakedPlancks + this.subtensor.reduce((total, each) => total + each.amount.planck, 0n);
+    return this.#format(baseUnavailable + otherUnavailable);
   }
-  return null;
-};
 
-const buildQueries$2 = (networkId, balanceDefs, miniMetadata) => {
-  const networkStorageCoders = buildNetworkStorageCoders(networkId, miniMetadata, {
-    storage: ["Assets", "Account"]
-  });
-  return balanceDefs.map(({
-    token,
-    address
-  }) => {
-    const scaleCoder = networkStorageCoders?.storage;
-    const stateKey = tryEncode(scaleCoder, Number(token.assetId), address) ??
-    // Asset Hub
-    tryEncode(scaleCoder, BigInt(token.assetId), address); // Astar
+  /** The feePayable balance of this token. Is generally the free amount - the feeFrozen amount. */
+  get feePayable() {
+    // if no locks exist, feePayable is equal to the free amount
+    if (this.locks.length === 0) return this.free;
 
-    if (!stateKey) {
-      log.warn(`Invalid assetId / address in ${networkId} storage query ${token.assetId} / ${address}`);
-      return null;
-    }
-    const decodeResult = changes => {
-      /** NOTE: This type is only a hint for typescript, the chain can actually return whatever it wants to */
+    // find the largest lock which can't be used to pay tx fees
+    const excludeAmount = excludeFromFeePayableLocks(this.locked.planck.toString()).map(lock => BigInt(lock.amount)).reduce((max, lock) => BigMath.max(max, lock), 0n);
 
-      const decoded = decodeScale(scaleCoder, changes[0], `Failed to decode substrate-assets balance on chain ${networkId}`) ?? {
-        balance: 0n,
-        status: {
-          type: "Liquid"
-        }};
-      const isFrozen = decoded?.status?.type === "Frozen";
-      const amount = (decoded?.balance ?? 0n).toString();
+    // subtract the lock from the free amount (but don't go below 0)
+    return this.#format(BigMath.max(this.free.planck - excludeAmount, 0n));
+  }
+}
+class BalanceValueGetter {
+  #storage;
+  constructor(storage) {
+    this.#storage = storage;
+  }
+  get(valueType) {
+    if ("values" in this.#storage && this.#storage.values) return this.#storage.values.filter(({
+      type
+    }) => type === valueType);
+    return [];
+  }
+  add(valueType, amount) {
+    if ("values" in this.#storage && this.#storage.values) this.#storage.values.push({
+      type: valueType,
+      ...amount
+    });
+  }
+}
+class BalanceFormatter {
+  #planck;
+  #decimals;
+  #tokenRates;
+  constructor(planck, decimals, fiatRatios) {
+    this.#planck = isBigInt(planck) ? planck.toString() : planck ?? "0";
+    this.#decimals = decimals || 0;
+    this.#tokenRates = fiatRatios || null;
+  }
+  toJSON = () => this.#planck;
+  get planck() {
+    return BigInt(this.#planck);
+  }
+  get tokens() {
+    return planckToTokens(this.#planck, this.#decimals);
+  }
+  fiat(currency) {
+    if (!this.#tokenRates) return null;
+    const ratio = this.#tokenRates[currency];
+    if (!ratio) return null;
+    return parseFloat(this.tokens) * ratio.price;
+  }
+}
+class PlanckSumBalancesFormatter {
+  #balances;
+  constructor(balances) {
+    this.#balances = balances;
+  }
+  #sum = balanceField => {
+    // a function to get a planck amount from a balance
+    const planck = balance => balance[balanceField].planck ?? 0n;
+    return this.#balances.filterMirrorTokens().each.reduce(
+    // add the total amount to the planck amount of each balance
+    (total, balance) => total + planck(balance),
+    // start with a total of 0
+    0n);
+  };
 
-      // due to the following balance calculations, which are made in the `Balance` type:
-      //
-      // total balance        = (free balance) + (reserved balance)
-      // transferable balance = (free balance) - (frozen balance)
-      //
-      // when `isFrozen` is true we need to set **both** the `free` and `frozen` amounts
-      // of this balance to the value we received from the RPC.
-      //
-      // if we only set the `frozen` amount, then the `total` calculation will be incorrect!
-      const free = amount;
-      const frozen = token.isFrozen || isFrozen ? amount : "0";
+  /**
+   * The total balance of these tokens. Includes the free and the reserved amount.
+   */
+  get total() {
+    return this.#sum("total");
+  }
+  /** The non-reserved balance of these tokens. Includes the frozen amount. Is included in the total. */
+  get free() {
+    return this.#sum("free");
+  }
+  /** The reserved balance of these tokens. Is included in the total. */
+  get reserved() {
+    return this.#sum("reserved");
+  }
+  /** The frozen balance of these tokens. Is included in the free amount. */
+  get locked() {
+    return this.#sum("locked");
+  }
+  /** @deprecated Use balances.locked */
+  get frozen() {
+    return this.locked;
+  }
+  /** The transferable balance of these tokens. Is generally the free amount - the miscFrozen amount. */
+  get transferable() {
+    return this.#sum("transferable");
+  }
+  /** The unavailable balance of these tokens. */
+  get unavailable() {
+    return this.#sum("unavailable");
+  }
 
-      // include balance values even if zero, so that newly-zero values overwrite old values
-      const balanceValues = [{
-        type: "free",
-        label: "free",
-        amount: free.toString()
-      }, {
-        type: "locked",
-        label: "frozen",
-        amount: frozen.toString()
-      }];
-      const balance = {
-        source: "substrate-assets",
-        status: "live",
-        address,
-        networkId,
-        tokenId: token.id,
-        values: balanceValues
+  /** The feePayable balance of these tokens. Is generally the free amount - the feeFrozen amount. */
+  get feePayable() {
+    return this.#sum("feePayable");
+  }
+}
+class FiatSumBalancesFormatter {
+  #balances;
+  #currency;
+  constructor(balances, currency) {
+    this.#balances = balances;
+    this.#currency = currency;
+  }
+  #sum = balanceField => {
+    // a function to get a fiat amount from a balance
+    const fiat = balance => balance[balanceField].fiat(this.#currency) ?? 0;
+    return this.#balances.filterMirrorTokens().each.reduce(
+    // add the total amount to the fiat amount of each balance
+    (total, balance) => total + fiat(balance),
+    // start with a total of 0
+    0);
+  };
+
+  /**
+   * The total balance of these tokens. Includes the free and the reserved amount.
+   */
+  get total() {
+    return this.#sum("total");
+  }
+  /** The non-reserved balance of these tokens. Includes the frozen amount. Is included in the total. */
+  get free() {
+    return this.#sum("free");
+  }
+  /** The reserved balance of these tokens. Is included in the total. */
+  get reserved() {
+    return this.#sum("reserved");
+  }
+  /** The frozen balance of these tokens. Is included in the free amount. */
+  get locked() {
+    return this.#sum("locked");
+  }
+  /** @deprecated Use balances.locked */
+  get frozen() {
+    return this.locked;
+  }
+  /** The transferable balance of these tokens. Is generally the free amount - the miscFrozen amount. */
+  get transferable() {
+    return this.#sum("transferable");
+  }
+  /** The unavailable balance of these tokens. */
+  get unavailable() {
+    return this.#sum("unavailable");
+  }
+  /** The feePayable balance of these tokens. Is generally the free amount - the feeFrozen amount. */
+  get feePayable() {
+    return this.#sum("feePayable");
+  }
+}
+class SumBalancesFormatter {
+  #balances;
+  constructor(balances) {
+    this.#balances = balances;
+  }
+  get planck() {
+    return new PlanckSumBalancesFormatter(this.#balances);
+  }
+  fiat(currency) {
+    return new FiatSumBalancesFormatter(this.#balances, currency);
+  }
+  change24h(currency) {
+    return new Change24hCurrencyFormatter(this.#balances, currency);
+  }
+}
+class Change24hCurrencyFormatter {
+  #balances;
+  #currency;
+  constructor(balances, currency) {
+    this.#balances = balances;
+    this.#currency = currency;
+  }
+  #change24h = balanceField => {
+    const output = this.#balances.filterMirrorTokens().each.reduce(
+    // add the total amount to the fiat amount of each balance
+    (acc, balance) => {
+      const change24h = balance.rates?.[this.#currency]?.change24h;
+      if (typeof change24h !== "number") return acc;
+      const fiat = balance[balanceField].fiat(this.#currency);
+      if (!fiat) return acc;
+      return {
+        totalFiatDiff: acc.totalFiatDiff + fiat * change24h,
+        totalFiat: acc.totalFiat + fiat
       };
-      return balance;
-    };
-    return {
-      stateKeys: [stateKey],
-      decodeResult
+    },
+    // start with a total of 0
+    {
+      totalFiatDiff: 0,
+      totalFiat: 0
+    });
+    return output.totalFiat === 0 ? null : {
+      diff: output.totalFiatDiff / 100,
+      ratio: output.totalFiatDiff / output.totalFiat
     };
-  }).filter(isNotNil);
-};
-const tryEncode = (scaleCoder, ...args) => {
-  try {
-    return scaleCoder?.keys?.enc?.(...args);
-  } catch {
-    return null;
-  }
-};
-
-const fetchBalances$5 = async ({
-  networkId,
-  tokensWithAddresses,
-  connector,
-  miniMetadata
-}) => {
-  if (!tokensWithAddresses.length) return {
-    success: [],
-    errors: []
   };
-  const balanceDefs = getBalanceDefs(tokensWithAddresses);
-  if (!miniMetadata?.data) {
-    log.warn(`MiniMetadata is required for fetching ${MODULE_TYPE$5} balances on ${networkId}.`);
-    return {
-      success: [],
-      errors: balanceDefs.map(def => ({
-        tokenId: def.token.id,
-        address: def.address,
-        error: new Error("Minimetadata is required for fetching balances")
-      }))
-    };
+  get total() {
+    return this.#change24h("total");
   }
-  if (miniMetadata.source !== MODULE_TYPE$5) {
-    log.warn(`Ignoring miniMetadata with source ${miniMetadata.source} in ${MODULE_TYPE$5}.`);
-    return {
-      success: [],
-      errors: balanceDefs.map(def => ({
-        tokenId: def.token.id,
-        address: def.address,
-        error: new Error(`Invalid request: miniMetadata source is not ${MODULE_TYPE$5}`)
-      }))
-    };
+  get free() {
+    return this.#change24h("free");
   }
-  if (miniMetadata.chainId !== networkId) {
-    log.warn(`Ignoring miniMetadata with chainId ${miniMetadata.chainId} in ${MODULE_TYPE$5}. Expected chainId is ${networkId}`);
-    return {
-      success: [],
-      errors: balanceDefs.map(def => ({
-        tokenId: def.token.id,
-        address: def.address,
-        error: new Error(`Invalid request: Expected chainId is ${networkId}`)
-      }))
-    };
+  get reserved() {
+    return this.#change24h("reserved");
   }
-  const queries = buildQueries$2(networkId, balanceDefs, miniMetadata);
-  const balances = await fetchRpcQueryPack(connector, networkId, queries);
-  return balanceDefs.reduce((acc, def) => {
-    const balance = balances.find(b => b?.address === def.address && b?.tokenId === def.token.id);
-    if (balance) acc.success.push(balance);
-    //if no entry consider empty balance
-    else acc.success.push({
-      address: def.address,
-      networkId,
-      tokenId: def.token.id,
-      source: MODULE_TYPE$5,
-      status: "live",
-      values: [{
-        type: "free",
-        label: "free",
-        amount: "0"
-      }, {
-        type: "locked",
-        label: "frozen",
-        amount: "0"
-      }]
-    });
-    return acc;
-  }, {
-    success: [],
-    errors: []
-  });
+  get locked() {
+    return this.#change24h("locked");
+  }
+  get frozen() {
+    return this.#change24h("frozen");
+  }
+  get transferable() {
+    return this.#change24h("transferable");
+  }
+  get unavailable() {
+    return this.#change24h("unavailable");
+  }
+  get feePayable() {
+    return this.#change24h("feePayable");
+  }
+}
+const filterMirrorTokens = (balance, i, balances) => {
+  const mirrorOf = balance.token?.mirrorOf;
+  return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
 
-const fetchTokens$5 = async ({
-  networkId,
-  tokens,
-  connector,
-  miniMetadata
-}) => {
-  const anyMiniMetadata = miniMetadata;
-  if (!anyMiniMetadata?.data) return [];
-  const {
-    builder
-  } = parseMetadataRpc(anyMiniMetadata.data);
-  const assetCodec = builder.buildStorage("Assets", "Asset");
-  const metadataCodec = builder.buildStorage("Assets", "Metadata");
-  const [allAssetStorageKeys, allMetadataStorageKeys] = await Promise.all([connector.send(networkId, "state_getKeys", [getStorageKeyPrefix("Assets", "Asset")]), connector.send(networkId, "state_getKeys", [getStorageKeyPrefix("Assets", "Metadata")])]);
-  const [assetStorageResults, metadataStorageResults] = await Promise.all([connector.send(networkId, "state_queryStorageAt", [allAssetStorageKeys]), connector.send(networkId, "state_queryStorageAt", [allMetadataStorageKeys])]);
-  const assetStorageEntries = assetStorageResults[0].changes;
-  const metadataStorageEntries = metadataStorageResults[0].changes;
-  const assetByAssetId = keyBy(assetStorageEntries.map(([key, value]) => {
-    const [assetId] = assetCodec.keys.dec(key);
-    const asset = assetCodec.value.dec(value);
-    return {
-      assetId,
-      existentialDeposit: asset.min_balance,
-      isSufficient: asset.is_sufficient
-    };
-  }), a => a.assetId);
-  const metadataByAssetId = keyBy(metadataStorageEntries.map(([key, value]) => {
-    const [assetId] = metadataCodec.keys.dec(key);
-    const metadata = metadataCodec.value.dec(value);
-    return {
-      assetId,
-      decimals: metadata.decimals,
-      isFrozen: metadata.is_frozen,
-      name: metadata.name?.asText(),
-      symbol: metadata.symbol?.asText()
-    };
-  }), a => a.assetId);
-  const allTokens = keys(assetByAssetId).map(assetId => assign({}, assetByAssetId[assetId], metadataByAssetId[assetId] ?? undefined));
-  const configTokenByAssetId = keyBy(tokens, t => t.assetId);
-  return allTokens.map(asset => ({
-    id: subAssetTokenId(networkId, String(asset.assetId)),
-    type: MODULE_TYPE$5,
-    platform: "polkadot",
-    networkId,
-    assetId: String(asset.assetId),
-    isSufficient: asset.isSufficient,
-    isFrozen: asset.isFrozen,
-    name: asset.name,
-    symbol: asset.symbol,
-    decimals: asset.decimals ?? 0,
-    existentialDeposit: String(asset.existentialDeposit),
-    isDefault: true
-  }))
-  // keep all tokens listed in the config + all tokens marked as sufficient
-  .filter(token => {
-    const configToken = configTokenByAssetId[token.assetId];
-    return configToken || token.isSufficient;
-  })
-  // apply config overrides
-  .map(token => {
-    const configToken = configTokenByAssetId[token.assetId];
-    return configToken ? assign({}, token, configToken) : token;
-  })
-  // validate results
-  .filter(t => {
-    const parsed = SubAssetsTokenSchema.safeParse(t);
-    if (!parsed.success) log.warn(`Ignoring invalid token ${MODULE_TYPE$5}`, t);
-    return parsed.success;
-  });
+/** `IBalance` is a common interface which all balance types must implement. */
+
+/** A collection of `BalanceJson` objects */
+
+/** An unlabelled amount of a balance */
+
+/** A labelled amount of a balance */
+
+const getValueId = amount => {
+  const getMetaId = () => {
+    const meta = amount.meta;
+    if (!meta) return "";
+    if (amount.type === "nompool") return meta.poolId?.toString() ?? "";
+    if (amount.type === "subtensor") {
+      const {
+        hotkey,
+        netuid
+      } = meta;
+      if (hotkey && netuid !== undefined) return `${hotkey.toString()}${netuid.toString()}`;
+    }
+    return "";
+  };
+  return [amount.label, amount.type, amount.source, getMetaId()].join("::");
 };
 
+/** A labelled locked amount of a balance */
+
+/** A labelled extra amount of a balance */
+
+/** Used by plugins to help define their custom `BalanceType` */
+
+/** For fast db access, you can calculate the primary key for a miniMetadata using this method */
+const deriveMiniMetadataId = ({
+  source,
+  chainId,
+  specVersion
+}) => toHex(Twox64Concat(new TextEncoder().encode(`${source}${chainId}${specVersion}${MINIMETADATA_VERSION}`))).slice(-64);
+
 const getMiniMetadata$5 = ({
   networkId,
   specVersion,
@@ -6484,7 +6389,7 @@ const POOL = new PQueue({
 });
 const getMiniMetadatas = async (chainConnector, chaindataProvider, networkId, specVersion, signal) => {
   if (CACHE.has(networkId)) return CACHE.get(networkId);
-  log.warn("[miniMetadata] getMiniMetadatas called without signal, this may hang the updates", new Error("No signal provided") // this will show the stack trace
+  if (!signal) log.warn("[miniMetadata] getMiniMetadatas called without signal, this may hang the updates", new Error("No signal provided") // this will show the stack trace so the culprit can fix it
   );
   if (specVersion === undefined) specVersion = await getSpecVersion(chainConnector, networkId);
   const pResult = POOL.add(() => fetchMiniMetadatas(chainConnector, chaindataProvider, networkId, specVersion), {
@@ -6553,24 +6458,31 @@ class BalancesProvider {
     // TODO move the getSharedObservable caching down to this.getNetworkBalances$ to prevent network-level subscriptions to restart when enabling/disabling other networks
     // this will require addressesByTokenId arg to be normalized/sorted so the cache key can be compared properly, seems a bit random atm
     return getSharedObservable("BalancesProvider.getBalances$", addressesByTokenId, () => {
+      return this.cleanupAddressesByTokenId(addressesByTokenId).pipe(map(
       // split by network
-      const addressesByTokenIdByNetworkId = toPairs(addressesByTokenId).reduce((acc, [tokenId, addresses]) => {
+      addressesByTokenId => toPairs(addressesByTokenId).reduce((acc, [tokenId, addresses]) => {
         const networkId = parseTokenId(tokenId).networkId;
         if (!acc[networkId]) acc[networkId] = {};
         acc[networkId][tokenId] = addresses;
         return acc;
-      }, {});
-      return combineLatest({
+      }, {})), switchMap(addressesByTokenIdByNetworkId =>
+      // fetch balances and start a 30s timer to mark the whole subscription live after 30s
+      combineLatest({
         isStale: timer(30_000).pipe(map(() => true), startWith(false)),
         results: combineLatest(toPairs(addressesByTokenIdByNetworkId).map(([networkId]) => this.getNetworkBalances$(networkId, addressesByTokenIdByNetworkId[networkId])))
-      }).pipe(map(({
+      })), map(
+      // combine
+      ({
         isStale,
         results
       }) => ({
         status: !isStale && results.some(({
           status
         }) => status === "initialising") ? "initialising" : "live",
-        balances: results.flatMap(result => result.balances).sort((a, b) => getBalanceId(a).localeCompare(getBalanceId(b)))
+        balances: results.flatMap(result => result.balances.map(b => isStale && b.status !== "live" ? {
+          ...b,
+          status: "stale"
+        } : b)).sort((a, b) => getBalanceId(a).localeCompare(getBalanceId(b)))
       })), startWith({
         status: "initialising",
         balances: this.getStoredBalances(addressesByTokenId)
@@ -6612,7 +6524,12 @@ class BalancesProvider {
           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(results.balances, b => getBalanceId(b)));
+          fromPairs(balanceIds.map(balanceId => [balanceId, undefined])), keyBy(
+          // storage balances must have status "cache", because they are used as start value when initialising subsequent subscriptions
+          results.balances.map(b => ({
+            ...b,
+            status: "cache"
+          })), b => getBalanceId(b)));
           this.#storage.next(assign({}, storage, {
             balances
           }));
@@ -6655,39 +6572,49 @@ class BalancesProvider {
         }) => status === "initialising") ? "initialising" : "live",
         balances: results.flatMap(result => result.balances)
       };
+    }), startWith({
+      status: "initialising",
+      balances: this.getStoredBalances(addressesByTokenId)
     }));
   }
   getNetworkMiniMetadatas$(networkId) {
     return this.#chaindataProvider.getNetworkById$(networkId).pipe(switchMap(network => isNetworkDot(network) && this.#chainConnectors.substrate ? from(getSpecVersion(this.#chainConnectors.substrate, networkId)).pipe(switchMap(specVersion => this.getMiniMetadatas$(networkId, specVersion))) : of([])));
   }
   getMiniMetadatas$(networkId, specVersion) {
-    return combineLatest({
-      defaultMiniMetadatas: this.getDefaultMiniMetadatas$(networkId, specVersion),
-      storedMiniMetadatas: this.getStoredMiniMetadatas$(networkId, specVersion)
-    }).pipe(switchMap(({
-      storedMiniMetadatas,
-      defaultMiniMetadatas
-    }) => {
-      if (defaultMiniMetadatas.length) return of(defaultMiniMetadatas);
-      if (storedMiniMetadatas.length) return of(storedMiniMetadatas);
-      if (!this.#chainConnectors.substrate) return of([]);
-      return from(
-      // fetch them from the chain
-      getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId)).pipe(
-      // 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
+    return new Observable(subscriber => {
+      const controller = new AbortController();
+      const subscription = combineLatest({
+        defaultMiniMetadatas: this.getDefaultMiniMetadatas$(networkId, specVersion),
+        storedMiniMetadatas: this.getStoredMiniMetadatas$(networkId, specVersion)
+      }).pipe(switchMap(({
+        storedMiniMetadatas,
+        defaultMiniMetadatas
+      }) => {
+        if (defaultMiniMetadatas.length) return of(defaultMiniMetadatas);
+        if (storedMiniMetadatas.length) return of(storedMiniMetadatas);
+        if (!this.#chainConnectors.substrate) return of([]);
+        return from(
+        // fetch them from the chain
+        getMiniMetadatas(this.#chainConnectors.substrate, this.#chaindataProvider, networkId, specVersion, controller.signal)).pipe(
+        // 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
+          }));
         }));
-      }));
-    }));
+      })).subscribe(subscriber);
+      return () => {
+        subscription.unsubscribe();
+        controller.abort();
+      };
+    });
   }
   getStoredMiniMetadatas$(networkId, specVersion) {
     return this.storage$.pipe(map(storage => storage.miniMetadatas.filter(m => m.chainId === networkId && m.specVersion === specVersion && m.version === MINIMETADATA_VERSION)), distinctUntilChanged(isEqual));
@@ -6702,6 +6629,26 @@ class BalancesProvider {
       tokenId
     })]).filter(isNotNil).sort((a, b) => getBalanceId(a).localeCompare(getBalanceId(b)));
   }
+  cleanupAddressesByTokenId(addressesByTokenId) {
+    return this.#chaindataProvider.getNetworksMapById$().pipe(map(networksById => {
+      return fromPairs(toPairs(addressesByTokenId).map(([tokenId, addresses]) => {
+        const networkId = parseTokenId(tokenId).networkId;
+        const network = networksById[networkId];
+        return [tokenId, addresses.filter(address => network && isAddressCompatibleWithNetwork(network, address))];
+      }).filter(([, addresses]) => addresses.length > 0));
+    }));
+  }
 }
+const isAddressCompatibleWithNetwork = (network, address) => {
+  switch (network.platform) {
+    case "ethereum":
+      return isEthereumAddress(address);
+    case "polkadot":
+      return isEthereumAddress(address) ? network.account === "secp256k1" : network.account !== "secp256k1";
+    default:
+      log.warn("Unsupported network platform", network);
+      throw new Error("Unsupported network platform");
+  }
+};
 
-export { BALANCE_MODULES, Balance, BalanceFormatter, BalanceValueGetter, Balances, BalancesProvider, Change24hCurrencyFormatter, EvmErc20BalanceModule, EvmErc20TokenConfigSchema, EvmNativeBalanceModule, EvmNativeTokenConfigSchema, EvmUniswapV2BalanceModule, EvmUniswapV2TokenConfigSchema, FiatSumBalancesFormatter, ONE_ALPHA_TOKEN, PlanckSumBalancesFormatter, SCALE_FACTOR, SUBTENSOR_MIN_STAKE_AMOUNT_PLANK, SUBTENSOR_ROOT_NETUID, SubAssetsBalanceModule, SubAssetsTokenConfigSchema, SubForeignAssetsBalanceModule, SubForeignAssetsTokenConfigSchema, SubHydrationBalanceModule, SubHydrationTokenConfigSchema, SubNativeBalanceModule, SubNativeMiniMetadataExtraSchema, SubNativeModuleConfigSchema, SubNativeTokenConfigSchema, SubPsp22BalanceModule, SubPsp22TokenConfigSchema, SubTokensBalanceModule, SubTokensMiniMetadataExtraSchema, SubTokensModuleConfigSchema, SubTokensTokenConfigSchema, SumBalancesFormatter, TalismanBalancesDatabase, abiMulticall, calculateAlphaPrice, calculateTaoAmountFromAlpha, calculateTaoFromDynamicInfo, db, deriveMiniMetadataId, erc20BalancesAggregatorAbi, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterBaseLocks, filterMirrorTokens, getBalanceId, getLockTitle, getLockedType, getValueId, includeInTotalExtraAmount, uniswapV2PairAbi };
+export { BALANCE_MODULES, Balance, BalanceFormatter, BalanceValueGetter, Balances, BalancesProvider, Change24hCurrencyFormatter, EvmErc20BalanceModule, EvmErc20TokenConfigSchema, EvmNativeBalanceModule, EvmNativeTokenConfigSchema, EvmUniswapV2BalanceModule, EvmUniswapV2TokenConfigSchema, FiatSumBalancesFormatter, ONE_ALPHA_TOKEN, PlanckSumBalancesFormatter, SCALE_FACTOR, SUBTENSOR_MIN_STAKE_AMOUNT_PLANK, SUBTENSOR_ROOT_NETUID, SubAssetsBalanceModule, SubAssetsTokenConfigSchema, SubForeignAssetsBalanceModule, SubForeignAssetsTokenConfigSchema, SubHydrationBalanceModule, SubHydrationTokenConfigSchema, SubNativeBalanceModule, SubNativeMiniMetadataExtraSchema, SubNativeModuleConfigSchema, SubNativeTokenConfigSchema, SubPsp22BalanceModule, SubPsp22TokenConfigSchema, SubTokensBalanceModule, SubTokensMiniMetadataExtraSchema, SubTokensModuleConfigSchema, SubTokensTokenConfigSchema, SumBalancesFormatter, abiMulticall, calculateAlphaPrice, calculateTaoAmountFromAlpha, calculateTaoFromDynamicInfo, deriveMiniMetadataId, erc20BalancesAggregatorAbi, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterBaseLocks, filterMirrorTokens, getBalanceId, getLockTitle, getLockedType, getValueId, includeInTotalExtraAmount, isAddressCompatibleWithNetwork, uniswapV2PairAbi };