100x-sdk 1.0.1 → 1.0.3

package/src/modules/chain.js

@@ -68,12 +68,20 @@ class ChainModule {
    * @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:**
@@ -229,6 +237,15 @@ class ChainModule {
         this.sdk.programId
       );
 
+      // 借贷池专用 token 账户 PDA（合约新增，seed = "pool_borrow_token"）
+      const [poolBorrowTokenAccountPDA] = PublicKey.findProgramAddressSync(
+        [
+          Buffer.from("pool_borrow_token"),
+          mintPubkey.toBuffer()
+        ],
+        this.sdk.programId
+      );
+
       const [poolSolAccountPDA] = PublicKey.findProgramAddressSync(
         [
           Buffer.from("pool_sol"),
@@ -241,6 +258,7 @@ class ChainModule {
       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 } };
 
@@ -249,12 +267,14 @@ class ChainModule {
           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)
         ]);
@@ -293,6 +313,10 @@ class ChainModule {
         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%
@@ -300,7 +324,8 @@ class ChainModule {
         // 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())),
 
@@ -309,10 +334,12 @@ class ChainModule {
         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: {

package/src/modules/token.js

@@ -127,6 +127,15 @@ class TokenModule {
       this.sdk.programId
     );
 
+    // Calculate borrow pool token account address (pool_borrow_token)
+    const [poolBorrowTokenAccount] = PublicKey.findProgramAddressSync(
+      [
+        Buffer.from("pool_borrow_token"),
+        mint.publicKey.toBuffer(),
+      ],
+      this.sdk.programId
+    );
+
     // Calculate liquidity pool SOL account address (pool_sol)
     const [poolSolAccount] = PublicKey.findProgramAddressSync(
       [
@@ -166,6 +175,7 @@ class TokenModule {
     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());
@@ -199,6 +209,7 @@ class TokenModule {
         mintAccount: mint.publicKey,
         curveAccount: curveAccount,
         poolTokenAccount: poolTokenAccount,
+        poolBorrowTokenAccount: poolBorrowTokenAccount,
         poolSolAccount: poolSolAccount,
         upOrderbook: upOrderbook,
         downOrderbook: downOrderbook,
@@ -225,6 +236,7 @@ class TokenModule {
         mint: mint.publicKey,
         curveAccount,
         poolTokenAccount,
+        poolBorrowTokenAccount,
         poolSolAccount,
         upOrderbook,
         downOrderbook,
@@ -388,6 +400,7 @@ class TokenModule {
         mintAccount: mintPubkey,
         curveAccount: createResult.accounts.curveAccount,
         poolTokenAccount: createResult.accounts.poolTokenAccount,
+        poolBorrowTokenAccount: createResult.accounts.poolBorrowTokenAccount,
         poolSolAccount: createResult.accounts.poolSolAccount,
         upOrderbook: upOrderbook,
         downOrderbook: downOrderbook,

package/src/modules/trading.js

@@ -106,6 +106,7 @@ class TradingModule {
         mintAccount: mint,
         curveAccount: accounts.curveAccount,
         poolTokenAccount: accounts.poolTokenAccount,
+        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
         poolSolAccount: accounts.poolSolAccount,
         upOrderbook: upOrderbook,
         downOrderbook: downOrderbook,
@@ -242,6 +243,7 @@ class TradingModule {
         mintAccount: mint,
         curveAccount: accounts.curveAccount,
         poolTokenAccount: accounts.poolTokenAccount,
+        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
         poolSolAccount: accounts.poolSolAccount,
         upOrderbook: upOrderbook,
         downOrderbook: downOrderbook,
@@ -363,6 +365,7 @@ class TradingModule {
         mintAccount: mint,
         curveAccount: accounts.curveAccount,
         poolTokenAccount: accounts.poolTokenAccount,
+        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
         poolSolAccount: accounts.poolSolAccount,
         tokenProgram: TOKEN_PROGRAM_ID,
         systemProgram: SystemProgram.programId,
@@ -474,6 +477,7 @@ class TradingModule {
         mintAccount: mint,
         curveAccount: accounts.curveAccount,
         poolTokenAccount: accounts.poolTokenAccount,
+        poolBorrowTokenAccount: accounts.poolBorrowTokenAccount,
         poolSolAccount: accounts.poolSolAccount,
         tokenProgram: TOKEN_PROGRAM_ID,
         systemProgram: SystemProgram.programId,
@@ -617,6 +621,7 @@ class TradingModule {
         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,
@@ -766,6 +771,7 @@ class TradingModule {
         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,
@@ -827,6 +833,12 @@ class TradingModule {
       this.sdk.programId
     );
 
+    // 计算借贷池专用代币账户 PDA
+    const [poolBorrowTokenAccount] = PublicKey.findProgramAddressSync(
+      [Buffer.from('pool_borrow_token'), mintAccount.toBuffer()],
+      this.sdk.programId
+    );
+
     // 计算池子 SOL 账户 PDA
     const [poolSolAccount] = PublicKey.findProgramAddressSync(
       [Buffer.from('pool_sol'), mintAccount.toBuffer()],
@@ -836,6 +848,7 @@ class TradingModule {
     return {
       curveAccount,
       poolTokenAccount,
+      poolBorrowTokenAccount,
       poolSolAccount
     };
   }