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

package/dist/cjs/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/cjs/idl/hash.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ACTA_IDL_SHA256 = void 0;
-exports.ACTA_IDL_SHA256 = "8072bc43541635b8c359d8c0209c3ab63f6a264d6843997d20c9d6c9473130c9";
+exports.ACTA_IDL_SHA256 = "2ccf0a77f682ff60b8201e2bca7f4bd026500a2fb9637d46dad7a8de3b2ee313";

package/dist/cjs/ws/apy.js

@@ -58,17 +58,11 @@ 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 });

package/dist/cjs/ws/apy.test.js

@@ -7,7 +7,7 @@ describe("ws apy helpers", () => {
             positionType: "covered_call",
             underlyingAmount: 10,
             spotPrice: 150,
-            strikePrice: 150, // not used for calls
+            strikePrice: 150, // not used for collateral, kept for API compat
             premiumPerUnderlying: 1.5,
             secondsToExpiry: 7 * 24 * 60 * 60,
         });
@@ -22,8 +22,44 @@ describe("ws apy helpers", () => {
             underlyingAmount: 10,
             grossPremiumPerUnit1e9: 1_500_000_000, // 1.5
             strike1e9: 150_000_000_000, // 150
+            spotPrice1e9: 150_000_000_000, // 150 (ATM)
             secondsToExpiry: 7 * 24 * 60 * 60,
         });
         expect(res.premiumNotional).toBeCloseTo(15, 10);
     });
+    it("put APR uses spot as collateral (not strike)", () => {
+        const spot = 150;
+        const strike = 120; // OTM put
+        const res = (0, apy_1.computeApyFromAmounts)({
+            positionType: "cash_secured_put",
+            underlyingAmount: 1,
+            spotPrice: spot,
+            strikePrice: strike,
+            premiumPerUnderlying: 1.5,
+            secondsToExpiry: 30 * 24 * 60 * 60,
+        });
+        // collateral should be spot-based, not strike-based
+        expect(res.collateralNotional).toBeCloseTo(spot, 10);
+    });
+    it("put APR is monotonically decreasing for OTM strikes", () => {
+        const spot1e9 = 150_000_000_000; // 150
+        const strikes = [140, 130, 120, 110].map(s => s * 1_000_000_000);
+        // Premiums decrease with OTM (roughly realistic)
+        const premiums = [5, 2.5, 1, 0.3].map(p => p * 1_000_000_000);
+        const aprs = strikes.map((strike, i) => {
+            const res = (0, apy_1.computeApyFromScaledPrices)({
+                positionType: "cash_secured_put",
+                underlyingAmount: 1,
+                grossPremiumPerUnit1e9: premiums[i],
+                strike1e9: strike,
+                spotPrice1e9: spot1e9,
+                secondsToExpiry: 30 * 24 * 60 * 60,
+            });
+            return res.apr;
+        });
+        // Each APR should be less than the previous
+        for (let i = 1; i < aprs.length; i++) {
+            expect(aprs[i]).toBeLessThan(aprs[i - 1]);
+        }
+    });
 });

package/dist/cjs/ws/client.js

@@ -110,8 +110,8 @@ class ActaWsClient extends TypedEventEmitter {
     pingTimer = null;
     shouldReconnect = true;
     subscribedChannels = new Set(["rfqs"]);
-    subscribedMarkets = new Set();
-    hasMarketScope = false;
+    underlyingMintScope = null; // null = all
+    quoteMintScope = null; // null = all
     marketDescriptorsByMarket = new Map();
     state = {
         stats: null,
@@ -339,6 +339,70 @@ class ActaWsClient extends TypedEventEmitter {
         });
         return requestId;
     }
