@exponent-labs/exponent-sdk 0.0.3 → 0.0.5

package/src/events.ts

@@ -5,7 +5,6 @@ import bs58 from "bs58"
 
 export class EventDecoder {
   private coder: BorshCoder
-  private eventDecoder: EventDecoder
   programId: web3.PublicKey
   private static eventIxTag = new BN("1d9acb512ea545e4", 16)
   private discriminators: Map<string, string>
@@ -21,7 +20,7 @@ export class EventDecoder {
   parseAsTransactionCpiData(log: string): string | null {
     let encodedLog: Buffer
     try {
-      encodedLog = bs58.decode(log)
+      encodedLog = Buffer.from(bs58.decode(log))
     } catch (e) {
       return null
     }
@@ -135,6 +134,10 @@ function categorizeEvents(events: GenericEvent[]): CategorizedEvents {
   const wrapperCollectInterestEvents: WrapperCollectInterestEvent[] = []
   const wrapperWithdrawLiquidityEvents: WrapperWithdrawLiquidityEvent[] = []
   const wrapperWithdrawLiquidityClassicEvents: WrapperWithdrawLiquidityClassicEvent[] = []
+  const wrapperProvideLiquidityBaseEvents: WrapperProvideLiquidityBaseEvent[] = []
+  const wrapperProvideLiquidityClassicEvents: WrapperProvideLiquidityClassicEvent[] = []
+  const wrapperStripEvents: WrapperStripEvent[] = []
+  const wrapperMergeEvents: WrapperMergeEvent[] = []
 
   for (const ev of events) {
     switch (ev.name) {
@@ -216,6 +219,18 @@ function categorizeEvents(events: GenericEvent[]): CategorizedEvents {
       case "WrapperWithdrawLiquidityClassicEvent":
         wrapperWithdrawLiquidityClassicEvents.push(ev.data as WrapperWithdrawLiquidityClassicEvent)
         break
+      case "WrapperProvideLiquidityBaseEvent":
+        wrapperProvideLiquidityBaseEvents.push(ev.data as WrapperProvideLiquidityBaseEvent)
+        break
+      case "WrapperProvideLiquidityClassicEvent":
+        wrapperProvideLiquidityClassicEvents.push(ev.data as WrapperProvideLiquidityClassicEvent)
+        break
+      case "WrapperStripEvent":
+        wrapperStripEvents.push(ev.data as WrapperStripEvent)
+        break
+      case "WrapperMergeEvent":
+        wrapperMergeEvents.push(ev.data as WrapperMergeEvent)
+        break
     }
   }
 
@@ -246,6 +261,10 @@ function categorizeEvents(events: GenericEvent[]): CategorizedEvents {
     wrapperCollectInterestEvents,
     wrapperWithdrawLiquidityEvents,
     wrapperWithdrawLiquidityClassicEvents,
+    wrapperProvideLiquidityBaseEvents,
+    wrapperProvideLiquidityClassicEvents,
+    wrapperStripEvents,
+    wrapperMergeEvents,
   }
 }
 
@@ -276,6 +295,10 @@ export interface CategorizedEvents {
   wrapperCollectInterestEvents: WrapperCollectInterestEvent[]
   wrapperWithdrawLiquidityEvents: WrapperWithdrawLiquidityEvent[]
   wrapperWithdrawLiquidityClassicEvents: WrapperWithdrawLiquidityClassicEvent[]
+  wrapperProvideLiquidityBaseEvents: WrapperProvideLiquidityBaseEvent[]
+  wrapperProvideLiquidityClassicEvents: WrapperProvideLiquidityClassicEvent[]
+  wrapperStripEvents: WrapperStripEvent[]
+  wrapperMergeEvents: WrapperMergeEvent[]
 }
 
 export interface TradePtEvent {
@@ -593,3 +616,38 @@ export interface WrapperWithdrawLiquidityClassicEvent {
   amount_pt_out: BN
   lp_price: number
 }
+
+export interface WrapperProvideLiquidityBaseEvent {
+  user_address: web3.PublicKey
+  amount_base_in: BN
+  amount_lp_out: BN
+  market_address: web3.PublicKey
+  trade_amount_pt_out: BN
+  trade_amount_sy_in: BN
+  lp_price: number
+}
+
+export interface WrapperProvideLiquidityClassicEvent {
+  user_address: web3.PublicKey
+  market_address: web3.PublicKey
+  amount_base_in: BN
+  amount_pt_in: BN
+  amount_lp_out: BN
+  lp_price: number
+}
+
+export interface WrapperStripEvent {
+  user_address: web3.PublicKey
+  vault_address: web3.PublicKey
+  amount_base_in: BN
+  amount_sy_stripped: BN
+  amount_py_out: BN
+}
+
+export interface WrapperMergeEvent {
+  user_address: web3.PublicKey
+  vault_address: web3.PublicKey
+  amount_py_in: BN
+  amount_sy_redeemed: BN
+  amount_base_out: BN
+}

package/src/flavors.ts

@@ -2,7 +2,8 @@ import { BN, web3 } from "@coral-xyz/anchor"
 import { ExponentFetcher, fetchKaminoReserve } from "@exponent-labs/exponent-fetcher"
 import { Environment } from "./environment"
 import { MfiSySdk } from "@exponent-labs/marginfi-sy-sdk"
-import { getMeta, KAMINO_LEND_PROGRAM_ID } from "@exponent-labs/kamino-lend-standard"
+import { KaminoSyPda } from "@exponent-labs/kamino-sy-pda"
+import { PROGRAM_ID as KAMINO_STANDARD_PROGRAM_ID } from "@exponent-labs/kamino-sy-idl"
 import { KlendSySdk } from "@exponent-labs/kamino-sy-sdk"
 import {
   FlavorKaminoStateJson,
@@ -26,6 +27,8 @@ import {
   FlavorGenericState,
   InterfaceInstructionArgs,
   FlavorGenericStateJson,
+  toInterfaceTypeGenericJson,
+  fromInterfaceTypeGenericJson,
 } from "@exponent-labs/exponent-types"
 import { JitoRestakingSySdk } from "@exponent-labs/jito-restaking-sy-sdk"
 import { PreciseNumber } from "@exponent-labs/precise-number"
@@ -378,7 +381,7 @@ export function serializeFlavorGeneric(flavor: FlavorGenericState): FlavorGeneri
           treasuryEmission: e.treasuryEmission.toString(),
         })),
         interfaceAccounts: flavor.genericSyState.account.interfaceAccounts.map((a) => a.toString()),
-        interfaceType: flavor.genericSyState.account.interfaceType,
+        interfaceType: toInterfaceTypeGenericJson(flavor.genericSyState.account.interfaceType),
         index: parseFloat(PreciseNumber.fromRaw(flavor.genericSyState.account.index[0]).valueString),
       },
     },
@@ -444,7 +447,7 @@ export function deserializeFlavorGeneric(flavor: FlavorGenericStateJson): Flavor
         yieldBearingMint: new web3.PublicKey(flavor.genericSyState.account.yieldBearingMint),
         tokenSyEscrow: new web3.PublicKey(flavor.genericSyState.account.tokenSyEscrow),
         interfaceAccounts: flavor.genericSyState.account.interfaceAccounts.map((a) => new web3.PublicKey(a)),
-        interfaceType: flavor.genericSyState.account.interfaceType,
+        interfaceType: fromInterfaceTypeGenericJson(flavor.genericSyState.account.interfaceType),
         maxSySupply: new BN(flavor.genericSyState.account.maxSySupply),
         minMintSize: new BN(flavor.genericSyState.account.minMintSize),
         minRedeemSize: new BN(flavor.genericSyState.account.minRedeemSize),
@@ -638,7 +641,8 @@ async function makeKaminoFlavor(
   // TODO - don't do this
   const baseTokenProgram = await fetcher.connection.getAccountInfo(mintBase).then((a) => a.owner)
 
-  const meta = getMeta(reserve, kaminoSyProgramId)
+  const pda = new KaminoSyPda(new web3.PublicKey(KAMINO_STANDARD_PROGRAM_ID))
+  const meta = pda.syMeta({ kaminoReserve: reserve })
 
   const syMeta = await fetcher.fetchKaminoSyMeta(meta)
 
@@ -647,7 +651,6 @@ async function makeKaminoFlavor(
     klendMarketId: reserveAcct.lendingMarket,
     klendReserve: reserve,
     klendSyProgramId: kaminoSyProgramId,
-    klendProgramId: KAMINO_LEND_PROGRAM_ID,
   })
 
   return {

package/src/market.ts

@@ -1,6 +1,5 @@
 import { AnchorProvider, Program, Wallet, web3 } from "@coral-xyz/anchor"
 import { ExponentFetcher, LiquidityNetBalanceLimits, LpFarm } from "@exponent-labs/exponent-fetcher"
-import { ClaimAmount, ExponentIx } from "@exponent-labs/exponent-ix"
 import {
   createAssociatedTokenAccountIdempotentInstruction,
   getAssociatedTokenAddressSync,
@@ -22,12 +21,11 @@ import { ExponentPDA } from "@exponent-labs/exponent-pda"
 import { Vault } from "./vault"
 import { LiquidityAdd, lpOutForTokensIn, MarketCalculator } from "@exponent-labs/market-math"
 import { emitEventAuthority, getExponentAdminStatePda, uniqueRemainingAccounts } from "./utils"
-import { CpiAccountsRaw, Flavor, SyPosition } from "@exponent-labs/exponent-types"
+import { AccountInfo, CpiAccountsRaw, Flavor, serializeCpiAccountsRaw, SyPosition } from "@exponent-labs/exponent-types"
 import { PreciseNumber } from "@exponent-labs/precise-number"
 import { AnchorizedPNum } from "@exponent-labs/exponent-types"
 import { extendAddressLookupTable } from "./utils/altUtil"
 import { makeSyPosition } from "./syPosition"
-import { serializeCpiAccountsRaw } from "@exponent-labs/exponent-ix"
 import { CpiAccountsRawJson } from "@exponent-labs/exponent-types"
 
 export { LiquidityAdd }
@@ -138,7 +136,6 @@ export class MyWallet implements Wallet {
 
 export class Market {
   coreProgram: Program<ExponentCore>
-  xponIx: ExponentIx
   xponPda: ExponentPDA
 
   constructor(
@@ -148,7 +145,6 @@ export class Market {
     public connection: web3.Connection,
   ) {
     this.xponPda = new ExponentPDA(env.coreProgramId)
-    this.xponIx = new ExponentIx(env.coreProgramId)
     const mockWallet = new MyWallet(web3.Keypair.generate())
     this.coreProgram = new Program(IDL as ExponentCore, new AnchorProvider(connection, mockWallet))
   }

package/src/syPosition.ts

@@ -7,7 +7,8 @@ import {
 } from "./flavors"
 import { ExponentFetcher, SyPosition } from "@exponent-labs/exponent-fetcher"
 import { MarginfiSyPda } from "@exponent-labs/marginfi-sy-pda"
-import { getPosition, KAMINO_STANDARD_PROGRAM_ID } from "@exponent-labs/kamino-lend-standard"
+import { PROGRAM_ID as KAMINO_STANDARD_PROGRAM_ID } from "@exponent-labs/kamino-sy-idl"
+import { KaminoSyPda } from "@exponent-labs/kamino-sy-pda"
 import { JitoRestakingSyPda } from "@exponent-labs/jito-restaking-sy-pda"
 import { PROGRAM_ID as PERENA_STANDARD_PROGRAM_ID } from "@exponent-labs/perena-sy-idl"
 import { PROGRAM_ID as GENERIC_STANDARD_PROGRAM_ID } from "@exponent-labs/generic-sy-idl"
@@ -92,7 +93,8 @@ async function makeSyPositionKamino(
   owner: web3.PublicKey,
 ): Promise<SyPosition> {
   const reserve = flavor.kaminoSyState.account.kaminoReserve
-  const positionAddress = getPosition(reserve, owner, KAMINO_STANDARD_PROGRAM_ID)
+  const pda = new KaminoSyPda(new web3.PublicKey(KAMINO_STANDARD_PROGRAM_ID))
+  const positionAddress = pda.position({ reserve, owner })
   const position = await fetcher.fetchKaminoSyPosition(positionAddress)
   return position
 }

package/src/tokenUtil.ts

@@ -1,4 +1,5 @@
 import { web3 } from "@coral-xyz/anchor"
+import { CpiAccountsRaw, CpiAccountsRawJson } from "@exponent-labs/exponent-types"
 import { MintLayout } from "@solana/spl-token"
 
 export async function getMintSupply(cnx: web3.Connection, address: web3.PublicKey): Promise<bigint> {

package/src/vault.ts

@@ -1,5 +1,4 @@
 import { BN, Program, web3, AnchorProvider } from "@coral-xyz/anchor"
-import { ClaimAmount } from "@exponent-labs/exponent-ix"
 import { deserializeEmission, ExponentFetcher, serializeEmission } from "@exponent-labs/exponent-fetcher"
 import { fetchAddressLookupTable, makeCpiAccountMetaLists } from "./addressLookupTableUtil"
 import {
@@ -28,9 +27,10 @@ import { emitEventAuthority, InstructionAccounts, uniqueRemainingAccounts } from
 import { EXPONENT_ADMIN_PROGRAM_ID, ExponentAdminPda } from "@exponent-labs/exponent-admin-pda"
 import { ExponentPDA } from "@exponent-labs/exponent-pda"
 import { MyWallet } from "./market"
-import { deserializeCpiAccountsRaw, serializeCpiAccountsRaw } from "@exponent-labs/exponent-ix"
+import { deserializeCpiAccountsRaw, serializeCpiAccountsRaw } from "@exponent-labs/exponent-types"
 import { VaultEmission, VaultJson, VaultState, AnchorizedPNum, CpiAccountsRaw } from "@exponent-labs/exponent-types"
 import { extendAddressLookupTable } from "./utils/altUtil"
+import { ClaimAmount } from "@exponent-labs/marginfi-sy-sdk"
 
 export type CollectTreasuryEmissionKind =
   | { yieldPosition: {} }

package/src/ytPosition.ts

@@ -4,12 +4,12 @@ import { Environment } from "./environment"
 import { ExponentFetcher, YieldTokenTracker, YtPosition as YtPositionState } from "@exponent-labs/exponent-fetcher"
 import { Vault } from "./vault"
 import { getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID } from "@solana/spl-token"
-import { ClaimAmount } from "@exponent-labs/exponent-ix"
 import { InstructionAccounts } from "./utils"
 import { ExponentPDA } from "@exponent-labs/exponent-pda"
 import { MyWallet } from "./market"
 import { VaultJson } from "@exponent-labs/exponent-types"
 import { PreciseNumber } from "@exponent-labs/precise-number"
+import { ClaimAmount } from "@exponent-labs/marginfi-sy-sdk"
 
 export class YtPosition {
   public coreProgram: Program<ExponentCore>