@talismn/balances 0.3.3 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @talismn/balances
 
+## 0.4.0
+
+### Patch Changes
+
+- 3068bd60: feat: stale balances and exponential rpc backoff
+- 6643a4e4: fix: tokenRates in @talismn/balances-react
+- 6643a4e4: fix: ported useDbCache related perf fixes to @talismn/balances-react
+- Updated dependencies [3068bd60]
+- Updated dependencies [6643a4e4]
+- Updated dependencies [79f6ccf6]
+- Updated dependencies [c24dc1fb]
+  - @talismn/chain-connector@0.4.3
+  - @talismn/util@0.1.8
+  - @talismn/token-rates@0.1.15
+  - @talismn/chaindata-provider@0.4.3
+  - @talismn/chain-connector-evm@0.4.3
+
 ## 0.3.3
 
 ### Patch Changes

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

@@ -1,43 +1,65 @@
+import { UnsignedTransaction } from "@substrate/txwrapper-core";
 import { ChainConnector } from "@talismn/chain-connector";
 import { ChainConnectorEvm } from "@talismn/chain-connector-evm";
 import { ChainId, ChaindataProvider, IToken } from "@talismn/chaindata-provider";
+import { ethers } from "ethers";
 import { AddressesByToken, Balances, SubscriptionCallback, UnsubscribeFn } from "./types";
-export interface BalanceModule<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig> extends BalanceModuleSubstrate<TModuleType, TTokenType, TChainMeta, TModuleConfig>, BalanceModuleEvm<TModuleType, TTokenType, TChainMeta, TModuleConfig> {
-}
-export declare const DefaultBalanceModule: <TModuleType extends string, TTokenType extends IToken, TChainMeta extends ExtendableChainMeta = undefined, TModuleConfig extends ExtendableModuleConfig = undefined>(type: TModuleType) => BalanceModule<TModuleType, TTokenType, TChainMeta, TModuleConfig>;
 export type ExtendableTokenType = IToken;
 export type ExtendableChainMeta = Record<string, unknown> | undefined;
 export type DefaultChainMeta = undefined;
 export type ExtendableModuleConfig = Record<string, unknown> | undefined;
 export type DefaultModuleConfig = undefined;