+    /** Maker-only: get balances per deposited token (total, locked, available). */
+    getMakerBalances() {
+        this.ensureAuthenticated();
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMakerBalances",
+            data: { request_id: requestId },
+        });
+        return requestId;
+    }
+    /** Maker-only: get open positions with optional filters. */
+    getMakerPositions(args) {
+        this.ensureAuthenticated();
+        const requestId = this.nextRequestId();
+        const data = {
+            request_id: requestId,
+            ...args,
+        };
+        this.send({ type: "GetMakerPositions", data });
+        return requestId;
+    }
+    /** Maker-only: get trade history with keyset pagination. */
+    getMyTrades(args) {
+        this.ensureAuthenticated();
+        const requestId = this.nextRequestId();
+        const data = {
+            request_id: requestId,
+            ...args,
+        };
+        this.send({ type: "GetMyTrades", data });
+        return requestId;
+    }
+    /** Maker-only: get position, notional, and balance caps. */
+    getMyCaps() {
+        this.ensureAuthenticated();
+        const requestId = this.nextRequestId();
+        this.send({
+            type: "GetMyCaps",
+            data: { request_id: requestId },
+        });
+        return requestId;
+    }
+    /** Maker-only: get markets where maker has deposits, with optional filters and stats. */
+    getMarketsForMaker(args) {
+        this.ensureAuthenticated();
+        const requestId = this.nextRequestId();
+        const data = {
+            request_id: requestId,
+            ...args,
+        };
+        this.send({ type: "GetMarketsForMaker", data });
+        return requestId;
+    }
+    /** Maker-only: get submitted quotes with status. */
+    getMyQuotes(args) {
+        this.ensureAuthenticated();
+        const requestId = this.nextRequestId();
+        const data = {
+            request_id: requestId,
+            active_only: args?.active_only ?? true,
+        };
+        this.send({ type: "GetMyQuotes", data });
+        return requestId;
+    }
     logout() {
         this.send({ type: "Logout" });
     }
@@ -395,21 +459,25 @@ class ActaWsClient extends TypedEventEmitter {
         });
         return requestId;
     }
