@exponent-labs/exponent-sdk 0.0.10 → 0.1.1

package/src/syPosition.ts

@@ -1,29 +1,31 @@
 import { web3 } from "@coral-xyz/anchor"
-import {
-  makeFlavorJitoRestakingSync,
-  makeFlavorKaminoSync,
-  makeFlavorMarginfiSync,
-  makeFlavorPerenaSync,
-} from "./flavors"
+
 import { ExponentFetcher, SyPosition } from "@exponent-labs/exponent-fetcher"
-import { MarginfiSyPda } from "@exponent-labs/marginfi-sy-pda"
-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"
 import {
-  FlavorMarginfi,
-  FlavorKamino,
-  SyPositionJson,
-  IFlavorState,
+  FlavorGeneric,
   FlavorJitoRestaking,
+  FlavorKamino,
+  FlavorMarginfi,
   FlavorPerena,
-  FlavorGeneric,
+  IFlavorState,
+  SyPositionJson,
 } from "@exponent-labs/exponent-types"
+import { PROGRAM_ID as GENERIC_STANDARD_PROGRAM_ID } from "@exponent-labs/generic-sy-idl"
+import { GenericSyPda } from "@exponent-labs/generic-sy-pda"
 import { PROGRAM_ID as JITO_RESTAKING_SY_PROGRAM_ID } from "@exponent-labs/jito-restaking-sy-idl"
+import { JitoRestakingSyPda } from "@exponent-labs/jito-restaking-sy-pda"
+import { PROGRAM_ID as KAMINO_STANDARD_PROGRAM_ID } from "@exponent-labs/kamino-sy-idl"
+import { KaminoSyPda } from "@exponent-labs/kamino-sy-pda"
+import { MarginfiSyPda } from "@exponent-labs/marginfi-sy-pda"
+import { PROGRAM_ID as PERENA_STANDARD_PROGRAM_ID } from "@exponent-labs/perena-sy-idl"
 import { PerenaSyPda } from "@exponent-labs/perena-sy-pda"
