@exponent-labs/exponent-sdk 0.0.9 → 0.1.0

package/build/market.js

@@ -2,22 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Market = exports.MyWallet = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
-const exponent_fetcher_1 = require("@exponent-labs/exponent-fetcher");
 const spl_token_1 = require("@solana/spl-token");
-const addressLookupTableUtil_1 = require("./addressLookupTableUtil");
-const tokenUtil_1 = require("./tokenUtil");
-const flavors_1 = require("./flavors");
+const exponent_fetcher_1 = require("@exponent-labs/exponent-fetcher");
 const exponent_idl_1 = require("@exponent-labs/exponent-idl");
-const anchor_2 = require("@coral-xyz/anchor");
 const exponent_pda_1 = require("@exponent-labs/exponent-pda");
-const vault_1 = require("./vault");
-const market_math_1 = require("@exponent-labs/market-math");
-const utils_1 = require("./utils");
 const exponent_types_1 = require("@exponent-labs/exponent-types");
+const market_math_1 = require("@exponent-labs/market-math");
 const precise_number_1 = require("@exponent-labs/precise-number");
-const altUtil_1 = require("./utils/altUtil");
+const addressLookupTableUtil_1 = require("./addressLookupTableUtil");
+const flavors_1 = require("./flavors");
 const syPosition_1 = require("./syPosition");
+const tokenUtil_1 = require("./tokenUtil");
+const utils_1 = require("./utils");
+const altUtil_1 = require("./utils/altUtil");
+const vault_1 = require("./vault");
 const SECONDS_PER_YEAR = 365 * 24 * 60 * 60;
