@exponent-labs/exponent-types 0.1.8 → 0.9.0

package/src/generic.ts

@@ -1,8 +1,7 @@
-import { BN, web3 } from "@coral-xyz/anchor"
-
+import { PublicKey } from "@solana/web3.js"
 import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common"
 import { StakePoolAccount } from "@solana/spl-stake-pool"
-
+import BN from 'bn.js'
 export type InterfaceTypeGeneric =
   | {
       pyth: {
@@ -67,6 +66,11 @@ export type InterfaceTypeGeneric =
   | {
       ore: Record<string, never>
     }
+  | {
+      chainlink: {
+        padding: number[]
+      }
+    }
 export type InterfaceTypeGenericJson =
   | {
       pyth: {
@@ -124,45 +128,50 @@ export type InterfaceTypeGenericJson =
       }
     }
   | {
-    reflect: {
-      padding: number[]
+      reflect: {
+        padding: number[]
+      }
+    }
+  | {
+      ore: Record<string, never>
     }
-  }
   | {
-    ore: Record<string, never>
-  }
+      chainlink: {
+        padding: number[]
+      }
+    }
 /** Additional data that different interface types may need */
 export interface AdditionalDataGeneric {
   fragmetricData?: {
-    receiptTokenMint: web3.PublicKey
-    wrappedTokenMint: web3.PublicKey
+    receiptTokenMint: PublicKey
+    wrappedTokenMint: PublicKey
   }
   jupiterLendData?: {
-    baseTokenMint: web3.PublicKey
-    tokenReservesLiquidity: web3.PublicKey
-    lendingSupplyPosition: web3.PublicKey
-    rewardsRateModel: web3.PublicKey
-    rateModel: web3.PublicKey
+    baseTokenMint: PublicKey
+    tokenReservesLiquidity: PublicKey
+    lendingSupplyPosition: PublicKey
+    rewardsRateModel: PublicKey
+    rateModel: PublicKey
   }
   kaminoVaultData?: {
-    vault: web3.PublicKey
+    vault: PublicKey
     reserves: {
-      reserveAddress: web3.PublicKey
-      marketAddress: web3.PublicKey
+      reserveAddress: PublicKey
+      marketAddress: PublicKey
     }[]
-    tokenVault: web3.PublicKey
-    tokenMint: web3.PublicKey
-    baseVaultAuthority: web3.PublicKey
-    sharesMint: web3.PublicKey
+    tokenVault: PublicKey
+    tokenMint: PublicKey
+    baseVaultAuthority: PublicKey
+    sharesMint: PublicKey
   }
   splStakePoolData?: {
     stakePoolAccount?: StakePoolAccount // Optional because it is expensive to serialize / not always needed on clients
-    stakePoolAddress: web3.PublicKey
-    stakePoolProgramId: web3.PublicKey // Dynamic program ID from account owner
-    validatorList: web3.PublicKey
-    reserveStake: web3.PublicKey
-    managerFeeAccount: web3.PublicKey
-    poolMint: web3.PublicKey
+    stakePoolAddress: PublicKey
+    stakePoolProgramId: PublicKey // Dynamic program ID from account owner
+    validatorList: PublicKey
+    reserveStake: PublicKey
+    managerFeeAccount: PublicKey
+    poolMint: PublicKey
   }
   // Add other interface-specific data here as needed
   // meteoraData?: { ... }
@@ -211,7 +220,7 @@ export interface AdditionalDataGenericJson {
 export interface Hook {
   enabled: boolean
   interfaceEmissionsAccountsUntil: number
-  programId: web3.PublicKey
+  programId: PublicKey
   preMintHookDiscriminator: number[]
   postRedeemHookDiscriminator: number[]
 }
@@ -229,13 +238,13 @@ export interface HookRaw {
   interfaceEmissionsAccountsUntil: number
   preMintHookDiscriminator: Buffer
   postRedeemHookDiscriminator: Buffer
-  programId: web3.PublicKey
+  programId: PublicKey
 }
 
 export interface GenericSyState {
-  selfAddress: web3.PublicKey
+  selfAddress: PublicKey
   account: GenericSyMetaAccount
-  tokenProgramBase: web3.PublicKey
+  tokenProgramBase: PublicKey
   syRate: number
   additionalData?: AdditionalDataGeneric
 }
@@ -268,10 +277,10 @@ export interface GenericSyMetaAccountJson {
 }
 
 export interface GenericSyMetaAccount {
-  mintSy: web3.PublicKey
-  yieldBearingMint: web3.PublicKey
-  tokenSyEscrow: web3.PublicKey
-  interfaceAccounts: web3.PublicKey[]
+  mintSy: PublicKey
+  yieldBearingMint: PublicKey
+  tokenSyEscrow: PublicKey
+  interfaceAccounts: PublicKey[]
   interfaceType: InterfaceTypeGeneric
   maxSySupply: BN
   minMintSize: BN
@@ -282,15 +291,15 @@ export interface GenericSyMetaAccount {
 }
 
 export interface GenericSyMetaAccountRaw {
-  mintSy: web3.PublicKey
-  yieldBearingMint: web3.PublicKey
-  tokenSyEscrow: web3.PublicKey
+  mintSy: PublicKey
+  yieldBearingMint: PublicKey
+  tokenSyEscrow: PublicKey
   maxSySupply: BN
   minMintSize: BN
   minRedeemSize: BN
   selfAddressBump: number[]
   emissions: SyEmissionRaw[]
-  interfaceAccounts: web3.PublicKey[]
+  interfaceAccounts: PublicKey[]
   interfaceType: InterfaceTypeGeneric
   index: AnchorizedPNum
   hook: HookRaw
@@ -423,7 +432,7 @@ export function fromHookJson(json: HookJson): Hook {
   return {
     enabled: json.enabled,
     interfaceEmissionsAccountsUntil: json.interfaceEmissionsAccountsUntil,
-    programId: new web3.PublicKey(json.programId),
+    programId: new PublicKey(json.programId),
     preMintHookDiscriminator: json.preMintHookDiscriminator,
     postRedeemHookDiscriminator: json.postRedeemHookDiscriminator,
   }
@@ -484,43 +493,43 @@ export function fromAdditionalDataGenericJson(json: AdditionalDataGenericJson):
 
   if (json.fragmetricData) {
     result.fragmetricData = {
-      receiptTokenMint: new web3.PublicKey(json.fragmetricData.receiptTokenMint),
-      wrappedTokenMint: new web3.PublicKey(json.fragmetricData.wrappedTokenMint),
+      receiptTokenMint: new PublicKey(json.fragmetricData.receiptTokenMint),
+      wrappedTokenMint: new PublicKey(json.fragmetricData.wrappedTokenMint),
     }
   }
 
   if (json.jupiterLendData) {
     result.jupiterLendData = {
-      baseTokenMint: new web3.PublicKey(json.jupiterLendData.baseTokenMint),
-      tokenReservesLiquidity: new web3.PublicKey(json.jupiterLendData.tokenReservesLiquidity),
-      lendingSupplyPosition: new web3.PublicKey(json.jupiterLendData.lendingSupplyPosition),
-      rewardsRateModel: new web3.PublicKey(json.jupiterLendData.rewardsRateModel),
-      rateModel: new web3.PublicKey(json.jupiterLendData.rateModel),
+      baseTokenMint: new PublicKey(json.jupiterLendData.baseTokenMint),
+      tokenReservesLiquidity: new PublicKey(json.jupiterLendData.tokenReservesLiquidity),
+      lendingSupplyPosition: new PublicKey(json.jupiterLendData.lendingSupplyPosition),
+      rewardsRateModel: new PublicKey(json.jupiterLendData.rewardsRateModel),
+      rateModel: new PublicKey(json.jupiterLendData.rateModel),
     }
   }
 
   if (json.kaminoVaultData) {
     result.kaminoVaultData = {
-      vault: new web3.PublicKey(json.kaminoVaultData.vault),
+      vault: new PublicKey(json.kaminoVaultData.vault),
       reserves: json.kaminoVaultData.reserves.map((r) => ({
-        reserveAddress: new web3.PublicKey(r.reserveAddress),
-        marketAddress: new web3.PublicKey(r.marketAddress),
+        reserveAddress: new PublicKey(r.reserveAddress),
+        marketAddress: new PublicKey(r.marketAddress),
       })),
-      tokenVault: new web3.PublicKey(json.kaminoVaultData.tokenVault),
-      tokenMint: new web3.PublicKey(json.kaminoVaultData.tokenMint),
-      baseVaultAuthority: new web3.PublicKey(json.kaminoVaultData.baseVaultAuthority),
-      sharesMint: new web3.PublicKey(json.kaminoVaultData.sharesMint),
+      tokenVault: new PublicKey(json.kaminoVaultData.tokenVault),
+      tokenMint: new PublicKey(json.kaminoVaultData.tokenMint),
+      baseVaultAuthority: new PublicKey(json.kaminoVaultData.baseVaultAuthority),
+      sharesMint: new PublicKey(json.kaminoVaultData.sharesMint),
     }
   }
 
   if (json.splStakePoolData) {
     result.splStakePoolData = {
-      stakePoolAddress: new web3.PublicKey(json.splStakePoolData.stakePoolAddress),
-      stakePoolProgramId: new web3.PublicKey(json.splStakePoolData.stakePoolProgramId),
-      validatorList: new web3.PublicKey(json.splStakePoolData.validatorList),
-      reserveStake: new web3.PublicKey(json.splStakePoolData.reserveStake),
-      managerFeeAccount: new web3.PublicKey(json.splStakePoolData.managerFeeAccount),
-      poolMint: new web3.PublicKey(json.splStakePoolData.poolMint),
+      stakePoolAddress: new PublicKey(json.splStakePoolData.stakePoolAddress),
+      stakePoolProgramId: new PublicKey(json.splStakePoolData.stakePoolProgramId),
+      validatorList: new PublicKey(json.splStakePoolData.validatorList),
+      reserveStake: new PublicKey(json.splStakePoolData.reserveStake),
+      managerFeeAccount: new PublicKey(json.splStakePoolData.managerFeeAccount),
+      poolMint: new PublicKey(json.splStakePoolData.poolMint),
     }
   }
 
@@ -530,11 +539,11 @@ export function fromAdditionalDataGenericJson(json: AdditionalDataGenericJson):
 /** Helper function to extract fragmetric data from additional data */
 export function getFragmetricDataFromAdditionalData(additionalData?: AdditionalDataGeneric):
   | {
-      receiptTokenMint: web3.PublicKey
-      wrappedTokenMint: web3.PublicKey
+      receiptTokenMint: PublicKey
+      wrappedTokenMint: PublicKey
     }
   | undefined {
   if (!additionalData) return undefined
 
   return additionalData.fragmetricData
-}
+}

package/src/index.ts

@@ -9,4 +9,4 @@ export * from "./orderbook"
 export * from "./cpi"
 export * from "./trade"
 export * from "./liquidity"
-export * from "./generic"
+export * from "./generic"

package/src/jito-restaking.ts

@@ -1,38 +1,38 @@
-import { BN, web3 } from "@coral-xyz/anchor"
 import { AnchorizedPNum, AnchorizedPNumJson, SyEmissionRaw, SyEmissionJson } from "./common"
-
+import { PublicKey } from "@solana/web3.js"
+import BN from 'bn.js'
 export interface InterfaceType {
   splStakePool: {}
 }
 
 export interface JitoRestakingSyState {
-  selfAddress: web3.PublicKey
+  selfAddress: PublicKey
   account: JitoRestakingSyMetaAccount
   /** The value of SY tokens in terms of the base asset */
   syRate: string
   underlyingExchangeRate: number
-  mintBase: web3.PublicKey
-  tokenProgramBase: web3.PublicKey
+  mintBase: PublicKey
+  tokenProgramBase: PublicKey
 }
 
 export interface JitoRestakingSyMetaAccountRaw {
-  jitoVault: web3.PublicKey
-  mintSy: web3.PublicKey
-  tokenSyEscrow: web3.PublicKey
+  jitoVault: PublicKey
+  mintSy: PublicKey
+  tokenSyEscrow: PublicKey
   maxSySupply: BN
   minMintSize: BN
   minRedeemSize: BN
   selfAddressBump: number[]
   emissions: SyEmissionRaw[]
-  interfaceAccounts: web3.PublicKey[]
+  interfaceAccounts: PublicKey[]
   interfaceType: InterfaceType
 }
 
 export interface JitoRestakingSyMetaAccount {
-  jitoVault: web3.PublicKey
-  mintSy: web3.PublicKey
-  tokenSyEscrow: web3.PublicKey
-  interfaceAccounts: web3.PublicKey[]
+  jitoVault: PublicKey
+  mintSy: PublicKey
+  tokenSyEscrow: PublicKey
+  interfaceAccounts: PublicKey[]
   interfaceType: InterfaceType
   maxSySupply: BN
   minMintSize: BN
@@ -75,4 +75,4 @@ export interface JitoRestakingSyStateJson {
   underlyingExchangeRate: number
   mintBase: string
   tokenProgramBase: string
-}
+}

package/src/kamino.ts

@@ -1,19 +1,19 @@
-import { BN } from "@coral-xyz/anchor"
-import { web3 } from "@coral-xyz/anchor"
+import BN  from "bn.js"
 
 import { SyEmissionJson, SyEmissionRaw, SyEmissionRaw2 } from "./common"
+import { PublicKey } from "@solana/web3.js"
 
 export interface KaminoSyState {
-  selfAddress: web3.PublicKey
+  selfAddress: PublicKey
   account: KaminoSyMetaAccount
-  klendSyProgramId: web3.PublicKey
+  klendSyProgramId: PublicKey
   /** The value of SY tokens in terms of the base asset */
   syRate: string
-  mintBase: web3.PublicKey
-  tokenProgramBase: web3.PublicKey
-  klendProgramId: web3.PublicKey
-  klendMarketId: web3.PublicKey
-  scopePriceFeed?: web3.PublicKey
+  mintBase: PublicKey
+  tokenProgramBase: PublicKey
+  klendProgramId: PublicKey
+  klendMarketId: PublicKey
+  scopePriceFeed?: PublicKey
 }
 
 export interface KaminoSyStateJson {
@@ -29,14 +29,14 @@ export interface KaminoSyStateJson {
 }
 
 export interface KaminoSyMetaAccount {
-  kaminoReserve: web3.PublicKey
-  kaminoObligation: web3.PublicKey
-  kaminoFarm: web3.PublicKey
-  kaminoUserMetadata: web3.PublicKey
-  mintSy: web3.PublicKey
+  kaminoReserve: PublicKey
+  kaminoObligation: PublicKey
+  kaminoFarm: PublicKey
+  kaminoUserMetadata: PublicKey
+  mintSy: PublicKey
   /** Where deposited SY tokens reside */
-  tokenSyEscrow: web3.PublicKey
-  userState: web3.PublicKey
+  tokenSyEscrow: PublicKey
+  userState: PublicKey
   maxSySupply: string
   minMintSize: string
   minRedeemSize: string
@@ -58,22 +58,22 @@ interface KaminoSyMetaAccountJson {
 }
 
 export interface KaminoSyMetaAccountRaw {
-  kamino_reserve: web3.PublicKey
-  kamino_obligation: web3.PublicKey
-  kamino_farm: web3.PublicKey
-  kamino_user_metadata: web3.PublicKey
-  mint_sy: web3.PublicKey
+  kamino_reserve: PublicKey
+  kamino_obligation: PublicKey
+  kamino_farm: PublicKey
+  kamino_user_metadata: PublicKey
+  mint_sy: PublicKey
   /** Where deposited SY tokens reside */
-  token_sy_escrow: web3.PublicKey
+  token_sy_escrow: PublicKey
   /** Robot authority over the Mfi Account */
-  authority_klend_account: web3.PublicKey
+  authority_klend_account: PublicKey
   /** Authority over the SY token escrow account */
-  authority_escrow: web3.PublicKey
+  authority_escrow: PublicKey
   /** Authority over the sy mint */
-  mint_authority: web3.PublicKey
-  user_state: web3.PublicKey
+  mint_authority: PublicKey
+  user_state: PublicKey
   max_sy_supply: BN
   min_mint_size: BN
   min_redeem_size: BN
   emissions: SyEmissionRaw2[]
-}
+}

package/src/marginfi.ts

@@ -1,19 +1,19 @@
-import { BN, web3 } from "@coral-xyz/anchor"
+import { PublicKey } from "@solana/web3.js"
 import { SyEmissionRaw, SyEmissionJson } from "./common"
-
+import BN from 'bn.js'
 export interface MfiSyState {
-  selfAddress: web3.PublicKey
+  selfAddress: PublicKey
   account: MarginfiSyMeta
-  marginfiSyProgramId: web3.PublicKey
+  marginfiSyProgramId: PublicKey
 
   /** The value of SY tokens in terms of the base asset taken directly from the bank */
   syRate: string
-  mintBase: web3.PublicKey
-  tokenProgramBase: web3.PublicKey
-  marginfiProgramId: web3.PublicKey
-  marginfiGroupId: web3.PublicKey
-  emissionsMint: web3.PublicKey | null
-  emissionsTokenProgram: web3.PublicKey | null
+  mintBase: PublicKey
+  tokenProgramBase: PublicKey
+  marginfiProgramId: PublicKey
+  marginfiGroupId: PublicKey
+  emissionsMint: PublicKey | null
+  emissionsTokenProgram: PublicKey | null
 }
 
 export interface MfiSyStateJson {
@@ -43,11 +43,11 @@ export interface SyMetaJson {
 }
 
 export interface MarginfiSyMeta {
-  marginfiBank: web3.PublicKey
-  marginfiAccount: web3.PublicKey
-  mintSy: web3.PublicKey
+  marginfiBank: PublicKey
+  marginfiAccount: PublicKey
+  mintSy: PublicKey
   /** Where the SY tokens get deposited */
-  tokenSyEscrow: web3.PublicKey
+  tokenSyEscrow: PublicKey
   maxSySupply: bigint
   minMintSize: bigint
   minRedeemSize: bigint
@@ -66,16 +66,16 @@ export interface MarginfiSyMetaJson {
 }
 
 export interface MarginfiSyMetaRaw {
-  marginfiBank: web3.PublicKey
-  marginfiAccount: web3.PublicKey
-  mintSy: web3.PublicKey
+  marginfiBank: PublicKey
+  marginfiAccount: PublicKey
+  mintSy: PublicKey
   maxSySupply: BN
   minMintSize: BN
   minRedeemSize: BN
   /** Where the SY tokens get deposited */
-  tokenSyEscrow: web3.PublicKey
+  tokenSyEscrow: PublicKey
   emissions: SyEmissionRaw[]
 }
 
 export type AnchorizedPNum = { 0: BN[] }
-export type AnchorizedPNumJson = { 0: string[] }
+export type AnchorizedPNumJson = { 0: string[] }

package/src/orderbook.ts

@@ -1,11 +1,11 @@
-import { web3 } from "@coral-xyz/anchor"
 
+import { PublicKey } from "@solana/web3.js"
 import { CpiAccountsRaw, ExponentCoreCpiAccountsRaw } from "./cpi"
 import { Flavor } from "./flavor"
 
-export const MAX_PRICE_NODES = 100
-export const MAX_OFFERS = 500
-export const MAX_USER_ESCROWS = 250
+export const MAX_PRICE_NODES = 1000
+export const MAX_OFFERS = 2500
+export const MAX_USER_ESCROWS = 1500
 // RedBlackTree uses 3 registers per node: parent, left, right
 export const PRICE_NODE_REGISTERS = 3
 // Offer allocator uses 1 register per node (free‐list pointer)
@@ -65,6 +65,9 @@ export interface PriceTreeNode {
 }
 
 export interface OfferNode {
+  /** Actual NodeAllocator slot for this offer (0 is sentinel, live offers are 1-based) */
+  offerIndex: number
+
   /** Internal register 1 (the free‐list link when unused) */
   nextOfferPointer: number
 
@@ -72,7 +75,7 @@ export interface OfferNode {
   pricePointer: number
 
   /** SY/PT/YT amount deposited */
-  amount: BigInt
+  amount: bigint
   /** Index of the user escrow that owns this offer */
   userVaultPointer: number
   /** Expiry timestamp (unix seconds) */
@@ -89,8 +92,8 @@ export interface OfferNode {
 
 export interface UserEscrowNode {
   /** The user’s Pubkey */
-  user: web3.PublicKey
-  /** Yield‐index for this user (protocol’s Number type) */
+  user: PublicKey
+  /** Last seen SY exchange rate for this user escrow */
   yieldIndex: number
   /** Token amounts held */
   ptAmount: bigint
@@ -104,27 +107,27 @@ export interface UserEscrowNode {
 /** ─── Full On-chain Orderbook ───────────────────────────────────────────────── */
 export interface Orderbook {
   /** PDA link to vault */
-  vault: web3.PublicKey
+  vault: PublicKey
   /** PDA link to a vault-owned YT position */
-  yieldPosition: web3.PublicKey
+  yieldPosition: PublicKey
   /** Address Lookup Table key for the orderbook */
-  addressLookupTable: web3.PublicKey
+  addressLookupTable: PublicKey
   /** Address of the Exponent Core program */
-  exponentCoreProgram: web3.PublicKey
+  exponentCoreProgram: PublicKey
   /** Address of the Sy program */
-  syProgram: web3.PublicKey
+  syProgram: PublicKey
   /** Orderbook-owned escrow for SY tokens */
-  tokenEscrowSy: web3.PublicKey
+  tokenEscrowSy: PublicKey
   /** Orderbook-owned escrow for YT tokens */
-  tokenEscrowYt: web3.PublicKey
+  tokenEscrowYt: PublicKey
   /** Orderbook-owned escrow for PT tokens */
-  tokenEscrowPt: web3.PublicKey
+  tokenEscrowPt: PublicKey
 
   /// Admin key
-  admin: web3.PublicKey
+  admin: PublicKey
 
   /** CPI accounts storage key */
-  cpiAccountOrderbook: web3.PublicKey
+  cpiAccountOrderbook: PublicKey
 
   /** How many price nodes are currently in use */
   nodeCount: number
@@ -146,25 +149,25 @@ export interface Orderbook {
 
 export interface OrderbookState {
   /** PDA link to vault */
-  vault: web3.PublicKey
+  vault: PublicKey
   /** PDA link to a vault-owned YT position */
-  yieldPosition: web3.PublicKey
+  yieldPosition: PublicKey
   /** Address Lookup Table key for the orderbook */
-  addressLookupTable: web3.PublicKey
+  addressLookupTable: PublicKey
   /** Address of the Exponent Core program */
-  exponentCoreProgram: web3.PublicKey
+  exponentCoreProgram: PublicKey
   /** Address of the Exponent Core program */
-  syProgram: web3.PublicKey
+  syProgram: PublicKey
   /** Orderbook-owned escrow for SY tokens */
-  tokenEscrowSy: web3.PublicKey
+  tokenEscrowSy: PublicKey
   /** Orderbook-owned escrow for YT tokens */
-  tokenEscrowYt: web3.PublicKey
+  tokenEscrowYt: PublicKey
   /** Orderbook-owned escrow for PT tokens */
-  tokenEscrowPt: web3.PublicKey
+  tokenEscrowPt: PublicKey
   /** CPI accounts storage key */
-  cpiAccountOrderbook: web3.PublicKey
+  cpiAccountOrderbook: PublicKey
   /** Admin key */
-  admin: web3.PublicKey
+  admin: PublicKey
 
   configurationOptions: ConfigurationOptions
 
@@ -184,4 +187,9 @@ export interface OrderbookState {
   exponentCoreCpiAccounts: ExponentCoreCpiAccountsRaw
 
   flavor: Flavor
+
+  /** Next offer index that will be allocated (from NodeAllocator free list) */
+  offersFreeListHead: number
+  /** Bump index boundary for offers allocator */
+  offersBumpIndex: number
 }

package/src/perena.ts

@@ -1,32 +1,32 @@
-import { BN, web3 } from "@coral-xyz/anchor"
+import { PublicKey } from "@solana/web3.js"
 import { AnchorizedPNum, AnchorizedPNumJson, SyEmissionRaw, SyEmissionJson } from "./common"
-
+import BN from 'bn.js'
 export interface PerenaSyState {
-  selfAddress: web3.PublicKey
+  selfAddress: PublicKey
   account: PerenaSyMetaAccount
   /** The value of SY tokens in terms of the base asset */
   syRate: string
-  tokenProgramBase: web3.PublicKey
-  lpMint: web3.PublicKey
+  tokenProgramBase: PublicKey
+  lpMint: PublicKey
 }
 
 export interface PerenaSyMetaAccountRaw {
-  perenaStablePool: web3.PublicKey
-  mintSy: web3.PublicKey
-  tokenSyEscrow: web3.PublicKey
+  perenaStablePool: PublicKey
+  mintSy: PublicKey
+  tokenSyEscrow: PublicKey
   maxSySupply: BN
   minMintSize: BN
   minRedeemSize: BN
   selfAddressBump: number[]
   emissions: SyEmissionRaw[]
-  interfaceAccounts: web3.PublicKey[]
+  interfaceAccounts: PublicKey[]
 }
 
 export interface PerenaSyMetaAccount {
-  perenaStablePool: web3.PublicKey
-  mintSy: web3.PublicKey
-  tokenSyEscrow: web3.PublicKey
-  interfaceAccounts: web3.PublicKey[]
+  perenaStablePool: PublicKey
+  mintSy: PublicKey
+  tokenSyEscrow: PublicKey
+  interfaceAccounts: PublicKey[]
   maxSySupply: BN
   minMintSize: BN
   minRedeemSize: BN
@@ -64,4 +64,4 @@ export interface PerenaSyStateJson {
   underlyingExchangeRate: number
   mintBase: string
   tokenProgramBase: string
-}
+}