@acta-markets/ts-sdk 0.0.19-beta → 0.0.21-beta

package/dist/generated/instructions/createMarket.js

@@ -39,11 +39,6 @@ export function getCreateMarketInstruction(input, config) {
         marketPda: { value: input.marketPda ?? null, isWritable: true },
         underlyingMint: { value: input.underlyingMint ?? null, isWritable: false },
         quoteMint: { value: input.quoteMint ?? null, isWritable: false },
-        underlyingMintAcc: {
-            value: input.underlyingMintAcc ?? null,
-            isWritable: false,
-        },
-        quoteMintAcc: { value: input.quoteMintAcc ?? null, isWritable: false },
         oracleUnderlying: {
             value: input.oracleUnderlying ?? null,
             isWritable: true,
@@ -67,8 +62,6 @@ export function getCreateMarketInstruction(input, config) {
             getAccountMeta(accounts.marketPda),
             getAccountMeta(accounts.underlyingMint),
             getAccountMeta(accounts.quoteMint),
-            getAccountMeta(accounts.underlyingMintAcc),
-            getAccountMeta(accounts.quoteMintAcc),
             getAccountMeta(accounts.oracleUnderlying),
             getAccountMeta(accounts.oracleQuote),
             getAccountMeta(accounts.systemProgram),
@@ -78,7 +71,7 @@ export function getCreateMarketInstruction(input, config) {
     });
 }
 export function parseCreateMarketInstruction(instruction) {
-    if (instruction.accounts.length < 10) {
+    if (instruction.accounts.length < 8) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -96,8 +89,6 @@ export function parseCreateMarketInstruction(instruction) {
             marketPda: getNextAccount(),
             underlyingMint: getNextAccount(),
             quoteMint: getNextAccount(),
-            underlyingMintAcc: getNextAccount(),
-            quoteMintAcc: getNextAccount(),
             oracleUnderlying: getNextAccount(),
             oracleQuote: getNextAccount(),
             systemProgram: getNextAccount(),

package/dist/generated/instructions/createOracle.d.ts

@@ -9,11 +9,10 @@ import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeC
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const CREATE_ORACLE_DISCRIMINATOR = 15;
 export declare function getCreateOracleDiscriminatorBytes(): ReadonlyUint8Array;
-export type CreateOracleInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountOraclePda extends string | AccountMeta<string> = string, TAccountMint extends string | AccountMeta<string> = string, TAccountMintAcc extends string | AccountMeta<string> = string, TAccountSystemProgram extends string | AccountMeta<string> = "11111111111111111111111111111111", TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+export type CreateOracleInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountOraclePda extends string | AccountMeta<string> = string, TAccountMint extends string | AccountMeta<string> = string, TAccountSystemProgram extends string | AccountMeta<string> = "11111111111111111111111111111111", TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
     TAccountAdmin extends string ? WritableSignerAccount<TAccountAdmin> & AccountSignerMeta<TAccountAdmin> : TAccountAdmin,
     TAccountOraclePda extends string ? WritableAccount<TAccountOraclePda> : TAccountOraclePda,
     TAccountMint extends string ? ReadonlyAccount<TAccountMint> : TAccountMint,
-    TAccountMintAcc extends string ? ReadonlyAccount<TAccountMintAcc> : TAccountMintAcc,
     TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
     ...TRemainingAccounts
 ]>;
@@ -33,15 +32,13 @@ export type CreateOracleInstructionDataArgs = {
 export declare function getCreateOracleInstructionDataEncoder(): FixedSizeEncoder<CreateOracleInstructionDataArgs>;
 export declare function getCreateOracleInstructionDataDecoder(): FixedSizeDecoder<CreateOracleInstructionData>;
 export declare function getCreateOracleInstructionDataCodec(): FixedSizeCodec<CreateOracleInstructionDataArgs, CreateOracleInstructionData>;
-export type CreateOracleInput<TAccountAdmin extends string = string, TAccountOraclePda extends string = string, TAccountMint extends string = string, TAccountMintAcc extends string = string, TAccountSystemProgram extends string = string> = {
+export type CreateOracleInput<TAccountAdmin extends string = string, TAccountOraclePda extends string = string, TAccountMint extends string = string, TAccountSystemProgram extends string = string> = {
     /** Protocol admin authority that pays rent */
     admin: TransactionSigner<TAccountAdmin>;
     /** Oracle PDA to create */
     oraclePda: Address<TAccountOraclePda>;
-    /** SPL mint this oracle prices */
+    /** SPL mint this oracle prices (also used for decimals + token program owner) */
     mint: Address<TAccountMint>;
-    /** Mint account (for decimals + token program owner) */
-    mintAcc: Address<TAccountMintAcc>;
     /** System program */
     systemProgram?: Address<TAccountSystemProgram>;
     oracleType: CreateOracleInstructionDataArgs["oracleType"];
@@ -49,9 +46,9 @@ export type CreateOracleInput<TAccountAdmin extends string = string, TAccountOra
     authority: CreateOracleInstructionDataArgs["authority"];
     feedId: CreateOracleInstructionDataArgs["feedId"];
 };
-export declare function getCreateOracleInstruction<TAccountAdmin extends string, TAccountOraclePda extends string, TAccountMint extends string, TAccountMintAcc extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: CreateOracleInput<TAccountAdmin, TAccountOraclePda, TAccountMint, TAccountMintAcc, TAccountSystemProgram>, config?: {
+export declare function getCreateOracleInstruction<TAccountAdmin extends string, TAccountOraclePda extends string, TAccountMint extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: CreateOracleInput<TAccountAdmin, TAccountOraclePda, TAccountMint, TAccountSystemProgram>, config?: {
     programAddress?: TProgramAddress;
-}): CreateOracleInstruction<TProgramAddress, TAccountAdmin, TAccountOraclePda, TAccountMint, TAccountMintAcc, TAccountSystemProgram>;
+}): CreateOracleInstruction<TProgramAddress, TAccountAdmin, TAccountOraclePda, TAccountMint, TAccountSystemProgram>;
 export type ParsedCreateOracleInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -59,12 +56,10 @@ export type ParsedCreateOracleInstruction<TProgram extends string = typeof ACTA_
         admin: TAccountMetas[0];
         /** Oracle PDA to create */
         oraclePda: TAccountMetas[1];
-        /** SPL mint this oracle prices */
+        /** SPL mint this oracle prices (also used for decimals + token program owner) */
         mint: TAccountMetas[2];
-        /** Mint account (for decimals + token program owner) */
-        mintAcc: TAccountMetas[3];
         /** System program */
-        systemProgram: TAccountMetas[4];
+        systemProgram: TAccountMetas[3];
     };
     data: CreateOracleInstructionData;
 };

package/dist/generated/instructions/createOracle.js

@@ -41,7 +41,6 @@ export function getCreateOracleInstruction(input, config) {
         admin: { value: input.admin ?? null, isWritable: true },
         oraclePda: { value: input.oraclePda ?? null, isWritable: true },
         mint: { value: input.mint ?? null, isWritable: false },
-        mintAcc: { value: input.mintAcc ?? null, isWritable: false },
         systemProgram: { value: input.systemProgram ?? null, isWritable: false },
     };
     const accounts = originalAccounts;
@@ -58,7 +57,6 @@ export function getCreateOracleInstruction(input, config) {
             getAccountMeta(accounts.admin),
             getAccountMeta(accounts.oraclePda),
             getAccountMeta(accounts.mint),
-            getAccountMeta(accounts.mintAcc),
             getAccountMeta(accounts.systemProgram),
         ],
         data: getCreateOracleInstructionDataEncoder().encode(args),
@@ -66,7 +64,7 @@ export function getCreateOracleInstruction(input, config) {
     });
 }
 export function parseCreateOracleInstruction(instruction) {
-    if (instruction.accounts.length < 5) {
+    if (instruction.accounts.length < 4) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -82,7 +80,6 @@ export function parseCreateOracleInstruction(instruction) {
             admin: getNextAccount(),
             oraclePda: getNextAccount(),
             mint: getNextAccount(),
-            mintAcc: getNextAccount(),
             systemProgram: getNextAccount(),
         },
         data: getCreateOracleInstructionDataDecoder().decode(instruction.data),

package/dist/generated/instructions/depositFundsToPosition.d.ts

@@ -9,15 +9,14 @@ import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeC
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const DEPOSIT_FUNDS_TO_POSITION_DISCRIMINATOR = 9;
 export declare function getDepositFundsToPositionDiscriminatorBytes(): ReadonlyUint8Array;
-export type DepositFundsToPositionInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMakerOwner extends string | AccountMeta<string> = string, TAccountMakerPda extends string | AccountMeta<string> = string, TAccountPositionPda extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountMakerFundingAta extends string | AccountMeta<string> = string, TAccountPosSettlementAta extends string | AccountMeta<string> = string, TAccountUnderlyingTokenProgram extends string | AccountMeta<string> = string, TAccountQuoteTokenProgram extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+export type DepositFundsToPositionInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMakerOwner extends string | AccountMeta<string> = string, TAccountMakerPda extends string | AccountMeta<string> = string, TAccountPositionPda extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountMakerFundingAta extends string | AccountMeta<string> = string, TAccountPosSettlementAta extends string | AccountMeta<string> = string, TAccountSettlementTokenProgram extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
     TAccountMakerOwner extends string ? ReadonlySignerAccount<TAccountMakerOwner> & AccountSignerMeta<TAccountMakerOwner> : TAccountMakerOwner,
     TAccountMakerPda extends string ? ReadonlyAccount<TAccountMakerPda> : TAccountMakerPda,
     TAccountPositionPda extends string ? WritableAccount<TAccountPositionPda> : TAccountPositionPda,
     TAccountMarketPda extends string ? ReadonlyAccount<TAccountMarketPda> : TAccountMarketPda,
     TAccountMakerFundingAta extends string ? WritableAccount<TAccountMakerFundingAta> : TAccountMakerFundingAta,
     TAccountPosSettlementAta extends string ? WritableAccount<TAccountPosSettlementAta> : TAccountPosSettlementAta,
-    TAccountUnderlyingTokenProgram extends string ? ReadonlyAccount<TAccountUnderlyingTokenProgram> : TAccountUnderlyingTokenProgram,
-    TAccountQuoteTokenProgram extends string ? ReadonlyAccount<TAccountQuoteTokenProgram> : TAccountQuoteTokenProgram,
+    TAccountSettlementTokenProgram extends string ? ReadonlyAccount<TAccountSettlementTokenProgram> : TAccountSettlementTokenProgram,
     ...TRemainingAccounts
 ]>;
 export type DepositFundsToPositionInstructionData = {
@@ -27,7 +26,7 @@ export type DepositFundsToPositionInstructionDataArgs = {};
 export declare function getDepositFundsToPositionInstructionDataEncoder(): FixedSizeEncoder<DepositFundsToPositionInstructionDataArgs>;
 export declare function getDepositFundsToPositionInstructionDataDecoder(): FixedSizeDecoder<DepositFundsToPositionInstructionData>;
 export declare function getDepositFundsToPositionInstructionDataCodec(): FixedSizeCodec<DepositFundsToPositionInstructionDataArgs, DepositFundsToPositionInstructionData>;
-export type DepositFundsToPositionInput<TAccountMakerOwner extends string = string, TAccountMakerPda extends string = string, TAccountPositionPda extends string = string, TAccountMarketPda extends string = string, TAccountMakerFundingAta extends string = string, TAccountPosSettlementAta extends string = string, TAccountUnderlyingTokenProgram extends string = string, TAccountQuoteTokenProgram extends string = string> = {
+export type DepositFundsToPositionInput<TAccountMakerOwner extends string = string, TAccountMakerPda extends string = string, TAccountPositionPda extends string = string, TAccountMarketPda extends string = string, TAccountMakerFundingAta extends string = string, TAccountPosSettlementAta extends string = string, TAccountSettlementTokenProgram extends string = string> = {
     /** Maker owner authority */
     makerOwner: TransactionSigner<TAccountMakerOwner>;
     /** Maker PDA for ownership check */
@@ -40,14 +39,12 @@ export type DepositFundsToPositionInput<TAccountMakerOwner extends string = stri
     makerFundingAta: Address<TAccountMakerFundingAta>;
     /** Position settlement ATA */
     posSettlementAta: Address<TAccountPosSettlementAta>;
-    /** Token program for underlying mint */
-    underlyingTokenProgram: Address<TAccountUnderlyingTokenProgram>;
-    /** Token program for quote mint */
-    quoteTokenProgram: Address<TAccountQuoteTokenProgram>;
+    /** Token program for the settlement mint */
+    settlementTokenProgram: Address<TAccountSettlementTokenProgram>;
 };
-export declare function getDepositFundsToPositionInstruction<TAccountMakerOwner extends string, TAccountMakerPda extends string, TAccountPositionPda extends string, TAccountMarketPda extends string, TAccountMakerFundingAta extends string, TAccountPosSettlementAta extends string, TAccountUnderlyingTokenProgram extends string, TAccountQuoteTokenProgram extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: DepositFundsToPositionInput<TAccountMakerOwner, TAccountMakerPda, TAccountPositionPda, TAccountMarketPda, TAccountMakerFundingAta, TAccountPosSettlementAta, TAccountUnderlyingTokenProgram, TAccountQuoteTokenProgram>, config?: {
+export declare function getDepositFundsToPositionInstruction<TAccountMakerOwner extends string, TAccountMakerPda extends string, TAccountPositionPda extends string, TAccountMarketPda extends string, TAccountMakerFundingAta extends string, TAccountPosSettlementAta extends string, TAccountSettlementTokenProgram extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: DepositFundsToPositionInput<TAccountMakerOwner, TAccountMakerPda, TAccountPositionPda, TAccountMarketPda, TAccountMakerFundingAta, TAccountPosSettlementAta, TAccountSettlementTokenProgram>, config?: {
     programAddress?: TProgramAddress;
-}): DepositFundsToPositionInstruction<TProgramAddress, TAccountMakerOwner, TAccountMakerPda, TAccountPositionPda, TAccountMarketPda, TAccountMakerFundingAta, TAccountPosSettlementAta, TAccountUnderlyingTokenProgram, TAccountQuoteTokenProgram>;
+}): DepositFundsToPositionInstruction<TProgramAddress, TAccountMakerOwner, TAccountMakerPda, TAccountPositionPda, TAccountMarketPda, TAccountMakerFundingAta, TAccountPosSettlementAta, TAccountSettlementTokenProgram>;
 export type ParsedDepositFundsToPositionInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -63,10 +60,8 @@ export type ParsedDepositFundsToPositionInstruction<TProgram extends string = ty
         makerFundingAta: TAccountMetas[4];
         /** Position settlement ATA */
         posSettlementAta: TAccountMetas[5];
-        /** Token program for underlying mint */
-        underlyingTokenProgram: TAccountMetas[6];
-        /** Token program for quote mint */
-        quoteTokenProgram: TAccountMetas[7];
+        /** Token program for the settlement mint */
+        settlementTokenProgram: TAccountMetas[6];
     };
     data: DepositFundsToPositionInstructionData;
 };

