@exponent-labs/exponent-types 0.9.11 → 0.9.13

package/build/cpi.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeCpiAccountsRaw = exports.deserializeCpiAccountsRaw = void 0;
+exports.deserializeCpiAccountsRaw = deserializeCpiAccountsRaw;
+exports.serializeCpiAccountsRaw = serializeCpiAccountsRaw;
 const web3_js_1 = require("@solana/web3.js");
 function deserializeCpiAccountsRaw(serialized) {
     const deserializeAccountInfo = (accountInfo) => ({
@@ -16,7 +17,6 @@ function deserializeCpiAccountsRaw(serialized) {
         getPositionState: serialized.getPositionState.map(deserializeAccountInfo),
     };
 }
-exports.deserializeCpiAccountsRaw = deserializeCpiAccountsRaw;
 function serializeCpiAccountsRaw(cpiAccounts) {
     const serializeAccountInfo = (accountInfo) => ({
         pubkey: accountInfo.pubkey.toString(),
@@ -31,5 +31,4 @@ function serializeCpiAccountsRaw(cpiAccounts) {
         getPositionState: cpiAccounts.getPositionState.map(serializeAccountInfo),
     };
 }
-exports.serializeCpiAccountsRaw = serializeCpiAccountsRaw;
 //# sourceMappingURL=cpi.js.map

package/build/cpi.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"cpi.js","sourceRoot":"","sources":["../src/cpi.ts"],"names":[],"mappings":";;AAoEA,8DAaC;AAED,0DAcC;AAjGD,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;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"}

package/build/generic.d.ts

@@ -1,9 +1,6 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { PublicKey } from "@solana/web3.js";
-import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common";
+import { BN, web3 } from "@coral-xyz/anchor";
 import { StakePoolAccount } from "@solana/spl-stake-pool";
-import BN from 'bn.js';
+import { AnchorizedPNum, AnchorizedPNumJson, SyEmissionJson, SyEmissionRaw } from "./common";
 export type InterfaceTypeGeneric = {
     pyth: {
         lastSlot: BN;
@@ -56,6 +53,24 @@ export type InterfaceTypeGeneric = {
     chainlink: {
         padding: number[];
     };
+} | {
+    chainlinkDataStream: {
+        feedHash: number[];
+        lastStreamedExchangeRate: AnchorizedPNum;
+        decimals: number;
+        lastSlot: BN;
+        lastStreamedTimestamp: number;
+        freshnessWindowSeconds: number;
+    };
+} | {
+    scope: {
+        priceChain: number[];
+        maximumAgeSeconds: BN;
+    };
+} | {
+    solsticeGlamVault: {
+        padding: number[];
+    };
 };
 export type InterfaceTypeGenericJson = {
     pyth: {
@@ -109,39 +124,57 @@ export type InterfaceTypeGenericJson = {
     chainlink: {
         padding: number[];
     };
+} | {
+    chainlinkDataStream: {
+        feedHash: number[];
+        lastStreamedExchangeRate: AnchorizedPNumJson;
+        decimals: number;
+        lastSlot: string;
+        lastStreamedTimestamp: number;
+        freshnessWindowSeconds: number;
+    };
+} | {
+    scope: {
+        priceChain: number[];
+        maximumAgeSeconds: string;
+    };
+} | {
+    solsticeGlamVault: {
+        padding: number[];
+    };
 };
 /** Additional data that different interface types may need */
 export interface AdditionalDataGeneric {
     fragmetricData?: {
-        receiptTokenMint: PublicKey;
-        wrappedTokenMint: PublicKey;
+        receiptTokenMint: web3.PublicKey;
+        wrappedTokenMint: web3.PublicKey;
     };
     jupiterLendData?: {
-        baseTokenMint: PublicKey;
-        tokenReservesLiquidity: PublicKey;
-        lendingSupplyPosition: PublicKey;
-        rewardsRateModel: PublicKey;
-        rateModel: PublicKey;
+        baseTokenMint: web3.PublicKey;
+        tokenReservesLiquidity: web3.PublicKey;
+        lendingSupplyPosition: web3.PublicKey;
+        rewardsRateModel: web3.PublicKey;
+        rateModel: web3.PublicKey;
     };
     kaminoVaultData?: {
-        vault: PublicKey;
+        vault: web3.PublicKey;
         reserves: {
-            reserveAddress: PublicKey;
-            marketAddress: PublicKey;
+            reserveAddress: web3.PublicKey;
+            marketAddress: web3.PublicKey;
         }[];
-        tokenVault: PublicKey;
-        tokenMint: PublicKey;
-        baseVaultAuthority: PublicKey;
-        sharesMint: PublicKey;
+        tokenVault: web3.PublicKey;
+        tokenMint: web3.PublicKey;
+        baseVaultAuthority: web3.PublicKey;
+        sharesMint: web3.PublicKey;
     };
     splStakePoolData?: {
         stakePoolAccount?: StakePoolAccount;
-        stakePoolAddress: PublicKey;
-        stakePoolProgramId: PublicKey;
-        validatorList: PublicKey;
-        reserveStake: PublicKey;
-        managerFeeAccount: PublicKey;
-        poolMint: PublicKey;
+        stakePoolAddress: web3.PublicKey;
+        stakePoolProgramId: web3.PublicKey;
+        validatorList: web3.PublicKey;
+        reserveStake: web3.PublicKey;
+        managerFeeAccount: web3.PublicKey;
+        poolMint: web3.PublicKey;
     };
 }
 /** JSON version of additional data */
@@ -180,7 +213,7 @@ export interface AdditionalDataGenericJson {
 export interface Hook {
     enabled: boolean;
     interfaceEmissionsAccountsUntil: number;
-    programId: PublicKey;
+    programId: web3.PublicKey;
     preMintHookDiscriminator: number[];
     postRedeemHookDiscriminator: number[];
 }
@@ -196,12 +229,12 @@ export interface HookRaw {
     interfaceEmissionsAccountsUntil: number;
     preMintHookDiscriminator: Buffer;
     postRedeemHookDiscriminator: Buffer;
-    programId: PublicKey;
+    programId: web3.PublicKey;
 }
 export interface GenericSyState {
-    selfAddress: PublicKey;
+    selfAddress: web3.PublicKey;
     account: GenericSyMetaAccount;
-    tokenProgramBase: PublicKey;
+    tokenProgramBase: web3.PublicKey;
     syRate: number;
     additionalData?: AdditionalDataGeneric;
 }
@@ -229,12 +262,13 @@ export interface GenericSyMetaAccountJson {
     hook: HookJson;
     emissions: SyEmissionJson[];
     index: number;
+    lastSlotCached: string;
 }
 export interface GenericSyMetaAccount {
-    mintSy: PublicKey;
-    yieldBearingMint: PublicKey;
-    tokenSyEscrow: PublicKey;
-    interfaceAccounts: PublicKey[];
+    mintSy: web3.PublicKey;
+    yieldBearingMint: web3.PublicKey;
+    tokenSyEscrow: web3.PublicKey;
+    interfaceAccounts: web3.PublicKey[];
     interfaceType: InterfaceTypeGeneric;
     maxSySupply: BN;
     minMintSize: BN;
@@ -242,20 +276,22 @@ export interface GenericSyMetaAccount {
     hook: Hook;
     emissions: SyEmissionRaw[];
     index: AnchorizedPNum;
+    lastSlotCached: BN;
 }
 export interface GenericSyMetaAccountRaw {
-    mintSy: PublicKey;
-    yieldBearingMint: PublicKey;
-    tokenSyEscrow: PublicKey;
+    mintSy: web3.PublicKey;
+    yieldBearingMint: web3.PublicKey;
+    tokenSyEscrow: web3.PublicKey;
     maxSySupply: BN;
     minMintSize: BN;
     minRedeemSize: BN;
     selfAddressBump: number[];
     emissions: SyEmissionRaw[];
-    interfaceAccounts: PublicKey[];
+    interfaceAccounts: web3.PublicKey[];
     interfaceType: InterfaceTypeGeneric;
     index: AnchorizedPNum;
     hook: HookRaw;
+    lastSlotCached: BN;
 }
 export declare function deserializeGenericSyMetaAccountRaw(raw: GenericSyMetaAccountRaw): GenericSyMetaAccount;
 /** Convert InterfaceTypeGeneric to InterfaceTypeGenericJson */
@@ -272,6 +308,6 @@ export declare function toAdditionalDataGenericJson(additionalData: AdditionalDa
 export declare function fromAdditionalDataGenericJson(json: AdditionalDataGenericJson): AdditionalDataGeneric;
 /** Helper function to extract fragmetric data from additional data */
 export declare function getFragmetricDataFromAdditionalData(additionalData?: AdditionalDataGeneric): {
-    receiptTokenMint: PublicKey;
-    wrappedTokenMint: PublicKey;
+    receiptTokenMint: web3.PublicKey;
+    wrappedTokenMint: web3.PublicKey;
 } | undefined;

package/build/generic.js

@@ -1,11 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFragmetricDataFromAdditionalData = exports.fromAdditionalDataGenericJson = exports.toAdditionalDataGenericJson = exports.fromHookJson = exports.toHookJson = exports.fromInterfaceTypeGenericJson = exports.toInterfaceTypeGenericJson = exports.deserializeGenericSyMetaAccountRaw = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const bn_js_1 = __importDefault(require("bn.js"));
+exports.deserializeGenericSyMetaAccountRaw = deserializeGenericSyMetaAccountRaw;
+exports.toInterfaceTypeGenericJson = toInterfaceTypeGenericJson;
+exports.fromInterfaceTypeGenericJson = fromInterfaceTypeGenericJson;
+exports.toHookJson = toHookJson;
+exports.fromHookJson = fromHookJson;
+exports.toAdditionalDataGenericJson = toAdditionalDataGenericJson;
+exports.fromAdditionalDataGenericJson = fromAdditionalDataGenericJson;
+exports.getFragmetricDataFromAdditionalData = getFragmetricDataFromAdditionalData;
+const anchor_1 = require("@coral-xyz/anchor");
 function deserializeGenericSyMetaAccountRaw(raw) {
     return {
         mintSy: raw.mintSy,
@@ -18,6 +21,7 @@ function deserializeGenericSyMetaAccountRaw(raw) {
         minMintSize: raw.minMintSize,
         minRedeemSize: raw.minRedeemSize,
         emissions: raw.emissions,
+        lastSlotCached: raw.lastSlotCached,
         hook: {
             enabled: raw.hook.enabled,
             interfaceEmissionsAccountsUntil: raw.hook.interfaceEmissionsAccountsUntil,
@@ -27,7 +31,6 @@ function deserializeGenericSyMetaAccountRaw(raw) {
         },
     };
 }
-exports.deserializeGenericSyMetaAccountRaw = deserializeGenericSyMetaAccountRaw;
 /** Convert InterfaceTypeGeneric to InterfaceTypeGenericJson */
 function toInterfaceTypeGenericJson(interfaceType) {
     if ("pyth" in interfaceType) {
@@ -69,16 +72,37 @@ function toInterfaceTypeGenericJson(interfaceType) {
             },
         };
     }
+    if ("chainlinkDataStream" in interfaceType) {
+        return {
+            chainlinkDataStream: {
+                feedHash: interfaceType.chainlinkDataStream.feedHash,
+                lastStreamedExchangeRate: {
+                    0: interfaceType.chainlinkDataStream.lastStreamedExchangeRate[0].map((bn) => bn.toString()),
+                },
+                decimals: interfaceType.chainlinkDataStream.decimals,
+                lastSlot: interfaceType.chainlinkDataStream.lastSlot.toString(),
+                lastStreamedTimestamp: interfaceType.chainlinkDataStream.lastStreamedTimestamp,
+                freshnessWindowSeconds: interfaceType.chainlinkDataStream.freshnessWindowSeconds,
+            },
+        };
+    }
+    if ("scope" in interfaceType) {
+        return {
+            scope: {
+                priceChain: interfaceType.scope.priceChain,
+                maximumAgeSeconds: interfaceType.scope.maximumAgeSeconds.toString(),
+            },
+        };
+    }
     return interfaceType;
 }
-exports.toInterfaceTypeGenericJson = toInterfaceTypeGenericJson;
 /** Convert InterfaceTypeGenericJson to InterfaceTypeGeneric */
 function fromInterfaceTypeGenericJson(json) {
     if ("pyth" in json) {
         return {
             pyth: {
-                lastSlot: new bn_js_1.default(json.pyth.lastSlot),
-                maximumAgeSeconds: new bn_js_1.default(json.pyth.maximumAgeSeconds),
+                lastSlot: new anchor_1.BN(json.pyth.lastSlot),
+                maximumAgeSeconds: new anchor_1.BN(json.pyth.maximumAgeSeconds),
             },
         };
     }
@@ -86,8 +110,8 @@ function fromInterfaceTypeGenericJson(json) {
         return {
             jupiterPerps: {
                 lastFeeUsdResetUnixTimestamp: parseInt(json.jupiterPerps.lastFeeUsdResetUnixTimestamp),
-                lastRealizedFeeUsd: new bn_js_1.default(json.jupiterPerps.lastRealizedFeeUsd),
-                lastAumUsd: new bn_js_1.default(json.jupiterPerps.lastAumUsd),
+                lastRealizedFeeUsd: new anchor_1.BN(json.jupiterPerps.lastRealizedFeeUsd),
+                lastAumUsd: new anchor_1.BN(json.jupiterPerps.lastAumUsd),
                 lastRealizedFeeUsdUpdateUnixTimestamp: parseInt(json.jupiterPerps.lastRealizedFeeUsdUpdateUnixTimestamp),
             },
         };
@@ -95,7 +119,7 @@ function fromInterfaceTypeGenericJson(json) {
     if ("adrena" in json) {
         return {
             adrena: {
-                previousTotalFees: new bn_js_1.default(json.adrena.previousTotalFees),
+                previousTotalFees: new anchor_1.BN(json.adrena.previousTotalFees),
             },
         };
     }
@@ -113,9 +137,30 @@ function fromInterfaceTypeGenericJson(json) {
             },
         };
     }
+    if ("chainlinkDataStream" in json) {
+        return {
+            chainlinkDataStream: {
+                feedHash: json.chainlinkDataStream.feedHash,
+                lastStreamedExchangeRate: {
+                    0: json.chainlinkDataStream.lastStreamedExchangeRate[0].map((s) => new anchor_1.BN(s)),
+                },
+                decimals: json.chainlinkDataStream.decimals,
+                lastSlot: new anchor_1.BN(json.chainlinkDataStream.lastSlot),
+                lastStreamedTimestamp: json.chainlinkDataStream.lastStreamedTimestamp,
+                freshnessWindowSeconds: json.chainlinkDataStream.freshnessWindowSeconds,
+            },
+        };
+    }
+    if ("scope" in json) {
+        return {
+            scope: {
+                priceChain: json.scope.priceChain,
+                maximumAgeSeconds: new anchor_1.BN(json.scope.maximumAgeSeconds),
+            },
+        };
+    }
     return json;
 }
-exports.fromInterfaceTypeGenericJson = fromInterfaceTypeGenericJson;
 /** Convert Hook to HookJson */
 function toHookJson(hook) {
     return {
@@ -126,18 +171,16 @@ function toHookJson(hook) {
         postRedeemHookDiscriminator: hook.postRedeemHookDiscriminator,
     };
 }
-exports.toHookJson = toHookJson;
 /** Convert HookJson to Hook */
 function fromHookJson(json) {
     return {
         enabled: json.enabled,
         interfaceEmissionsAccountsUntil: json.interfaceEmissionsAccountsUntil,
-        programId: new web3_js_1.PublicKey(json.programId),
+        programId: new anchor_1.web3.PublicKey(json.programId),
         preMintHookDiscriminator: json.preMintHookDiscriminator,
         postRedeemHookDiscriminator: json.postRedeemHookDiscriminator,
     };
 }
-exports.fromHookJson = fromHookJson;
 /** Convert AdditionalDataGeneric to AdditionalDataGenericJson */
 function toAdditionalDataGenericJson(additionalData) {
     const result = {};
@@ -181,56 +224,53 @@ function toAdditionalDataGenericJson(additionalData) {
     }
     return result;
 }
-exports.toAdditionalDataGenericJson = toAdditionalDataGenericJson;
 /** Convert AdditionalDataGenericJson to AdditionalDataGeneric */
 function fromAdditionalDataGenericJson(json) {
     const result = {};
     if (json.fragmetricData) {
         result.fragmetricData = {
-            receiptTokenMint: new web3_js_1.PublicKey(json.fragmetricData.receiptTokenMint),
-            wrappedTokenMint: new web3_js_1.PublicKey(json.fragmetricData.wrappedTokenMint),
+            receiptTokenMint: new anchor_1.web3.PublicKey(json.fragmetricData.receiptTokenMint),
+            wrappedTokenMint: new anchor_1.web3.PublicKey(json.fragmetricData.wrappedTokenMint),
         };
     }
     if (json.jupiterLendData) {
         result.jupiterLendData = {
-            baseTokenMint: new web3_js_1.PublicKey(json.jupiterLendData.baseTokenMint),
-            tokenReservesLiquidity: new web3_js_1.PublicKey(json.jupiterLendData.tokenReservesLiquidity),
-            lendingSupplyPosition: new web3_js_1.PublicKey(json.jupiterLendData.lendingSupplyPosition),
-            rewardsRateModel: new web3_js_1.PublicKey(json.jupiterLendData.rewardsRateModel),
-            rateModel: new web3_js_1.PublicKey(json.jupiterLendData.rateModel),
+            baseTokenMint: new anchor_1.web3.PublicKey(json.jupiterLendData.baseTokenMint),
+            tokenReservesLiquidity: new anchor_1.web3.PublicKey(json.jupiterLendData.tokenReservesLiquidity),
+            lendingSupplyPosition: new anchor_1.web3.PublicKey(json.jupiterLendData.lendingSupplyPosition),
+            rewardsRateModel: new anchor_1.web3.PublicKey(json.jupiterLendData.rewardsRateModel),
+            rateModel: new anchor_1.web3.PublicKey(json.jupiterLendData.rateModel),
         };
     }
     if (json.kaminoVaultData) {
         result.kaminoVaultData = {
-            vault: new web3_js_1.PublicKey(json.kaminoVaultData.vault),
+            vault: new anchor_1.web3.PublicKey(json.kaminoVaultData.vault),
             reserves: json.kaminoVaultData.reserves.map((r) => ({
-                reserveAddress: new web3_js_1.PublicKey(r.reserveAddress),
-                marketAddress: new web3_js_1.PublicKey(r.marketAddress),
+                reserveAddress: new anchor_1.web3.PublicKey(r.reserveAddress),
+                marketAddress: new anchor_1.web3.PublicKey(r.marketAddress),
             })),
-            tokenVault: new web3_js_1.PublicKey(json.kaminoVaultData.tokenVault),
-            tokenMint: new web3_js_1.PublicKey(json.kaminoVaultData.tokenMint),
-            baseVaultAuthority: new web3_js_1.PublicKey(json.kaminoVaultData.baseVaultAuthority),
-            sharesMint: new web3_js_1.PublicKey(json.kaminoVaultData.sharesMint),
+            tokenVault: new anchor_1.web3.PublicKey(json.kaminoVaultData.tokenVault),
+            tokenMint: new anchor_1.web3.PublicKey(json.kaminoVaultData.tokenMint),
+            baseVaultAuthority: new anchor_1.web3.PublicKey(json.kaminoVaultData.baseVaultAuthority),
+            sharesMint: new anchor_1.web3.PublicKey(json.kaminoVaultData.sharesMint),
         };
     }
     if (json.splStakePoolData) {
         result.splStakePoolData = {
-            stakePoolAddress: new web3_js_1.PublicKey(json.splStakePoolData.stakePoolAddress),
-            stakePoolProgramId: new web3_js_1.PublicKey(json.splStakePoolData.stakePoolProgramId),
-            validatorList: new web3_js_1.PublicKey(json.splStakePoolData.validatorList),
-            reserveStake: new web3_js_1.PublicKey(json.splStakePoolData.reserveStake),
-            managerFeeAccount: new web3_js_1.PublicKey(json.splStakePoolData.managerFeeAccount),
-            poolMint: new web3_js_1.PublicKey(json.splStakePoolData.poolMint),
+            stakePoolAddress: new anchor_1.web3.PublicKey(json.splStakePoolData.stakePoolAddress),
+            stakePoolProgramId: new anchor_1.web3.PublicKey(json.splStakePoolData.stakePoolProgramId),
+            validatorList: new anchor_1.web3.PublicKey(json.splStakePoolData.validatorList),
+            reserveStake: new anchor_1.web3.PublicKey(json.splStakePoolData.reserveStake),
+            managerFeeAccount: new anchor_1.web3.PublicKey(json.splStakePoolData.managerFeeAccount),
+            poolMint: new anchor_1.web3.PublicKey(json.splStakePoolData.poolMint),
         };
     }
     return result;
 }
-exports.fromAdditionalDataGenericJson = fromAdditionalDataGenericJson;
 /** Helper function to extract fragmetric data from additional data */
 function getFragmetricDataFromAdditionalData(additionalData) {
     if (!additionalData)
         return undefined;
     return additionalData.fragmetricData;
 }
-exports.getFragmetricDataFromAdditionalData = getFragmetricDataFromAdditionalData;
 //# sourceMappingURL=generic.js.map

package/build/generic.js.map

@@ -1 +1 @@
-{"version":3,"file":"generic.js","sourceRoot":"","sources":["../src/generic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generic.js","sourceRoot":"","sources":["../src/generic.ts"],"names":[],"mappings":"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"}

package/build/jito-restaking.d.ts

@@ -1,4 +1,4 @@
-import { SyEmissionRaw, SyEmissionJson } from "./common";
+import { AnchorizedPNum, AnchorizedPNumJson, SyEmissionRaw, SyEmissionJson } from "./common";
 import { PublicKey } from "@solana/web3.js";
 import BN from 'bn.js';
 export interface InterfaceType {
@@ -24,6 +24,8 @@ export interface JitoRestakingSyMetaAccountRaw {
     emissions: SyEmissionRaw[];
     interfaceAccounts: PublicKey[];
     interfaceType: InterfaceType;
+    lastIndex: AnchorizedPNum;
+    lastSlotCached: BN;
 }
 export interface JitoRestakingSyMetaAccount {
     jitoVault: PublicKey;
@@ -35,6 +37,8 @@ export interface JitoRestakingSyMetaAccount {
     minMintSize: BN;
     minRedeemSize: BN;
     emissions: SyEmissionRaw[];
+    lastIndex: AnchorizedPNum;
+    lastSlotCached: BN;
 }
 export interface JitoRestakingSyMetaAccountJson {
     jitoVault: string;
@@ -46,6 +50,8 @@ export interface JitoRestakingSyMetaAccountJson {
     minMintSize: string;
     minRedeemSize: string;
     emissions: SyEmissionJson[];
+    lastIndex: AnchorizedPNumJson;
+    lastSlotCached: string;
 }
 export declare function deserializeJitoRestakingSyMetaAccountRaw(raw: JitoRestakingSyMetaAccountRaw): JitoRestakingSyMetaAccount;
 export interface JitoRestakingSyStateJson {

package/build/jito-restaking.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deserializeJitoRestakingSyMetaAccountRaw = void 0;
+exports.deserializeJitoRestakingSyMetaAccountRaw = deserializeJitoRestakingSyMetaAccountRaw;
 function deserializeJitoRestakingSyMetaAccountRaw(raw) {
     return {
         jitoVault: raw.jitoVault,
@@ -12,7 +12,8 @@ function deserializeJitoRestakingSyMetaAccountRaw(raw) {
         minMintSize: raw.minMintSize,
         minRedeemSize: raw.minRedeemSize,
         emissions: raw.emissions,
+        lastIndex: raw.lastIndex,
+        lastSlotCached: raw.lastSlotCached,
     };
 }
-exports.deserializeJitoRestakingSyMetaAccountRaw = deserializeJitoRestakingSyMetaAccountRaw;
 //# sourceMappingURL=jito-restaking.js.map

package/build/jito-restaking.js.map

@@ -1 +1 @@
-{"version":3,"file":"jito-restaking.js","sourceRoot":"","sources":["../src/jito-restaking.ts"],"names":[],"mappings":";;;AAsDA,SAAgB,wCAAwC,CACtD,GAAkC;IAElC,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,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;AAdD,4FAcC"}
+{"version":3,"file":"jito-restaking.js","sourceRoot":"","sources":["../src/jito-restaking.ts"],"names":[],"mappings":";;AA4DA,4FAgBC;AAhBD,SAAgB,wCAAwC,CACtD,GAAkC;IAElC,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,cAAc,EAAE,GAAG,CAAC,cAAc;KACnC,CAAA;AACH,CAAC"}

package/build/kamino.d.ts

@@ -1,6 +1,6 @@
-import BN from "bn.js";
-import { SyEmissionJson, SyEmissionRaw, SyEmissionRaw2 } from "./common";
 import { PublicKey } from "@solana/web3.js";
+import BN from "bn.js";
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw, SyEmissionRaw2 } from "./common";
 export interface KaminoSyState {
     selfAddress: PublicKey;
     account: KaminoSyMetaAccount;
@@ -37,6 +37,8 @@ export interface KaminoSyMetaAccount {
     minMintSize: string;
     minRedeemSize: string;
     emissions: SyEmissionRaw[];
+    lastIndex: AnchorizedPNum;
+    lastSlotCached: string;
 }
 interface KaminoSyMetaAccountJson {
     kaminoReserve: string;
@@ -50,6 +52,8 @@ interface KaminoSyMetaAccountJson {
     minMintSize: string;
     minRedeemSize: string;
     emissions: SyEmissionJson[];
+    lastIndex: number;
+    lastSlotCached: string;
 }
 export interface KaminoSyMetaAccountRaw {
     kamino_reserve: PublicKey;
@@ -70,5 +74,7 @@ export interface KaminoSyMetaAccountRaw {
     min_mint_size: BN;
     min_redeem_size: BN;
     emissions: SyEmissionRaw2[];
+    last_index: AnchorizedPNum;
+    last_slot_cached: BN;
 }
 export {};

package/build/marginfi.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
-import { SyEmissionRaw, SyEmissionJson } from "./common";
-import BN from 'bn.js';
+import BN from "bn.js";
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common";
 export interface MfiSyState {
     selfAddress: PublicKey;
     account: MarginfiSyMeta;
@@ -36,6 +36,8 @@ export interface SyMetaJson {
     maxSySupply: string;
     minMintSize: string;
     minRedeemSize: string;
+    lastIndex: number;
+    lastSlotCached: string;
     syRate: string;
 }
 export interface MarginfiSyMeta {
@@ -48,6 +50,8 @@ export interface MarginfiSyMeta {
     minMintSize: bigint;
     minRedeemSize: bigint;
     emissions: SyEmissionRaw[];
+    lastIndex: AnchorizedPNum;
+    lastSlotCached: bigint;
 }
 export interface MarginfiSyMetaJson {
     marginfiBank: string;
@@ -57,6 +61,8 @@ export interface MarginfiSyMetaJson {
     maxSySupply: string;
     minMintSize: string;
     minRedeemSize: string;
+    lastIndex: number;
+    lastSlotCached: string;
     emissions: SyEmissionJson[];
 }
 export interface MarginfiSyMetaRaw {
@@ -69,10 +75,6 @@ export interface MarginfiSyMetaRaw {
     /** Where the SY tokens get deposited */
     tokenSyEscrow: PublicKey;
     emissions: SyEmissionRaw[];
+    lastIndex: AnchorizedPNum;
+    lastSlotCached: BN;
 }
-export type AnchorizedPNum = {
-    0: BN[];
-};
-export type AnchorizedPNumJson = {
-    0: string[];
-};

package/build/perena.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
-import { SyEmissionRaw, SyEmissionJson } from "./common";
-import BN from 'bn.js';
+import BN from "bn.js";
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common";
 export interface PerenaSyState {
     selfAddress: PublicKey;
     account: PerenaSyMetaAccount;
@@ -19,6 +19,8 @@ export interface PerenaSyMetaAccountRaw {
     selfAddressBump: number[];
     emissions: SyEmissionRaw[];
     interfaceAccounts: PublicKey[];
+    lastIndex: AnchorizedPNum;
+    lastSlotCached: BN;
 }
 export interface PerenaSyMetaAccount {
     perenaStablePool: PublicKey;
@@ -29,6 +31,8 @@ export interface PerenaSyMetaAccount {
     minMintSize: BN;
     minRedeemSize: BN;
     emissions: SyEmissionRaw[];
+    lastIndex: AnchorizedPNum;
+    lastSlotCached: BN;
 }
 export interface PerenaSyMetaAccountJson {
     perenaStablePool: string;
@@ -39,6 +43,8 @@ export interface PerenaSyMetaAccountJson {
     minMintSize: string;
     minRedeemSize: string;
     emissions: SyEmissionJson[];
+    lastIndex: number;
+    lastSlotCached: string;
 }
 export declare function deserializePerenaSyMetaAccountRaw(raw: PerenaSyMetaAccountRaw): PerenaSyMetaAccount;
 export interface PerenaSyStateJson {

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,
@@ -11,7 +11,8 @@ function deserializePerenaSyMetaAccountRaw(raw) {
         minMintSize: raw.minMintSize,
         minRedeemSize: raw.minRedeemSize,
         emissions: raw.emissions,
+        lastIndex: raw.lastIndex,
+        lastSlotCached: raw.lastSlotCached,
     };
 }
-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":";;AAsDA,8EAaC;AAbD,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;QACxB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,cAAc,EAAE,GAAG,CAAC,cAAc;KACnC,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exponent-labs/exponent-types",
-  "version": "0.9.11",
+  "version": "0.9.13",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "AGPL-3.0",

package/src/generic.ts

@@ -1,7 +1,8 @@
-import { PublicKey } from "@solana/web3.js"
-import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common"
+import { BN, web3 } from "@coral-xyz/anchor"
 import { StakePoolAccount } from "@solana/spl-stake-pool"
-import BN from 'bn.js'
+
+import { AnchorizedPNum, AnchorizedPNumJson, SyEmissionJson, SyEmissionRaw } from "./common"
+
 export type InterfaceTypeGeneric =
   | {
       pyth: {
@@ -71,6 +72,27 @@ export type InterfaceTypeGeneric =
         padding: number[]
       }
     }
+  | {
+      chainlinkDataStream: {
+        feedHash: number[]
+        lastStreamedExchangeRate: AnchorizedPNum
+        decimals: number
+        lastSlot: BN
+        lastStreamedTimestamp: number
+        freshnessWindowSeconds: number
+      }
+    }
+  | {
+      scope: {
+        priceChain: number[]
+        maximumAgeSeconds: BN
+      }
+    }
+  | {
+      solsticeGlamVault: {
+        padding: number[]
+      }
+    }
 export type InterfaceTypeGenericJson =
   | {
       pyth: {
@@ -140,38 +162,59 @@ export type InterfaceTypeGenericJson =
         padding: number[]
       }
     }
+  | {
+      chainlinkDataStream: {
+        feedHash: number[]
+        lastStreamedExchangeRate: AnchorizedPNumJson
+        decimals: number
+        lastSlot: string
+        lastStreamedTimestamp: number
+        freshnessWindowSeconds: number
+      }
+    }
+  | {
+      scope: {
+        priceChain: number[]
+        maximumAgeSeconds: string
+      }
+    }
+  | {
+      solsticeGlamVault: {
+        padding: number[]
+      }
+    }
 /** Additional data that different interface types may need */
 export interface AdditionalDataGeneric {
   fragmetricData?: {
-    receiptTokenMint: PublicKey
-    wrappedTokenMint: PublicKey
+    receiptTokenMint: web3.PublicKey
+    wrappedTokenMint: web3.PublicKey
   }
   jupiterLendData?: {
-    baseTokenMint: PublicKey
-    tokenReservesLiquidity: PublicKey
-    lendingSupplyPosition: PublicKey
-    rewardsRateModel: PublicKey
-    rateModel: PublicKey
+    baseTokenMint: web3.PublicKey
+    tokenReservesLiquidity: web3.PublicKey
+    lendingSupplyPosition: web3.PublicKey
+    rewardsRateModel: web3.PublicKey
+    rateModel: web3.PublicKey
   }
   kaminoVaultData?: {
-    vault: PublicKey
+    vault: web3.PublicKey
     reserves: {
-      reserveAddress: PublicKey
-      marketAddress: PublicKey
+      reserveAddress: web3.PublicKey
+      marketAddress: web3.PublicKey
     }[]
-    tokenVault: PublicKey
-    tokenMint: PublicKey
-    baseVaultAuthority: PublicKey
-    sharesMint: PublicKey
+    tokenVault: web3.PublicKey
+    tokenMint: web3.PublicKey
+    baseVaultAuthority: web3.PublicKey
+    sharesMint: web3.PublicKey
   }
   splStakePoolData?: {
     stakePoolAccount?: StakePoolAccount // Optional because it is expensive to serialize / not always needed on clients
-    stakePoolAddress: PublicKey
-    stakePoolProgramId: PublicKey // Dynamic program ID from account owner
-    validatorList: PublicKey
-    reserveStake: PublicKey
-    managerFeeAccount: PublicKey
-    poolMint: PublicKey
+    stakePoolAddress: web3.PublicKey
+    stakePoolProgramId: web3.PublicKey // Dynamic program ID from account owner
+    validatorList: web3.PublicKey
+    reserveStake: web3.PublicKey
+    managerFeeAccount: web3.PublicKey
+    poolMint: web3.PublicKey
   }
   // Add other interface-specific data here as needed
   // meteoraData?: { ... }
@@ -220,7 +263,7 @@ export interface AdditionalDataGenericJson {
 export interface Hook {
   enabled: boolean
   interfaceEmissionsAccountsUntil: number
-  programId: PublicKey
+  programId: web3.PublicKey
   preMintHookDiscriminator: number[]
   postRedeemHookDiscriminator: number[]
 }
@@ -238,13 +281,13 @@ export interface HookRaw {
   interfaceEmissionsAccountsUntil: number
   preMintHookDiscriminator: Buffer
   postRedeemHookDiscriminator: Buffer
-  programId: PublicKey
+  programId: web3.PublicKey
 }
 
 export interface GenericSyState {
-  selfAddress: PublicKey
+  selfAddress: web3.PublicKey
   account: GenericSyMetaAccount
-  tokenProgramBase: PublicKey
+  tokenProgramBase: web3.PublicKey
   syRate: number
   additionalData?: AdditionalDataGeneric
 }
@@ -274,13 +317,14 @@ export interface GenericSyMetaAccountJson {
   hook: HookJson
   emissions: SyEmissionJson[]
   index: number
+  lastSlotCached: string
 }
 
 export interface GenericSyMetaAccount {
-  mintSy: PublicKey
-  yieldBearingMint: PublicKey
-  tokenSyEscrow: PublicKey
-  interfaceAccounts: PublicKey[]
+  mintSy: web3.PublicKey
+  yieldBearingMint: web3.PublicKey
+  tokenSyEscrow: web3.PublicKey
+  interfaceAccounts: web3.PublicKey[]
   interfaceType: InterfaceTypeGeneric
   maxSySupply: BN
   minMintSize: BN
@@ -288,21 +332,23 @@ export interface GenericSyMetaAccount {
   hook: Hook
   emissions: SyEmissionRaw[]
   index: AnchorizedPNum
+  lastSlotCached: BN
 }
 
 export interface GenericSyMetaAccountRaw {
-  mintSy: PublicKey
-  yieldBearingMint: PublicKey
-  tokenSyEscrow: PublicKey
+  mintSy: web3.PublicKey
+  yieldBearingMint: web3.PublicKey
+  tokenSyEscrow: web3.PublicKey
   maxSySupply: BN
   minMintSize: BN
   minRedeemSize: BN
   selfAddressBump: number[]
   emissions: SyEmissionRaw[]
-  interfaceAccounts: PublicKey[]
+  interfaceAccounts: web3.PublicKey[]
   interfaceType: InterfaceTypeGeneric
   index: AnchorizedPNum
   hook: HookRaw
+  lastSlotCached: BN
 }
 
 export function deserializeGenericSyMetaAccountRaw(raw: GenericSyMetaAccountRaw): GenericSyMetaAccount {
@@ -317,6 +363,7 @@ export function deserializeGenericSyMetaAccountRaw(raw: GenericSyMetaAccountRaw)
     minMintSize: raw.minMintSize,
     minRedeemSize: raw.minRedeemSize,
     emissions: raw.emissions,
+    lastSlotCached: raw.lastSlotCached,
     hook: {
       enabled: raw.hook.enabled,
       interfaceEmissionsAccountsUntil: raw.hook.interfaceEmissionsAccountsUntil,
@@ -369,6 +416,28 @@ export function toInterfaceTypeGenericJson(interfaceType: InterfaceTypeGeneric):
       },
     }
   }
+  if ("chainlinkDataStream" in interfaceType) {
+    return {
+      chainlinkDataStream: {
+        feedHash: interfaceType.chainlinkDataStream.feedHash,
+        lastStreamedExchangeRate: {
+          0: interfaceType.chainlinkDataStream.lastStreamedExchangeRate[0].map((bn) => bn.toString()),
+        },
+        decimals: interfaceType.chainlinkDataStream.decimals,
+        lastSlot: interfaceType.chainlinkDataStream.lastSlot.toString(),
+        lastStreamedTimestamp: interfaceType.chainlinkDataStream.lastStreamedTimestamp,
+        freshnessWindowSeconds: interfaceType.chainlinkDataStream.freshnessWindowSeconds,
+      },
+    }
+  }
+  if ("scope" in interfaceType) {
+    return {
+      scope: {
+        priceChain: interfaceType.scope.priceChain,
+        maximumAgeSeconds: interfaceType.scope.maximumAgeSeconds.toString(),
+      },
+    }
+  }
   return interfaceType as InterfaceTypeGenericJson
 }
 
@@ -413,6 +482,28 @@ export function fromInterfaceTypeGenericJson(json: InterfaceTypeGenericJson): In
       },
     }
   }
+  if ("chainlinkDataStream" in json) {
+    return {
+      chainlinkDataStream: {
+        feedHash: json.chainlinkDataStream.feedHash,
+        lastStreamedExchangeRate: {
+          0: json.chainlinkDataStream.lastStreamedExchangeRate[0].map((s) => new BN(s)),
+        },
+        decimals: json.chainlinkDataStream.decimals,
+        lastSlot: new BN(json.chainlinkDataStream.lastSlot),
+        lastStreamedTimestamp: json.chainlinkDataStream.lastStreamedTimestamp,
+        freshnessWindowSeconds: json.chainlinkDataStream.freshnessWindowSeconds,
+      },
+    }
+  }
+  if ("scope" in json) {
+    return {
+      scope: {
+        priceChain: json.scope.priceChain,
+        maximumAgeSeconds: new BN(json.scope.maximumAgeSeconds),
+      },
+    }
+  }
   return json as InterfaceTypeGeneric
 }
 
@@ -432,7 +523,7 @@ export function fromHookJson(json: HookJson): Hook {
   return {
     enabled: json.enabled,
     interfaceEmissionsAccountsUntil: json.interfaceEmissionsAccountsUntil,
-    programId: new PublicKey(json.programId),
+    programId: new web3.PublicKey(json.programId),
     preMintHookDiscriminator: json.preMintHookDiscriminator,
     postRedeemHookDiscriminator: json.postRedeemHookDiscriminator,
   }
@@ -493,43 +584,43 @@ export function fromAdditionalDataGenericJson(json: AdditionalDataGenericJson):
 
   if (json.fragmetricData) {
     result.fragmetricData = {
-      receiptTokenMint: new PublicKey(json.fragmetricData.receiptTokenMint),
-      wrappedTokenMint: new PublicKey(json.fragmetricData.wrappedTokenMint),
+      receiptTokenMint: new web3.PublicKey(json.fragmetricData.receiptTokenMint),
+      wrappedTokenMint: new web3.PublicKey(json.fragmetricData.wrappedTokenMint),
     }
   }
 
   if (json.jupiterLendData) {
     result.jupiterLendData = {
-      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),
+      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),
     }
   }
 
   if (json.kaminoVaultData) {
     result.kaminoVaultData = {
-      vault: new PublicKey(json.kaminoVaultData.vault),
+      vault: new web3.PublicKey(json.kaminoVaultData.vault),
       reserves: json.kaminoVaultData.reserves.map((r) => ({
-        reserveAddress: new PublicKey(r.reserveAddress),
-        marketAddress: new PublicKey(r.marketAddress),
+        reserveAddress: new web3.PublicKey(r.reserveAddress),
+        marketAddress: new web3.PublicKey(r.marketAddress),
       })),
-      tokenVault: new PublicKey(json.kaminoVaultData.tokenVault),
-      tokenMint: new PublicKey(json.kaminoVaultData.tokenMint),
-      baseVaultAuthority: new PublicKey(json.kaminoVaultData.baseVaultAuthority),
-      sharesMint: new PublicKey(json.kaminoVaultData.sharesMint),
+      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),
     }
   }
 
   if (json.splStakePoolData) {
     result.splStakePoolData = {
-      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),
+      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),
     }
   }
 
@@ -539,11 +630,11 @@ export function fromAdditionalDataGenericJson(json: AdditionalDataGenericJson):
 /** Helper function to extract fragmetric data from additional data */
 export function getFragmetricDataFromAdditionalData(additionalData?: AdditionalDataGeneric):
   | {
-      receiptTokenMint: PublicKey
-      wrappedTokenMint: PublicKey
+      receiptTokenMint: web3.PublicKey
+      wrappedTokenMint: web3.PublicKey
     }
   | undefined {
   if (!additionalData) return undefined
 
   return additionalData.fragmetricData
-}
+}

package/src/jito-restaking.ts

@@ -26,6 +26,8 @@ export interface JitoRestakingSyMetaAccountRaw {
   emissions: SyEmissionRaw[]
   interfaceAccounts: PublicKey[]
   interfaceType: InterfaceType
+  lastIndex: AnchorizedPNum
+  lastSlotCached: BN
 }
 
 export interface JitoRestakingSyMetaAccount {
@@ -38,6 +40,8 @@ export interface JitoRestakingSyMetaAccount {
   minMintSize: BN
   minRedeemSize: BN
   emissions: SyEmissionRaw[]
+  lastIndex: AnchorizedPNum
+  lastSlotCached: BN
 }
 
 export interface JitoRestakingSyMetaAccountJson {
@@ -50,6 +54,8 @@ export interface JitoRestakingSyMetaAccountJson {
   minMintSize: string
   minRedeemSize: string
   emissions: SyEmissionJson[]
+  lastIndex: AnchorizedPNumJson
+  lastSlotCached: string
 }
 
 export function deserializeJitoRestakingSyMetaAccountRaw(
@@ -65,6 +71,8 @@ export function deserializeJitoRestakingSyMetaAccountRaw(
     minMintSize: raw.minMintSize,
     minRedeemSize: raw.minRedeemSize,
     emissions: raw.emissions,
+    lastIndex: raw.lastIndex,
+    lastSlotCached: raw.lastSlotCached,
   }
 }
 

package/src/kamino.ts

@@ -1,7 +1,7 @@
-import BN  from "bn.js"
-
-import { SyEmissionJson, SyEmissionRaw, SyEmissionRaw2 } from "./common"
 import { PublicKey } from "@solana/web3.js"
+import BN from "bn.js"
+
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw, SyEmissionRaw2 } from "./common"
 
 export interface KaminoSyState {
   selfAddress: PublicKey
@@ -41,6 +41,8 @@ export interface KaminoSyMetaAccount {
   minMintSize: string
   minRedeemSize: string
   emissions: SyEmissionRaw[]
+  lastIndex: AnchorizedPNum
+  lastSlotCached: string
 }
 
 interface KaminoSyMetaAccountJson {
@@ -55,6 +57,8 @@ interface KaminoSyMetaAccountJson {
   minMintSize: string
   minRedeemSize: string
   emissions: SyEmissionJson[]
+  lastIndex: number
+  lastSlotCached: string
 }
 
 export interface KaminoSyMetaAccountRaw {
@@ -76,4 +80,6 @@ export interface KaminoSyMetaAccountRaw {
   min_mint_size: BN
   min_redeem_size: BN
   emissions: SyEmissionRaw2[]
-}
+  last_index: AnchorizedPNum
+  last_slot_cached: BN
+}

package/src/marginfi.ts

@@ -1,6 +1,8 @@
 import { PublicKey } from "@solana/web3.js"
-import { SyEmissionRaw, SyEmissionJson } from "./common"
-import BN from 'bn.js'
+import BN from "bn.js"
+
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common"
+
 export interface MfiSyState {
   selfAddress: PublicKey
   account: MarginfiSyMeta
@@ -39,6 +41,8 @@ export interface SyMetaJson {
   maxSySupply: string
   minMintSize: string
   minRedeemSize: string
+  lastIndex: number
+  lastSlotCached: string
   syRate: string
 }
 
@@ -52,6 +56,8 @@ export interface MarginfiSyMeta {
   minMintSize: bigint
   minRedeemSize: bigint
   emissions: SyEmissionRaw[]
+  lastIndex: AnchorizedPNum
+  lastSlotCached: bigint
 }
 
 export interface MarginfiSyMetaJson {
@@ -62,6 +68,8 @@ export interface MarginfiSyMetaJson {
   maxSySupply: string
   minMintSize: string
   minRedeemSize: string
+  lastIndex: number
+  lastSlotCached: string
   emissions: SyEmissionJson[]
 }
 
@@ -75,7 +83,6 @@ export interface MarginfiSyMetaRaw {
   /** Where the SY tokens get deposited */
   tokenSyEscrow: PublicKey
   emissions: SyEmissionRaw[]
+  lastIndex: AnchorizedPNum
+  lastSlotCached: BN
 }
-
-export type AnchorizedPNum = { 0: BN[] }
-export type AnchorizedPNumJson = { 0: string[] }

package/src/perena.ts

@@ -1,6 +1,8 @@
 import { PublicKey } from "@solana/web3.js"
-import { AnchorizedPNum, AnchorizedPNumJson, SyEmissionRaw, SyEmissionJson } from "./common"
-import BN from 'bn.js'
+import BN from "bn.js"
+
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common"
+
 export interface PerenaSyState {
   selfAddress: PublicKey
   account: PerenaSyMetaAccount
@@ -20,6 +22,8 @@ export interface PerenaSyMetaAccountRaw {
   selfAddressBump: number[]
   emissions: SyEmissionRaw[]
   interfaceAccounts: PublicKey[]
+  lastIndex: AnchorizedPNum
+  lastSlotCached: BN
 }
 
 export interface PerenaSyMetaAccount {
@@ -31,6 +35,8 @@ export interface PerenaSyMetaAccount {
   minMintSize: BN
   minRedeemSize: BN
   emissions: SyEmissionRaw[]
+  lastIndex: AnchorizedPNum
+  lastSlotCached: BN
 }
 
 export interface PerenaSyMetaAccountJson {
@@ -42,6 +48,8 @@ export interface PerenaSyMetaAccountJson {
   minMintSize: string
   minRedeemSize: string
   emissions: SyEmissionJson[]
+  lastIndex: number
+  lastSlotCached: string
 }
 
 export function deserializePerenaSyMetaAccountRaw(raw: PerenaSyMetaAccountRaw): PerenaSyMetaAccount {
@@ -54,6 +62,8 @@ export function deserializePerenaSyMetaAccountRaw(raw: PerenaSyMetaAccountRaw):
     minMintSize: raw.minMintSize,
     minRedeemSize: raw.minRedeemSize,
     emissions: raw.emissions,
+    lastIndex: raw.lastIndex,
+    lastSlotCached: raw.lastSlotCached,
   }
 }
 
@@ -64,4 +74,4 @@ export interface PerenaSyStateJson {
   underlyingExchangeRate: number
   mintBase: string
   tokenProgramBase: string
-}
+}