-interface BalanceModuleSubstrate<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig> extends BalanceModuleCommon<TModuleType, TTokenType> {
+export type BaseTransferParams = {
+    tokenId: string;
+    from: string;
+    to: string;
+    amount: string;
+};
+export type ExtendableTransferParams = BaseTransferParams | undefined;
+export type DefaultTransferParams = undefined;
+export type NewTransferParamsType<T extends Record<string, unknown>> = BaseTransferParams & T;
+export type TransferTokenTx = {
+    type: "substrate";
+    tx: UnsignedTransaction;
+} | {
+    type: "evm";
+    tx: ethers.providers.TransactionRequest;
+};
+export type ChainConnectors = {
+    substrate?: ChainConnector;
+    evm?: ChainConnectorEvm;
+};
+export type Hydrate = {
+    chainConnectors: ChainConnectors;
+    chaindataProvider: ChaindataProvider;
+};
+export type NewBalanceModule<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig, TTransferParams extends ExtendableTransferParams = DefaultTransferParams> = (hydrate: Hydrate) => BalanceModule<TModuleType, TTokenType, TChainMeta, TModuleConfig, TTransferParams>;
+export interface BalanceModule<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig, TTransferParams extends ExtendableTransferParams = DefaultTransferParams> extends BalanceModuleSubstrate<TModuleType, TTokenType, TChainMeta, TModuleConfig, TTransferParams>, BalanceModuleEvm<TModuleType, TTokenType, TChainMeta, TModuleConfig, TTransferParams> {
+}
+export declare const DefaultBalanceModule: <TModuleType extends string, TTokenType extends IToken, TChainMeta extends ExtendableChainMeta = undefined, TModuleConfig extends ExtendableModuleConfig = undefined, TTransferParams extends ExtendableTransferParams = undefined>(type: TModuleType) => BalanceModule<TModuleType, TTokenType, TChainMeta, TModuleConfig, TTransferParams>;
+interface BalanceModuleSubstrate<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig, TTransferParams extends ExtendableTransferParams = DefaultTransferParams> extends BalanceModuleCommon<TModuleType, TTokenType, TTransferParams> {
     /** Pre-processes any substrate chain metadata required by this module ahead of time */
-    fetchSubstrateChainMeta(chainConnector: ChainConnector, chaindataProvider: ChaindataProvider, chainId: ChainId, moduleConfig: TModuleConfig | undefined): Promise<TChainMeta | null>;
+    fetchSubstrateChainMeta(chainId: ChainId, moduleConfig?: TModuleConfig): Promise<TChainMeta | null>;
     /** Detects which tokens are available on a given substrate chain */
-    fetchSubstrateChainTokens(chainConnector: ChainConnector, chaindataProvider: ChaindataProvider, chainId: ChainId, chainMeta: TChainMeta, moduleConfig: TModuleConfig | undefined): Promise<Record<TTokenType["id"], TTokenType>>;
+    fetchSubstrateChainTokens(chainId: ChainId, chainMeta: TChainMeta, moduleConfig?: TModuleConfig): Promise<Record<TTokenType["id"], TTokenType>>;
 }
-interface BalanceModuleEvm<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig> extends BalanceModuleCommon<TModuleType, TTokenType> {
+interface BalanceModuleEvm<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig, TTransferParams extends ExtendableTransferParams = DefaultTransferParams> extends BalanceModuleCommon<TModuleType, TTokenType, TTransferParams> {
     /** Pre-processes any evm chain metadata required by this module ahead of time */
-    fetchEvmChainMeta(chainConnector: ChainConnectorEvm, chaindataProvider: ChaindataProvider, chainId: ChainId, moduleConfig: TModuleConfig | undefined): Promise<TChainMeta | null>;
+    fetchEvmChainMeta(chainId: ChainId, moduleConfig?: TModuleConfig): Promise<TChainMeta | null>;
     /** Detects which tokens are available on a given evm chain */
-    fetchEvmChainTokens(chainConnector: ChainConnectorEvm, chaindataProvider: ChaindataProvider, chainId: ChainId, chainMeta: TChainMeta, moduleConfig: TModuleConfig | undefined): Promise<Record<TTokenType["id"], TTokenType>>;
+    fetchEvmChainTokens(chainId: ChainId, chainMeta: TChainMeta, moduleConfig?: TModuleConfig): Promise<Record<TTokenType["id"], TTokenType>>;
 }
-interface BalanceModuleCommon<TModuleType extends string, TTokenType extends ExtendableTokenType> {
+interface BalanceModuleCommon<TModuleType extends string, TTokenType extends ExtendableTokenType, TTransferParams extends ExtendableTransferParams> {
     get type(): TModuleType;
     /**
      * Subscribe to balances for this module with optional filtering.
      *
      * If subscriptions are not possible, this function should poll at some reasonable interval.
      */
-    subscribeBalances(chainConnectors: {
-        substrate?: ChainConnector;
-        evm?: ChainConnectorEvm;
-    }, chaindataProvider: ChaindataProvider, addressesByToken: AddressesByToken<TTokenType>, callback: SubscriptionCallback<Balances>): Promise<UnsubscribeFn>;
+    subscribeBalances(addressesByToken: AddressesByToken<TTokenType>, callback: SubscriptionCallback<Balances>): Promise<UnsubscribeFn>;
     /** Fetch balances for this module with optional filtering */
-    fetchBalances(chainConnectors: {
-        substrate?: ChainConnector;
-        evm?: ChainConnectorEvm;
-    }, chaindataProvider: ChaindataProvider, addressesByToken: AddressesByToken<TTokenType>): Promise<Balances>;
-    [x: string | number | symbol]: unknown;
+    fetchBalances(addressesByToken: AddressesByToken<TTokenType>): Promise<Balances>;
+    /** Prepare a tx to transfer some tokens from this module */
+    transferToken(transferParams: TTransferParams): Promise<TransferTokenTx | null>;
 }
 export {};

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

@@ -1,21 +1,16 @@
-import { TypeRegistry } from "@polkadot/types";
-import { ChainConnector } from "@talismn/chain-connector";
-import { ChainConnectorEvm } from "@talismn/chain-connector-evm";
-import { ChaindataProvider } from "@talismn/chaindata-provider";
-import { BalanceModule, DefaultChainMeta, DefaultModuleConfig, ExtendableChainMeta, ExtendableModuleConfig, ExtendableTokenType } from "./BalanceModule";
+import type { Registry } from "@polkadot/types-codec/types";
+import { ChainId } from "@talismn/chaindata-provider";
+import { BalanceModule, DefaultChainMeta, DefaultModuleConfig, DefaultTransferParams, ExtendableChainMeta, ExtendableModuleConfig, ExtendableTokenType, ExtendableTransferParams } from "./BalanceModule";
 import { AddressesByToken, Balance, Balances, SubscriptionCallback, UnsubscribeFn } from "./types";
 /**
  * Wraps a BalanceModule's fetch/subscribe methods with a single `balances` method.
  * This `balances` method will subscribe if a callback parameter is provided, or otherwise fetch.
  */
-export declare function balances<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig>(balanceModule: BalanceModule<TModuleType, TTokenType, TChainMeta, TModuleConfig>, chainConnectors: {
-    substrate?: ChainConnector;
-    evm?: ChainConnectorEvm;
-}, chaindataProvider: ChaindataProvider, addressesByToken: AddressesByToken<TTokenType>): Promise<Balances>;
-export declare function balances<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig>(balanceModule: BalanceModule<TModuleType, TTokenType, TChainMeta, TModuleConfig>, chainConnectors: {
-    substrate?: ChainConnector;
-    evm?: ChainConnectorEvm;
-}, chaindataProvider: ChaindataProvider, addressesByToken: AddressesByToken<TTokenType>, callback: SubscriptionCallback<Balances>): Promise<UnsubscribeFn>;
+export declare function balances<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig, TTransferParams extends ExtendableTransferParams = DefaultTransferParams>(balanceModule: BalanceModule<TModuleType, TTokenType, TChainMeta, TModuleConfig, TTransferParams>, addressesByToken: AddressesByToken<TTokenType>): Promise<Balances>;
+export declare function balances<TModuleType extends string, TTokenType extends ExtendableTokenType, TChainMeta extends ExtendableChainMeta = DefaultChainMeta, TModuleConfig extends ExtendableModuleConfig = DefaultModuleConfig, TTransferParams extends ExtendableTransferParams = DefaultTransferParams>(balanceModule: BalanceModule<TModuleType, TTokenType, TChainMeta, TModuleConfig, TTransferParams>, addressesByToken: AddressesByToken<TTokenType>, callback: SubscriptionCallback<Balances>): Promise<UnsubscribeFn>;
+export declare const createTypeRegistryCache: () => {
+    getOrCreateTypeRegistry: (chainId: ChainId, metadataRpc?: `0x${string}`) => Registry;
+};
 export declare const filterMirrorTokens: (balance: Balance, i: number, balances: Balance[]) => boolean;
 /**
  * Used by a variety of balance modules to help encode and decode substrate state calls.
@@ -23,7 +18,7 @@ export declare const filterMirrorTokens: (balance: Balance, i: number, balances:
 export declare class StorageHelper {
     #private;
     tags: any;
-    constructor(registry: TypeRegistry, module: string, method: string, ...parameters: any[]);
+    constructor(registry: Registry, module: string, method: string, ...parameters: any[]);
     get stateKey(): `0x${string}` | undefined;
     get module(): string;
     get method(): string;

package/dist/declarations/src/types/balances.d.ts

@@ -80,6 +80,7 @@ export declare class Balances {
      * @returns The new collection of balances.
      */
     remove: (ids: string[] | string) => Balances;
+    get each(): Balance[];
     /**
      * Get an array of balances in this collection, sorted by chain sortIndex.
      *

package/dist/declarations/src/types/balancetypes.d.ts

@@ -23,7 +23,7 @@ export type BalanceTypes = {
 export type BalanceJson = BalanceTypes[keyof BalanceTypes] extends never ? IBalance : BalanceTypes[keyof BalanceTypes];
 /** A collection of `BalanceJson` objects */
 export type BalanceJsonList = Record<string, BalanceJson>;
-export type BalanceStatus = "live" | "cache";
+export type BalanceStatus = "live" | "cache" | "stale";
 /** `IBalance` is a common interface which all balance types must implement. */
 export type IBalance = {
     /** The module that this balance was retrieved by */

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

@@ -6,17 +6,10 @@ var dexie = require('dexie');
 var types = require('@polkadot/types');
 var anylogger = require('anylogger');
 var util = require('@talismn/util');
-var memoize = require('lodash/memoize');
-var typescriptMemoize = require('typescript-memoize');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
 var anylogger__default = /*#__PURE__*/_interopDefault(anylogger);
-var memoize__default = /*#__PURE__*/_interopDefault(memoize);
-
-//
-// exported
-//
 
 // TODO: Document default balances module purpose/usage
 const DefaultBalanceModule = type => ({
@@ -35,12 +28,15 @@ const DefaultBalanceModule = type => ({
   async fetchEvmChainTokens() {
     return Promise.resolve({});
   },
-  async subscribeBalances(_chainConnectors, _chaindataProvider, _addressesByToken, callback) {
+  async subscribeBalances(_, callback) {
     callback(new Error("Balance subscriptions are not implemented in this module."));
     return () => {};
   },
   async fetchBalances() {
     throw new Error("Balance fetching is not implemented in this module.");
+  },
+  async transferToken() {
+    throw new Error("Token transfers are not implemented in this module.");
   }
 });
 
@@ -71,7 +67,7 @@ const db = new TalismanBalancesDatabase();
 
 var packageJson = {
 	name: "@talismn/balances",
-	version: "0.3.3",
+	version: "0.4.0",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -90,7 +86,7 @@ var packageJson = {
 		"/plugins"
 	],
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	scripts: {
 		test: "jest",
@@ -104,9 +100,7 @@ var packageJson = {
 		"@talismn/token-rates": "workspace:^",
 		"@talismn/util": "workspace:^",
 		anylogger: "^1.0.11",
-		dexie: "^3.2.2",
-		lodash: "^4.17.21",
-		"typescript-memoize": "^1.1.0"
+		dexie: "^3.2.3"
 	},
 	devDependencies: {
 		"@polkadot/types": "^9.10.5",
@@ -137,15 +131,33 @@ var packageJson = {
 
 var log = anylogger__default["default"](packageJson.name);
 
-async function balances(balanceModule, chainConnectors, chaindataProvider, addressesByToken, callback) {
+async function balances(balanceModule, addressesByToken, callback) {
   // subscription request
-  if (callback !== undefined) return await balanceModule.subscribeBalances(chainConnectors, chaindataProvider, addressesByToken, callback);
+  if (callback !== undefined) return await balanceModule.subscribeBalances(addressesByToken, callback);
 
   // one-off request
-  return await balanceModule.fetchBalances(chainConnectors, chaindataProvider, addressesByToken);
+  return await balanceModule.fetchBalances(addressesByToken);
 }
+const createTypeRegistryCache = () => {
+  const typeRegistryCache = new Map();
+  const getOrCreateTypeRegistry = (chainId, metadataRpc) => {
+    // TODO: Delete cache when metadataRpc is different from last time
+    const cached = typeRegistryCache.get(chainId);
+    if (cached) return cached;
+    const typeRegistry = new types.TypeRegistry();
+    if (typeof metadataRpc === "string") {
+      const metadata = new types.Metadata(typeRegistry, metadataRpc);
+      metadata.registry.setMetadata(metadata);
+    }
+    typeRegistryCache.set(chainId, typeRegistry);
+    return typeRegistry;
+  };
+  return {
+    getOrCreateTypeRegistry
+  };
+};
 const filterMirrorTokens = (balance, i, balances) => {
-  // TODO implement a mirrorOf property, which should be set from chaindata
+  // TODO: implement a mirrorOf property, which should be set from chaindata
   const mirrorOf = balance.token?.mirrorOf;
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
@@ -231,30 +243,6 @@ class StorageHelper {
   }
 }
 
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
-  var desc = {};
-  Object.keys(descriptor).forEach(function (key) {
-    desc[key] = descriptor[key];
-  });
-  desc.enumerable = !!desc.enumerable;
-  desc.configurable = !!desc.configurable;
-  if ('value' in desc || desc.initializer) {
-    desc.writable = true;
-  }
-  desc = decorators.slice().reverse().reduce(function (desc, decorator) {
-    return decorator(target, property, desc) || desc;
-  }, desc);
-  if (context && desc.initializer !== void 0) {
-    desc.value = desc.initializer ? desc.initializer.call(context) : void 0;
-    desc.initializer = undefined;
-  }
-  if (desc.initializer === void 0) {
-    Object.defineProperty(target, property, desc);
-    desc = null;
-  }
-  return desc;
-}
-
 function excludeFromTransferableAmount(locks) {
   if (typeof locks === "string") return BigInt(locks);
   if (!Array.isArray(locks)) locks = [locks];
@@ -276,8 +264,6 @@ function includeInTotalExtraAmount(extra) {
 
 /** Used by plugins to help define their custom `BalanceType` */
 
-var _dec, _dec2, _dec3, _class, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class2, _dec11, _class3, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _class4;
-
 /**
  * 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.
@@ -288,12 +274,12 @@ var _dec, _dec2, _dec3, _class, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10
 /**
  * A collection of balances.
  */
-let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Memoize(), _dec3 = typescriptMemoize.Memoize(), (_class = class Balances {
+class Balances {
   //
   // Properties
   //
 
-  #balances = {};
+  #balances = [];
 
   //
   // Methods
@@ -301,7 +287,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
 
   constructor(balances, hydrate) {
     // handle Balances (convert to Balance[])
-    if (balances instanceof Balances) return new Balances([...balances], hydrate);
+    if (balances instanceof Balances) return new Balances(balances.each, hydrate);
 
     // handle Balance (convert to Balance[])
     if (balances instanceof Balance) return new Balances([balances], hydrate);
@@ -316,19 +302,19 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
     if (!util.isArrayOf(balances, Balance)) return new Balances(balances.map(storage => new Balance(storage)), hydrate);
 
     // handle Balance[]
-    this.#balances = Object.fromEntries(balances.map(balance => [balance.id, 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(Object.entries(this.#balances).map(([id, balance]) => {
+  toJSON = () => Object.fromEntries(this.#balances.map(balance => {
     try {
-      return [id, balance.toJSON()];
+      return [balance.id, balance.toJSON()];
     } catch (error) {
       log.error("Failed to convert balance to JSON", error, {
-        id,
+        id: balance.id,
         balance
       });
       return null;
@@ -348,7 +334,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
    */
   [Symbol.iterator] = () =>
   // Create an array of the balances in this collection and return the result of its iterator.
-  Object.values(this.#balances)[Symbol.iterator]();
+  this.#balances[Symbol.iterator]();
 
   /**
    * Hydrates all balances in this collection.
@@ -356,7 +342,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
    * @param sources - The sources to hydrate from.
    */
   hydrate = sources => {
-    Object.values(this.#balances).map(balance => balance.hydrate(sources));
+    this.#balances.map(balance => balance.hydrate(sources));
   };
 
   /**
@@ -365,7 +351,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
    * @param id - The id of the balance to fetch.
    * @returns The balance if one exists, or none.
    */
-  get = id => this.#balances[id] || null;
+  get = id => this.#balances.find(balance => balance.id === id) ?? null;
 
   /**
    * Retrieve balances from this collection by search query.
@@ -398,10 +384,8 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
     if (balances instanceof Balance) return this.add(new Balances(balances));
 
     // merge balances
-    const mergedBalances = {
-      ...this.#balances
-    };
-    [...balances].forEach(balance => mergedBalances[balance.id] = balance);
+    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));
@@ -419,25 +403,23 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
     // handle single id
     if (!Array.isArray(ids)) return this.remove([ids]);
 
-    // merge balances
-    const removedBalances = {
-      ...this.#balances
-    };
-    ids.forEach(id => delete removedBalances[id]);
-
-    // return new balances
-    return new Balances(Object.values(removedBalances));
+    // 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];
+  }
+
   /**
    * Get an array of balances in this collection, sorted by chain sortIndex.
    *
    * @returns A sorted array of the balances in this collection.
    */
   get sorted() {
-    return [...this].sort((a, b) => ((a.chain || a.evmNetwork)?.sortIndex || Number.MAX_SAFE_INTEGER) - ((b.chain || b.evmNetwork)?.sortIndex || Number.MAX_SAFE_INTEGER));
+    return [...this].sort((a, b) => ((a.chain || a.evmNetwork)?.sortIndex ?? Number.MAX_SAFE_INTEGER) - ((b.chain || b.evmNetwork)?.sortIndex ?? Number.MAX_SAFE_INTEGER));
   }
 
   /**
@@ -460,12 +442,12 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
   get sum() {
     return new SumBalancesFormatter(this);
   }
-}, (_applyDecoratedDescriptor(_class.prototype, "sorted", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "sorted"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "count", [_dec2], Object.getOwnPropertyDescriptor(_class.prototype, "count"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "sum", [_dec3], Object.getOwnPropertyDescriptor(_class.prototype, "sum"), _class.prototype)), _class));
+}
 
 /**
  * An individual balance.
  */
-let Balance = (_dec4 = typescriptMemoize.Memoize(), _dec5 = typescriptMemoize.Memoize(), _dec6 = typescriptMemoize.Memoize(), _dec7 = typescriptMemoize.Memoize(), _dec8 = typescriptMemoize.Memoize(), _dec9 = typescriptMemoize.Memoize(), _dec10 = typescriptMemoize.Memoize(), (_class2 = class Balance {
+class Balance {
   //
   // Properties
   //
@@ -479,7 +461,6 @@ let Balance = (_dec4 = typescriptMemoize.Memoize(), _dec5 = typescriptMemoize.Me
   //
 
   constructor(storage, hydrate) {
-    this.#format = memoize__default["default"](this.#format);
     this.#storage = storage;
     if (hydrate !== undefined) this.hydrate(hydrate);
   }
@@ -602,8 +583,8 @@ let Balance = (_dec4 = typescriptMemoize.Memoize(), _dec5 = typescriptMemoize.Me
     // subtract the lock from the free amount (but don't go below 0)
     return this.#format(util.BigMath.max(this.free.planck - excludeAmount, BigInt("0")));
   }
-}, (_applyDecoratedDescriptor(_class2.prototype, "total", [_dec4], Object.getOwnPropertyDescriptor(_class2.prototype, "total"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "free", [_dec5], Object.getOwnPropertyDescriptor(_class2.prototype, "free"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "reserved", [_dec6], Object.getOwnPropertyDescriptor(_class2.prototype, "reserved"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "locked", [_dec7], Object.getOwnPropertyDescriptor(_class2.prototype, "locked"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "frozen", [_dec8], Object.getOwnPropertyDescriptor(_class2.prototype, "frozen"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "transferable", [_dec9], Object.getOwnPropertyDescriptor(_class2.prototype, "transferable"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "feePayable", [_dec10], Object.getOwnPropertyDescriptor(_class2.prototype, "feePayable"), _class2.prototype)), _class2));
-let BalanceFormatter = (_dec11 = typescriptMemoize.Memoize(), (_class3 = class BalanceFormatter {
+}
+class BalanceFormatter {
   #planck;
   #decimals;
   #fiatRatios;
@@ -611,7 +592,6 @@ let BalanceFormatter = (_dec11 = typescriptMemoize.Memoize(), (_class3 = class B
     this.#planck = typeof planck === "bigint" ? planck.toString() : planck ?? "0";
     this.#decimals = decimals || 0;
     this.#fiatRatios = fiatRatios || null;
-    this.fiat = memoize__default["default"](this.fiat);
   }
   toJSON = () => this.#planck;
   get planck() {
@@ -626,14 +606,13 @@ let BalanceFormatter = (_dec11 = typescriptMemoize.Memoize(), (_class3 = class B
     if (!ratio) return null;
     return parseFloat(this.tokens) * ratio;
   }
-}, (_applyDecoratedDescriptor(_class3.prototype, "tokens", [_dec11], Object.getOwnPropertyDescriptor(_class3.prototype, "tokens"), _class3.prototype)), _class3));
-let FiatSumBalancesFormatter = (_dec12 = typescriptMemoize.Memoize(), _dec13 = typescriptMemoize.Memoize(), _dec14 = typescriptMemoize.Memoize(), _dec15 = typescriptMemoize.Memoize(), _dec16 = typescriptMemoize.Memoize(), _dec17 = typescriptMemoize.Memoize(), _dec18 = typescriptMemoize.Memoize(), (_class4 = class FiatSumBalancesFormatter {
+}
+class FiatSumBalancesFormatter {
   #balances;
   #currency;
   constructor(balances, currency) {
     this.#balances = balances;
     this.#currency = currency;
-    this.#sum = memoize__default["default"](this.#sum);
   }
   #sum = balanceField => {
     // a function to get a fiat amount from a balance
@@ -680,12 +659,11 @@ let FiatSumBalancesFormatter = (_dec12 = typescriptMemoize.Memoize(), _dec13 = t
   get feePayable() {
     return this.#sum("feePayable");
   }
-}, (_applyDecoratedDescriptor(_class4.prototype, "total", [_dec12], Object.getOwnPropertyDescriptor(_class4.prototype, "total"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "free", [_dec13], Object.getOwnPropertyDescriptor(_class4.prototype, "free"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "reserved", [_dec14], Object.getOwnPropertyDescriptor(_class4.prototype, "reserved"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "locked", [_dec15], Object.getOwnPropertyDescriptor(_class4.prototype, "locked"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "frozen", [_dec16], Object.getOwnPropertyDescriptor(_class4.prototype, "frozen"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "transferable", [_dec17], Object.getOwnPropertyDescriptor(_class4.prototype, "transferable"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "feePayable", [_dec18], Object.getOwnPropertyDescriptor(_class4.prototype, "feePayable"), _class4.prototype)), _class4));
+}
 class SumBalancesFormatter {
   #balances;
   constructor(balances) {
     this.#balances = balances;
-    this.fiat = memoize__default["default"](this.fiat);
   }
   fiat(currency) {
     return new FiatSumBalancesFormatter(this.#balances, currency);
@@ -701,6 +679,7 @@ exports.StorageHelper = StorageHelper;
 exports.SumBalancesFormatter = SumBalancesFormatter;
 exports.TalismanBalancesDatabase = TalismanBalancesDatabase;
 exports.balances = balances;
+exports.createTypeRegistryCache = createTypeRegistryCache;
 exports.db = db;
 exports.excludeFromFeePayableLocks = excludeFromFeePayableLocks;
 exports.excludeFromTransferableAmount = excludeFromTransferableAmount;

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

@@ -6,17 +6,10 @@ var dexie = require('dexie');
 var types = require('@polkadot/types');
 var anylogger = require('anylogger');
 var util = require('@talismn/util');
-var memoize = require('lodash/memoize');
-var typescriptMemoize = require('typescript-memoize');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
 var anylogger__default = /*#__PURE__*/_interopDefault(anylogger);
-var memoize__default = /*#__PURE__*/_interopDefault(memoize);
-
-//
-// exported
-//
 
 // TODO: Document default balances module purpose/usage
 const DefaultBalanceModule = type => ({
@@ -35,12 +28,15 @@ const DefaultBalanceModule = type => ({
   async fetchEvmChainTokens() {
     return Promise.resolve({});
   },
-  async subscribeBalances(_chainConnectors, _chaindataProvider, _addressesByToken, callback) {
+  async subscribeBalances(_, callback) {
     callback(new Error("Balance subscriptions are not implemented in this module."));
     return () => {};
   },
   async fetchBalances() {
     throw new Error("Balance fetching is not implemented in this module.");
+  },
+  async transferToken() {
+    throw new Error("Token transfers are not implemented in this module.");
   }
 });
 
@@ -71,7 +67,7 @@ const db = new TalismanBalancesDatabase();
 
 var packageJson = {
 	name: "@talismn/balances",
-	version: "0.3.3",
+	version: "0.4.0",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -90,7 +86,7 @@ var packageJson = {
 		"/plugins"
 	],
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	scripts: {
 		test: "jest",
@@ -104,9 +100,7 @@ var packageJson = {
 		"@talismn/token-rates": "workspace:^",
 		"@talismn/util": "workspace:^",
 		anylogger: "^1.0.11",
-		dexie: "^3.2.2",
-		lodash: "^4.17.21",
-		"typescript-memoize": "^1.1.0"
+		dexie: "^3.2.3"
 	},
 	devDependencies: {
 		"@polkadot/types": "^9.10.5",
@@ -137,15 +131,33 @@ var packageJson = {
 
 var log = anylogger__default["default"](packageJson.name);
 
-async function balances(balanceModule, chainConnectors, chaindataProvider, addressesByToken, callback) {
+async function balances(balanceModule, addressesByToken, callback) {
   // subscription request
-  if (callback !== undefined) return await balanceModule.subscribeBalances(chainConnectors, chaindataProvider, addressesByToken, callback);
+  if (callback !== undefined) return await balanceModule.subscribeBalances(addressesByToken, callback);
 
   // one-off request
-  return await balanceModule.fetchBalances(chainConnectors, chaindataProvider, addressesByToken);
+  return await balanceModule.fetchBalances(addressesByToken);
 }
+const createTypeRegistryCache = () => {
+  const typeRegistryCache = new Map();
+  const getOrCreateTypeRegistry = (chainId, metadataRpc) => {
+    // TODO: Delete cache when metadataRpc is different from last time
+    const cached = typeRegistryCache.get(chainId);
+    if (cached) return cached;
+    const typeRegistry = new types.TypeRegistry();
+    if (typeof metadataRpc === "string") {
+      const metadata = new types.Metadata(typeRegistry, metadataRpc);
+      metadata.registry.setMetadata(metadata);
+    }
+    typeRegistryCache.set(chainId, typeRegistry);
+    return typeRegistry;
+  };
+  return {
+    getOrCreateTypeRegistry
+  };
+};
 const filterMirrorTokens = (balance, i, balances) => {
-  // TODO implement a mirrorOf property, which should be set from chaindata
+  // TODO: implement a mirrorOf property, which should be set from chaindata
   const mirrorOf = balance.token?.mirrorOf;
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
@@ -231,30 +243,6 @@ class StorageHelper {
   }
 }
 
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
-  var desc = {};
-  Object.keys(descriptor).forEach(function (key) {
-    desc[key] = descriptor[key];
-  });
-  desc.enumerable = !!desc.enumerable;
-  desc.configurable = !!desc.configurable;
-  if ('value' in desc || desc.initializer) {
-    desc.writable = true;
-  }
-  desc = decorators.slice().reverse().reduce(function (desc, decorator) {
-    return decorator(target, property, desc) || desc;
-  }, desc);
-  if (context && desc.initializer !== void 0) {
-    desc.value = desc.initializer ? desc.initializer.call(context) : void 0;
-    desc.initializer = undefined;
-  }
-  if (desc.initializer === void 0) {
-    Object.defineProperty(target, property, desc);
-    desc = null;
-  }
-  return desc;
-}
-
 function excludeFromTransferableAmount(locks) {
   if (typeof locks === "string") return BigInt(locks);
   if (!Array.isArray(locks)) locks = [locks];
@@ -276,8 +264,6 @@ function includeInTotalExtraAmount(extra) {
 
 /** Used by plugins to help define their custom `BalanceType` */
 
-var _dec, _dec2, _dec3, _class, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class2, _dec11, _class3, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _class4;
-
 /**
  * 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.
@@ -288,12 +274,12 @@ var _dec, _dec2, _dec3, _class, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10
 /**
  * A collection of balances.
  */
-let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Memoize(), _dec3 = typescriptMemoize.Memoize(), (_class = class Balances {
+class Balances {
   //
   // Properties
   //
 
-  #balances = {};
+  #balances = [];
 
   //
   // Methods
@@ -301,7 +287,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
 
   constructor(balances, hydrate) {
     // handle Balances (convert to Balance[])
-    if (balances instanceof Balances) return new Balances([...balances], hydrate);
+    if (balances instanceof Balances) return new Balances(balances.each, hydrate);
 
     // handle Balance (convert to Balance[])
     if (balances instanceof Balance) return new Balances([balances], hydrate);
@@ -316,19 +302,19 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
     if (!util.isArrayOf(balances, Balance)) return new Balances(balances.map(storage => new Balance(storage)), hydrate);
 
     // handle Balance[]
-    this.#balances = Object.fromEntries(balances.map(balance => [balance.id, 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(Object.entries(this.#balances).map(([id, balance]) => {
+  toJSON = () => Object.fromEntries(this.#balances.map(balance => {
     try {
-      return [id, balance.toJSON()];
+      return [balance.id, balance.toJSON()];
     } catch (error) {
       log.error("Failed to convert balance to JSON", error, {
-        id,
+        id: balance.id,
         balance
       });
       return null;
@@ -348,7 +334,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
    */
   [Symbol.iterator] = () =>
   // Create an array of the balances in this collection and return the result of its iterator.
-  Object.values(this.#balances)[Symbol.iterator]();
+  this.#balances[Symbol.iterator]();
 
   /**
    * Hydrates all balances in this collection.
@@ -356,7 +342,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
    * @param sources - The sources to hydrate from.
    */
   hydrate = sources => {
-    Object.values(this.#balances).map(balance => balance.hydrate(sources));
+    this.#balances.map(balance => balance.hydrate(sources));
   };
 
   /**
@@ -365,7 +351,7 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
    * @param id - The id of the balance to fetch.
    * @returns The balance if one exists, or none.
    */
-  get = id => this.#balances[id] || null;
+  get = id => this.#balances.find(balance => balance.id === id) ?? null;
 
   /**
    * Retrieve balances from this collection by search query.
@@ -398,10 +384,8 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
     if (balances instanceof Balance) return this.add(new Balances(balances));
 
     // merge balances
-    const mergedBalances = {
-      ...this.#balances
-    };
-    [...balances].forEach(balance => mergedBalances[balance.id] = balance);
+    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));
@@ -419,25 +403,23 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
     // handle single id
     if (!Array.isArray(ids)) return this.remove([ids]);
 
-    // merge balances
-    const removedBalances = {
-      ...this.#balances
-    };
-    ids.forEach(id => delete removedBalances[id]);
-
-    // return new balances
-    return new Balances(Object.values(removedBalances));
+    // 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];
+  }
+
   /**
    * Get an array of balances in this collection, sorted by chain sortIndex.
    *
    * @returns A sorted array of the balances in this collection.
    */
   get sorted() {
-    return [...this].sort((a, b) => ((a.chain || a.evmNetwork)?.sortIndex || Number.MAX_SAFE_INTEGER) - ((b.chain || b.evmNetwork)?.sortIndex || Number.MAX_SAFE_INTEGER));
+    return [...this].sort((a, b) => ((a.chain || a.evmNetwork)?.sortIndex ?? Number.MAX_SAFE_INTEGER) - ((b.chain || b.evmNetwork)?.sortIndex ?? Number.MAX_SAFE_INTEGER));
   }
 
   /**
@@ -460,12 +442,12 @@ let Balances = (_dec = typescriptMemoize.Memoize(), _dec2 = typescriptMemoize.Me
   get sum() {
     return new SumBalancesFormatter(this);
   }
-}, (_applyDecoratedDescriptor(_class.prototype, "sorted", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "sorted"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "count", [_dec2], Object.getOwnPropertyDescriptor(_class.prototype, "count"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "sum", [_dec3], Object.getOwnPropertyDescriptor(_class.prototype, "sum"), _class.prototype)), _class));
+}
 
 /**
  * An individual balance.
  */
-let Balance = (_dec4 = typescriptMemoize.Memoize(), _dec5 = typescriptMemoize.Memoize(), _dec6 = typescriptMemoize.Memoize(), _dec7 = typescriptMemoize.Memoize(), _dec8 = typescriptMemoize.Memoize(), _dec9 = typescriptMemoize.Memoize(), _dec10 = typescriptMemoize.Memoize(), (_class2 = class Balance {
+class Balance {
   //
   // Properties
   //
@@ -479,7 +461,6 @@ let Balance = (_dec4 = typescriptMemoize.Memoize(), _dec5 = typescriptMemoize.Me
   //
 
   constructor(storage, hydrate) {
-    this.#format = memoize__default["default"](this.#format);
     this.#storage = storage;
     if (hydrate !== undefined) this.hydrate(hydrate);
   }
@@ -602,8 +583,8 @@ let Balance = (_dec4 = typescriptMemoize.Memoize(), _dec5 = typescriptMemoize.Me
     // subtract the lock from the free amount (but don't go below 0)
     return this.#format(util.BigMath.max(this.free.planck - excludeAmount, BigInt("0")));
   }
-}, (_applyDecoratedDescriptor(_class2.prototype, "total", [_dec4], Object.getOwnPropertyDescriptor(_class2.prototype, "total"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "free", [_dec5], Object.getOwnPropertyDescriptor(_class2.prototype, "free"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "reserved", [_dec6], Object.getOwnPropertyDescriptor(_class2.prototype, "reserved"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "locked", [_dec7], Object.getOwnPropertyDescriptor(_class2.prototype, "locked"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "frozen", [_dec8], Object.getOwnPropertyDescriptor(_class2.prototype, "frozen"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "transferable", [_dec9], Object.getOwnPropertyDescriptor(_class2.prototype, "transferable"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "feePayable", [_dec10], Object.getOwnPropertyDescriptor(_class2.prototype, "feePayable"), _class2.prototype)), _class2));
-let BalanceFormatter = (_dec11 = typescriptMemoize.Memoize(), (_class3 = class BalanceFormatter {
+}
+class BalanceFormatter {
   #planck;
   #decimals;
   #fiatRatios;
@@ -611,7 +592,6 @@ let BalanceFormatter = (_dec11 = typescriptMemoize.Memoize(), (_class3 = class B
     this.#planck = typeof planck === "bigint" ? planck.toString() : planck ?? "0";
     this.#decimals = decimals || 0;
     this.#fiatRatios = fiatRatios || null;
-    this.fiat = memoize__default["default"](this.fiat);
   }
   toJSON = () => this.#planck;
   get planck() {
@@ -626,14 +606,13 @@ let BalanceFormatter = (_dec11 = typescriptMemoize.Memoize(), (_class3 = class B
     if (!ratio) return null;
     return parseFloat(this.tokens) * ratio;
   }
-}, (_applyDecoratedDescriptor(_class3.prototype, "tokens", [_dec11], Object.getOwnPropertyDescriptor(_class3.prototype, "tokens"), _class3.prototype)), _class3));
-let FiatSumBalancesFormatter = (_dec12 = typescriptMemoize.Memoize(), _dec13 = typescriptMemoize.Memoize(), _dec14 = typescriptMemoize.Memoize(), _dec15 = typescriptMemoize.Memoize(), _dec16 = typescriptMemoize.Memoize(), _dec17 = typescriptMemoize.Memoize(), _dec18 = typescriptMemoize.Memoize(), (_class4 = class FiatSumBalancesFormatter {
+}
+class FiatSumBalancesFormatter {
   #balances;
   #currency;
   constructor(balances, currency) {
     this.#balances = balances;
     this.#currency = currency;
-    this.#sum = memoize__default["default"](this.#sum);
   }
   #sum = balanceField => {
     // a function to get a fiat amount from a balance
@@ -680,12 +659,11 @@ let FiatSumBalancesFormatter = (_dec12 = typescriptMemoize.Memoize(), _dec13 = t
   get feePayable() {
     return this.#sum("feePayable");
   }
-}, (_applyDecoratedDescriptor(_class4.prototype, "total", [_dec12], Object.getOwnPropertyDescriptor(_class4.prototype, "total"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "free", [_dec13], Object.getOwnPropertyDescriptor(_class4.prototype, "free"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "reserved", [_dec14], Object.getOwnPropertyDescriptor(_class4.prototype, "reserved"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "locked", [_dec15], Object.getOwnPropertyDescriptor(_class4.prototype, "locked"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "frozen", [_dec16], Object.getOwnPropertyDescriptor(_class4.prototype, "frozen"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "transferable", [_dec17], Object.getOwnPropertyDescriptor(_class4.prototype, "transferable"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "feePayable", [_dec18], Object.getOwnPropertyDescriptor(_class4.prototype, "feePayable"), _class4.prototype)), _class4));
+}
 class SumBalancesFormatter {
   #balances;
   constructor(balances) {
     this.#balances = balances;
-    this.fiat = memoize__default["default"](this.fiat);
   }
   fiat(currency) {
     return new FiatSumBalancesFormatter(this.#balances, currency);
@@ -701,6 +679,7 @@ exports.StorageHelper = StorageHelper;
 exports.SumBalancesFormatter = SumBalancesFormatter;
 exports.TalismanBalancesDatabase = TalismanBalancesDatabase;
 exports.balances = balances;
+exports.createTypeRegistryCache = createTypeRegistryCache;
 exports.db = db;
 exports.excludeFromFeePayableLocks = excludeFromFeePayableLocks;
 exports.excludeFromTransferableAmount = excludeFromTransferableAmount;

package/dist/talismn-balances.esm.js

@@ -1,13 +1,7 @@
 import { Dexie } from 'dexie';
-import { decorateStorage, StorageKey } from '@polkadot/types';
+import { decorateStorage, StorageKey, TypeRegistry, Metadata } from '@polkadot/types';
 import anylogger from 'anylogger';
 import { BigMath, isArrayOf, planckToTokens } from '@talismn/util';
-import memoize from 'lodash/memoize';
-import { Memoize } from 'typescript-memoize';
-
-//
-// exported
-//
 
 // TODO: Document default balances module purpose/usage
 const DefaultBalanceModule = type => ({
@@ -26,12 +20,15 @@ const DefaultBalanceModule = type => ({
   async fetchEvmChainTokens() {
     return Promise.resolve({});
   },
-  async subscribeBalances(_chainConnectors, _chaindataProvider, _addressesByToken, callback) {
+  async subscribeBalances(_, callback) {
     callback(new Error("Balance subscriptions are not implemented in this module."));
     return () => {};
   },
   async fetchBalances() {
     throw new Error("Balance fetching is not implemented in this module.");
+  },
+  async transferToken() {
+    throw new Error("Token transfers are not implemented in this module.");
   }
 });
 
@@ -62,7 +59,7 @@ const db = new TalismanBalancesDatabase();
 
 var packageJson = {
 	name: "@talismn/balances",
-	version: "0.3.3",
+	version: "0.4.0",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "UNLICENSED",
@@ -81,7 +78,7 @@ var packageJson = {
 		"/plugins"
 	],
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	scripts: {
 		test: "jest",
@@ -95,9 +92,7 @@ var packageJson = {
 		"@talismn/token-rates": "workspace:^",
 		"@talismn/util": "workspace:^",
 		anylogger: "^1.0.11",
-		dexie: "^3.2.2",
-		lodash: "^4.17.21",
-		"typescript-memoize": "^1.1.0"
+		dexie: "^3.2.3"
 	},
 	devDependencies: {
 		"@polkadot/types": "^9.10.5",
@@ -128,15 +123,33 @@ var packageJson = {
 
 var log = anylogger(packageJson.name);
 
-async function balances(balanceModule, chainConnectors, chaindataProvider, addressesByToken, callback) {
+async function balances(balanceModule, addressesByToken, callback) {
   // subscription request
-  if (callback !== undefined) return await balanceModule.subscribeBalances(chainConnectors, chaindataProvider, addressesByToken, callback);
+  if (callback !== undefined) return await balanceModule.subscribeBalances(addressesByToken, callback);
 
   // one-off request
-  return await balanceModule.fetchBalances(chainConnectors, chaindataProvider, addressesByToken);
+  return await balanceModule.fetchBalances(addressesByToken);
 }
+const createTypeRegistryCache = () => {
+  const typeRegistryCache = new Map();
+  const getOrCreateTypeRegistry = (chainId, metadataRpc) => {
+    // TODO: Delete cache when metadataRpc is different from last time
+    const cached = typeRegistryCache.get(chainId);
+    if (cached) return cached;
+    const typeRegistry = new TypeRegistry();
+    if (typeof metadataRpc === "string") {
+      const metadata = new Metadata(typeRegistry, metadataRpc);
+      metadata.registry.setMetadata(metadata);
+    }
+    typeRegistryCache.set(chainId, typeRegistry);
+    return typeRegistry;
+  };
+  return {
+    getOrCreateTypeRegistry
+  };
+};
 const filterMirrorTokens = (balance, i, balances) => {
-  // TODO implement a mirrorOf property, which should be set from chaindata
+  // TODO: implement a mirrorOf property, which should be set from chaindata
   const mirrorOf = balance.token?.mirrorOf;
   return !mirrorOf || !balances.find(b => b.tokenId === mirrorOf);
 };
@@ -222,30 +235,6 @@ class StorageHelper {
   }
 }
 
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
-  var desc = {};
-  Object.keys(descriptor).forEach(function (key) {
-    desc[key] = descriptor[key];
-  });
-  desc.enumerable = !!desc.enumerable;
-  desc.configurable = !!desc.configurable;
-  if ('value' in desc || desc.initializer) {
-    desc.writable = true;
-  }
-  desc = decorators.slice().reverse().reduce(function (desc, decorator) {
-    return decorator(target, property, desc) || desc;
-  }, desc);
-  if (context && desc.initializer !== void 0) {
-    desc.value = desc.initializer ? desc.initializer.call(context) : void 0;
-    desc.initializer = undefined;
-  }
-  if (desc.initializer === void 0) {
-    Object.defineProperty(target, property, desc);
-    desc = null;
-  }
-  return desc;
-}
-
 function excludeFromTransferableAmount(locks) {
   if (typeof locks === "string") return BigInt(locks);
   if (!Array.isArray(locks)) locks = [locks];
@@ -267,8 +256,6 @@ function includeInTotalExtraAmount(extra) {
 
 /** Used by plugins to help define their custom `BalanceType` */
 
-var _dec, _dec2, _dec3, _class, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _class2, _dec11, _class3, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _class4;
-
 /**
  * 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.
@@ -279,12 +266,12 @@ var _dec, _dec2, _dec3, _class, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10
 /**
  * A collection of balances.
  */
-let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class = class Balances {
+class Balances {
   //
   // Properties
   //
 
-  #balances = {};
+  #balances = [];
 
   //
   // Methods
@@ -292,7 +279,7 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
 
   constructor(balances, hydrate) {
     // handle Balances (convert to Balance[])
-    if (balances instanceof Balances) return new Balances([...balances], hydrate);
+    if (balances instanceof Balances) return new Balances(balances.each, hydrate);
 
     // handle Balance (convert to Balance[])
     if (balances instanceof Balance) return new Balances([balances], hydrate);
@@ -307,19 +294,19 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
     if (!isArrayOf(balances, Balance)) return new Balances(balances.map(storage => new Balance(storage)), hydrate);
 
     // handle Balance[]
-    this.#balances = Object.fromEntries(balances.map(balance => [balance.id, 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(Object.entries(this.#balances).map(([id, balance]) => {
+  toJSON = () => Object.fromEntries(this.#balances.map(balance => {
     try {
-      return [id, balance.toJSON()];
+      return [balance.id, balance.toJSON()];
     } catch (error) {
       log.error("Failed to convert balance to JSON", error, {
-        id,
+        id: balance.id,
         balance
       });
       return null;
@@ -339,7 +326,7 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
    */
   [Symbol.iterator] = () =>
   // Create an array of the balances in this collection and return the result of its iterator.
-  Object.values(this.#balances)[Symbol.iterator]();
+  this.#balances[Symbol.iterator]();
 
   /**
    * Hydrates all balances in this collection.
@@ -347,7 +334,7 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
    * @param sources - The sources to hydrate from.
    */
   hydrate = sources => {
-    Object.values(this.#balances).map(balance => balance.hydrate(sources));
+    this.#balances.map(balance => balance.hydrate(sources));
   };
 
   /**
@@ -356,7 +343,7 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
    * @param id - The id of the balance to fetch.
    * @returns The balance if one exists, or none.
    */
-  get = id => this.#balances[id] || null;
+  get = id => this.#balances.find(balance => balance.id === id) ?? null;
 
   /**
    * Retrieve balances from this collection by search query.
@@ -389,10 +376,8 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
     if (balances instanceof Balance) return this.add(new Balances(balances));
 
     // merge balances
-    const mergedBalances = {
-      ...this.#balances
-    };
-    [...balances].forEach(balance => mergedBalances[balance.id] = balance);
+    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));
@@ -410,25 +395,23 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
     // handle single id
     if (!Array.isArray(ids)) return this.remove([ids]);
 
-    // merge balances
-    const removedBalances = {
-      ...this.#balances
-    };
-    ids.forEach(id => delete removedBalances[id]);
-
-    // return new balances
-    return new Balances(Object.values(removedBalances));
+    // 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];
+  }
+
   /**
    * Get an array of balances in this collection, sorted by chain sortIndex.
    *
    * @returns A sorted array of the balances in this collection.
    */
   get sorted() {
-    return [...this].sort((a, b) => ((a.chain || a.evmNetwork)?.sortIndex || Number.MAX_SAFE_INTEGER) - ((b.chain || b.evmNetwork)?.sortIndex || Number.MAX_SAFE_INTEGER));
+    return [...this].sort((a, b) => ((a.chain || a.evmNetwork)?.sortIndex ?? Number.MAX_SAFE_INTEGER) - ((b.chain || b.evmNetwork)?.sortIndex ?? Number.MAX_SAFE_INTEGER));
   }
 
   /**
@@ -451,12 +434,12 @@ let Balances = (_dec = Memoize(), _dec2 = Memoize(), _dec3 = Memoize(), (_class
   get sum() {
     return new SumBalancesFormatter(this);
   }
-}, (_applyDecoratedDescriptor(_class.prototype, "sorted", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "sorted"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "count", [_dec2], Object.getOwnPropertyDescriptor(_class.prototype, "count"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "sum", [_dec3], Object.getOwnPropertyDescriptor(_class.prototype, "sum"), _class.prototype)), _class));
+}
 
 /**
  * An individual balance.
  */
-let Balance = (_dec4 = Memoize(), _dec5 = Memoize(), _dec6 = Memoize(), _dec7 = Memoize(), _dec8 = Memoize(), _dec9 = Memoize(), _dec10 = Memoize(), (_class2 = class Balance {
+class Balance {
   //
   // Properties
   //
@@ -470,7 +453,6 @@ let Balance = (_dec4 = Memoize(), _dec5 = Memoize(), _dec6 = Memoize(), _dec7 =
   //
 
   constructor(storage, hydrate) {
-    this.#format = memoize(this.#format);
     this.#storage = storage;
     if (hydrate !== undefined) this.hydrate(hydrate);
   }
@@ -593,8 +575,8 @@ let Balance = (_dec4 = Memoize(), _dec5 = Memoize(), _dec6 = Memoize(), _dec7 =
     // subtract the lock from the free amount (but don't go below 0)
     return this.#format(BigMath.max(this.free.planck - excludeAmount, BigInt("0")));
   }
-}, (_applyDecoratedDescriptor(_class2.prototype, "total", [_dec4], Object.getOwnPropertyDescriptor(_class2.prototype, "total"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "free", [_dec5], Object.getOwnPropertyDescriptor(_class2.prototype, "free"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "reserved", [_dec6], Object.getOwnPropertyDescriptor(_class2.prototype, "reserved"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "locked", [_dec7], Object.getOwnPropertyDescriptor(_class2.prototype, "locked"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "frozen", [_dec8], Object.getOwnPropertyDescriptor(_class2.prototype, "frozen"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "transferable", [_dec9], Object.getOwnPropertyDescriptor(_class2.prototype, "transferable"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "feePayable", [_dec10], Object.getOwnPropertyDescriptor(_class2.prototype, "feePayable"), _class2.prototype)), _class2));
-let BalanceFormatter = (_dec11 = Memoize(), (_class3 = class BalanceFormatter {
+}
+class BalanceFormatter {
   #planck;
   #decimals;
   #fiatRatios;
@@ -602,7 +584,6 @@ let BalanceFormatter = (_dec11 = Memoize(), (_class3 = class BalanceFormatter {
     this.#planck = typeof planck === "bigint" ? planck.toString() : planck ?? "0";
     this.#decimals = decimals || 0;
     this.#fiatRatios = fiatRatios || null;
-    this.fiat = memoize(this.fiat);
   }
   toJSON = () => this.#planck;
   get planck() {
@@ -617,14 +598,13 @@ let BalanceFormatter = (_dec11 = Memoize(), (_class3 = class BalanceFormatter {
     if (!ratio) return null;
     return parseFloat(this.tokens) * ratio;
   }
-}, (_applyDecoratedDescriptor(_class3.prototype, "tokens", [_dec11], Object.getOwnPropertyDescriptor(_class3.prototype, "tokens"), _class3.prototype)), _class3));
-let FiatSumBalancesFormatter = (_dec12 = Memoize(), _dec13 = Memoize(), _dec14 = Memoize(), _dec15 = Memoize(), _dec16 = Memoize(), _dec17 = Memoize(), _dec18 = Memoize(), (_class4 = class FiatSumBalancesFormatter {
+}
+class FiatSumBalancesFormatter {
   #balances;
   #currency;
   constructor(balances, currency) {
     this.#balances = balances;
     this.#currency = currency;
-    this.#sum = memoize(this.#sum);
   }
   #sum = balanceField => {
     // a function to get a fiat amount from a balance
@@ -671,16 +651,15 @@ let FiatSumBalancesFormatter = (_dec12 = Memoize(), _dec13 = Memoize(), _dec14 =
   get feePayable() {
     return this.#sum("feePayable");
   }
-}, (_applyDecoratedDescriptor(_class4.prototype, "total", [_dec12], Object.getOwnPropertyDescriptor(_class4.prototype, "total"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "free", [_dec13], Object.getOwnPropertyDescriptor(_class4.prototype, "free"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "reserved", [_dec14], Object.getOwnPropertyDescriptor(_class4.prototype, "reserved"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "locked", [_dec15], Object.getOwnPropertyDescriptor(_class4.prototype, "locked"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "frozen", [_dec16], Object.getOwnPropertyDescriptor(_class4.prototype, "frozen"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "transferable", [_dec17], Object.getOwnPropertyDescriptor(_class4.prototype, "transferable"), _class4.prototype), _applyDecoratedDescriptor(_class4.prototype, "feePayable", [_dec18], Object.getOwnPropertyDescriptor(_class4.prototype, "feePayable"), _class4.prototype)), _class4));
+}
 class SumBalancesFormatter {
   #balances;
   constructor(balances) {
     this.#balances = balances;
-    this.fiat = memoize(this.fiat);
   }
   fiat(currency) {
     return new FiatSumBalancesFormatter(this.#balances, currency);
   }
 }
 
-export { Balance, BalanceFormatter, Balances, DefaultBalanceModule, FiatSumBalancesFormatter, StorageHelper, SumBalancesFormatter, TalismanBalancesDatabase, balances, db, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterMirrorTokens, includeInTotalExtraAmount };
+export { Balance, BalanceFormatter, Balances, DefaultBalanceModule, FiatSumBalancesFormatter, StorageHelper, SumBalancesFormatter, TalismanBalancesDatabase, balances, createTypeRegistryCache, db, excludeFromFeePayableLocks, excludeFromTransferableAmount, filterMirrorTokens, includeInTotalExtraAmount };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "UNLICENSED",
@@ -19,7 +19,7 @@
     "/plugins"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "scripts": {
     "test": "jest",
@@ -27,15 +27,13 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "@talismn/chain-connector": "^0.4.2",
-    "@talismn/chain-connector-evm": "^0.4.2",
-    "@talismn/chaindata-provider": "^0.4.2",
-    "@talismn/token-rates": "^0.1.14",
-    "@talismn/util": "^0.1.7",
+    "@talismn/chain-connector": "^0.4.3",
+    "@talismn/chain-connector-evm": "^0.4.3",
+    "@talismn/chaindata-provider": "^0.4.3",
+    "@talismn/token-rates": "^0.1.15",
+    "@talismn/util": "^0.1.8",
     "anylogger": "^1.0.11",
-    "dexie": "^3.2.2",
-    "lodash": "^4.17.21",
-    "typescript-memoize": "^1.1.0"
+    "dexie": "^3.2.3"
   },
   "devDependencies": {
     "@polkadot/types": "^9.10.5",