curvance 4.1.2 → 5.1.0

package/dist/classes/DexAggregators/helpers.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSimpleZapQuote = createSimpleZapQuote;
+exports.buildLocalSimpleZapTokens = buildLocalSimpleZapTokens;
+const helpers_1 = require("../../helpers");
+const ERC20_1 = require("../ERC20");
+const FormatConverter_1 = __importDefault(require("../FormatConverter"));
+function createSimpleZapQuote(provider, account, quoteFn, resolveFee) {
+    return async (tokenIn, tokenOut, amount, slippage) => {
+        const wallet = account ?? helpers_1.EMPTY_ADDRESS;
+        const erc20In = new ERC20_1.ERC20(provider, tokenIn, undefined, undefined, null);
+        const decimalsIn = erc20In.decimals ?? await erc20In.contract.decimals();
+        const amountBigInt = (0, helpers_1.toBigInt)(amount, decimalsIn);
+        const erc20Out = new ERC20_1.ERC20(provider, tokenOut, undefined, undefined, null);
+        const decimalsOut = erc20Out.decimals ?? await erc20Out.contract.decimals();
+        const fee = resolveFee?.(tokenIn, tokenOut, amountBigInt) ?? { feeBps: 0n };
+        const results = await quoteFn(wallet, tokenIn, tokenOut, amountBigInt, FormatConverter_1.default.percentageToBps(slippage), fee.feeBps, fee.feeReceiver);
+        return {
+            minOut_raw: results.min_out,
+            output_raw: results.out,
+            minOut: FormatConverter_1.default.bigIntToDecimal(results.min_out, decimalsOut),
+            output: FormatConverter_1.default.bigIntToDecimal(results.out, decimalsOut),
+            extra: results.raw,
+        };
+    };
+}
+function buildLocalSimpleZapTokens(markets, provider, query, account, quoteFn, resolveFee) {
+    const zapTokens = [];
+    const seen = new Set();
+    for (const market of markets) {
+        for (const token of market.tokens) {
+            const asset = token.getAsset(true);
+            const assetKey = asset.address.toLowerCase();
+            if (seen.has(assetKey)) {
+                continue;
+            }
+            seen.add(assetKey);
+            if (query) {
+                const lowerQuery = query.toLowerCase();
+                if (!token.name.toLowerCase().includes(lowerQuery) &&
+                    !token.symbol.toLowerCase().includes(lowerQuery)) {
+                    continue;
+                }
+            }
+            zapTokens.push({
+                interface: asset,
+                type: "simple",
+                quote: createSimpleZapQuote(provider, account, quoteFn, resolveFee),
+            });
+        }
+    }
+    return zapTokens;
+}
+//# sourceMappingURL=helpers.js.map

package/dist/classes/DexAggregators/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/classes/DexAggregators/helpers.ts"],"names":[],"mappings":"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"}

package/dist/classes/DexAggregators/index.d.ts

@@ -1,4 +1,6 @@
+export type { default as IDexAgg, Quote, QuoteArgs } from './IDexAgg';
 export * from './Kuru';
 export * from './KyberSwap';
 export * from './MultiDexAgg';
+export * from './UnsupportedDexAgg';
 //# sourceMappingURL=index.d.ts.map

package/dist/classes/DexAggregators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/classes/DexAggregators/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/classes/DexAggregators/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,IAAI,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtE,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC"}

package/dist/classes/DexAggregators/index.js

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Kuru"), exports);
 __exportStar(require("./KyberSwap"), exports);
 __exportStar(require("./MultiDexAgg"), exports);
+__exportStar(require("./UnsupportedDexAgg"), exports);
 //# sourceMappingURL=index.js.map

package/dist/classes/DexAggregators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/classes/DexAggregators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,8CAA4B;AAC5B,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/classes/DexAggregators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,yCAAuB;AACvB,8CAA4B;AAC5B,gDAA8B;AAC9B,sDAAoC"}

package/dist/classes/ERC20.d.ts

@@ -1,7 +1,7 @@
 import { TransactionResponse } from "ethers";
 import { Contract } from "ethers";
