@exponent-labs/exponent-sdk 0.0.10 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exponent-labs/exponent-sdk",
-  "version": "0.0.10",
+  "version": "0.1.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,28 +10,28 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "0.30.1",
-    "@exponent-labs/exponent-fetcher": "0.0.10",
-    "@exponent-labs/exponent-idl": "0.0.10",
-    "@exponent-labs/exponent-pda": "0.0.10",
-    "@exponent-labs/generic-sy-idl": "0.0.10",
-    "@exponent-labs/generic-sy-pda": "0.0.10",
-    "@exponent-labs/generic-sy-sdk": "0.0.10",
-    "@exponent-labs/jito-restaking-sy-idl": "0.0.10",
-    "@exponent-labs/jito-restaking-sy-sdk": "0.0.10",
-    "@exponent-labs/kamino-sy-sdk": "0.0.10",
-    "@exponent-labs/marginfi-sy-pda": "0.0.10",
-    "@exponent-labs/marginfi-sy-sdk": "0.0.10",
-    "@exponent-labs/market-math": "0.0.10",
-    "@exponent-labs/perena-sy-idl": "0.0.10",
-    "@exponent-labs/perena-sy-pda": "0.0.10",
-    "@exponent-labs/perena-sy-sdk": "0.0.10",
+    "@exponent-labs/exponent-fetcher": "0.1.1",
+    "@exponent-labs/exponent-idl": "0.1.1",
+    "@exponent-labs/exponent-pda": "0.1.1",
+    "@exponent-labs/generic-sy-idl": "0.1.1",
+    "@exponent-labs/generic-sy-pda": "0.1.1",
+    "@exponent-labs/generic-sy-sdk": "0.1.1",
+    "@exponent-labs/jito-restaking-sy-idl": "0.1.1",
+    "@exponent-labs/jito-restaking-sy-sdk": "0.1.1",
+    "@exponent-labs/kamino-sy-sdk": "0.1.1",
+    "@exponent-labs/marginfi-sy-pda": "0.1.1",
+    "@exponent-labs/marginfi-sy-sdk": "0.1.1",
+    "@exponent-labs/market-math": "0.1.1",
+    "@exponent-labs/perena-sy-idl": "0.1.1",
+    "@exponent-labs/perena-sy-pda": "0.1.1",
+    "@exponent-labs/perena-sy-sdk": "0.1.1",
     "@solana/spl-token": "0.4.8",