-import { GenericSyPda } from "@exponent-labs/generic-sy-pda"
+
+import {
+  makeFlavorJitoRestakingSync,
+  makeFlavorKaminoSync,
+  makeFlavorMarginfiSync,
+  makeFlavorPerenaSync,
+} from "./flavors"
 
 export function deserializeSyPosition(syPosition: SyPositionJson): SyPosition {
   return {
@@ -37,11 +39,11 @@ export function deserializeSyPosition(syPosition: SyPositionJson): SyPosition {
   }
 }
 
-export function serializeSyPostion(syPostion: SyPosition): SyPositionJson {
+export function serializeSyPosition(syPosition: SyPosition): SyPositionJson {
   return {
-    balanceSy: syPostion.balanceSy.toString(),
-    owner: syPostion.owner.toString(),
-    emissions: syPostion.emissions.map((emission) => ({
+    balanceSy: syPosition.balanceSy.toString(),
+    owner: syPosition.owner.toString(),
+    emissions: syPosition.emissions.map((emission) => ({
       ...emission,
       mint: emission.mint.toString(),
       staged: emission.staged.toString(),
@@ -58,16 +60,24 @@ export async function makeSyPosition(
   if (flavor.flavor === "marginfi") {
     const marginfiFlavor = makeFlavorMarginfiSync(flavor)
     return makeSyPositionMarginfi(fetcher, syProgramId, marginfiFlavor, owner)
-  } else if (flavor.flavor === "kamino") {
+  }
+
+  if (flavor.flavor === "kamino") {
     const kaminoFlavor = makeFlavorKaminoSync(flavor)
     return makeSyPositionKamino(fetcher, kaminoFlavor, owner)
-  } else if (flavor.flavor === "jitoRestaking") {
+  }
+
+  if (flavor.flavor === "jitoRestaking") {
     const jitoRestakingFlavor = makeFlavorJitoRestakingSync(flavor)
     return makeSyPositionJitoRestaking(fetcher, jitoRestakingFlavor, owner)
-  } else if (flavor.flavor === "perena") {
+  }
+
+  if (flavor.flavor === "perena") {
     const perenaFlavor = makeFlavorPerenaSync(flavor)
     return makeSyPositionPerena(fetcher, perenaFlavor, owner)
-  } else if (flavor.flavor === "generic") {
+  }
+
+  if (flavor.flavor === "generic") {
     return makeSyPositionGeneric(fetcher, flavor as FlavorGeneric, owner)
   }
 
@@ -142,6 +152,8 @@ async function makeSyPositionGeneric(
     interfaceIndex = 3 // InterfaceType.Fragmetric
   } else if ("meteora" in interfaceType) {
     interfaceIndex = 4 // InterfaceType.Meteora
+  } else if ("fragmetricSupportedAsset" in interfaceType) {
+    interfaceIndex = 5 // InterfaceType.FragmetricSupportedAsset
   } else {
     throw new Error("Unsupported interface type")
   }

package/src/tokenUtil.ts

@@ -1,17 +1,19 @@
 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> {
-  const mintInfo = await cnx.getAccountInfo(address)
+export async function getMintSupply(connection: web3.Connection, address: web3.PublicKey): Promise<bigint> {
+  const mintInfo = await connection.getAccountInfo(address)
   if (mintInfo === null) {
     throw new Error("Failed to find mint account")
   }
   return MintLayout.decode(mintInfo.data).supply
 }
 
-export async function getMultipleMintSupply(cnx: web3.Connection, addresses: web3.PublicKey[]): Promise<bigint[]> {
-  const mintInfos = await cnx.getMultipleAccountsInfo(addresses)
+export async function getMultipleMintSupply(
+  connection: web3.Connection,
+  addresses: web3.PublicKey[],
+): Promise<bigint[]> {
+  const mintInfos = await connection.getMultipleAccountsInfo(addresses)
   return mintInfos.map((mintInfo) => {
     if (mintInfo === null) {
       throw new Error("Failed to find mint account")

package/src/utils/altUtil.ts

@@ -1,14 +1,15 @@
 import * as web3 from "@solana/web3.js"
-import { CpiAccountsRaw, CpiAccountIndexes, CpiAccountIndex, AccountInfo } from "@exponent-labs/exponent-types"
+
+import { AccountInfo, CpiAccountIndex, CpiAccountIndexes, CpiAccountsRaw } from "@exponent-labs/exponent-types"
 
 export function extendAddressLookupTable(
   oldAlt: web3.PublicKey[],
-  c: CpiAccountsRaw,
+  cpiAccountsRaw: CpiAccountsRaw,
 ): {
   cpiAccountIndexes: CpiAccountIndexes
   addressLookupTableExtension: web3.PublicKey[]
 } {
-  const allPubkeys = getAllPubkeysFromCpiAccountsRaw(c)
+  const allPubkeys = getAllPubkeysFromCpiAccountsRaw(cpiAccountsRaw)
 
   const newPubkeys = allPubkeys.filter((p) => !oldAlt.some((o) => o.equals(p)))
   const addressLookupTableExtension = Array.from(new Set(newPubkeys))
@@ -26,11 +27,11 @@ export function extendAddressLookupTable(
   })
 
   const cpiAccountIndexes: CpiAccountIndexes = {
-    getSyState: c.getSyState.map(toCpiAccountIndex),
-    withdrawSy: c.withdrawSy.map(toCpiAccountIndex),
-    depositSy: c.depositSy.map(toCpiAccountIndex),
-    claimEmission: c.claimEmission.map((a) => a.map(toCpiAccountIndex)),
-    getPositionState: c.getPositionState.map(toCpiAccountIndex),
+    getSyState: cpiAccountsRaw.getSyState.map(toCpiAccountIndex),
+    withdrawSy: cpiAccountsRaw.withdrawSy.map(toCpiAccountIndex),
+    depositSy: cpiAccountsRaw.depositSy.map(toCpiAccountIndex),
+    claimEmission: cpiAccountsRaw.claimEmission.map((a) => a.map(toCpiAccountIndex)),
+    getPositionState: cpiAccountsRaw.getPositionState.map(toCpiAccountIndex),
   }
 
   return {
@@ -40,8 +41,12 @@ export function extendAddressLookupTable(
 }
 
 /** Get all pubkeys from CpiAccountsRaw */
-export function getAllPubkeysFromCpiAccountsRaw(c: CpiAccountsRaw): web3.PublicKey[] {
-  return [...c.getSyState, ...c.withdrawSy, ...c.depositSy, ...c.claimEmission.flat(), ...c.getPositionState].map(
-    (a) => a.pubkey,
-  )
+export function getAllPubkeysFromCpiAccountsRaw(cpiAccountsRaw: CpiAccountsRaw): web3.PublicKey[] {
+  return [
+    ...cpiAccountsRaw.getSyState,
+    ...cpiAccountsRaw.withdrawSy,
+    ...cpiAccountsRaw.depositSy,
+    ...cpiAccountsRaw.claimEmission.flat(),
+    ...cpiAccountsRaw.getPositionState,
+  ].map((a) => a.pubkey)
 }

package/src/utils/binSolver.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from "@jest/globals"
+
 import { binSolver } from "./binSolver"
 
 describe("bin solver", () => {

package/src/utils/index.ts

@@ -1,5 +1,7 @@
 import { web3 } from "@coral-xyz/anchor"
+
 import { EXPONENT_ADMIN_PROGRAM_ID, ExponentAdminPda } from "@exponent-labs/exponent-admin-pda"
+
 export { InstructionAccounts } from "./ix"
 
 export function uniqueRemainingAccounts(xs: web3.AccountMeta[]): web3.AccountMeta[] {

package/src/vault.ts

@@ -1,52 +1,65 @@
-import { BN, Program, web3, AnchorProvider } from "@coral-xyz/anchor"
-import { deserializeEmission, ExponentFetcher, serializeEmission } from "@exponent-labs/exponent-fetcher"
+import { AnchorProvider, BN, Program, web3 } from "@coral-xyz/anchor"
+import {
+  TOKEN_PROGRAM_ID,
+  createAssociatedTokenAccountIdempotentInstruction,
+  getAssociatedTokenAddressSync,
+} from "@solana/spl-token"
+
+import { EXPONENT_ADMIN_PROGRAM_ID, ExponentAdminPda } from "@exponent-labs/exponent-admin-pda"
+import { ExponentFetcher, deserializeEmission, serializeEmission } from "@exponent-labs/exponent-fetcher"
+import { ExponentCore, IDL } from "@exponent-labs/exponent-idl"
+import { ExponentPDA } from "@exponent-labs/exponent-pda"
+import {
+  AnchorizedPNum,
+  CpiAccountsRaw,
+  VaultEmission,
+  VaultJson,
+  VaultState,
+  deserializeCpiAccountsRaw,
+  serializeCpiAccountsRaw,
+} from "@exponent-labs/exponent-types"
+import { ClaimAmount } from "@exponent-labs/marginfi-sy-sdk"
+
 import { fetchAddressLookupTable, makeCpiAccountMetaLists } from "./addressLookupTableUtil"
+import { Environment } from "./environment"
 import {
   deserializeFlavorGeneric,
+  deserializeFlavorJitoRestaking,
   deserializeFlavorKamino,
   deserializeFlavorMarginfi,
-  deserializeFlavorParena,
-  deserializeFlavorJitoRestaking,
+  deserializeFlavorPerena,
   makeFlavor,
   makeFlavorGenericSync,
+  makeFlavorJitoRestakingSync,
   makeFlavorKaminoSync,
   makeFlavorMarginfiSync,
   makeFlavorPerenaSync,
-  makeFlavorJitoRestakingSync,
   serializeFlavorGeneric,
   serializeFlavorJitoRestaking,
   serializeFlavorKamino,
   serializeFlavorMarginfi,
-  serializeFlavorParena,
+  serializeFlavorPerena,
 } from "./flavors"
-import { Environment } from "./environment"
-import {
-  createAssociatedTokenAccountIdempotentInstruction,
-  getAssociatedTokenAddressSync,
-  TOKEN_PROGRAM_ID,
-} from "@solana/spl-token"
-import { deserializeSyPosition, makeSyPosition, serializeSyPostion } from "./syPosition"
-import { ExponentCore, IDL } from "@exponent-labs/exponent-idl"
-import { emitEventAuthority, InstructionAccounts, uniqueRemainingAccounts } from "./utils"
-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-types"
-import { VaultEmission, VaultJson, VaultState, AnchorizedPNum, CpiAccountsRaw } from "@exponent-labs/exponent-types"
+import { deserializeSyPosition, makeSyPosition, serializeSyPosition } from "./syPosition"
+import { InstructionAccounts, emitEventAuthority, uniqueRemainingAccounts } from "./utils"
 import { extendAddressLookupTable } from "./utils/altUtil"
-import { ClaimAmount } from "@exponent-labs/marginfi-sy-sdk"
 
 export type CollectTreasuryEmissionKind =
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   | { yieldPosition: {} }
   | {
+      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
       treasuryEmission: {}
     }
 
 export type CollectTreasuryInterestKind =
   | {
+      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
       yieldPosition: {}
     }
   | {
+      // eslint-disable-next-line @typescript-eslint/no-empty-object-type
       treasuryInterest: {}
     }
 
@@ -92,8 +105,8 @@ export class Vault {
     )
   }
 
-  static loadFromJson(v: VaultJson, address: web3.PublicKey, env: Environment, connection: web3.Connection) {
-    const state = toVaultState(v)
+  static loadFromJson(vaultJson: VaultJson, address: web3.PublicKey, env: Environment, connection: web3.Connection) {
+    const state = toVaultState(vaultJson)
     return new Vault(state, address, env, connection)
   }
 
@@ -104,52 +117,53 @@ export class Vault {
     options: VaultLoadOptions = {},
   ) {
     const fetcher = new ExponentFetcher({ connection })
-    const v = await fetcher.fetchVault(address)
+    const vault = await fetcher.fetchVault(address)
+
 
-    const alt = await fetchAddressLookupTable(connection, v.addressLookupTable)
-    const cpiAccounts = makeCpiAccountMetaLists(alt, v.cpiAccounts)
-    const flavor = await makeFlavor(fetcher, env, v.syProgram, cpiAccounts, options.syConfig)
-    const positionInCpiAccounts = cpiAccounts.depositSy[6]
-    console.log("positionInCpiAccounts", positionInCpiAccounts.pubkey.toBase58())
-    const syPosition = await makeSyPosition(fetcher, flavor, v.syProgram, v.authority)
+    const alt = await fetchAddressLookupTable(connection, vault.addressLookupTable)
+    const cpiAccounts = makeCpiAccountMetaLists(alt, vault.cpiAccounts)
+    const flavor = await makeFlavor(fetcher, env, vault.syProgram, cpiAccounts, options.syConfig)
+
+    const syPosition = await makeSyPosition(fetcher, flavor, vault.syProgram, vault.authority)
 
     const state: VaultState = {
-      ptSupply: v.ptSupply,
-      syForPt: v.syForPt,
-      startTs: v.startTs,
-      durationSeconds: v.duration,
-      authority: v.authority,
-      addressLookupTable: v.addressLookupTable,
-      lastSeenSyExchangeRate: v.lastSeenSyExchangeRate,
-      allTimeHighSyExchangeRate: v.allTimeHighSyExchangeRate,
-      syProgram: v.syProgram,
-      mintPt: v.mintPt,
-      mintSy: v.mintSy,
-      mintYt: v.mintYt,
-      escrowSy: v.escrowSy,
-      escrowYt: v.escrowYt,
-      yieldPositonAddress: v.yieldPosition,
+      ptSupply: vault.ptSupply,
+      syForPt: vault.syForPt,
+      startTs: vault.startTs,
+      durationSeconds: vault.duration,
+      authority: vault.authority,
+      addressLookupTable: vault.addressLookupTable,
+      lastSeenSyExchangeRate: vault.lastSeenSyExchangeRate,
+      allTimeHighSyExchangeRate: vault.allTimeHighSyExchangeRate,
+      syProgram: vault.syProgram,
+      mintPt: vault.mintPt,
+      mintSy: vault.mintSy,
+      mintYt: vault.mintYt,
+      escrowSy: vault.escrowSy,
+      escrowYt: vault.escrowYt,
+      // Misspelled word
+      yieldPositonAddress: vault.yieldPosition,
       cpiAccounts,
       flavor,
       syPosition,
-      totalSyInEscrow: v.totalSyInEscrow,
-      treasurySyTokenAccount: v.treasurySyTokenAccount,
-      interestBpsFee: v.interestBpsFee,
-      emissions: v.emissions,
-      minOperationSizeStrip: v.minOpSizeStrip,
-      minOperationSizeMerge: v.minOpSizeMerge,
-      status: v.status,
-      finalSyExchangeRate: v.finalSyExchangeRate,
-      maxPySupply: v.maxPySupply,
+      totalSyInEscrow: vault.totalSyInEscrow,
+      treasurySyTokenAccount: vault.treasurySyTokenAccount,
+      interestBpsFee: vault.interestBpsFee,
+      emissions: vault.emissions,
+      minOperationSizeStrip: vault.minOpSizeStrip,
+      minOperationSizeMerge: vault.minOpSizeMerge,
+      status: vault.status,
+      finalSyExchangeRate: vault.finalSyExchangeRate,
+      maxPySupply: vault.maxPySupply,
     }
 
     return new Vault(state, address, env, connection)
   }
 
-  async reload(conn: web3.Connection = this.connection) {
-    const v = await Vault.load(this.env, conn, this.selfAddress)
-    this.state = v.state
-    return v
+  async reload(connection: web3.Connection = this.connection) {
+    const vault = await Vault.load(this.env, connection, this.selfAddress)
+    this.state = vault.state
+    return vault
   }
 
   toJson(): VaultJson {
@@ -177,9 +191,11 @@ export class Vault {
       totalSyInEscrow: this.state.totalSyInEscrow.toString(),
       cpiAccounts: serializeCpiAccountsRaw(this.state.cpiAccounts),
       status: this.state.status,
-      syPosition: serializeSyPostion(this.state.syPosition),
+      // Misspelled word
+      syPosition: serializeSyPosition(this.state.syPosition),
       minOperationSizeStrip: this.state.minOperationSizeStrip.toString(),
       minOperationSizeMerge: this.state.minOperationSizeMerge.toString(),
+      // Misspelled word
       yieldPositonAddress: this.state.yieldPositonAddress.toString(),
       interestFeeBps: this.state.interestBpsFee,
       flavor: (() => {
@@ -191,7 +207,7 @@ export class Vault {
           case "jitoRestaking":
             return serializeFlavorJitoRestaking(this.state.flavor)
           case "perena":
-            return serializeFlavorParena(this.state.flavor)
+            return serializeFlavorPerena(this.state.flavor)
           case "generic":
             return serializeFlavorGeneric(this.state.flavor)
           default:
@@ -380,10 +396,10 @@ export class Vault {
   async ixStripFromBase({
     owner,
     amountBase,
-    baseSrc,
-    sySrc,
-    ptDst,
-    ytDst,
+    baseSrc: baseSrcParam,
+    sySrc: sySrcParam,
+    ptDst: ptDstParam,
+    ytDst: ytDstParam,
   }: {
     owner: web3.PublicKey
     amountBase: bigint
@@ -392,10 +408,10 @@ export class Vault {
     ptDst?: web3.PublicKey
     ytDst?: web3.PublicKey
   }): Promise<web3.TransactionInstruction> {
-    baseSrc = baseSrc || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
-    sySrc = sySrc || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
-    ptDst = ptDst || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
-    ytDst = ytDst || getAssociatedTokenAddressSync(this.mintYt, owner, true, TOKEN_PROGRAM_ID)
+    const baseSrc = baseSrcParam || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
+    const sySrc = sySrcParam || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
+    const ptDst = ptDstParam || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
+    const ytDst = ytDstParam || getAssociatedTokenAddressSync(this.mintYt, owner, true, TOKEN_PROGRAM_ID)
 
     const mintSyIx = await this.state.flavor.ixMintSy({
       amountBase: "0",
@@ -439,9 +455,9 @@ export class Vault {
   async ixMergeToBase({
     owner,
     amountPy,
-    ptSrc,
-    ytSrc,
-    syDst,
+    ptSrc: ptSrcParam,
+    ytSrc: ytSrcParam,
+    syDst: syDstParam,
     baseDst,
   }: {
     owner: web3.PublicKey
@@ -451,9 +467,9 @@ export class Vault {
     syDst?: web3.PublicKey
     baseDst?: web3.PublicKey
   }): Promise<{ ixs: web3.TransactionInstruction[]; setupIxs: web3.TransactionInstruction[] }> {
-    syDst = syDst || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
-    ptSrc = ptSrc || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
-    ytSrc = ytSrc || getAssociatedTokenAddressSync(this.mintYt, owner, true, TOKEN_PROGRAM_ID)
+    const syDst = syDstParam || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
+    const ptSrc = ptSrcParam || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
+    const ytSrc = ytSrcParam || getAssociatedTokenAddressSync(this.mintYt, owner, true, TOKEN_PROGRAM_ID)
 
     const tokenSyTraderAtaIx = createAssociatedTokenAccountIdempotentInstruction(owner, syDst, owner, this.mintSy)
     const tokenPtTraderAtaIx = createAssociatedTokenAccountIdempotentInstruction(owner, ptSrc, owner, this.mintPt)
@@ -560,7 +576,7 @@ export class Vault {
   collectEmissionAccounts({
     emissionIndex,
     owner,
-    emissionDst,
+    emissionDst: emissionDstParam,
   }: {
     emissionIndex: number
     owner: web3.PublicKey
@@ -581,7 +597,8 @@ export class Vault {
     const emissionEscrow = vaultE.tokenAccount
     const treasuryEmissionTokenAccount = vaultE.treasuryTokenAccount
     const position = this.pda.yieldPosition({ owner, vault: this.selfAddress })
-    emissionDst = emissionDst || getAssociatedTokenAddressSync(syE.mint, owner, true, syE.tokenProgramAddress)
+    const emissionDst =
+      emissionDstParam || getAssociatedTokenAddressSync(syE.mint, owner, true, syE.tokenProgramAddress)
     const remainingAccounts = uniqueRemainingAccounts([...this.cpiAccounts.claimEmission[emissionIndex]])
 
     return {
@@ -605,20 +622,20 @@ export class Vault {
 
   stripAccounts({
     depositor,
-    ptDst,
-    ytDst,
-    sySrc,
+    ptDst: ptDstParam,
+    ytDst: ytDstParam,
+    sySrc: sySrcParam,
   }: {
     depositor: web3.PublicKey
     ptDst?: web3.PublicKey
     ytDst?: web3.PublicKey
     sySrc?: web3.PublicKey
   }): InstructionAccounts<StripAccounts> {
-    ptDst = ptDst || getAssociatedTokenAddressSync(this.mintPt, depositor, true, TOKEN_PROGRAM_ID)
-    ytDst = ytDst || getAssociatedTokenAddressSync(this.mintYt, depositor, true, TOKEN_PROGRAM_ID)
-    sySrc = sySrc || getAssociatedTokenAddressSync(this.mintSy, depositor, true, TOKEN_PROGRAM_ID)
+    const ptDst = ptDstParam || getAssociatedTokenAddressSync(this.mintPt, depositor, true, TOKEN_PROGRAM_ID)
+    const ytDst = ytDstParam || getAssociatedTokenAddressSync(this.mintYt, depositor, true, TOKEN_PROGRAM_ID)
+    const sySrc = sySrcParam || getAssociatedTokenAddressSync(this.mintSy, depositor, true, TOKEN_PROGRAM_ID)
 
-    console.log("sysrc account: ", sySrc.toBase58())
+    // console.log("sysrc account: ", sySrc.toBase58())
 
     const remainingAccounts = uniqueRemainingAccounts([...this.cpiAccounts.depositSy])
 
@@ -757,12 +774,12 @@ export class Vault {
 
   collectInterestAccounts({
     owner,
-    syDst,
+    syDst: syDstParam,
   }: {
     owner: web3.PublicKey
     syDst?: web3.PublicKey
   }): InstructionAccounts<CollectInterestAccounts> {
-    syDst = syDst || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
+    const syDst = syDstParam || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
     const yieldPosition = this.pda.yieldPosition({ owner, vault: this.selfAddress })
     const remainingAccounts = [...this.cpiAccounts.withdrawSy]
 
@@ -788,18 +805,18 @@ export class Vault {
   /** Construct accounts for Merge instruction */
   mergeAccounts({
     owner,
-    ptSrc,
-    ytSrc,
-    syDst,
+    ptSrc: ptSrcParam,
+    ytSrc: ytSrcParam,
+    syDst: syDstParam,
   }: {
     owner: web3.PublicKey
     ptSrc?: web3.PublicKey
     ytSrc?: web3.PublicKey
     syDst?: web3.PublicKey
   }): InstructionAccounts<MergeAccounts> {
-    ptSrc = ptSrc || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
-    ytSrc = ytSrc || getAssociatedTokenAddressSync(this.mintYt, owner, true, TOKEN_PROGRAM_ID)
-    syDst = syDst || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
+    const ptSrc = ptSrcParam || getAssociatedTokenAddressSync(this.mintPt, owner, true, TOKEN_PROGRAM_ID)
+    const ytSrc = ytSrcParam || getAssociatedTokenAddressSync(this.mintYt, owner, true, TOKEN_PROGRAM_ID)
+    const syDst = syDstParam || getAssociatedTokenAddressSync(this.mintSy, owner, true, TOKEN_PROGRAM_ID)
     const remainingAccounts = [...this.cpiAccounts.getSyState, ...this.cpiAccounts.withdrawSy]
     return {
       mainAccounts: {
@@ -891,7 +908,7 @@ function toVaultState(vault: VaultJson): VaultState {
         case "jitoRestaking":
           return makeFlavorJitoRestakingSync(deserializeFlavorJitoRestaking(vault.flavor))
         case "perena":
-          return makeFlavorPerenaSync(deserializeFlavorParena(vault.flavor))
+          return makeFlavorPerenaSync(deserializeFlavorPerena(vault.flavor))
         case "generic":
           return makeFlavorGenericSync(deserializeFlavorGeneric(vault.flavor))
         default: