100x-sdk 1.0.1 → 1.0.3

package/dist/100x-sdk.js

@@ -20409,6 +20409,7 @@
 	        mintAccount: mint,
 	        curveAccount: accounts.curveAccount,
 	        poolTokenAccount: accounts.poolTokenAccount,
+	        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
 	        poolSolAccount: accounts.poolSolAccount,
 	        upOrderbook: upOrderbook,
 	        downOrderbook: downOrderbook,
@@ -20545,6 +20546,7 @@
 	        mintAccount: mint,
 	        curveAccount: accounts.curveAccount,
 	        poolTokenAccount: accounts.poolTokenAccount,
+	        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
 	        poolSolAccount: accounts.poolSolAccount,
 	        upOrderbook: upOrderbook,
 	        downOrderbook: downOrderbook,
@@ -20666,6 +20668,7 @@
 	        mintAccount: mint,
 	        curveAccount: accounts.curveAccount,
 	        poolTokenAccount: accounts.poolTokenAccount,
+	        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
 	        poolSolAccount: accounts.poolSolAccount,
 	        tokenProgram: TOKEN_PROGRAM_ID$2,
 	        systemProgram: SystemProgram$3.programId,
@@ -20777,6 +20780,7 @@
 	        mintAccount: mint,
 	        curveAccount: accounts.curveAccount,
 	        poolTokenAccount: accounts.poolTokenAccount,
+	        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
 	        poolSolAccount: accounts.poolSolAccount,
 	        tokenProgram: TOKEN_PROGRAM_ID$2,
 	        systemProgram: SystemProgram$3.programId,
@@ -20920,6 +20924,7 @@
 	        mintAccount: mint,
 	        curveAccount: accounts.curveAccount,
 	        poolTokenAccount: accounts.poolTokenAccount,
+	        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
 	        poolSolAccount: accounts.poolSolAccount,
 	        userSolAccount: userSolAccountPubkey,  // 开仓用户的SOL账户 / User SOL account (must be order opener)
 	        tokenProgram: TOKEN_PROGRAM_ID$2,
@@ -21069,6 +21074,7 @@
 	        mintAccount: mint,
 	        curveAccount: accounts.curveAccount,
 	        poolTokenAccount: accounts.poolTokenAccount,
+	        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
 	        poolSolAccount: accounts.poolSolAccount,
 	        userSolAccount: userSolAccountPubkey,  // 开仓用户的SOL账户 / User SOL account (must be order opener)
 	        tokenProgram: TOKEN_PROGRAM_ID$2,
@@ -21130,6 +21136,12 @@
 	      this.sdk.programId
 	    );
 
+	    // 计算借贷池专用代币账户 PDA
+	    const [poolBorrowTokenAccount] = PublicKey$6.findProgramAddressSync(
+	      [Buffer$6.from('pool_borrow_token'), mintAccount.toBuffer()],
+	      this.sdk.programId
+	    );
+
 	    // 计算池子 SOL 账户 PDA
 	    const [poolSolAccount] = PublicKey$6.findProgramAddressSync(
 	      [Buffer$6.from('pool_sol'), mintAccount.toBuffer()],
@@ -21139,6 +21151,7 @@
 	    return {
 	      curveAccount,
 	      poolTokenAccount,
+	      poolBorrowTokenAccount,
 	      poolSolAccount
 	    };
 	  }
@@ -21279,6 +21292,15 @@
 	      this.sdk.programId
 	    );
 