-    subscribe(channels, markets) {
+    subscribe(channels, opts) {
         this.ensureAuthenticated();
         const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.add(c);
-        if (markets) {
-            this.hasMarketScope = true;
-            this.subscribedMarkets = new Set(markets);
+        if (opts?.underlying_mints) {
+            this.underlyingMintScope = new Set(opts.underlying_mints);
         }
-        this.send({
-            type: "Subscribe",
-            data: this.hasMarketScope
-                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
-                : { request_id, channels },
-        });
+        if (opts?.quote_mints) {
+            this.quoteMintScope = new Set(opts.quote_mints);
+        }
+        const data = { request_id, channels };
+        if (this.underlyingMintScope) {
+            data.underlying_mints = Array.from(this.underlyingMintScope);
+        }
+        if (this.quoteMintScope) {
+            data.quote_mints = Array.from(this.quoteMintScope);
+        }
+        this.send({ type: "Subscribe", data });
         return request_id;
     }
     unsubscribe(channels) {
@@ -423,6 +491,58 @@ class ActaWsClient extends TypedEventEmitter {
         });
         return request_id;
     }
+    addMints(opts) {
+        this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
+        if (opts.underlying_mints) {
+            if (!this.underlyingMintScope)
+                this.underlyingMintScope = new Set();
+            for (const m of opts.underlying_mints)
+                this.underlyingMintScope.add(m);
+        }
+        if (opts.quote_mints) {
+            if (!this.quoteMintScope)
+                this.quoteMintScope = new Set();
+            for (const m of opts.quote_mints)
+                this.quoteMintScope.add(m);
+        }
+        this.send({ type: "AddMints", data: { request_id, ...opts } });
+        return request_id;
+    }
+    removeMints(opts) {
+        this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
+        if (opts.underlying_mints && this.underlyingMintScope) {
+            for (const m of opts.underlying_mints)
+                this.underlyingMintScope.delete(m);
+            if (this.underlyingMintScope.size === 0)
+                this.underlyingMintScope = null;
+        }
+        if (opts.quote_mints && this.quoteMintScope) {
+            for (const m of opts.quote_mints)
+                this.quoteMintScope.delete(m);
+            if (this.quoteMintScope.size === 0)
+                this.quoteMintScope = null;
+        }
+        this.send({ type: "RemoveMints", data: { request_id, ...opts } });
+        return request_id;
+    }
+    addChannels(channels) {
+        this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
+        for (const c of channels)
+            this.subscribedChannels.add(c);
+        this.send({ type: "AddChannels", data: { request_id, channels } });
+        return request_id;
+    }
+    removeChannels(channels) {
+        this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
+        for (const c of channels)
+            this.subscribedChannels.delete(c);
+        this.send({ type: "RemoveChannels", data: { request_id, channels } });
+        return request_id;
+    }
     ping() {
         if (this.ws?.readyState === WS_OPEN) {
             this.send({ type: "Ping" });
@@ -573,6 +693,21 @@ class ActaWsClient extends TypedEventEmitter {
             case "MyCaps":
                 this.emit("myCaps", message.data);
                 break;
+            case "MakerBalances":
+                this.emit("makerBalances", message.data);
+                break;
+            case "MakerPositions":
+                this.emit("makerPositions", message.data);
+                break;
+            case "MyTrades":
+                this.emit("myTrades", message.data);
+                break;
+            case "MakerMarkets":
+                this.emit("makerMarkets", message.data);
+                break;
+            case "MyQuotes":
+                this.emit("myQuotes", message.data);
+                break;
             case "MyActiveRfqs":
                 this.handleMyActiveRfqs(message.data);
                 break;
@@ -730,6 +865,18 @@ class ActaWsClient extends TypedEventEmitter {
             case "UnsubscribeAck":
                 this.emit("unsubscribeAck", message.data);
                 break;
+            case "SubscriptionUpdated":
+                {
+                    const d = message.data;
+                    // Sync local state from the server's authoritative response.
+                    this.subscribedChannels = new Set(d.channels);
+                    this.underlyingMintScope =
+                        d.underlying_mints != null ? new Set(d.underlying_mints) : null;
+                    this.quoteMintScope =
+                        d.quote_mints != null ? new Set(d.quote_mints) : null;
+                    this.emit("subscriptionUpdated", d);
+                }
+                break;
         }
     }
     /** Taker-only: request current indicative prices for a market + position_type. */
@@ -815,9 +962,13 @@ class ActaWsClient extends TypedEventEmitter {
         if (this.subscribedChannels.size > 0) {
             const channels = Array.from(this.subscribedChannels);
             const request_id = this.nextRequestId();
-            const data = this.hasMarketScope
-                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
-                : { request_id, channels };
+            const data = { request_id, channels };
+            if (this.underlyingMintScope) {
+                data.underlying_mints = Array.from(this.underlyingMintScope);
+            }
+            if (this.quoteMintScope) {
+                data.quote_mints = Array.from(this.quoteMintScope);
+            }
             this.send({ type: "Subscribe", data });
         }
     }

package/dist/generated/errors/actaContract.d.ts

@@ -96,7 +96,9 @@ export declare const ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS = 1074;
 export declare const ACTA_CONTRACT_ERROR__DUPLICATE_ACCOUNT = 1075;
 /** MarketNotExpired: Market has not expired yet */
 export declare const ACTA_CONTRACT_ERROR__MARKET_NOT_EXPIRED = 1076;
-export type ActaContractError = typeof ACTA_CONTRACT_ERROR__ACCOUNT_ALREADY_INITIALIZED | typeof ACTA_CONTRACT_ERROR__ACCOUNT_NOT_INITIALIZED | typeof ACTA_CONTRACT_ERROR__CANNOT_LIQUIDATE_FUNDED | typeof ACTA_CONTRACT_ERROR__DUPLICATE_ACCOUNT | typeof ACTA_CONTRACT_ERROR__INSUFFICIENT_FUNDS | typeof ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_COUNT | typeof ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_DATA | typeof ACTA_CONTRACT_ERROR__INVALID_INSTRUCTION_DATA | typeof ACTA_CONTRACT_ERROR__INVALID_ORACLE_ACCOUNT | typeof ACTA_CONTRACT_ERROR__INVALID_ORACLE_TYPE | typeof ACTA_CONTRACT_ERROR__INVALID_ORDER_ID | typeof ACTA_CONTRACT_ERROR__INVALID_OWNER | typeof ACTA_CONTRACT_ERROR__INVALID_PDA | typeof ACTA_CONTRACT_ERROR__INVALID_PROGRAM_ID | typeof ACTA_CONTRACT_ERROR__INVALID_SIGNATURE_COUNT | typeof ACTA_CONTRACT_ERROR__INVALID_TIMESTAMP | typeof ACTA_CONTRACT_ERROR__MAKER_ALREADY_REGISTERED | typeof ACTA_CONTRACT_ERROR__MAKER_NOT_OWNER | typeof ACTA_CONTRACT_ERROR__MAKER_NOT_REGISTERED | typeof ACTA_CONTRACT_ERROR__MARKET_EXPIRED | typeof ACTA_CONTRACT_ERROR__MARKET_FINALIZED | typeof ACTA_CONTRACT_ERROR__MARKET_NOT_EMPTY | typeof ACTA_CONTRACT_ERROR__MARKET_NOT_EXPIRED | typeof ACTA_CONTRACT_ERROR__MARKET_NOT_FINALIZED | typeof ACTA_CONTRACT_ERROR__MATH_OVERFLOW | typeof ACTA_CONTRACT_ERROR__MINT_MISMATCH | typeof ACTA_CONTRACT_ERROR__NOT_SIGNED | typeof ACTA_CONTRACT_ERROR__ORACLE_ALREADY_UPDATED | typeof ACTA_CONTRACT_ERROR__ORACLE_CLOSE_TOO_EARLY | typeof ACTA_CONTRACT_ERROR__ORACLE_EXPIRY_MISMATCH | typeof ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS | typeof ACTA_CONTRACT_ERROR__ORACLE_INACTIVE | typeof ACTA_CONTRACT_ERROR__ORACLE_INVALID_PRICE | typeof ACTA_CONTRACT_ERROR__ORACLE_SOURCE_LOCKED | typeof ACTA_CONTRACT_ERROR__ORACLE_STALE | typeof ACTA_CONTRACT_ERROR__POSITION_ALREADY_FUNDED | typeof ACTA_CONTRACT_ERROR__POSITION_ALREADY_OPEN | typeof ACTA_CONTRACT_ERROR__POSITION_ALREADY_SETTLED | typeof ACTA_CONTRACT_ERROR__POSITION_NOT_FUNDED | typeof ACTA_CONTRACT_ERROR__POSITION_NOT_ITM | typeof ACTA_CONTRACT_ERROR__POSITION_NOT_OPEN | typeof ACTA_CONTRACT_ERROR__POSITION_TYPE_MISMATCH | typeof ACTA_CONTRACT_ERROR__SIGNED_MESSAGE_MISMATCH | typeof ACTA_CONTRACT_ERROR__SIGNER_MISMATCH | typeof ACTA_CONTRACT_ERROR__UNAUTHORIZED;
+/** OracleNotExpiredYet: Oracle has not expired yet (cannot update price before expiry) */
+export declare const ACTA_CONTRACT_ERROR__ORACLE_NOT_EXPIRED_YET = 1077;
+export type ActaContractError = typeof ACTA_CONTRACT_ERROR__ACCOUNT_ALREADY_INITIALIZED | typeof ACTA_CONTRACT_ERROR__ACCOUNT_NOT_INITIALIZED | typeof ACTA_CONTRACT_ERROR__CANNOT_LIQUIDATE_FUNDED | typeof ACTA_CONTRACT_ERROR__DUPLICATE_ACCOUNT | typeof ACTA_CONTRACT_ERROR__INSUFFICIENT_FUNDS | typeof ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_COUNT | typeof ACTA_CONTRACT_ERROR__INVALID_ACCOUNT_DATA | typeof ACTA_CONTRACT_ERROR__INVALID_INSTRUCTION_DATA | typeof ACTA_CONTRACT_ERROR__INVALID_ORACLE_ACCOUNT | typeof ACTA_CONTRACT_ERROR__INVALID_ORACLE_TYPE | typeof ACTA_CONTRACT_ERROR__INVALID_ORDER_ID | typeof ACTA_CONTRACT_ERROR__INVALID_OWNER | typeof ACTA_CONTRACT_ERROR__INVALID_PDA | typeof ACTA_CONTRACT_ERROR__INVALID_PROGRAM_ID | typeof ACTA_CONTRACT_ERROR__INVALID_SIGNATURE_COUNT | typeof ACTA_CONTRACT_ERROR__INVALID_TIMESTAMP | typeof ACTA_CONTRACT_ERROR__MAKER_ALREADY_REGISTERED | typeof ACTA_CONTRACT_ERROR__MAKER_NOT_OWNER | typeof ACTA_CONTRACT_ERROR__MAKER_NOT_REGISTERED | typeof ACTA_CONTRACT_ERROR__MARKET_EXPIRED | typeof ACTA_CONTRACT_ERROR__MARKET_FINALIZED | typeof ACTA_CONTRACT_ERROR__MARKET_NOT_EMPTY | typeof ACTA_CONTRACT_ERROR__MARKET_NOT_EXPIRED | typeof ACTA_CONTRACT_ERROR__MARKET_NOT_FINALIZED | typeof ACTA_CONTRACT_ERROR__MATH_OVERFLOW | typeof ACTA_CONTRACT_ERROR__MINT_MISMATCH | typeof ACTA_CONTRACT_ERROR__NOT_SIGNED | typeof ACTA_CONTRACT_ERROR__ORACLE_ALREADY_UPDATED | typeof ACTA_CONTRACT_ERROR__ORACLE_CLOSE_TOO_EARLY | typeof ACTA_CONTRACT_ERROR__ORACLE_EXPIRY_MISMATCH | typeof ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS | typeof ACTA_CONTRACT_ERROR__ORACLE_INACTIVE | typeof ACTA_CONTRACT_ERROR__ORACLE_INVALID_PRICE | typeof ACTA_CONTRACT_ERROR__ORACLE_NOT_EXPIRED_YET | typeof ACTA_CONTRACT_ERROR__ORACLE_SOURCE_LOCKED | typeof ACTA_CONTRACT_ERROR__ORACLE_STALE | typeof ACTA_CONTRACT_ERROR__POSITION_ALREADY_FUNDED | typeof ACTA_CONTRACT_ERROR__POSITION_ALREADY_OPEN | typeof ACTA_CONTRACT_ERROR__POSITION_ALREADY_SETTLED | typeof ACTA_CONTRACT_ERROR__POSITION_NOT_FUNDED | typeof ACTA_CONTRACT_ERROR__POSITION_NOT_ITM | typeof ACTA_CONTRACT_ERROR__POSITION_NOT_OPEN | typeof ACTA_CONTRACT_ERROR__POSITION_TYPE_MISMATCH | typeof ACTA_CONTRACT_ERROR__SIGNED_MESSAGE_MISMATCH | typeof ACTA_CONTRACT_ERROR__SIGNER_MISMATCH | typeof ACTA_CONTRACT_ERROR__UNAUTHORIZED;
 export declare function getActaContractErrorMessage(code: ActaContractError): string;
 export declare function isActaContractError<TProgramErrorCode extends ActaContractError>(error: unknown, transactionMessage: {
     instructions: Record<number, {

package/dist/generated/errors/actaContract.js

@@ -97,6 +97,8 @@ export const ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS = 0x432; // 1074
 export const ACTA_CONTRACT_ERROR__DUPLICATE_ACCOUNT = 0x433; // 1075
 /** MarketNotExpired: Market has not expired yet */
 export const ACTA_CONTRACT_ERROR__MARKET_NOT_EXPIRED = 0x434; // 1076
+/** OracleNotExpiredYet: Oracle has not expired yet (cannot update price before expiry) */
+export const ACTA_CONTRACT_ERROR__ORACLE_NOT_EXPIRED_YET = 0x435; // 1077
 let actaContractErrorMessages;
 if (process.env.NODE_ENV !== "production") {
     actaContractErrorMessages = {
@@ -133,6 +135,7 @@ if (process.env.NODE_ENV !== "production") {
         [ACTA_CONTRACT_ERROR__ORACLE_HAS_ACTIVE_MARKETS]: `Oracle is still linked to active markets`,
         [ACTA_CONTRACT_ERROR__ORACLE_INACTIVE]: `Oracle inactive`,
         [ACTA_CONTRACT_ERROR__ORACLE_INVALID_PRICE]: `Oracle price invalid (zero or negative)`,
+        [ACTA_CONTRACT_ERROR__ORACLE_NOT_EXPIRED_YET]: `Oracle has not expired yet (cannot update price before expiry)`,
         [ACTA_CONTRACT_ERROR__ORACLE_SOURCE_LOCKED]: `Oracle source fields are locked after first update`,
         [ACTA_CONTRACT_ERROR__ORACLE_STALE]: `Oracle price is stale (updated_at before expiry)`,
         [ACTA_CONTRACT_ERROR__POSITION_ALREADY_FUNDED]: `Position already funded by maker`,

package/dist/generated/instructions/closeOracle.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 ReadonlyUint8Array, type TransactionSigner, type WritableAccount, type WritableSignerAccount } from "@solana/kit";
+import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeCodec, type FixedSizeDecoder, type FixedSizeEncoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, type WritableSignerAccount } from "@solana/kit";
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const CLOSE_ORACLE_DISCRIMINATOR = 19;
 export declare function getCloseOracleDiscriminatorBytes(): ReadonlyUint8Array;
-export type CloseOracleInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountSigner 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 CloseOracleInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountSigner extends string | AccountMeta<string> = string, TAccountOraclePda extends string | AccountMeta<string> = string, TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
     TAccountSigner extends string ? WritableSignerAccount<TAccountSigner> & AccountSignerMeta<TAccountSigner> : TAccountSigner,
     TAccountOraclePda extends string ? WritableAccount<TAccountOraclePda> : TAccountOraclePda,
-    TAccountClockSysvar extends string ? ReadonlyAccount<TAccountClockSysvar> : TAccountClockSysvar,
     ...TRemainingAccounts
 ]>;
 export type CloseOracleInstructionData = {
@@ -22,17 +21,15 @@ export type CloseOracleInstructionDataArgs = {};
 export declare function getCloseOracleInstructionDataEncoder(): FixedSizeEncoder<CloseOracleInstructionDataArgs>;
 export declare function getCloseOracleInstructionDataDecoder(): FixedSizeDecoder<CloseOracleInstructionData>;
 export declare function getCloseOracleInstructionDataCodec(): FixedSizeCodec<CloseOracleInstructionDataArgs, CloseOracleInstructionData>;
-export type CloseOracleInput<TAccountSigner extends string = string, TAccountOraclePda extends string = string, TAccountClockSysvar extends string = string> = {
+export type CloseOracleInput<TAccountSigner extends string = string, TAccountOraclePda extends string = string> = {
     /** Protocol admin authority */
     signer: TransactionSigner<TAccountSigner>;
     /** Oracle PDA to close */
     oraclePda: Address<TAccountOraclePda>;
-    /** Clock sysvar account */
-    clockSysvar?: Address<TAccountClockSysvar>;
 };
-export declare function getCloseOracleInstruction<TAccountSigner extends string, TAccountOraclePda extends string, TAccountClockSysvar extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: CloseOracleInput<TAccountSigner, TAccountOraclePda, TAccountClockSysvar>, config?: {
+export declare function getCloseOracleInstruction<TAccountSigner extends string, TAccountOraclePda extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: CloseOracleInput<TAccountSigner, TAccountOraclePda>, config?: {
     programAddress?: TProgramAddress;
-}): CloseOracleInstruction<TProgramAddress, TAccountSigner, TAccountOraclePda, TAccountClockSysvar>;
+}): CloseOracleInstruction<TProgramAddress, TAccountSigner, TAccountOraclePda>;
 export type ParsedCloseOracleInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -40,8 +37,6 @@ export type ParsedCloseOracleInstruction<TProgram extends string = typeof ACTA_C
         signer: TAccountMetas[0];
         /** Oracle PDA to close */
         oraclePda: TAccountMetas[1];
-        /** Clock sysvar account */
-        clockSysvar: TAccountMetas[2];
     };
     data: CloseOracleInstructionData;
 };

package/dist/generated/instructions/closeOracle.js

@@ -28,27 +28,20 @@ export 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 = getAccountMetaFactory(programAddress, "programId");
     return Object.freeze({
         accounts: [
             getAccountMeta(accounts.signer),
             getAccountMeta(accounts.oraclePda),
-            getAccountMeta(accounts.clockSysvar),
         ],
         data: getCloseOracleInstructionDataEncoder().encode({}),
         programAddress,
     });
 }
 export function parseCloseOracleInstruction(instruction) {
-    if (instruction.accounts.length < 3) {
+    if (instruction.accounts.length < 2) {
         // TODO: Coded error.
         throw new Error("Not enough accounts");
     }
@@ -60,11 +53,7 @@ export 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/generated/instructions/createMarket.d.ts

@@ -9,14 +9,12 @@ import { type AccountMeta, type AccountSignerMeta, type Address, type FixedSizeC
 import { ACTA_CONTRACT_PROGRAM_ADDRESS } from "../programs";
 export declare const CREATE_MARKET_DISCRIMINATOR = 6;
 export declare function getCreateMarketDiscriminatorBytes(): ReadonlyUint8Array;
-export type CreateMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountConfigPda extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountUnderlyingMint extends string | AccountMeta<string> = string, TAccountQuoteMint extends string | AccountMeta<string> = string, TAccountUnderlyingMintAcc extends string | AccountMeta<string> = string, TAccountQuoteMintAcc extends string | AccountMeta<string> = string, TAccountOracleUnderlying extends string | AccountMeta<string> = string, TAccountOracleQuote extends string | AccountMeta<string> = string, TAccountSystemProgram extends string | AccountMeta<string> = "11111111111111111111111111111111", TRemainingAccounts extends readonly AccountMeta<string>[] = []> = Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array> & InstructionWithAccounts<[
+export type CreateMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountAdmin extends string | AccountMeta<string> = string, TAccountConfigPda extends string | AccountMeta<string> = string, TAccountMarketPda extends string | AccountMeta<string> = string, TAccountUnderlyingMint extends string | AccountMeta<string> = string, TAccountQuoteMint extends string | AccountMeta<string> = string, TAccountOracleUnderlying extends string | AccountMeta<string> = string, TAccountOracleQuote 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,
     TAccountConfigPda extends string ? ReadonlyAccount<TAccountConfigPda> : TAccountConfigPda,
     TAccountMarketPda extends string ? WritableAccount<TAccountMarketPda> : TAccountMarketPda,
     TAccountUnderlyingMint extends string ? ReadonlyAccount<TAccountUnderlyingMint> : TAccountUnderlyingMint,
     TAccountQuoteMint extends string ? ReadonlyAccount<TAccountQuoteMint> : TAccountQuoteMint,
-    TAccountUnderlyingMintAcc extends string ? ReadonlyAccount<TAccountUnderlyingMintAcc> : TAccountUnderlyingMintAcc,
-    TAccountQuoteMintAcc extends string ? ReadonlyAccount<TAccountQuoteMintAcc> : TAccountQuoteMintAcc,
     TAccountOracleUnderlying extends string ? WritableAccount<TAccountOracleUnderlying> : TAccountOracleUnderlying,
     TAccountOracleQuote extends string ? WritableAccount<TAccountOracleQuote> : TAccountOracleQuote,
     TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
@@ -34,21 +32,17 @@ export type CreateMarketInstructionDataArgs = {
 export declare function getCreateMarketInstructionDataEncoder(): FixedSizeEncoder<CreateMarketInstructionDataArgs>;
 export declare function getCreateMarketInstructionDataDecoder(): FixedSizeDecoder<CreateMarketInstructionData>;
 export declare function getCreateMarketInstructionDataCodec(): FixedSizeCodec<CreateMarketInstructionDataArgs, CreateMarketInstructionData>;
-export type CreateMarketInput<TAccountAdmin extends string = string, TAccountConfigPda extends string = string, TAccountMarketPda extends string = string, TAccountUnderlyingMint extends string = string, TAccountQuoteMint extends string = string, TAccountUnderlyingMintAcc extends string = string, TAccountQuoteMintAcc extends string = string, TAccountOracleUnderlying extends string = string, TAccountOracleQuote extends string = string, TAccountSystemProgram extends string = string> = {
+export type CreateMarketInput<TAccountAdmin extends string = string, TAccountConfigPda extends string = string, TAccountMarketPda extends string = string, TAccountUnderlyingMint extends string = string, TAccountQuoteMint extends string = string, TAccountOracleUnderlying extends string = string, TAccountOracleQuote extends string = string, TAccountSystemProgram extends string = string> = {
     /** Protocol admin authority */
     admin: TransactionSigner<TAccountAdmin>;
     /** Config PDA for admin verification */
     configPda: Address<TAccountConfigPda>;
     /** Market PDA to create */
     marketPda: Address<TAccountMarketPda>;
-    /** Underlying SPL mint */
+    /** Underlying SPL mint (used for PDA seed and decimals) */
     underlyingMint: Address<TAccountUnderlyingMint>;
-    /** Quote SPL mint */
+    /** Quote SPL mint (used for PDA seed and decimals) */
     quoteMint: Address<TAccountQuoteMint>;
-    /** Underlying mint account (for decimals) */
-    underlyingMintAcc: Address<TAccountUnderlyingMintAcc>;
-    /** Quote mint account (for decimals) */
-    quoteMintAcc: Address<TAccountQuoteMintAcc>;
     /** Underlying oracle PDA */
     oracleUnderlying: Address<TAccountOracleUnderlying>;
     /** Quote oracle PDA */
@@ -58,9 +52,9 @@ export type CreateMarketInput<TAccountAdmin extends string = string, TAccountCon
     expiryTs: CreateMarketInstructionDataArgs["expiryTs"];
     isPut: CreateMarketInstructionDataArgs["isPut"];
 };
-export declare function getCreateMarketInstruction<TAccountAdmin extends string, TAccountConfigPda extends string, TAccountMarketPda extends string, TAccountUnderlyingMint extends string, TAccountQuoteMint extends string, TAccountUnderlyingMintAcc extends string, TAccountQuoteMintAcc extends string, TAccountOracleUnderlying extends string, TAccountOracleQuote extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: CreateMarketInput<TAccountAdmin, TAccountConfigPda, TAccountMarketPda, TAccountUnderlyingMint, TAccountQuoteMint, TAccountUnderlyingMintAcc, TAccountQuoteMintAcc, TAccountOracleUnderlying, TAccountOracleQuote, TAccountSystemProgram>, config?: {
+export declare function getCreateMarketInstruction<TAccountAdmin extends string, TAccountConfigPda extends string, TAccountMarketPda extends string, TAccountUnderlyingMint extends string, TAccountQuoteMint extends string, TAccountOracleUnderlying extends string, TAccountOracleQuote extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof ACTA_CONTRACT_PROGRAM_ADDRESS>(input: CreateMarketInput<TAccountAdmin, TAccountConfigPda, TAccountMarketPda, TAccountUnderlyingMint, TAccountQuoteMint, TAccountOracleUnderlying, TAccountOracleQuote, TAccountSystemProgram>, config?: {
     programAddress?: TProgramAddress;
-}): CreateMarketInstruction<TProgramAddress, TAccountAdmin, TAccountConfigPda, TAccountMarketPda, TAccountUnderlyingMint, TAccountQuoteMint, TAccountUnderlyingMintAcc, TAccountQuoteMintAcc, TAccountOracleUnderlying, TAccountOracleQuote, TAccountSystemProgram>;
+}): CreateMarketInstruction<TProgramAddress, TAccountAdmin, TAccountConfigPda, TAccountMarketPda, TAccountUnderlyingMint, TAccountQuoteMint, TAccountOracleUnderlying, TAccountOracleQuote, TAccountSystemProgram>;
 export type ParsedCreateMarketInstruction<TProgram extends string = typeof ACTA_CONTRACT_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -70,20 +64,16 @@ export type ParsedCreateMarketInstruction<TProgram extends string = typeof ACTA_
         configPda: TAccountMetas[1];
         /** Market PDA to create */
         marketPda: TAccountMetas[2];
-        /** Underlying SPL mint */
+        /** Underlying SPL mint (used for PDA seed and decimals) */
         underlyingMint: TAccountMetas[3];
-        /** Quote SPL mint */
+        /** Quote SPL mint (used for PDA seed and decimals) */
         quoteMint: TAccountMetas[4];
-        /** Underlying mint account (for decimals) */
-        underlyingMintAcc: TAccountMetas[5];
-        /** Quote mint account (for decimals) */
-        quoteMintAcc: TAccountMetas[6];
         /** Underlying oracle PDA */
-        oracleUnderlying: TAccountMetas[7];
+        oracleUnderlying: TAccountMetas[5];
         /** Quote oracle PDA */
-        oracleQuote: TAccountMetas[8];
+        oracleQuote: TAccountMetas[6];
         /** System program */
-        systemProgram: TAccountMetas[9];
+        systemProgram: TAccountMetas[7];
     };
     data: CreateMarketInstructionData;
 };