+//TODO Put it in the shared package because this code is repeated in many packages
 class MyWallet {
     payer;
     constructor(payer) {
@@ -67,13 +67,13 @@ class Market {
     }
     static async load(env, connection, address, vault, options = {}) {
         const fetcher = new exponent_fetcher_1.ExponentFetcher({ connection });
-        const m = await fetcher.fetchMarket(address);
+        const fetchedMarket = await fetcher.fetchMarket(address);
         const [[lpSupply, sySupply], alt, loadedVault] = await Promise.all([
-            (0, tokenUtil_1.getMultipleMintSupply)(connection, [m.mintLp, m.mintSy]),
-            (0, addressLookupTableUtil_1.fetchAddressLookupTable)(connection, m.addressLookupTable),
-            vault || vault_1.Vault.load(env, connection, m.vault, options),
+            (0, tokenUtil_1.getMultipleMintSupply)(connection, [fetchedMarket.mintLp, fetchedMarket.mintSy]),
+            (0, addressLookupTableUtil_1.fetchAddressLookupTable)(connection, fetchedMarket.addressLookupTable),
+            vault || vault_1.Vault.load(env, connection, fetchedMarket.vault, options),
         ]);
-        const cpiAccounts = (0, addressLookupTableUtil_1.makeCpiAccountMetaLists)(alt, m.cpiAccounts);
+        const cpiAccounts = (0, addressLookupTableUtil_1.makeCpiAccountMetaLists)(alt, fetchedMarket.cpiAccounts);
         const flavor = (() => {
             switch (loadedVault.flavor.flavor) {
                 case "marginfi":
@@ -90,9 +90,9 @@ class Market {
                     throw new Error(`Unknown flavor: ${loadedVault.flavor}`);
             }
         })();
-        const syPosition = await (0, syPosition_1.makeSyPosition)(fetcher, flavor, m.syProgram, address);
+        const syPosition = await (0, syPosition_1.makeSyPosition)(fetcher, flavor, fetchedMarket.syProgram, address);
         const state = {
-            ...m,
+            ...fetchedMarket,
             vault: loadedVault,
             cpiAccounts,
             lpSupply,
@@ -102,10 +102,10 @@ class Market {
         };
         return new Market(state, address, env, connection);
     }
-    async reload(conn = this.connection) {
-        const m = await Market.load(this.env, conn, this.selfAddress);
-        this.state = m.state;
-        return m;
+    async reload(connection = this.connection) {
+        const market = await Market.load(this.env, connection, this.selfAddress);
+        this.state = market.state;
+        return market;
     }
     /** Convert to a JSON representation */
     toJson() {
@@ -236,8 +236,8 @@ class Market {
         return this.currentPtPriceInAsset / this.currentSyExchangeRate;
     }
     get currentPtPriceInAsset() {
-        const c = this.marketCalculator();
-        return c.exchangeRate;
+        const marketCalculator = this.marketCalculator();
+        return marketCalculator.exchangeRate;
     }
     get ptDiscount() {
         return 1 / this.currentPtPriceInAsset;
@@ -249,21 +249,27 @@ class Market {
         return Number(this.lpSupply) === 0 ? 0 : liquidityPoolTvl / Number(this.lpSupply);
     }
     get secondsRemaining() {
-        const now = Date.now() / 1000;
-        return Math.max(0, Math.round(this.state.expirationTs - now));
+        const timeNow = Date.now() / 1000;
+        return Math.max(0, Math.round(this.state.expirationTs - timeNow));
     }
     get absolutePtYield() {
         const ptAssetExchangeRate = this.ptDiscount;
         return (1 - ptAssetExchangeRate) / ptAssetExchangeRate;
     }
     /** Annualize a rate given the number of seconds remaining until maturity */
-    static annualize(r, secondsRemaining) {
-        return (r * SECONDS_PER_YEAR) / secondsRemaining;
+    static annualize(rate, secondsRemaining) {
+        return (rate * SECONDS_PER_YEAR) / secondsRemaining;
+    }
+    static annualizeApy(rate, secondsRemaining) {
+        return (1 + rate) ** (SECONDS_PER_YEAR / secondsRemaining) - 1;
     }
     /** Annualized PT fixed rate */
     get ptApr() {
         return Market.annualize(this.absolutePtYield, this.secondsRemaining);
     }
+    get ptApy() {
+        return Market.annualizeApy(this.absolutePtYield, this.secondsRemaining);
+    }
     /** The fee rate taken off of trade fees (typically around 20%) expressed as a BPS number */
     get feeTreasuryBps() {
         return this.state.feeTreasurySyBps;
@@ -279,7 +285,7 @@ class Market {
     get feeTreasuryRate() {
         return this.feeTreasuryBps / 10_000;
     }
-    /** Calculate amonut of LP tokens to expect for tokens in */
+    /** Calculate amount of LP tokens to expect for tokens in */
     lpOutForTokensIn(syInIntent, ptInIntent) {
         return (0, market_math_1.lpOutForTokensIn)({
             syIntent: Number(syInIntent),
@@ -290,7 +296,8 @@ class Market {
         });
     }
     marketCalculator() {
-        const secondsRemaining = Math.max(0, Math.round(this.state.expirationTs - Date.now() / 1000));
+        const timeNow = Date.now() / 1000;
+        const secondsRemaining = Math.max(0, Math.round(this.state.expirationTs - timeNow));
         return new market_math_1.MarketCalculator({
             liquiditySy: parseInt(this.syBalance.toString()),
             liquidityPt: parseInt(this.ptBalance.toString()),
@@ -305,6 +312,7 @@ class Market {
             windowStartTimestamp: this.state.liquidityNetBalanceLimits.windowStartTimestamp,
             windowStartNetBalance: this.state.liquidityNetBalanceLimits.windowStartNetBalance.toNumber(),
             windowDurationSeconds: this.state.liquidityNetBalanceLimits.windowDurationSeconds,
+            feeTreasurySyBps: this.state.feeTreasurySyBps,
         });
     }
     /** Deposit a pair of tokens as liquidity to the market
@@ -315,14 +323,14 @@ class Market {
      *
      * The token accounts themselves are optional, and will be derived from the depositor's wallet if not provided
      */
-    async ixDepositLiquidity({ ptInIntent, syInIntent, minLpOut, depositor, ptSrc, sySrc, lpDst, }) {
+    async ixDepositLiquidity({ ptInIntent, syInIntent, minLpOut, depositor, ptSrc: ptSrcParam, sySrc: sySrcParam, lpDst: lpDstParam, }) {
         const tokenProgram = spl_token_1.TOKEN_PROGRAM_ID;
-        sySrc = sySrc || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        ptSrc = ptSrc || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        lpDst = lpDst || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const sySrc = sySrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const ptSrc = ptSrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const lpDst = lpDstParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
         const syRemAccounts = this.cpiAccounts.depositSy;
         return this.coreProgram.methods
-            .marketTwoDepositLiquidity(new anchor_2.BN(ptInIntent.toString()), new anchor_2.BN(syInIntent.toString()), new anchor_2.BN(minLpOut.toString()))
+            .marketTwoDepositLiquidity(new anchor_1.BN(ptInIntent.toString()), new anchor_1.BN(syInIntent.toString()), new anchor_1.BN(minLpOut.toString()))
             .accountsStrict({
             depositor,
             market: this.selfAddress,
@@ -352,11 +360,11 @@ class Market {
         })
             .instruction();
     }
-    async ixModifyFarm({ newRate, untilTimestamp, signer, farmMint, farmTokenProgram, farmTokenSrc, }) {
-        farmTokenSrc = farmTokenSrc || (0, spl_token_1.getAssociatedTokenAddressSync)(farmMint, signer, true, farmTokenProgram);
+    async ixModifyFarm({ newRate, untilTimestamp, signer, farmMint, farmTokenProgram, farmTokenSrc: farmTokenSrcParam, }) {
+        const farmTokenSrc = farmTokenSrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(farmMint, signer, true, farmTokenProgram);
         const tokenFarm = (0, spl_token_1.getAssociatedTokenAddressSync)(farmMint, this.selfAddress, true, farmTokenProgram);
         return this.coreProgram.methods
-            .modifyFarm(untilTimestamp, new anchor_2.BN(newRate.toString()))
+            .modifyFarm(untilTimestamp, new anchor_1.BN(newRate.toString()))
             .accountsStrict({
             adminState: (0, utils_1.getExponentAdminStatePda)(),
             market: this.selfAddress,
@@ -377,16 +385,16 @@ class Market {
      *
      * The token accounts themselves are optional, and will be derived from the withdrawer's wallet if not provided
      */
-    async ixWithdrawLiquidity({ lpIn, withdrawer, minPtOut, minSyOut, ptDst, syDst, lpSrc, }) {
-        ptDst = ptDst || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, withdrawer, true, spl_token_1.TOKEN_PROGRAM_ID);
-        syDst = syDst || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, withdrawer, true, spl_token_1.TOKEN_PROGRAM_ID);
-        lpSrc = lpSrc || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, withdrawer, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixWithdrawLiquidity({ lpIn, withdrawer, minPtOut, minSyOut, ptDst: ptDstParam, syDst: syDstParam, lpSrc: lpSrcParam, }) {
+        const ptDst = ptDstParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, withdrawer, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const syDst = syDstParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, withdrawer, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const lpSrc = lpSrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, withdrawer, true, spl_token_1.TOKEN_PROGRAM_ID);
         const ptDstAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(withdrawer, ptDst, withdrawer, this.mintPt);
         const syDstAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(withdrawer, syDst, withdrawer, this.mintSy);
         const lpSrcAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(withdrawer, lpSrc, withdrawer, this.mintLp);
         const syRemAccounts = this.cpiAccounts.withdrawSy;
         const ixs = await this.coreProgram.methods
-            .marketTwoWithdrawLiquidity(new anchor_2.BN(lpIn.toString()), new anchor_2.BN(minPtOut.toString()), new anchor_2.BN(minSyOut.toString()))
+            .marketTwoWithdrawLiquidity(new anchor_1.BN(lpIn.toString()), new anchor_1.BN(minPtOut.toString()), new anchor_1.BN(minSyOut.toString()))
             .accountsStrict({
             withdrawer,
             market: this.selfAddress,
@@ -442,9 +450,9 @@ class Market {
             tokenSy,
         });
     }
-    async ixTradePt({ trader, traderPt, syConstraint, isBuy, tokenPt, tokenSy, }) {
-        tokenPt = tokenPt || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenSy = tokenSy || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixTradePt({ trader, traderPt, syConstraint, isBuy, tokenPt: tokenPtParam, tokenSy: tokenSyParam, }) {
+        const tokenPt = tokenPtParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenSy = tokenSyParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenSyAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, tokenSy, trader, this.mintSy);
         const tokenPtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, tokenPt, trader, this.mintPt);
         const remainingAccounts = [
@@ -452,8 +460,8 @@ class Market {
             ...this.cpiAccounts.depositSy,
             ...this.cpiAccounts.withdrawSy,
         ];
-        const netTradePtBN = new anchor_2.BN(traderPt.toString()).mul(isBuy ? new anchor_2.BN(1) : new anchor_2.BN(-1));
-        const syConstraintBN = new anchor_2.BN(syConstraint.toString()).mul(isBuy ? new anchor_2.BN(-1) : new anchor_2.BN(1));
+        const netTradePtBN = new anchor_1.BN(traderPt.toString()).mul(isBuy ? new anchor_1.BN(1) : new anchor_1.BN(-1));
+        const syConstraintBN = new anchor_1.BN(syConstraint.toString()).mul(isBuy ? new anchor_1.BN(-1) : new anchor_1.BN(1));
         const ix = await this.coreProgram.methods
             .tradePt(netTradePtBN, syConstraintBN)
             .accountsStrict({
@@ -484,10 +492,10 @@ class Market {
      *
      * The token accounts themselves are optional, and will be derived from the trader's wallet if not provided
      */
-    async ixSellYt({ trader, ytIn, minSyOut, ytSrc, ptSrc, syDst, }) {
-        syDst = syDst || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
-        ptSrc = ptSrc || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
-        ytSrc = ytSrc || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixSellYt({ trader, ytIn, minSyOut, ytSrc: ytSrcParam, ptSrc: ptSrcParam, syDst: syDstParam, }) {
+        const syDst = syDstParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const ptSrc = ptSrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const ytSrc = ytSrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
         const syDstAtaIxs = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, syDst, trader, this.mintSy);
         const ptSrcAtaIxs = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, ptSrc, trader, this.mintPt);
         const ytSrcAtaIxs = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, ytSrc, trader, this.mintYt);
@@ -499,7 +507,7 @@ class Market {
         ]);
         remainingAccounts.push({ pubkey: this.coreProgram.programId, isWritable: false, isSigner: false });
         const ix = await this.coreProgram.methods
-            .sellYt(new anchor_2.BN(ytIn.toString()), new anchor_2.BN(minSyOut.toString()))
+            .sellYt(new anchor_1.BN(ytIn.toString()), new anchor_1.BN(minSyOut.toString()))
             .accountsStrict({
             trader,
             market: this.selfAddress,
@@ -536,10 +544,10 @@ class Market {
      *
      * The token accounts themselves are optional, and will be derived from the trader's wallet if not provided
      */
-    async ixBuyYt({ trader, ytOut, maxSyIn, ytTrader, ptTrader, syTrader, }) {
-        syTrader = syTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
-        ptTrader = ptTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
-        ytTrader = ytTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixBuyYt({ trader, ytOut, maxSyIn, ytTrader: ytTraderParam, ptTrader: ptTraderParam, syTrader: syTraderParam, }) {
+        const syTrader = syTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const ptTrader = ptTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const ytTrader = ytTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, trader, true, spl_token_1.TOKEN_PROGRAM_ID);
         const syTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, syTrader, trader, this.mintSy);
         const ptTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, ptTrader, trader, this.mintPt);
         const ytTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(trader, ytTrader, trader, this.mintYt);
@@ -557,7 +565,7 @@ class Market {
         ]);
         remainingAccounts.push({ pubkey: this.coreProgram.programId, isWritable: false, isSigner: false });
         const ix = await this.coreProgram.methods
-            .buyYt(new anchor_2.BN(maxSyIn.toString()), new anchor_2.BN(ytOut.toString()))
+            .buyYt(new anchor_1.BN(maxSyIn.toString()), new anchor_1.BN(ytOut.toString()))
             .accountsStrict({
             trader,
             market: this.selfAddress,
@@ -600,11 +608,11 @@ class Market {
             .instruction();
     }
     /** Deposit LP tokens into the farming module to earn rewards */
-    async ixDepositLp({ owner, amount, lpSrc }) {
-        lpSrc = lpSrc || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixDepositLp({ owner, amount, lpSrc: lpSrcParam, }) {
+        const lpSrc = lpSrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
         const lpPosition = this.xponPda.marketLpPosition({ market: this.selfAddress, owner });
         return this.coreProgram.methods
-            .marketDepositLp(new anchor_2.BN(amount.toString()))
+            .marketDepositLp(new anchor_1.BN(amount.toString()))
             .accountsStrict({
             owner,
             lpPosition,
@@ -623,11 +631,11 @@ class Market {
             .instruction();
     }
     /** Withdraw LP tokens from the farming module */
-    async ixWithdrawLp({ owner, amount, lpDst }) {
-        lpDst = lpDst || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixWithdrawLp({ owner, amount, lpDst: lpDstParam, }) {
+        const lpDst = lpDstParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
         const lpPosition = this.xponPda.marketLpPosition({ market: this.selfAddress, owner });
         return this.coreProgram.methods
-            .marketWithdrawLp(new anchor_2.BN(amount.toString()))
+            .marketWithdrawLp(new anchor_1.BN(amount.toString()))
             .accountsStrict({
             owner,
             lpPosition,
@@ -645,9 +653,9 @@ class Market {
             .remainingAccounts(this.cpiAccounts.getPositionState)
             .instruction();
     }
-    async ixWrapperCollectInterest({ claimer, tokenSyDst }) {
+    async ixWrapperCollectInterest({ claimer, tokenSyDst: tokenSyDstParam, }) {
         const yieldPosition = this.xponPda.yieldPosition({ owner: claimer, vault: this.vault.selfAddress });
-        tokenSyDst = tokenSyDst || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, claimer, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenSyDst = tokenSyDstParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, claimer, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenBaseClaimer = (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, claimer, true, this.flavor.baseTokenProgram);
         const tokenBaseClaimerAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(claimer, tokenBaseClaimer, claimer, this.flavor.mintBase);
         const tokenSyClaimer = (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, claimer, true);
@@ -689,11 +697,11 @@ class Market {
             setupIxs: [tokenBaseClaimerAtaIx, tokenSyClaimerAtaIx],
         };
     }
-    async ixWrapperBuyPt({ owner, ptOut, maxBaseIn, tokenSyTrader, tokenPtTrader, tokenBaseTrader, }) {
-        tokenSyTrader = tokenSyTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtTrader = tokenPtTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseTrader =
-            tokenBaseTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
+    async ixWrapperBuyPt({ owner, ptOut, maxBaseIn, tokenSyTrader: tokenSyTraderParam, tokenPtTrader: tokenPtTraderParam, tokenBaseTrader: tokenBaseTraderParam, }) {
+        const tokenSyTrader = tokenSyTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtTrader = tokenPtTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseTrader = tokenBaseTraderParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
         const tokenSyTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenSyTrader, owner, this.mintSy);
         const tokenPtTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenPtTrader, owner, this.mintPt);
         const tokenBaseTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenBaseTrader, owner, this.flavor.mintBase);
@@ -704,7 +712,7 @@ class Market {
             depositorSyTokenAccount: tokenSyTrader,
         });
         const mintSyRemAccounts = mintSyIx.keys;
-        console.log("mintSyRemAccounts", mintSyRemAccounts);
+        // console.log("mintSyRemAccounts", mintSyRemAccounts)
         mintSyRemAccounts.push({
             pubkey: this.coreProgram.programId,
             isWritable: false,
@@ -716,7 +724,7 @@ class Market {
             // ...this.cpiAccounts.withdrawSy,
         ]);
         const ix = await this.coreProgram.methods
-            .wrapperBuyPt(new anchor_2.BN(ptOut.toString()), new anchor_2.BN(maxBaseIn.toString()), mintSyRemAccounts.length - 1)
+            .wrapperBuyPt(new anchor_1.BN(ptOut.toString()), new anchor_1.BN(maxBaseIn.toString()), mintSyRemAccounts.length - 1)
             .accountsStrict({
             addressLookupTable: this.addressLookupTable,
             buyer: owner,
@@ -738,11 +746,11 @@ class Market {
             setupIxs: [tokenSyTraderAtaIx, tokenPtTraderAtaIx, tokenBaseTraderAtaIx],
         };
     }
-    async ixWrapperSellPt({ owner, amount, minBaseOut, tokenSyTrader, tokenPtTrader, tokenBaseTrader, }) {
-        tokenSyTrader = tokenSyTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtTrader = tokenPtTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseTrader =
-            tokenBaseTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
+    async ixWrapperSellPt({ owner, amount, minBaseOut, tokenSyTrader: tokenSyTraderParam, tokenPtTrader: tokenPtTraderParam, tokenBaseTrader: tokenBaseTraderParam, }) {
+        const tokenSyTrader = tokenSyTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtTrader = tokenPtTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseTrader = tokenBaseTraderParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
         const tokenSyTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenSyTrader, owner, this.mintSy);
         const tokenPtTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenPtTrader, owner, this.mintPt);
         const tokenBaseTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenBaseTrader, owner, this.flavor.mintBase);
@@ -755,7 +763,7 @@ class Market {
         const redeemSyRemAccounts = redeemSyIx.keys;
         const remainingAccounts = (0, utils_1.uniqueRemainingAccounts)([...this.cpiAccounts.getSyState, ...this.cpiAccounts.withdrawSy]);
         const ix = await this.coreProgram.methods
-            .wrapperSellPt(new anchor_2.BN(amount.toString()), new anchor_2.BN(minBaseOut.toString()), redeemSyRemAccounts.length)
+            .wrapperSellPt(new anchor_1.BN(amount.toString()), new anchor_1.BN(minBaseOut.toString()), redeemSyRemAccounts.length)
             .accountsStrict({
             seller: owner,
             market: this.selfAddress,
@@ -777,12 +785,12 @@ class Market {
             setupIxs: [tokenSyTraderAtaIx, tokenPtTraderAtaIx, tokenBaseTraderAtaIx],
         };
     }
-    async ixWrapperBuyYt({ owner, ytOut, maxBaseIn, tokenSyTrader, tokenPtTrader, tokenYtTrader, tokenBaseTrader, }) {
-        tokenSyTrader = tokenSyTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtTrader = tokenPtTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenYtTrader = tokenYtTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseTrader =
-            tokenBaseTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
+    async ixWrapperBuyYt({ owner, ytOut, maxBaseIn, tokenSyTrader: tokenSyTraderParam, tokenPtTrader: tokenPtTraderParam, tokenYtTrader: tokenYtTraderParam, tokenBaseTrader: tokenBaseTraderParam, }) {
+        const tokenSyTrader = tokenSyTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtTrader = tokenPtTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenYtTrader = tokenYtTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseTrader = tokenBaseTraderParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
         const tokenSyTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenSyTrader, owner, this.mintSy);
         const tokenPtTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenPtTrader, owner, this.mintPt);
         const tokenYtTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenYtTrader, owner, this.mintYt);
@@ -802,7 +810,7 @@ class Market {
         ]);
         const allRemainingAccounts = mintSyRemAccounts.concat(remainingAccounts);
         const ix1 = await this.coreProgram.methods
-            .wrapperBuyYt(new anchor_2.BN(ytOut.toString()), new anchor_2.BN(maxBaseIn.toString()), mintSyRemAccounts.length - 1)
+            .wrapperBuyYt(new anchor_1.BN(ytOut.toString()), new anchor_1.BN(maxBaseIn.toString()), mintSyRemAccounts.length)
             .accountsStrict({
             buyer: owner,
             market: this.selfAddress,
@@ -831,7 +839,7 @@ class Market {
             .remainingAccounts(allRemainingAccounts)
             .instruction();
         const ix2 = await this.coreProgram.methods
-            .depositYt(new anchor_2.BN(ytOut.toString()))
+            .depositYt(new anchor_1.BN(ytOut.toString()))
             .accountsStrict({
             depositor: owner,
             vault: this.vault.selfAddress,
@@ -858,12 +866,12 @@ class Market {
             setupIxs: [tokenSyTraderAtaIx, tokenPtTraderAtaIx, tokenYtTraderAtaIx],
         };
     }
-    async ixWrapperSellYt({ owner, amount, minBaseOut, tokenBaseTrader, tokenSyTrader, tokenYtTrader, tokenPtTrader, }) {
-        tokenBaseTrader =
-            tokenBaseTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
-        tokenSyTrader = tokenSyTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenYtTrader = tokenYtTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtTrader = tokenPtTrader || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixWrapperSellYt({ owner, amount, minBaseOut, tokenBaseTrader: tokenBaseTraderParam, tokenSyTrader: tokenSyTraderParam, tokenYtTrader: tokenYtTraderParam, tokenPtTrader: tokenPtTraderParam, }) {
+        const tokenBaseTrader = tokenBaseTraderParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
+        const tokenSyTrader = tokenSyTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenYtTrader = tokenYtTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtTrader = tokenPtTraderParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenSyTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenSyTrader, owner, this.mintSy);
         const tokenPtTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenPtTrader, owner, this.mintPt);
         const tokenYtTraderAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenYtTrader, owner, this.mintYt);
@@ -880,14 +888,14 @@ class Market {
             ...this.cpiAccounts.withdrawSy,
             ...this.vault.cpiAccounts.depositSy,
         ]);
-        console.log(" remaining accounts length", remainingAccounts.length);
+        // console.log(" remaining accounts length", remainingAccounts.length)
         // remainingAccounts.push({
         //   pubkey: this.coreProgram.programId,
         //   isWritable: false,
         //   isSigner: false,
         // })
         const ix1 = await this.coreProgram.methods
-            .withdrawYt(new anchor_2.BN(amount.toString()))
+            .withdrawYt(new anchor_1.BN(amount.toString()))
             .accountsStrict({
             ytDst: tokenYtTrader,
             escrowYt: this.vault.escrowYt,
@@ -906,7 +914,7 @@ class Market {
             .remainingAccounts(remainingAccounts)
             .instruction();
         const ix2 = await this.coreProgram.methods
-            .wrapperSellYt(new anchor_2.BN(amount.toString()), new anchor_2.BN(minBaseOut.toString()), redeemSyRemAccounts.length)
+            .wrapperSellYt(new anchor_1.BN(amount.toString()), new anchor_1.BN(minBaseOut.toString()), redeemSyRemAccounts.length)
             .accountsStrict({
             seller: owner,
             market: this.selfAddress,
@@ -967,20 +975,19 @@ class Market {
         };
     }
     /** Provide liquidity from a base asset - and receive YT and LP tokens in return */
-    async ixProvideLiquidityNoPriceImpact({ depositor, amountBase, minLpOut, tokenSyDepositor, tokenYtDepositor, tokenPtDepositor, tokenBaseDepositor, tokenLpDepositor, }) {
-        tokenSyDepositor = tokenSyDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenYtDepositor = tokenYtDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtDepositor = tokenPtDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseDepositor =
-            tokenBaseDepositor ||
-                (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, depositor, true, this.flavor.baseTokenProgram);
-        tokenLpDepositor = tokenLpDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixProvideLiquidityNoPriceImpact({ depositor, amountBase, minLpOut, tokenSyDepositor: tokenSyDepositorParam, tokenYtDepositor: tokenYtDepositorParam, tokenPtDepositor: tokenPtDepositorParam, tokenBaseDepositor: tokenBaseDepositorParam, tokenLpDepositor: tokenLpDepositorParam, }) {
+        const tokenSyDepositor = tokenSyDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenYtDepositor = tokenYtDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtDepositor = tokenPtDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseDepositor = tokenBaseDepositorParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, depositor, true, this.flavor.baseTokenProgram);
+        const tokenLpDepositor = tokenLpDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenSyDepositorAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenSyDepositor, depositor, this.mintSy);
         const tokenYtDepositorAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenYtDepositor, depositor, this.mintYt);
         const tokenPtDepositorAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenPtDepositor, depositor, this.mintPt);
         const tokenLpDepositorAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenLpDepositor, depositor, this.mintLp);
-        const amountBaseBn = new anchor_2.BN(amountBase.toString());
-        const minLpOutBn = new anchor_2.BN(minLpOut.toString());
+        const amountBaseBn = new anchor_1.BN(amountBase.toString());
+        const minLpOutBn = new anchor_1.BN(minLpOut.toString());
         // TODO - fix this
         const mintSyIx = await this.flavor.ixMintSy({
             // argument does not matter - since we are just getting the keys
@@ -990,22 +997,22 @@ class Market {
             depositorSyTokenAccount: tokenSyDepositor,
         });
         const mintSyRemAccounts = mintSyIx.keys;
-        // Log vault accounts before filtering
         const beforeVaultAccounts = [...this.vault.cpiAccounts.getSyState, ...this.vault.cpiAccounts.depositSy];
-        console.log("Before filtering vault accounts:", beforeVaultAccounts.length, "accounts");
+        // Log vault accounts before filtering
+        // console.log("Before filtering vault accounts:", beforeVaultAccounts.length, "accounts")
         // Filter out TOKEN_PROGRAM_ID and SystemProgram.programId from vault remaining accounts
         const vaultCpiRemainingAccounts = beforeVaultAccounts.filter((account) => account.pubkey.toBase58() !== spl_token_1.TOKEN_PROGRAM_ID.toBase58());
         // Log vault accounts after filtering
-        console.log("After filtering vault accounts:", vaultCpiRemainingAccounts.length, "accounts");
+        // console.log("After filtering vault accounts:", vaultCpiRemainingAccounts.length, "accounts")
         // Log market accounts before filtering
         const beforeMarketAccounts = [...this.cpiAccounts.depositSy];
-        console.log("Before filtering market accounts:", beforeMarketAccounts.length, "accounts");
+        // console.log("Before filtering market accounts:", beforeMarketAccounts.length, "accounts")
         // Filter out TOKEN_PROGRAM_ID and SystemProgram.programId from market remaining accounts
         const marketCpiRemainingAccounts = beforeMarketAccounts.filter((account) => account.pubkey.toBase58() !== spl_token_1.TOKEN_PROGRAM_ID.toBase58() &&
             account.pubkey.toBase58() !== anchor_1.web3.SystemProgram.programId.toBase58() &&
             account.pubkey.toBase58() !== this.selfAddress.toBase58());
         // Log market accounts after filtering
-        console.log("After filtering market accounts:", marketCpiRemainingAccounts.length, "accounts");
+        // console.log("After filtering market accounts:", marketCpiRemainingAccounts.length, "accounts")
         // These remaining accounts can be in any order, and they can be unique-ified
         const unorderedRemainingAccounts = (0, utils_1.uniqueRemainingAccounts)([
             ...vaultCpiRemainingAccounts,
@@ -1014,7 +1021,7 @@ class Market {
         const allRemainingAccounts = [...mintSyRemAccounts, ...unorderedRemainingAccounts];
         const lpPosition = this.xponPda.marketLpPosition({ market: this.selfAddress, owner: depositor });
         const ix = await this.coreProgram.methods
-            .wrapperProvideLiquidity(amountBaseBn, minLpOutBn, mintSyRemAccounts.length - 1)
+            .wrapperProvideLiquidity(amountBaseBn, minLpOutBn, mintSyRemAccounts.length)
             .accountsStrict({
             depositor,
             authority: this.vault.authority,
@@ -1045,7 +1052,7 @@ class Market {
         })
             .remainingAccounts(allRemainingAccounts)
             .instruction();
-        console.log("ix accounts length", ix.keys.length);
+        // console.log("ix accounts length", ix.keys.length)
         return {
             ixs: [
                 ...(await this.flavor.preIxs({ signer: depositor })),
@@ -1055,14 +1062,13 @@ class Market {
             setupIxs: [tokenSyDepositorAtaIx, tokenYtDepositorAtaIx, tokenPtDepositorAtaIx, tokenLpDepositorAtaIx],
         };
     }
-    async ixProvideLiquidityBase({ depositor, amountBase, minLpOut, externalPtToBuy, externalSyConstraint, tokenSyDepositor, tokenYtDepositor, tokenPtDepositor, tokenBaseDepositor, tokenLpDepositor, }) {
-        tokenSyDepositor = tokenSyDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenYtDepositor = tokenYtDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtDepositor = tokenPtDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseDepositor =
-            tokenBaseDepositor ||
-                (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, depositor, true, this.flavor.baseTokenProgram);
-        tokenLpDepositor = tokenLpDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixProvideLiquidityBase({ depositor, amountBase, minLpOut, externalPtToBuy, externalSyConstraint, tokenSyDepositor: tokenSyDepositorParam, tokenYtDepositor: tokenYtDepositorParam, tokenPtDepositor: tokenPtDepositorParam, tokenBaseDepositor: tokenBaseDepositorParam, tokenLpDepositor: tokenLpDepositorParam, }) {
+        const tokenSyDepositor = tokenSyDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenYtDepositor = tokenYtDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtDepositor = tokenPtDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseDepositor = tokenBaseDepositorParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, depositor, true, this.flavor.baseTokenProgram);
+        const tokenLpDepositor = tokenLpDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenSyAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenSyDepositor, depositor, this.mintSy);
         const tokenYtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenYtDepositor, depositor, this.mintYt);
         const tokenPtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenPtDepositor, depositor, this.mintPt);
@@ -1081,7 +1087,7 @@ class Market {
         });
         const mintSyRemAccounts = mintSyIx.keys;
         const ix = await this.coreProgram.methods
-            .wrapperProvideLiquidityBase(new anchor_2.BN(amountBase.toString()), new anchor_2.BN(minLpOut.toString()), mintSyRemAccounts.length - 1, new anchor_2.BN(externalPtToBuy.toString()), new anchor_2.BN(externalSyConstraint.toString()))
+            .wrapperProvideLiquidityBase(new anchor_1.BN(amountBase.toString()), new anchor_1.BN(minLpOut.toString()), mintSyRemAccounts.length, new anchor_1.BN(externalPtToBuy.toString()), new anchor_1.BN(externalSyConstraint.toString()))
             .accountsStrict({
             depositor,
             lpPosition,
@@ -1112,14 +1118,13 @@ class Market {
             setupIxs: [tokenSyAtaIx, tokenYtAtaIx, tokenPtAtaIx, tokenBaseAtaIx, tokenLpAtaIx],
         };
     }
-    async ixProvideLiquidityClassic({ depositor, amountBase, amountPt, minLpOut, tokenSyDepositor, tokenYtDepositor, tokenPtDepositor, tokenBaseDepositor, tokenLpDepositor, }) {
-        tokenSyDepositor = tokenSyDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenYtDepositor = tokenYtDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtDepositor = tokenPtDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseDepositor =
-            tokenBaseDepositor ||
-                (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, depositor, true, this.flavor.baseTokenProgram);
-        tokenLpDepositor = tokenLpDepositor || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixProvideLiquidityClassic({ depositor, amountBase, amountPt, minLpOut, tokenSyDepositor: tokenSyDepositorParam, tokenYtDepositor: tokenYtDepositorParam, tokenPtDepositor: tokenPtDepositorParam, tokenBaseDepositor: tokenBaseDepositorParam, tokenLpDepositor: tokenLpDepositorParam, }) {
+        const tokenSyDepositor = tokenSyDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenYtDepositor = tokenYtDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtDepositor = tokenPtDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseDepositor = tokenBaseDepositorParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, depositor, true, this.flavor.baseTokenProgram);
+        const tokenLpDepositor = tokenLpDepositorParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, depositor, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenSyAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenSyDepositor, depositor, this.mintSy);
         const tokenYtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenYtDepositor, depositor, this.mintYt);
         const tokenPtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor, tokenPtDepositor, depositor, this.mintPt);
@@ -1137,7 +1142,7 @@ class Market {
         });
         const mintSyRemAccounts = mintSyIx.keys;
         const ix = await this.coreProgram.methods
-            .wrapperProvideLiquidityClassic(new anchor_2.BN(amountBase.toString()), new anchor_2.BN(amountPt.toString()), new anchor_2.BN(minLpOut.toString()), mintSyRemAccounts.length - 1)
+            .wrapperProvideLiquidityClassic(new anchor_1.BN(amountBase.toString()), new anchor_1.BN(amountPt.toString()), new anchor_1.BN(minLpOut.toString()), mintSyRemAccounts.length)
             .accountsStrict({
             depositor,
             lpPosition,
@@ -1167,14 +1172,13 @@ class Market {
             setupIxs: [tokenSyAtaIx, tokenYtAtaIx, tokenPtAtaIx, tokenLpAtaIx],
         };
     }
-    async ixWithdrawLiquidityToBase({ owner, amountLp, minBaseOut, tokenSyWithdrawer, tokenYtWithdrawer, tokenPtWithdrawer, tokenBaseWithdrawer, tokenLpWithdrawer, }) {
-        tokenSyWithdrawer = tokenSyWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenYtWithdrawer = tokenYtWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtWithdrawer = tokenPtWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseWithdrawer =
-            tokenBaseWithdrawer ||
-                (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
-        tokenLpWithdrawer = tokenLpWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixWithdrawLiquidityToBase({ owner, amountLp, minBaseOut, tokenSyWithdrawer: tokenSyWithdrawerParam, tokenYtWithdrawer: tokenYtWithdrawerParam, tokenPtWithdrawer: tokenPtWithdrawerParam, tokenBaseWithdrawer: tokenBaseWithdrawerParam, tokenLpWithdrawer: tokenLpWithdrawerParam, }) {
+        const tokenSyWithdrawer = tokenSyWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenYtWithdrawer = tokenYtWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtWithdrawer = tokenPtWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseWithdrawer = tokenBaseWithdrawerParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
+        const tokenLpWithdrawer = tokenLpWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenSyAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenSyWithdrawer, owner, this.mintSy);
         const tokenYtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenYtWithdrawer, owner, this.mintYt);
         const tokenPtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenPtWithdrawer, owner, this.mintPt);
@@ -1194,7 +1198,7 @@ class Market {
         const redeemSyRemAccounts = redeemSyIx.keys;
         const minSyOut = Number(minBaseOut) / this.currentSyExchangeRate;
         const ix = await this.coreProgram.methods
-            .wrapperWithdrawLiquidity(new anchor_2.BN(amountLp.toString()), new anchor_2.BN(minSyOut.toFixed(0).toString()), redeemSyRemAccounts.length)
+            .wrapperWithdrawLiquidity(new anchor_1.BN(amountLp.toString()), new anchor_1.BN(minSyOut.toFixed(0).toString()), redeemSyRemAccounts.length)
             .accountsStrict({
             market: this.selfAddress,
             tokenPtEscrow: this.tokenPtEscrow,
@@ -1221,14 +1225,13 @@ class Market {
             setupIxs: [tokenSyAtaIx, tokenYtAtaIx, tokenPtAtaIx, tokenBaseAtaIx, tokenLpAtaIx],
         };
     }
-    async ixWithdrawLiquidityClassic({ owner, amountLp, minBaseOut, tokenSyWithdrawer, tokenYtWithdrawer, tokenPtWithdrawer, tokenBaseWithdrawer, tokenLpWithdrawer, }) {
-        tokenSyWithdrawer = tokenSyWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenYtWithdrawer = tokenYtWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenPtWithdrawer = tokenPtWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
-        tokenBaseWithdrawer =
-            tokenBaseWithdrawer ||
-                (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
-        tokenLpWithdrawer = tokenLpWithdrawer || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+    async ixWithdrawLiquidityClassic({ owner, amountLp, tokenSyWithdrawer: tokenSyWithdrawerParam, tokenYtWithdrawer: tokenYtWithdrawerParam, tokenPtWithdrawer: tokenPtWithdrawerParam, tokenBaseWithdrawer: tokenBaseWithdrawerParam, tokenLpWithdrawer: tokenLpWithdrawerParam, }) {
+        const tokenSyWithdrawer = tokenSyWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintSy, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenYtWithdrawer = tokenYtWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintYt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenPtWithdrawer = tokenPtWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintPt, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const tokenBaseWithdrawer = tokenBaseWithdrawerParam ||
+            (0, spl_token_1.getAssociatedTokenAddressSync)(this.flavor.mintBase, owner, true, this.flavor.baseTokenProgram);
+        const tokenLpWithdrawer = tokenLpWithdrawerParam || (0, spl_token_1.getAssociatedTokenAddressSync)(this.mintLp, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
         const tokenSyAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenSyWithdrawer, owner, this.mintSy);
         const tokenYtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenYtWithdrawer, owner, this.mintYt);
         const tokenPtAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenPtWithdrawer, owner, this.mintPt);
@@ -1247,7 +1250,7 @@ class Market {
         });
         const redeemSyRemAccounts = redeemSyIx.keys;
         const ixn = await this.coreProgram.methods
-            .wrapperWithdrawLiquidityClassic(new anchor_2.BN(amountLp.toString()), redeemSyRemAccounts.length)
+            .wrapperWithdrawLiquidityClassic(new anchor_1.BN(amountLp.toString()), redeemSyRemAccounts.length)
             .accountsStrict({
             market: this.selfAddress,
             tokenPtEscrow: this.tokenPtEscrow,
@@ -1273,8 +1276,8 @@ class Market {
             setupIxs: [tokenSyAtaIx, tokenYtAtaIx, tokenPtAtaIx, tokenBaseAtaIx, tokenLpAtaIx],
         };
     }
-    async claimFarmEmissions({ owner, mint, tokenProgram, tokenDst, }) {
-        tokenDst = tokenDst || (0, spl_token_1.getAssociatedTokenAddressSync)(mint, owner, true, tokenProgram);
+    async claimFarmEmissions({ owner, mint, tokenProgram, tokenDst: tokenDstParam, }) {
+        const tokenDst = tokenDstParam || (0, spl_token_1.getAssociatedTokenAddressSync)(mint, owner, true, tokenProgram);
         const lpPosition = this.xponPda.marketLpPosition({ market: this.selfAddress, owner });
         const tokenFarm = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, this.selfAddress, true, tokenProgram);
         const tokenAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(owner, tokenDst, owner, mint);
@@ -1318,12 +1321,12 @@ class Market {
             addMarketEmissionIx: ix,
         };
     }
-    async addFarm({ signer, farmMint, farmRewardTokenProgram, emissionsRate, untilTimestamp, farmRewardSrc, feePayer, }) {
-        feePayer = feePayer || signer;
+    async addFarm({ signer, farmMint, farmRewardTokenProgram, emissionsRate, untilTimestamp, farmRewardSrc: farmRewardSrcParam, feePayer: feePayerParam, }) {
+        const feePayer = feePayerParam || signer;
         const farmRewardEscrow = (0, spl_token_1.getAssociatedTokenAddressSync)(farmMint, this.selfAddress, true, farmRewardTokenProgram);
-        farmRewardSrc = farmRewardSrc || (0, spl_token_1.getAssociatedTokenAddressSync)(farmMint, signer, true, farmRewardTokenProgram);
+        const farmRewardSrc = farmRewardSrcParam || (0, spl_token_1.getAssociatedTokenAddressSync)(farmMint, signer, true, farmRewardTokenProgram);
         const ix = await this.coreProgram.methods
-            .addFarm(new anchor_2.BN(emissionsRate), untilTimestamp)
+            .addFarm(new anchor_1.BN(emissionsRate), untilTimestamp)
             .accountsStrict({
             adminState: (0, utils_1.getExponentAdminStatePda)(),
             market: this.selfAddress,
@@ -1341,20 +1344,20 @@ class Market {
         };
     }
     /** Calculate available liquidity for PT trades
-     * @param is_buy - true if buying PT with SY, false if selling PT for SY
-     * @param size_pt - amount of PT to trade (in PT decimals)
+     * @param isBuy - true if buying PT with SY, false if selling PT for SY
+     * @param sizePt - amount of PT to trade (in PT decimals)
      * @returns amount of PT that can be traded given current liquidity
      */
-    liquidityAvailable(is_buy, size_pt) {
+    liquidityAvailable(isBuy, sizePt) {
         const calc = this.marketCalculator();
-        if (is_buy) {
+        if (isBuy) {
             // When buying PT, we're limited by SY liquidity
             // Convert PT amount to SY using current price
-            const syNeeded = Number(size_pt) * calc.exchangeRate;
+            const syNeeded = Number(sizePt) * calc.exchangeRate;
             // Available SY in the market
             const syAvailable = Number(this.syBalance);
             if (syNeeded <= syAvailable) {
-                return size_pt;
+                return sizePt;
             }
             else {
                 // Calculate max PT that can be bought with available SY
@@ -1364,8 +1367,8 @@ class Market {
         else {
             // When selling PT, we're limited by PT liquidity in the market
             const ptAvailable = this.ptBalance;
-            if (size_pt <= ptAvailable) {
-                return size_pt;
+            if (sizePt <= ptAvailable) {
+                return sizePt;
             }
             else {
                 return ptAvailable;
@@ -1374,58 +1377,59 @@ class Market {
     }
 }
 exports.Market = Market;
-function toJson(m) {
-    const c = m.marketCalculator();
+function toJson(market) {
+    const marketCalculator = market.marketCalculator();
     return {
-        treasurySyTokenAccount: m.state.tokenFeeTreasurySy.toBase58(),
-        address: m.selfAddress.toBase58(),
-        addressLookupTable: m.addressLookupTable.toBase58(),
-        tokenSyEscrow: m.tokenSyEscrow.toBase58(),
-        tokenPtEscrow: m.tokenPtEscrow.toBase58(),
-        tokenLpEscrow: m.tokenLpEscrow.toBase58(),
-        lpSupply: m.state.lpSupply.toString(),
-        syProgram: m.state.syProgram.toBase58(),
-        mintPt: m.state.mintPt.toBase58(),
-        mintSy: m.state.mintSy.toBase58(),
-        mintLp: m.state.mintLp.toBase58(),
-        feeTreasurySyBps: m.state.feeTreasurySyBps,
-        ptBalance: m.state.ptBalance.toString(),
-        syBalance: m.state.syBalance.toString(),
-        currentSyRate: m.flavor.currentSyExchangeRate,
-        expirationTs: m.state.expirationTs,
-        expirationDate: new Date(m.state.expirationTs * 1000).toISOString(),
-        lnFeeRateRoot: m.state.lnFeeRateRoot,
-        rateScalarRoot: m.state.rateScalarRoot,
-        lastLnImpliedRate: m.state.lastLnImpliedRate,
-        currentPtPriceInSy: m.currentPtPriceInSy,
-        currentPtPriceInAsset: m.currentPtPriceInAsset,
-        secondsRemaining: m.secondsRemaining,
-        proportionPtInAsset: c.proportionPtInAsset,
-        proportionPtInSy: c.proportionPtInSy,
-        currentFeeRate: c.feeRate,
-        currentRateScalar: c.rateScalar,
-        currentRateAnchor: c.findRateAnchor(),
-        cpiAccounts: (0, exponent_types_1.serializeCpiAccountsRaw)(m.cpiAccounts),
+        treasurySyTokenAccount: market.state.tokenFeeTreasurySy.toBase58(),
+        address: market.selfAddress.toBase58(),
+        addressLookupTable: market.addressLookupTable.toBase58(),
+        tokenSyEscrow: market.tokenSyEscrow.toBase58(),
+        tokenPtEscrow: market.tokenPtEscrow.toBase58(),
+        tokenLpEscrow: market.tokenLpEscrow.toBase58(),
+        lpSupply: market.state.lpSupply.toString(),
+        syProgram: market.state.syProgram.toBase58(),
+        mintPt: market.state.mintPt.toBase58(),
+        mintSy: market.state.mintSy.toBase58(),
+        mintLp: market.state.mintLp.toBase58(),
+        feeTreasurySyBps: market.state.feeTreasurySyBps,
+        ptBalance: market.state.ptBalance.toString(),
+        syBalance: market.state.syBalance.toString(),
+        currentSyRate: market.flavor.currentSyExchangeRate,
+        expirationTs: market.state.expirationTs,
+        expirationDate: new Date(market.state.expirationTs * 1000).toISOString(),
+        lnFeeRateRoot: market.state.lnFeeRateRoot,
+        rateScalarRoot: market.state.rateScalarRoot,
+        lastLnImpliedRate: market.state.lastLnImpliedRate,
+        currentPtPriceInSy: market.currentPtPriceInSy,
+        currentPtPriceInAsset: market.currentPtPriceInAsset,
+        secondsRemaining: market.secondsRemaining,
+        proportionPtInAsset: marketCalculator.proportionPtInAsset,
+        proportionPtInSy: marketCalculator.proportionPtInSy,
+        currentFeeRate: marketCalculator.feeRate,
+        currentRateScalar: marketCalculator.rateScalar,
+        currentRateAnchor: marketCalculator.findRateAnchor(),
+        cpiAccounts: (0, exponent_types_1.serializeCpiAccountsRaw)(market.cpiAccounts),
         emissions: {
-            trackers: m.marketEmissions.trackers.map((e) => ({
+            trackers: market.marketEmissions.trackers.map((e) => ({
                 tokenEscrow: e.tokenEscrow.toBase58(),
                 lpShareIndex: e.lpShareIndex,
                 lastSeenStaged: e.lastSeenStaged,
             })),
         },
-        ptApr: m.ptApr,
-        lpEscrowAmount: m.state.lpEscrowAmount.toString(),
-        maxLpSupply: m.state.maxLpSupply.toString(),
+        ptApr: market.ptApr,
+        ptApy: market.ptApy,
+        lpEscrowAmount: market.state.lpEscrowAmount.toString(),
+        maxLpSupply: market.state.maxLpSupply.toString(),
         liquidityNetBalanceLimits: {
-            windowStartTimestamp: m.state.liquidityNetBalanceLimits.windowStartTimestamp,
-            windowStartNetBalance: m.state.liquidityNetBalanceLimits.windowStartNetBalance.toString(),
-            maxNetBalanceChangeNegativePercentage: m.state.liquidityNetBalanceLimits.maxNetBalanceChangeNegativePercentage,
-            maxNetBalanceChangePositivePercentage: m.state.liquidityNetBalanceLimits.maxNetBalanceChangePositivePercentage,
-            windowDurationSeconds: m.state.liquidityNetBalanceLimits.windowDurationSeconds,
+            windowStartTimestamp: market.state.liquidityNetBalanceLimits.windowStartTimestamp,
+            windowStartNetBalance: market.state.liquidityNetBalanceLimits.windowStartNetBalance.toString(),
+            maxNetBalanceChangeNegativePercentage: market.state.liquidityNetBalanceLimits.maxNetBalanceChangeNegativePercentage,
+            maxNetBalanceChangePositivePercentage: market.state.liquidityNetBalanceLimits.maxNetBalanceChangePositivePercentage,
+            windowDurationSeconds: market.state.liquidityNetBalanceLimits.windowDurationSeconds,
         },
         lpFarm: {
-            lastSeenTimestamp: m.state.lpFarm.lastSeenTimestamp,
-            farmEmissions: m.state.lpFarm.farmEmissions.map((e) => ({
+            lastSeenTimestamp: market.state.lpFarm.lastSeenTimestamp,
+            farmEmissions: market.state.lpFarm.farmEmissions.map((e) => ({
                 mint: e.mint.toBase58(),
                 tokenRate: e.tokenRate.toString(),
                 expiryTimestamp: e.expiryTimestamp,