package/dist/generated/instructions/depositFundsToPosition.js

@@ -38,12 +38,8 @@ export function getDepositFundsToPositionInstruction(input, config) {
             value: input.posSettlementAta ?? null,
             isWritable: true,
         },
-        underlyingTokenProgram: {
-            value: input.underlyingTokenProgram ?? null,
-            isWritable: false,
-        },
-        quoteTokenProgram: {
-            value: input.quoteTokenProgram ?? null,
+        settlementTokenProgram: {
+            value: input.settlementTokenProgram ?? null,
             isWritable: false,
         },
     };
@@ -57,15 +53,14 @@ export function getDepositFundsToPositionInstruction(input, config) {
             getAccountMeta(accounts.marketPda),
             getAccountMeta(accounts.makerFundingAta),
             getAccountMeta(accounts.posSettlementAta),
-            getAccountMeta(accounts.underlyingTokenProgram),
-            getAccountMeta(accounts.quoteTokenProgram),
+            getAccountMeta(accounts.settlementTokenProgram),
         ],
         data: getDepositFundsToPositionInstructionDataEncoder().encode({}),
         programAddress,
     });
 }
 export function parseDepositFundsToPositionInstruction(instruction) {
-    if (instruction.accounts.length < 8) {
+    if (instruction.accounts.length < 7) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -84,8 +79,7 @@ export function parseDepositFundsToPositionInstruction(instruction) {
             marketPda: getNextAccount(),
             makerFundingAta: getNextAccount(),
             posSettlementAta: getNextAccount(),
-            underlyingTokenProgram: getNextAccount(),
-            quoteTokenProgram: getNextAccount(),
+            settlementTokenProgram: getNextAccount(),
         },
         data: getDepositFundsToPositionInstructionDataDecoder().decode(instruction.data),
     };

package/dist/generated/instructions/finalizeMarket.d.ts

@@ -9,13 +9,12 @@ import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeC
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const FINALIZE_MARKET_DISCRIMINATOR = 8;
 export declare function getFinalizeMarketDiscriminatorBytes(): ReadonlyUint8Array;
-export type FinalizeMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountConfigPda extends string | AccountMeta<string> = string, TAccountOracleUnderlying extends string | AccountMeta<string> = string, TAccountOracleQuote extends string | AccountMeta<string> = string, TAccountClockSysvar extends string | AccountMeta<string> = "SysvarC1ock11111111111111111111111111111111", TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+export type FinalizeMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountConfigPda extends string | AccountMeta<string> = string, TAccountOracleUnderlying extends string | AccountMeta<string> = string, TAccountOracleQuote extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
     TAccountAdmin extends string ? ReadonlySignerAccount<TAccountAdmin> & AccountSignerMeta<TAccountAdmin> : TAccountAdmin,
     TAccountMarketPda extends string ? WritableAccount<TAccountMarketPda> : TAccountMarketPda,
     TAccountConfigPda extends string ? ReadonlyAccount<TAccountConfigPda> : TAccountConfigPda,
     TAccountOracleUnderlying extends string ? ReadonlyAccount<TAccountOracleUnderlying> : TAccountOracleUnderlying,
     TAccountOracleQuote extends string ? ReadonlyAccount<TAccountOracleQuote> : TAccountOracleQuote,
-    TAccountClockSysvar extends string ? ReadonlyAccount<TAccountClockSysvar> : TAccountClockSysvar,
     ...TRemainingAccounts
 ]>;
 export type FinalizeMarketInstructionData = {
@@ -25,7 +24,7 @@ export type FinalizeMarketInstructionDataArgs = {};
 export declare function getFinalizeMarketInstructionDataEncoder(): FixedSizeEncoder<FinalizeMarketInstructionDataArgs>;
 export declare function getFinalizeMarketInstructionDataDecoder(): FixedSizeDecoder<FinalizeMarketInstructionData>;
 export declare function getFinalizeMarketInstructionDataCodec(): FixedSizeCodec<FinalizeMarketInstructionDataArgs, FinalizeMarketInstructionData>;
-export type FinalizeMarketInput<TAccountAdmin extends string = string, TAccountMarketPda extends string = string, TAccountConfigPda extends string = string, TAccountOracleUnderlying extends string = string, TAccountOracleQuote extends string = string, TAccountClockSysvar extends string = string> = {
+export type FinalizeMarketInput<TAccountAdmin extends string = string, TAccountMarketPda extends string = string, TAccountConfigPda extends string = string, TAccountOracleUnderlying extends string = string, TAccountOracleQuote extends string = string> = {
     /** Protocol admin authority */
     admin: TransactionSigner<TAccountAdmin>;
     /** Market PDA to finalize */
@@ -36,12 +35,10 @@ export type FinalizeMarketInput<TAccountAdmin extends string = string, TAccountM
     oracleUnderlying: Address<TAccountOracleUnderlying>;
     /** Quote oracle PDA */
     oracleQuote: Address<TAccountOracleQuote>;
-    /** Clock sysvar account */
-    clockSysvar?: Address<TAccountClockSysvar>;
 };
-export declare function getFinalizeMarketInstruction<TAccountAdmin extends string, TAccountMarketPda extends string, TAccountConfigPda extends string, TAccountOracleUnderlying extends string, TAccountOracleQuote extends string, TAccountClockSysvar extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: FinalizeMarketInput<TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote, TAccountClockSysvar>, config?: {
+export declare function getFinalizeMarketInstruction<TAccountAdmin extends string, TAccountMarketPda extends string, TAccountConfigPda extends string, TAccountOracleUnderlying extends string, TAccountOracleQuote extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: FinalizeMarketInput<TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote>, config?: {
     programAddress?: TProgramAddress;
-}): FinalizeMarketInstruction<TProgramAddress, TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote, TAccountClockSysvar>;
+}): FinalizeMarketInstruction<TProgramAddress, TAccountAdmin, TAccountMarketPda, TAccountConfigPda, TAccountOracleUnderlying, TAccountOracleQuote>;
 export type ParsedFinalizeMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -55,8 +52,6 @@ export type ParsedFinalizeMarketInstruction<TProgram extends string = typeof ACT
         oracleUnderlying: TAccountMetas[3];
         /** Quote oracle PDA */
         oracleQuote: TAccountMetas[4];
