@exponent-labs/exponent-sdk 0.1.7 → 0.9.0

package/src/lpPosition.ts

@@ -1,12 +1,10 @@
-import { AnchorProvider, Program, web3 } from "@coral-xyz/anchor"
-
 import { ExponentFetcher } from "@exponent-labs/exponent-fetcher"
-import { ExponentCore, IDL } from "@exponent-labs/exponent-idl"
 import { ExponentPDA } from "@exponent-labs/exponent-pda"
 import { PreciseNumber } from "@exponent-labs/precise-number"
 
 import { Environment } from "./environment"
-import { Market, MyWallet } from "./market"
+import { Market } from "./market"
+import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js"
 
 export interface EmissionTracker {
   lastSeenIndex: number
@@ -14,7 +12,7 @@ export interface EmissionTracker {
 }
 
 export interface LpPositionState {
-  owner: web3.PublicKey
+  owner: PublicKey
   balanceLp: bigint
   market: Market
   emissionTrackers: EmissionTracker[]
@@ -23,18 +21,15 @@ export interface LpPositionState {
 }
 
 export class LpPosition {
-  public coreProgram: Program<ExponentCore>
   constructor(
     public env: Environment,
-    public connection: web3.Connection,
-    public selfAddress: web3.PublicKey,
+    public connection: Connection,
+    public selfAddress: PublicKey,
     public state: LpPositionState,
   ) {
-    const mockWallet = new MyWallet(web3.Keypair.generate())
-    this.coreProgram = new Program<ExponentCore>(IDL as ExponentCore, new AnchorProvider(connection, mockWallet))
   }
 
-  static async load(env: Environment, connection: web3.Connection, address: web3.PublicKey, market?: Market) {
+  static async load(env: Environment, connection: Connection, address: PublicKey, market?: Market) {
     const fetcher = new ExponentFetcher({ connection })
     const fetchedLpPosition = await fetcher.fetchLpPosition(address)
     const loadedMarket = market ?? (await Market.load(env, connection, fetchedLpPosition.market))
@@ -51,14 +46,14 @@ export class LpPosition {
 
   static async loadAllByOwner(
     env: Environment,
-    connection: web3.Connection,
-    owner: web3.PublicKey,
-    markets: (Market | web3.PublicKey)[],
+    connection: Connection,
+    owner: PublicKey,
+    markets: (Market | PublicKey)[],
   ) {
     const pda = new ExponentPDA(env.coreProgramId)
     const addresses = markets.map((m) =>
       pda.marketLpPosition({
-        market: m instanceof web3.PublicKey ? m : m.selfAddress,
+        market: m instanceof PublicKey ? m : m.selfAddress,
         owner,
       }),
     )
@@ -97,7 +92,7 @@ export class LpPosition {
     return this.state.market.selfAddress
   }
 
-  async ixDepositLp(amount: bigint): Promise<web3.TransactionInstruction> {
+  async ixDepositLp(amount: bigint): Promise<TransactionInstruction> {
     const ix = this.marketSdk.ixDepositLp({
       owner: this.owner,
       amount,
@@ -105,7 +100,7 @@ export class LpPosition {
     return ix
   }
 
-  async ixWithdrawLp(amount: bigint): Promise<web3.TransactionInstruction> {
+  async ixWithdrawLp(amount: bigint): Promise<TransactionInstruction> {
     const ix = this.marketSdk.ixWithdrawLp({
       owner: this.owner,
       amount,
@@ -113,7 +108,7 @@ export class LpPosition {
     return ix
   }
 
-  async claimableFarmEmissions(mint: web3.PublicKey) {
+  async claimableFarmEmissions(mint: PublicKey) {
     const marketFarmIndex = this.state.market.state.lpFarm.farmEmissions.findIndex((e) => e.mint.equals(mint))
     if (marketFarmIndex === -1) return null
 
@@ -121,8 +116,11 @@ export class LpPosition {
     const positionFarm = this.state.farms[marketFarmIndex]
 
     const timeNow = new Date().getTime() / 1000
+    const expirationTs = this.state.market.state.expirationTs
 
-    const deltaTimeFarm = timeNow - this.marketSdk.state.lpFarm.lastSeenTimestamp
+    // cap time at expiration - emissions stop accruing after market expires
+    const effectiveTime = Math.min(timeNow, expirationTs)
+    const deltaTimeFarm = effectiveTime - this.marketSdk.state.lpFarm.lastSeenTimestamp
     const lpStakedTotal = this.marketSdk.state.lpEscrowAmount
     const tokensEmitted = Number(marketFarm.tokenRate) * deltaTimeFarm
     const increaseAmount = Number(tokensEmitted) / Number(lpStakedTotal)