@talismn/balances 0.1.19 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @talismn/balances
 
+## 0.2.1
+
+## 0.2.0
+
+### Patch Changes
+
+- Updated dependencies [bff217a1]
+- Updated dependencies [bff217a1]
+  - @talismn/chain-connector-evm@0.2.0
+
 ## 0.1.19
 
 ## 0.1.18

package/dist/BalanceModule.js

@@ -1,50 +1,25 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultBalanceModule = void 0;
 // TODO: Document default balances module purpose/usage
-const DefaultBalanceModule = (type) => ({
+export const DefaultBalanceModule = (type) => ({
     get type() {
         return type;
     },
-    fetchSubstrateChainMeta() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return null;
-        });
+    async fetchSubstrateChainMeta() {
+        return null;
     },
-    fetchEvmChainMeta() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return null;
-        });
+    async fetchEvmChainMeta() {
+        return null;
     },
-    fetchSubstrateChainTokens() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return Promise.resolve({});
-        });
+    async fetchSubstrateChainTokens() {
+        return Promise.resolve({});
     },
-    fetchEvmChainTokens() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return Promise.resolve({});
-        });
+    async fetchEvmChainTokens() {
+        return Promise.resolve({});
     },
-    subscribeBalances(_chainConnectors, _chaindataProvider, _addressesByToken, callback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            callback(new Error("Balance subscriptions are not implemented in this module."));
-            return () => { };
-        });
+    async subscribeBalances(_chainConnectors, _chaindataProvider, _addressesByToken, callback) {
+        callback(new Error("Balance subscriptions are not implemented in this module."));
+        return () => { };
     },
-    fetchBalances() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error("Balance fetching is not implemented in this module.");
-        });
+    async fetchBalances() {
+        throw new Error("Balance fetching is not implemented in this module.");
     },
 });
-exports.DefaultBalanceModule = DefaultBalanceModule;

package/dist/TalismanBalancesDatabase.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.db = exports.TalismanBalancesDatabase = void 0;
-const dexie_1 = require("dexie");
-class TalismanBalancesDatabase extends dexie_1.Dexie {
+import { Dexie } from "dexie";
+export class TalismanBalancesDatabase extends Dexie {
+    balances;
     constructor() {
         super("TalismanBalances");
         // https://dexie.org/docs/Tutorial/Design#database-versioning
@@ -18,5 +16,4 @@ class TalismanBalancesDatabase extends dexie_1.Dexie {
         // this.on("ready", async () => {})
     }
 }
-exports.TalismanBalancesDatabase = TalismanBalancesDatabase;
-exports.db = new TalismanBalancesDatabase();
+export const db = new TalismanBalancesDatabase();

package/dist/helpers.js

@@ -1,22 +1,7 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.balances = void 0;
-function balances(balanceModule, chainConnectors, chaindataProvider, addressesByToken, callback) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // subscription request
-        if (callback !== undefined)
-            return yield balanceModule.subscribeBalances(chainConnectors, chaindataProvider, addressesByToken, callback);
-        // one-off request
-        return yield balanceModule.fetchBalances(chainConnectors, chaindataProvider, addressesByToken);
-    });
+export async function balances(balanceModule, chainConnectors, chaindataProvider, addressesByToken, callback) {
+    // subscription request
+    if (callback !== undefined)
+        return await balanceModule.subscribeBalances(chainConnectors, chaindataProvider, addressesByToken, callback);
+    // one-off request
+    return await balanceModule.fetchBalances(chainConnectors, chaindataProvider, addressesByToken);
 }
-exports.balances = balances;

package/dist/index.js

@@ -1,4 +1,3 @@
-"use strict";
 //
 // NOTE: Do not export `./plugins` from here!
 // Doing so will introduce a circular dependency!
