@defillama/sdk 5.0.209 → 5.0.212

package/build/Balances.d.ts

@@ -3,6 +3,10 @@ import { Chain } from "./general";
 type BalancesOptions = {
     skipChain?: boolean;
     label?: string;
+    tags?: string[];
+    tag?: string;
+    id?: string;
+    isUSDValue?: boolean;
 };
 type BalancesOptionsWithLabel = BalancesOptions | string;
 export declare class Balances {
@@ -13,6 +17,10 @@ export declare class Balances {
     _breakdownBalances: {
         [key: string]: Balances;
     };
+    _taggedBalances: {
+        [tag: string]: Balances;
+    };
+    _usdBalances: BalancesV1;
     constructor(params: {
         chain?: Chain | string;
         timestamp?: number;
@@ -45,6 +53,9 @@ export declare class Balances {
         labelBreakdown?: {
             [key: string]: number;
         };
+        tagBreakdown?: {
+            [key: string]: number;
+        };
         debugData?: {
             tokenData: {
                 balance: string | number;
@@ -67,6 +78,9 @@ export declare class Balances {
         labelBreakdown?: {
             [key: string]: number;
         };
+        tagBreakdown?: {
+            [key: string]: number;
+        };
         debugData?: {
             tokenData: {
                 balance: string | number;
@@ -109,10 +123,17 @@ export declare class Balances {
     _breakdownBalancesAction(action: string, args?: any[]): Promise<{
         [key: string]: any;
     }>;
+    _taggedBalancesAction(action: string, args?: any[]): Promise<{
+        [key: string]: any;
+    }>;
     hasBreakdownBalances(): boolean;
+    hasTaggedBalances(): boolean;
     isEmpty(): boolean;
     getBreakdownBalances(): {
         [key: string]: Balances;
     };
+    getTaggedBalances(): {
+        [tag: string]: Balances;
+    };
 }
 export default Balances;

package/build/Balances.js

@@ -27,6 +27,11 @@ function getOptions({ optionsOrLabel = {}, options = {} } = {}) {
         label,
     };
 }
+// Duck-type check that also works across module boundaries (when the same package
+// is loaded from two different node_modules copies, `instanceof Balances` returns false).
+function isLlamaBalancesObject(o) {
+    return typeof o === 'object' && o !== null && o._llamaBalancesObject === true;
+}
 class Balances {
     constructor(params) {
         var _a;
@@ -34,11 +39,15 @@ class Balances {
         this.timestamp = params.timestamp;
         this._balances = {};
         this._breakdownBalances = {};
+        this._taggedBalances = {};
+        this._usdBalances = {};
         this._llamaBalancesObject = true;
     }
     _add(token, balance, optionsOrLabel, options) {
         var _a;
-        const { label, skipChain } = getOptions({ optionsOrLabel, options });
+        const { label, skipChain, tag, tags = [], isUSDValue } = getOptions({ optionsOrLabel, options });
+        if (tag && typeof tag === 'string' && !tags.includes(tag))
+            tags.push(tag);
         token = token.replace(/\//g, ':');
         const isIBCToken = token.startsWith('ibc:');
         let chain = this.chain;
@@ -53,14 +62,26 @@ class Balances {
         if (!skipChain && this.chain === 'starknet' && token.length === 65) {
             token = token.replace('0x', '0x0');
         }
-        (0, generalUtil_1.sumSingleBalance)(this._balances, token, balance, chain);
+        if (isUSDValue) {
+            (0, generalUtil_1.sumSingleBalance)(this._usdBalances, token, balance, chain);
+        }
+        else {
+            (0, generalUtil_1.sumSingleBalance)(this._balances, token, balance, chain);
+        }
         if (label) {
             this._breakdownBalances[label] = (_a = this._breakdownBalances[label]) !== null && _a !== void 0 ? _a : new Balances({ chain: this.chain, timestamp: this.timestamp });
-            this._breakdownBalances[label]._add(token, balance, { skipChain });
+            this._breakdownBalances[label]._add(token, balance, { skipChain, isUSDValue });
+        }
+        if (tags.length > 0) {
+            tags.forEach((tag) => {
+                var _a;
+                this._taggedBalances[tag] = (_a = this._taggedBalances[tag]) !== null && _a !== void 0 ? _a : new Balances({ chain: this.chain, timestamp: this.timestamp });
+                this._taggedBalances[tag]._add(token, balance, { skipChain, isUSDValue });
+            });
         }
     }
     add(token, balance, optionsOrLabel, options) {
-        if (token instanceof Balances) {
+        if (isLlamaBalancesObject(token)) {
             if (typeof optionsOrLabel === 'string')
                 throw new Error('When adding a Balances instance, optionsOrLabel must be an object with options, not a string');
             this.addBalances(token, balance, optionsOrLabel);
@@ -103,6 +124,10 @@ class Balances {
     }
     addUSDValue(balance, optionsOrLabel, options) {
         options = getOptions({ optionsOrLabel, options });
+        if (options.id) {
+            this.add(options.id, balance, { ...options, isUSDValue: true, skipChain: true });
+            return;
+        }
         this.addCGToken('tether', balance, { ...options, skipChain: true });
     }
     addTokens(tokens, balances, optionsOrLabel, options) {
@@ -116,22 +141,37 @@ class Balances {
         tokens.forEach((v, i) => this._add(v, balances[i], options));
     }
     addBalances(balances, optionsOrLabel, options) {
-        var _a;
+        var _a, _b;
         options = getOptions({ optionsOrLabel, options });
-        if (balances instanceof Balances) {
-            if (balances === this)
+        if (isLlamaBalancesObject(balances)) {
+            const balancesInstance = balances;
+            if (balancesInstance === this)
                 return;
             // if balances object has breakdown by label, and overall label is not set, we copy existing breakdown balances into this instance
-            if (balances.hasBreakdownBalances() && !options.skipBreakdown && !options.label) {
+            if (balancesInstance.hasBreakdownBalances() && !options.skipBreakdown && !options.label) {
                 this._breakdownBalances = (_a = this._breakdownBalances) !== null && _a !== void 0 ? _a : {};
                 const { label, ...restOptions } = options;
-                Object.entries(balances.getBreakdownBalances()).forEach(([label, breakdown]) => {
+                Object.entries(balancesInstance.getBreakdownBalances()).forEach(([label, breakdown]) => {
                     var _a;
                     this._breakdownBalances[label] = (_a = this._breakdownBalances[label]) !== null && _a !== void 0 ? _a : new Balances({ chain: this.chain, timestamp: this.timestamp });
                     this._breakdownBalances[label].addBalances(breakdown, restOptions);
                 });
             }
-            balances = balances.getBalances();
+            if (balancesInstance.hasTaggedBalances()) {
+                this._taggedBalances = (_b = this._taggedBalances) !== null && _b !== void 0 ? _b : {};
+                const { label, ...restOptions } = options;
+                Object.entries(balancesInstance.getTaggedBalances()).forEach(([tag, taggedBalance]) => {
+                    var _a;
+                    this._taggedBalances[tag] = (_a = this._taggedBalances[tag]) !== null && _a !== void 0 ? _a : new Balances({ chain: this.chain, timestamp: this.timestamp });
+                    this._taggedBalances[tag].addBalances(taggedBalance, restOptions);
+                });
+            }
+            if (Object.keys(balancesInstance._usdBalances).length > 0) {
+                Object.entries(balancesInstance._usdBalances).forEach(([token, balance]) => {
+                    this._add(token, balance, { ...options, skipChain: true, isUSDValue: true });
+                });
+            }
+            balances = balancesInstance.getBalances();
         }
         if (balances === this._balances)
             return;
@@ -146,18 +186,32 @@ class Balances {
             if (regex.test(i))
                 delete this._balances[i];
         });
+        Object.keys(this._usdBalances).forEach((i) => {
+            if (regex.test(i))
+                delete this._usdBalances[i];
+        });
         this._breakdownBalancesAction('removeTokenBalance', [token]);
+        this._taggedBalancesAction('removeTokenBalance', [token]);
     }
     async getUSDValue() {
-        const { usdTvl } = await (0, computeTVL_1.default)(this.getBalances(), this.timestamp);
+        let { usdTvl } = await (0, computeTVL_1.default)(this.getBalances(), this.timestamp);
+        usdTvl = Object.values(this._usdBalances).reduce((a, b) => a + b, usdTvl);
         return usdTvl;
     }
     async getUSDString() {
         return Number(await this.getUSDValue()).toFixed(0);
     }
     async getUSDJSONs({ debug = false, debugOptions: { printTokenTable = true, minTokenUSDValue } = {} } = {}) {
-        const { usdTvl, usdTokenBalances, debugData } = await (0, computeTVL_1.default)(this.getBalances(), this.timestamp, { debug });
+        let { usdTvl, usdTokenBalances, debugData } = await (0, computeTVL_1.default)(this.getBalances(), this.timestamp, { debug });
         const response = { usdTvl, usdTokenBalances, rawTokenBalances: this.getBalances(), labelBreakdown: {} };
+        // add the USD value of tokens that were directly added as USD value (instead of raw token balances that need to be converted to USD value using price cache)
+        Object.entries(this._usdBalances).forEach(([symbol, balance]) => {
+            usdTvl += Number(balance);
+            (0, generalUtil_1.sumSingleBalance)(usdTokenBalances, symbol, balance);
+            // skipping it from debug table, unlikely that we would mix raw token balances and direct USD value in the same Balances instance, but if we do, it's cleaner to skip these from debug table since they are already in USD value and don't have price/confidence/decimals data
+            // if (debug && !isNaN(Number(balance))) debugData.tokenData.push({ symbol, value: Number(balance), token: symbol, price: 1, confidence: 1, balance, decimals: 0 })
+        });
+        response.usdTvl = usdTvl;
         if (debug) {
             response.debugData = debugData;
             if (!minTokenUSDValue && minTokenUSDValue !== 0) {
@@ -178,11 +232,18 @@ class Balances {
             });
             debugData.tokenData = tokenData;
         }
-        if (!this.hasBreakdownBalances())
-            return response;
-        for (const [label, breakdown] of Object.entries(this.getBreakdownBalances())) {
-            const breakdownUSD = await breakdown.getUSDValue();
-            response.labelBreakdown[label] = breakdownUSD;
+        if (this.hasBreakdownBalances()) {
+            for (const [label, breakdown] of Object.entries(this.getBreakdownBalances())) {
+                const breakdownUSD = await breakdown.getUSDValue();
+                response.labelBreakdown[label] = breakdownUSD;
+            }
+        }
+        if (this.hasTaggedBalances()) {
+            response.tagBreakdown = {};
+            for (const [tag, taggedBalance] of Object.entries(this.getTaggedBalances())) {
+                const taggedUSD = await taggedBalance.getUSDValue();
+                response.tagBreakdown[tag] = taggedUSD;
+            }
         }
         return response;
     }
@@ -193,7 +254,11 @@ class Balances {
         Object.keys(this._balances).forEach((token) => {
             this._balances[token] = Number(this._balances[token]) * ratio;
         });
+        Object.keys(this._usdBalances).forEach((token) => {
+            this._usdBalances[token] = Number(this._usdBalances[token]) * ratio;
+        });
         this._breakdownBalancesAction('resizeBy', [ratio]);
+        this._taggedBalancesAction('resizeBy', [ratio]);
         return this;
     }
     static async getUSDValue(balances, timestamp) {
@@ -219,10 +284,14 @@ class Balances {
     }
     subtract(balances, optionsOrLabel, options) {
         options = getOptions({ optionsOrLabel, options });
-        if (typeof balances === 'object' && balances !== null && balances._llamaBalancesObject) {
+        if (isLlamaBalancesObject(balances)) {
             if (balances === this)
                 return;
-            balances = balances.getBalances();
+            const balancesInstance = balances;
+            Object.entries(balancesInstance._usdBalances).forEach(([token, balance]) => {
+                this._add(token, Number(balance) * -1, { skipChain: true, label: options.label, isUSDValue: true });
+            });
+            balances = balancesInstance.getBalances();
         }
         Object.entries(balances).forEach(([token, balance]) => {
             this._add(token, Number(balance) * -1, { skipChain: true, label: options.label });
@@ -237,9 +306,12 @@ class Balances {
             if (Number(this._balances[token]) <= 0)
                 delete this._balances[token];
         });
-        if (this._breakdownBalances) {
-            Object.values(this._breakdownBalances).forEach((breakdown) => breakdown.removeNegativeBalances());
-        }
+        Object.keys(this._usdBalances).forEach((token) => {
+            if (Number(this._usdBalances[token]) <= 0)
+                delete this._usdBalances[token];
+        });
+        this._breakdownBalancesAction('removeNegativeBalances');
+        this._taggedBalancesAction('removeNegativeBalances');
     }
     async _breakdownBalancesAction(action, args = []) {
         if (!this._breakdownBalances)
@@ -256,15 +328,36 @@ class Balances {
         }
         return response;
     }
+    async _taggedBalancesAction(action, args = []) {
+        if (!this._taggedBalances)
+            return {};
+        const response = {};
+        const entries = Object.entries(this._taggedBalances);
+        for (const [label, breakdown] of entries) {
+            if (typeof breakdown[action] === 'function') {
+                response[label] = breakdown[action](...args);
+                if (response[label] instanceof Promise) {
+                    response[label] = await response[label];
+                }
+            }
+        }
+        return response;
+    }
     hasBreakdownBalances() {
         return Object.keys(this._breakdownBalances).length > 0 && Object.values(this._breakdownBalances).some(b => !b.isEmpty());
     }
+    hasTaggedBalances() {
+        return Object.keys(this._taggedBalances).length > 0 && Object.values(this._taggedBalances).some(b => !b.isEmpty());
+    }
     isEmpty() {
-        return Object.keys(this._balances).length === 0;
+        return Object.keys(this._balances).length === 0 && Object.keys(this._usdBalances).length === 0;
     }
     getBreakdownBalances() {
         return this._breakdownBalances;
     }
+    getTaggedBalances() {
+        return this._taggedBalances;
+    }
 }
 exports.Balances = Balances;
 exports.default = Balances;

package/build/ChainApi.d.ts

@@ -95,6 +95,9 @@ export declare class ChainApi {
         labelBreakdown?: {
             [key: string]: number;
         };
+        tagBreakdown?: {
+            [key: string]: number;
+        };
         debugData?: {
             tokenData: {
                 balance: string | number;

package/build/abi/multicall.js

@@ -371,6 +371,7 @@ function multicallAddress(chainId) {
         case 728126428: return 'TEazPvZwDjDtFeJupyo7QunvnrnUjPH8ED'; // silicon_zk
         case 1110: return '0x114575812CF34299cd65BD251C798608fa805433'; // grx
         case 1990: return '0xfD4014ba4dDB610A1587501378Fa52eee6C3a07B'; // qiev3
+        case 38833: return '0x7B2Fa3e6CE90Ce6037395630a4C6DF45B7ef25Af'; // igra
         default:
             return null;
     }

package/build/abi/multicall3.js

@@ -214,6 +214,7 @@ const DEPLOYMENT_BLOCK = {
     tempo: 1,
     edegex: 1,
     wchain: 2207643,
+    fluent: 754598
 };
 async function makeMultiCall(functionABI, calls, chain, block) {
     if (!functionABI)
@@ -324,7 +325,6 @@ const CUSTOM_MULTICALL_ADDRESSES = {
     'taiko': '0xcb2436774C3e191c85056d248EF4260ce5f27A9D',
     'qom': '0x7A52370716ea730585884F5BDB0f6E60C39b8C64',
     'matchain': '0xDa91510Bd8c50bfa54FC2BE2dD6dAbE03eA8496c',
-    'morph': '0x33A213b1049D5AD2eeE6e61dAe040955e60383D4',
     'ace': '0x025A2B4fCE1E0bD736D5cebe6C8a52229795376B',
     'sophon': '0x5f4867441d2416cA88B1b3fd38f21811680CD2C8',
     'vana': '0xFe92b91F3326e58557478c28EeAe1936E0c7148a',

package/build/generalUtil.d.ts

@@ -1,7 +1,8 @@
 import * as blocks from "./computeTVL/blocks";
+import * as discord from "./util/discord";
 import * as humanizeNumber from "./computeTVL/humanizeNumber";
 export { sliceIntoChunks, normalizeAddress, getTimestamp, tableToString, } from "./util";
 export { isEvmChain, getEVMChainSet, getEVMProvidersConfigMap, } from "./util/LlamaProvider";
 export { runInPromisePool } from "./util/promisePool";
 export { sumMultiBalanceOf, sumSingleBalance, mergeBalances, removeTokenBalance, sumChainTvls, getUniqueAddresses, convertToBigInt, getProviderUrl, formError, formErrorString, shortenString, fetchJson, postJson, tronToEvmAddress, evmToTronAddress, sleep, sleepRandom, getHash, } from './util/common';
-export { blocks, humanizeNumber, };
+export { blocks, humanizeNumber, discord, };

package/build/generalUtil.js

@@ -33,9 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.humanizeNumber = exports.blocks = exports.getHash = exports.sleepRandom = exports.sleep = exports.evmToTronAddress = exports.tronToEvmAddress = exports.postJson = exports.fetchJson = exports.shortenString = exports.formErrorString = exports.formError = exports.getProviderUrl = exports.convertToBigInt = exports.getUniqueAddresses = exports.sumChainTvls = exports.removeTokenBalance = exports.mergeBalances = exports.sumSingleBalance = exports.sumMultiBalanceOf = exports.runInPromisePool = exports.getEVMProvidersConfigMap = exports.getEVMChainSet = exports.isEvmChain = exports.tableToString = exports.getTimestamp = exports.normalizeAddress = exports.sliceIntoChunks = void 0;
+exports.discord = exports.humanizeNumber = exports.blocks = exports.getHash = exports.sleepRandom = exports.sleep = exports.evmToTronAddress = exports.tronToEvmAddress = exports.postJson = exports.fetchJson = exports.shortenString = exports.formErrorString = exports.formError = exports.getProviderUrl = exports.convertToBigInt = exports.getUniqueAddresses = exports.sumChainTvls = exports.removeTokenBalance = exports.mergeBalances = exports.sumSingleBalance = exports.sumMultiBalanceOf = exports.runInPromisePool = exports.getEVMProvidersConfigMap = exports.getEVMChainSet = exports.isEvmChain = exports.tableToString = exports.getTimestamp = exports.normalizeAddress = exports.sliceIntoChunks = void 0;
 const blocks = __importStar(require("./computeTVL/blocks"));
 exports.blocks = blocks;
+const discord = __importStar(require("./util/discord"));
+exports.discord = discord;
 const humanizeNumber = __importStar(require("./computeTVL/humanizeNumber"));
 exports.humanizeNumber = humanizeNumber;
 var util_1 = require("./util");