-        /** Clock sysvar account */
-        clockSysvar: TAccountMetas[5];
     };
     data: FinalizeMarketInstructionData;
 };

package/dist/generated/instructions/finalizeMarket.js

@@ -34,14 +34,8 @@ export function getFinalizeMarketInstruction(input, config) {
             isWritable: false,
         },
         oracleQuote: { value: input.oracleQuote ?? null, isWritable: false },
-        clockSysvar: { value: input.clockSysvar ?? null, isWritable: false },
     };
     const accounts = originalAccounts;
-    // Resolve default values.
-    if (!accounts.clockSysvar.value) {
-        accounts.clockSysvar.value =
-            "SysvarC1ock11111111111111111111111111111111";
-    }
     const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
     return Object.freeze({
         accounts: [
@@ -50,14 +44,13 @@ export function getFinalizeMarketInstruction(input, config) {
             getAccountMeta(accounts.configPda),
             getAccountMeta(accounts.oracleUnderlying),
             getAccountMeta(accounts.oracleQuote),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getFinalizeMarketInstructionDataEncoder().encode({}),
         programAddress,
     });
 }
 export function parseFinalizeMarketInstruction(instruction) {
-    if (instruction.accounts.length < 6) {
+    if (instruction.accounts.length < 5) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -75,7 +68,6 @@ export function parseFinalizeMarketInstruction(instruction) {
             configPda: getNextAccount(),
             oracleUnderlying: getNextAccount(),
             oracleQuote: getNextAccount(),
-            clockSysvar: getNextAccount(),
         },
         data: getFinalizeMarketInstructionDataDecoder().decode(instruction.data),
     };

package/dist/generated/instructions/updateOraclePrice.d.ts

@@ -5,14 +5,13 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeCodec, type FixedSizeDecoder, type FixedSizeEncoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount } from "@solana/kit";
+import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeCodec, type FixedSizeDecoder, type FixedSizeEncoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount } from "@solana/kit";
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const UPDATE_ORACLE_PRICE_DISCRIMINATOR = 16;
 export declare function getUpdateOraclePriceDiscriminatorBytes(): ReadonlyUint8Array;
