@lightconexyz/lightcone-sdk 0.2.0 → 0.2.1

package/dist/program/instructions.js

@@ -21,7 +21,6 @@ exports.buildDepositToGlobalIx = buildDepositToGlobalIx;
 exports.buildGlobalToMarketDepositIx = buildGlobalToMarketDepositIx;
 exports.buildInitPositionTokensIx = buildInitPositionTokensIx;
 exports.buildDepositAndSwapIx = buildDepositAndSwapIx;
-exports.buildExtendPositionTokensIx = buildExtendPositionTokensIx;
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const pda_1 = require("./pda");
@@ -133,14 +132,12 @@ function buildAddDepositMintIx(params, market, numOutcomes, programId = constant
     if (params.outcomeMetadata.length !== numOutcomes) {
         throw new Error(`Outcome metadata count (${params.outcomeMetadata.length}) must match numOutcomes (${numOutcomes})`);
     }
-    const [exchange] = (0, pda_1.getExchangePda)(programId);
     const [vault] = (0, pda_1.getVaultPda)(params.depositMint, market, programId);
     const [mintAuthority] = (0, pda_1.getMintAuthorityPda)(market, programId);
     const conditionalMints = (0, pda_1.getAllConditionalMintPdas)(market, params.depositMint, numOutcomes, programId);
     const keys = [
         signerMut(params.payer),
-        readonly(exchange),
-        readonly(market),
+        writable(market),
         readonly(params.depositMint),
         writable(vault),
         readonly(mintAuthority),
@@ -714,7 +711,7 @@ function buildWhitelistDepositTokenIx(params, programId = constants_1.PROGRAM_ID
     const [globalDepositToken] = (0, pda_1.getGlobalDepositTokenPda)(params.mint, programId);
     const keys = [
         signerMut(params.authority),
-        writable(exchange),
+        readonly(exchange),
         readonly(params.mint),
         writable(globalDepositToken),
         readonly(constants_1.SYSTEM_PROGRAM_ID),
@@ -737,12 +734,7 @@ function buildWhitelistDepositTokenIx(params, programId = constants_1.PROGRAM_ID
  * 5. token_program (readonly)
  * 6. system_program (readonly)
  *
- * Optional (for ALT creation/extension when first deposit to this mint):
- * 7. user_nonce (readonly)
- * 8. lookup_table (mut)
- * 9. alt_program (readonly)
- *
- * Data: [discriminator, amount (u64), optional recent_slot (u64)]
+ * Data: [discriminator, amount (u64)]
  */
 function buildDepositToGlobalIx(params, programId = constants_1.PROGRAM_ID) {
     const [globalDepositToken] = (0, pda_1.getGlobalDepositTokenPda)(params.mint, programId);
@@ -757,24 +749,14 @@ function buildDepositToGlobalIx(params, programId = constants_1.PROGRAM_ID) {
         readonly(constants_1.TOKEN_PROGRAM_ID),
         readonly(constants_1.SYSTEM_PROGRAM_ID),
     ];
-    // Optional ALT accounts
-    if (params.userNonce && params.lookupTable) {
-        keys.push(readonly(params.userNonce));
-        keys.push(writable(params.lookupTable));
-        keys.push(readonly(constants_1.ALT_PROGRAM_ID));
-    }
-    const dataBuffers = [
+    const data = Buffer.concat([
         Buffer.from([constants_1.INSTRUCTION.DEPOSIT_TO_GLOBAL]),
         (0, utils_1.toU64Le)(params.amount),
-    ];
-    // Optional recent_slot for ALT creation
-    if (params.recentSlot !== undefined) {
-        dataBuffers.push((0, utils_1.toU64Le)(params.recentSlot));
-    }
+    ]);
     return new web3_js_1.TransactionInstruction({
         keys,
         programId,
-        data: Buffer.concat(dataBuffers),
+        data,
     });
 }
 /**
@@ -840,39 +822,36 @@ function buildGlobalToMarketDepositIx(params, numOutcomes, programId = constants
 }
 /**
  * Build InitPositionTokens instruction
- * Permissionless: payer pays, user is position owner (no signature required)
  *
  * Accounts:
- * 0. payer (signer, mut)
- * 1. user (readonly)
- * 2. exchange (readonly)
- * 3. market (readonly)
- * 4. position (mut)
- * 5. lookup_table (mut)
- * 6. mint_authority (readonly)
- * 7. token_2022_program (readonly)
- * 8. ata_program (readonly)
- * 9. alt_program (readonly)
- * 10. system_program (readonly)
- *
- * Remaining per deposit_mint (in ascending GDT index order):
- *   deposit_mint, vault, gdt, [conditional_mint[i], position_conditional_ata[i]]*numOutcomes
+ * 0. user (signer, mut)
+ * 1. exchange (readonly)
+ * 2. market (readonly)
+ * 3. deposit_mint (readonly)
+ * 4. vault (readonly)
+ * 5. position (mut)
+ * 6. lookup_table (mut)
+ * 7. mint_authority (readonly)
+ * 8. token_2022_program (readonly)
+ * 9. ata_program (readonly)
+ * 10. alt_program (readonly)
+ * 11. system_program (readonly)
+ * + per outcome: conditional_mint[i] (readonly), position_conditional_ata[i] (mut)
  *
- * Data: [discriminator, recent_slot (u64), num_deposit_mints (u8)]
+ * Data: [discriminator, recent_slot (u64)]
  */
 function buildInitPositionTokensIx(params, numOutcomes, programId = constants_1.PROGRAM_ID) {
-    if (params.depositMints.length === 0) {
-        throw new Error("At least one deposit mint is required");
-    }
     const [exchange] = (0, pda_1.getExchangePda)(programId);
+    const [vault] = (0, pda_1.getVaultPda)(params.depositMint, params.market, programId);
     const [position] = (0, pda_1.getPositionPda)(params.user, params.market, programId);
     const [lookupTable] = (0, pda_1.getPositionAltPda)(position, params.recentSlot);
     const [mintAuthority] = (0, pda_1.getMintAuthorityPda)(params.market, programId);
     const keys = [
-        signerMut(params.payer),
-        readonly(params.user),
+        signerMut(params.user),
         readonly(exchange),
         readonly(params.market),
+        readonly(params.depositMint),
+        readonly(vault),
         writable(position),
         writable(lookupTable),
         readonly(mintAuthority),
@@ -881,23 +860,14 @@ function buildInitPositionTokensIx(params, numOutcomes, programId = constants_1.
         readonly(constants_1.ALT_PROGRAM_ID),
         readonly(constants_1.SYSTEM_PROGRAM_ID),
     ];
-    // Remaining accounts: per deposit_mint group
-    for (const depositMint of params.depositMints) {
-        const [vault] = (0, pda_1.getVaultPda)(depositMint, params.market, programId);
-        const [gdt] = (0, pda_1.getGlobalDepositTokenPda)(depositMint, programId);
-        keys.push(readonly(depositMint));
-        keys.push(readonly(vault));
-        keys.push(readonly(gdt));
-        for (let i = 0; i < numOutcomes; i += 1) {
-            const [conditionalMint] = (0, pda_1.getAllConditionalMintPdas)(params.market, depositMint, numOutcomes, programId)[i];
-            keys.push(readonly(conditionalMint));
-            keys.push(writable((0, utils_1.getConditionalTokenAta)(conditionalMint, position)));
-        }
+    for (let i = 0; i < numOutcomes; i += 1) {
+        const [conditionalMint] = (0, pda_1.getAllConditionalMintPdas)(params.market, params.depositMint, numOutcomes, programId)[i];
+        keys.push(readonly(conditionalMint));
+        keys.push(writable((0, utils_1.getConditionalTokenAta)(conditionalMint, position)));
     }
     const data = Buffer.concat([
         Buffer.from([constants_1.INSTRUCTION.INIT_POSITION_TOKENS]),
         (0, utils_1.toU64Le)(params.recentSlot),
-        (0, utils_1.toU8)(params.depositMints.length),
     ]);
     return new web3_js_1.TransactionInstruction({
         keys,
@@ -907,24 +877,7 @@ function buildInitPositionTokensIx(params, numOutcomes, programId = constants_1.
 }
 /**
  * Build DepositAndSwap instruction.
- *
- * deposit_bitmask controls per-participant deposit vs swap routing:
- *   bit 7 = taker deposits, bits 0..n = maker i deposits
- *
- * Account layout:
- *   Fixed (5): operator, exchange, market, mint_authority, token_program
- *   Taker: [order_status], nonce, position, base_mint, quote_mint,
- *          taker_receive_ata, taker_give_ata, token_2022, system
- *   Taker deposit (if bit 7): deposit_mint, vault, gdt, user_global_deposit,
- *          [cond_mint, ata]*numOutcomes
- *   Per maker:
- *     Common: [order_status], nonce, position
- *     If deposit: deposit_mint, vault, gdt, user_global_deposit,
- *                 [cond_mint, ata]*numOutcomes, maker_receive_ata, maker_give_ata
- *     If swap: maker_receive_ata, maker_give_ata
- *
- * Data: [disc, takerOrder(29), takerSig(64), numMakers(1),
- *        fullFillBitmask(1), depositBitmask(1), ...makerData(109*n)]
+ * Data format is identical to matchOrdersMulti.
  */
 function buildDepositAndSwapIx(params, numOutcomes, programId = constants_1.PROGRAM_ID) {
     if (params.makerOrders.length === 0) {
@@ -940,64 +893,40 @@ function buildDepositAndSwapIx(params, numOutcomes, programId = constants_1.PROG
         throw new Error("taker_fill_amounts length must match maker_orders");
     }
     const [exchange] = (0, pda_1.getExchangePda)(programId);
+    const [vault] = (0, pda_1.getVaultPda)(params.depositMint, params.market, programId);
+    const [globalDepositToken] = (0, pda_1.getGlobalDepositTokenPda)(params.depositMint, programId);
     const [mintAuthority] = (0, pda_1.getMintAuthorityPda)(params.market, programId);
     const takerOrderHash = (0, orders_1.hashOrder)(params.takerOrder);
     const [takerNonce] = (0, pda_1.getUserNoncePda)(params.takerOrder.maker, programId);
     const [takerPosition] = (0, pda_1.getPositionPda)(params.takerOrder.maker, params.market, programId);
-    const takerFullFill = (params.fullFillBitmask & 0x80) !== 0;
-    const takerIsDeposit = (params.depositBitmask & 0x80) !== 0;
-    // Determine receive/give mints based on taker side
-    const takerSide = params.takerOrder.side;
-    const receiveMint = takerSide === 0 ? params.baseMint : params.quoteMint;
-    const giveMint = takerSide === 0 ? params.quoteMint : params.baseMint;
+    const takerFullFill = ((params.fullFillBitmask >> 7) & 1) === 1;
     const keys = [];
-    // Fixed accounts (5)
     keys.push(signerMut(params.operator));
     keys.push(readonly(exchange));
     keys.push(readonly(params.market));
+    keys.push(readonly(params.depositMint));
+    keys.push(writable(vault));
+    keys.push(readonly(globalDepositToken));
     keys.push(readonly(mintAuthority));
     keys.push(readonly(constants_1.TOKEN_PROGRAM_ID));
-    // Taker order_status (if not fully filled)
     if (!takerFullFill) {
         const [takerOrderStatus] = (0, pda_1.getOrderStatusPda)(takerOrderHash, programId);
         keys.push(writable(takerOrderStatus));
     }
-    // Taker common block (8 accounts)
     keys.push(readonly(takerNonce));
     keys.push(writable(takerPosition));
     keys.push(readonly(params.baseMint));
     keys.push(readonly(params.quoteMint));
-    const takerReceiveAta = (0, utils_1.getConditionalTokenAta)(receiveMint, takerPosition);
-    const takerGiveAta = (0, utils_1.getConditionalTokenAta)(giveMint, takerPosition);
-    keys.push(writable(takerReceiveAta));
-    keys.push(writable(takerGiveAta));
     keys.push(readonly(constants_1.TOKEN_2022_PROGRAM_ID));
     keys.push(readonly(constants_1.SYSTEM_PROGRAM_ID));
-    // Taker deposit block (if taker deposits)
-    if (takerIsDeposit) {
-        if (!params.takerDepositMint) {
-            throw new Error("takerDepositMint is required when taker deposits (depositBitmask bit 7)");
-        }
-        const takerDm = params.takerDepositMint;
-        const [takerVault] = (0, pda_1.getVaultPda)(takerDm, params.market, programId);
-        const [takerGdt] = (0, pda_1.getGlobalDepositTokenPda)(takerDm, programId);
-        const [takerUgd] = (0, pda_1.getUserGlobalDepositPda)(params.takerOrder.maker, takerDm, programId);
-        keys.push(readonly(takerDm));
-        keys.push(writable(takerVault));
-        keys.push(readonly(takerGdt));
-        keys.push(writable(takerUgd));
-        for (let j = 0; j < numOutcomes; j += 1) {
-            const [conditionalMint] = (0, pda_1.getAllConditionalMintPdas)(params.market, takerDm, numOutcomes, programId)[j];
-            keys.push(writable(conditionalMint));
-            keys.push(writable((0, utils_1.getConditionalTokenAta)(conditionalMint, takerPosition)));
-        }
+    for (let i = 0; i < numOutcomes; i += 1) {
+        const [conditionalMint] = (0, pda_1.getAllConditionalMintPdas)(params.market, params.depositMint, numOutcomes, programId)[i];
+        keys.push(writable(conditionalMint));
+        keys.push(writable((0, utils_1.getConditionalTokenAta)(conditionalMint, takerPosition)));
     }
-    // Per-maker accounts
     for (let i = 0; i < params.makerOrders.length; i += 1) {
         const makerOrder = params.makerOrders[i];
-        const makerFullFill = (params.fullFillBitmask & (1 << i)) !== 0;
-        const makerIsDeposit = (params.depositBitmask & (1 << i)) !== 0;
-        // Maker order_status (if not fully filled)
+        const makerFullFill = ((params.fullFillBitmask >> i) & 1) === 1;
         if (!makerFullFill) {
             const makerOrderHash = (0, orders_1.hashOrder)(makerOrder);
             const [makerOrderStatus] = (0, pda_1.getOrderStatusPda)(makerOrderHash, programId);
@@ -1005,49 +934,21 @@ function buildDepositAndSwapIx(params, numOutcomes, programId = constants_1.PROG
         }
         const [makerNonce] = (0, pda_1.getUserNoncePda)(makerOrder.maker, programId);
         const [makerPosition] = (0, pda_1.getPositionPda)(makerOrder.maker, params.market, programId);
-        // Common: nonce, position
+        const [makerGlobalDeposit] = (0, pda_1.getUserGlobalDepositPda)(makerOrder.maker, params.depositMint, programId);
         keys.push(readonly(makerNonce));
         keys.push(writable(makerPosition));
-        if (makerIsDeposit) {
-            // Maker deposit: deposit_mint, vault, gdt, ugd, [cond_mint, ata]*n, receive_ata, give_ata
-            const makerDm = params.makerDepositMints?.[i];
-            if (!makerDm) {
-                throw new Error(`makerDepositMints[${i}] is required when maker ${i} deposits`);
-            }
-            const [makerVault] = (0, pda_1.getVaultPda)(makerDm, params.market, programId);
-            const [makerGdt] = (0, pda_1.getGlobalDepositTokenPda)(makerDm, programId);
-            const [makerUgd] = (0, pda_1.getUserGlobalDepositPda)(makerOrder.maker, makerDm, programId);
-            keys.push(readonly(makerDm));
-            keys.push(writable(makerVault));
-            keys.push(readonly(makerGdt));
-            keys.push(writable(makerUgd));
-            for (let j = 0; j < numOutcomes; j += 1) {
-                const [conditionalMint] = (0, pda_1.getAllConditionalMintPdas)(params.market, makerDm, numOutcomes, programId)[j];
-                keys.push(writable(conditionalMint));
-                keys.push(writable((0, utils_1.getConditionalTokenAta)(conditionalMint, makerPosition)));
-            }
-            // Maker swap ATAs (always present after deposit block)
-            const makerReceiveAta = (0, utils_1.getConditionalTokenAta)(receiveMint, makerPosition);
-            const makerGiveAta = (0, utils_1.getConditionalTokenAta)(giveMint, makerPosition);
-            keys.push(writable(makerReceiveAta));
-            keys.push(writable(makerGiveAta));
-        }
-        else {
-            // Maker swap: receive_ata, give_ata
-            const makerReceiveAta = (0, utils_1.getConditionalTokenAta)(receiveMint, makerPosition);
-            const makerGiveAta = (0, utils_1.getConditionalTokenAta)(giveMint, makerPosition);
-            keys.push(writable(makerReceiveAta));
-            keys.push(writable(makerGiveAta));
+        keys.push(writable(makerGlobalDeposit));
+        for (let j = 0; j < numOutcomes; j += 1) {
+            const [conditionalMint] = (0, pda_1.getAllConditionalMintPdas)(params.market, params.depositMint, numOutcomes, programId)[j];
+            keys.push(writable((0, utils_1.getConditionalTokenAta)(conditionalMint, makerPosition)));
         }
     }
-    // Build data (96-byte header + 109 per maker)
     const buffers = [
         Buffer.from([constants_1.INSTRUCTION.DEPOSIT_AND_SWAP]),
         (0, orders_1.serializeOrder)((0, orders_1.signedOrderToOrder)(params.takerOrder)),
         params.takerOrder.signature,
         (0, utils_1.toU8)(params.makerOrders.length),
         (0, utils_1.toU8)(params.fullFillBitmask),
-        (0, utils_1.toU8)(params.depositBitmask),
     ];
     for (let i = 0; i < params.makerOrders.length; i += 1) {
         const makerOrder = params.makerOrders[i];
@@ -1062,66 +963,4 @@ function buildDepositAndSwapIx(params, numOutcomes, programId = constants_1.PROG
         data: Buffer.concat(buffers),
     });
 }
-/**
- * Build ExtendPositionTokens instruction
- * Permissionless: anyone can pay to extend ALTs for any user
- *
- * Accounts:
- * 0. payer (signer, mut)
- * 1. user (readonly)
- * 2. exchange (readonly)
- * 3. market (readonly)
- * 4. position (readonly)
- * 5. lookup_table (mut)
- * 6. token_2022_program (readonly)
- * 7. ata_program (readonly)
- * 8. alt_program (readonly)
- * 9. system_program (readonly)
- *
- * Remaining per deposit_mint (in ascending GDT index order):
- *   deposit_mint, vault, gdt, [conditional_mint[i], position_conditional_ata[i]]*numOutcomes
- *
- * Data: [discriminator, num_deposit_mints (u8)]
- */
-function buildExtendPositionTokensIx(params, numOutcomes, lookupTable, programId = constants_1.PROGRAM_ID) {
-    if (params.depositMints.length === 0) {
-        throw new Error("At least one deposit mint is required");
-    }
-    const [exchange] = (0, pda_1.getExchangePda)(programId);
-    const [position] = (0, pda_1.getPositionPda)(params.user, params.market, programId);
-    const keys = [
-        signerMut(params.payer),
-        readonly(params.user),
-        readonly(exchange),
-        readonly(params.market),
-        readonly(position),
-        writable(lookupTable),
-        readonly(constants_1.TOKEN_2022_PROGRAM_ID),
-        readonly(constants_1.ASSOCIATED_TOKEN_PROGRAM_ID),
-        readonly(constants_1.ALT_PROGRAM_ID),
-        readonly(constants_1.SYSTEM_PROGRAM_ID),
-    ];
-    // Remaining accounts: per deposit_mint group
-    for (const depositMint of params.depositMints) {
-        const [vault] = (0, pda_1.getVaultPda)(depositMint, params.market, programId);
-        const [gdt] = (0, pda_1.getGlobalDepositTokenPda)(depositMint, programId);
-        keys.push(readonly(depositMint));
-        keys.push(readonly(vault));
-        keys.push(readonly(gdt));
-        for (let i = 0; i < numOutcomes; i += 1) {
-            const [conditionalMint] = (0, pda_1.getAllConditionalMintPdas)(params.market, depositMint, numOutcomes, programId)[i];
-            keys.push(readonly(conditionalMint));
-            keys.push(writable((0, utils_1.getConditionalTokenAta)(conditionalMint, position)));
-        }
-    }
-    const data = Buffer.concat([
-        Buffer.from([constants_1.INSTRUCTION.EXTEND_POSITION_TOKENS]),
-        (0, utils_1.toU8)(params.depositMints.length),
-    ]);
-    return new web3_js_1.TransactionInstruction({
-        keys,
-        programId,
-        data,
-    });
-}
 //# sourceMappingURL=instructions.js.map