@@ -10,22 +9,7 @@
 //
 //     import { PluginBalanceTypes } from '@talismn/balances'
 //
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./BalanceModule"), exports);
-__exportStar(require("./TalismanBalancesDatabase"), exports);
-__exportStar(require("./helpers"), exports);
-__exportStar(require("./types"), exports);
+export * from "./BalanceModule";
+export * from "./TalismanBalancesDatabase";
+export * from "./helpers";
+export * from "./types";

package/dist/log.js

@@ -1,10 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const anylogger_1 = __importDefault(require("anylogger"));
+import anylogger from "anylogger";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { name } = require("../package.json");
 // import { name } from "../package.json"
-exports.default = (0, anylogger_1.default)(name);
+export default anylogger(name);

package/dist/plugins.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/addresses.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/types/balances.js

@@ -1,144 +1,26 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _Balances_balances, _a, _Balance_storage, _Balance_db, _Balance_format, _BalanceFormatter_planck, _BalanceFormatter_decimals, _BalanceFormatter_fiatRatios, _FiatSumBalancesFormatter_balances, _FiatSumBalancesFormatter_currency, _FiatSumBalancesFormatter_sum, _SumBalancesFormatter_balances;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SumBalancesFormatter = exports.FiatSumBalancesFormatter = exports.BalanceFormatter = exports.Balance = exports.Balances = void 0;
-const util_1 = require("@talismn/util");
-const memoize_1 = __importDefault(require("lodash/memoize"));
-const typescript_memoize_1 = require("typescript-memoize");
-const log_1 = __importDefault(require("../log"));
-const balancetypes_1 = require("./balancetypes");
+import { BigMath, isArrayOf, planckToTokens } from "@talismn/util";
+import memoize from "lodash/memoize";
+import { Memoize } from "typescript-memoize";
+import log from "../log";
+import { excludeFromFeePayableLocks, excludeFromTransferableAmount, includeInTotalExtraAmount, } from "./balancetypes";
 /**
  * A collection of balances.
  */
