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

package/dist/chain/instructions.market.d.ts

@@ -23,7 +23,6 @@ export declare function buildFinalizeMarketIx(input: {
     premiumMint?: Address<string>;
     configPda?: Address<string>;
     marketPda?: Address<string>;
-    clockSysvar?: Address<string>;
 }): Promise<Instruction>;
 export declare function buildCloseMarketIx(input: {
     admin: Signerish;

package/dist/chain/instructions.market.js

@@ -3,7 +3,7 @@ import { getFinalizeMarketInstruction } from "../generated/instructions/finalize
 import { getCloseMarketInstruction } from "../generated/instructions/closeMarket";
 import { getActaProgramId } from "../index";
 import { findConfigPda, findMarketPda, findOraclePda } from "./helpers";
-import { CLOCK_SYSVAR_ID, toAddress, toPublicKey, toTxnSigner, } from "./instructions.shared";
+import { toAddress, toPublicKey, toTxnSigner, } from "./instructions.shared";
 export async function buildCreateMarketIx(input) {
     const configPda = input.configPda ??
         (input.premiumMint
@@ -18,8 +18,6 @@ export async function buildCreateMarketIx(input) {
             expiryTs: input.expiryTs,
             isPut: input.isPut,
         }));
-    const underlyingMintAcc = toAddress(input.underlyingMint);
-    const quoteMintAcc = toAddress(input.quoteMint);
     const oracleUnderlying = input.oracleUnderlying ??
         (await findOraclePda({
             mint: toAddress(input.underlyingMint),
@@ -36,8 +34,6 @@ export async function buildCreateMarketIx(input) {
         marketPda: toAddress(marketPda),
         underlyingMint: toAddress(input.underlyingMint),
         quoteMint: toAddress(input.quoteMint),
-        underlyingMintAcc,
-        quoteMintAcc,
         oracleUnderlying: toAddress(oracleUnderlying),
         oracleQuote: toAddress(oracleQuote),
         expiryTs: input.expiryTs,
@@ -74,7 +70,6 @@ export async function buildFinalizeMarketIx(input) {
         marketPda: toAddress(marketPda),
         oracleUnderlying: toAddress(oracleUnderlying),
         oracleQuote: toAddress(oracleQuote),
-        clockSysvar: toAddress(input.clockSysvar ?? CLOCK_SYSVAR_ID),
     }, { programAddress: getActaProgramId() });
 }
 export async function buildCloseMarketIx(input) {

package/dist/chain/instructions.oracle.d.ts

@@ -8,7 +8,6 @@ export declare function buildCreateOracleIx(input: {
     authority: Address<string>;
     feedId: Uint8Array;
     oraclePda?: Address<string>;
-    mintAcc?: Address<string>;
     systemProgram?: Address<string>;
 }): Promise<Instruction>;
 export declare function buildUpdateOraclePriceIx(input: {
@@ -16,7 +15,6 @@ export declare function buildUpdateOraclePriceIx(input: {
     oraclePda: Address<string>;
     price: bigint | number;
     settledExpiryTs: bigint | number;
-    clockSysvar?: Address<string>;
 }): Promise<Instruction>;
 export declare function buildChangeOracleSourceIx(input: {
     admin: Signerish;
@@ -27,7 +25,6 @@ export declare function buildChangeOracleSourceIx(input: {
 export declare function buildCloseOracleIx(input: {
     signer: Signerish;
     oraclePda: Address<string>;
-    clockSysvar?: Address<string>;
 }): Promise<Instruction>;
 export declare function buildSetOracleConfigIx(input: {
     admin: Signerish;

package/dist/chain/instructions.oracle.js

@@ -5,19 +5,17 @@ import { getCloseOracleInstruction } from "../generated/instructions/closeOracle
 import { getSetOracleConfigInstruction } from "../generated/instructions/setOracleConfig";
 import { getActaProgramId } from "../index";
 import { findOraclePda } from "./helpers";
-import { CLOCK_SYSVAR_ID, toAddress, toTxnSigner, } from "./instructions.shared";
+import { toAddress, toTxnSigner, } from "./instructions.shared";
 export async function buildCreateOracleIx(input) {
     const oraclePda = input.oraclePda ??
         (await findOraclePda({
             mint: toAddress(input.mint),
             expiryTs: input.expiryTs,
         }));
-    const mintAcc = input.mintAcc ?? toAddress(input.mint);
     return getCreateOracleInstruction({
         admin: toTxnSigner(input.admin, "admin"),
         oraclePda: toAddress(oraclePda),
         mint: toAddress(input.mint),
-        mintAcc: toAddress(mintAcc),
         systemProgram: input.systemProgram
             ? toAddress(input.systemProgram)
             : undefined,
@@ -31,7 +29,6 @@ export async function buildUpdateOraclePriceIx(input) {
     return getUpdateOraclePriceInstruction({
         authority: toTxnSigner(input.authority, "authority"),
         oraclePda: toAddress(input.oraclePda),
-        clockSysvar: toAddress(input.clockSysvar ?? CLOCK_SYSVAR_ID),
         price: input.price,
         settledExpiryTs: input.settledExpiryTs,
     }, { programAddress: getActaProgramId() });
@@ -48,7 +45,6 @@ export async function buildCloseOracleIx(input) {
     return getCloseOracleInstruction({
         signer: toTxnSigner(input.signer, "signer"),
         oraclePda: toAddress(input.oraclePda),
-        clockSysvar: toAddress(input.clockSysvar ?? CLOCK_SYSVAR_ID),
     }, { programAddress: getActaProgramId() });
 }
 export async function buildSetOracleConfigIx(input) {

package/dist/chain/instructions.position.js

@@ -97,22 +97,15 @@ export async function buildDepositFundsToPositionIx(input) {
             expiryTs: input.expiryTs,
             isPut: input.isPut,
         }));
-    const underlyingTokenProgram = await resolveTokenProgramForMint({
-        mint: input.underlyingMint,
-        tokenProgram: input.underlyingTokenProgram ?? input.tokenProgram,
-        rpc: input.rpc,
-        label: "underlyingTokenProgram",
-    });
-    const quoteTokenProgram = await resolveTokenProgramForMint({
-        mint: input.quoteMint,
-        tokenProgram: input.quoteTokenProgram ?? input.tokenProgram,
+    const settlementMint = input.isPut ? input.underlyingMint : input.quoteMint;
+    const settlementTokenProgram = await resolveTokenProgramForMint({
+        mint: settlementMint,
+        tokenProgram: input.isPut
+            ? (input.underlyingTokenProgram ?? input.tokenProgram)
+            : (input.quoteTokenProgram ?? input.tokenProgram),
         rpc: input.rpc,
-        label: "quoteTokenProgram",
+        label: "settlementTokenProgram",
     });
-    const settlementMint = input.isPut ? input.underlyingMint : input.quoteMint;
-    const settlementTokenProgram = input.isPut
-        ? underlyingTokenProgram
-        : quoteTokenProgram;
     const makerFundingAta = input.makerFundingAta ??
         (await deriveAta({
             mint: settlementMint,
@@ -132,8 +125,7 @@ export async function buildDepositFundsToPositionIx(input) {
         marketPda: toAddress(marketPda),
         makerFundingAta: toAddress(makerFundingAta),
         posSettlementAta: toAddress(posSettlementAta),
-        underlyingTokenProgram,
-        quoteTokenProgram,
+        settlementTokenProgram,
     }, { programAddress: getActaProgramId() });
 }
 export async function buildSettlePositionIx(input) {

package/dist/chain/instructions.shared.d.ts

@@ -3,7 +3,6 @@ import type { createSolanaRpc } from "@solana/rpc";
 import { ASSOCIATED_TOKEN_PROGRAM_ID } from "./token";
 export type Signerish = Address<string> | TransactionSigner<string>;
 export type Rpc = ReturnType<typeof createSolanaRpc>;
-export declare const CLOCK_SYSVAR_ID: Address<string>;
 export declare const toAddress: (value: Address<string> | TransactionSigner<string>) => Address<string>;
 export declare const toTxnSigner: (value: Signerish, label?: string) => TransactionSigner<string>;
 export declare const toPublicKey: (value: Address<string>) => Address<string>;

package/dist/chain/instructions.shared.js

@@ -2,7 +2,6 @@ import { isTransactionSigner as kitIsTransactionSigner, } from "@solana/kit";
 import { getAddressEncoder, getProgramDerivedAddress } from "@solana/addresses";
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, fetchTokenProgramForMint, } from "./token";
 const addressEncoder = getAddressEncoder();
-export const CLOCK_SYSVAR_ID = "SysvarC1ock11111111111111111111111111111111";
 export const toAddress = (value) => typeof value === "string"
     ? value
     : value.address;

package/dist/cjs/chain/instructions.market.js

@@ -23,8 +23,6 @@ async function buildCreateMarketIx(input) {
             expiryTs: input.expiryTs,
             isPut: input.isPut,
         }));
-    const underlyingMintAcc = (0, instructions_shared_1.toAddress)(input.underlyingMint);
-    const quoteMintAcc = (0, instructions_shared_1.toAddress)(input.quoteMint);
     const oracleUnderlying = input.oracleUnderlying ??
         (await (0, helpers_1.findOraclePda)({
             mint: (0, instructions_shared_1.toAddress)(input.underlyingMint),
@@ -41,8 +39,6 @@ async function buildCreateMarketIx(input) {
         marketPda: (0, instructions_shared_1.toAddress)(marketPda),
         underlyingMint: (0, instructions_shared_1.toAddress)(input.underlyingMint),
         quoteMint: (0, instructions_shared_1.toAddress)(input.quoteMint),
-        underlyingMintAcc,
-        quoteMintAcc,
         oracleUnderlying: (0, instructions_shared_1.toAddress)(oracleUnderlying),
         oracleQuote: (0, instructions_shared_1.toAddress)(oracleQuote),
         expiryTs: input.expiryTs,
@@ -79,7 +75,6 @@ async function buildFinalizeMarketIx(input) {
         marketPda: (0, instructions_shared_1.toAddress)(marketPda),
         oracleUnderlying: (0, instructions_shared_1.toAddress)(oracleUnderlying),
         oracleQuote: (0, instructions_shared_1.toAddress)(oracleQuote),
-        clockSysvar: (0, instructions_shared_1.toAddress)(input.clockSysvar ?? instructions_shared_1.CLOCK_SYSVAR_ID),
     }, { programAddress: (0, index_1.getActaProgramId)() });
 }
 async function buildCloseMarketIx(input) {

package/dist/cjs/chain/instructions.oracle.js

@@ -19,12 +19,10 @@ async function buildCreateOracleIx(input) {
             mint: (0, instructions_shared_1.toAddress)(input.mint),
             expiryTs: input.expiryTs,
         }));
-    const mintAcc = input.mintAcc ?? (0, instructions_shared_1.toAddress)(input.mint);
     return (0, createOracle_1.getCreateOracleInstruction)({
         admin: (0, instructions_shared_1.toTxnSigner)(input.admin, "admin"),
         oraclePda: (0, instructions_shared_1.toAddress)(oraclePda),
         mint: (0, instructions_shared_1.toAddress)(input.mint),
-        mintAcc: (0, instructions_shared_1.toAddress)(mintAcc),
         systemProgram: input.systemProgram
             ? (0, instructions_shared_1.toAddress)(input.systemProgram)
             : undefined,
@@ -38,7 +36,6 @@ async function buildUpdateOraclePriceIx(input) {
     return (0, updateOraclePrice_1.getUpdateOraclePriceInstruction)({
         authority: (0, instructions_shared_1.toTxnSigner)(input.authority, "authority"),
         oraclePda: (0, instructions_shared_1.toAddress)(input.oraclePda),
-        clockSysvar: (0, instructions_shared_1.toAddress)(input.clockSysvar ?? instructions_shared_1.CLOCK_SYSVAR_ID),
         price: input.price,
         settledExpiryTs: input.settledExpiryTs,
     }, { programAddress: (0, index_1.getActaProgramId)() });
@@ -55,7 +52,6 @@ async function buildCloseOracleIx(input) {
     return (0, closeOracle_1.getCloseOracleInstruction)({
         signer: (0, instructions_shared_1.toTxnSigner)(input.signer, "signer"),
         oraclePda: (0, instructions_shared_1.toAddress)(input.oraclePda),
-        clockSysvar: (0, instructions_shared_1.toAddress)(input.clockSysvar ?? instructions_shared_1.CLOCK_SYSVAR_ID),
     }, { programAddress: (0, index_1.getActaProgramId)() });
 }
 async function buildSetOracleConfigIx(input) {

package/dist/cjs/chain/instructions.position.js

@@ -104,22 +104,15 @@ async function buildDepositFundsToPositionIx(input) {
             expiryTs: input.expiryTs,
             isPut: input.isPut,
         }));
-    const underlyingTokenProgram = await (0, instructions_shared_1.resolveTokenProgramForMint)({
-        mint: input.underlyingMint,
-        tokenProgram: input.underlyingTokenProgram ?? input.tokenProgram,
-        rpc: input.rpc,
-        label: "underlyingTokenProgram",
-    });
-    const quoteTokenProgram = await (0, instructions_shared_1.resolveTokenProgramForMint)({
-        mint: input.quoteMint,
-        tokenProgram: input.quoteTokenProgram ?? input.tokenProgram,
+    const settlementMint = input.isPut ? input.underlyingMint : input.quoteMint;
+    const settlementTokenProgram = await (0, instructions_shared_1.resolveTokenProgramForMint)({
+        mint: settlementMint,
+        tokenProgram: input.isPut
+            ? (input.underlyingTokenProgram ?? input.tokenProgram)
+            : (input.quoteTokenProgram ?? input.tokenProgram),
         rpc: input.rpc,
-        label: "quoteTokenProgram",
+        label: "settlementTokenProgram",
     });
-    const settlementMint = input.isPut ? input.underlyingMint : input.quoteMint;
-    const settlementTokenProgram = input.isPut
-        ? underlyingTokenProgram
-        : quoteTokenProgram;
     const makerFundingAta = input.makerFundingAta ??
         (await (0, instructions_shared_1.deriveAta)({
             mint: settlementMint,
@@ -139,8 +132,7 @@ async function buildDepositFundsToPositionIx(input) {
         marketPda: (0, instructions_shared_1.toAddress)(marketPda),
         makerFundingAta: (0, instructions_shared_1.toAddress)(makerFundingAta),
         posSettlementAta: (0, instructions_shared_1.toAddress)(posSettlementAta),
-        underlyingTokenProgram,
-        quoteTokenProgram,
+        settlementTokenProgram,
     }, { programAddress: (0, index_1.getActaProgramId)() });
 }
 async function buildSettlePositionIx(input) {

package/dist/cjs/chain/instructions.shared.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASSOCIATED_TOKEN_PROGRAM_ID = exports.toPublicKeyFromSignerish = exports.toPublicKey = exports.toTxnSigner = exports.toAddress = exports.CLOCK_SYSVAR_ID = void 0;
+exports.ASSOCIATED_TOKEN_PROGRAM_ID = exports.toPublicKeyFromSignerish = exports.toPublicKey = exports.toTxnSigner = exports.toAddress = void 0;
 exports.deriveAta = deriveAta;
 exports.resolveTokenProgramForMint = resolveTokenProgramForMint;
 const kit_1 = require("@solana/kit");
@@ -8,7 +8,6 @@ const addresses_1 = require("@solana/addresses");
 const token_1 = require("./token");
 Object.defineProperty(exports, "ASSOCIATED_TOKEN_PROGRAM_ID", { enumerable: true, get: function () { return token_1.ASSOCIATED_TOKEN_PROGRAM_ID; } });
 const addressEncoder = (0, addresses_1.getAddressEncoder)();
-exports.CLOCK_SYSVAR_ID = "SysvarC1ock11111111111111111111111111111111";
 const toAddress = (value) => typeof value === "string"
     ? value
     : value.address;

package/dist/cjs/generated/errors/actaContract.js

@@ -7,7 +7,7 @@
  * @see https://github.com/codama-idl/codama
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACTA_CONTRACT_ERROR__MARKET_NOT_EXPIRED = exports.ACTA_CONTRACT_ERROR__DUPLICATE_ACCOUNT = exports.ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS = exports.ACTA_CONTRACT_ERROR__ORACLE_SOURCE_LOCKED = exports.ACTA_CONTRACT_ERROR__ORACLE_ALREADY_UPDATED = exports.ACTA_CONTRACT_ERROR__ORACLE_CLOSE_TOO_EARLY = exports.ACTA_CONTRACT_ERROR__UNAUTHORIZED = exports.ACTA_CONTRACT_ERROR__INVALID_TIMESTAMP = exports.ACTA_CONTRACT_ERROR__INVALID_PROGRAM_ID = exports.ACTA_CONTRACT_ERROR__INSUFFICIENT_FUNDS = exports.ACTA_CONTRACT_ERROR__MINT_MISMATCH = exports.ACTA_CONTRACT_ERROR__MATH_OVERFLOW = exports.ACTA_CONTRACT_ERROR__INVALID_INSTRUCTION_DATA = exports.ACTA_CONTRACT_ERROR__SIGNED_MESSAGE_MISMATCH = exports.ACTA_CONTRACT_ERROR__SIGNER_MISMATCH = exports.ACTA_CONTRACT_ERROR__INVALID_SIGNATURE_COUNT = exports.ACTA_CONTRACT_ERROR__INVALID_ORDER_ID = exports.ACTA_CONTRACT_ERROR__CANNOT_LIQUIDATE_FUNDED = exports.ACTA_CONTRACT_ERROR__POSITION_TYPE_MISMATCH = exports.ACTA_CONTRACT_ERROR__POSITION_NOT_ITM = exports.ACTA_CONTRACT_ERROR__POSITION_ALREADY_SETTLED = exports.ACTA_CONTRACT_ERROR__POSITION_NOT_FUNDED = exports.ACTA_CONTRACT_ERROR__POSITION_ALREADY_FUNDED = exports.ACTA_CONTRACT_ERROR__POSITION_NOT_OPEN = exports.ACTA_CONTRACT_ERROR__POSITION_ALREADY_OPEN = exports.ACTA_CONTRACT_ERROR__ORACLE_INVALID_PRICE = exports.ACTA_CONTRACT_ERROR__ORACLE_INACTIVE = exports.ACTA_CONTRACT_ERROR__ORACLE_STALE = exports.ACTA_CONTRACT_ERROR__ORACLE_EXPIRY_MISMATCH = exports.ACTA_CONTRACT_ERROR__INVALID_ORACLE_ACCOUNT = exports.ACTA_CONTRACT_ERROR__INVALID_ORACLE_TYPE = exports.ACTA_CONTRACT_ERROR__MARKET_NOT_EMPTY = exports.ACTA_CONTRACT_ERROR__MARKET_EXPIRED = exports.ACTA_CONTRACT_ERROR__MARKET_NOT_FINALIZED = exports.ACTA_CONTRACT_ERROR__MARKET_FINALIZED = exports.ACTA_CONTRACT_ERROR__MAKER_NOT_OWNER = exports.ACTA_CONTRACT_ERROR__MAKER_NOT_REGISTERED = exports.ACTA_CONTRACT_ERROR__MAKER_ALREADY_REGISTERED = exports.ACTA_CONTRACT_ERROR__ACCOUNT_ALREADY_INITIALIZED = exports.ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_DATA = exports.ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_COUNT = exports.ACTA_CONTRACT_ERROR__ACCOUNT_NOT_INITIALIZED = exports.ACTA_CONTRACT_ERROR__INVALID_PDA = exports.ACTA_CONTRACT_ERROR__INVALID_OWNER = exports.ACTA_CONTRACT_ERROR__NOT_SIGNED = void 0;
+exports.ACTA_CONTRACT_ERROR__ORACLE_NOT_EXPIRED_YET = exports.ACTA_CONTRACT_ERROR__MARKET_NOT_EXPIRED = exports.ACTA_CONTRACT_ERROR__DUPLICATE_ACCOUNT = exports.ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS = exports.ACTA_CONTRACT_ERROR__ORACLE_SOURCE_LOCKED = exports.ACTA_CONTRACT_ERROR__ORACLE_ALREADY_UPDATED = exports.ACTA_CONTRACT_ERROR__ORACLE_CLOSE_TOO_EARLY = exports.ACTA_CONTRACT_ERROR__UNAUTHORIZED = exports.ACTA_CONTRACT_ERROR__INVALID_TIMESTAMP = exports.ACTA_CONTRACT_ERROR__INVALID_PROGRAM_ID = exports.ACTA_CONTRACT_ERROR__INSUFFICIENT_FUNDS = exports.ACTA_CONTRACT_ERROR__MINT_MISMATCH = exports.ACTA_CONTRACT_ERROR__MATH_OVERFLOW = exports.ACTA_CONTRACT_ERROR__INVALID_INSTRUCTION_DATA = exports.ACTA_CONTRACT_ERROR__SIGNED_MESSAGE_MISMATCH = exports.ACTA_CONTRACT_ERROR__SIGNER_MISMATCH = exports.ACTA_CONTRACT_ERROR__INVALID_SIGNATURE_COUNT = exports.ACTA_CONTRACT_ERROR__INVALID_ORDER_ID = exports.ACTA_CONTRACT_ERROR__CANNOT_LIQUIDATE_FUNDED = exports.ACTA_CONTRACT_ERROR__POSITION_TYPE_MISMATCH = exports.ACTA_CONTRACT_ERROR__POSITION_NOT_ITM = exports.ACTA_CONTRACT_ERROR__POSITION_ALREADY_SETTLED = exports.ACTA_CONTRACT_ERROR__POSITION_NOT_FUNDED = exports.ACTA_CONTRACT_ERROR__POSITION_ALREADY_FUNDED = exports.ACTA_CONTRACT_ERROR__POSITION_NOT_OPEN = exports.ACTA_CONTRACT_ERROR__POSITION_ALREADY_OPEN = exports.ACTA_CONTRACT_ERROR__ORACLE_INVALID_PRICE = exports.ACTA_CONTRACT_ERROR__ORACLE_INACTIVE = exports.ACTA_CONTRACT_ERROR__ORACLE_STALE = exports.ACTA_CONTRACT_ERROR__ORACLE_EXPIRY_MISMATCH = exports.ACTA_CONTRACT_ERROR__INVALID_ORACLE_ACCOUNT = exports.ACTA_CONTRACT_ERROR__INVALID_ORACLE_TYPE = exports.ACTA_CONTRACT_ERROR__MARKET_NOT_EMPTY = exports.ACTA_CONTRACT_ERROR__MARKET_EXPIRED = exports.ACTA_CONTRACT_ERROR__MARKET_NOT_FINALIZED = exports.ACTA_CONTRACT_ERROR__MARKET_FINALIZED = exports.ACTA_CONTRACT_ERROR__MAKER_NOT_OWNER = exports.ACTA_CONTRACT_ERROR__MAKER_NOT_REGISTERED = exports.ACTA_CONTRACT_ERROR__MAKER_ALREADY_REGISTERED = exports.ACTA_CONTRACT_ERROR__ACCOUNT_ALREADY_INITIALIZED = exports.ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_DATA = exports.ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_COUNT = exports.ACTA_CONTRACT_ERROR__ACCOUNT_NOT_INITIALIZED = exports.ACTA_CONTRACT_ERROR__INVALID_PDA = exports.ACTA_CONTRACT_ERROR__INVALID_OWNER = exports.ACTA_CONTRACT_ERROR__NOT_SIGNED = void 0;
 exports.getActaContractErrorMessage = getActaContractErrorMessage;
 exports.isActaContractError = isActaContractError;
 const kit_1 = require("@solana/kit");
@@ -102,6 +102,8 @@ exports.ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS = 0x432; // 1074
 exports.ACTA_CONTRACT_ERROR__DUPLICATE_ACCOUNT = 0x433; // 1075
 /** MarketNotExpired: Market has not expired yet */
 exports.ACTA_CONTRACT_ERROR__MARKET_NOT_EXPIRED = 0x434; // 1076
+/** OracleNotExpiredYet: Oracle has not expired yet (cannot update price before expiry) */
+exports.ACTA_CONTRACT_ERROR__ORACLE_NOT_EXPIRED_YET = 0x435; // 1077
 let actaContractErrorMessages;
 if (process.env.NODE_ENV !== "production") {
     actaContractErrorMessages = {
@@ -138,6 +140,7 @@ if (process.env.NODE_ENV !== "production") {
         [exports.ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS]: `Oracle is still linked to active markets`,
         [exports.ACTA_CONTRACT_ERROR__ORACLE_INACTIVE]: `Oracle inactive`,
         [exports.ACTA_CONTRACT_ERROR__ORACLE_INVALID_PRICE]: `Oracle price invalid (zero or negative)`,
+        [exports.ACTA_CONTRACT_ERROR__ORACLE_NOT_EXPIRED_YET]: `Oracle has not expired yet (cannot update price before expiry)`,
         [exports.ACTA_CONTRACT_ERROR__ORACLE_SOURCE_LOCKED]: `Oracle source fields are locked after first update`,
         [exports.ACTA_CONTRACT_ERROR__ORACLE_STALE]: `Oracle price is stale (updated_at before expiry)`,
         [exports.ACTA_CONTRACT_ERROR__POSITION_ALREADY_FUNDED]: `Position already funded by maker`,

package/dist/cjs/generated/instructions/closeOracle.js

@@ -37,27 +37,20 @@ function getCloseOracleInstruction(input, config) {
     const originalAccounts = {
         signer: { value: input.signer ?? null, isWritable: true },
         oraclePda: { value: input.oraclePda ?? null, isWritable: true },
-        clockSysvar: { value: input.clockSysvar ?? null, isWritable: false },
     };
     const accounts = originalAccounts;
-    // Resolve default values.
-    if (!accounts.clockSysvar.value) {
-        accounts.clockSysvar.value =
-            "SysvarC1ock11111111111111111111111111111111";
-    }
     const getAccountMeta = (0, shared_1.getAccountMetaFactory)(programAddress, "programId");
     return Object.freeze({
         accounts: [
             getAccountMeta(accounts.signer),
             getAccountMeta(accounts.oraclePda),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getCloseOracleInstructionDataEncoder().encode({}),
         programAddress,
     });
 }
 function parseCloseOracleInstruction(instruction) {
-    if (instruction.accounts.length < 3) {
+    if (instruction.accounts.length < 2) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -69,11 +62,7 @@ function parseCloseOracleInstruction(instruction) {
     };
     return {
         programAddress: instruction.programAddress,
-        accounts: {
-            signer: getNextAccount(),
-            oraclePda: getNextAccount(),
-            clockSysvar: getNextAccount(),
-        },
+        accounts: { signer: getNextAccount(), oraclePda: getNextAccount() },
         data: getCloseOracleInstructionDataDecoder().decode(instruction.data),
     };
 }

package/dist/cjs/generated/instructions/createMarket.js

@@ -48,11 +48,6 @@ 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,
@@ -76,8 +71,6 @@ 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),
@@ -87,7 +80,7 @@ function getCreateMarketInstruction(input, config) {
     });
 }
 function parseCreateMarketInstruction(instruction) {
-    if (instruction.accounts.length < 10) {
+    if (instruction.accounts.length < 8) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -105,8 +98,6 @@ function parseCreateMarketInstruction(instruction) {
             marketPda: getNextAccount(),
             underlyingMint: getNextAccount(),
             quoteMint: getNextAccount(),
-            underlyingMintAcc: getNextAccount(),
-            quoteMintAcc: getNextAccount(),
             oracleUnderlying: getNextAccount(),
             oracleQuote: getNextAccount(),
             systemProgram: getNextAccount(),

package/dist/cjs/generated/instructions/createOracle.js

@@ -50,7 +50,6 @@ 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;
@@ -67,7 +66,6 @@ function getCreateOracleInstruction(input, config) {
             getAccountMeta(accounts.admin),
             getAccountMeta(accounts.oraclePda),
             getAccountMeta(accounts.mint),
-            getAccountMeta(accounts.mintAcc),
             getAccountMeta(accounts.systemProgram),
         ],
         data: getCreateOracleInstructionDataEncoder().encode(args),
@@ -75,7 +73,7 @@ function getCreateOracleInstruction(input, config) {
     });
 }
 function parseCreateOracleInstruction(instruction) {
-    if (instruction.accounts.length < 5) {
+    if (instruction.accounts.length < 4) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -91,7 +89,6 @@ function parseCreateOracleInstruction(instruction) {
             admin: getNextAccount(),
             oraclePda: getNextAccount(),
             mint: getNextAccount(),
-            mintAcc: getNextAccount(),
             systemProgram: getNextAccount(),
         },
         data: getCreateOracleInstructionDataDecoder().decode(instruction.data),

package/dist/cjs/generated/instructions/depositFundsToPosition.js

@@ -47,12 +47,8 @@ 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,
         },
     };
@@ -66,15 +62,14 @@ 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,
     });
 }
 function parseDepositFundsToPositionInstruction(instruction) {
-    if (instruction.accounts.length < 8) {
+    if (instruction.accounts.length < 7) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -93,8 +88,7 @@ function parseDepositFundsToPositionInstruction(instruction) {
             marketPda: getNextAccount(),
             makerFundingAta: getNextAccount(),
             posSettlementAta: getNextAccount(),
-            underlyingTokenProgram: getNextAccount(),
-            quoteTokenProgram: getNextAccount(),
+            settlementTokenProgram: getNextAccount(),
         },
         data: getDepositFundsToPositionInstructionDataDecoder().decode(instruction.data),
     };

package/dist/cjs/generated/instructions/finalizeMarket.js

@@ -43,14 +43,8 @@ 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 = (0, shared_1.getAccountMetaFactory)(programAddress, "programId");
     return Object.freeze({
         accounts: [
@@ -59,14 +53,13 @@ function getFinalizeMarketInstruction(input, config) {
             getAccountMeta(accounts.configPda),
             getAccountMeta(accounts.oracleUnderlying),
             getAccountMeta(accounts.oracleQuote),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getFinalizeMarketInstructionDataEncoder().encode({}),
         programAddress,
     });
 }
 function parseFinalizeMarketInstruction(instruction) {
-    if (instruction.accounts.length < 6) {
+    if (instruction.accounts.length < 5) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -84,7 +77,6 @@ function parseFinalizeMarketInstruction(instruction) {
             configPda: getNextAccount(),
             oracleUnderlying: getNextAccount(),
             oracleQuote: getNextAccount(),
-            clockSysvar: getNextAccount(),
         },
         data: getFinalizeMarketInstructionDataDecoder().decode(instruction.data),
     };

package/dist/cjs/generated/instructions/updateOraclePrice.js

@@ -45,29 +45,22 @@ 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 = (0, shared_1.getAccountMetaFactory)(programAddress, "programId");
     return Object.freeze({
         accounts: [
             getAccountMeta(accounts.authority),
             getAccountMeta(accounts.oraclePda),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getUpdateOraclePriceInstructionDataEncoder().encode(args),
         programAddress,
     });
 }
 function parseUpdateOraclePriceInstruction(instruction) {
-    if (instruction.accounts.length < 3) {
+    if (instruction.accounts.length < 2) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -79,11 +72,7 @@ function parseUpdateOraclePriceInstruction(instruction) {
     };
     return {
         programAddress: instruction.programAddress,
-        accounts: {
-            authority: getNextAccount(),
-            oraclePda: getNextAccount(),
-            clockSysvar: getNextAccount(),
-        },
+        accounts: { authority: getNextAccount(), oraclePda: getNextAccount() },
         data: getUpdateOraclePriceInstructionDataDecoder().decode(instruction.data),
     };
 }