-export type UpdateOraclePriceInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAuthority extends string | AccountMeta<string> = string, TAccountOraclePda extends string | AccountMeta<string> = string, TAccountClockSysvar extends string | AccountMeta<string> = "SysvarC1ock11111111111111111111111111111111", TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+export type UpdateOraclePriceInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAuthority extends string | AccountMeta<string> = string, TAccountOraclePda extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
     TAccountAuthority extends string ? ReadonlySignerAccount<TAccountAuthority> & AccountSignerMeta<TAccountAuthority> : TAccountAuthority,
     TAccountOraclePda extends string ? WritableAccount<TAccountOraclePda> : TAccountOraclePda,
-    TAccountClockSysvar extends string ? ReadonlyAccount<TAccountClockSysvar> : TAccountClockSysvar,
     ...TRemainingAccounts
 ]>;
 export type UpdateOraclePriceInstructionData = {
@@ -27,19 +26,17 @@ export type UpdateOraclePriceInstructionDataArgs = {
 export declare function getUpdateOraclePriceInstructionDataEncoder(): FixedSizeEncoder<UpdateOraclePriceInstructionDataArgs>;
 export declare function getUpdateOraclePriceInstructionDataDecoder(): FixedSizeDecoder<UpdateOraclePriceInstructionData>;
 export declare function getUpdateOraclePriceInstructionDataCodec(): FixedSizeCodec<UpdateOraclePriceInstructionDataArgs, UpdateOraclePriceInstructionData>;
-export type UpdateOraclePriceInput<TAccountAuthority extends string = string, TAccountOraclePda extends string = string, TAccountClockSysvar extends string = string> = {
+export type UpdateOraclePriceInput<TAccountAuthority extends string = string, TAccountOraclePda extends string = string> = {
     /** Oracle authority signer (or protocol admin) */
     authority: TransactionSigner<TAccountAuthority>;
     /** Oracle PDA to update */
     oraclePda: Address<TAccountOraclePda>;
-    /** Clock sysvar account */
-    clockSysvar?: Address<TAccountClockSysvar>;
     price: UpdateOraclePriceInstructionDataArgs["price"];
     settledExpiryTs: UpdateOraclePriceInstructionDataArgs["settledExpiryTs"];
 };
-export declare function getUpdateOraclePriceInstruction<TAccountAuthority extends string, TAccountOraclePda extends string, TAccountClockSysvar extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: UpdateOraclePriceInput<TAccountAuthority, TAccountOraclePda, TAccountClockSysvar>, config?: {
+export declare function getUpdateOraclePriceInstruction<TAccountAuthority extends string, TAccountOraclePda extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: UpdateOraclePriceInput<TAccountAuthority, TAccountOraclePda>, config?: {
     programAddress?: TProgramAddress;
-}): UpdateOraclePriceInstruction<TProgramAddress, TAccountAuthority, TAccountOraclePda, TAccountClockSysvar>;
+}): UpdateOraclePriceInstruction<TProgramAddress, TAccountAuthority, TAccountOraclePda>;
 export type ParsedUpdateOraclePriceInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -47,8 +44,6 @@ export type ParsedUpdateOraclePriceInstruction<TProgram extends string = typeof
         authority: TAccountMetas[0];
         /** Oracle PDA to update */
         oraclePda: TAccountMetas[1];
-        /** Clock sysvar account */
-        clockSysvar: TAccountMetas[2];
     };
     data: UpdateOraclePriceInstructionData;
 };