-    "@exponent-labs/precise-number": "0.0.10",
-    "@exponent-labs/exponent-admin-pda": "0.0.10",
-    "@exponent-labs/jito-restaking-sy-pda": "0.0.10",
-    "@exponent-labs/kamino-sy-idl": "0.0.10",
-    "@exponent-labs/exponent-types": "0.0.10",
-    "@exponent-labs/kamino-sy-pda": "0.0.10",
+    "@exponent-labs/precise-number": "0.1.1",
+    "@exponent-labs/exponent-admin-pda": "0.1.1",
+    "@exponent-labs/jito-restaking-sy-pda": "0.1.1",
+    "@exponent-labs/kamino-sy-idl": "0.1.1",
+    "@exponent-labs/exponent-types": "0.1.1",
+    "@exponent-labs/kamino-sy-pda": "0.1.1",
     "bs58": "5.0.0"
   },
   "devDependencies": {

package/src/addressLookupTableUtil.ts

@@ -1,5 +1,6 @@
 import { web3 } from "@coral-xyz/anchor"
-import { CpiAccountIndexes, CpiAccountIndex } from "@exponent-labs/exponent-types"
+
+import { CpiAccountIndex, CpiAccountIndexes } from "@exponent-labs/exponent-types"
 
 /** Fetch and deserialize the ALT */
 export async function fetchAddressLookupTable(

package/src/events.ts

@@ -1,33 +1,35 @@
-import { BorshCoder, web3, BN } from "@coral-xyz/anchor"
+import { BN, BorshCoder, web3 } from "@coral-xyz/anchor"
+import bs58 from "bs58"
+
 import { ExponentCore, IDL } from "@exponent-labs/exponent-idl"
 import { AnchorizedPNum } from "@exponent-labs/exponent-types"
-import bs58 from "bs58"
+
+const EVENT_IX_TAG = new BN("1d9acb512ea545e4", 16)
 
 export class EventDecoder {
   private coder: BorshCoder
   programId: web3.PublicKey
-  private static eventIxTag = new BN("1d9acb512ea545e4", 16)
-  private discriminators: Map<string, string>
+  private static eventIxTag = EVENT_IX_TAG
 
   constructor(idl: ExponentCore = IDL as ExponentCore) {
     this.programId = new web3.PublicKey(idl.address)
     this.coder = new BorshCoder(idl)
-    this.discriminators = new Map<string, string>(
-      (idl.events ?? []).map((ev): [string, string] => [Buffer.from(ev.discriminator).toString("hex"), ev.name]),
-    )
   }
 
   parseAsTransactionCpiData(log: string): string | null {
-    let encodedLog: Buffer
     try {
-      encodedLog = Buffer.from(bs58.decode(log))
-    } catch (e) {
-      return null
-    }
-    const disc = encodedLog.slice(0, 8)
-    if (disc.equals(Uint8Array.from(EventDecoder.eventIxTag.toBuffer("le", 8)))) {
-      return Buffer.from(Uint8Array.from(encodedLog.slice(8))).toString("base64")
-    } else {
+      const encodedLog = Buffer.from(bs58.decode(log))
+      const discriminator = encodedLog.subarray(0, 8)
+
+      const eventIxTagBuffer = Uint8Array.from(EventDecoder.eventIxTag.toBuffer("le", 8))
+
+      if (discriminator.equals(eventIxTagBuffer)) {
+        return Buffer.from(Uint8Array.from(encodedLog.subarray(8))).toString("base64")
+      }
+
+      throw new Error("Discriminator not found")
+    } catch (error) {
+      console.error("Unable tp parse transaction CPI data:", error)
       return null
     }
   }
@@ -42,10 +44,10 @@ export class EventDecoder {
       const event = this.coder.events.decode(cpiData)
       return {
         name: event.name,
-        data: event,
+        data: event.data,
       }
-    } catch (e) {
-      console.error(`Failed to decode event:`, e)
+    } catch (error) {
+      console.error(`Failed to decode event:`, error)
       return null
     }
   }
@@ -54,8 +56,7 @@ export class EventDecoder {
     transactionResponse: web3.VersionedTransactionResponse | web3.TransactionResponse,
     connection: web3.Connection,
   ): Promise<CategorizedEvents> {
-    const events: GenericEvent[] = []
-    const inner: web3.CompiledInnerInstruction[] = transactionResponse?.meta?.innerInstructions ?? []
+    const innerInstructions: web3.CompiledInnerInstruction[] = transactionResponse?.meta?.innerInstructions ?? []
 
     const addressTableLookups = transactionResponse?.transaction.message.addressTableLookups
 
@@ -66,25 +67,23 @@ export class EventDecoder {
       }),
     )
 
-    for (let i = 0; i < inner.length; i++) {
-      for (let j = 0; j < inner[i].instructions.length; j++) {
-        const ix = inner[i].instructions[j]
+    const instructions: web3.CompiledInstruction[] = innerInstructions.map(({ instructions }) => instructions).flat()
 
+    const events: GenericEvent[] = instructions
+      .map((ix) => {
         const accountKeys = transactionResponse?.transaction.message.getAccountKeys({
           addressLookupTableAccounts: lookupTables.map((lookup) => lookup.value),
         })
         const programPubkey = accountKeys.get(ix.programIdIndex)
-
         if (programPubkey === undefined || !programPubkey.equals(this.programId)) {
-          continue
+          return null
         }
 
         const event = this.decode(ix.data)
-        if (event) {
-          events.push(event.data)
-        }
-      }
-    }
+
+        return event || null
+      })
+      .filter((ev) => !!ev)
 
     return categorizeEvents(events)
   }