-class Balances {
+export class Balances {
+    //
+    // Properties
+    //
+    #balances = {};
     //
     // Methods
     //
     constructor(balances, hydrate) {
-        //
-        // Properties
-        //
-        _Balances_balances.set(this, {}
-        //
-        // Methods
-        //
-        );
-        /**
-         * Calling toJSON on a collection of balances will return the underlying BalanceJsonList.
-         */
-        this.toJSON = () => Object.fromEntries(Object.entries(__classPrivateFieldGet(this, _Balances_balances, "f"))
-            .map(([id, balance]) => {
-            try {
-                return [id, balance.toJSON()];
-            }
-            catch (error) {
-                log_1.default.error("Failed to convert balance to JSON", error, { 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
-         * }
-         */
-        this[_a] = () => 
-        // Create an array of the balances in this collection and return the result of its iterator.
-        Object.values(__classPrivateFieldGet(this, _Balances_balances, "f"))[Symbol.iterator]();
-        /**
-         * Hydrates all balances in this collection.
-         *
-         * @param sources - The sources to hydrate from.
-         */
-        this.hydrate = (sources) => {
-            Object.values(__classPrivateFieldGet(this, _Balances_balances, "f")).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.
-         */
-        this.get = (id) => __classPrivateFieldGet(this, _Balances_balances, "f")[id] || null;
-        /**
-         * Retrieve balances from this collection by search query.
-         *
-         * @param query - The search query.
-         * @returns All balances which match the query.
-         */
-        this.find = (query) => {
-            // construct filter
-            const orQueries = (Array.isArray(query) ? query : [query]).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));
-        };
-        /**
-         * 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.
-         */
-        this.add = (balances) => {
-            // handle single balance
-            if (balances instanceof Balance)
-                return this.add(new Balances(balances));
-            // merge balances
-            const mergedBalances = Object.assign({}, __classPrivateFieldGet(this, _Balances_balances, "f"));
-            [...balances].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.
-         */
-        this.remove = (ids) => {
-            // handle single id
-            if (!Array.isArray(ids))
-                return this.remove([ids]);
-            // merge balances
-            const removedBalances = Object.assign({}, __classPrivateFieldGet(this, _Balances_balances, "f"));
-            ids.forEach((id) => delete removedBalances[id]);
-            // return new balances
-            return new Balances(Object.values(removedBalances));
-        };
         // handle Balances (convert to Balance[])
         if (balances instanceof Balances)
             return new Balances([...balances], hydrate);
@@ -152,13 +34,109 @@ class Balances {
         if (balances.length === 0)
             return this;
         // handle BalanceJson[]
-        if (!(0, util_1.isArrayOf)(balances, Balance))
+        if (!isArrayOf(balances, Balance))
             return new Balances(balances.map((storage) => new Balance(storage)), hydrate);
         // handle Balance[]
-        __classPrivateFieldSet(this, _Balances_balances, Object.fromEntries(balances.map((balance) => [balance.id, balance])), "f");
+        this.#balances = Object.fromEntries(balances.map((balance) => [balance.id, balance]));
         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]) => {
+        try {
+            return [id, balance.toJSON()];
+        }
+        catch (error) {
+            log.error("Failed to convert balance to JSON", error, { 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.
+    Object.values(this.#balances)[Symbol.iterator]();
+    /**
+     * Hydrates all balances in this collection.
+     *
+     * @param sources - The sources to hydrate from.
+     */
+    hydrate = (sources) => {
+        Object.values(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[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 orQueries = (Array.isArray(query) ? query : [query]).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));
+    };
+    /**
+     * 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 = { ...this.#balances };
+        [...balances].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 balances
+        const removedBalances = { ...this.#balances };
+        ids.forEach((id) => delete removedBalances[id]);
+        // return new balances
+        return new Balances(Object.values(removedBalances));
+    };
     // TODO: Add some more useful aggregator methods
     /**
      * Get an array of balances in this collection, sorted by chain sortIndex.
@@ -166,11 +144,8 @@ class Balances {
      * @returns A sorted array of the balances in this collection.
      */
     get sorted() {
-        return [...this].sort((a, b) => {
-            var _b, _c;
-            return (((_b = (a.chain || a.evmNetwork)) === null || _b === void 0 ? void 0 : _b.sortIndex) || Number.MAX_SAFE_INTEGER) -
-                (((_c = (b.chain || b.evmNetwork)) === null || _c === void 0 ? void 0 : _c.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));
     }
     /**
      * Get the number of balances in this collection.
@@ -192,114 +167,96 @@ class Balances {
         return new SumBalancesFormatter(this);
     }
 }
-_Balances_balances = new WeakMap(), _a = Symbol.iterator;
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balances.prototype, "sorted", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balances.prototype, "count", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balances.prototype, "sum", null);
-exports.Balances = Balances;
 /**
  * An individual balance.
  */
-class Balance {
+export class Balance {
+    //
+    // Properties
+    //
+    /** The underlying data for this balance */
+    #storage;
+    #db = null;
     //
     // Methods
     //
     constructor(storage, hydrate) {
-        //
-        // Properties
-        //
-        /** The underlying data for this balance */
-        _Balance_storage.set(this, void 0);
-        _Balance_db.set(this, null
-        //
-        // Methods
-        //
-        );
-        this.toJSON = () => __classPrivateFieldGet(this, _Balance_storage, "f");
-        this.isSource = (source) => __classPrivateFieldGet(this, _Balance_storage, "f").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
-        // }
-        this.hydrate = (hydrate) => {
-            if (hydrate !== undefined)
-                __classPrivateFieldSet(this, _Balance_db, hydrate, "f");
-        };
-        _Balance_format.set(this, (balance) => {
-            var _b;
-            return new BalanceFormatter(typeof balance === "bigint" ? balance.toString() : balance, this.decimals || undefined, ((_b = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _b === void 0 ? void 0 : _b.tokenRates) && __classPrivateFieldGet(this, _Balance_db, "f").tokenRates[this.tokenId]);
-        }
-        //
-        // Accessors
-        //
-        );
-        __classPrivateFieldSet(this, _Balance_format, (0, memoize_1.default)(__classPrivateFieldGet(this, _Balance_format, "f")), "f");
-        __classPrivateFieldSet(this, _Balance_storage, storage, "f");
+        this.#format = memoize(this.#format);
+        this.#storage = 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(typeof balance === "bigint" ? balance.toString() : balance, this.decimals || undefined, this.#db?.tokenRates && this.#db.tokenRates[this.tokenId]);
     //
     // Accessors
     //
     get id() {
-        const { source, address, chainId, evmNetworkId, tokenId } = __classPrivateFieldGet(this, _Balance_storage, "f");
+        const { source, address, chainId, evmNetworkId, tokenId } = this.#storage;
         const locationId = chainId !== undefined ? chainId : evmNetworkId;
         return `${source}-${address}-${locationId}-${tokenId}`;
     }
     get source() {
-        return __classPrivateFieldGet(this, _Balance_storage, "f").source;
+        return this.#storage.source;
     }
     get status() {
-        return __classPrivateFieldGet(this, _Balance_storage, "f").status;
+        return this.#storage.status;
     }
     get address() {
-        return __classPrivateFieldGet(this, _Balance_storage, "f").address;
+        return this.#storage.address;
     }
     get chainId() {
-        return __classPrivateFieldGet(this, _Balance_storage, "f").chainId;
+        return this.#storage.chainId;
     }
     get chain() {
-        var _b, _c;
-        return (((_b = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _b === void 0 ? void 0 : _b.chains) && this.chainId && ((_c = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _c === void 0 ? void 0 : _c.chains[this.chainId])) || null;
+        return (this.#db?.chains && this.chainId && this.#db?.chains[this.chainId]) || null;
     }
     get evmNetworkId() {
-        return __classPrivateFieldGet(this, _Balance_storage, "f").evmNetworkId;
+        return this.#storage.evmNetworkId;
     }
     get evmNetwork() {
-        var _b, _c;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return (((_b = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _b === void 0 ? void 0 : _b.evmNetworks) && ((_c = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _c === void 0 ? void 0 : _c.evmNetworks[this.evmNetworkId])) || null;
+        return (this.#db?.evmNetworks && this.#db?.evmNetworks[this.evmNetworkId]) || null;
     }
     get tokenId() {
-        return __classPrivateFieldGet(this, _Balance_storage, "f").tokenId;
+        return this.#storage.tokenId;
     }
     get token() {
-        var _b, _c;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return (((_b = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _b === void 0 ? void 0 : _b.tokens) && ((_c = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _c === void 0 ? void 0 : _c.tokens[this.tokenId])) || null;
+        return (this.#db?.tokens && this.#db?.tokens[this.tokenId]) || null;
     }
     get decimals() {
-        var _b;
-        return ((_b = this.token) === null || _b === void 0 ? void 0 : _b.decimals) || null;
+        return this.token?.decimals || null;
     }
     get rates() {
-        var _b;
-        return (((_b = __classPrivateFieldGet(this, _Balance_db, "f")) === null || _b === void 0 ? void 0 : _b.tokenRates) && __classPrivateFieldGet(this, _Balance_db, "f").tokenRates[this.tokenId]) || null;
+        return (this.#db?.tokenRates && this.#db.tokenRates[this.tokenId]) || null;
     }
     /**
      * The total balance of this token.
@@ -307,41 +264,38 @@ class Balance {
      * The balance will be reaped if this goes below the existential deposit.
      */
     get total() {
-        const extra = (0, balancetypes_1.includeInTotalExtraAmount)(__classPrivateFieldGet(this, _Balance_storage, "f").extra);
-        return __classPrivateFieldGet(this, _Balance_format, "f").call(this, this.free.planck + this.reserved.planck + extra);
+        const extra = includeInTotalExtraAmount(this.#storage.extra);
+        return this.#format(this.free.planck + this.reserved.planck + extra);
     }
     /** The non-reserved balance of this token. Includes the frozen amount. Is included in the total. */
     get free() {
-        var _b;
-        return __classPrivateFieldGet(this, _Balance_format, "f").call(this, typeof __classPrivateFieldGet(this, _Balance_storage, "f").free === "string"
-            ? BigInt(__classPrivateFieldGet(this, _Balance_storage, "f").free)
-            : Array.isArray(__classPrivateFieldGet(this, _Balance_storage, "f").free)
-                ? __classPrivateFieldGet(this, _Balance_storage, "f").free
+        return this.#format(typeof this.#storage.free === "string"
+            ? BigInt(this.#storage.free)
+            : Array.isArray(this.#storage.free)
+                ? this.#storage.free
                     .map((reserve) => BigInt(reserve.amount))
                     .reduce((a, b) => a + b, BigInt("0"))
-                : BigInt(((_b = __classPrivateFieldGet(this, _Balance_storage, "f").free) === null || _b === void 0 ? void 0 : _b.amount) || "0"));
+                : BigInt(this.#storage.free?.amount || "0"));
     }
     /** The reserved balance of this token. Is included in the total. */
     get reserved() {
-        var _b;
-        return __classPrivateFieldGet(this, _Balance_format, "f").call(this, typeof __classPrivateFieldGet(this, _Balance_storage, "f").reserves === "string"
-            ? BigInt(__classPrivateFieldGet(this, _Balance_storage, "f").reserves)
-            : Array.isArray(__classPrivateFieldGet(this, _Balance_storage, "f").reserves)
-                ? __classPrivateFieldGet(this, _Balance_storage, "f").reserves
+        return this.#format(typeof this.#storage.reserves === "string"
+            ? BigInt(this.#storage.reserves)
+            : Array.isArray(this.#storage.reserves)
+                ? this.#storage.reserves
                     .map((reserve) => BigInt(reserve.amount))
                     .reduce((a, b) => a + b, BigInt("0"))
-                : BigInt(((_b = __classPrivateFieldGet(this, _Balance_storage, "f").reserves) === null || _b === void 0 ? void 0 : _b.amount) || "0"));
+                : BigInt(this.#storage.reserves?.amount || "0"));
     }
     /** The frozen balance of this token. Is included in the free amount. */
     get locked() {
-        var _b;
-        return __classPrivateFieldGet(this, _Balance_format, "f").call(this, typeof __classPrivateFieldGet(this, _Balance_storage, "f").locks === "string"
-            ? BigInt(__classPrivateFieldGet(this, _Balance_storage, "f").locks)
-            : Array.isArray(__classPrivateFieldGet(this, _Balance_storage, "f").locks)
-                ? __classPrivateFieldGet(this, _Balance_storage, "f").locks
+        return this.#format(typeof this.#storage.locks === "string"
+            ? BigInt(this.#storage.locks)
+            : Array.isArray(this.#storage.locks)
+                ? this.#storage.locks
                     .map((lock) => BigInt(lock.amount))
-                    .reduce((a, b) => util_1.BigMath.max(a, b), BigInt("0"))
-                : BigInt(((_b = __classPrivateFieldGet(this, _Balance_storage, "f").locks) === null || _b === void 0 ? void 0 : _b.amount) || "0"));
+                    .reduce((a, b) => BigMath.max(a, b), BigInt("0"))
+                : BigInt(this.#storage.locks?.amount || "0"));
     }
     /** @depreacted - use balance.locked */
     get frozen() {
@@ -350,122 +304,114 @@ class Balance {
     /** The transferable balance of this token. Is generally the free amount - the miscFrozen amount. */
     get transferable() {
         // if no locks exist, transferable is equal to the free amount
-        if (!__classPrivateFieldGet(this, _Balance_storage, "f").locks)
+        if (!this.#storage.locks)
             return this.free;
         // find the largest lock (but ignore any locks which are marked as `includeInTransferable`)
-        const excludeAmount = (0, balancetypes_1.excludeFromTransferableAmount)(__classPrivateFieldGet(this, _Balance_storage, "f").locks);
+        const excludeAmount = excludeFromTransferableAmount(this.#storage.locks);
         // subtract the lock from the free amount (but don't go below 0)
-        return __classPrivateFieldGet(this, _Balance_format, "f").call(this, util_1.BigMath.max(this.free.planck - excludeAmount, BigInt("0")));
+        return this.#format(BigMath.max(this.free.planck - excludeAmount, BigInt("0")));
     }
     /** 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 (!__classPrivateFieldGet(this, _Balance_storage, "f").locks)
+        if (!this.#storage.locks)
             return this.free;
         // find the largest lock which can't be used to pay tx fees
-        const excludeAmount = (0, balancetypes_1.excludeFromFeePayableLocks)(__classPrivateFieldGet(this, _Balance_storage, "f").locks)
+        const excludeAmount = excludeFromFeePayableLocks(this.#storage.locks)
             .map((lock) => BigInt(lock.amount))
-            .reduce((max, lock) => util_1.BigMath.max(max, lock), BigInt("0"));
+            .reduce((max, lock) => BigMath.max(max, lock), BigInt("0"));
         // subtract the lock from the free amount (but don't go below 0)
-        return __classPrivateFieldGet(this, _Balance_format, "f").call(this, util_1.BigMath.max(this.free.planck - excludeAmount, BigInt("0")));
+        return this.#format(BigMath.max(this.free.planck - excludeAmount, BigInt("0")));
     }
 }
-_Balance_storage = new WeakMap(), _Balance_db = new WeakMap(), _Balance_format = new WeakMap();
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balance.prototype, "total", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balance.prototype, "free", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balance.prototype, "reserved", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balance.prototype, "locked", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balance.prototype, "frozen", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balance.prototype, "transferable", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], Balance.prototype, "feePayable", null);
-exports.Balance = Balance;
-class BalanceFormatter {
+export class BalanceFormatter {
+    #planck;
+    #decimals;
+    #fiatRatios;
     constructor(planck, decimals, fiatRatios) {
-        _BalanceFormatter_planck.set(this, void 0);
-        _BalanceFormatter_decimals.set(this, void 0);
-        _BalanceFormatter_fiatRatios.set(this, void 0);
-        this.toJSON = () => __classPrivateFieldGet(this, _BalanceFormatter_planck, "f");
-        __classPrivateFieldSet(this, _BalanceFormatter_planck, typeof planck === "bigint" ? planck.toString() : planck !== null && planck !== void 0 ? planck : "0", "f");
-        __classPrivateFieldSet(this, _BalanceFormatter_decimals, decimals || 0, "f");
-        __classPrivateFieldSet(this, _BalanceFormatter_fiatRatios, fiatRatios || null, "f");
-        this.fiat = (0, memoize_1.default)(this.fiat);
+        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() {
-        return BigInt(__classPrivateFieldGet(this, _BalanceFormatter_planck, "f"));
+        return BigInt(this.#planck);
     }
     get tokens() {
-        return (0, util_1.planckToTokens)(__classPrivateFieldGet(this, _BalanceFormatter_planck, "f"), __classPrivateFieldGet(this, _BalanceFormatter_decimals, "f"));
+        return planckToTokens(this.#planck, this.#decimals);
     }
     fiat(currency) {
-        if (!__classPrivateFieldGet(this, _BalanceFormatter_fiatRatios, "f"))
+        if (!this.#fiatRatios)
             return null;
-        const ratio = __classPrivateFieldGet(this, _BalanceFormatter_fiatRatios, "f")[currency];
+        const ratio = this.#fiatRatios[currency];
         if (!ratio)
             return null;
         return parseFloat(this.tokens) * ratio;
     }
 }
-_BalanceFormatter_planck = new WeakMap(), _BalanceFormatter_decimals = new WeakMap(), _BalanceFormatter_fiatRatios = new WeakMap();
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], BalanceFormatter.prototype, "tokens", null);
-exports.BalanceFormatter = BalanceFormatter;
-class FiatSumBalancesFormatter {
+export class FiatSumBalancesFormatter {
+    #balances;
+    #currency;
     constructor(balances, currency) {
-        _FiatSumBalancesFormatter_balances.set(this, void 0);
-        _FiatSumBalancesFormatter_currency.set(this, void 0);
-        _FiatSumBalancesFormatter_sum.set(this, (balanceField) => {
-            // a function to get a fiat amount from a balance
-            const fiat = (balance) => balance[balanceField].fiat(__classPrivateFieldGet(this, _FiatSumBalancesFormatter_currency, "f")) || 0;
-            // a function to add two amounts
-            const sum = (a, b) => a + b;
-            return [...__classPrivateFieldGet(this, _FiatSumBalancesFormatter_balances, "f")].reduce((total, balance) => sum(
-            // add the total amount...
-            total, 
-            // ...to the fiat amount of each balance
-            fiat(balance)), 
-            // start with a total of 0
-            0);
-        }
-        /**
-         * The total balance of these tokens. Includes the free and the reserved amount.
-         */
-        );
-        __classPrivateFieldSet(this, _FiatSumBalancesFormatter_balances, balances, "f");
-        __classPrivateFieldSet(this, _FiatSumBalancesFormatter_currency, currency, "f");
-        __classPrivateFieldSet(this, _FiatSumBalancesFormatter_sum, (0, memoize_1.default)(__classPrivateFieldGet(this, _FiatSumBalancesFormatter_sum, "f")), "f");
-    }
+        this.#balances = balances;
+        this.#currency = currency;
+        this.#sum = memoize(this.#sum);
+    }
+    #sum = (balanceField) => {
+        // a function to get a fiat amount from a balance
+        const fiat = (balance) => balance[balanceField].fiat(this.#currency) || 0;
+        // a function to add two amounts
+        const sum = (a, b) => a + b;
+        return [...this.#balances].reduce((total, balance) => sum(
+        // add the total amount...
+        total, 
+        // ...to the fiat amount of each balance
+        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 __classPrivateFieldGet(this, _FiatSumBalancesFormatter_sum, "f").call(this, "total");
+        return this.#sum("total");
     }
     /** The non-reserved balance of these tokens. Includes the frozen amount. Is included in the total. */
     get free() {
-        return __classPrivateFieldGet(this, _FiatSumBalancesFormatter_sum, "f").call(this, "free");
+        return this.#sum("free");
     }
     /** The reserved balance of these tokens. Is included in the total. */
     get reserved() {
-        return __classPrivateFieldGet(this, _FiatSumBalancesFormatter_sum, "f").call(this, "reserved");
+        return this.#sum("reserved");
     }
     /** The frozen balance of these tokens. Is included in the free amount. */
     get locked() {
-        return __classPrivateFieldGet(this, _FiatSumBalancesFormatter_sum, "f").call(this, "locked");
+        return this.#sum("locked");
     }
     /** @deprecated - use balances.locked */
     get frozen() {
@@ -473,45 +419,41 @@ class FiatSumBalancesFormatter {
     }
     /** The transferable balance of these tokens. Is generally the free amount - the miscFrozen amount. */
     get transferable() {
-        return __classPrivateFieldGet(this, _FiatSumBalancesFormatter_sum, "f").call(this, "transferable");
+        return this.#sum("transferable");
     }
     /** The feePayable balance of these tokens. Is generally the free amount - the feeFrozen amount. */
     get feePayable() {
-        return __classPrivateFieldGet(this, _FiatSumBalancesFormatter_sum, "f").call(this, "feePayable");
+        return this.#sum("feePayable");
     }
 }
-_FiatSumBalancesFormatter_balances = new WeakMap(), _FiatSumBalancesFormatter_currency = new WeakMap(), _FiatSumBalancesFormatter_sum = new WeakMap();
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], FiatSumBalancesFormatter.prototype, "total", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], FiatSumBalancesFormatter.prototype, "free", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], FiatSumBalancesFormatter.prototype, "reserved", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], FiatSumBalancesFormatter.prototype, "locked", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], FiatSumBalancesFormatter.prototype, "frozen", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], FiatSumBalancesFormatter.prototype, "transferable", null);
 __decorate([
-    (0, typescript_memoize_1.Memoize)()
+    Memoize()
 ], FiatSumBalancesFormatter.prototype, "feePayable", null);
-exports.FiatSumBalancesFormatter = FiatSumBalancesFormatter;
-class SumBalancesFormatter {
+export class SumBalancesFormatter {
+    #balances;
     constructor(balances) {
-        _SumBalancesFormatter_balances.set(this, void 0);
-        __classPrivateFieldSet(this, _SumBalancesFormatter_balances, balances, "f");
-        this.fiat = (0, memoize_1.default)(this.fiat);
+        this.#balances = balances;
+        this.fiat = memoize(this.fiat);
     }
     fiat(currency) {
-        return new FiatSumBalancesFormatter(__classPrivateFieldGet(this, _SumBalancesFormatter_balances, "f"), currency);
+        return new FiatSumBalancesFormatter(this.#balances, currency);
     }
 }
-exports.SumBalancesFormatter = SumBalancesFormatter;
-_SumBalancesFormatter_balances = new WeakMap();

package/dist/types/balancetypes.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.includeInTotalExtraAmount = exports.excludeFromFeePayableLocks = exports.excludeFromTransferableAmount = void 0;
-const util_1 = require("@talismn/util");
-function excludeFromTransferableAmount(locks) {
+import { BigMath } from "@talismn/util";
+export function excludeFromTransferableAmount(locks) {
     if (typeof locks === "string")
         return BigInt(locks);
     if (!Array.isArray(locks))
@@ -10,18 +7,16 @@ function excludeFromTransferableAmount(locks) {
     return locks
         .filter((lock) => lock.includeInTransferable !== true)
         .map((lock) => BigInt(lock.amount))
-        .reduce((max, lock) => util_1.BigMath.max(max, lock), BigInt("0"));
+        .reduce((max, lock) => BigMath.max(max, lock), BigInt("0"));
 }
-exports.excludeFromTransferableAmount = excludeFromTransferableAmount;
-function excludeFromFeePayableLocks(locks) {
+export function excludeFromFeePayableLocks(locks) {
     if (typeof locks === "string")
         return [];
     if (!Array.isArray(locks))
         locks = [locks];
     return locks.filter((lock) => lock.excludeFromFeePayable);
 }
-exports.excludeFromFeePayableLocks = excludeFromFeePayableLocks;
-function includeInTotalExtraAmount(extra) {
+export function includeInTotalExtraAmount(extra) {
     if (!extra)
         return BigInt("0");
     if (!Array.isArray(extra))
@@ -31,4 +26,3 @@ function includeInTotalExtraAmount(extra) {
         .map((extra) => BigInt(extra.amount))
         .reduce((a, b) => a + b, BigInt("0"));
 }
-exports.includeInTotalExtraAmount = includeInTotalExtraAmount;

package/dist/types/index.js

@@ -1,20 +1,4 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./addresses"), exports);
-__exportStar(require("./balances"), exports);
-__exportStar(require("./balancetypes"), exports);
-__exportStar(require("./subscriptions"), exports);
+export * from "./addresses";
+export * from "./balances";
+export * from "./balancetypes";
+export * from "./subscriptions";

package/dist/types/subscriptions.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/balances",
-  "version": "0.1.19",
+  "version": "0.2.1",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "UNLICENSED",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@talismn/chain-connector": "^0.1.10",
-    "@talismn/chain-connector-evm": "^0.1.10",
+    "@talismn/chain-connector-evm": "^0.2.0",
     "@talismn/chaindata-provider": "^0.1.10",
     "@talismn/token-rates": "^0.1.10",
     "@talismn/util": "^0.1.4",