package/dist/generated/instructions/updateOraclePrice.js

@@ -36,29 +36,22 @@ export function getUpdateOraclePriceInstruction(input, config) {
     const originalAccounts = {
         authority: { value: input.authority ?? null, isWritable: false },
         oraclePda: { value: input.oraclePda ?? null, isWritable: true },
-        clockSysvar: { value: input.clockSysvar ?? null, isWritable: false },
     };
     const accounts = originalAccounts;
     // Original args.
     const args = { ...input };
-    // Resolve default values.
-    if (!accounts.clockSysvar.value) {
-        accounts.clockSysvar.value =
-            "SysvarC1ock11111111111111111111111111111111";
-    }
     const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
     return Object.freeze({
         accounts: [
             getAccountMeta(accounts.authority),
             getAccountMeta(accounts.oraclePda),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getUpdateOraclePriceInstructionDataEncoder().encode(args),
         programAddress,
     });
 }
 export function parseUpdateOraclePriceInstruction(instruction) {
-    if (instruction.accounts.length < 3) {
+    if (instruction.accounts.length < 2) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -70,11 +63,7 @@ export function parseUpdateOraclePriceInstruction(instruction) {
     };
     return {
         programAddress: instruction.programAddress,
-        accounts: {
-            authority: getNextAccount(),
-            oraclePda: getNextAccount(),
-            clockSysvar: getNextAccount(),
-        },
+        accounts: { authority: getNextAccount(), oraclePda: getNextAccount() },
         data: getUpdateOraclePriceInstructionDataDecoder().decode(instruction.data),
     };
 }

package/dist/idl/acta_contract.json

@@ -344,7 +344,7 @@
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "Underlying SPL mint"
+                        "Underlying SPL mint (used for PDA seed and decimals)"
                     ]
                 },
                 {
@@ -352,23 +352,7 @@
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "Quote SPL mint"
-                    ]
-                },
-                {
-                    "name": "underlyingMintAcc",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Underlying mint account (for decimals)"
-                    ]
-                },
-                {
-                    "name": "quoteMintAcc",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Quote mint account (for decimals)"
+                        "Quote SPL mint (used for PDA seed and decimals)"
                     ]
                 },
                 {
@@ -617,14 +601,6 @@
                     "docs": [
                         "Quote oracle PDA"
                     ]
-                },
-                {
-                    "name": "clockSysvar",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Clock sysvar account"
-                    ]
                 }
             ],
             "args": [],
