@exponent-labs/exponent-sdk 0.0.9 → 0.1.0

package/build/index.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAkE;AAAzD,gGAAA,MAAM,OAAA;AACf,iCAA+B;AAAtB,8FAAA,KAAK,OAAA;AACd,2CAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,2CAAyC;AAAhC,wGAAA,UAAU,OAAA;AACnB,mCAAuC;AAA9B,sGAAA,YAAY,OAAA;AAGrB,mDAAkC;AAClC,gDAA6B;AAC7B,qDAAoC;AACpC,2CAA6C;AAApC,4GAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAkE;AAAzD,gGAAA,MAAM,OAAA;AACf,iCAA+B;AAAtB,8FAAA,KAAK,OAAA;AACd,2CAA0D;AAAjD,wGAAA,UAAU,OAAA;AACnB,2CAAyC;AAAhC,wGAAA,UAAU,OAAA;AACnB,mCAAuC;AAA9B,sGAAA,YAAY,OAAA;AAGrB,mDAAkC;AAClC,gDAA6B;AAC7B,qDAAoC;AACpC,2CAA6C;AAApC,4GAAA,cAAc,OAAA"}

package/build/lpPosition.d.ts

@@ -1,8 +1,8 @@
 import { Program, web3 } from "@coral-xyz/anchor";
-import { Market } from "./market";
-import { Environment } from "./environment";
-import { ExponentCore } from "@exponent-labs/exponent-idl";
 import { ExponentFetcher } from "@exponent-labs/exponent-fetcher";
