@xitadel-fi/sdk 0.2.1 → 0.2.2

package/dist/sdk/src/program.js

@@ -526,6 +526,26 @@ class XitadelProgram {
         if (positionNftAccountInfo == null) {
             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(signer, positionNftAccount, lpAuthority, positionNftMint, spl_token_1.TOKEN_2022_PROGRAM_ID));
         }
+        // Pool B: when LTT has two pools, derive pool B accounts; otherwise use pool A accounts for _b slots
+        const positionNftMintB = lttConfig.positionNftMintB;
+        const hasPoolB = !positionNftMintB.equals(web3_js_2.SystemProgram.programId);
+        let positionNftAccountB = positionNftAccount;
+        let harvestVaultPositionNftAtaB = harvestVaultPositionNftAta;
+        if (hasPoolB) {
+            const [positionNftAccountBDerived] = web3_js_1.PublicKey.findProgramAddressSync([constants_1.POSITION_NFT_ACCOUNT_SEED, positionNftMintB.toBuffer()], cpAmmProgramId);
+            positionNftAccountB = positionNftAccountBDerived;
+            harvestVaultPositionNftAtaB = (0, spl_token_1.getAssociatedTokenAddressSync)(positionNftMintB, harvestVault, true, spl_token_1.TOKEN_2022_PROGRAM_ID);
+            let harvestVaultPositionNftAtaBInfo = null;
+            try {
+                harvestVaultPositionNftAtaBInfo = await this.program.provider.connection.getAccountInfo(harvestVaultPositionNftAtaB);
+            }
+            catch {
+                // Account doesn't exist
+            }
+            if (harvestVaultPositionNftAtaBInfo == null) {
+                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(signer, harvestVaultPositionNftAtaB, harvestVault, positionNftMintB, spl_token_1.TOKEN_2022_PROGRAM_ID));
+            }
+        }
         const configPda = this.getConfigPda();
         // Add the main deactivate instruction
         instructions.push(await this.program.methods
@@ -540,7 +560,10 @@ class XitadelProgram {
             collateralVaultAta: (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.collateralTokenMint, lttConfigPda, true),
             positionNftMint,
             positionNftAccount: positionNftAccount,
+            positionNftMintB,
+            positionNftAccountB,
             harvestVaultPositionNftAta,
+            harvestVaultPositionNftAtaB,
             harvestVaultFundingAta,
             harvestVaultCollateralAta,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -836,6 +859,15 @@ class XitadelProgram {
         // Derive all ATAs
         const harvestVaultPositionNftAta = (0, spl_token_1.getAssociatedTokenAddressSync)(positionNftMint, harvestVault, true, spl_token_1.TOKEN_2022_PROGRAM_ID);
         const managerPositionNftAta = (0, spl_token_1.getAssociatedTokenAddressSync)(positionNftMint, manager, true, spl_token_1.TOKEN_2022_PROGRAM_ID);
+        // Pool B: when LTT has two pools use pool B ATAs; otherwise use pool A for _b slots
+        const positionNftMintB = lttConfig.positionNftMintB;
+        const hasPoolB = !positionNftMintB.equals(web3_js_2.SystemProgram.programId);
+        let harvestVaultPositionNftAtaB = harvestVaultPositionNftAta;
+        let managerPositionNftAtaB = managerPositionNftAta;
+        if (hasPoolB) {
+            harvestVaultPositionNftAtaB = (0, spl_token_1.getAssociatedTokenAddressSync)(positionNftMintB, harvestVault, true, spl_token_1.TOKEN_2022_PROGRAM_ID);
+            managerPositionNftAtaB = (0, spl_token_1.getAssociatedTokenAddressSync)(positionNftMintB, manager, true, spl_token_1.TOKEN_2022_PROGRAM_ID);
+        }
         const harvestVaultFundingAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.fundingTokenMint, harvestVault, true, spl_token_1.TOKEN_PROGRAM_ID);
         const harvestVaultCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.collateralTokenMint, harvestVault, true, spl_token_1.TOKEN_PROGRAM_ID);
         const managerFundingAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.fundingTokenMint, manager, true, spl_token_1.TOKEN_PROGRAM_ID);
@@ -853,6 +885,16 @@ class XitadelProgram {
         if (!managerPositionNftAtaInfo) {
             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(manager, managerPositionNftAta, manager, positionNftMint, spl_token_1.TOKEN_2022_PROGRAM_ID));
         }