@@ -685,19 +661,11 @@
                     ]
                 },
                 {
-                    "name": "underlyingTokenProgram",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Token program for underlying mint"
-                    ]
-                },
-                {
-                    "name": "quoteTokenProgram",
+                    "name": "settlementTokenProgram",
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "Token program for quote mint"
+                        "Token program for the settlement mint"
                     ]
                 }
             ],
@@ -1063,15 +1031,7 @@
                     "isMut": false,
                     "isSigner": false,
                     "docs": [
-                        "SPL mint this oracle prices"
-                    ]
-                },
-                {
-                    "name": "mintAcc",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Mint account (for decimals + token program owner)"
+                        "SPL mint this oracle prices (also used for decimals + token program owner)"
                     ]
                 },
                 {
@@ -1129,14 +1089,6 @@
                     "docs": [
                         "Oracle PDA to update"
                     ]
-                },
-                {
-                    "name": "clockSysvar",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Clock sysvar account"
-                    ]
                 }
             ],
             "args": [
@@ -1251,14 +1203,6 @@
                     "docs": [
                         "Oracle PDA to close"
                     ]
-                },
-                {
-                    "name": "clockSysvar",
-                    "isMut": false,
-                    "isSigner": false,
-                    "docs": [
-                        "Clock sysvar account"
-                    ]
                 }
             ],
             "args": [],