+import { ExponentCore } from "@exponent-labs/exponent-idl";
+import { Environment } from "./environment";
+import { Market } from "./market";
 export interface EmissionTracker {
     lastSeenIndex: number;
     staged: bigint;
@@ -22,8 +22,9 @@ export declare class LpPosition {
     state: LpPositionState;
     coreProgram: Program<ExponentCore>;
     constructor(env: Environment, connection: web3.Connection, selfAddress: web3.PublicKey, state: LpPositionState);
-    static load(env: Environment, connection: web3.Connection, address: web3.PublicKey): Promise<LpPosition>;
-    reload(conn?: web3.Connection): Promise<LpPosition>;
+    static load(env: Environment, connection: web3.Connection, address: web3.PublicKey, market?: Market): Promise<LpPosition>;
+    static loadAllByOwner(env: Environment, connection: web3.Connection, owner: web3.PublicKey, markets: (Market | web3.PublicKey)[]): Promise<LpPosition[]>;
+    reload(connection?: web3.Connection): Promise<LpPosition>;
     get lpBalance(): bigint;
     get owner(): web3.PublicKey;
     get marketSdk(): Market;

package/build/lpPosition.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LpPosition = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
-const market_1 = require("./market");
-const exponent_idl_1 = require("@exponent-labs/exponent-idl");
 const exponent_fetcher_1 = require("@exponent-labs/exponent-fetcher");
+const exponent_idl_1 = require("@exponent-labs/exponent-idl");
+const exponent_pda_1 = require("@exponent-labs/exponent-pda");
 const precise_number_1 = require("@exponent-labs/precise-number");
+const market_1 = require("./market");
 class LpPosition {
     env;
     connection;
@@ -20,24 +21,41 @@ class LpPosition {
         const mockWallet = new market_1.MyWallet(anchor_1.web3.Keypair.generate());
         this.coreProgram = new anchor_1.Program(exponent_idl_1.IDL, new anchor_1.AnchorProvider(connection, mockWallet));
     }
-    static async load(env, connection, address) {
+    static async load(env, connection, address, market) {
         const fetcher = new exponent_fetcher_1.ExponentFetcher({ connection });
-        const x = await fetcher.fetchLpPosition(address);
-        const market = await market_1.Market.load(env, connection, x.market);
-        const state = {
-            owner: x.owner,
-            balanceLp: x.lpBalance,
-            market,
-            emissionTrackers: x.emissions,
-            farms: x.farms,
+        const fetchedLpPosition = await fetcher.fetchLpPosition(address);
+        const loadedMarket = market ?? (await market_1.Market.load(env, connection, fetchedLpPosition.market));
+        const lpPositionState = {
+            owner: fetchedLpPosition.owner,
+            balanceLp: fetchedLpPosition.lpBalance,
+            market: loadedMarket,
+            emissionTrackers: fetchedLpPosition.emissions,
+            farms: fetchedLpPosition.farms,
             fetcher: fetcher,
         };
-        return new LpPosition(env, connection, address, state);
+        return new LpPosition(env, connection, address, lpPositionState);
+    }
+    static async loadAllByOwner(env, connection, owner, markets) {
+        const pda = new exponent_pda_1.ExponentPDA(env.coreProgramId);
+        const addresses = markets.map((m) => pda.marketLpPosition({
+            market: m instanceof anchor_1.web3.PublicKey ? m : m.selfAddress,
+            owner,
+        }));
+        const positionPromises = addresses.map((addr) => {
+            try {
+                return LpPosition.load(env, connection, addr);
+            }
+            catch {
+                return Promise.resolve(null);
+            }
+        });
+        const positions = await Promise.all(positionPromises);
+        return positions.filter((p) => p !== null);
     }
-    async reload(conn = this.connection) {
-        const x = await LpPosition.load(this.env, conn, this.selfAddress);
-        this.state = x.state;
-        return x;
+    async reload(connection = this.connection) {
+        const lpPosition = await LpPosition.load(this.env, connection, this.selfAddress);
+        this.state = lpPosition.state;
+        return lpPosition;
     }
     get lpBalance() {
         return this.state.balanceLp;
@@ -71,8 +89,8 @@ class LpPosition {
             return null;
         const marketFarm = this.state.market.state.lpFarm.farmEmissions[marketFarmIndex];
         const positionFarm = this.state.farms[marketFarmIndex];
-        const ts = new Date().getTime() / 1000;
-        const deltaTimeFarm = ts - this.marketSdk.state.lpFarm.lastSeenTimestamp;
+        const timeNow = new Date().getTime() / 1000;
+        const deltaTimeFarm = timeNow - this.marketSdk.state.lpFarm.lastSeenTimestamp;
         const lpStakedTotal = this.marketSdk.state.lpEscrowAmount;
         const tokensEmitted = Number(marketFarm.tokenRate) * deltaTimeFarm;
         const increaseAmount = Number(tokensEmitted) / Number(lpStakedTotal);
@@ -83,7 +101,7 @@ class LpPosition {
     }
     async getClaimableMarketEmissions() {
         const syPosition = this.marketSdk.state.syPosition;
-        return this.state.market.emissions.map((emission, index) => {
+        return this.state.market.emissions.map((_, index) => {
             const marketEmission = this.state.market.marketEmissions.trackers[index];
             const positionEmission = this.state.emissionTrackers[index];
             if (!positionEmission)

package/build/lpPosition.js.map

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

package/build/market.d.ts

@@ -1,14 +1,12 @@
-import { Program, Wallet, web3 } from "@coral-xyz/anchor";
+/// <reference types="bn.js" />
+import { BN, Program, Wallet, web3 } from "@coral-xyz/anchor";
 import { LiquidityNetBalanceLimits, LpFarm } from "@exponent-labs/exponent-fetcher";
-import { Environment } from "./environment";
 import { ExponentCore } from "@exponent-labs/exponent-idl";
-import { BN } from "@coral-xyz/anchor";
 import { ExponentPDA } from "@exponent-labs/exponent-pda";
-import { Vault } from "./vault";
+import { AnchorizedPNum, CpiAccountsRaw, CpiAccountsRawJson, Flavor, SyPosition } from "@exponent-labs/exponent-types";
 import { LiquidityAdd, MarketCalculator } from "@exponent-labs/market-math";
-import { CpiAccountsRaw, Flavor, SyPosition } from "@exponent-labs/exponent-types";
-import { AnchorizedPNum } from "@exponent-labs/exponent-types";
-import { CpiAccountsRawJson } from "@exponent-labs/exponent-types";
+import { Environment } from "./environment";
+import { Vault } from "./vault";
 export { LiquidityAdd };
 interface Emission {
     /** Token account that holds emission tokens */
@@ -99,7 +97,7 @@ export declare class Market {
     xponPda: ExponentPDA;
     constructor(state: MarketArgs, selfAddress: web3.PublicKey, env: Environment, connection: web3.Connection);
     static load(env: Environment, connection: web3.Connection, address: web3.PublicKey, vault?: Vault, options?: MarketLoadOptions): Promise<Market>;
-    reload(conn?: web3.Connection): Promise<Market>;
+    reload(connection?: web3.Connection): Promise<Market>;
     /** Convert to a JSON representation */
     toJson(): MarketJson;
     get vault(): Vault;
@@ -142,9 +140,11 @@ export declare class Market {
     get secondsRemaining(): number;
     get absolutePtYield(): number;
     /** Annualize a rate given the number of seconds remaining until maturity */
-    static annualize(r: number, secondsRemaining: number): number;
+    static annualize(rate: number, secondsRemaining: number): number;
+    static annualizeApy(rate: number, secondsRemaining: number): number;
     /** Annualized PT fixed rate */
     get ptApr(): number;
+    get ptApy(): number;
     /** The fee rate taken off of trade fees (typically around 20%) expressed as a BPS number */
     get feeTreasuryBps(): number;
     /** The fee rate on assets when trading PT
@@ -154,7 +154,7 @@ export declare class Market {
     get feeRatePtTrade(): number;
     /** The fee rate taken off of trade fees (typically around 20%) expressed as a rational number */
     get feeTreasuryRate(): number;
-    /** Calculate amonut of LP tokens to expect for tokens in */
+    /** Calculate amount of LP tokens to expect for tokens in */
     lpOutForTokensIn(syInIntent: bigint, ptInIntent: bigint): LiquidityAdd;
     marketCalculator(): MarketCalculator;
     /** Deposit a pair of tokens as liquidity to the market
@@ -165,7 +165,7 @@ export declare class Market {
      *
      * The token accounts themselves are optional, and will be derived from the depositor's wallet if not provided
      */
-    ixDepositLiquidity({ ptInIntent, syInIntent, minLpOut, depositor, ptSrc, sySrc, lpDst, }: {
+    ixDepositLiquidity({ ptInIntent, syInIntent, minLpOut, depositor, ptSrc: ptSrcParam, sySrc: sySrcParam, lpDst: lpDstParam, }: {
         /** Intended (maximum) amount of PT in */
         ptInIntent: bigint;
         /** Intended (maximum) amount of SY in */
@@ -181,7 +181,7 @@ export declare class Market {
         signer: web3.PublicKey;
         adminAction: MarketAdminAction;
     }): Promise<web3.TransactionInstruction>;
-    ixModifyFarm({ newRate, untilTimestamp, signer, farmMint, farmTokenProgram, farmTokenSrc, }: {
+    ixModifyFarm({ newRate, untilTimestamp, signer, farmMint, farmTokenProgram, farmTokenSrc: farmTokenSrcParam, }: {
         newRate: bigint;
         untilTimestamp: number;
         signer: web3.PublicKey;
@@ -198,7 +198,7 @@ export declare class Market {
      *
      * The token accounts themselves are optional, and will be derived from the withdrawer's wallet if not provided
      */
-    ixWithdrawLiquidity({ lpIn, withdrawer, minPtOut, minSyOut, ptDst, syDst, lpSrc, }: {
+    ixWithdrawLiquidity({ lpIn, withdrawer, minPtOut, minSyOut, ptDst: ptDstParam, syDst: syDstParam, lpSrc: lpSrcParam, }: {
         lpIn: bigint;
         withdrawer: web3.PublicKey;
         minPtOut: bigint;
@@ -246,7 +246,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixTradePt({ trader, traderPt, syConstraint, isBuy, tokenPt, tokenSy, }: {
+    ixTradePt({ trader, traderPt, syConstraint, isBuy, tokenPt: tokenPtParam, tokenSy: tokenSyParam, }: {
         trader: web3.PublicKey;
         traderPt: bigint;
         syConstraint: bigint;
@@ -267,7 +267,7 @@ export declare class Market {
      *
      * The token accounts themselves are optional, and will be derived from the trader's wallet if not provided
      */
-    ixSellYt({ trader, ytIn, minSyOut, ytSrc, ptSrc, syDst, }: {
+    ixSellYt({ trader, ytIn, minSyOut, ytSrc: ytSrcParam, ptSrc: ptSrcParam, syDst: syDstParam, }: {
         trader: web3.PublicKey;
         ytIn: bigint;
         minSyOut: bigint;
@@ -288,7 +288,7 @@ export declare class Market {
      *
      * The token accounts themselves are optional, and will be derived from the trader's wallet if not provided
      */
-    ixBuyYt({ trader, ytOut, maxSyIn, ytTrader, ptTrader, syTrader, }: {
+    ixBuyYt({ trader, ytOut, maxSyIn, ytTrader: ytTraderParam, ptTrader: ptTraderParam, syTrader: syTraderParam, }: {
         trader: web3.PublicKey;
         ytOut: bigint;
         maxSyIn: bigint;
@@ -304,25 +304,25 @@ export declare class Market {
         feePayer?: web3.PublicKey;
     }): Promise<web3.TransactionInstruction>;
     /** Deposit LP tokens into the farming module to earn rewards */
-    ixDepositLp({ owner, amount, lpSrc }: {
+    ixDepositLp({ owner, amount, lpSrc: lpSrcParam, }: {
         owner: web3.PublicKey;
         amount: bigint;
         lpSrc?: web3.PublicKey;
     }): Promise<web3.TransactionInstruction>;
     /** Withdraw LP tokens from the farming module */
-    ixWithdrawLp({ owner, amount, lpDst }: {
+    ixWithdrawLp({ owner, amount, lpDst: lpDstParam, }: {
         owner: web3.PublicKey;
         amount: bigint;
         lpDst?: web3.PublicKey;
     }): Promise<web3.TransactionInstruction>;
-    ixWrapperCollectInterest({ claimer, tokenSyDst }: {
+    ixWrapperCollectInterest({ claimer, tokenSyDst: tokenSyDstParam, }: {
         claimer: web3.PublicKey;
         tokenSyDst?: web3.PublicKey;
     }): Promise<{
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixWrapperBuyPt({ owner, ptOut, maxBaseIn, tokenSyTrader, tokenPtTrader, tokenBaseTrader, }: {
+    ixWrapperBuyPt({ owner, ptOut, maxBaseIn, tokenSyTrader: tokenSyTraderParam, tokenPtTrader: tokenPtTraderParam, tokenBaseTrader: tokenBaseTraderParam, }: {
         owner: web3.PublicKey;
         ptOut: bigint;
         maxBaseIn: bigint;
@@ -333,7 +333,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixWrapperSellPt({ owner, amount, minBaseOut, tokenSyTrader, tokenPtTrader, tokenBaseTrader, }: {
+    ixWrapperSellPt({ owner, amount, minBaseOut, tokenSyTrader: tokenSyTraderParam, tokenPtTrader: tokenPtTraderParam, tokenBaseTrader: tokenBaseTraderParam, }: {
         owner: web3.PublicKey;
         amount: bigint;
         minBaseOut: bigint;
@@ -344,7 +344,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixWrapperBuyYt({ owner, ytOut, maxBaseIn, tokenSyTrader, tokenPtTrader, tokenYtTrader, tokenBaseTrader, }: {
+    ixWrapperBuyYt({ owner, ytOut, maxBaseIn, tokenSyTrader: tokenSyTraderParam, tokenPtTrader: tokenPtTraderParam, tokenYtTrader: tokenYtTraderParam, tokenBaseTrader: tokenBaseTraderParam, }: {
         owner: web3.PublicKey;
         ytOut: bigint;
         maxBaseIn: bigint;
@@ -356,7 +356,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixWrapperSellYt({ owner, amount, minBaseOut, tokenBaseTrader, tokenSyTrader, tokenYtTrader, tokenPtTrader, }: {
+    ixWrapperSellYt({ owner, amount, minBaseOut, tokenBaseTrader: tokenBaseTraderParam, tokenSyTrader: tokenSyTraderParam, tokenYtTrader: tokenYtTraderParam, tokenPtTrader: tokenPtTraderParam, }: {
         owner: web3.PublicKey;
         amount: bigint;
         minBaseOut: bigint;
@@ -377,7 +377,7 @@ export declare class Market {
         setupIxs: web3.TransactionInstruction[];
     }>;
     /** Provide liquidity from a base asset - and receive YT and LP tokens in return */
-    ixProvideLiquidityNoPriceImpact({ depositor, amountBase, minLpOut, tokenSyDepositor, tokenYtDepositor, tokenPtDepositor, tokenBaseDepositor, tokenLpDepositor, }: {
+    ixProvideLiquidityNoPriceImpact({ depositor, amountBase, minLpOut, tokenSyDepositor: tokenSyDepositorParam, tokenYtDepositor: tokenYtDepositorParam, tokenPtDepositor: tokenPtDepositorParam, tokenBaseDepositor: tokenBaseDepositorParam, tokenLpDepositor: tokenLpDepositorParam, }: {
         depositor: web3.PublicKey;
         amountBase: bigint;
         minLpOut: bigint;
@@ -390,7 +390,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixProvideLiquidityBase({ depositor, amountBase, minLpOut, externalPtToBuy, externalSyConstraint, tokenSyDepositor, tokenYtDepositor, tokenPtDepositor, tokenBaseDepositor, tokenLpDepositor, }: {
+    ixProvideLiquidityBase({ depositor, amountBase, minLpOut, externalPtToBuy, externalSyConstraint, tokenSyDepositor: tokenSyDepositorParam, tokenYtDepositor: tokenYtDepositorParam, tokenPtDepositor: tokenPtDepositorParam, tokenBaseDepositor: tokenBaseDepositorParam, tokenLpDepositor: tokenLpDepositorParam, }: {
         depositor: web3.PublicKey;
         amountBase: bigint;
         minLpOut: bigint;
@@ -405,7 +405,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixProvideLiquidityClassic({ depositor, amountBase, amountPt, minLpOut, tokenSyDepositor, tokenYtDepositor, tokenPtDepositor, tokenBaseDepositor, tokenLpDepositor, }: {
+    ixProvideLiquidityClassic({ depositor, amountBase, amountPt, minLpOut, tokenSyDepositor: tokenSyDepositorParam, tokenYtDepositor: tokenYtDepositorParam, tokenPtDepositor: tokenPtDepositorParam, tokenBaseDepositor: tokenBaseDepositorParam, tokenLpDepositor: tokenLpDepositorParam, }: {
         depositor: web3.PublicKey;
         amountBase: bigint;
         amountPt: bigint;
@@ -419,7 +419,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixWithdrawLiquidityToBase({ owner, amountLp, minBaseOut, tokenSyWithdrawer, tokenYtWithdrawer, tokenPtWithdrawer, tokenBaseWithdrawer, tokenLpWithdrawer, }: {
+    ixWithdrawLiquidityToBase({ owner, amountLp, minBaseOut, tokenSyWithdrawer: tokenSyWithdrawerParam, tokenYtWithdrawer: tokenYtWithdrawerParam, tokenPtWithdrawer: tokenPtWithdrawerParam, tokenBaseWithdrawer: tokenBaseWithdrawerParam, tokenLpWithdrawer: tokenLpWithdrawerParam, }: {
         owner: web3.PublicKey;
         amountLp: bigint;
         minBaseOut: bigint;
@@ -432,10 +432,9 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    ixWithdrawLiquidityClassic({ owner, amountLp, minBaseOut, tokenSyWithdrawer, tokenYtWithdrawer, tokenPtWithdrawer, tokenBaseWithdrawer, tokenLpWithdrawer, }: {
+    ixWithdrawLiquidityClassic({ owner, amountLp, tokenSyWithdrawer: tokenSyWithdrawerParam, tokenYtWithdrawer: tokenYtWithdrawerParam, tokenPtWithdrawer: tokenPtWithdrawerParam, tokenBaseWithdrawer: tokenBaseWithdrawerParam, tokenLpWithdrawer: tokenLpWithdrawerParam, }: {
         owner: web3.PublicKey;
         amountLp: bigint;
-        minBaseOut: bigint;
         tokenSyWithdrawer?: web3.PublicKey;
         tokenYtWithdrawer?: web3.PublicKey;
         tokenPtWithdrawer?: web3.PublicKey;
@@ -445,7 +444,7 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
         setupIxs: web3.TransactionInstruction[];
     }>;
-    claimFarmEmissions({ owner, mint, tokenProgram, tokenDst, }: {
+    claimFarmEmissions({ owner, mint, tokenProgram, tokenDst: tokenDstParam, }: {
         owner: web3.PublicKey;
         mint: web3.PublicKey;
         tokenProgram: web3.PublicKey;
@@ -464,7 +463,7 @@ export declare class Market {
         extendAddressLookupTableExtensionAccounts: web3.PublicKey[];
         addMarketEmissionIx: web3.TransactionInstruction;
     }>;
-    addFarm({ signer, farmMint, farmRewardTokenProgram, emissionsRate, untilTimestamp, farmRewardSrc, feePayer, }: {
+    addFarm({ signer, farmMint, farmRewardTokenProgram, emissionsRate, untilTimestamp, farmRewardSrc: farmRewardSrcParam, feePayer: feePayerParam, }: {
         signer: web3.PublicKey;
         farmMint: web3.PublicKey;
         farmRewardTokenProgram: web3.PublicKey;
@@ -476,11 +475,11 @@ export declare class Market {
         ixs: web3.TransactionInstruction[];
     }>;
     /** 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: boolean, size_pt: bigint): bigint;
+    liquidityAvailable(isBuy: boolean, sizePt: bigint): bigint;
 }
 export type MarketJson = {
     /** The market's public key */
@@ -540,6 +539,7 @@ export type MarketJson = {
     cpiAccounts: CpiAccountsRawJson;
     /** Annualized yield for PT */
     ptApr: number;
+    ptApy: number;
     /** Emission tokens */
     emissions: {
         trackers: {