@exponent-labs/exponent-sdk 0.1.7 → 0.1.8

package/src/vault.ts

@@ -15,6 +15,7 @@ import {
   VaultEmission,
   VaultJson,
   VaultState,
+  VaultStateJson,
   deserializeCpiAccountsRaw,
   serializeCpiAccountsRaw,
 } from "@exponent-labs/exponent-types"
@@ -99,14 +100,14 @@ export class Vault {
     public env: Environment,
     public connection: web3.Connection,
   ) {
-    this.coreProgram = new Program<ExponentCore>(
+    this.coreProgram = new Program(
       IDL as ExponentCore,
       new AnchorProvider(connection, new MyWallet(web3.Keypair.generate())),
     )
   }
 
   static loadFromJson(vaultJson: VaultJson, address: web3.PublicKey, env: Environment, connection: web3.Connection) {
-    const state = toVaultState(vaultJson)
+    const state = deserializeVaultState(vaultJson.state)
     return new Vault(state, address, env, connection)
   }
 
@@ -169,6 +170,7 @@ export class Vault {
     return {
       startTs: this.state.startTs,
       duration: this.state.durationSeconds,
+      state: serializeVaultState(this.state),
       authority: this.state.authority.toString(),
       syBalance: this.syBalance.toString(),
       addressLookupTable: this.state.addressLookupTable.toString(),
@@ -197,22 +199,7 @@ export class Vault {
       // Misspelled word
       yieldPositonAddress: this.state.yieldPositonAddress.toString(),
       interestFeeBps: this.state.interestBpsFee,
-      flavor: (() => {
-        switch (this.state.flavor.flavor) {
-          case "marginfi":
-            return serializeFlavorMarginfi(this.state.flavor)
-          case "kamino":
-            return serializeFlavorKamino(this.state.flavor)
-          case "jitoRestaking":
-            return serializeFlavorJitoRestaking(this.state.flavor)
-          case "perena":
-            return serializeFlavorPerena(this.state.flavor)
-          case "generic":
-            return serializeFlavorGeneric(this.state.flavor)
-          default:
-            throw new Error(`Unknown flavor: ${this.state.flavor}`)
-        }
-      })(),
+      flavor: serializeFlavorState(this.state.flavor),
       emissions: this.state.emissions.map((e) => serializeEmission(e)),
       maxPySupply: this.state.maxPySupply.toString(),
     }
@@ -477,7 +464,7 @@ export class Vault {
     const redeemSyIx = await this.state.flavor.ixRedeemSy({
       amountSy: "0",
       redeemer: owner,
-      redeemerBaseTokenAccount: baseDst,
+      redeemerBaseTokenAccount: baseDst || web3.PublicKey.default,
       redeemerSyTokenAccount: syDst,
     })
 
@@ -872,50 +859,101 @@ export class Vault {
   }
 }
 
-function toVaultState(vault: VaultJson): VaultState {
+function serializeFlavorState(flavor: VaultState["flavor"]): VaultStateJson["flavor"] {
+  switch (flavor.flavor) {
+    case "marginfi":
+      return serializeFlavorMarginfi(flavor)
+    case "kamino":
+      return serializeFlavorKamino(flavor)
+    case "jitoRestaking":
+      return serializeFlavorJitoRestaking(flavor)
+    case "perena":
+      return serializeFlavorPerena(flavor)
+    case "generic":
+      return serializeFlavorGeneric(flavor)
+    default:
+      throw new Error(`Unknown flavor: ${flavor}`)
+  }
+}
+
+function deserializeFlavorState(flavor: VaultStateJson["flavor"]): VaultState["flavor"] {
+  switch (flavor.flavor) {
+    case "marginfi":
+      return makeFlavorMarginfiSync(deserializeFlavorMarginfi(flavor))
+    case "kamino":
+      return makeFlavorKaminoSync(deserializeFlavorKamino(flavor))
+    case "jitoRestaking":
+      return makeFlavorJitoRestakingSync(deserializeFlavorJitoRestaking(flavor))
+    case "perena":
+      return makeFlavorPerenaSync(deserializeFlavorPerena(flavor))
+    case "generic":
+      return makeFlavorGenericSync(deserializeFlavorGeneric(flavor))
+    default:
+      throw new Error(`Unknown flavor: ${flavor}`)
+  }
+}
+
+export function serializeVaultState(state: VaultState): VaultStateJson {
   return {
-    ptSupply: BigInt(vault.ptSupply),
-    syForPt: BigInt(vault.syForPt),
-    startTs: vault.startTs,
-    durationSeconds: vault.duration,
-    authority: new web3.PublicKey(vault.authority),
-    addressLookupTable: new web3.PublicKey(vault.addressLookupTable),
-    lastSeenSyExchangeRate: vault.lastSeenSyExchangeRate,
-    allTimeHighSyExchangeRate: vault.allTimeHighSyExchangeRate,
-    escrowSy: new web3.PublicKey(vault.escrowSy),
-    escrowYt: new web3.PublicKey(vault.escrowYt),
-    syProgram: new web3.PublicKey(vault.syProgram),
-    syPosition: deserializeSyPosition(vault.syPosition),
-    mintPt: new web3.PublicKey(vault.mintPt),
-    status: vault.status,
-    minOperationSizeStrip: BigInt(vault.minOperationSizeStrip),
-    minOperationSizeMerge: BigInt(vault.minOperationSizeMerge),
-    mintYt: new web3.PublicKey(vault.mintYt),
-    mintSy: new web3.PublicKey(vault.mintSy),
-    yieldPositonAddress: new web3.PublicKey(vault.yieldPositonAddress),
-    treasurySyTokenAccount: new web3.PublicKey(vault.treasurySyTokenAccount),
-    interestBpsFee: vault.interestFeeBps,
-    totalSyInEscrow: BigInt(vault.totalSyInEscrow),
-    cpiAccounts: deserializeCpiAccountsRaw(vault.cpiAccounts),
-    finalSyExchangeRate: vault.finalSyExchangeRate,
-    flavor: (() => {
-      switch (vault.flavor.flavor) {
-        case "marginfi":
-          return makeFlavorMarginfiSync(deserializeFlavorMarginfi(vault.flavor))
-        case "kamino":
-          return makeFlavorKaminoSync(deserializeFlavorKamino(vault.flavor))
-        case "jitoRestaking":
-          return makeFlavorJitoRestakingSync(deserializeFlavorJitoRestaking(vault.flavor))
-        case "perena":
-          return makeFlavorPerenaSync(deserializeFlavorPerena(vault.flavor))
-        case "generic":
-          return makeFlavorGenericSync(deserializeFlavorGeneric(vault.flavor))
-        default:
-          throw new Error(`Unknown flavor: ${vault.flavor}`)
-      }
-    })(),
-    emissions: vault.emissions.map((e) => deserializeEmission(e)),
-    maxPySupply: BigInt(vault.maxPySupply),
+    ptSupply: state.ptSupply.toString(),
+    syForPt: state.syForPt.toString(),
+    startTs: state.startTs,
+    durationSeconds: state.durationSeconds,
+    authority: state.authority.toString(),
+    addressLookupTable: state.addressLookupTable.toString(),
+    lastSeenSyExchangeRate: state.lastSeenSyExchangeRate,
+    allTimeHighSyExchangeRate: state.allTimeHighSyExchangeRate,
+    escrowSy: state.escrowSy.toString(),
+    escrowYt: state.escrowYt.toString(),
+    syProgram: state.syProgram.toString(),
+    syPosition: serializeSyPosition(state.syPosition),
+    cpiAccounts: serializeCpiAccountsRaw(state.cpiAccounts),
+    mintPt: state.mintPt.toString(),
+    status: state.status,
+    minOperationSizeStrip: state.minOperationSizeStrip.toString(),
+    minOperationSizeMerge: state.minOperationSizeMerge.toString(),
+    mintYt: state.mintYt.toString(),
+    mintSy: state.mintSy.toString(),
+    yieldPositonAddress: state.yieldPositonAddress.toString(),
+    treasurySyTokenAccount: state.treasurySyTokenAccount.toString(),
+    interestBpsFee: state.interestBpsFee,
+    totalSyInEscrow: state.totalSyInEscrow.toString(),
+    flavor: serializeFlavorState(state.flavor),
+    finalSyExchangeRate: state.finalSyExchangeRate,
+    emissions: state.emissions.map((emission) => serializeEmission(emission)),
+    maxPySupply: state.maxPySupply.toString(),
+  }
+}
+
+export function deserializeVaultState(state: VaultStateJson): VaultState {
+  return {
+    ptSupply: BigInt(state.ptSupply),
+    syForPt: BigInt(state.syForPt),
+    startTs: state.startTs,
+    durationSeconds: state.durationSeconds,
+    authority: new web3.PublicKey(state.authority),
+    addressLookupTable: new web3.PublicKey(state.addressLookupTable),
+    lastSeenSyExchangeRate: state.lastSeenSyExchangeRate,
+    allTimeHighSyExchangeRate: state.allTimeHighSyExchangeRate,
+    escrowSy: new web3.PublicKey(state.escrowSy),
+    escrowYt: new web3.PublicKey(state.escrowYt),
+    syProgram: new web3.PublicKey(state.syProgram),
+    syPosition: deserializeSyPosition(state.syPosition),
+    cpiAccounts: deserializeCpiAccountsRaw(state.cpiAccounts),
+    mintPt: new web3.PublicKey(state.mintPt),
+    status: state.status,
+    minOperationSizeStrip: BigInt(state.minOperationSizeStrip),
+    minOperationSizeMerge: BigInt(state.minOperationSizeMerge),
+    mintYt: new web3.PublicKey(state.mintYt),
+    mintSy: new web3.PublicKey(state.mintSy),
+    yieldPositonAddress: new web3.PublicKey(state.yieldPositonAddress),
+    treasurySyTokenAccount: new web3.PublicKey(state.treasurySyTokenAccount),
+    interestBpsFee: state.interestBpsFee,
+    totalSyInEscrow: BigInt(state.totalSyInEscrow),
+    flavor: deserializeFlavorState(state.flavor),
+    finalSyExchangeRate: state.finalSyExchangeRate,
+    emissions: state.emissions.map((emission) => deserializeEmission(emission)),
+    maxPySupply: BigInt(state.maxPySupply),
   }
 }
 

package/src/ytPosition.ts

@@ -23,7 +23,7 @@ export class YtPosition {
     public vault: Vault,
   ) {
     const mockWallet = new MyWallet(web3.Keypair.generate())
-    this.coreProgram = new Program<ExponentCore>(IDL as ExponentCore, new AnchorProvider(connection, mockWallet))
+    this.coreProgram = new Program(IDL as ExponentCore, new AnchorProvider(connection, mockWallet))
   }
 
   /** Loads the YT position by address, and loads Vault, too */
@@ -59,6 +59,32 @@ export class YtPosition {
     return Promise.all(addresses.map((addr) => YtPosition.load(env, connection, addr)))
   }
 
+  /** Batch load multiple YT positions in a single RPC call */
+  static async loadBatch(
+    env: Environment,
+    connection: web3.Connection,
+    owner: web3.PublicKey,
+    vaults: Vault[],
+  ): Promise<(YtPosition | null)[]> {
+    if (vaults.length === 0) return []
+
+    const pda = new ExponentPDA(env.coreProgramId)
+    const addresses = vaults.map((vault) =>
+      pda.yieldPosition({
+        vault: vault.selfAddress,
+        owner,
+      }),
+    )
+
+    const fetcher = new ExponentFetcher({ connection })
+    const positions = await fetcher.fetchYtPositions(addresses)
+
+    return positions.map((state, index) => {
+      if (!state) return null
+      return new YtPosition(env, connection, addresses[index], state, vaults[index])
+    })
+  }
+
   async reload(connection = this.connection) {
     const x = await YtPosition.load(this.env, connection, this.selfAddress)
     this.state = x.state
@@ -112,19 +138,14 @@ export class YtPosition {
     return this.vault.syEmissions.map((e, index) => {
       // Use initial index if user doesn't have a position yet (lastSeenIndex is 0)
       const lastSeenIndex = this.state.emissions[index]?.lastSeenIndex ?? 0
-      console.log("lastSeenIndex: ", lastSeenIndex)
+      // console.log("lastSeenIndex: ", lastSeenIndex)
 
       // use finalIndex from the vault's emissions
       const finalIndex = Number(
         PreciseNumber.fromRaw(this.vault.state.emissions[index]?.finalIndex?.[0] || e.index[0]).valueString,
       )
 
-      console.log("finalIndex: ", finalIndex)
-      console.log("totalSyBalance: ", totalSyBalance)
-      console.log("finalIndex - lastSeenIndex: ", finalIndex - Number(lastSeenIndex))
-
       const earnedEmission = totalSyBalance * (finalIndex - Number(lastSeenIndex))
-      console.log("earnedEmission: ", earnedEmission)
 
       return {
         mint: e.mint,

package/tsconfig.json

@@ -23,6 +23,7 @@
     { "path": "../market-math" },
     { "path": "../marginfi-util" },
     { "path": "../exponent-pda" },
+    { "path": "../exponent-clmm-pda" },
     { "path": "../marginfi-sy-sdk" },
     { "path": "../kamino-sy-sdk" },
     { "path": "../exponent-types" },
@@ -33,6 +34,8 @@
     { "path": "../perena-sy-pda" },
     { "path": "../generic-sy-sdk" },
     { "path": "../generic-sy-idl" },
-    { "path": "../generic-sy-pda" }
+    { "path": "../generic-sy-pda" },
+    { "path": "../exponent-orderbook-idl" },
+    { "path": "../market-three-math" }
   ]
 }