@epicentral/sos-sdk 0.5.0-alpha.8 → 0.6.1-alpha

package/generated/instructions/optionValidate.ts

@@ -59,7 +59,7 @@ export type OptionValidateInstruction<
   TProgram extends string = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
   TAccountOptionAccount extends string | AccountMeta<string> = string,
   TAccountMarketData extends string | AccountMeta<string> = string,
-  TAccountPriceUpdate extends string | AccountMeta<string> = string,
+  TAccountSwitchboardFeed extends string | AccountMeta<string> = string,
   TAccountAuthority extends string | AccountMeta<string> = string,
   TRemainingAccounts extends readonly AccountMeta<string>[] = [],
 > = Instruction<TProgram> &
@@ -72,9 +72,9 @@ export type OptionValidateInstruction<
       TAccountMarketData extends string
         ? ReadonlyAccount<TAccountMarketData>
         : TAccountMarketData,
-      TAccountPriceUpdate extends string
-        ? ReadonlyAccount<TAccountPriceUpdate>
-        : TAccountPriceUpdate,
+      TAccountSwitchboardFeed extends string
+        ? ReadonlyAccount<TAccountSwitchboardFeed>
+        : TAccountSwitchboardFeed,
       TAccountAuthority extends string
         ? ReadonlySignerAccount<TAccountAuthority> &
             AccountSignerMeta<TAccountAuthority>
@@ -134,13 +134,12 @@ export function getOptionValidateInstructionDataCodec(): FixedSizeCodec<
 export type OptionValidateInput<
   TAccountOptionAccount extends string = string,
   TAccountMarketData extends string = string,
