@xitadel-fi/sdk 0.1.4 → 0.1.5

package/dist/sdk/src/program.js

@@ -165,7 +165,6 @@ class XitadelProgram {
      */
     async fundLTT(lttId, investor, fundingAmount) {
         const lttConfigPda = this.getLTTConfigPda(lttId);
-        const fundingRecordPda = this.getFundingRecordPda(lttConfigPda, investor);
         const lttConfig = await this.program.account.lttConfiguration.fetch(lttConfigPda);
         const fundingTokenMint = lttConfig.fundingTokenMint;
         const fundingVaultAta = (0, spl_token_1.getAssociatedTokenAddressSync)(fundingTokenMint, lttConfigPda, true);
@@ -506,9 +505,6 @@ class XitadelProgram {
         const lpAuthority = this.getLpAuthority();
         const lttConfigPda = this.getLTTConfigPda(params.lttId);
         const lttTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(params.lttId, lpAuthority, true);
-        const lpUsdcAta = (0, spl_token_1.getAssociatedTokenAddressSync)(params.stableCoinMint, lpAuthority, true);
-        const fundingVaultAta = (0, spl_token_1.getAssociatedTokenAddressSync)(params.stableCoinMint, lttConfigPda, true);
-        // console.log("lpAuthority", lpAuthority.toBase58());
         const instructions = [];
         // Create stable coin token account if it doesn't exist
         const stableCoinVaultTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(params.stableCoinMint, lpAuthority, true);
@@ -572,29 +568,37 @@ class XitadelProgram {
             recentSlot: await this.program.provider.connection.getSlot(),
         });
         const addresses = [
+            signer,
             lttConfigPda,
             lpAuthority,
             poolAuthority,
+            pool,
+            poolb,
             lpMint,
             ammConfig,
             ammConfigB,
             params.lttId,
             params.stableCoinMint,
-            fundingVaultAta,
-            lttVaultAta,
-            stableVaultAta,
-            lttTokenAccount,
-            lpUsdcAta,
+            fundingVaultTokenAccount,
             lttVaultAta,
             stableVaultAta,
             lttVaultAtaB,
             stableVaultAtaB,
-            collateralVaultAta,
-            eventAuthority,
+            payerLttTokenAccount,
+            payerStableCoinTokenAccount,
+            positionNftMintKeypair.publicKey,
+            positionNftMintKeypairB.publicKey,
+            positionNftAccount,
+            positionNftAccountB,
+            position,
+            positionB,
             spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             web3_js_2.SystemProgram.programId,
+            collateralVaultAta,
+            spl_token_1.TOKEN_PROGRAM_ID,
             spl_token_1.TOKEN_PROGRAM_ID,
             spl_token_1.TOKEN_2022_PROGRAM_ID,
+            eventAuthority,
             params.cpAmmProgramId,
             web3_js_1.SYSVAR_RENT_PUBKEY,
         ];
@@ -772,7 +776,6 @@ class XitadelProgram {
         const managerFundingAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.fundingTokenMint, manager, true, spl_token_1.TOKEN_PROGRAM_ID);
         const managerCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.collateralTokenMint, manager, true, spl_token_1.TOKEN_PROGRAM_ID);
         const fundingVaultAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.fundingTokenMint, lttConfigPda, true, spl_token_1.TOKEN_PROGRAM_ID);
-        const collateralVaultAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.collateralTokenMint, lttConfigPda, true, spl_token_1.TOKEN_PROGRAM_ID);
         const interestVaultAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lttConfig.fundingTokenMint, lttConfigPda, true, spl_token_1.TOKEN_PROGRAM_ID);
         const instructions = [];
         // Create missing ATAs if needed
@@ -988,9 +991,10 @@ class XitadelProgram {
         const configPda = this.getConfigPda();
         const lttConfigPda = this.getLTTConfigPda(lttId);
         const collateralVaultAta = (0, spl_token_1.getAssociatedTokenAddressSync)(lpTokenMint, lttConfigPda, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-        const tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("token_stake"), lttConfigPda.toBuffer()], flashTradeProgramId)[0];
+        const tokenStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('token_stake'), lttConfigPda.toBuffer()], flashTradeProgramId)[0];
         let tokenStakeAccounts = [];
-        if (tokenStakeAccount && await (0, utils_1.checkIfAccountExists)(tokenStakeAccount, this.program.provider.connection)) {
+        if (tokenStakeAccount &&
+            (await (0, utils_1.checkIfAccountExists)(tokenStakeAccount, this.program.provider.connection))) {
             tokenStakeAccounts.push({
                 pubkey: tokenStakeAccount,
                 isSigner: false,

package/dist/target/idl/xitadel.json

@@ -5356,26 +5356,41 @@
         },
         {
             "code": 6032,
+            "name": "WithdrawalNotAllowed",
+            "msg": "Withdrawal of staked collateral is only allowed when maturity time is reached or liquidation has started"
+        },
+        {
+            "code": 6033,
+            "name": "StakedCollateralNotWithdrawnForMaturity",
+            "msg": "All staked collateral must be withdrawn before maturity"
+        },
+        {
+            "code": 6034,
+            "name": "StakedCollateralNotWithdrawnForLiquidation",
+            "msg": "All staked collateral must be withdrawn before liquidation execution"
+        },
+        {
+            "code": 6035,
             "name": "InvalidAccount",
             "msg": "Invalid Account"
         },
         {
-            "code": 6033,
+            "code": 6036,
             "name": "InvalidAccessController",
             "msg": "Invalid access controller account"
         },
         {
-            "code": 6034,
+            "code": 6037,
             "name": "InvalidConfigAccount",
             "msg": "Invalid config account"
         },
         {
-            "code": 6035,
+            "code": 6038,
             "name": "InvalidPriceFeedId",
             "msg": "Invalid price feed ID"
         },
         {
-            "code": 6036,
+            "code": 6039,
             "name": "InvalidVerifierAccount",
             "msg": "Invalid verifier account"
         }

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

@@ -5362,26 +5362,41 @@ export type Xitadel = {
         },
         {
             "code": 6032;
+            "name": "withdrawalNotAllowed";
+            "msg": "Withdrawal of staked collateral is only allowed when maturity time is reached or liquidation has started";
+        },
+        {
+            "code": 6033;
+            "name": "stakedCollateralNotWithdrawnForMaturity";
+            "msg": "All staked collateral must be withdrawn before maturity";
+        },
+        {
+            "code": 6034;
+            "name": "stakedCollateralNotWithdrawnForLiquidation";
+            "msg": "All staked collateral must be withdrawn before liquidation execution";
+        },
+        {
+            "code": 6035;
             "name": "invalidAccount";
             "msg": "Invalid Account";
         },
         {
-            "code": 6033;
+            "code": 6036;
             "name": "invalidAccessController";
             "msg": "Invalid access controller account";
         },
         {
-            "code": 6034;
+            "code": 6037;
             "name": "invalidConfigAccount";
             "msg": "Invalid config account";
         },
         {
-            "code": 6035;
+            "code": 6038;
             "name": "invalidPriceFeedId";
             "msg": "Invalid price feed ID";
         },
         {
-            "code": 6036;
+            "code": 6039;
             "name": "invalidVerifierAccount";
             "msg": "Invalid verifier account";
         }

package/package.json

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