@acta-markets/ts-sdk 0.0.18-beta → 0.0.20-beta

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.handshake.integration.test.js

@@ -55,7 +55,8 @@ describeIfWsUrl("ws handshake integration (real backend)", () => {
             });
             client.on("error", (err) => {
                 if (!welcomeReceived) {
-                    finish(err);
+                    const msg = err.type === "generic" ? err.data.message : err.type;
+                    finish(new Error(msg));
                 }
             });
             client.on("disconnected", (code, reason) => {

package/dist/cjs/ws/client.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActaWsClient = void 0;
 const flows_1 = require("./flows");
 const wirePolicy_1 = require("./wirePolicy");
+function toGenericServerError(err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { type: "generic", data: { code: "client_error", message } };
+}
 function formatServerError(error) {
     if (error.type === "generic") {
         return `${error.data.code}: ${error.data.message}`;
@@ -160,7 +164,7 @@ class ActaWsClient extends TypedEventEmitter {
         if (this.ws?.readyState === WS_OPEN) {
             if (this.welcomeReceived && !this.startAuthSent) {
                 void this.beginAuthHandshake().catch((err) => {
-                    this.emit("error", err);
+                    this.emit("error", toGenericServerError(err));
                     this.setConnectionState("error");
                 });
             }
@@ -393,6 +397,7 @@ class ActaWsClient extends TypedEventEmitter {
     }
     subscribe(channels, markets) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.add(c);
         if (markets) {
@@ -402,18 +407,21 @@ class ActaWsClient extends TypedEventEmitter {
         this.send({
             type: "Subscribe",
             data: this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels },
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels },
         });
+        return request_id;
     }
     unsubscribe(channels) {
         this.ensureAuthenticated();
+        const request_id = this.nextRequestId();
         for (const c of channels)
             this.subscribedChannels.delete(c);
         this.send({
             type: "Unsubscribe",
-            data: { channels },
+            data: { request_id, channels },
         });
+        return request_id;
     }
     ping() {
         if (this.ws?.readyState === WS_OPEN) {
@@ -468,7 +476,7 @@ class ActaWsClient extends TypedEventEmitter {
         };
         ws.onerror = (ev) => {
             this.log("WebSocket error:", ev);
-            this.emit("error", new Error("WebSocket error"));
+            this.emit("error", toGenericServerError("WebSocket error"));
             if (this.shouldReconnect) {
                 this.cleanup();
                 this.scheduleReconnect();
@@ -485,7 +493,7 @@ class ActaWsClient extends TypedEventEmitter {
                 this.flushPendingMessages();
                 if (this.authRequested && this.authProvider && !this.startAuthSent) {
                     void this.beginAuthHandshake().catch((err) => {
-                        this.emit("error", err);
+                        this.emit("error", toGenericServerError(err));
                         this.setConnectionState("error");
                     });
                 }
@@ -711,7 +719,16 @@ class ActaWsClient extends TypedEventEmitter {
             case "Pong":
                 break;
             case "Error":
-                this.emit("error", new Error(formatServerError(message.data)));
+                this.emit("error", message.data);
+                break;
+            case "RequestError":
+                this.emit("requestError", message.data);
+                break;
+            case "SubscribeAck":
+                this.emit("subscribeAck", message.data);
+                break;
+            case "UnsubscribeAck":
+                this.emit("unsubscribeAck", message.data);
                 break;
         }
     }
@@ -732,7 +749,7 @@ class ActaWsClient extends TypedEventEmitter {
     async handleAuthRequest(challenge) {
         this.setConnectionState("authenticating");
         if (!this.authProvider) {
-            this.emit("error", new Error("No auth provider configured"));
+            this.emit("error", toGenericServerError("No auth provider configured"));
             return;
         }
         try {
@@ -746,7 +763,7 @@ class ActaWsClient extends TypedEventEmitter {
             });
         }
         catch (err) {
-            this.emit("error", err);
+            this.emit("error", toGenericServerError(err));
             this.setConnectionState("error");
         }
     }
@@ -797,9 +814,10 @@ class ActaWsClient extends TypedEventEmitter {
         this.emit("authenticated", sessionId, expiresAt);
         if (this.subscribedChannels.size > 0) {
             const channels = Array.from(this.subscribedChannels);
+            const request_id = this.nextRequestId();
             const data = this.hasMarketScope
-                ? { channels, markets: Array.from(this.subscribedMarkets) }
-                : { channels };
+                ? { request_id, channels, markets: Array.from(this.subscribedMarkets) }
+                : { request_id, channels };
             this.send({ type: "Subscribe", data });
         }
     }
@@ -813,14 +831,14 @@ class ActaWsClient extends TypedEventEmitter {
             this.lastAuthSessionId = null;
             this.startAuthSent = false;
             void this.sendStartAuth().catch((err) => {
-                this.emit("error", err);
+                this.emit("error", toGenericServerError(err));
                 this.setConnectionState("error");
             });
             return;
         }
         this.setConnectionState("error");
         const details = message ? `${reason}: ${message}` : reason;
-        this.emit("error", new Error(`Authentication failed: ${details}`));
+        this.emit("error", toGenericServerError(`Authentication failed: ${details}`));
     }
     handleSnapshot(snapshot) {
         this.state.markets.clear();
@@ -959,7 +977,7 @@ class ActaWsClient extends TypedEventEmitter {
                 this.log("Pending queue full, dropping newest message:", message.type);
                 return false;
             case "throw":
-                this.emit("error", new Error(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
+                this.emit("error", toGenericServerError(`Pending queue overflow (maxPendingMessages=${maxPending}) for message type=${message.type}`));
                 return false;
         }
     }

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

@@ -420,7 +420,11 @@ describe("ActaWsClient", () => {
         client.getMarkets();
         client.getTokens();
         expect(errors).toHaveLength(1);
-        expect(errors[0].message).toContain("Pending queue overflow");
+        const err0 = errors[0];
+        expect(err0.type).toBe("generic");
+        if (err0.type === "generic") {
+            expect(err0.data.message).toContain("Pending queue overflow");
+        }
         ws.triggerMessage(WELCOME_MESSAGE);
         const flushedTypes = ws.sent
             .slice(1)

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;
 };

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;
 };