@@ -92,26 +91,26 @@ export class EventDecoder {
   parseHeliusWebsocketCpiEvents(
     transactionResponse: web3.VersionedTransactionResponse | web3.TransactionResponse,
   ): CategorizedEvents {
-    const events: GenericEvent[] = []
-    const inner: web3.CompiledInnerInstruction[] = transactionResponse?.meta?.innerInstructions ?? []
+    // const events: GenericEvent[] = []
+    const innerInstructions: web3.CompiledInnerInstruction[] = transactionResponse?.meta?.innerInstructions ?? []
 
-    for (let i = 0; i < inner.length; i++) {
-      for (let j = 0; j < inner[i].instructions.length; j++) {
-        const ix = inner[i].instructions[j]
+    const instructions: web3.CompiledInstruction[] = innerInstructions.map(({ instructions }) => instructions).flat()
 
-        // @ts-ignore
-        const programPubkey = new web3.PublicKey(ix.programId)
+    const events: GenericEvent[] = instructions
+      .map((ix) => {
+        //! Is it safe? If helius adds a programId field, we need to use a modified CompiledInstruction interface
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const programPubkey = new web3.PublicKey((ix as any).programId)
 
         if (programPubkey === undefined || !programPubkey.equals(this.programId)) {
-          continue
+          return null
         }
 
         const event = this.decode(ix.data)
-        if (event) {
-          events.push(event.data)
-        }
-      }
-    }
+
+        return event || null
+      })
+      .filter((ev) => !!ev)
 
     return categorizeEvents(events)
   }
@@ -119,6 +118,7 @@ export class EventDecoder {
 
 interface GenericEvent {
   name: string
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   data: any
 }
 

package/src/flavors.ts

@@ -1,39 +1,40 @@
 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 { 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,
-  FlavorKaminoState,
-  FlavorMarginfiState,
-  FlavorMarginfiStateJson,
-  FlavorKamino,
-  FlavorMarginfi,
-  FlavorDiscriminator,
-  MintSyArgs,
-  RedeemSyArgs,
-  Flavor,
   CpiAccountsRaw,
+  Flavor,
+  FlavorDiscriminator,
+  FlavorGeneric,
+  FlavorGenericState,
+  FlavorGenericStateJson,
   FlavorJitoRestaking,
   FlavorJitoRestakingState,
   FlavorJitoRestakingStateJson,
+  FlavorKamino,
+  FlavorKaminoState,
+  FlavorKaminoStateJson,
+  FlavorMarginfi,
+  FlavorMarginfiState,
+  FlavorMarginfiStateJson,
   FlavorPerena,
   FlavorPerenaState,
   FlavorPerenaStateJson,
-  FlavorGeneric,
-  FlavorGenericState,
-  InterfaceInstructionArgs,
-  FlavorGenericStateJson,
-  toInterfaceTypeGenericJson,
+  MintSyArgs,
+  RedeemSyArgs,
   fromInterfaceTypeGenericJson,
+  toInterfaceTypeGenericJson,
 } from "@exponent-labs/exponent-types"
+import { GenericSySdk } from "@exponent-labs/generic-sy-sdk"
 import { JitoRestakingSySdk } from "@exponent-labs/jito-restaking-sy-sdk"
-import { PreciseNumber } from "@exponent-labs/precise-number"
+import { PROGRAM_ID as KAMINO_STANDARD_PROGRAM_ID } from "@exponent-labs/kamino-sy-idl"
+import { KaminoSyPda } from "@exponent-labs/kamino-sy-pda"
+import { KlendSySdk } from "@exponent-labs/kamino-sy-sdk"
+import { MfiSySdk } from "@exponent-labs/marginfi-sy-sdk"
 import { PerenaSySdk } from "@exponent-labs/perena-sy-sdk"
-import { GenericSySdk } from "@exponent-labs/generic-sy-sdk"
+import { PreciseNumber } from "@exponent-labs/precise-number"
+
+import { Environment } from "./environment"
 
 export function serializeFlavorMarginfi(flavor: FlavorMarginfiState): FlavorMarginfiStateJson {
   return {
@@ -303,7 +304,7 @@ export function deserializeFlavorJitoRestaking(flavor: FlavorJitoRestakingStateJ
   }
 }
 
-export function serializeFlavorParena(flavor: FlavorPerenaState): FlavorPerenaStateJson {
+export function serializeFlavorPerena(flavor: FlavorPerenaState): FlavorPerenaStateJson {
   return {
     flavor: "perena",
     currentSyExchangeRate: flavor.currentSyExchangeRate,
@@ -388,7 +389,7 @@ export function serializeFlavorGeneric(flavor: FlavorGenericState): FlavorGeneri
   }
 }
 
-export function deserializeFlavorParena(flavor: FlavorPerenaStateJson): FlavorPerenaState {
+export function deserializeFlavorPerena(flavor: FlavorPerenaStateJson): FlavorPerenaState {
   return {
     flavor: "perena",
     currentSyExchangeRate: flavor.currentSyExchangeRate,
@@ -482,8 +483,8 @@ export function makeFlavorMarginfiSync(data: FlavorMarginfiState): FlavorMarginf
     flavor: "marginfi",
     ixMintSy: (args) => mfiSySdk.ixMintSy(args),
     ixRedeemSy: (args) => mfiSySdk.ixRedeemSy(args),
-    preIxs: async (args) => [],
-    postIxs: async (args) => [],
+    preIxs: async () => [],
+    postIxs: async () => [],
   }
 }
 
@@ -508,8 +509,8 @@ export function makeFlavorJitoRestakingSync(data: FlavorJitoRestakingState): Fla
     flavor: "jitoRestaking",
     ixMintSy: (args) => jitoSdk.ixMintSy(args),
     ixRedeemSy: (args) => jitoSdk.ixRedeemSy(args),
-    preIxs: async (args) => [],
-    postIxs: async (args) => [],
+    preIxs: async () => [],
+    postIxs: async () => [],
   }
 }
 
@@ -622,8 +623,8 @@ async function makeMarginfiFlavor(
     mfiSyState: mfiSySdk.state,
     emissionMint: mapOptAccount(emissionMint),
     emissionTokenProgram: mapOptAccount(emissionTokenProgram),
-    preIxs: async (args) => [],
-    postIxs: async (args) => [],
+    preIxs: async () => [],
+    postIxs: async () => [],
   }
 }
 
@@ -632,9 +633,6 @@ async function makeKaminoFlavor(
   kaminoSyProgramId: web3.PublicKey,
   cpiAccounts: CpiAccountsRaw,
 ): Promise<FlavorKamino> {
-  const isNone = (x: web3.PublicKey) => x.equals(kaminoSyProgramId)
-  const mapOptAccount = (x: web3.PublicKey) => (isNone(x) ? undefined : x)
-
   // TODO - I do not like hard-coding these magic numbers
   const reserve = cpiAccounts.getSyState[0].pubkey
   const reserveAcct = await fetchKaminoReserve(reserve, fetcher.connection)
@@ -685,7 +683,6 @@ async function makeJitoRestakingFlavor(
 ): Promise<FlavorJitoRestaking> {
   // TODO - I do not like hard-coding these magic numbers
   const jitoVault = cpiAccounts.getSyState[1].pubkey
-  // const recentBlockhash = await fetcher.connection.getLatestBlockhash().then((b) => b.blockhash)
 
   const jitoSdk = await JitoRestakingSySdk.load({
     cnx: fetcher.connection,
@@ -757,9 +754,6 @@ async function makeGenericFlavor(
     config: syConfig,
   })
 
-  let preIxs = []
-  let postIxs = []
-
   return {
     flavor: "generic",
     currentSyExchangeRate: sySdk.state.syRate,
@@ -767,8 +761,8 @@ async function makeGenericFlavor(
     baseTokenProgram: sySdk.tokenProgramBase,
     ixMintSy: (args) => sySdk.ixMintSy(args),
     ixRedeemSy: (args) => sySdk.ixRedeemSy(args),
-    preIxs: async () => preIxs,
-    postIxs: async () => postIxs,
+    preIxs: async () => [],
+    postIxs: async () => [],
     genericSyState: sySdk.state,
     emissions: sySdk.emissions.map((e) => ({
       exchangeRate: e.index,

package/src/lpPosition.ts

@@ -1,11 +1,12 @@
 import { AnchorProvider, Program, web3 } from "@coral-xyz/anchor"
-import { Market, MyWallet } from "./market"
-import { Environment } from "./environment"
-import { ExponentCore, IDL } from "@exponent-labs/exponent-idl"
+
 import { ExponentFetcher } from "@exponent-labs/exponent-fetcher"
-import { PreciseNumber } from "@exponent-labs/precise-number"
-import { makeSyPosition } from "./syPosition"
+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"
 
 export interface EmissionTracker {
   lastSeenIndex: number
@@ -35,17 +36,17 @@ export class LpPosition {
 
   static async load(env: Environment, connection: web3.Connection, address: web3.PublicKey, market?: Market) {
     const fetcher = new ExponentFetcher({ connection })
-    const x = await fetcher.fetchLpPosition(address)
-    const loadedMarket = market ?? (await Market.load(env, connection, x.market))
-    const state: LpPositionState = {
-      owner: x.owner,
-      balanceLp: x.lpBalance,
+    const fetchedLpPosition = await fetcher.fetchLpPosition(address)
+    const loadedMarket = market ?? (await Market.load(env, connection, fetchedLpPosition.market))
+    const lpPositionState: LpPositionState = {
+      owner: fetchedLpPosition.owner,
+      balanceLp: fetchedLpPosition.lpBalance,
       market: loadedMarket,
-      emissionTrackers: x.emissions,
-      farms: x.farms,
+      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(
@@ -65,7 +66,7 @@ export class LpPosition {
     const positionPromises = addresses.map((addr) => {
       try {
         return LpPosition.load(env, connection, addr)
-      } catch (e) {
+      } catch {
         return Promise.resolve(null)
       }
     })
@@ -74,10 +75,10 @@ export class LpPosition {
     return positions.filter((p): p is LpPosition => 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() {
@@ -119,9 +120,9 @@ export class LpPosition {
     const marketFarm = this.state.market.state.lpFarm.farmEmissions[marketFarmIndex]
     const positionFarm = this.state.farms[marketFarmIndex]
 
-    const ts = new Date().getTime() / 1000
+    const timeNow = new Date().getTime() / 1000
 
-    const deltaTimeFarm = ts - this.marketSdk.state.lpFarm.lastSeenTimestamp
+    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)
@@ -137,7 +138,7 @@ export 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) return 0