@exponent-labs/exponent-types 0.1.8 → 0.9.1

package/build/kamino.d.ts

@@ -1,17 +1,17 @@
-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 {
     selfAddress: string;
@@ -25,14 +25,14 @@ export interface KaminoSyStateJson {
     scopePriceFeed?: string;
 }
 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;
@@ -52,20 +52,20 @@ interface KaminoSyMetaAccountJson {
     emissions: SyEmissionJson[];
 }
 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;

package/build/marginfi.d.ts

@@ -1,17 +1,18 @@
-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 {
     selfAddress: string;
@@ -38,11 +39,11 @@ export interface SyMetaJson {
     syRate: string;
 }
 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;
@@ -59,14 +60,14 @@ export interface MarginfiSyMetaJson {
     emissions: SyEmissionJson[];
 }
 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 = {

package/build/orderbook.d.ts

@@ -1,9 +1,9 @@
-import { web3 } from "@coral-xyz/anchor";
+import { PublicKey } from "@solana/web3.js";
 import { CpiAccountsRaw, ExponentCoreCpiAccountsRaw } from "./cpi";
 import { Flavor } from "./flavor";
-export declare const MAX_PRICE_NODES = 100;
-export declare const MAX_OFFERS = 500;
-export declare const MAX_USER_ESCROWS = 250;
+export declare const MAX_PRICE_NODES = 1000;
+export declare const MAX_OFFERS = 2500;
+export declare const MAX_USER_ESCROWS = 1500;
 export declare const PRICE_NODE_REGISTERS = 3;
 export declare const OFFER_REGISTERS = 1;
 export declare const ESCROW_REGISTERS = 0;
@@ -45,12 +45,14 @@ export interface PriceTreeNode {
     right: number;
 }
 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;
     /** Internal register 3 (the free‐list link when unused) */
     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) */
@@ -66,8 +68,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;
@@ -80,24 +82,24 @@ 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;
-    admin: web3.PublicKey;
+    tokenEscrowPt: PublicKey;
+    admin: PublicKey;
     /** CPI accounts storage key */
-    cpiAccountOrderbook: web3.PublicKey;
+    cpiAccountOrderbook: PublicKey;
     /** How many price nodes are currently in use */
     nodeCount: number;
     financials: OrderbookFinancials;
@@ -112,25 +114,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;
     financials: OrderbookFinancials;
     /** All PriceNode entries (fixed capacity) */
@@ -142,4 +144,8 @@ export interface OrderbookState {
     syCpiAccounts: CpiAccountsRaw;
     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/build/orderbook.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ESCROW_REGISTERS = exports.OFFER_REGISTERS = exports.PRICE_NODE_REGISTERS = exports.MAX_USER_ESCROWS = exports.MAX_OFFERS = exports.MAX_PRICE_NODES = void 0;
-exports.MAX_PRICE_NODES = 100;
-exports.MAX_OFFERS = 500;
-exports.MAX_USER_ESCROWS = 250;
+exports.MAX_PRICE_NODES = 1000;
+exports.MAX_OFFERS = 2500;
+exports.MAX_USER_ESCROWS = 1500;
 // RedBlackTree uses 3 registers per node: parent, left, right
 exports.PRICE_NODE_REGISTERS = 3;
 // Offer allocator uses 1 register per node (free‐list pointer)

package/build/orderbook.js.map

@@ -1 +1 @@
-{"version":3,"file":"orderbook.js","sourceRoot":"","sources":["../src/orderbook.ts"],"names":[],"mappings":";;;AAKa,QAAA,eAAe,GAAG,GAAG,CAAA;AACrB,QAAA,UAAU,GAAG,GAAG,CAAA;AAChB,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACnC,8DAA8D;AACjD,QAAA,oBAAoB,GAAG,CAAC,CAAA;AACrC,+DAA+D;AAClD,QAAA,eAAe,GAAG,CAAC,CAAA;AAChC,wCAAwC;AAC3B,QAAA,gBAAgB,GAAG,CAAC,CAAA"}
+{"version":3,"file":"orderbook.js","sourceRoot":"","sources":["../src/orderbook.ts"],"names":[],"mappings":";;;AAKa,QAAA,eAAe,GAAG,IAAI,CAAA;AACtB,QAAA,UAAU,GAAG,IAAI,CAAA;AACjB,QAAA,gBAAgB,GAAG,IAAI,CAAA;AACpC,8DAA8D;AACjD,QAAA,oBAAoB,GAAG,CAAC,CAAA;AACrC,+DAA+D;AAClD,QAAA,eAAe,GAAG,CAAC,CAAA;AAChC,wCAAwC;AAC3B,QAAA,gBAAgB,GAAG,CAAC,CAAA"}

package/build/perena.d.ts

@@ -1,29 +1,30 @@
-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 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;

package/build/perena.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deserializePerenaSyMetaAccountRaw = void 0;
+exports.deserializePerenaSyMetaAccountRaw = deserializePerenaSyMetaAccountRaw;
 function deserializePerenaSyMetaAccountRaw(raw) {
     return {
         perenaStablePool: raw.perenaStablePool,
@@ -13,5 +13,4 @@ function deserializePerenaSyMetaAccountRaw(raw) {
         emissions: raw.emissions,
     };
 }
-exports.deserializePerenaSyMetaAccountRaw = deserializePerenaSyMetaAccountRaw;
 //# sourceMappingURL=perena.js.map

package/build/perena.js.map

@@ -1 +1 @@
-{"version":3,"file":"perena.js","sourceRoot":"","sources":["../src/perena.ts"],"names":[],"mappings":";;;AA8CA,SAAgB,iCAAiC,CAAC,GAA2B;IAC3E,OAAO;QACL,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;QACtC,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAA;AACH,CAAC;AAXD,8EAWC"}
+{"version":3,"file":"perena.js","sourceRoot":"","sources":["../src/perena.ts"],"names":[],"mappings":";;AA8CA,8EAWC;AAXD,SAAgB,iCAAiC,CAAC,GAA2B;IAC3E,OAAO;QACL,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;QACtC,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAA;AACH,CAAC"}

package/build/vault.d.ts

@@ -1,7 +1,8 @@
-import { BN, web3 } from "@coral-xyz/anchor";
 import { IFlavorStateJson, Flavor } from "./flavor";
 import { CpiAccountsRaw, CpiAccountsRawJson } from "./cpi";
 import { AnchorizedPNum, AnchorizedPNumJson } from "./common";
+import { PublicKey } from "@solana/web3.js";
+import BN from 'bn.js';
 export type VaultJson = {
     /** When does the vault start, as a UNIX timestamp */
     startTs: number;
@@ -66,26 +67,26 @@ export interface VaultState {
     /** For how long is the vault active */
     durationSeconds: number;
     /** Vault signer for token accounts, mints, SY position etc */
-    authority: web3.PublicKey;
-    addressLookupTable: web3.PublicKey;
+    authority: PublicKey;
+    addressLookupTable: PublicKey;
     lastSeenSyExchangeRate: number;
     allTimeHighSyExchangeRate: number;
     /** Vault-owned account for passing SY between SY program and user */
-    escrowSy: web3.PublicKey;
+    escrowSy: PublicKey;
     /** Escrow account for holding deposited YT */
-    escrowYt: web3.PublicKey;
+    escrowYt: PublicKey;
     /** Key to SY Program */
-    syProgram: web3.PublicKey;
+    syProgram: PublicKey;
     syPosition: SyPosition;
     cpiAccounts: CpiAccountsRaw;
-    mintPt: web3.PublicKey;
+    mintPt: PublicKey;
     status: number;
     minOperationSizeStrip: bigint;
     minOperationSizeMerge: bigint;
-    mintYt: web3.PublicKey;
-    mintSy: web3.PublicKey;
-    yieldPositonAddress: web3.PublicKey;
-    treasurySyTokenAccount: web3.PublicKey;
+    mintYt: PublicKey;
+    mintSy: PublicKey;
+    yieldPositonAddress: PublicKey;
+    treasurySyTokenAccount: PublicKey;
     interestBpsFee: number;
     totalSyInEscrow: bigint;
     flavor: Flavor;
@@ -140,22 +141,22 @@ export interface SyPositionJson {
 }
 export interface SyPosition {
     balanceSy: bigint;
-    owner: web3.PublicKey;
+    owner: PublicKey;
     emissions: {
         /** Last seen index for SY-to-emission exchange rate */
         lastSeenIndex: number;
         /** mint of emission token */
-        mint: web3.PublicKey;
+        mint: PublicKey;
         /** How many emissions are staged to claim */
         staged: bigint;
     }[];
 }
 export interface VaultEmission {
-    tokenAccount: web3.PublicKey;
+    tokenAccount: PublicKey;
     initialIndex: AnchorizedPNum;
     lastSeenIndex: AnchorizedPNum;
     finalIndex: AnchorizedPNum;
-    treasuryTokenAccount: web3.PublicKey;
+    treasuryTokenAccount: PublicKey;
     feeBps: number;
     treasuryEmission: BN;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exponent-labs/exponent-types",
-  "version": "0.1.8",
+  "version": "0.9.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "AGPL-3.0",
@@ -8,8 +8,9 @@
     "build": "tsc --build"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "0.31.0",
-    "@solana/spl-stake-pool": "1.1.8"
+    "@solana/web3.js": "1.98.4",
+    "@solana/spl-stake-pool": "1.1.8",
+    "bn.js": "5.2.2"
   },
   "devDependencies": {
     "typescript": "5.4.5"

package/src/common.ts

@@ -1,23 +1,24 @@
-import { BN, web3 } from "@coral-xyz/anchor"
+import { PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
 
 export interface SyEmissionRaw {
-  mint: web3.PublicKey
+  mint: PublicKey
   index: AnchorizedPNum
   lastSeenTotalAccruedEmissions: BN
   totalClaimedEmissions: BN
-  tokenProgram: web3.PublicKey
-  escrowAccount: web3.PublicKey
+  tokenProgram: PublicKey
+  escrowAccount: PublicKey
   treasuryEmission: BN
   lastSeenIndex: AnchorizedPNum
 }
 
 export interface SyEmissionRaw2 {
-  mint: web3.PublicKey
+  mint: PublicKey
   index: AnchorizedPNum
   last_seen_total_accrued_emissions: BN
   total_claimed_emissions: BN
-  token_program: web3.PublicKey
-  escrow_account: web3.PublicKey
+  token_program: PublicKey
+  escrow_account: PublicKey
   treasury_emission: BN
   last_seen_index: AnchorizedPNum
 }
@@ -34,4 +35,4 @@ export interface SyEmissionJson {
 }
 
 export type AnchorizedPNum = { 0: BN[] }
-export type AnchorizedPNumJson = { 0: string[] }
+export type AnchorizedPNumJson = { 0: string[] }

package/src/cpi.ts

@@ -1,7 +1,7 @@
-import { web3 } from "@coral-xyz/anchor"
+import { PublicKey } from "@solana/web3.js"
 
 export interface AccountInfo {
-  pubkey: web3.PublicKey
+  pubkey: PublicKey
   isSigner: boolean
   isWritable: boolean
 }
@@ -68,7 +68,7 @@ export type AccountInfoJson = {
 
 export function deserializeCpiAccountsRaw(serialized: CpiAccountsRawJson): CpiAccountsRaw {
   const deserializeAccountInfo = (accountInfo: AccountInfoJson): AccountInfo => ({
-    pubkey: new web3.PublicKey(accountInfo.pubkey),
+    pubkey: new PublicKey(accountInfo.pubkey),
     isSigner: accountInfo.isSigner,
     isWritable: accountInfo.isWritable,
   })

package/src/flavor.ts

@@ -1,41 +1,40 @@
-import { web3 } from "@coral-xyz/anchor"
 import { MfiSyStateJson, MfiSyState } from "./marginfi"
 import { KaminoSyState, KaminoSyStateJson } from "./kamino"
 import { JitoRestakingSyState, JitoRestakingSyStateJson } from "./jito-restaking"
 import { AnchorizedPNum } from "./common"
 import { PerenaSyState, PerenaSyStateJson } from "./perena"
 import { GenericSyState, GenericSyStateJson } from "./generic"
-
+import {PublicKey, TransactionInstruction} from "@solana/web3.js"
 export type FlavorDiscriminator = "marginfi" | "kamino" | "jitoRestaking" | "perena" | "generic"
 
 export type MintSyArgs = {
   amountBase: string
-  depositor: web3.PublicKey
-  depositorBaseTokenAccount: web3.PublicKey
-  depositorSyTokenAccount: web3.PublicKey
+  depositor: PublicKey
+  depositorBaseTokenAccount: PublicKey
+  depositorSyTokenAccount: PublicKey
 }
 
 export type RedeemSyArgs = {
   amountSy: string
-  redeemer: web3.PublicKey
-  redeemerBaseTokenAccount: web3.PublicKey
-  redeemerSyTokenAccount: web3.PublicKey
+  redeemer: PublicKey
+  redeemerBaseTokenAccount: PublicKey
+  redeemerSyTokenAccount: PublicKey
 }
 
 export type InterfaceInstructionArgs = {
-  signer: web3.PublicKey
+  signer: PublicKey
   amountBase: string
 }
 
 type BaseFlavorState = {
   flavor: FlavorDiscriminator
   currentSyExchangeRate: number
-  mintBase: web3.PublicKey
-  baseTokenProgram: web3.PublicKey
+  mintBase: PublicKey
+  baseTokenProgram: PublicKey
   emissions: {
     exchangeRate: AnchorizedPNum
-    mint: web3.PublicKey
-    tokenProgram: web3.PublicKey
+    mint: PublicKey
+    tokenProgram: PublicKey
   }[]
 }
 
@@ -52,12 +51,12 @@ type BaseFlavorStateJson = {
 }
 
 interface BaseFlavorTrait {
-  ixMintSy: (args: MintSyArgs) => Promise<web3.TransactionInstruction>
-  ixRedeemSy: (args: RedeemSyArgs) => Promise<web3.TransactionInstruction>
-  preIxs: (args: { signer: web3.PublicKey }) => Promise<web3.TransactionInstruction[]>
-  postIxs: (args: { signer: web3.PublicKey }) => Promise<web3.TransactionInstruction[]>
-  preMintSyIx?: (args: InterfaceInstructionArgs) => Promise<web3.TransactionInstruction[]>
-  postRedeemSyIx?: (args: InterfaceInstructionArgs) => Promise<web3.TransactionInstruction[]>
+  ixMintSy: (args: MintSyArgs) => Promise<TransactionInstruction>
+  ixRedeemSy: (args: RedeemSyArgs) => Promise<TransactionInstruction>
+  preIxs: (args: { signer: PublicKey }) => Promise<TransactionInstruction[]>
+  postIxs: (args: { signer: PublicKey }) => Promise<TransactionInstruction[]>
+  preMintSyIx?: (args: InterfaceInstructionArgs) => Promise<TransactionInstruction[]>
+  postRedeemSyIx?: (args: InterfaceInstructionArgs) => Promise<TransactionInstruction[]>
 }
 
 export interface FlavorKaminoState extends BaseFlavorState {
@@ -67,9 +66,9 @@ export interface FlavorKaminoState extends BaseFlavorState {
 
 export interface FlavorMarginfiState extends BaseFlavorState {
   flavor: "marginfi"
-  bank: web3.PublicKey
-  emissionMint?: web3.PublicKey
-  emissionTokenProgram?: web3.PublicKey
+  bank: PublicKey
+  emissionMint?: PublicKey
+  emissionTokenProgram?: PublicKey
   mfiSyState: MfiSyState
 }