@epicentral/sos-sdk 0.10.0-beta → 0.10.1-beta

package/accounts/fetchers.ts

@@ -1,4 +1,6 @@
 import {
+  COLLATERAL_POOL_DISCRIMINATOR,
+  OPTION_POOL_DISCRIMINATOR,
   getCollateralPoolDecoder,
   getLenderPositionDecoder,
   getMarketDataAccountDecoder,
@@ -19,10 +21,74 @@ import {
   type WriterPosition,
 } from "../generated/accounts";
 import type { Address } from "@solana/kit";
+import bs58 from "bs58";
 import { toAddress } from "../client/program";
 import type { AddressLike, KitRpc } from "../client/types";
 
-async function fetchRawAccount(
+/** Anchor `CollateralPool`: discriminator + option_account (32) + collateral_mint (32), then collateral_vault. */
+const COLLATERAL_POOL_COLLATERAL_VAULT_OFFSET =
+  COLLATERAL_POOL_DISCRIMINATOR.length + 32 + 32;
+
+/** Sequential pubkeys before numeric fields (`option_pool` Anchor layout). */
+const OPTION_POOL_UNDERLYING_MINT_OFFSET =
+  OPTION_POOL_DISCRIMINATOR.length + 32 + 32 + 32;
+const OPTION_POOL_ESCROW_LONG_OFFSET = OPTION_POOL_UNDERLYING_MINT_OFFSET + 32;
+const OPTION_POOL_PREMIUM_VAULT_OFFSET = OPTION_POOL_ESCROW_LONG_OFFSET + 32;
+
+function discriminatorMatches(expected: Uint8Array, data: Uint8Array): boolean {
+  if (data.length < expected.length) return false;
+  for (let i = 0; i < expected.length; i++) {
+    if (data[i] !== expected[i]!) return false;
+  }
+  return true;
+}
+
+function collateralPoolDiscriminatorMatches(data: Uint8Array): boolean {
+  return discriminatorMatches(COLLATERAL_POOL_DISCRIMINATOR, data);
+}
+
+function optionPoolDiscriminatorMatches(data: Uint8Array): boolean {
+  return discriminatorMatches(OPTION_POOL_DISCRIMINATOR, data);
+}
+
+/**
+ * If full `OptionPool` decode fails, read the pubkey fields layout-traders need for resolving pool routes.
+ */
+export function decodeOptionPoolTradePubkeysFromRawData(data: Uint8Array): {
+  underlyingMint: Address;
+  escrowLongAccount: Address;
+  premiumVault: Address;
+} | undefined {
+  const end = OPTION_POOL_PREMIUM_VAULT_OFFSET + 32;
+  if (data.length < end) return undefined;
+  if (!optionPoolDiscriminatorMatches(data)) return undefined;
+  return {
+    underlyingMint: toAddress(
+      bs58.encode(data.subarray(OPTION_POOL_UNDERLYING_MINT_OFFSET, OPTION_POOL_UNDERLYING_MINT_OFFSET + 32)),
+    ),
+    escrowLongAccount: toAddress(
+      bs58.encode(data.subarray(OPTION_POOL_ESCROW_LONG_OFFSET, OPTION_POOL_ESCROW_LONG_OFFSET + 32)),
+    ),
+    premiumVault: toAddress(
+      bs58.encode(data.subarray(OPTION_POOL_PREMIUM_VAULT_OFFSET, OPTION_POOL_PREMIUM_VAULT_OFFSET + 32)),
+    ),
+  };
+}
+
+/**
+ * If full Codama decode fails (IDL / deployed account size mismatch), read `collateral_vault`
+ * from the fixed Anchor field order. This is sufficient for txs that only need vault + pool PDAs.
+ */
+export function decodeCollateralVaultFromCollateralPoolRawData(
+  data: Uint8Array
+): Address | undefined {
+  const end = COLLATERAL_POOL_COLLATERAL_VAULT_OFFSET + 32;
+  if (data.length < end) return undefined;
+  if (!collateralPoolDiscriminatorMatches(data)) return undefined;
+  return toAddress(bs58.encode(data.subarray(COLLATERAL_POOL_COLLATERAL_VAULT_OFFSET, end)));
+}
+
+export async function fetchAccountData(
   rpc: KitRpc,
   address: AddressLike
 ): Promise<Uint8Array | null> {
@@ -32,7 +98,7 @@ async function fetchRawAccount(
   const [data] = accountInfo.data;
   const binary = atob(data);
   const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
+  for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i)!;
   return bytes;
 }
 
@@ -41,9 +107,13 @@ async function decodeAccount<T>(
   address: AddressLike,
   decoder: { decode: (value: Uint8Array) => T }
 ): Promise<T | null> {
-  const data = await fetchRawAccount(rpc, address);
+  const data = await fetchAccountData(rpc, address);
   if (!data) return null;
-  return decoder.decode(data);
+  try {
+    return decoder.decode(data);
+  } catch {
+    return null;
+  }
 }
 
 export async function fetchOptionAccount(
@@ -148,21 +218,21 @@ export async function fetchOptionAccounts(
   for (let i = 0; i < keys.length; i++) {
     const accountInfo = infos[i];
     if (!accountInfo) {
-      result.set(keys[i], null);
+      result.set(keys[i]!, null);
       continue;
     }
     const [b64] = accountInfo.data;
     if (!b64) {
-      result.set(keys[i], null);
+      result.set(keys[i]!, null);
       continue;
     }
     const binary = atob(b64);
     const data = new Uint8Array(binary.length);
-    for (let j = 0; j < binary.length; j++) data[j] = binary.charCodeAt(j);
+    for (let j = 0; j < binary.length; j++) data[j] = binary.charCodeAt(j)!;
     try {
-      result.set(keys[i], optionDecoder.decode(data));
+      result.set(keys[i]!, optionDecoder.decode(data));
     } catch {
-      result.set(keys[i], null);
+      result.set(keys[i]!, null);
     }
   }
   return result;

package/accounts/list.ts

@@ -97,14 +97,20 @@ async function fetchAndDecodeProgramAccounts<T>(
     ? (response as Array<ProgramAccountResponse>)
     : (response as { value: Array<ProgramAccountResponse> }).value;
 
-  return rawAccounts.map(({ pubkey, account }) => {
+  const out: Array<ListedAccount<T>> = [];
+  for (const { pubkey, account } of rawAccounts) {
     const base64Data =
       Array.isArray(account.data) ? account.data[0] : account.data;
-    return {
-      address: pubkey,
-      data: decoder.decode(decodeBase64Data(base64Data)),
-    };
-  });
+    try {
+      out.push({
+        address: pubkey,
+        data: decoder.decode(decodeBase64Data(base64Data)),
+      });
+    } catch {
+      /** Skip malformed / IDL-size mismatches instead of throwing from getProgramAccounts. */
+    }
+  }
+  return out;
 }
 
 export async function fetchWriterPositionsByWriter(

package/accounts/resolve-option.ts

@@ -1,7 +1,12 @@
 import type { Address } from "@solana/kit";
 import { OptionType } from "../generated/types";
-import { toAddress } from "../client/program";
 import type { AddressLike, KitRpc } from "../client/types";
+import type { CollateralPool, OptionAccount, OptionPool } from "../generated/accounts";
+import {
+  getCollateralPoolDecoder,
+  getOptionAccountDecoder,
+  getOptionPoolDecoder,
+} from "../generated/accounts";
 import {
   deriveCollateralPoolPda,
   deriveLongMintPda,
@@ -11,7 +16,11 @@ import {
   deriveOptionPoolPda,
   deriveShortMintPda,
 } from "./pdas";
-import { fetchCollateralPool, fetchOptionAccount, fetchOptionPool } from "./fetchers";
+import {
+  decodeCollateralVaultFromCollateralPoolRawData,
+  decodeOptionPoolTradePubkeysFromRawData,
+  fetchAccountData,
+} from "./fetchers";
 
 export interface ResolveOptionAccountsParams {
   underlyingAsset: AddressLike;
@@ -34,9 +43,9 @@ export interface ResolvedOptionAccounts {
   escrowLongAccount?: Address;
   premiumVault?: Address;
   collateralVault?: Address;
-  optionPoolData?: Awaited<ReturnType<typeof fetchOptionPool>>;
-  optionAccountData?: Awaited<ReturnType<typeof fetchOptionAccount>>;
-  collateralPoolData?: Awaited<ReturnType<typeof fetchCollateralPool>>;
+  optionPoolData?: OptionPool;
+  optionAccountData?: OptionAccount;
+  collateralPoolData?: CollateralPool;
 }
 
 /**
@@ -76,27 +85,59 @@ export async function resolveOptionAccounts(
   };
 
   if (params.rpc) {
-    const [optionPoolFetched, optionAccountFetched, collateralPoolFetched] =
+    const optionPoolDecoder = getOptionPoolDecoder();
+    const optionAccountDecoder = getOptionAccountDecoder();
+    const collateralPoolDecoder = getCollateralPoolDecoder();
+    const [optionPoolBytes, optionAccountBytes, collateralPoolBytes] =
       await Promise.all([
-        fetchOptionPool(params.rpc, optionPool),
-        fetchOptionAccount(params.rpc, optionAccount),
-        fetchCollateralPool(params.rpc, collateralPool),
+        fetchAccountData(params.rpc, optionPool),
+        fetchAccountData(params.rpc, optionAccount),
+        fetchAccountData(params.rpc, collateralPool),
       ]);
 
-    if (optionPoolFetched) {
-      result.optionPoolData = optionPoolFetched;
-      result.escrowLongAccount = optionPoolFetched.escrowLongAccount;
-      result.premiumVault = optionPoolFetched.premiumVault;
-      result.underlyingMint = optionPoolFetched.underlyingMint;
+    if (optionPoolBytes) {
+      let optionPoolDecoded: OptionPool | null = null;
+      try {
+        optionPoolDecoded = optionPoolDecoder.decode(optionPoolBytes);
+      } catch {
+        optionPoolDecoded = null;
+      }
+      if (optionPoolDecoded) {
+        result.optionPoolData = optionPoolDecoded;
+        result.escrowLongAccount = optionPoolDecoded.escrowLongAccount;
+        result.premiumVault = optionPoolDecoded.premiumVault;
+        result.underlyingMint = optionPoolDecoded.underlyingMint;
+      } else {
+        const tradePubkeys =
+          decodeOptionPoolTradePubkeysFromRawData(optionPoolBytes);
+        if (tradePubkeys) {
+          result.escrowLongAccount = tradePubkeys.escrowLongAccount;
+          result.premiumVault = tradePubkeys.premiumVault;
+          result.underlyingMint = tradePubkeys.underlyingMint;
+        }
+      }
     }
 
-    if (optionAccountFetched) {
-      result.optionAccountData = optionAccountFetched;
+    if (optionAccountBytes) {
+      try {
+        result.optionAccountData = optionAccountDecoder.decode(optionAccountBytes);
+      } catch {
+        /* layout drift: PDAs remain valid; Greeks-only consumers see no OptionAccount snapshot */
+      }
     }
 
-    if (collateralPoolFetched) {
-      result.collateralPoolData = collateralPoolFetched;
-      result.collateralVault = collateralPoolFetched.collateralVault;
+    if (collateralPoolBytes) {
+      try {
+        const collateralPoolFetched = collateralPoolDecoder.decode(collateralPoolBytes);
+        result.collateralPoolData = collateralPoolFetched;
+        result.collateralVault = collateralPoolFetched.collateralVault;
+      } catch {
+        const vaultFallback =
+          decodeCollateralVaultFromCollateralPoolRawData(collateralPoolBytes);
+        if (vaultFallback) {
+          result.collateralVault = vaultFallback;
+        }
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epicentral/sos-sdk",
-  "version": "0.10.0-beta",
+  "version": "0.10.1-beta",
   "private": false,
   "description": "Solana Option Standard SDK. The frontend-first SDK for Native Options Trading on Solana. Created by Epicentral Labs.",
   "type": "module",