+	    // Calculate borrow pool token account address (pool_borrow_token)
+	    const [poolBorrowTokenAccount] = PublicKey$5.findProgramAddressSync(
+	      [
+	        Buffer$5.from("pool_borrow_token"),
+	        mint.publicKey.toBuffer(),
+	      ],
+	      this.sdk.programId
+	    );
+
 	    // Calculate liquidity pool SOL account address (pool_sol)
 	    const [poolSolAccount] = PublicKey$5.findProgramAddressSync(
 	      [
@@ -21318,6 +21340,7 @@
 	    console.log('Calculated account addresses:');
 	    console.log('  Borrowing liquidity pool account:', curveAccount.toString());
 	    console.log('  Liquidity pool token account:', poolTokenAccount.toString());
+	    console.log('  Borrow pool token account:', poolBorrowTokenAccount.toString());
 	    console.log('  Liquidity pool SOL account:', poolSolAccount.toString());
 	    console.log('  Up orderbook:', upOrderbook.toString());
 	    console.log('  Down orderbook:', downOrderbook.toString());
@@ -21351,6 +21374,7 @@
 	        mintAccount: mint.publicKey,
 	        curveAccount: curveAccount,
 	        poolTokenAccount: poolTokenAccount,
+	        poolBorrowTokenAccount: poolBorrowTokenAccount,
 	        poolSolAccount: poolSolAccount,
 	        upOrderbook: upOrderbook,
 	        downOrderbook: downOrderbook,
@@ -21377,6 +21401,7 @@
 	        mint: mint.publicKey,
 	        curveAccount,
 	        poolTokenAccount,
+	        poolBorrowTokenAccount,
 	        poolSolAccount,
 	        upOrderbook,
 	        downOrderbook,
@@ -21540,6 +21565,7 @@
 	        mintAccount: mintPubkey,
 	        curveAccount: createResult.accounts.curveAccount,
 	        poolTokenAccount: createResult.accounts.poolTokenAccount,
+	        poolBorrowTokenAccount: createResult.accounts.poolBorrowTokenAccount,
 	        poolSolAccount: createResult.accounts.poolSolAccount,
 	        upOrderbook: upOrderbook,
 	        downOrderbook: downOrderbook,
@@ -36806,12 +36832,20 @@
 	   * @returns {string} returns.downOrderbook - Down orderbook (long orders) PDA address
 	   * @returns {string} returns.creator - Token creator address, the wallet that created this token
 	   * @returns {string} returns.poolTokenAccount - Pool token account address, stores tokens in the liquidity pool
+	   * @returns {string} returns.poolBorrowTokenAccount - Pool borrow token account address (PDA seed "pool_borrow_token"), stores tokens for the borrow pool
 	   * @returns {string} returns.poolSolAccount - Pool SOL account address, stores native SOL in the liquidity pool
 	   *
+	   * **Dynamic Liquidity Pool Parameters:**
+	   * @returns {bigint} returns.initialVirtualSol - Initial virtual SOL reserve (lamports), used for k value / price curve
+	   * @returns {bigint} returns.initialVirtualToken - Initial virtual Token reserve (smallest unit), used for k value / price curve
+	   * @returns {bigint} returns.initialBorrowTokenReserve - Borrow pool initial funding (smallest unit), never changes after creation. Borrowed out = initialBorrowTokenReserve - borrowTokenReserve
+	   * @returns {number} returns.poolType - Pool type (0: basic version, 1: advanced version)
+	   * @returns {number} returns.borrowPoolRatio - Borrow pool token ratio (5-30 means 5%-30%, basic version fixed at 20)
+	   *
 	   * **Token Supply Information:**
 	   * @returns {bigint} returns.totalSupply - Total token supply (smallest unit)
 	   * @returns {number} returns.decimals - Token decimal places
-	   * @returns {bigint} returns.initialBorrowPool - Initial borrow pool size = totalSupply - initialVirtualToken
+	   * @returns {bigint} returns.initialBorrowPool - Initial borrow pool size (= initialBorrowTokenReserve from chain)
 	   * @returns {bigint} returns.circulatingSupply - Circulating supply = totalSupply - borrowTokenReserve
 	   *
 	   * **Balance Information:**
@@ -36967,6 +37001,15 @@
 	        this.sdk.programId
 	      );
 
+	      // 借贷池专用 token 账户 PDA（合约新增，seed = "pool_borrow_token"）
+	      const [poolBorrowTokenAccountPDA] = PublicKey$3.findProgramAddressSync(
+	        [
+	          Buffer$3.from("pool_borrow_token"),
+	          mintPubkey.toBuffer()
+	        ],
+	        this.sdk.programId
+	      );
+
 	      const [poolSolAccountPDA] = PublicKey$3.findProgramAddressSync(
 	        [
 	          Buffer$3.from("pool_sol"),
@@ -36979,6 +37022,7 @@
 	      let baseFeeRecipientBalance = 0;
 	      let feeRecipientBalance = 0;
 	      let poolTokenBalance = { value: { amount: '0' } };
+	      let poolBorrowTokenBalance = { value: { amount: '0' } };
 	      let poolSolBalance = 0;
 	      let tokenSupply = { value: { amount: '0', decimals: 0 } };
 
@@ -36987,12 +37031,14 @@
 	          baseFeeRecipientBalance,
 	          feeRecipientBalance,
 	          poolTokenBalance,
+	          poolBorrowTokenBalance,
 	          poolSolBalance,
 	          tokenSupply
 	        ] = await Promise.all([
 	          this.sdk.connection.getBalance(decodedData.baseFeeRecipient),
 	          this.sdk.connection.getBalance(decodedData.feeRecipient),
 	          this.sdk.connection.getTokenAccountBalance(poolTokenAccountPDA).catch(() => ({ value: { amount: '0' } })),
+	          this.sdk.connection.getTokenAccountBalance(poolBorrowTokenAccountPDA).catch(() => ({ value: { amount: '0' } })),
 	          this.sdk.connection.getBalance(poolSolAccountPDA),
 	          this.sdk.connection.getTokenSupply(mintPubkey)
 	        ]);
@@ -37031,6 +37077,10 @@
 	        initialVirtualSol: BigInt(decodedData.initialVirtualSol.toString()),        // u64, lamports
 	        initialVirtualToken: BigInt(decodedData.initialVirtualToken.toString()),    // u64, 最小单位
 
+	        // 借贷池初始资金（合约新增），创建后永不变
+	        // 已借出量 = initialBorrowTokenReserve - borrowTokenReserve
+	        initialBorrowTokenReserve: BigInt(decodedData.initialBorrowTokenReserve.toString()), // u64, 最小单位
+
 	        // === 第二阶段新增字段：高级版池子参数 ===
 	        poolType: decodedData.poolType,                           // u8, 0=普通版, 1=高级版
 	        borrowPoolRatio: decodedData.borrowPoolRatio,            // u8, 5-30表示5%-30%
@@ -37038,7 +37088,8 @@
 	        // Token Supply 信息
 	        totalSupply: BigInt(tokenSupply.value.amount),
 	        decimals: tokenSupply.value.decimals,
-	        initialBorrowPool: BigInt(tokenSupply.value.amount) - BigInt(decodedData.initialVirtualToken.toString()),
+	        // 借贷池初始总量，直接取链上字段（旧公式 totalSupply - initialVirtualToken 已废弃）
+	        initialBorrowPool: BigInt(decodedData.initialBorrowTokenReserve.toString()),
 	        circulatingSupply: BigInt(decodedData.initialVirtualToken.toString())
 	          + (BigInt(tokenSupply.value.amount) - BigInt(decodedData.initialVirtualToken.toString()) - BigInt(decodedData.borrowTokenReserve.toString())),
 
@@ -37047,10 +37098,12 @@
 	        feeRecipientBalance: feeRecipientBalance,          // Unit: lamports
 
 	        // Pool account information
-	        poolTokenAccount: poolTokenAccountPDA.toString(),           // Pool token account address
-	        poolSolAccount: poolSolAccountPDA.toString(),               // Pool SOL account address
-	        poolTokenBalance: BigInt(poolTokenBalance.value.amount),    // Pool token balance
-	        poolSolBalance: poolSolBalance,                             // Pool SOL balance (lamports)
+	        poolTokenAccount: poolTokenAccountPDA.toString(),                 // Pool token account address
+	        poolBorrowTokenAccount: poolBorrowTokenAccountPDA.toString(),     // Pool borrow token account address (新增)
+	        poolSolAccount: poolSolAccountPDA.toString(),                     // Pool SOL account address
+	        poolTokenBalance: BigInt(poolTokenBalance.value.amount),          // Pool token balance
+	        poolBorrowTokenBalance: BigInt(poolBorrowTokenBalance.value.amount), // Pool borrow token balance (= borrowTokenReserve, 新增)
+	        poolSolBalance: poolSolBalance,                                   // Pool SOL balance (lamports)
 
 	        // Additional metadata
 	        _metadata: {
@@ -38688,6 +38741,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -39015,6 +39102,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -39227,6 +39348,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -39667,6 +39822,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -39902,6 +40091,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -40114,6 +40337,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -40441,6 +40698,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -41610,6 +41901,16 @@
 						],
 						type: "u64"
 					},
+					{
+						name: "initial_borrow_token_reserve",
+						docs: [
+							"Borrow pool initial funding (initial token amount minted into borrow pool at creation)",
+							"Unlike borrow_token_reserve which changes in real time with borrow/repay,",
+							"this field never changes after creation; used by external parties to compute",
+							"\"borrowed out = initial funding - current available reserve\"."
+						],
+						type: "u64"
+					},
 					{
 						name: "pool_type",
 						docs: [
@@ -41737,9 +42038,21 @@
 						type: "pubkey"
 					},
 					{
-						name: "order_id",
-						type: "u64"
-					},
+						name: "is_buy",
+						type: "bool"
+					},
+					{
+						name: "token_amount",
+						type: "u64"
+					},
+					{
+						name: "sol_amount",
+						type: "u64"
+					},
+					{
+						name: "order_id",
+						type: "u64"
+					},
 					{
 						name: "order_index",
 						type: "u16"
@@ -42078,6 +42391,10 @@
 						name: "pool_token_account",
 						type: "pubkey"
 					},
+					{
+						name: "pool_borrow_token_account",
+						type: "pubkey"
+					},
 					{
 						name: "pool_sol_account",
 						type: "pubkey"
@@ -42138,6 +42455,10 @@
 						name: "initial_virtual_token",
 						type: "u64"
 					},
+					{
+						name: "initial_borrow_token_reserve",
+						type: "u64"
+					},
 					{
 						name: "pool_type",
 						type: "u8"
@@ -42434,6 +42755,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -42761,6 +43116,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -42973,6 +43362,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -43413,6 +43836,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -43648,6 +44105,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -43860,6 +44351,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -44187,6 +44712,40 @@
 						]
 					}
 				},
