@exponent-labs/exponent-types 0.1.7 → 0.9.0

package/build/common.d.ts

@@ -1,21 +1,22 @@
-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;
 }

package/build/cpi.d.ts

@@ -1,6 +1,6 @@
-import { web3 } from "@coral-xyz/anchor";
+import { PublicKey } from "@solana/web3.js";
 export interface AccountInfo {
-    pubkey: web3.PublicKey;
+    pubkey: PublicKey;
     isSigner: boolean;
     isWritable: boolean;
 }
@@ -12,6 +12,14 @@ export interface CpiMeta<T> {
     claimEmission: T[][];
     getPositionState: T[];
 }
+/** Generic container for ExponentCore CPI account lists */
+export interface ExponentCoreCpiMeta<T> {
+    depositYt: T[];
+    withdrawYt: T[];
+    stripSy: T[];
+    mergeSy: T[];
+    collectInterest: T[];
+}
 /** The on-chain storage for CPI accounts, which references an ALT */
 export interface CpiAccountIndex {
     /** Index in the Address Lookup Table */
@@ -21,8 +29,12 @@ export interface CpiAccountIndex {
 }
 /**  Raw account infos for CPI that include the Pubkey */
 export type CpiAccountsRaw = CpiMeta<AccountInfo>;
+/**  Raw account infos for CPI that include the Pubkey */
+export type ExponentCoreCpiAccountsRaw = ExponentCoreCpiMeta<AccountInfo>;
 /** This account is stored in state on the vault/market to track indexes in the ALT */
 export type CpiAccountIndexes = CpiMeta<CpiAccountIndex>;
+/** This account is stored in state on the vault/market to track indexes in the ALT */
+export type ExponentCoreCpiIndexes = ExponentCoreCpiMeta<CpiAccountIndex>;
 export interface CpiAccountsRawJson {
     getSyState: AccountInfoJson[];
     withdrawSy: AccountInfoJson[];
@@ -30,6 +42,13 @@ export interface CpiAccountsRawJson {
     claimEmission: AccountInfoJson[][];
     getPositionState: AccountInfoJson[];
 }
+export interface ExponentCoreCpiAccountsRawJson {
+    depositYt: AccountInfoJson[];
+    withdrawYt: AccountInfoJson[];
+    stripSy: AccountInfoJson[];
+    mergeSy: AccountInfoJson[];
+    collectInterest: AccountInfoJson[];
+}
 export type AccountInfoJson = {
     pubkey: string;
     isSigner: boolean;
@@ -37,3 +56,16 @@ export type AccountInfoJson = {
 };
 export declare function deserializeCpiAccountsRaw(serialized: CpiAccountsRawJson): CpiAccountsRaw;
 export declare function serializeCpiAccountsRaw(cpiAccounts: CpiAccountsRaw): CpiAccountsRawJson;
+/** MarketThree/CLMM only uses a subset of ExponentCore CPI accounts (strip and merge) */
+export interface MarketCpiCoreMeta<T> {
+    stripSy: T[];
+    mergeSy: T[];
+}
+export interface MarketCpiCoreAccountsRawJson {
+    stripSy: AccountInfoJson[];
+    mergeSy: AccountInfoJson[];
+}
+/** Type alias for MarketThree's CPI core accounts with pubkeys */
+export type MarketCpiCoreAccountsRaw = MarketCpiCoreMeta<AccountInfo>;
+/** Type alias for MarketThree's CPI core accounts stored in state */
+export type MarketCpiCoreIndexes = MarketCpiCoreMeta<CpiAccountIndex>;

package/build/cpi.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeCpiAccountsRaw = exports.deserializeCpiAccountsRaw = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
+const web3_js_1 = require("@solana/web3.js");
 function deserializeCpiAccountsRaw(serialized) {
     const deserializeAccountInfo = (accountInfo) => ({
-        pubkey: new anchor_1.web3.PublicKey(accountInfo.pubkey),
+        pubkey: new web3_js_1.PublicKey(accountInfo.pubkey),
         isSigner: accountInfo.isSigner,
         isWritable: accountInfo.isWritable,
     });

package/build/cpi.js.map

@@ -1 +1 @@
-{"version":3,"file":"cpi.js","sourceRoot":"","sources":["../src/cpi.ts"],"names":[],"mappings":";;;AAAA,8CAAwC;AA6CxC,SAAgB,yBAAyB,CAAC,UAA8B;IACtE,MAAM,sBAAsB,GAAG,CAAC,WAA4B,EAAe,EAAE,CAAC,CAAC;QAC7E,MAAM,EAAE,IAAI,aAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;QAC9C,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,UAAU,EAAE,WAAW,CAAC,UAAU;KACnC,CAAC,CAAA;IACF,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC;QAC7D,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC;QAC7D,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC;QAC3D,aAAa,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC/F,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC;KAC1E,CAAA;AACH,CAAC;AAbD,8DAaC;AAED,SAAgB,uBAAuB,CAAC,WAA2B;IACjE,MAAM,oBAAoB,GAAG,CAAC,WAAwB,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE;QACrC,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,UAAU,EAAE,WAAW,CAAC,UAAU;KACnC,CAAC,CAAA;IAEF,OAAO;QACL,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC5D,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC5D,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC1D,aAAa,EAAE,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC9F,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC;KACzE,CAAA;AACH,CAAC;AAdD,0DAcC"}
+{"version":3,"file":"cpi.js","sourceRoot":"","sources":["../src/cpi.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAoE3C,SAAgB,yBAAyB,CAAC,UAA8B;IACtE,MAAM,sBAAsB,GAAG,CAAC,WAA4B,EAAe,EAAE,CAAC,CAAC;QAC7E,MAAM,EAAE,IAAI,mBAAS,CAAC,WAAW,CAAC,MAAM,CAAC;QACzC,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,UAAU,EAAE,WAAW,CAAC,UAAU;KACnC,CAAC,CAAA;IACF,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC;QAC7D,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC;QAC7D,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC;QAC3D,aAAa,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC/F,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC;KAC1E,CAAA;AACH,CAAC;AAbD,8DAaC;AAED,SAAgB,uBAAuB,CAAC,WAA2B;IACjE,MAAM,oBAAoB,GAAG,CAAC,WAAwB,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE;QACrC,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,UAAU,EAAE,WAAW,CAAC,UAAU;KACnC,CAAC,CAAA;IAEF,OAAO;QACL,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC5D,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC5D,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC1D,aAAa,EAAE,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC9F,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC;KACzE,CAAA;AACH,CAAC;AAdD,0DAcC"}

package/build/exponent-vaults.d.ts

@@ -0,0 +1,107 @@
+import { web3 } from "@coral-xyz/anchor";
+/** Seed used for withdrawal PDA derivation on-chain. */
+export declare const WITHDRAWAL_ACCOUNT_SEED: "withdrawal";
+/** Unique vault identifier is stored as 8 bytes on-chain. */
+export type VaultSeedId = Uint8Array | [number, number, number, number, number, number, number, number];
+export interface VaultFinancials {
+    /** Expiration timestamp mirrored from the underlying PT vault. */
+    expirationTs: number;
+    /** Total LP that has been minted. */
+    lpBalance: bigint;
+    /** Assets under management tracked in base units. */
+    aumInBase: bigint;
+}
+export interface OrderbookEntry {
+    /** Orderbook PDA powering the routing for this vault. */
+    orderbook: web3.PublicKey;
+    /** User escrow index that belongs to the vault inside the orderbook. */
+    userEscrowIdx: number;
+    /** Mint of the SY leg this entry routes into. */
+    mintSy: web3.PublicKey;
+    /** Offer indices that belong to the vault inside the target orderbook. */
+    offerIdxVec: number[];
+    /** PT priced in the base asset (0–1.0 range). */
+    ptPriceInAsset: number;
+    /** Total liquidity committed on this orderbook leg. */
+    totalLiquidity: bigint;
+    /** Bitmap describing the orderbook flavor/config. */
+    orderbookFlag: number;
+}
+export type SyEntryType = "generic" | "jitoSol";
+export interface SyCpiInterfaceContext {
+    /** Index inside the shared ALT that holds the account key. */
+    altIndex: number;
+    isSigner: boolean;
+    isWritable: boolean;
+}
+export interface CpiSyAccounts {
+    /** Packed account meta information for `getSyState` CPI validation. */
+    getSyState: SyCpiInterfaceContext[];
+}
+export interface SyEntry {
+    /** SY mint handled by the entry. */
+    mintSy: web3.PublicKey;
+    /** SPL account controlled by Squads (user deposits flow here first). */
+    tokenSquadsAccount: web3.PublicKey;
+    /** Escrow owned by the vault PDA that earmarks SY for withdrawals. */
+    tokenEscrowSy: web3.PublicKey;
+    /** Basis points share of this entry relative to total deposits. */
+    shareBp: number;
+    /** Liquidity currently allocated to the entry (in SY). */
+    currentLiquidity: bigint;
+    /** Anchor point for LP/SY conversion math. */
+    rateAnchor: number;
+    /** Type hint describing which SY program is behind the entry. */
+    syType: SyEntryType;
+    /** CPI account lists used for validation. */
+    syCpiAccounts: CpiSyAccounts;
+    /** Flag stored on-chain for mint-level bookkeeping. */
+    mintFlag: number;
+}
+export interface ExponentVaultState {
+    addressLookupTable: web3.PublicKey;
+    manager: web3.PublicKey;
+    squadsSettings: web3.PublicKey;
+    /** All configured SY entries (one per underlying SY mint). */
+    syEntries: SyEntry[];
+    mintLp: web3.PublicKey;
+    tokenLpEscrow: web3.PublicKey;
+    feeTreasuryLpBps: number;
+    /** PDA authority for CPI calls. */
+    selfAddress: web3.PublicKey;
+    /** Single byte bump used when deriving the authority PDA. */
+    signerBump: number;
+    /** Bitfield of vault runtime flags. */
+    statusFlags: number;
+    financials: VaultFinancials;
+    /** Tracks cross-program liquidity parked on orderbooks. */
+    orderbookEntries: OrderbookEntry[];
+    maxLpSupply: bigint;
+    lpEscrowAmount: bigint;
+    seedId: VaultSeedId;
+}
+/** Type of withdrawal: either SOL or SY tokens. */
+export type WithdrawalType = "sol" | "sy";
+/** Individual fill entry tracking SY mint and amount distributed. */
+export interface WithdrawalSyFill {
+    /** SY mint that was used for this fill. */
+    mintSy: web3.PublicKey;
+    /** Amount of SY tokens distributed in this fill. */
+    syAmount: bigint;
+}
+export interface WithdrawalAccount {
+    vault: web3.PublicKey;
+    owner: web3.PublicKey;
+    withdrawalId: bigint;
+    /** Type of withdrawal being processed. */
+    withdrawalType: WithdrawalType;
+    lpAmountRequested: bigint;
+    lpAmountRemaining: bigint;
+    /** Vector of fills tracking how the withdrawal was satisfied. */
+    fills: WithdrawalSyFill[];
+    createdAt: number;
+    updatedAt: number;
+    bump: number;
+    /** Reserved bytes retained for future extensions. */
+    reserved: Uint8Array | [number, number, number, number, number, number, number];
+}

package/build/exponent-vaults.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WITHDRAWAL_ACCOUNT_SEED = void 0;
+/** Seed used for withdrawal PDA derivation on-chain. */
+exports.WITHDRAWAL_ACCOUNT_SEED = "withdrawal";
+//# sourceMappingURL=exponent-vaults.js.map

package/build/exponent-vaults.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exponent-vaults.js","sourceRoot":"","sources":["../src/exponent-vaults.ts"],"names":[],"mappings":";;;AAEA,wDAAwD;AAC3C,QAAA,uBAAuB,GAAG,YAAqB,CAAA"}

package/build/flavor.d.ts

@@ -1,36 +1,36 @@
-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;
     }[];
 };
 type BaseFlavorStateJson = {
@@ -45,16 +45,16 @@ type BaseFlavorStateJson = {
     }[];
 };
 interface BaseFlavorTrait {
-    ixMintSy: (args: MintSyArgs) => Promise<web3.TransactionInstruction>;
-    ixRedeemSy: (args: RedeemSyArgs) => Promise<web3.TransactionInstruction>;
+    ixMintSy: (args: MintSyArgs) => Promise<TransactionInstruction>;
+    ixRedeemSy: (args: RedeemSyArgs) => Promise<TransactionInstruction>;
     preIxs: (args: {
-        signer: web3.PublicKey;
-    }) => Promise<web3.TransactionInstruction[]>;
+        signer: PublicKey;
+    }) => Promise<TransactionInstruction[]>;
     postIxs: (args: {
-        signer: web3.PublicKey;
-    }) => Promise<web3.TransactionInstruction[]>;
-    preMintSyIx?: (args: InterfaceInstructionArgs) => Promise<web3.TransactionInstruction[]>;
-    postRedeemSyIx?: (args: InterfaceInstructionArgs) => Promise<web3.TransactionInstruction[]>;
+        signer: PublicKey;
+    }) => Promise<TransactionInstruction[]>;
+    preMintSyIx?: (args: InterfaceInstructionArgs) => Promise<TransactionInstruction[]>;
+    postRedeemSyIx?: (args: InterfaceInstructionArgs) => Promise<TransactionInstruction[]>;
 }
 export interface FlavorKaminoState extends BaseFlavorState {
     flavor: "kamino";
@@ -62,9 +62,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;
 }
 export interface FlavorJitoRestakingState extends BaseFlavorState {

package/build/generic.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
-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: {
         lastSlot: BN;
@@ -44,6 +46,16 @@ export type InterfaceTypeGeneric = {
     solstice: {
         padding: number[];
     };
+} | {
+    reflect: {
+        padding: number[];
+    };
+} | {
+    ore: Record<string, never>;
+} | {
+    chainlink: {
+        padding: number[];
+    };
 };
 export type InterfaceTypeGenericJson = {
     pyth: {
@@ -87,30 +99,49 @@ export type InterfaceTypeGenericJson = {
     solstice: {
         padding: number[];
     };
+} | {
+    reflect: {
+        padding: number[];
+    };
+} | {
+    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;
+        stakePoolAddress: PublicKey;
+        stakePoolProgramId: PublicKey;
+        validatorList: PublicKey;
+        reserveStake: PublicKey;
+        managerFeeAccount: PublicKey;
+        poolMint: PublicKey;
     };
 }
 /** JSON version of additional data */
@@ -122,12 +153,41 @@ export interface AdditionalDataGenericJson {
     jupiterLendData?: {
         baseTokenMint: string;
         tokenReservesLiquidity: string;
+        lendingSupplyPosition: string;
+        rewardsRateModel: string;
+        rateModel: string;
+    };
+    kaminoVaultData?: {
+        vault: string;
+        reserves: {
+            reserveAddress: string;
+            marketAddress: string;
+        }[];
+        tokenVault: string;
+        tokenMint: string;
+        baseVaultAuthority: string;
+        sharesMint: string;
+    };
+    splStakePoolData?: {
+        stakePoolAddress: string;
+        stakePoolProgramId: string;
+        validatorList: string;
+        reserveStake: string;
+        managerFeeAccount: string;
+        poolMint: string;
     };
 }
 export interface Hook {
     enabled: boolean;
     interfaceEmissionsAccountsUntil: number;
-    programId: web3.PublicKey;
+    programId: PublicKey;
+    preMintHookDiscriminator: number[];
+    postRedeemHookDiscriminator: number[];
+}
+export interface HookJson {
+    enabled: boolean;
+    interfaceEmissionsAccountsUntil: number;
+    programId: string;
     preMintHookDiscriminator: number[];
     postRedeemHookDiscriminator: number[];
 }
@@ -136,12 +196,12 @@ 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;
 }
@@ -166,15 +226,15 @@ export interface GenericSyMetaAccountJson {
     maxSySupply: string;
     minMintSize: string;
     minRedeemSize: string;
-    hook: HookRaw;
+    hook: HookJson;
     emissions: SyEmissionJson[];
     index: number;
 }
 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;
@@ -184,15 +244,15 @@ export interface GenericSyMetaAccount {
     index: AnchorizedPNum;
 }
 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;
@@ -202,12 +262,16 @@ export declare function deserializeGenericSyMetaAccountRaw(raw: GenericSyMetaAcc
 export declare function toInterfaceTypeGenericJson(interfaceType: InterfaceTypeGeneric): InterfaceTypeGenericJson;
 /** Convert InterfaceTypeGenericJson to InterfaceTypeGeneric */
 export declare function fromInterfaceTypeGenericJson(json: InterfaceTypeGenericJson): InterfaceTypeGeneric;
+/** Convert Hook to HookJson */
+export declare function toHookJson(hook: Hook): HookJson;
+/** Convert HookJson to Hook */
+export declare function fromHookJson(json: HookJson): Hook;
 /** Convert AdditionalDataGeneric to AdditionalDataGenericJson */
 export declare function toAdditionalDataGenericJson(additionalData: AdditionalDataGeneric): AdditionalDataGenericJson;
 /** Convert AdditionalDataGenericJson to AdditionalDataGeneric */
 export declare function fromAdditionalDataGenericJson(json: AdditionalDataGenericJson): AdditionalDataGeneric;
 /** Helper function to extract fragmetric data from additional data */
 export declare function getFragmetricDataFromAdditionalData(additionalData?: AdditionalDataGeneric): {
-    receiptTokenMint: web3.PublicKey;
-    wrappedTokenMint: web3.PublicKey;
+    receiptTokenMint: PublicKey;
+    wrappedTokenMint: PublicKey;
 } | undefined;