+        if (hasPoolB) {
+            const managerPositionNftAtaBInfo = await connection.getAccountInfo(managerPositionNftAtaB);
+            if (!managerPositionNftAtaBInfo) {
+                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(manager, managerPositionNftAtaB, manager, positionNftMintB, spl_token_1.TOKEN_2022_PROGRAM_ID));
+            }
+            const harvestVaultPositionNftAtaBInfo = await connection.getAccountInfo(harvestVaultPositionNftAtaB);
+            if (!harvestVaultPositionNftAtaBInfo) {
+                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(manager, harvestVaultPositionNftAtaB, harvestVault, positionNftMintB, spl_token_1.TOKEN_2022_PROGRAM_ID));
+            }
+        }
         const harvestVaultFundingAtaInfo = await connection.getAccountInfo(harvestVaultFundingAta);
         if (!harvestVaultFundingAtaInfo) {
             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(manager, harvestVaultFundingAta, harvestVault, lttConfig.fundingTokenMint, spl_token_1.TOKEN_PROGRAM_ID));
@@ -876,6 +918,9 @@ class XitadelProgram {
             positionNftMint,
             harvestVaultPositionNftAta,
             managerPositionNftAta,
+            positionNftMintB,
+            harvestVaultPositionNftAtaB,
+            managerPositionNftAtaB,
             harvestVaultFundingAta,
             managerFundingAta,
             managerCollateralAta,

package/dist/target/idl/xitadel.json

@@ -1436,6 +1436,17 @@
                     ],
                     "writable": true
                 },
+                {
+                    "name": "position_nft_mint_b",
+                    "writable": true
+                },
+                {
+                    "name": "position_nft_account_b",
+                    "docs": [
+                        "The position NFT token account for pool B owned by LP authority (pass same as position_nft_account if single pool)"
+                    ],
+                    "writable": true
+                },
                 {
                     "name": "harvest_vault_position_nft_ata",
                     "docs": [
@@ -1443,6 +1454,13 @@
                     ],
                     "writable": true
                 },
+                {
+                    "name": "harvest_vault_position_nft_ata_b",
+                    "docs": [
+                        "The harvest vault's position NFT token account for pool B (pass same as harvest_vault_position_nft_ata if single pool)"
+                    ],
+                    "writable": true
+                },
                 {
                     "name": "harvest_vault_funding_ata",
                     "docs": [
@@ -2617,6 +2635,24 @@
                     "name": "manager_position_nft_ata",
                     "writable": true
                 },
+                {
+                    "name": "position_nft_mint_b",
+                    "writable": true
+                },
+                {
+                    "name": "harvest_vault_position_nft_ata_b",
+                    "docs": [
+                        "Harvest vault's position NFT ATA for pool B (pass same as harvest_vault_position_nft_ata if single pool)"
+                    ],
+                    "writable": true
+                },
+                {
+                    "name": "manager_position_nft_ata_b",
+                    "docs": [
+                        "Manager's position NFT ATA for pool B (pass same as manager_position_nft_ata if single pool)"
+                    ],
+                    "writable": true
+                },
                 {
                     "name": "harvest_vault_funding_ata",
                     "writable": true,

package/dist/target/types/xitadel.d.ts

@@ -1442,6 +1442,17 @@ export type Xitadel = {
                     ];
                     "writable": true;
                 },
+                {
+                    "name": "positionNftMintB";
+                    "writable": true;
+                },
+                {
+                    "name": "positionNftAccountB";
+                    "docs": [
+                        "The position NFT token account for pool B owned by LP authority (pass same as position_nft_account if single pool)"
+                    ];
+                    "writable": true;
+                },
                 {
                     "name": "harvestVaultPositionNftAta";
                     "docs": [
@@ -1449,6 +1460,13 @@ export type Xitadel = {
                     ];
                     "writable": true;
                 },
+                {
+                    "name": "harvestVaultPositionNftAtaB";
+                    "docs": [
+                        "The harvest vault's position NFT token account for pool B (pass same as harvest_vault_position_nft_ata if single pool)"
+                    ];
+                    "writable": true;
+                },
                 {
                     "name": "harvestVaultFundingAta";
                     "docs": [
@@ -2623,6 +2641,24 @@ export type Xitadel = {
                     "name": "managerPositionNftAta";
                     "writable": true;
                 },
+                {
+                    "name": "positionNftMintB";
+                    "writable": true;
+                },
+                {
+                    "name": "harvestVaultPositionNftAtaB";
+                    "docs": [
+                        "Harvest vault's position NFT ATA for pool B (pass same as harvest_vault_position_nft_ata if single pool)"
+                    ];
+                    "writable": true;
+                },
+                {
+                    "name": "managerPositionNftAtaB";
+                    "docs": [
+                        "Manager's position NFT ATA for pool B (pass same as manager_position_nft_ata if single pool)"
+                    ];
+                    "writable": true;
+                },
                 {
                     "name": "harvestVaultFundingAta";
                     "writable": true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@xitadel-fi/sdk",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "SDK for interacting with the Xitadel program",
   "main": "dist/sdk/src/index.js",
   "types": "dist/sdk/src/index.d.ts",