curvance 5.1.9 → 5.2.1

package/dist/classes/OptimizerReader.d.ts

@@ -1,9 +1,14 @@
 import { Contract } from "ethers";
+import Decimal from "decimal.js";
 import { address, curvance_read_provider } from "../types";
+import type { Market } from "./Market";
 export interface OptimizerCTokenData {
     address: address;
     allocatedAssets: bigint;
     liquidity: bigint;
+    allocationCap: bigint;
+    /** Current allocation relative to the cap-derived max allocation. 10000 = at cap. */
+    allocationCapUtilizationBps: bigint;
 }
 export interface OptimizerMarketData {
     address: address;
@@ -12,10 +17,30 @@ export interface OptimizerMarketData {
     markets: OptimizerCTokenData[];
     totalLiquidity: bigint;
     sharePrice: bigint;
+    exchangeRateHighWatermark: bigint;
     performanceFee: bigint;
+    numApprovedMarkets: bigint;
     /** Pre-performance-fee weighted supply APY in WAD (1e18 = 100%). */
     apy: bigint;
 }
+export interface OptimizerUnderlyingMarketAPY {
+    cToken: address;
+    market: address | null;
+    assetSymbol: string;
+    allocatedAssets: bigint;
+    allocationWeight: Decimal;
+    nativeApy: Decimal;
+    merklApy: Decimal;
+    totalApy: Decimal;
+}
+export interface OptimizerAPYBreakdown {
+    optimizer: address;
+    totalAssets: bigint;
+    nativeApy: Decimal;
+    merklApy: Decimal;
+    averageApy: Decimal;
+    markets: OptimizerUnderlyingMarketAPY[];
+}
 export interface OptimizerUserData {
     address: address;
     shareBalance: bigint;
@@ -32,9 +57,12 @@ export interface AllocationBound {
 }
 export interface IOptimizerReader {
     getOptimizerAPY(optimizer: address): Promise<bigint>;
-    getOptimizerMarketData(optimizers: address[]): Promise<any[]>;
     getOptimizerUserData(optimizers: address[], account: address): Promise<any[]>;
+    assetsAtTimestamp(account: address, cToken: address, timestamp: bigint): Promise<bigint>;
+    isBad(optimizer: address): Promise<address[]>;
+    multiIsBadCheck(optimizers: address[]): Promise<address[][]>;
     optimalRebalance(optimizer: address, slippageBps: bigint): Promise<any>;
+    optimalRebalanceAt(optimizer: address, slippageBps: bigint, timestamp: bigint): Promise<any>;
 }
 export declare class OptimizerReader {
     provider: curvance_read_provider;
@@ -43,13 +71,25 @@ export declare class OptimizerReader {
     constructor(address: address, provider?: curvance_read_provider);
     getOptimizerAPY(optimizer: address): Promise<bigint>;
     getOptimizerMarketData(optimizers: address[]): Promise<OptimizerMarketData[]>;
-    private shouldFallbackToViewOnlyOptimizerReads;
-    private getOptimizerMarketDataViewOnly;
-    private normalizeOptimizerMarketData;
+    /**
+     * Returns the optimizer APY model plus weighted Merkl LEND rewards.
+     *
+     * The native optimizer APY comes from `getOptimizerMarketData().apy`, which
+     * mirrors the on-chain reader's weighted supply APY. Per-market Merkl APYs
+     * come from SDK market tokens hydrated during `Market.getAll`/`setupChain`.
+     */
+    getOptimizerAPYBreakdown(optimizer: address, markets?: Market[]): Promise<OptimizerAPYBreakdown>;
     getOptimizerUserData(optimizers: address[], account: address): Promise<OptimizerUserData[]>;
+    assetsAtTimestamp(account: address, cToken: address, timestamp: bigint): Promise<bigint>;
+    isBad(optimizer: address): Promise<address[]>;
+    multiIsBadCheck(optimizers: address[]): Promise<address[][]>;
     optimalRebalance(optimizer: address, slippageBps?: bigint): Promise<{
         actions: ReallocationAction[];
         bounds: AllocationBound[];
     }>;
+    optimalRebalanceAt(optimizer: address, slippageBps: bigint, timestamp: bigint): Promise<{
+        actions: ReallocationAction[];
+        bounds: AllocationBound[];
+    }>;
 }
 //# sourceMappingURL=OptimizerReader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"OptimizerReader.d.ts","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAoB3D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,oEAAoE;IACpE,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC7B,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,sBAAsB,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9E,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3E;AAiBD,qBAAa,eAAe;IACxB,QAAQ,EAAE,sBAAsB,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,GAAG,gBAAgB,CAAC;gBAE1B,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,sBAAsB;IAczD,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIpD,sBAAsB,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAanF,OAAO,CAAC,sCAAsC;YAKhC,8BAA8B;YAqC9B,4BAA4B;IAiBpC,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAS3F,gBAAgB,CAClB,SAAS,EAAE,OAAO,EAClB,WAAW,GAAE,MAAW,GACzB,OAAO,CAAC;QAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;CAU3E"}
+{"version":3,"file":"OptimizerReader.d.ts","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":"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"}

package/dist/classes/OptimizerReader.js

@@ -5,13 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OptimizerReader = void 0;
 const ethers_1 = require("ethers");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const OptimizerReader_json_1 = __importDefault(require("../abis/OptimizerReader.json"));
+const helpers_1 = require("../helpers");
 const OPTIMIZER_VIEW_ABI = [
     "function asset() view returns (address)",
     "function totalAssets() view returns (uint256)",
     "function exchangeRate() view returns (uint256)",
+    "function exchangeRateHighWatermark() view returns (uint256)",
     "function fee() view returns (uint256)",
     "function getApprovedMarkets() view returns (address[])",
+    "function allocationCaps(address cToken) view returns (uint256)",
 ];
 const BORROWABLE_CTOKEN_VIEW_ABI = [
     "function balanceOf(address owner) view returns (uint256)",
@@ -34,6 +38,33 @@ function normalizeAllocationBound(bound) {
         maxBps: BigInt(bound.maxBps),
     };
 }
+function calculateAllocationCapUtilizationBps(totalAssets, allocatedAssets, allocationCap) {
+    const maxAllocation = (totalAssets * allocationCap) / helpers_1.WAD;
+    return maxAllocation === 0n ? 0n : (allocatedAssets * helpers_1.BPS) / maxAllocation;
+}
+function normalizeRebalanceResult(data) {
+    const actions = data.actions ?? data[0] ?? [];
+    const bounds = data.bounds ?? data[1] ?? [];
+    return {
+        actions: actions.map((action) => normalizeReallocationAction(action)),
+        bounds: bounds.map((bound) => normalizeAllocationBound(bound)),
+    };
+}
+function getDefaultMarkets() {
+    return (require("../setup").all_markets ?? []);
+}
+function buildTokenIndex(markets) {
+    const tokens = new Map();
+    for (const market of markets) {
+        for (const token of market.tokens) {
+            const key = token.address.toLowerCase();
+            if (!tokens.has(key)) {
+                tokens.set(key, token);
+            }
+        }
+    }
+    return tokens;
+}
 class OptimizerReader {
     provider;
     address;
@@ -52,68 +83,98 @@ class OptimizerReader {
         return BigInt(await this.contract.getOptimizerAPY(optimizer));
     }
     async getOptimizerMarketData(optimizers) {
-        try {
-            const data = await this.contract.getOptimizerMarketData.staticCall(optimizers);
-            return Promise.all(data.map((opt) => this.normalizeOptimizerMarketData(opt)));
-        }
-        catch (error) {
-            if (!this.shouldFallbackToViewOnlyOptimizerReads(error)) {
-                throw error;
-            }
-            return Promise.all(optimizers.map((optimizer) => this.getOptimizerMarketDataViewOnly(optimizer)));
-        }
-    }
-    shouldFallbackToViewOnlyOptimizerReads(error) {
-        const message = String(error?.shortMessage ?? error?.reason ?? error?.message ?? error);
-        return /static|state|write|non-view|call exception|execution reverted/i.test(message);
-    }
-    async getOptimizerMarketDataViewOnly(optimizer) {
-        const opt = new ethers_1.Contract(optimizer, OPTIMIZER_VIEW_ABI, this.provider);
-        const [asset, totalAssets, sharePrice, performanceFee, markets] = await Promise.all([
-            opt.asset(),
-            opt.totalAssets(),
-            opt.exchangeRate(),
-            opt.fee(),
-            opt.getApprovedMarkets(),
-        ]);
-        const marketRows = await Promise.all(markets.map(async (market) => {
-            const cToken = new ethers_1.Contract(market, BORROWABLE_CTOKEN_VIEW_ABI, this.provider);
-            const shareBalance = await cToken.balanceOf(optimizer);
-            const [allocatedAssets, liquidity] = await Promise.all([
-                cToken.convertToAssets(shareBalance),
-                cToken.assetsHeld(),
+        return Promise.all(optimizers.map(async (optimizer) => {
+            const opt = new ethers_1.Contract(optimizer, OPTIMIZER_VIEW_ABI, this.provider);
+            const [asset, totalAssets, sharePrice, exchangeRateHighWatermark, performanceFee, markets,] = await Promise.all([
+                opt.asset(),
+                opt.totalAssets(),
+                opt.exchangeRate(),
+                opt.exchangeRateHighWatermark(),
+                opt.fee(),
+                opt.getApprovedMarkets(),
             ]);
+            const totalAssetsBig = BigInt(totalAssets);
+            const marketRows = await Promise.all(markets.map(async (market) => {
+                const cToken = new ethers_1.Contract(market, BORROWABLE_CTOKEN_VIEW_ABI, this.provider);
+                const [shareBalance, allocationCap] = await Promise.all([
+                    cToken.balanceOf(optimizer),
+                    opt.allocationCaps(market),
+                ]);
+                const [allocatedAssets, liquidity] = await Promise.all([
+                    cToken.convertToAssets(shareBalance),
+                    cToken.assetsHeld(),
+                ]);
+                const allocatedAssetsBig = BigInt(allocatedAssets);
+                const allocationCapBig = BigInt(allocationCap);
+                return {
+                    address: market,
+                    allocatedAssets: allocatedAssetsBig,
+                    liquidity: BigInt(liquidity),
+                    allocationCap: allocationCapBig,
+                    allocationCapUtilizationBps: calculateAllocationCapUtilizationBps(totalAssetsBig, allocatedAssetsBig, allocationCapBig),
+                };
+            }));
             return {
-                address: market,
-                allocatedAssets: BigInt(allocatedAssets),
-                liquidity: BigInt(liquidity),
+                address: optimizer,
+                asset: asset,
+                totalAssets: totalAssetsBig,
+                markets: marketRows,
+                totalLiquidity: marketRows.reduce((sum, market) => sum + market.liquidity, 0n),
+                sharePrice: BigInt(sharePrice),
+                exchangeRateHighWatermark: BigInt(exchangeRateHighWatermark),
+                performanceFee: BigInt(performanceFee),
+                numApprovedMarkets: BigInt(markets.length),
+                apy: await this.getOptimizerAPY(optimizer),
             };
         }));
-        return {
-            address: optimizer,
-            asset: asset,
-            totalAssets: BigInt(totalAssets),
-            markets: marketRows,
-            totalLiquidity: marketRows.reduce((sum, market) => sum + market.liquidity, 0n),
-            sharePrice: BigInt(sharePrice),
-            performanceFee: BigInt(performanceFee),
-            apy: await this.getOptimizerAPY(optimizer),
-        };
     }
-    async normalizeOptimizerMarketData(opt) {
+    /**
+     * Returns the optimizer APY model plus weighted Merkl LEND rewards.
+     *
+     * The native optimizer APY comes from `getOptimizerMarketData().apy`, which
+     * mirrors the on-chain reader's weighted supply APY. Per-market Merkl APYs
+     * come from SDK market tokens hydrated during `Market.getAll`/`setupChain`.
+     */
+    async getOptimizerAPYBreakdown(optimizer, markets = getDefaultMarkets()) {
+        const [data] = await this.getOptimizerMarketData([optimizer]);
+        if (data == undefined) {
+            throw new Error(`OptimizerReader.getOptimizerAPYBreakdown: no data returned for ${optimizer}.`);
+        }
+        const tokenIndex = buildTokenIndex(markets);
+        const totalAssetsDecimal = new decimal_js_1.default(data.totalAssets.toString());
+        const nativeApy = new decimal_js_1.default(data.apy.toString()).div(helpers_1.WAD_DECIMAL);
+        let merklApy = new decimal_js_1.default(0);
+        const rows = [];
+        for (const marketData of data.markets) {
+            const token = tokenIndex.get(marketData.address.toLowerCase());
+            if (token == undefined) {
+                throw new Error(`OptimizerReader.getOptimizerAPYBreakdown: approved market ${marketData.address} ` +
+                    `is not present in the provided SDK markets.`);
+            }
+            const allocationWeight = data.totalAssets === 0n
+                ? new decimal_js_1.default(0)
+                : new decimal_js_1.default(marketData.allocatedAssets.toString()).div(totalAssetsDecimal);
+            const tokenNativeApy = token.getApy();
+            const tokenMerklApy = new decimal_js_1.default(token.incentiveSupplyApy ?? 0);
+            merklApy = merklApy.add(tokenMerklApy.mul(allocationWeight));
+            rows.push({
+                cToken: marketData.address,
+                market: token.market?.address ?? null,
+                assetSymbol: token.asset?.symbol ?? marketData.address,
+                allocatedAssets: marketData.allocatedAssets,
+                allocationWeight,
+                nativeApy: tokenNativeApy,
+                merklApy: tokenMerklApy,
+                totalApy: tokenNativeApy.add(tokenMerklApy),
+            });
+        }
         return {
-            address: opt._address,
-            asset: opt.asset,
-            totalAssets: BigInt(opt.totalAssets),
-            markets: opt.markets.map((m) => ({
-                address: m._address,
-                allocatedAssets: BigInt(m.allocatedAssets),
-                liquidity: BigInt(m.liquidity)
-            })),
-            totalLiquidity: BigInt(opt.totalLiquidity),
-            sharePrice: BigInt(opt.sharePrice),
-            performanceFee: BigInt(opt.performanceFee),
-            apy: opt.apy == null ? await this.getOptimizerAPY(opt._address) : BigInt(opt.apy),
+            optimizer: data.address,
+            totalAssets: data.totalAssets,
+            nativeApy,
+            merklApy,
+            averageApy: nativeApy.add(merklApy),
+            markets: rows,
         };
     }
     async getOptimizerUserData(optimizers, account) {
@@ -124,14 +185,24 @@ class OptimizerReader {
             redeemable: BigInt(opt.redeemable)
         }));
     }
+    async assetsAtTimestamp(account, cToken, timestamp) {
+        return BigInt(await this.contract.assetsAtTimestamp(account, cToken, timestamp));
+    }
+    async isBad(optimizer) {
+        const markets = await this.contract.isBad(optimizer);
+        return markets.map((market) => market);
+    }
+    async multiIsBadCheck(optimizers) {
+        const markets = await this.contract.multiIsBadCheck(optimizers);
+        return markets.map((row) => row.map((market) => market));
+    }
     async optimalRebalance(optimizer, slippageBps = 0n) {
         const data = await this.contract.optimalRebalance(optimizer, slippageBps);
-        const actions = data.actions ?? data[0] ?? [];
-        const bounds = data.bounds ?? data[1] ?? [];
-        return {
-            actions: actions.map((action) => normalizeReallocationAction(action)),
-            bounds: bounds.map((bound) => normalizeAllocationBound(bound)),
-        };
+        return normalizeRebalanceResult(data);
+    }
+    async optimalRebalanceAt(optimizer, slippageBps, timestamp) {
+        const data = await this.contract.optimalRebalanceAt(optimizer, slippageBps, timestamp);
+        return normalizeRebalanceResult(data);
     }
 }
 exports.OptimizerReader = OptimizerReader;

package/dist/classes/OptimizerReader.js.map

@@ -1 +1 @@
-{"version":3,"file":"OptimizerReader.js","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAkC;AAClC,wFAA8C;AAG9C,MAAM,kBAAkB,GAAG;IACvB,yCAAyC;IACzC,+CAA+C;IAC/C,gDAAgD;IAChD,uCAAuC;IACvC,wDAAwD;CAClD,CAAC;AAEX,MAAM,0BAA0B,GAAG;IAC/B,0DAA0D;IAC1D,iEAAiE;IACjE,8CAA8C;CACxC,CAAC;AAEX,SAAS,0BAA0B;IAC/B,OAAQ,OAAO,CAAC,UAAU,CAA+B,CAAC,YAAY,EAAE,YAAY,CAAC;AACzF,CAAC;AA4CD,SAAS,2BAA2B,CAAC,MAAW;IAC5C,OAAO;QACH,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC;KAC3D,CAAC;AACN,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAU;IACxC,OAAO;QACH,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;KAC/B,CAAC;AACN,CAAC;AAED,MAAa,eAAe;IACxB,QAAQ,CAAyB;IACjC,OAAO,CAAU;IACjB,QAAQ,CAA8B;IAEtC,YAAY,OAAgB,EAAE,QAAiC;QAC3D,MAAM,gBAAgB,GAAG,QAAQ,IAAI,0BAA0B,EAAE,CAAC;QAClE,IAAI,gBAAgB,IAAI,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACX,uDAAuD,OAAO,IAAI;gBAClE,8DAA8D,CACjE,CAAC;QACN,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,iBAAQ,CAAC,OAAO,EAAE,8BAAG,EAAE,gBAAgB,CAAgC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAkB;QACpC,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,UAAqB;QAC9C,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAO,IAAI,CAAC,QAAgB,CAAC,sBAAsB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACxF,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACvF,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,sCAAsC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtD,MAAM,KAAK,CAAC;YAChB,CAAC;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtG,CAAC;IACL,CAAC;IAEO,sCAAsC,CAAC,KAAU;QACrD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,YAAY,IAAI,KAAK,EAAE,MAAM,IAAI,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC;QACxF,OAAO,gEAAgE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1F,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAAC,SAAkB;QAC3D,MAAM,GAAG,GAAG,IAAI,iBAAQ,CAAC,SAAS,EAAE,kBAAkB,EAAE,IAAI,CAAC,QAAQ,CAAQ,CAAC;QAC9E,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChF,GAAG,CAAC,KAAK,EAAE;YACX,GAAG,CAAC,WAAW,EAAE;YACjB,GAAG,CAAC,YAAY,EAAE;YAClB,GAAG,CAAC,GAAG,EAAE;YACT,GAAG,CAAC,kBAAkB,EAAE;SAC3B,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAAE,OAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7E,MAAM,MAAM,GAAG,IAAI,iBAAQ,CAAC,MAAM,EAAE,0BAA0B,EAAE,IAAI,CAAC,QAAQ,CAAQ,CAAC;YACtF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACvD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACnD,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC;gBACpC,MAAM,CAAC,UAAU,EAAE;aACtB,CAAC,CAAC;YAEH,OAAO;gBACH,OAAO,EAAE,MAAM;gBACf,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC;gBACxC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;aAC/B,CAAC;QACN,CAAC,CAAC,CAAC,CAAC;QAEJ,OAAO;YACH,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,KAAgB;YACvB,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,UAAU;YACnB,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;YAC9E,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;YAC9B,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC;YACtC,GAAG,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;SAC7C,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,GAAQ;QAC/C,OAAO;YACH,OAAO,EAAE,GAAG,CAAC,QAAQ;YACrB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;YACpC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;gBAClC,OAAO,EAAE,CAAC,CAAC,QAAQ;gBACnB,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC;gBAC1C,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;aACjC,CAAC,CAAC;YACH,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;YAC1C,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;YAClC,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;YAC1C,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;SACpF,CAAC;IACN,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,UAAqB,EAAE,OAAgB;QAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;YAC3B,OAAO,EAAE,GAAG,CAAC,QAAQ;YACrB,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;YACtC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;SACrC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,SAAkB,EAClB,cAAsB,EAAE;QAExB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAE5C,OAAO;YACH,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;YAC1E,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;SACtE,CAAC;IACN,CAAC;CACJ;AArHD,0CAqHC"}
+{"version":3,"file":"OptimizerReader.js","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":"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"}

package/dist/classes/OptimizerZapper.d.ts

@@ -0,0 +1,24 @@
+import { Contract, TransactionResponse } from "ethers";
+import { address, bytes, curvance_signer } from "../types";
+import { Calldata } from "./Calldata";
+import type { SetupConfigSnapshot } from "../setup";
+import type IDexAgg from "./DexAggregators/IDexAgg";
+import type { LendingOptimizer } from "./LendingOptimizer";
+import type { Swap } from "./Zapper";
+export interface IOptimizerZapper {
+    swapAndDeposit(optimizer: address, depositAsWrappedNative: boolean, swapAction: Swap, expectedShares: bigint, receiver: address): Promise<TransactionResponse>;
+}
+export declare class OptimizerZapper extends Calldata<IOptimizerZapper> {
+    signer: curvance_signer;
+    contract: Contract & IOptimizerZapper;
+    address: address;
+    setup: SetupConfigSnapshot;
+    dexAgg: IDexAgg;
+    constructor(address: address, signer: curvance_signer, setup: SetupConfigSnapshot, dexAgg: IDexAgg);
+    deposit(optimizer: LendingOptimizer, inputToken: address, amount: bigint, slippage: bigint, receiver?: address): Promise<TransactionResponse>;
+    getDepositCalldata(optimizer: LendingOptimizer, inputToken: address, amount: bigint, slippage: bigint, receiver?: address): Promise<bytes>;
+    getNativeDepositCalldata(optimizer: LendingOptimizer, amount: bigint, wrapped?: boolean, receiver?: address): Promise<bytes>;
+    private getOptimizerAsset;
+    private getExpectedShares;
+}
+//# sourceMappingURL=OptimizerZapper.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"OptimizerZapper.d.ts","sourceRoot":"","sources":["../../src/classes/OptimizerZapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,OAAO,MAAM,0BAA0B,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAIrC,MAAM,WAAW,gBAAgB;IAC7B,cAAc,CACV,SAAS,EAAE,OAAO,EAClB,sBAAsB,EAAE,OAAO,EAC/B,UAAU,EAAE,IAAI,EAChB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,OAAO,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACnC;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAC3D,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,QAAQ,GAAG,gBAAgB,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;gBAEJ,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,OAAO;IAe5F,OAAO,CACT,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,OAAwC,GACnD,OAAO,CAAC,mBAAmB,CAAC;IAQzB,kBAAkB,CACpB,SAAS,EAAE,gBAAgB,EAC3B,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,OAAwC,GACnD,OAAO,CAAC,KAAK,CAAC;IAoEX,wBAAwB,CAC1B,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,OAAe,EACxB,QAAQ,GAAE,OAAwC,GACnD,OAAO,CAAC,KAAK,CAAC;YAqBH,iBAAiB;YAIjB,iBAAiB;CAIlC"}

package/dist/classes/OptimizerZapper.js

@@ -0,0 +1,117 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OptimizerZapper = void 0;
+const helpers_1 = require("../helpers");
+const Calldata_1 = require("./Calldata");
+const OptimizerZapper_json_1 = __importDefault(require("../abis/OptimizerZapper.json"));
+const OPTIMIZER_ZAP_SHARES_BUFFER_BPS = 2n;
+class OptimizerZapper extends Calldata_1.Calldata {
+    signer;
+    contract;
+    address;
+    setup;
+    dexAgg;
+    constructor(address, signer, setup, dexAgg) {
+        super();
+        this.address = address;
+        this.signer = signer;
+        this.setup = setup;
+        if (dexAgg == undefined) {
+            throw new Error("OptimizerZapper requires a setup-bound DEX aggregator. " +
+                "Pass the dexAgg returned by setupChain(...).");
+        }
+        this.dexAgg = dexAgg;
+        this.contract = (0, helpers_1.contractSetup)(signer, address, OptimizerZapper_json_1.default);
+    }
+    async deposit(optimizer, inputToken, amount, slippage, receiver = this.signer.address) {
+        const calldata = await this.getDepositCalldata(optimizer, inputToken, amount, slippage, receiver);
+        const overrides = inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase()
+            ? { value: amount }
+            : {};
+        return this.executeCallData(calldata, overrides);
+    }
+    async getDepositCalldata(optimizer, inputToken, amount, slippage, receiver = this.signer.address) {
+        const outputToken = await this.getOptimizerAsset(optimizer);
+        const isNative = inputToken.toLowerCase() === helpers_1.NATIVE_ADDRESS.toLowerCase();
+        const wrappedNative = this.setup.assets.wrapped_native;
+        if (isNative && outputToken.toLowerCase() === wrappedNative.toLowerCase()) {
+            return this.getNativeDepositCalldata(optimizer, amount, true, receiver);
+        }
+        const swapInputToken = isNative ? wrappedNative : inputToken;
+        if (swapInputToken.toLowerCase() === outputToken.toLowerCase()) {
+            const swap = {
+                inputToken: isNative ? helpers_1.NATIVE_ADDRESS : inputToken,
+                inputAmount: amount,
+                outputToken,
+                target: helpers_1.EMPTY_ADDRESS,
+                slippage: 0n,
+                call: helpers_1.EMPTY_BYTES,
+            };
+            const expectedShares = await this.getExpectedShares(optimizer, amount);
+            return this.getCallData("swapAndDeposit", [
+                optimizer.address,
+                isNative,
+                swap,
+                expectedShares,
+                receiver,
+            ]);
+        }
+        const feeBps = this.setup.feePolicy.getFeeBps({
+            operation: "zap",
+            inputToken: isNative ? helpers_1.NATIVE_ADDRESS : inputToken,
+            outputToken,
+            inputAmount: amount,
+            currentLeverage: null,
+            targetLeverage: null,
+        });
+        const feeReceiver = feeBps > 0n ? this.setup.feePolicy.feeReceiver : undefined;
+        const quote = await this.dexAgg.quote(this.address, swapInputToken, outputToken, amount, slippage, feeBps, feeReceiver);
+        const swap = {
+            inputToken: isNative ? helpers_1.NATIVE_ADDRESS : inputToken,
+            inputAmount: amount,
+            outputToken,
+            target: quote.to,
+            slippage: (0, helpers_1.toContractSwapSlippage)(slippage, feeBps),
+            call: quote.calldata,
+        };
+        const expectedShares = await this.getExpectedShares(optimizer, BigInt(quote.min_out));
+        return this.getCallData("swapAndDeposit", [
+            optimizer.address,
+            isNative,
+            swap,
+            expectedShares,
+            receiver,
+        ]);
+    }
+    async getNativeDepositCalldata(optimizer, amount, wrapped = false, receiver = this.signer.address) {
+        const outputToken = wrapped ? this.setup.assets.wrapped_native : helpers_1.NATIVE_ADDRESS;
+        const swap = {
+            inputToken: helpers_1.NATIVE_ADDRESS,
+            inputAmount: amount,
+            outputToken,
+            target: helpers_1.EMPTY_ADDRESS,
+            slippage: 0n,
+            call: helpers_1.EMPTY_BYTES,
+        };
+        const expectedShares = await this.getExpectedShares(optimizer, amount);
+        return this.getCallData("swapAndDeposit", [
+            optimizer.address,
+            wrapped,
+            swap,
+            expectedShares,
+            receiver,
+        ]);
+    }
+    async getOptimizerAsset(optimizer) {
+        return optimizer.contract.asset();
+    }
+    async getExpectedShares(optimizer, assets) {
+        const shares = await optimizer.convertToShares(assets);
+        return shares * (helpers_1.BPS - OPTIMIZER_ZAP_SHARES_BUFFER_BPS) / helpers_1.BPS;
+    }
+}
+exports.OptimizerZapper = OptimizerZapper;
+//# sourceMappingURL=OptimizerZapper.js.map

package/dist/classes/OptimizerZapper.js.map

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

package/dist/classes/PositionManager.d.ts

@@ -33,6 +33,7 @@ export declare class PositionManager extends Calldata<IPositionManager> {
     constructor(address: address, signer: curvance_signer, type: PositionManagerTypes);
     static emptySwapAction(): Swap;
     static getExpectedShares(deposit_ctoken: CToken, amount: bigint): Promise<bigint>;
+    private static assertVaultExpectedSharesTokensMatch;
     static getVaultExpectedShares(deposit_ctoken: CToken, borrow_ctoken: CToken, borrow_amount: TokenInput): Promise<bigint>;
     getDeleverageCalldata(action: DeleverageAction, slippage: bigint): `0x${string}`;
     getLeverageCalldata(action: LeverageAction, slippage: bigint): `0x${string}`;

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

@@ -1 +1 @@
-{"version":3,"file":"PositionManager.d.ts","sourceRoot":"","sources":["../../src/classes/PositionManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAE,MAAM,EAAY,MAAM,UAAU,CAAC;AAG5C,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,QAAQ,GAAG,OAAO,CAAC;AACvE,MAAM,WAAW,cAAc;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE,KAAK,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACjF,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC3G,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACxF;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAC3D,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,oBAAoB,CAAC;gBAEf,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,oBAAoB;IAQjF,MAAM,CAAC,eAAe,IAAI,IAAI;WAWjB,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;WAIxD,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU;IAK5G,qBAAqB,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM;IAIhE,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM;IAI5D,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM;CAGzF"}
+{"version":3,"file":"PositionManager.d.ts","sourceRoot":"","sources":["../../src/classes/PositionManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAE,MAAM,EAAY,MAAM,UAAU,CAAC;AAG5C,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,QAAQ,GAAG,OAAO,CAAC;AACvE,MAAM,WAAW,cAAc;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,OAAO,CAAC,EAAE,KAAK,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACjF,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC3G,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACxF;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAC3D,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,oBAAoB,CAAC;gBAEf,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,oBAAoB;IAQjF,MAAM,CAAC,eAAe,IAAI,IAAI;WAWjB,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIrE,OAAO,CAAC,MAAM,CAAC,oCAAoC;WAgCtC,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU;IAM5G,qBAAqB,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM;IAIhE,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM;IAI5D,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM;CAGzF"}

package/dist/classes/PositionManager.js

@@ -33,7 +33,32 @@ class PositionManager extends Calldata_1.Calldata {
     static async getExpectedShares(deposit_ctoken, amount) {
         return deposit_ctoken.convertToShares(amount);
     }
+    static assertVaultExpectedSharesTokensMatch(deposit_ctoken, borrow_ctoken) {
+        const depositMarket = deposit_ctoken.market;
+        const borrowMarket = borrow_ctoken.market;
+        if (depositMarket == undefined || borrowMarket == undefined) {
+            return;
+        }
+        if (depositMarket === borrowMarket) {
+            return;
+        }
+        const depositChain = depositMarket.setup?.chain;
+        const borrowChain = borrowMarket.setup?.chain;
+        const sameMarket = depositMarket.address?.toLowerCase() === borrowMarket.address?.toLowerCase();
+        const sameChain = depositChain != null && borrowChain != null && depositChain === borrowChain;
+        const depositReaderKey = depositMarket.reader?.batchKey ?? null;
+        const borrowReaderKey = borrowMarket.reader?.batchKey ?? null;
+        const sameReaderDeployment = depositMarket.reader === borrowMarket.reader ||
+            (depositReaderKey != null && depositReaderKey === borrowReaderKey);
+        if (!sameMarket || !sameChain || !sameReaderDeployment) {
+            throw new Error(`Vault expected shares for deposit token ${deposit_ctoken.address} on ` +
+                `${depositChain ?? "unknown"} market ${depositMarket.address ?? "unknown"} cannot use ` +
+                `borrow token ${borrow_ctoken.address} from ${borrowChain ?? "unknown"} ` +
+                `market ${borrowMarket.address ?? "unknown"} with a different reader deployment.`);
+        }
+    }
     static async getVaultExpectedShares(deposit_ctoken, borrow_ctoken, borrow_amount) {
+        PositionManager.assertVaultExpectedSharesTokensMatch(deposit_ctoken, borrow_ctoken);
         const borrow_amount_as_bn = FormatConverter_1.default.decimalToBigInt(borrow_amount, borrow_ctoken.asset.decimals);
         return deposit_ctoken.getExpectedVaultShares(borrow_amount_as_bn);
     }

package/dist/classes/PositionManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"PositionManager.js","sourceRoot":"","sources":["../../src/classes/PositionManager.ts"],"names":[],"mappings":";;;;;;AAEA,yCAAsC;AAEtC,wCAA0D;AAC1D,oGAAqD;AAErD,wEAAgD;AA2BhD,MAAa,eAAgB,SAAQ,mBAA0B;IAC3D,MAAM,CAAkB;IACxB,QAAQ,CAA8B;IACtC,OAAO,CAAU;IACjB,IAAI,CAAuB;IAE3B,YAAY,OAAgB,EAAE,MAAuB,EAAE,IAA0B;QAC7E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAA,uBAAa,EAAmB,MAAM,EAAE,OAAO,EAAE,oCAAG,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,eAAe;QAClB,OAAO;YACH,UAAU,EAAE,uBAAa;YACzB,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,uBAAa;YAC1B,MAAM,EAAE,uBAAa;YACrB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,IAAI;SACb,CAAA;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,cAAsB,EAAE,MAAc;QACjE,OAAO,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,cAAsB,EAAE,aAAqB,EAAE,aAAyB;QACxG,MAAM,mBAAmB,GAAG,yBAAe,CAAC,eAAe,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACzG,OAAO,cAAc,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;IACtE,CAAC;IAED,qBAAqB,CAAC,MAAwB,EAAE,QAAgB;QAC5D,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,mBAAmB,CAAC,MAAsB,EAAE,QAAgB;QACxD,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,6BAA6B,CAAC,MAAc,EAAE,MAAsB,EAAE,QAAgB;QAClF,OAAO,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9E,CAAC;CACJ;AA7CD,0CA6CC"}
+{"version":3,"file":"PositionManager.js","sourceRoot":"","sources":["../../src/classes/PositionManager.ts"],"names":[],"mappings":"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"}

package/dist/classes/ProtocolReader.d.ts

@@ -110,6 +110,7 @@ export interface UserData {
     markets: UserMarket[];
 }
 export interface IProtocolReader {
+    centralRegistry(): Promise<address>;
     getAllDynamicState(account: address): Promise<any>;
     getMarketSummaries(markets: address[], account: address): Promise<any>;
     getMarketStates(markets: address[], account: address): Promise<any>;
@@ -137,6 +138,8 @@ export declare class ProtocolReader {
     readonly batchKey: string | null;
     private readonly staticMarketCacheKey;
     constructor(address: address, provider?: curvance_read_provider, cacheNamespace?: string | null);
+    private assertTokenBelongsToReader;
+    getDaoAddress(): Promise<address>;
     getAllMarketData(account?: address | null): Promise<{
         staticMarket: StaticMarketData[];
         dynamicMarket: DynamicMarketData[];