@exponent-labs/exponent-sdk 0.1.8 → 0.9.0

package/src/flavors.ts

@@ -1,4 +1,3 @@
-import { BN, web3 } from "@coral-xyz/anchor"
 
 import { ExponentFetcher, fetchKaminoReserve } from "@exponent-labs/exponent-fetcher"
 import {
@@ -20,10 +19,10 @@ import {
   FlavorPerena,
   FlavorPerenaState,
   FlavorPerenaStateJson,
-  fromAdditionalDataGenericJson,
-  fromInterfaceTypeGenericJson,
   MintSyArgs,
   RedeemSyArgs,
+  fromAdditionalDataGenericJson,
+  fromInterfaceTypeGenericJson,
   toAdditionalDataGenericJson,
   toInterfaceTypeGenericJson,
 } from "@exponent-labs/exponent-types"
@@ -37,6 +36,8 @@ import { PerenaSySdk } from "@exponent-labs/perena-sy-sdk"
 import { PreciseNumber } from "@exponent-labs/precise-number"
 
 import { Environment } from "./environment"
+import BN from 'bn.js'
+import { PublicKey } from "@solana/web3.js"
 
 export function serializeFlavorMarginfi(flavor: FlavorMarginfiState): FlavorMarginfiStateJson {
   return {
@@ -89,40 +90,40 @@ export function deserializeFlavorMarginfi(flavor: FlavorMarginfiStateJson): Flav
   return {
     flavor: "marginfi",
     currentSyExchangeRate: flavor.currentSyExchangeRate,
-    mintBase: new web3.PublicKey(flavor.mintBase),
-    baseTokenProgram: new web3.PublicKey(flavor.baseTokenProgram),
+    mintBase: new PublicKey(flavor.mintBase),
+    baseTokenProgram: new PublicKey(flavor.baseTokenProgram),
     emissions: flavor.emissions.map((e) => ({
       exchangeRate: new PreciseNumber(e.exchangeRate.toString()).anchorify(),
-      mint: new web3.PublicKey(e.mint),
-      tokenProgram: new web3.PublicKey(e.tokenProgram),
+      mint: new PublicKey(e.mint),
+      tokenProgram: new PublicKey(e.tokenProgram),
     })),
-    bank: new web3.PublicKey(flavor.bank),
-    emissionMint: flavor.emissionMint ? new web3.PublicKey(flavor.emissionMint) : undefined,
-    emissionTokenProgram: flavor.emissionTokenProgram ? new web3.PublicKey(flavor.emissionTokenProgram) : undefined,
+    bank: new PublicKey(flavor.bank),
+    emissionMint: flavor.emissionMint ? new PublicKey(flavor.emissionMint) : undefined,
+    emissionTokenProgram: flavor.emissionTokenProgram ? new PublicKey(flavor.emissionTokenProgram) : undefined,
     mfiSyState: {
-      selfAddress: new web3.PublicKey(flavor.mfiSyState.selfAddress),
-      marginfiSyProgramId: new web3.PublicKey(flavor.mfiSyState.marginfiSyProgramId),
+      selfAddress: new PublicKey(flavor.mfiSyState.selfAddress),
+      marginfiSyProgramId: new PublicKey(flavor.mfiSyState.marginfiSyProgramId),
       syRate: flavor.mfiSyState.syRate,
-      mintBase: new web3.PublicKey(flavor.mfiSyState.mintBase),
-      tokenProgramBase: new web3.PublicKey(flavor.mfiSyState.tokenProgramBase),
-      marginfiProgramId: new web3.PublicKey(flavor.mfiSyState.marginfiProgramId),
-      marginfiGroupId: new web3.PublicKey(flavor.mfiSyState.marginfiGroupId),
-      emissionsMint: flavor.mfiSyState.emissionsMint ? new web3.PublicKey(flavor.mfiSyState.emissionsMint) : null,
+      mintBase: new PublicKey(flavor.mfiSyState.mintBase),
+      tokenProgramBase: new PublicKey(flavor.mfiSyState.tokenProgramBase),
+      marginfiProgramId: new PublicKey(flavor.mfiSyState.marginfiProgramId),
+      marginfiGroupId: new PublicKey(flavor.mfiSyState.marginfiGroupId),
+      emissionsMint: flavor.mfiSyState.emissionsMint ? new PublicKey(flavor.mfiSyState.emissionsMint) : null,
       emissionsTokenProgram: flavor.mfiSyState.emissionsTokenProgram
-        ? new web3.PublicKey(flavor.mfiSyState.emissionsTokenProgram)
+        ? new PublicKey(flavor.mfiSyState.emissionsTokenProgram)
         : null,
       account: {
-        marginfiBank: new web3.PublicKey(flavor.mfiSyState.account.marginfiBank),
-        marginfiAccount: new web3.PublicKey(flavor.mfiSyState.account.marginfiAccount),
-        mintSy: new web3.PublicKey(flavor.mfiSyState.account.mintSy),
-        tokenSyEscrow: new web3.PublicKey(flavor.mfiSyState.account.tokenSyEscrow),
+        marginfiBank: new PublicKey(flavor.mfiSyState.account.marginfiBank),
+        marginfiAccount: new PublicKey(flavor.mfiSyState.account.marginfiAccount),
+        mintSy: new PublicKey(flavor.mfiSyState.account.mintSy),
+        tokenSyEscrow: new PublicKey(flavor.mfiSyState.account.tokenSyEscrow),
         maxSySupply: BigInt(flavor.mfiSyState.account.maxSySupply),
         minMintSize: BigInt(flavor.mfiSyState.account.minMintSize),
         minRedeemSize: BigInt(flavor.mfiSyState.account.minRedeemSize),
         emissions: flavor.mfiSyState.account.emissions.map((emission) => ({
-          mint: new web3.PublicKey(emission.mint),
-          tokenProgram: new web3.PublicKey(emission.tokenProgram),
-          escrowAccount: new web3.PublicKey(emission.escrowAccount),
+          mint: new PublicKey(emission.mint),
+          tokenProgram: new PublicKey(emission.tokenProgram),
+          escrowAccount: new PublicKey(emission.escrowAccount),
           index: new PreciseNumber(emission.index.toString()).anchorify(),
           lastSeenIndex: new PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
           lastSeenTotalAccruedEmissions: new BN(emission.lastSeenTotalAccruedEmissions),
@@ -184,39 +185,39 @@ export function deserializeFlavorKamino(flavor: FlavorKaminoStateJson): FlavorKa
   return {
     flavor: "kamino",
     currentSyExchangeRate: flavor.currentSyExchangeRate,
-    mintBase: new web3.PublicKey(flavor.mintBase),
-    baseTokenProgram: new web3.PublicKey(flavor.baseTokenProgram),
+    mintBase: new PublicKey(flavor.mintBase),
+    baseTokenProgram: new PublicKey(flavor.baseTokenProgram),
     emissions: flavor.emissions.map((e) => ({
       exchangeRate: new PreciseNumber(e.exchangeRate.toString()).anchorify(),
-      mint: new web3.PublicKey(e.mint),
-      tokenProgram: new web3.PublicKey(e.tokenProgram),
+      mint: new PublicKey(e.mint),
+      tokenProgram: new PublicKey(e.tokenProgram),
     })),
     kaminoSyState: {
-      selfAddress: new web3.PublicKey(flavor.kaminoSyState.selfAddress),
-      klendSyProgramId: new web3.PublicKey(flavor.kaminoSyState.klendSyProgramId),
+      selfAddress: new PublicKey(flavor.kaminoSyState.selfAddress),
+      klendSyProgramId: new PublicKey(flavor.kaminoSyState.klendSyProgramId),
       syRate: flavor.kaminoSyState.syRate,
-      mintBase: new web3.PublicKey(flavor.kaminoSyState.mintBase),
-      tokenProgramBase: new web3.PublicKey(flavor.kaminoSyState.tokenProgramBase),
-      klendProgramId: new web3.PublicKey(flavor.kaminoSyState.klendProgramId),
-      klendMarketId: new web3.PublicKey(flavor.kaminoSyState.klendMarketId),
+      mintBase: new PublicKey(flavor.kaminoSyState.mintBase),
+      tokenProgramBase: new PublicKey(flavor.kaminoSyState.tokenProgramBase),
+      klendProgramId: new PublicKey(flavor.kaminoSyState.klendProgramId),
+      klendMarketId: new PublicKey(flavor.kaminoSyState.klendMarketId),
       scopePriceFeed: flavor.kaminoSyState.scopePriceFeed
-        ? new web3.PublicKey(flavor.kaminoSyState.scopePriceFeed)
+        ? new PublicKey(flavor.kaminoSyState.scopePriceFeed)
         : undefined,
       account: {
-        kaminoReserve: new web3.PublicKey(flavor.kaminoSyState.account.kaminoReserve),
-        kaminoObligation: new web3.PublicKey(flavor.kaminoSyState.account.kaminoObligation),
-        kaminoFarm: new web3.PublicKey(flavor.kaminoSyState.account.kaminoFarm),
-        kaminoUserMetadata: new web3.PublicKey(flavor.kaminoSyState.account.kaminoUserMetadata),
-        mintSy: new web3.PublicKey(flavor.kaminoSyState.account.mintSy),
-        tokenSyEscrow: new web3.PublicKey(flavor.kaminoSyState.account.tokenSyEscrow),
+        kaminoReserve: new PublicKey(flavor.kaminoSyState.account.kaminoReserve),
+        kaminoObligation: new PublicKey(flavor.kaminoSyState.account.kaminoObligation),
+        kaminoFarm: new PublicKey(flavor.kaminoSyState.account.kaminoFarm),
+        kaminoUserMetadata: new PublicKey(flavor.kaminoSyState.account.kaminoUserMetadata),
+        mintSy: new PublicKey(flavor.kaminoSyState.account.mintSy),
+        tokenSyEscrow: new PublicKey(flavor.kaminoSyState.account.tokenSyEscrow),
         minMintSize: flavor.kaminoSyState.account.minMintSize,
         minRedeemSize: flavor.kaminoSyState.account.minRedeemSize,
-        userState: new web3.PublicKey(flavor.kaminoSyState.account.userState),
+        userState: new PublicKey(flavor.kaminoSyState.account.userState),
         maxSySupply: flavor.kaminoSyState.account.maxSySupply,
         emissions: flavor.kaminoSyState.account.emissions.map((emission) => ({
-          mint: new web3.PublicKey(emission.mint),
-          tokenProgram: new web3.PublicKey(emission.tokenProgram),
-          escrowAccount: new web3.PublicKey(emission.escrowAccount),
+          mint: new PublicKey(emission.mint),
+          tokenProgram: new PublicKey(emission.tokenProgram),
+          escrowAccount: new PublicKey(emission.escrowAccount),
           index: new PreciseNumber(emission.index.toString()).anchorify(),
           lastSeenIndex: new PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
           lastSeenTotalAccruedEmissions: new BN(emission.lastSeenTotalAccruedEmissions),
@@ -273,32 +274,32 @@ export function deserializeFlavorJitoRestaking(flavor: FlavorJitoRestakingStateJ
   return {
     flavor: "jitoRestaking",
     currentSyExchangeRate: flavor.currentSyExchangeRate,
-    mintBase: new web3.PublicKey(flavor.mintBase),
-    baseTokenProgram: new web3.PublicKey(flavor.baseTokenProgram),
+    mintBase: new PublicKey(flavor.mintBase),
+    baseTokenProgram: new PublicKey(flavor.baseTokenProgram),
     emissions: flavor.emissions.map((e) => ({
       exchangeRate: new PreciseNumber(e.exchangeRate.toString()).anchorify(),
-      mint: new web3.PublicKey(e.mint),
-      tokenProgram: new web3.PublicKey(e.tokenProgram),
+      mint: new PublicKey(e.mint),
+      tokenProgram: new PublicKey(e.tokenProgram),
     })),
     jitoSyState: {
-      selfAddress: new web3.PublicKey(flavor.jitoSyState.selfAddress),
+      selfAddress: new PublicKey(flavor.jitoSyState.selfAddress),
       syRate: flavor.jitoSyState.syRate,
       underlyingExchangeRate: flavor.jitoSyState.underlyingExchangeRate,
-      mintBase: new web3.PublicKey(flavor.jitoSyState.mintBase),
-      tokenProgramBase: new web3.PublicKey(flavor.jitoSyState.tokenProgramBase),
+      mintBase: new PublicKey(flavor.jitoSyState.mintBase),
+      tokenProgramBase: new PublicKey(flavor.jitoSyState.tokenProgramBase),
       account: {
-        jitoVault: new web3.PublicKey(flavor.jitoSyState.account.jitoVault),
-        mintSy: new web3.PublicKey(flavor.jitoSyState.account.mintSy),
-        tokenSyEscrow: new web3.PublicKey(flavor.jitoSyState.account.tokenSyEscrow),
+        jitoVault: new PublicKey(flavor.jitoSyState.account.jitoVault),
+        mintSy: new PublicKey(flavor.jitoSyState.account.mintSy),
+        tokenSyEscrow: new PublicKey(flavor.jitoSyState.account.tokenSyEscrow),
         minMintSize: new BN(flavor.jitoSyState.account.minMintSize),
         minRedeemSize: new BN(flavor.jitoSyState.account.minRedeemSize),
         maxSySupply: new BN(flavor.jitoSyState.account.maxSySupply),
-        interfaceAccounts: flavor.jitoSyState.account.interfaceAccounts.map((a) => new web3.PublicKey(a)),
+        interfaceAccounts: flavor.jitoSyState.account.interfaceAccounts.map((a) => new PublicKey(a)),
         interfaceType: flavor.jitoSyState.account.interfaceType,
         emissions: flavor.jitoSyState.account.emissions.map((emission) => ({
-          mint: new web3.PublicKey(emission.mint),
-          tokenProgram: new web3.PublicKey(emission.tokenProgram),
-          escrowAccount: new web3.PublicKey(emission.escrowAccount),
+          mint: new PublicKey(emission.mint),
+          tokenProgram: new PublicKey(emission.tokenProgram),
+          escrowAccount: new PublicKey(emission.escrowAccount),
           index: new PreciseNumber(emission.index.toString()).anchorify(),
           lastSeenIndex: new PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
           lastSeenTotalAccruedEmissions: new BN(emission.lastSeenTotalAccruedEmissions),
@@ -404,37 +405,37 @@ export function deserializeFlavorPerena(flavor: FlavorPerenaStateJson): FlavorPe
   return {
     flavor: "perena",
     currentSyExchangeRate: flavor.currentSyExchangeRate,
-    baseTokenProgram: new web3.PublicKey(flavor.baseTokenProgram),
-    mintBase: new web3.PublicKey(flavor.mintBase),
+    baseTokenProgram: new PublicKey(flavor.baseTokenProgram),
+    mintBase: new PublicKey(flavor.mintBase),
     perenaSyState: {
-      selfAddress: new web3.PublicKey(flavor.perenaSyState.selfAddress),
+      selfAddress: new PublicKey(flavor.perenaSyState.selfAddress),
       syRate: flavor.perenaSyState.syRate,
       account: {
-        perenaStablePool: new web3.PublicKey(flavor.perenaSyState.account.perenaStablePool),
-        mintSy: new web3.PublicKey(flavor.perenaSyState.account.mintSy),
-        tokenSyEscrow: new web3.PublicKey(flavor.perenaSyState.account.tokenSyEscrow),
+        perenaStablePool: new PublicKey(flavor.perenaSyState.account.perenaStablePool),
+        mintSy: new PublicKey(flavor.perenaSyState.account.mintSy),
+        tokenSyEscrow: new PublicKey(flavor.perenaSyState.account.tokenSyEscrow),
         minMintSize: new BN(flavor.perenaSyState.account.minMintSize),
         minRedeemSize: new BN(flavor.perenaSyState.account.minRedeemSize),
         maxSySupply: new BN(flavor.perenaSyState.account.maxSySupply),
         emissions: flavor.perenaSyState.account.emissions.map((emission) => ({
-          mint: new web3.PublicKey(emission.mint),
-          tokenProgram: new web3.PublicKey(emission.tokenProgram),
-          escrowAccount: new web3.PublicKey(emission.escrowAccount),
+          mint: new PublicKey(emission.mint),
+          tokenProgram: new PublicKey(emission.tokenProgram),
+          escrowAccount: new PublicKey(emission.escrowAccount),
           index: new PreciseNumber(emission.index.toString()).anchorify(),
           lastSeenIndex: new PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
           lastSeenTotalAccruedEmissions: new BN(emission.lastSeenTotalAccruedEmissions),
           totalClaimedEmissions: new BN(emission.totalClaimedEmissions),
           treasuryEmission: new BN(emission.treasuryEmission),
         })),
-        interfaceAccounts: flavor.perenaSyState.account.interfaceAccounts.map((a) => new web3.PublicKey(a)),
+        interfaceAccounts: flavor.perenaSyState.account.interfaceAccounts.map((a) => new PublicKey(a)),
       },
-      lpMint: new web3.PublicKey(flavor.perenaSyState.mintBase),
-      tokenProgramBase: new web3.PublicKey(flavor.perenaSyState.tokenProgramBase),
+      lpMint: new PublicKey(flavor.perenaSyState.mintBase),
+      tokenProgramBase: new PublicKey(flavor.perenaSyState.tokenProgramBase),
     },
     emissions: flavor.emissions.map((e) => ({
       exchangeRate: new PreciseNumber(e.exchangeRate.toString()).anchorify(),
-      mint: new web3.PublicKey(e.mint),
-      tokenProgram: new web3.PublicKey(e.tokenProgram),
+      mint: new PublicKey(e.mint),
+      tokenProgram: new PublicKey(e.tokenProgram),
     })),
   }
 }
@@ -443,25 +444,25 @@ export function deserializeFlavorGeneric(flavor: FlavorGenericStateJson): Flavor
   return {
     flavor: "generic",
     currentSyExchangeRate: flavor.currentSyExchangeRate,
-    mintBase: new web3.PublicKey(flavor.mintBase),
-    baseTokenProgram: new web3.PublicKey(flavor.baseTokenProgram),
+    mintBase: new PublicKey(flavor.mintBase),
+    baseTokenProgram: new PublicKey(flavor.baseTokenProgram),
     emissions: flavor.emissions.map((e) => ({
       exchangeRate: new PreciseNumber(e.exchangeRate.toString()).anchorify(),
-      mint: new web3.PublicKey(e.mint),
-      tokenProgram: new web3.PublicKey(e.tokenProgram),
+      mint: new PublicKey(e.mint),
+      tokenProgram: new PublicKey(e.tokenProgram),
     })),
     genericSyState: {
-      selfAddress: new web3.PublicKey(flavor.genericSyState.selfAddress),
+      selfAddress: new PublicKey(flavor.genericSyState.selfAddress),
       syRate: flavor.genericSyState.syRate,
-      tokenProgramBase: new web3.PublicKey(flavor.genericSyState.tokenProgramBase),
+      tokenProgramBase: new PublicKey(flavor.genericSyState.tokenProgramBase),
       additionalData: flavor.genericSyState.additionalData
         ? fromAdditionalDataGenericJson(flavor.genericSyState.additionalData)
         : undefined,
       account: {
-        mintSy: new web3.PublicKey(flavor.genericSyState.account.mintSy),
-        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)),
+        mintSy: new PublicKey(flavor.genericSyState.account.mintSy),
+        yieldBearingMint: new PublicKey(flavor.genericSyState.account.yieldBearingMint),
+        tokenSyEscrow: new PublicKey(flavor.genericSyState.account.tokenSyEscrow),
+        interfaceAccounts: flavor.genericSyState.account.interfaceAccounts.map((a) => new PublicKey(a)),
         interfaceType: fromInterfaceTypeGenericJson(flavor.genericSyState.account.interfaceType),
         maxSySupply: new BN(flavor.genericSyState.account.maxSySupply),
         minMintSize: new BN(flavor.genericSyState.account.minMintSize),
@@ -471,12 +472,12 @@ export function deserializeFlavorGeneric(flavor: FlavorGenericStateJson): Flavor
           interfaceEmissionsAccountsUntil: flavor.genericSyState.account.hook.interfaceEmissionsAccountsUntil,
           preMintHookDiscriminator: Array.from(flavor.genericSyState.account.hook.preMintHookDiscriminator),
           postRedeemHookDiscriminator: Array.from(flavor.genericSyState.account.hook.postRedeemHookDiscriminator),
-          programId: new web3.PublicKey(flavor.genericSyState.account.hook.programId),
+          programId: new PublicKey(flavor.genericSyState.account.hook.programId),
         },
         emissions: flavor.genericSyState.account.emissions.map((e) => ({
-          mint: new web3.PublicKey(e.mint),
-          tokenProgram: new web3.PublicKey(e.tokenProgram),
-          escrowAccount: new web3.PublicKey(e.escrowAccount),
+          mint: new PublicKey(e.mint),
+          tokenProgram: new PublicKey(e.tokenProgram),
+          escrowAccount: new PublicKey(e.escrowAccount),
           index: new PreciseNumber(e.index.toString()).anchorify(),
           lastSeenIndex: new PreciseNumber(e.lastSeenIndex.toString()).anchorify(),
           lastSeenTotalAccruedEmissions: new BN(e.lastSeenTotalAccruedEmissions),
@@ -552,7 +553,7 @@ export function makeFlavorGenericSync(data: FlavorGenericState, syConfig?: { ski
   }
 }
 
-export function flavorFinder(env: Environment, syProgram: web3.PublicKey): FlavorDiscriminator {
+export function flavorFinder(env: Environment, syProgram: PublicKey): FlavorDiscriminator {
   if (env.marginfiSyProgramId?.equals(syProgram)) {
     return "marginfi"
   } else if (env.kaminoSyProgramId?.equals(syProgram)) {
@@ -572,7 +573,7 @@ export async function makeFlavor(
   fetcher: ExponentFetcher,
   env: Environment,
   /** The actual SY program linked to the market */
-  syProgram: web3.PublicKey,
+  syProgram: PublicKey,
   cpiAccounts: CpiAccountsRaw,
   syConfig?: { skipWrap?: boolean },
 ): Promise<Flavor> {
@@ -594,12 +595,12 @@ export async function makeFlavor(
 
 async function makeMarginfiFlavor(
   fetcher: ExponentFetcher,
-  marginfiSyProgramId: web3.PublicKey,
+  marginfiSyProgramId: PublicKey,
   cpiAccounts: CpiAccountsRaw,
 ): Promise<FlavorMarginfi> {
   /** Solana's convention is to use the Program ID for the account address if the account is null */
-  const isNone = (x: web3.PublicKey) => x.equals(marginfiSyProgramId)
-  const mapOptAccount = (x: web3.PublicKey) => (isNone(x) ? undefined : x)
+  const isNone = (x: PublicKey) => x.equals(marginfiSyProgramId)
+  const mapOptAccount = (x: PublicKey) => (isNone(x) ? undefined : x)
 
   // TODO - I do not like hard-coding these magic numbers
   const bank = cpiAccounts.getSyState[2].pubkey
@@ -641,7 +642,7 @@ async function makeMarginfiFlavor(
 
 async function makeKaminoFlavor(
   fetcher: ExponentFetcher,
-  kaminoSyProgramId: web3.PublicKey,
+  kaminoSyProgramId: PublicKey,
   cpiAccounts: CpiAccountsRaw,
 ): Promise<FlavorKamino> {
   // TODO - I do not like hard-coding these magic numbers
@@ -655,7 +656,7 @@ async function makeKaminoFlavor(
   // @ts-ignore
   const baseTokenProgram = await fetcher.connection.getAccountInfo(mintBase).then((a) => a.owner)
 
-  const pda = new KaminoSyPda(new web3.PublicKey(KAMINO_STANDARD_PROGRAM_ID))
+  const pda = new KaminoSyPda(new PublicKey(KAMINO_STANDARD_PROGRAM_ID))
   const meta = pda.syMeta({ kaminoReserve: reserve })
 
   const syMeta = await fetcher.fetchKaminoSyMeta(meta)
@@ -691,7 +692,7 @@ async function makeKaminoFlavor(
 
 async function makeJitoRestakingFlavor(
   fetcher: ExponentFetcher,
-  jitoRestakingSyProgramId: web3.PublicKey,
+  jitoRestakingSyProgramId: PublicKey,
   cpiAccounts: CpiAccountsRaw,
 ): Promise<FlavorJitoRestaking> {
   // TODO - I do not like hard-coding these magic numbers
@@ -723,7 +724,7 @@ async function makeJitoRestakingFlavor(
 
 async function makePerenaFlavor(
   fetcher: ExponentFetcher,
-  perenaSyProgramId: web3.PublicKey,
+  perenaSyProgramId: PublicKey,
   cpiAccounts: CpiAccountsRaw,
 ): Promise<FlavorPerena> {
   const perenaStablePool = cpiAccounts.getSyState[1].pubkey
@@ -754,7 +755,7 @@ async function makePerenaFlavor(
 
 async function makeGenericFlavor(
   fetcher: ExponentFetcher,
-  genericStandardProgramId: web3.PublicKey,
+  genericStandardProgramId: PublicKey,
   cpiAccounts: CpiAccountsRaw,
   syConfig?: { skipWrap?: boolean },
 ): Promise<FlavorGeneric> {
@@ -837,4 +838,4 @@ export function deserializeFlavor(
     default:
       throw new Error(`Unsupported flavor for deserialization: ${(flavor as any).flavor}`)
   }
-}
+}

package/src/index.ts

@@ -1,17 +1,26 @@
+export { InvalidAddressLookupTableError } from "./addressLookupTableUtil"
 export { Market, LiquidityAdd, MarketAdminAction } from "./market"
+export type { MarketJson } from "./market"
 export { Vault } from "./vault"
-export { MarketThree, MarketSnapshotData } from "./marketThree"
+export { MarketThree, MarketSnapshotData, SwapDirection } from "./marketThree"
 export * from "./orderbook"
+export * from "./exponentVaults"
+export { calcPriceInAssetsByAPYPt } from "./orderbook/math"
 export { LpPosition, LpPositionState } from "./lpPosition"
 export { YtPosition } from "./ytPosition"
-export { EventDecoder } from "./events"
-export * as exponentEvents from "./eventsV2"
-export * as clmmEvents from "./clmm/events"
-export * from "./EventDecoderV2"
-export type { AdminAction } from "./vault"
-export type { CategorizedEvents } from "./events"
-export * as events from "./events"
+export type { AdminAction, Amount } from "./client/core"
+export { adminAction, marketAdminAction, amount, CollectTreasuryInterestKind, CollectTreasuryEmissionKind } from "./client/core"
+export type { OfferOptions } from "./client/orderbook"
+export { offerOptions } from "./client/orderbook"
+export { priceId, vaultSettingsAction } from "./client/vaults"
+
+// Codama-based event decoders (Anchor-free)
+export { CodamaEventDecoder } from "./CodamaEventDecoder"
+export type { GenericEvent } from "./CodamaEventDecoder"
+export * as exponentEvents from "./codamaEvents"
+export * as clmmEvents from "./clmm/codamaEvents"
 export * from "./environment"
 export * as flavors from "./flavors"
 export { makeSyPosition } from "./syPosition"
 export { Router, RouterTradeSource, RouterQuoteDirection } from "./router"
+export type { ClmmWithTicks, SplitQuote, SplitRoute as SdkSplitRoute } from "./router"

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(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