@@ -2368,6 +2312,11 @@
             "code": 1076,
             "name": "MarketNotExpired",
             "msg": "Market has not expired yet"
+        },
+        {
+            "code": 1077,
+            "name": "OracleNotExpiredYet",
+            "msg": "Oracle has not expired yet (cannot update price before expiry)"
         }
     ]
 }

package/dist/idl/hash.d.ts

@@ -1 +1 @@
-export declare const ACTA_IDL_SHA256 = "8072bc43541635b8c359d8c0209c3ab63f6a264d6843997d20c9d6c9473130c9";
+export declare const ACTA_IDL_SHA256 = "2ccf0a77f682ff60b8201e2bca7f4bd026500a2fb9637d46dad7a8de3b2ee313";

package/dist/idl/hash.js

@@ -1 +1 @@
-export const ACTA_IDL_SHA256 = "8072bc43541635b8c359d8c0209c3ab63f6a264d6843997d20c9d6c9473130c9";
+export const ACTA_IDL_SHA256 = "2ccf0a77f682ff60b8201e2bca7f4bd026500a2fb9637d46dad7a8de3b2ee313";

package/dist/ws/apy.d.ts

@@ -42,7 +42,7 @@ export declare function computeApyFromAmounts(args: {
     premiumPerUnderlying: number;
     /** for puts: strike price per 1 underlying (quote units) */
     strikePrice: number;
-    /** for calls: current spot price per 1 underlying (quote units) */
+    /** current spot price per 1 underlying (quote units), required for both calls and puts */
     spotPrice?: number;
     /** seconds to option expiry (market expiry, not RFQ TTL) */
     secondsToExpiry: number;

package/dist/ws/apy.js

@@ -50,17 +50,11 @@ export function computeApyFromAmounts(args) {
     if (!Number.isFinite(premPU) || premPU < 0)
         throw new Error("invalid premiumPerUnderlying");
     const premiumNotional = qty * premPU;
-    let collateralPerUnderlying;
-    if (args.positionType === "cash_secured_put") {
-        collateralPerUnderlying = args.strikePrice;
-    }
-    else {
-        collateralPerUnderlying = args.spotPrice ?? NaN;
-    }
+    // Collateral always valued at spot so APR is monotonic across strikes.
+    // On-chain collateral requirements are unchanged — display metric only.
+    const collateralPerUnderlying = args.spotPrice ?? NaN;
     if (!Number.isFinite(collateralPerUnderlying) || collateralPerUnderlying <= 0) {
-        throw new Error(args.positionType === "covered_call"
-            ? "spotPrice is required for covered_call yield"
-            : "invalid strikePrice");
+        throw new Error("spotPrice is required for yield calculation");
     }
     const collateralNotional = qty * collateralPerUnderlying;
     const termYield = termYieldFromNotionals({ premiumNotional, collateralNotional });