+				{
+					name: "pool_borrow_token_account",
+					writable: true,
+					pda: {
+						seeds: [
+							{
+								kind: "const",
+								value: [
+									112,
+									111,
+									111,
+									108,
+									95,
+									98,
+									111,
+									114,
+									114,
+									111,
+									119,
+									95,
+									116,
+									111,
+									107,
+									101,
+									110
+								]
+							},
+							{
+								kind: "account",
+								path: "mint_account"
+							}
+						]
+					}
+				},
 				{
 					name: "pool_sol_account",
 					writable: true,
@@ -45356,6 +45915,16 @@
 						],
 						type: "u64"
 					},
+					{
+						name: "initial_borrow_token_reserve",
+						docs: [
+							"Borrow pool initial funding (initial token amount minted into borrow pool at creation)",
+							"Unlike borrow_token_reserve which changes in real time with borrow/repay,",
+							"this field never changes after creation; used by external parties to compute",
+							"\"borrowed out = initial funding - current available reserve\"."
+						],
+						type: "u64"
+					},
 					{
 						name: "pool_type",
 						docs: [
@@ -45482,6 +46051,18 @@
 						name: "mint_account",
 						type: "pubkey"
 					},
+					{
+						name: "is_buy",
+						type: "bool"
+					},
+					{
+						name: "token_amount",
+						type: "u64"
+					},
+					{
+						name: "sol_amount",
+						type: "u64"
+					},
 					{
 						name: "order_id",
 						type: "u64"
@@ -45824,6 +46405,10 @@
 						name: "pool_token_account",
 						type: "pubkey"
 					},
+					{
+						name: "pool_borrow_token_account",
+						type: "pubkey"
+					},
 					{
 						name: "pool_sol_account",
 						type: "pubkey"
@@ -45884,6 +46469,10 @@
 						name: "initial_virtual_token",
 						type: "u64"
 					},
+					{
+						name: "initial_borrow_token_reserve",
+						type: "u64"
+					},
 					{
 						name: "pool_type",
 						type: "u8"