@exponent-labs/exponent-types 0.1.3 → 0.1.5

package/build/common.d.ts

@@ -9,6 +9,16 @@ export interface SyEmissionRaw {
     treasuryEmission: BN;
     lastSeenIndex: AnchorizedPNum;
 }
+export interface SyEmissionRaw2 {
+    mint: web3.PublicKey;
+    index: AnchorizedPNum;
+    last_seen_total_accrued_emissions: BN;
+    total_claimed_emissions: BN;
+    token_program: web3.PublicKey;
+    escrow_account: web3.PublicKey;
+    treasury_emission: BN;
+    last_seen_index: AnchorizedPNum;
+}
 export interface SyEmissionJson {
     mint: string;
     tokenProgram: string;

package/build/generic.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { BN, web3 } from "@coral-xyz/anchor";
-import { AnchorizedPNum, SyEmissionRaw, SyEmissionJson } from "./common";
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common";
 export type InterfaceTypeGeneric = {
     pyth: {
         lastSlot: BN;
@@ -17,6 +17,33 @@ export type InterfaceTypeGeneric = {
     meteora: Record<string, never>;
 } | {
     fragmetricSupportedAsset: Record<string, never>;
+} | {
+    sanctum: Record<string, never>;
+} | {
+    jupiterPerps: {
+        lastFeeUsdResetUnixTimestamp: number;
+        lastRealizedFeeUsd: BN;
+        lastAumUsd: BN;
+        lastRealizedFeeUsdUpdateUnixTimestamp: number;
+    };
+} | {
+    adrena: {
+        previousTotalFees: BN;
+    };
+} | {
+    hyloLpToken: Record<string, never>;
+} | {
+    jupiterLend: {
+        padding: number[];
+    };
+} | {
+    kaminoVault: {
+        padding: number[];
+    };
+} | {
+    solstice: {
+        padding: number[];
+    };
 };
 export type InterfaceTypeGenericJson = {
     pyth: {
@@ -31,7 +58,72 @@ export type InterfaceTypeGenericJson = {
     fragmetric: Record<string, never>;
 } | {
     meteora: Record<string, never>;
+} | {
+    fragmetricSupportedAsset: Record<string, never>;
+} | {
+    sanctum: Record<string, never>;
+} | {
+    jupiterPerps: {
+        lastFeeUsdResetUnixTimestamp: string;
+        lastRealizedFeeUsd: string;
+        lastAumUsd: string;
+        lastRealizedFeeUsdUpdateUnixTimestamp: string;
+    };
+} | {
+    adrena: {
+        previousTotalFees: string;
+    };
+} | {
+    hyloLpToken: Record<string, never>;
+} | {
+    jupiterLend: {
+        padding: number[];
+    };
+} | {
+    kaminoVault: {
+        padding: number[];
+    };
+} | {
+    solstice: {
+        padding: number[];
+    };
 };
+/** Additional data that different interface types may need */
+export interface AdditionalDataGeneric {
+    fragmetricData?: {
+        receiptTokenMint: web3.PublicKey;
+        wrappedTokenMint: web3.PublicKey;
+    };
+    jupiterLendData?: {
+        baseTokenMint: web3.PublicKey;
+        tokenReservesLiquidity: web3.PublicKey;
+        lendingSupplyPosition: web3.PublicKey;
+        rewardsRateModel: web3.PublicKey;
+        rateModel: web3.PublicKey;
+    };
+    kaminoVaultData?: {
+        vault: web3.PublicKey;
+        reserves: {
+            reserveAddress: web3.PublicKey;
+            marketAddress: web3.PublicKey;
+        }[];
+        tokenVault: web3.PublicKey;
+        tokenMint: web3.PublicKey;
+        baseVaultAuthority: web3.PublicKey;
+        sharesMint: web3.PublicKey;
+    };
+}
+/** JSON version of additional data */
+export interface AdditionalDataGenericJson {
+    fragmetricData?: {
+        receiptTokenMint: string;
+        wrappedTokenMint: string;
+    };
+    jupiterLendData?: {
+        baseTokenMint: string;
+        tokenReservesLiquidity: string;
+    };
+}
 export interface Hook {
     enabled: boolean;
     interfaceEmissionsAccountsUntil: number;
@@ -51,16 +143,19 @@ export interface GenericSyState {
     account: GenericSyMetaAccount;
     tokenProgramBase: web3.PublicKey;
     syRate: number;
-    fragmetricData?: {
-        receiptTokenMint: web3.PublicKey;
-        wrappedTokenMint: web3.PublicKey;
-    };
+    additionalData?: AdditionalDataGeneric;
 }
 export interface GenericSyStateJson {
     selfAddress: string;
     account: GenericSyMetaAccountJson;
     tokenProgramBase: string;
     syRate: number;
+    additionalData?: AdditionalDataGenericJson;
+    /** @deprecated Use additionalData.fragmetricData instead */
+    fragmetricData?: {
+        receiptTokenMint: string;
+        wrappedTokenMint: string;
+    };
 }
 export interface GenericSyMetaAccountJson {
     mintSy: string;
@@ -107,3 +202,12 @@ 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 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;
+} | undefined;

package/build/generic.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromInterfaceTypeGenericJson = exports.toInterfaceTypeGenericJson = exports.deserializeGenericSyMetaAccountRaw = void 0;
+exports.getFragmetricDataFromAdditionalData = exports.fromAdditionalDataGenericJson = exports.toAdditionalDataGenericJson = exports.fromInterfaceTypeGenericJson = exports.toInterfaceTypeGenericJson = exports.deserializeGenericSyMetaAccountRaw = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 function deserializeGenericSyMetaAccountRaw(raw) {
     return {
@@ -34,6 +34,37 @@ function toInterfaceTypeGenericJson(interfaceType) {
             },
         };
     }
+    if ("jupiterPerps" in interfaceType) {
+        return {
+            jupiterPerps: {
+                lastFeeUsdResetUnixTimestamp: interfaceType.jupiterPerps.lastFeeUsdResetUnixTimestamp.toString(),
+                lastRealizedFeeUsd: interfaceType.jupiterPerps.lastRealizedFeeUsd.toString(),
+                lastAumUsd: interfaceType.jupiterPerps.lastAumUsd.toString(),
+                lastRealizedFeeUsdUpdateUnixTimestamp: interfaceType.jupiterPerps.lastRealizedFeeUsdUpdateUnixTimestamp.toString(),
+            },
+        };
+    }
+    if ("adrena" in interfaceType) {
+        return {
+            adrena: {
+                previousTotalFees: interfaceType.adrena.previousTotalFees.toString(),
+            },
+        };
+    }
+    if ("jupiterLend" in interfaceType) {
+        return {
+            jupiterLend: {
+                padding: interfaceType.jupiterLend.padding,
+            },
+        };
+    }
+    if ("kaminoVault" in interfaceType) {
+        return {
+            kaminoVault: {
+                padding: interfaceType.kaminoVault.padding,
+            },
+        };
+    }
     return interfaceType;
 }
 exports.toInterfaceTypeGenericJson = toInterfaceTypeGenericJson;
@@ -47,7 +78,69 @@ function fromInterfaceTypeGenericJson(json) {
             },
         };
     }
+    if ("jupiterPerps" in json) {
+        return {
+            jupiterPerps: {
+                lastFeeUsdResetUnixTimestamp: parseInt(json.jupiterPerps.lastFeeUsdResetUnixTimestamp),
+                lastRealizedFeeUsd: new anchor_1.BN(json.jupiterPerps.lastRealizedFeeUsd),
+                lastAumUsd: new anchor_1.BN(json.jupiterPerps.lastAumUsd),
+                lastRealizedFeeUsdUpdateUnixTimestamp: parseInt(json.jupiterPerps.lastRealizedFeeUsdUpdateUnixTimestamp),
+            },
+        };
+    }
+    if ("adrena" in json) {
+        return {
+            adrena: {
+                previousTotalFees: new anchor_1.BN(json.adrena.previousTotalFees),
+            },
+        };
+    }
+    if ("jupiterLend" in json) {
+        return {
+            jupiterLend: {
+                padding: json.jupiterLend.padding,
+            },
+        };
+    }
+    if ("kaminoVault" in json) {
+        return {
+            kaminoVault: {
+                padding: json.kaminoVault.padding,
+            },
+        };
+    }
     return json;
 }
 exports.fromInterfaceTypeGenericJson = fromInterfaceTypeGenericJson;
+/** Convert AdditionalDataGeneric to AdditionalDataGenericJson */
+function toAdditionalDataGenericJson(additionalData) {
+    const result = {};
+    if (additionalData.fragmetricData) {
+        result.fragmetricData = {
+            receiptTokenMint: additionalData.fragmetricData.receiptTokenMint.toString(),
+            wrappedTokenMint: additionalData.fragmetricData.wrappedTokenMint.toString(),
+        };
+    }
+    return result;
+}
+exports.toAdditionalDataGenericJson = toAdditionalDataGenericJson;
+/** Convert AdditionalDataGenericJson to AdditionalDataGeneric */
+function fromAdditionalDataGenericJson(json) {
+    const result = {};
+    if (json.fragmetricData) {
+        result.fragmetricData = {
+            receiptTokenMint: new anchor_1.web3.PublicKey(json.fragmetricData.receiptTokenMint),
+            wrappedTokenMint: new anchor_1.web3.PublicKey(json.fragmetricData.wrappedTokenMint),
+        };
+    }
+    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":";;;AAAA,8CAA4C;AA2H5C,SAAgB,kCAAkC,CAAC,GAA4B;IAC7E,OAAO;QACL,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;QACtC,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,IAAI,EAAE;YACJ,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO;YACzB,+BAA+B,EAAE,GAAG,CAAC,IAAI,CAAC,+BAA+B;YACzE,wBAAwB,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC;YACvE,2BAA2B,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC;YAC7E,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS;SAC9B;KACF,CAAA;AACH,CAAC;AApBD,gFAoBC;AAED,+DAA+D;AAC/D,SAAgB,0BAA0B,CAAC,aAAmC;IAC5E,IAAI,MAAM,IAAI,aAAa,EAAE,CAAC;QAC5B,OAAO;YACL,IAAI,EAAE;gBACJ,QAAQ,EAAE,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;gBAChD,iBAAiB,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE;aACnE;SACF,CAAA;IACH,CAAC;IACD,OAAO,aAAyC,CAAA;AAClD,CAAC;AAVD,gEAUC;AAED,+DAA+D;AAC/D,SAAgB,4BAA4B,CAAC,IAA8B;IACzE,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO;YACL,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI,WAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACpC,iBAAiB,EAAE,IAAI,WAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;aACvD;SACF,CAAA;IACH,CAAC;IACD,OAAO,IAA4B,CAAA;AACrC,CAAC;AAVD,oEAUC"}
+{"version":3,"file":"generic.js","sourceRoot":"","sources":["../src/generic.ts"],"names":[],"mappings":"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"}

package/build/kamino.d.ts

@@ -1,6 +1,6 @@
 import { BN } from "@coral-xyz/anchor";
 import { web3 } from "@coral-xyz/anchor";
-import { SyEmissionRaw, SyEmissionJson } from "./common";
+import { SyEmissionJson, SyEmissionRaw, SyEmissionRaw2 } from "./common";
 export interface KaminoSyState {
     selfAddress: web3.PublicKey;
     account: KaminoSyMetaAccount;
@@ -67,6 +67,6 @@ export interface KaminoSyMetaAccountRaw {
     max_sy_supply: BN;
     min_mint_size: BN;
     min_redeem_size: BN;
-    emissions: SyEmissionRaw[];
+    emissions: SyEmissionRaw2[];
 }
 export {};

package/build/trade.d.ts

@@ -13,7 +13,6 @@ export type Trade = {
     amountOutTokens: number;
     amountUsd: number;
     price: number;
-    date: number;
     kind: "buy" | "sell";
     annualizedYield: number;
     txHash: string;

package/build/vault.d.ts

@@ -117,6 +117,7 @@ export interface VaultEmission {
     tokenAccount: web3.PublicKey;
     initialIndex: AnchorizedPNum;
     lastSeenIndex: AnchorizedPNum;
+    finalIndex: AnchorizedPNum;
     treasuryTokenAccount: web3.PublicKey;
     feeBps: number;
     treasuryEmission: BN;
@@ -125,6 +126,7 @@ export interface VaultEmissionJson {
     tokenAccount: string;
     initialIndex: AnchorizedPNumJson;
     lastSeenIndex: AnchorizedPNumJson;
+    finalIndex: AnchorizedPNumJson;
     treasuryTokenAccount: string;
     feeBps: number;
     treasuryEmission: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exponent-labs/exponent-types",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "AGPL-3.0",
@@ -8,7 +8,7 @@
     "build": "tsc --build"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "0.30.1"
+    "@coral-xyz/anchor": "0.31.0"
   },
   "devDependencies": {
     "typescript": "5.4.5"

package/src/common.ts

@@ -11,6 +11,17 @@ export interface SyEmissionRaw {
   lastSeenIndex: AnchorizedPNum
 }
 
+export interface SyEmissionRaw2 {
+  mint: web3.PublicKey
+  index: AnchorizedPNum
+  last_seen_total_accrued_emissions: BN
+  total_claimed_emissions: BN
+  token_program: web3.PublicKey
+  escrow_account: web3.PublicKey
+  treasury_emission: BN
+  last_seen_index: AnchorizedPNum
+}
+
 export interface SyEmissionJson {
   mint: string
   tokenProgram: string

package/src/generic.ts

@@ -1,5 +1,6 @@
 import { BN, web3 } from "@coral-xyz/anchor"
-import { AnchorizedPNum, SyEmissionRaw, SyEmissionJson } from "./common"
+
+import { AnchorizedPNum, SyEmissionJson, SyEmissionRaw } from "./common"
 
 export type InterfaceTypeGeneric =
   | {
@@ -23,7 +24,40 @@ export type InterfaceTypeGeneric =
   | {
       fragmetricSupportedAsset: Record<string, never>
     }
-
+  | {
+      sanctum: Record<string, never>
+    }
+  | {
+      jupiterPerps: {
+        lastFeeUsdResetUnixTimestamp: number
+        lastRealizedFeeUsd: BN
+        lastAumUsd: BN
+        lastRealizedFeeUsdUpdateUnixTimestamp: number
+      }
+    }
+  | {
+      adrena: {
+        previousTotalFees: BN
+      }
+    }
+  | {
+      hyloLpToken: Record<string, never>
+    }
+  | {
+      jupiterLend: {
+        padding: number[]
+      }
+    }
+  | {
+      kaminoVault: {
+        padding: number[]
+      }
+    }
+  | {
+      solstice: {
+        padding: number[]
+      }
+    }
 export type InterfaceTypeGenericJson =
   | {
       pyth: {
@@ -43,6 +77,88 @@ export type InterfaceTypeGenericJson =
   | {
       meteora: Record<string, never>
     }
+  | {
+      fragmetricSupportedAsset: Record<string, never>
+    }
+  | {
+      sanctum: Record<string, never>
+    }
+  | {
+      jupiterPerps: {
+        lastFeeUsdResetUnixTimestamp: string
+        lastRealizedFeeUsd: string
+        lastAumUsd: string
+        lastRealizedFeeUsdUpdateUnixTimestamp: string
+      }
+    }
+  | {
+      adrena: {
+        previousTotalFees: string
+      }
+    }
+  | {
+      hyloLpToken: Record<string, never>
+    }
+  | {
+      jupiterLend: {
+        padding: number[]
+      }
+    }
+  | {
+      kaminoVault: {
+        padding: number[]
+      }
+    }
+  | {
+      solstice: {
+        padding: number[]
+      }
+    }
+/** Additional data that different interface types may need */
+export interface AdditionalDataGeneric {
+  fragmetricData?: {
+    receiptTokenMint: web3.PublicKey
+    wrappedTokenMint: web3.PublicKey
+  }
+  jupiterLendData?: {
+    baseTokenMint: web3.PublicKey
+    tokenReservesLiquidity: web3.PublicKey
+    lendingSupplyPosition: web3.PublicKey
+    rewardsRateModel: web3.PublicKey
+    rateModel: web3.PublicKey
+  }
+  kaminoVaultData?: {
+    vault: web3.PublicKey
+    reserves: {
+      reserveAddress: web3.PublicKey
+      marketAddress: web3.PublicKey
+    }[]
+    tokenVault: web3.PublicKey
+    tokenMint: web3.PublicKey
+    baseVaultAuthority: web3.PublicKey
+    sharesMint: web3.PublicKey
+  }
+  // Add other interface-specific data here as needed
+  // meteoraData?: { ... }
+  // sanctumData?: { ... }
+  // adrenaData?: { ... }
+}
+
+/** JSON version of additional data */
+export interface AdditionalDataGenericJson {
+  fragmetricData?: {
+    receiptTokenMint: string
+    wrappedTokenMint: string
+  }
+  jupiterLendData?: {
+    baseTokenMint: string
+    tokenReservesLiquidity: string
+  }
+  // Add other interface-specific data here as needed
+  // meteoraData?: { ... }
+  // sanctumData?: { ... }
+  // adrenaData?: { ... }
+}
 
 export interface Hook {
   enabled: boolean
@@ -65,10 +181,7 @@ export interface GenericSyState {
   account: GenericSyMetaAccount
   tokenProgramBase: web3.PublicKey
   syRate: number
-  fragmetricData?: {
-    receiptTokenMint: web3.PublicKey
-    wrappedTokenMint: web3.PublicKey
-  }
+  additionalData?: AdditionalDataGeneric
 }
 
 export interface GenericSyStateJson {
@@ -76,6 +189,12 @@ export interface GenericSyStateJson {
   account: GenericSyMetaAccountJson
   tokenProgramBase: string
   syRate: number
+  additionalData?: AdditionalDataGenericJson
+  /** @deprecated Use additionalData.fragmetricData instead */
+  fragmetricData?: {
+    receiptTokenMint: string
+    wrappedTokenMint: string
+  }
 }
 
 export interface GenericSyMetaAccountJson {
@@ -153,6 +272,38 @@ export function toInterfaceTypeGenericJson(interfaceType: InterfaceTypeGeneric):
       },
     }
   }
+  if ("jupiterPerps" in interfaceType) {
+    return {
+      jupiterPerps: {
+        lastFeeUsdResetUnixTimestamp: interfaceType.jupiterPerps.lastFeeUsdResetUnixTimestamp.toString(),
+        lastRealizedFeeUsd: interfaceType.jupiterPerps.lastRealizedFeeUsd.toString(),
+        lastAumUsd: interfaceType.jupiterPerps.lastAumUsd.toString(),
+        lastRealizedFeeUsdUpdateUnixTimestamp:
+          interfaceType.jupiterPerps.lastRealizedFeeUsdUpdateUnixTimestamp.toString(),
+      },
+    }
+  }
+  if ("adrena" in interfaceType) {
+    return {
+      adrena: {
+        previousTotalFees: interfaceType.adrena.previousTotalFees.toString(),
+      },
+    }
+  }
+  if ("jupiterLend" in interfaceType) {
+    return {
+      jupiterLend: {
+        padding: interfaceType.jupiterLend.padding,
+      },
+    }
+  }
+  if ("kaminoVault" in interfaceType) {
+    return {
+      kaminoVault: {
+        padding: interfaceType.kaminoVault.padding,
+      },
+    }
+  }
   return interfaceType as InterfaceTypeGenericJson
 }
 
@@ -166,5 +317,76 @@ export function fromInterfaceTypeGenericJson(json: InterfaceTypeGenericJson): In
       },
     }
   }
+  if ("jupiterPerps" in json) {
+    return {
+      jupiterPerps: {
+        lastFeeUsdResetUnixTimestamp: parseInt(json.jupiterPerps.lastFeeUsdResetUnixTimestamp),
+        lastRealizedFeeUsd: new BN(json.jupiterPerps.lastRealizedFeeUsd),
+        lastAumUsd: new BN(json.jupiterPerps.lastAumUsd),
+        lastRealizedFeeUsdUpdateUnixTimestamp: parseInt(json.jupiterPerps.lastRealizedFeeUsdUpdateUnixTimestamp),
+      },
+    }
+  }
+  if ("adrena" in json) {
+    return {
+      adrena: {
+        previousTotalFees: new BN(json.adrena.previousTotalFees),
+      },
+    }
+  }
+  if ("jupiterLend" in json) {
+    return {
+      jupiterLend: {
+        padding: json.jupiterLend.padding,
+      },
+    }
+  }
+  if ("kaminoVault" in json) {
+    return {
+      kaminoVault: {
+        padding: json.kaminoVault.padding,
+      },
+    }
+  }
   return json as InterfaceTypeGeneric
 }
+
+/** Convert AdditionalDataGeneric to AdditionalDataGenericJson */
+export function toAdditionalDataGenericJson(additionalData: AdditionalDataGeneric): AdditionalDataGenericJson {
+  const result: AdditionalDataGenericJson = {}
+
+  if (additionalData.fragmetricData) {
+    result.fragmetricData = {
+      receiptTokenMint: additionalData.fragmetricData.receiptTokenMint.toString(),
+      wrappedTokenMint: additionalData.fragmetricData.wrappedTokenMint.toString(),
+    }
+  }
+
+  return result
+}
+
+/** Convert AdditionalDataGenericJson to AdditionalDataGeneric */
+export function fromAdditionalDataGenericJson(json: AdditionalDataGenericJson): AdditionalDataGeneric {
+  const result: AdditionalDataGeneric = {}
+
+  if (json.fragmetricData) {
+    result.fragmetricData = {
+      receiptTokenMint: new web3.PublicKey(json.fragmetricData.receiptTokenMint),
+      wrappedTokenMint: new web3.PublicKey(json.fragmetricData.wrappedTokenMint),
+    }
+  }
+
+  return result
+}
+
+/** Helper function to extract fragmetric data from additional data */
+export function getFragmetricDataFromAdditionalData(additionalData?: AdditionalDataGeneric):
+  | {
+      receiptTokenMint: web3.PublicKey
+      wrappedTokenMint: web3.PublicKey
+    }
+  | undefined {
+  if (!additionalData) return undefined
+
+  return additionalData.fragmetricData
+}

package/src/kamino.ts

@@ -1,6 +1,7 @@
 import { BN } from "@coral-xyz/anchor"
 import { web3 } from "@coral-xyz/anchor"
-import { SyEmissionRaw, SyEmissionJson } from "./common"
+
+import { SyEmissionJson, SyEmissionRaw, SyEmissionRaw2 } from "./common"
 
 export interface KaminoSyState {
   selfAddress: web3.PublicKey
@@ -72,5 +73,5 @@ export interface KaminoSyMetaAccountRaw {
   max_sy_supply: BN
   min_mint_size: BN
   min_redeem_size: BN
-  emissions: SyEmissionRaw[]
+  emissions: SyEmissionRaw2[]
 }

package/src/trade.ts

@@ -14,7 +14,6 @@ export type Trade = {
   amountOutTokens: number
   amountUsd: number
   price: number
-  date: number
   kind: "buy" | "sell"
   annualizedYield: number
   txHash: string

package/src/vault.ts

@@ -176,6 +176,7 @@ export interface VaultEmission {
   tokenAccount: web3.PublicKey
   initialIndex: AnchorizedPNum
   lastSeenIndex: AnchorizedPNum
+  finalIndex: AnchorizedPNum
   treasuryTokenAccount: web3.PublicKey
   feeBps: number
   treasuryEmission: BN
@@ -185,6 +186,7 @@ export interface VaultEmissionJson {
   tokenAccount: string
   initialIndex: AnchorizedPNumJson
   lastSeenIndex: AnchorizedPNumJson
+  finalIndex: AnchorizedPNumJson
   treasuryTokenAccount: string
   feeBps: number
   treasuryEmission: string