-  TAccountPriceUpdate extends string = string,
+  TAccountSwitchboardFeed extends string = string,
   TAccountAuthority extends string = string,
 > = {
   optionAccount: Address<TAccountOptionAccount>;
   marketData: Address<TAccountMarketData>;
-  /** Pyth price update account (ownership validated by Anchor) */
-  priceUpdate: Address<TAccountPriceUpdate>;
+  switchboardFeed: Address<TAccountSwitchboardFeed>;
   authority: TransactionSigner<TAccountAuthority>;
   optionType: OptionValidateInstructionDataArgs["optionType"];
   strikePrice: OptionValidateInstructionDataArgs["strikePrice"];
@@ -151,14 +150,14 @@ export type OptionValidateInput<
 export function getOptionValidateInstruction<
   TAccountOptionAccount extends string,
   TAccountMarketData extends string,
-  TAccountPriceUpdate extends string,
+  TAccountSwitchboardFeed extends string,
   TAccountAuthority extends string,
   TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
 >(
   input: OptionValidateInput<
     TAccountOptionAccount,
     TAccountMarketData,
-    TAccountPriceUpdate,
+    TAccountSwitchboardFeed,
     TAccountAuthority
   >,
   config?: { programAddress?: TProgramAddress },
@@ -166,7 +165,7 @@ export function getOptionValidateInstruction<
   TProgramAddress,
   TAccountOptionAccount,
   TAccountMarketData,
-  TAccountPriceUpdate,
+  TAccountSwitchboardFeed,
   TAccountAuthority
 > {
   // Program address.
@@ -177,7 +176,10 @@ export function getOptionValidateInstruction<
   const originalAccounts = {
     optionAccount: { value: input.optionAccount ?? null, isWritable: true },
     marketData: { value: input.marketData ?? null, isWritable: false },
-    priceUpdate: { value: input.priceUpdate ?? null, isWritable: false },
+    switchboardFeed: {
+      value: input.switchboardFeed ?? null,
+      isWritable: false,
+    },
     authority: { value: input.authority ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<
@@ -193,7 +195,7 @@ export function getOptionValidateInstruction<
     accounts: [
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.marketData),
-      getAccountMeta(accounts.priceUpdate),
+      getAccountMeta(accounts.switchboardFeed),
       getAccountMeta(accounts.authority),
     ],
     data: getOptionValidateInstructionDataEncoder().encode(
@@ -204,7 +206,7 @@ export function getOptionValidateInstruction<
     TProgramAddress,
     TAccountOptionAccount,
     TAccountMarketData,
-    TAccountPriceUpdate,
+    TAccountSwitchboardFeed,
     TAccountAuthority
   >);
 }
@@ -217,8 +219,7 @@ export type ParsedOptionValidateInstruction<
   accounts: {
     optionAccount: TAccountMetas[0];
     marketData: TAccountMetas[1];
-    /** Pyth price update account (ownership validated by Anchor) */
-    priceUpdate: TAccountMetas[2];
+    switchboardFeed: TAccountMetas[2];
     authority: TAccountMetas[3];
   };
   data: OptionValidateInstructionData;
@@ -247,7 +248,7 @@ export function parseOptionValidateInstruction<
     accounts: {
       optionAccount: getNextAccount(),
       marketData: getNextAccount(),
-      priceUpdate: getNextAccount(),
+      switchboardFeed: getNextAccount(),
       authority: getNextAccount(),
     },
     data: getOptionValidateInstructionDataDecoder().decode(instruction.data),

package/generated/programs/optionProgram.ts

@@ -7,50 +7,13 @@
  */
 
 import {
-  assertIsInstructionWithAccounts,
   containsBytes,
   fixEncoderSize,
   getBytesEncoder,
   type Address,
-  type Instruction,
-  type InstructionWithData,
   type ReadonlyUint8Array,
 } from "@solana/kit";
 import {
-  parseAcceptAdminInstruction,
-  parseAutoExerciseAllExpiredInstruction,
-  parseAutoExerciseExpiredInstruction,
-  parseBorrowFromPoolInstruction,
-  parseBuyFromPoolInstruction,
-  parseClaimThetaInstruction,
-  parseCloseLongToPoolInstruction,
-  parseCloseOptionInstruction,
-  parseCreateEscrowV2Instruction,
-  parseDepositCollateralInstruction,
-  parseDepositToPositionInstruction,
-  parseInitCollateralPoolInstruction,
-  parseInitConfigInstruction,
-  parseInitializeMarketDataInstruction,
-  parseInitOptionPoolInstruction,
-  parseLiquidateWriterPositionInstruction,
-  parseOmlpCreateVaultInstruction,
-  parseOmlpUpdateMaxLeverageInstruction,
-  parseOmlpUpdateProtocolFeeInstruction,
-  parseOmlpUpdateSupplyLimitInstruction,
-  parseOptionExerciseInstruction,
-  parseOptionMintInstruction,
-  parseOptionValidateInstruction,
-  parseRepayPoolLoanFromCollateralInstruction,
-  parseRepayPoolLoanFromWalletInstruction,
-  parseRepayPoolLoanInstruction,
-  parseSettleMakerCollateralInstruction,
-  parseSyncWriterPositionInstruction,
-  parseTransferAdminInstruction,
-  parseUnwindWriterUnsoldInstruction,
-  parseUpdateImpliedVolatilityInstruction,
-  parseUpdateMarketDataInstruction,
-  parseWithdrawFromPositionInstruction,
-  parseWriteToPoolInstruction,
   type ParsedAcceptAdminInstruction,
   type ParsedAutoExerciseAllExpiredInstruction,
   type ParsedAutoExerciseExpiredInstruction,
@@ -88,7 +51,7 @@ import {
 } from "../instructions";
 
 export const OPTION_PROGRAM_PROGRAM_ADDRESS =
-  "AA1nq9oeALQRYoN6WJvmFw6oRuek5X4KfTr7vb1i2dMQ" as Address<"AA1nq9oeALQRYoN6WJvmFw6oRuek5X4KfTr7vb1i2dMQ">;
+  "ASTGCefQVGEQ79ZSC6d2G9oMqmn2dk1onb4N75Bc5djQ" as Address<"ASTGCefQVGEQ79ZSC6d2G9oMqmn2dk1onb4N75Bc5djQ">;
 
 export enum OptionProgramAccount {
   CollateralPool,
@@ -101,7 +64,6 @@ export enum OptionProgramAccount {
   OptionPool,
   PoolLoan,
   PositionAccount,
-  PriceUpdateV2,
   Vault,
   WriterPosition,
 }
@@ -220,17 +182,6 @@ export function identifyOptionProgramAccount(
   ) {
     return OptionProgramAccount.PositionAccount;
   }
-  if (
-    containsBytes(
-      data,
-      fixEncoderSize(getBytesEncoder(), 8).encode(
-        new Uint8Array([34, 241, 35, 99, 157, 126, 244, 205]),
-      ),
-      0,
-    )
-  ) {
-    return OptionProgramAccount.PriceUpdateV2;
-  }
   if (
     containsBytes(
       data,
@@ -679,7 +630,7 @@ export function identifyOptionProgramInstruction(
 }
 
 export type ParsedOptionProgramInstruction<
-  TProgram extends string = "AA1nq9oeALQRYoN6WJvmFw6oRuek5X4KfTr7vb1i2dMQ",
+  TProgram extends string = "ASTGCefQVGEQ79ZSC6d2G9oMqmn2dk1onb4N75Bc5djQ",
 > =
   | ({
       instructionType: OptionProgramInstruction.AcceptAdmin;
@@ -783,253 +734,3 @@ export type ParsedOptionProgramInstruction<
   | ({
       instructionType: OptionProgramInstruction.WriteToPool;
     } & ParsedWriteToPoolInstruction<TProgram>);
-
-export function parseOptionProgramInstruction<TProgram extends string>(
-  instruction: Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array>,
-): ParsedOptionProgramInstruction<TProgram> {
-  const instructionType = identifyOptionProgramInstruction(instruction);
-  switch (instructionType) {
-    case OptionProgramInstruction.AcceptAdmin: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.AcceptAdmin,
-        ...parseAcceptAdminInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.AutoExerciseAllExpired: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.AutoExerciseAllExpired,
-        ...parseAutoExerciseAllExpiredInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.AutoExerciseExpired: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.AutoExerciseExpired,
-        ...parseAutoExerciseExpiredInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.BorrowFromPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.BorrowFromPool,
-        ...parseBorrowFromPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.BuyFromPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.BuyFromPool,
-        ...parseBuyFromPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.ClaimTheta: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.ClaimTheta,
-        ...parseClaimThetaInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.CloseLongToPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.CloseLongToPool,
-        ...parseCloseLongToPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.CloseOption: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.CloseOption,
-        ...parseCloseOptionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.CreateEscrowV2: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.CreateEscrowV2,
-        ...parseCreateEscrowV2Instruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.DepositCollateral: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.DepositCollateral,
-        ...parseDepositCollateralInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.DepositToPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.DepositToPosition,
-        ...parseDepositToPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitCollateralPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitCollateralPool,
-        ...parseInitCollateralPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitConfig: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitConfig,
-        ...parseInitConfigInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitOptionPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitOptionPool,
-        ...parseInitOptionPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitializeMarketData: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitializeMarketData,
-        ...parseInitializeMarketDataInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.LiquidateWriterPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.LiquidateWriterPosition,
-        ...parseLiquidateWriterPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpCreateVault: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpCreateVault,
-        ...parseOmlpCreateVaultInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateMaxLeverage: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateMaxLeverage,
-        ...parseOmlpUpdateMaxLeverageInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateProtocolFee: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateProtocolFee,
-        ...parseOmlpUpdateProtocolFeeInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateSupplyLimit: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateSupplyLimit,
-        ...parseOmlpUpdateSupplyLimitInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OptionExercise: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OptionExercise,
-        ...parseOptionExerciseInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OptionMint: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OptionMint,
-        ...parseOptionMintInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OptionValidate: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OptionValidate,
-        ...parseOptionValidateInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.RepayPoolLoan: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.RepayPoolLoan,
-        ...parseRepayPoolLoanInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.RepayPoolLoanFromCollateral: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.RepayPoolLoanFromCollateral,
-        ...parseRepayPoolLoanFromCollateralInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.RepayPoolLoanFromWallet: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.RepayPoolLoanFromWallet,
-        ...parseRepayPoolLoanFromWalletInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.SettleMakerCollateral: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.SettleMakerCollateral,
-        ...parseSettleMakerCollateralInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.SyncWriterPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.SyncWriterPosition,
-        ...parseSyncWriterPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.TransferAdmin: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.TransferAdmin,
-        ...parseTransferAdminInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.UnwindWriterUnsold: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.UnwindWriterUnsold,
-        ...parseUnwindWriterUnsoldInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.UpdateImpliedVolatility: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.UpdateImpliedVolatility,
-        ...parseUpdateImpliedVolatilityInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.UpdateMarketData: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.UpdateMarketData,
-        ...parseUpdateMarketDataInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.WithdrawFromPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.WithdrawFromPosition,
-        ...parseWithdrawFromPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.WriteToPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.WriteToPool,
-        ...parseWriteToPoolInstruction(instruction),
-      };
-    }
-    default:
-      throw new Error(
-        `Unrecognized instruction type: ${instructionType as string}`,
-      );
-  }
-}

package/generated/types/index.ts

@@ -20,7 +20,5 @@ export * from "./poolLoanCreated";
 export * from "./poolLoanRepaid";
 export * from "./positionDeposited";
 export * from "./positionWithdrawn";
-export * from "./priceFeedMessage";
 export * from "./protocolFeeUpdated";
 export * from "./vaultCreated";
-export * from "./verificationLevel";

package/index.ts

@@ -30,6 +30,12 @@ export * from "./short/preflight";
 
 export * from "./omlp/builders";
 export * from "./omlp/service";
+export {
+  resolveSwitchboardFeedFromMarketData,
+  buildSwitchboardPullFeedUpdate,
+  type SwitchboardPullFeedLike,
+  type BuildSwitchboardPullFeedUpdateParams,
+} from "./oracle/switchboard";
 
 export {
   getWrapSOLInstructions,