-import { StaticMarketAsset } from "./ProtocolReader";
-import { address, curvance_read_provider, curvance_signer, TokenInput, USD } from "../types";
+import type { StaticMarketAsset } from "./ProtocolReader";
+import { address, curvance_provider, curvance_read_provider, curvance_signer, TokenInput, USD } from "../types";
 import Decimal from "decimal.js";
 export interface IERC20 {
     balanceOf(account: address): Promise<bigint>;
@@ -20,7 +20,7 @@ export declare class ERC20 {
     contract: Contract & IERC20;
     cache: StaticMarketAsset | undefined;
     protected oracleManagerAddress: address | undefined;
-    constructor(provider: curvance_read_provider, address: address, cache?: StaticMarketAsset | undefined, oracleManagerAddress?: address | undefined, signer?: curvance_signer | null);
+    constructor(provider: curvance_provider, address: address, cache?: StaticMarketAsset | undefined, oracleManagerAddress?: address, signer?: curvance_signer | null);
     get name(): string | undefined;
     get symbol(): string | undefined;
     get decimals(): bigint | undefined;

package/dist/classes/ERC20.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ERC20.d.ts","sourceRoot":"","sources":["../../src/classes/ERC20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAG7F,OAAO,OAAO,MAAM,YAAY,CAAC;AAGjC,MAAM,WAAW,MAAM;IACnB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACpE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACxE,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1B,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChE;AAYD,qBAAa,KAAK;IACd,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC5B,KAAK,EAAE,iBAAiB,GAAG,SAAS,CAAa;IACjD,SAAS,CAAC,oBAAoB,EAAE,OAAO,GAAG,SAAS,CAAC;gBAGhD,QAAQ,EAAE,sBAAsB,EAChC,OAAO,EAAE,OAAO,EAChB,KAAK,GAAE,iBAAiB,GAAG,SAAqB,EAChD,oBAAoB,GAAE,OAAO,GAAG,SAAqB,EACrD,MAAM,GAAE,eAAe,GAAG,IAA0B;IAUxD,IAAI,IAAI,uBAA+B;IACvC,IAAI,MAAM,uBAAiC;IAC3C,IAAI,QAAQ,uBAAmC;IAC/C,IAAI,WAAW,uBAAsC;IACrD,IAAI,KAAK,uBAAgC;IACzC,IAAI,OAAO,wBAAmG;IAC9G,IAAI,KAAK,wBAAgC;IAEnC,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAC5C,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IACtE,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAQnE,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU;IAMxC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAIvC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAMnD,SAAS;IAMT,WAAW;IAMX,aAAa;IAMb,gBAAgB;IAMhB,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;IAI1C,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC7E,QAAQ,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAUvF,OAAO,CAAC,QAAQ;CAMnB"}
+{"version":3,"file":"ERC20.d.ts","sourceRoot":"","sources":["../../src/classes/ERC20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEhH,OAAO,OAAO,MAAM,YAAY,CAAC;AAWjC,MAAM,WAAW,MAAM;IACnB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACpE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACxE,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1B,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChE;AAaD,qBAAa,KAAK;IACd,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC5B,KAAK,EAAE,iBAAiB,GAAG,SAAS,CAAa;IACjD,SAAS,CAAC,oBAAoB,EAAE,OAAO,GAAG,SAAS,CAAC;gBAGhD,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,OAAO,EAChB,KAAK,GAAE,iBAAiB,GAAG,SAAqB,EAChD,oBAAoB,CAAC,EAAE,OAAO,EAC9B,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI;IAgBnC,IAAI,IAAI,uBAA+B;IACvC,IAAI,MAAM,uBAAiC;IAC3C,IAAI,QAAQ,uBAAmC;IAC/C,IAAI,WAAW,uBAAsC;IACrD,IAAI,KAAK,uBAAgC;IACzC,IAAI,OAAO,wBAAgH;IAC3H,IAAI,KAAK,wBAAgC;IAEnC,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAC5C,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IACtE,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAQnE,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU;IAOxC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAIvC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAOnD,SAAS;IAMT,WAAW;IAMX,aAAa;IAMb,gBAAgB;IAMhB,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;IAI1C,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC7E,QAAQ,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBvF,OAAO,CAAC,QAAQ;CAMnB"}

package/dist/classes/ERC20.js

@@ -5,10 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ERC20 = void 0;
 const helpers_1 = require("../helpers");
-const setup_1 = require("../setup");
 const OracleManager_1 = require("./OracleManager");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const FormatConverter_1 = __importDefault(require("./FormatConverter"));
+function getSetupConfig() {
+    return require("../setup").setup_config;
+}
+function resolveDefaultOracleManagerAddress() {
+    return getSetupConfig()?.contracts?.OracleManager;
+}
 const ERC20_ABI = [
     "function balanceOf(address owner) view returns (uint256)",
     "function transfer(address to, uint256 amount) returns (bool)",
@@ -16,6 +21,7 @@ const ERC20_ABI = [
     "function name() view returns (string)",
     "function symbol() view returns (string)",
     "function decimals() view returns (uint8)",
+    "function totalSupply() view returns (uint256)",
     "function allowance(address owner, address spender) view returns (uint256)",
 ];
 class ERC20 {
@@ -25,20 +31,24 @@ class ERC20 {
     contract;
     cache = undefined;
     oracleManagerAddress;
-    constructor(provider, address, cache = undefined, oracleManagerAddress = undefined, signer = setup_1.setup_config.signer) {
-        this.provider = provider;
-        this.signer = signer;
+    constructor(provider, address, cache = undefined, oracleManagerAddress, signer) {
+        const legacySigner = "address" in provider ? provider : null;
+        const resolvedProvider = legacySigner == null
+            ? provider
+            : (0, helpers_1.resolveReadProvider)(provider, `ERC20 ${address}`);
+        this.provider = resolvedProvider;
+        this.signer = signer ?? legacySigner ?? null;
         this.address = address;
         this.cache = cache;
-        this.oracleManagerAddress = oracleManagerAddress;
-        this.contract = (0, helpers_1.contractSetup)(provider, address, ERC20_ABI);
+        this.oracleManagerAddress = oracleManagerAddress ?? resolveDefaultOracleManagerAddress();
+        this.contract = (0, helpers_1.contractSetup)(resolvedProvider, address, ERC20_ABI);
     }
     get name() { return this.cache?.name; }
     get symbol() { return this.cache?.symbol; }
     get decimals() { return this.cache?.decimals; }
     get totalSupply() { return this.cache?.totalSupply; }
     get image() { return this.cache?.image; }
-    get balance() { return this.cache?.balance ? (0, helpers_1.toDecimal)(this.cache.balance, this.cache.decimals) : undefined; }
+    get balance() { return this.cache?.balance != undefined ? (0, helpers_1.toDecimal)(this.cache.balance, this.cache.decimals) : undefined; }
     get price() { return this.cache?.price; }
     async balanceOf(account, in_token_input = false) {
         const amount = await this.contract.balanceOf(account);
@@ -46,17 +56,19 @@ class ERC20 {
         return in_token_input ? FormatConverter_1.default.bigIntToDecimal(amount, decimals) : amount;
     }
     async transfer(to, amount) {
+        const signer = (0, helpers_1.requireSigner)(this.signer);
         const decimals = this.decimals ?? await this.contract.decimals();
         const tokens = (0, helpers_1.toBigInt)(amount, decimals);
-        return (0, helpers_1.contractSetup)((0, helpers_1.requireSigner)(this.signer), this.address, ERC20_ABI).transfer(to, tokens);
+        return (0, helpers_1.contractSetup)(signer, this.address, ERC20_ABI).transfer(to, tokens);
     }
     async rawTransfer(to, amount) {
         return (0, helpers_1.contractSetup)((0, helpers_1.requireSigner)(this.signer), this.address, ERC20_ABI).transfer(to, amount);
     }
     async approve(spender, amount) {
+        const signer = (0, helpers_1.requireSigner)(this.signer);
         const decimals = this.decimals ?? await this.fetchDecimals();
         const tokens = amount == null ? helpers_1.UINT256_MAX : (0, helpers_1.toBigInt)(amount, decimals);
-        return (0, helpers_1.contractSetup)((0, helpers_1.requireSigner)(this.signer), this.address, ERC20_ABI).approve(spender, tokens);
+        return (0, helpers_1.contractSetup)(signer, this.address, ERC20_ABI).approve(spender, tokens);
     }
     async fetchName() {
         const name = await this.contract.name();
@@ -82,7 +94,11 @@ class ERC20 {
         return this.contract.allowance(owner, spender);
     }
     async getPrice(inTokenInput, inUSD = true, getLower = false) {
-        const oracleManagerAddress = this.oracleManagerAddress ?? setup_1.setup_config.contracts.OracleManager;
+        const oracleManagerAddress = this.oracleManagerAddress;
+        if (oracleManagerAddress == undefined) {
+            throw new Error(`OracleManager address is not configured for ERC20 ${this.address}. ` +
+                `Pass oracleManagerAddress explicitly or initialize setupChain() before constructing this token.`);
+        }
         const oracle_manager = new OracleManager_1.OracleManager(oracleManagerAddress, this.provider);
         const price = await oracle_manager.getPrice(this.address, inUSD, getLower);
         return inTokenInput ? (0, decimal_js_1.default)(price).div(helpers_1.WAD) : price;

package/dist/classes/ERC20.js.map

@@ -1 +1 @@
-{"version":3,"file":"ERC20.js","sourceRoot":"","sources":["../../src/classes/ERC20.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ERC20.js","sourceRoot":"","sources":["../../src/classes/ERC20.ts"],"names":[],"mappings":"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"}

package/dist/classes/FormatConverter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormatConverter.d.ts","sourceRoot":"","sources":["../../src/classes/FormatConverter.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAGvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAChC;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;IAItC,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG;IAWvF;;;;;;;OAOG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,EAAE,EAAE,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,SAAS,EAAE,KAAK,GAAG,MAAM;IACzJ,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,EAAE,EAAE,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO;IAOzJ;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,GAAG;IAI/D;;;;;;OAMG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAW9F;;;;;;OAMG;IACH,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;IAO5F;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAUzE;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;IAa5E;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzC;;;;;;;;;;OAUG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM;IAIjD;;;;;;;;OAQG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM;IAKpD;;;;;;OAMG;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM;CAGrD"}
+{"version":3,"file":"FormatConverter.d.ts","sourceRoot":"","sources":["../../src/classes/FormatConverter.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAChC;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;IAItC,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG;IAWvF;;;;;;;OAOG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,EAAE,EAAE,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,SAAS,EAAE,KAAK,GAAG,MAAM;IACzJ,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,EAAE,EAAE,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO;IAOzJ;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,GAAG;IAI/D;;;;;;OAMG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAe9F;;;;;;OAMG;IACH,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;IAO5F;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAUzE;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;IAa5E;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzC;;;;;;;;;;OAUG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM;IAIjD;;;;;;;;OAQG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM;IAKpD;;;;;;OAMG;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM;CAGrD"}

package/dist/classes/FormatConverter.js

@@ -46,6 +46,9 @@ class FormatConverter {
         if (!decimal_js_1.default.isDecimal(price)) {
             price = this.bigIntToUsd(price);
         }
+        if (!price.isFinite() || price.lte(0)) {
+            throw new Error("Cannot convert USD to tokens with a non-positive or non-finite price.");
+        }
         if (typeof decimals === 'bigint') {
             decimals = Number(decimals);
         }
@@ -132,7 +135,7 @@ class FormatConverter {
      * @returns The BPS value as a bigint
      */
     static percentageToBps(value) {
-        return BigInt(value.mul(10_000).toFixed(0));
+        return BigInt(value.mul(10_000).floor().toFixed(0));
     }
     /**
      * Take a percentage value (Decimal) and convert it to BPS in WAD format.

package/dist/classes/FormatConverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormatConverter.js","sourceRoot":"","sources":["../../src/classes/FormatConverter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FormatConverter.js","sourceRoot":"","sources":["../../src/classes/FormatConverter.ts"],"names":[],"mappings":"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"}

package/dist/classes/Market.d.ts

@@ -1,13 +1,14 @@
 import { ChangeRate } from "../helpers";
 import { Contract } from "ethers";
-import { DynamicMarketData, ProtocolReader, StaticMarketData, UserMarket } from "./ProtocolReader";
+import { DynamicMarketData, ProtocolReader, StaticMarketData, UserMarket, UserMarketSummary } from "./ProtocolReader";
 import { AccountSnapshot, CToken } from "./CToken";
 import { Decimal } from "decimal.js";
 import { address, curvance_read_provider, curvance_signer, Percentage, TokenInput, USD } from "../types";
 import { OracleManager } from "./OracleManager";
-import { type SetupConfigSnapshot } from "../setup";
+import type { SetupConfigSnapshot } from "../setup";
 import { BorrowableCToken } from "./BorrowableCToken";
 import { IncentiveResponse, Incentives, MilestoneResponse, Milestones } from "./Api";
+import type { PositionManagerTypes } from "./PositionManager";
 export type MarketToken = CToken | BorrowableCToken;
 export type PluginTypes = 'zapper' | 'positionManager';
 export interface Plugins {
@@ -40,10 +41,10 @@ export interface HypotheticalLiquidityOf {
     loanSizeError: boolean;
     oracleError: boolean;
 }
+export type UserDataScope = "full" | "summary";
 export interface IMarket {
     accountAssets(account: address): Promise<bigint>;
     MIN_HOLD_PERIOD(): Promise<bigint>;
-    hypotheticalLiquidityOf(account: address, cTokenModified: address, redemptionShares: bigint, borrowAssets: bigint): Promise<HypotheticalLiquidityOf>;
     statusOf(account: address): Promise<StatusOf>;
 }
 export declare class Market {
@@ -64,8 +65,14 @@ export declare class Market {
     };
     milestone: MilestoneResponse | null;
     incentives: Array<IncentiveResponse>;
+    private _userDataScope?;
     constructor(provider: curvance_read_provider, signer: curvance_signer | null, account: address | null, static_data: StaticMarketData, dynamic_data: DynamicMarketData, user_data: UserMarket, deploy_data: DeployData, oracle_manager: OracleManager, reader: ProtocolReader, setup: SetupConfigSnapshot);
     private getAccountOrThrow;
+    assertRefreshAccountCompatible(account: address, allowSignerMismatch?: boolean): void;
+    bindRefreshedAccount(account: address, allowSignerMismatch?: boolean): void;
+    private requireFullUserTokenData;
+    private requireValidCachedUserHealth;
+    private cooldownDateFromUnlockTime;
     /** @returns {string} - The name of the market at deployment. */
     get name(): string;
     /** @returns {Plugins} - The address of the market's plugins by deploy name. */
@@ -76,6 +83,8 @@ export declare class Market {
     get adapters(): bigint[];
     /** @returns {Date | null} - Market cooldown, activated by Collateralization or Borrowing. Lasts as long as {this.cooldownLength} which is currently 20mins */
     get cooldown(): Date | null;
+    /** @returns The scope of the latest whole-market user refresh. */
+    get userDataScope(): UserDataScope;
     /** @returns {Decimal} - The user's collateral in Shares. */
     get userCollateral(): Decimal;
     /** @returns {USD} - The user's debt in USD. */
@@ -104,8 +113,12 @@ export declare class Market {
         min: Decimal;
         max: Decimal;
     };
-    /** @returns Total market deposits */
-    get tvl(): Decimal;
+    /** @returns Total market deposits in USD, summed across the market's tokens.
+     *  Renamed from `tvl` to match the sibling getter naming
+     *  (`totalDebt`, `totalCollateral`). Backed by the per-token
+     *  `getDeposits` (which now values via `totalAssets`, not `totalSupply`,
+     *  so the liquidity ≤ deposits invariant holds). */
+    get totalDeposits(): Decimal;
     /** @returns Total market debt */
     get totalDebt(): Decimal;
     /** @returns Total market collateral */
@@ -153,11 +166,27 @@ export declare class Market {
      */
     getSnapshots(account: address): Promise<AccountSnapshot[]>;
     hasUserActivity(): boolean;
+    private requireRefreshTokenRows;
+    private requireRefreshMarketAddress;
+    private validateStateRows;
+    validateRefreshState(dynamicData: DynamicMarketData, userData?: UserMarket): void;
+    private static requireMarketRow;
     applyState(dynamicData: DynamicMarketData, userData?: UserMarket): void;
+    applyUserSummary(userData: UserMarketSummary): void;
     reloadMarketData(): Promise<void>;
-    reloadUserData(account: address): Promise<void>;
+    reloadUserData(account: address, options?: {
+        allowSignerMismatch?: boolean;
+    }): Promise<void>;
+    reloadUserSummary(account: address): Promise<void>;
     static getActiveUserMarkets(markets: Market[]): Market[];
+    private static groupByReaderDeployment;
     static reloadUserMarkets(markets: Market[], account: address): Promise<Market[]>;
+    static reloadUserMarketSummaries(markets: Market[], account: address): Promise<Market[]>;
+    private static buildDeployDataIndex;
+    private static buildYieldIndex;
+    private static buildMarketPayloadIndex;
+    private static requireTokenRow;
+    private static mergeTokenPayloads;
     /**
      * Preview the impact of the user descision for their deposit/borrow/leverage
      * @param user - Wallet address
@@ -189,7 +218,8 @@ export declare class Market {
      */
     previewPositionHealthLeverageDeposit(deposit_ctoken: CToken, deposit_amount: TokenInput, borrow_ctoken: BorrowableCToken, borrow_amount: TokenInput): Promise<Decimal | null>;
     previewPositionHealthLeverageDown(deposit_ctoken: CToken, borrow_ctoken: BorrowableCToken, newLeverage: Decimal, currentLeverage: Decimal): Promise<Decimal | null>;
-    previewPositionHealthLeverageUp(deposit_ctoken: CToken, borrow_ctoken: BorrowableCToken, newLeverage: Decimal, depositAssets?: bigint): Promise<Decimal | null>;
+    previewPositionHealthLeverageUp(deposit_ctoken: CToken, borrow_ctoken: BorrowableCToken, newLeverage: Decimal, depositAssets?: bigint, positionManagerType?: PositionManagerTypes): Promise<Decimal | null>;
+    previewPositionHealthDepositAndLeverage(deposit_ctoken: CToken, borrow_ctoken: BorrowableCToken, newLeverage: Decimal, depositAssets: bigint, positionManagerType?: PositionManagerTypes): Promise<Decimal | null>;
     /**
      * A dynamic position health previewer for any action
      * @param deposit_ctoken - Deposit side ctoken
@@ -239,7 +269,15 @@ export declare class Market {
      * @param borrowAssets - Amount of assets being borrowed
      * @returns An object containing the hypothetical liquidity values
      */
-    hypotheticalLiquidityOf(account: address, cTokenModified?: address, redemptionShares?: bigint, borrowAssets?: bigint): Promise<HypotheticalLiquidityOf>;
+    hypotheticalLiquidityOf(account: address, cTokenModified?: address, redemptionShares?: bigint, borrowAssets?: bigint, bufferTime?: bigint): Promise<{
+        collateral: bigint;
+        maxDebt: bigint;
+        debt: bigint;
+        collateralSurplus: bigint;
+        liquidityDeficit: bigint;
+        loanSizeError: boolean;
+        oracleError: boolean;
+    }>;
     /**
      * Fetch the expiration date of a user's cooldown period
      * @param account - The user's account address

package/dist/classes/Market.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Market.d.ts","sourceRoot":"","sources":["../../src/classes/Market.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Market.d.ts","sourceRoot":"","sources":["../../src/classes/Market.ts"],"names":[],"mappings":"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"}