pinpet-sdk 2.0.3 → 2.0.5

package/dist/pinpet-sdk.cjs.js

@@ -15628,7 +15628,7 @@ const { ComputeBudgetProgram: ComputeBudgetProgram$1, PublicKey: PublicKey$6, Tr
 const { createAssociatedTokenAccountInstruction: createAssociatedTokenAccountInstruction$1, getAssociatedTokenAddress: getAssociatedTokenAddress$2, TOKEN_PROGRAM_ID: TOKEN_PROGRAM_ID$2, ASSOCIATED_TOKEN_PROGRAM_ID: ASSOCIATED_TOKEN_PROGRAM_ID$2 } = cjs$3;
 const anchor$4 = require$$0__default$3["default"];
 // 统一使用 buffer 包，所有平台一致
-const { Buffer: Buffer$5 } = require$$3__default["default"];
+const { Buffer: Buffer$6 } = require$$3__default["default"];
 const { MAX_CANDIDATE_INDICES: MAX_CANDIDATE_INDICES$2 } = utils$2;
 
 // 环境检测和条件加载
@@ -15677,12 +15677,12 @@ class TradingModule$1 {
 
     // 3. Calculate orderbook PDAs
     const [upOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('up_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('up_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
     const [downOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('down_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('down_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
@@ -15713,7 +15713,7 @@ class TradingModule$1 {
     // 6.5. Calculate cooldown PDA
     const [cooldownPDA] = PublicKey$6.findProgramAddressSync(
       [
-        Buffer$5.from('trade_cooldown'),
+        Buffer$6.from('trade_cooldown'),
         mint.toBuffer(),
         payer.toBuffer()
       ],
@@ -15813,12 +15813,12 @@ class TradingModule$1 {
 
     // 3. Calculate orderbook PDAs
     const [upOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('up_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('up_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
     const [downOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('down_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('down_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
@@ -15849,7 +15849,7 @@ class TradingModule$1 {
     // 6.5. Calculate cooldown PDA
     const [cooldownPDA] = PublicKey$6.findProgramAddressSync(
       [
-        Buffer$5.from('trade_cooldown'),
+        Buffer$6.from('trade_cooldown'),
         mint.toBuffer(),
         payer.toBuffer()
       ],
@@ -15962,12 +15962,12 @@ class TradingModule$1 {
 
     // 3. Calculate OrderBook PDA addresses
     const [upOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from("up_orderbook"), mint.toBuffer()],
+      [Buffer$6.from("up_orderbook"), mint.toBuffer()],
       this.sdk.programId
     );
 
     const [downOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from("down_orderbook"), mint.toBuffer()],
+      [Buffer$6.from("down_orderbook"), mint.toBuffer()],
       this.sdk.programId
     );
 
@@ -16073,12 +16073,12 @@ class TradingModule$1 {
 
     // 3. Calculate OrderBook PDA addresses
     const [upOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from("up_orderbook"), mint.toBuffer()],
+      [Buffer$6.from("up_orderbook"), mint.toBuffer()],
       this.sdk.programId
     );
 
     const [downOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from("down_orderbook"), mint.toBuffer()],
+      [Buffer$6.from("down_orderbook"), mint.toBuffer()],
       this.sdk.programId
     );
 
@@ -16212,12 +16212,12 @@ class TradingModule$1 {
 
     // 3. 计算 OrderBook PDA 地址 / Calculate OrderBook PDA addresses
     const [upOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('up_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('up_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
     const [downOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('down_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('down_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
@@ -16361,12 +16361,12 @@ class TradingModule$1 {
 
     // 3. 计算 OrderBook PDA 地址 / Calculate OrderBook PDA addresses
     const [upOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('up_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('up_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
     const [downOrderbook] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('down_orderbook'), mint.toBuffer()],
+      [Buffer$6.from('down_orderbook'), mint.toBuffer()],
       this.sdk.programId
     );
 
@@ -16443,19 +16443,19 @@ class TradingModule$1 {
   _calculatePDAAccounts(mintAccount) {
     // 计算曲线账户 PDA
     const [curveAccount] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('borrowing_curve'), mintAccount.toBuffer()],
+      [Buffer$6.from('borrowing_curve'), mintAccount.toBuffer()],
       this.sdk.programId
     );
 
     // 计算池子代币账户 PDA
     const [poolTokenAccount] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('pool_token'), mintAccount.toBuffer()],
+      [Buffer$6.from('pool_token'), mintAccount.toBuffer()],
       this.sdk.programId
     );
 
     // 计算池子 SOL 账户 PDA
     const [poolSolAccount] = PublicKey$6.findProgramAddressSync(
-      [Buffer$5.from('pool_sol'), mintAccount.toBuffer()],
+      [Buffer$6.from('pool_sol'), mintAccount.toBuffer()],
       this.sdk.programId
     );
 
@@ -16477,7 +16477,7 @@ const { ComputeBudgetProgram, PublicKey: PublicKey$5, Transaction: Transaction$1
 const { TOKEN_PROGRAM_ID: TOKEN_PROGRAM_ID$1, getAssociatedTokenAddress: getAssociatedTokenAddress$1, createAssociatedTokenAccountInstruction, ASSOCIATED_TOKEN_PROGRAM_ID: ASSOCIATED_TOKEN_PROGRAM_ID$1 } = cjs$3;
 const anchor$3 = require$$0__default$3["default"];
 // 统一使用 buffer 包，所有平台一致
-const { Buffer: Buffer$4 } = require$$3__default["default"];
+const { Buffer: Buffer$5 } = require$$3__default["default"];
 
 // Metaplex Token Metadata 程序ID
 const METADATA_PROGRAM_ID = new PublicKey$5("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
@@ -16519,7 +16519,7 @@ class TokenModule$1 {
     // Calculate borrowing liquidity pool account address (borrowing_curve)
     const [curveAccount] = PublicKey$5.findProgramAddressSync(
       [
-        Buffer$4.from("borrowing_curve"),
+        Buffer$5.from("borrowing_curve"),
         mint.publicKey.toBuffer(),
       ],
       this.sdk.programId
@@ -16528,7 +16528,7 @@ class TokenModule$1 {
     // Calculate liquidity pool token account address (pool_token)
     const [poolTokenAccount] = PublicKey$5.findProgramAddressSync(
       [
-        Buffer$4.from("pool_token"),
+        Buffer$5.from("pool_token"),
         mint.publicKey.toBuffer(),
       ],
       this.sdk.programId
@@ -16537,7 +16537,7 @@ class TokenModule$1 {
     // Calculate liquidity pool SOL account address (pool_sol)
     const [poolSolAccount] = PublicKey$5.findProgramAddressSync(
       [
-        Buffer$4.from("pool_sol"),
+        Buffer$5.from("pool_sol"),
         mint.publicKey.toBuffer(),
       ],
       this.sdk.programId
@@ -16546,7 +16546,7 @@ class TokenModule$1 {
     // Calculate order book accounts (new)
     const [upOrderbook] = PublicKey$5.findProgramAddressSync(
       [
-        Buffer$4.from("up_orderbook"),
+        Buffer$5.from("up_orderbook"),
         mint.publicKey.toBuffer(),
       ],
       this.sdk.programId
@@ -16554,7 +16554,7 @@ class TokenModule$1 {
 
     const [downOrderbook] = PublicKey$5.findProgramAddressSync(
       [
-        Buffer$4.from("down_orderbook"),
+        Buffer$5.from("down_orderbook"),
         mint.publicKey.toBuffer(),
       ],
       this.sdk.programId
@@ -16563,7 +16563,7 @@ class TokenModule$1 {
     // Calculate Metaplex metadata account address
     const [metadataAccount] = PublicKey$5.findProgramAddressSync(
       [
-        Buffer$4.from("metadata"),
+        Buffer$5.from("metadata"),
         METADATA_PROGRAM_ID.toBuffer(),
         mint.publicKey.toBuffer(),
       ],
@@ -16715,7 +16715,7 @@ class TokenModule$1 {
     // 计算 cooldown PDA
     const [cooldownPDA] = PublicKey$5.findProgramAddressSync(
       [
-        Buffer$4.from('trade_cooldown'),
+        Buffer$5.from('trade_cooldown'),
         mintPubkey.toBuffer(),
         payer.toBuffer()
       ],
@@ -16724,12 +16724,12 @@ class TokenModule$1 {
 
     // 计算 orderbook PDAs (复用 create 中计算的值)
     const [upOrderbook] = PublicKey$5.findProgramAddressSync(
-      [Buffer$4.from('up_orderbook'), mintPubkey.toBuffer()],
+      [Buffer$5.from('up_orderbook'), mintPubkey.toBuffer()],
       this.sdk.programId
     );
 
     const [downOrderbook] = PublicKey$5.findProgramAddressSync(
-      [Buffer$4.from('down_orderbook'), mintPubkey.toBuffer()],
+      [Buffer$5.from('down_orderbook'), mintPubkey.toBuffer()],
       this.sdk.programId
     );
 
@@ -16834,7 +16834,7 @@ var token = TokenModule$1;
 
 const { PublicKey: PublicKey$4, Transaction, SystemProgram: SystemProgram$1 } = require$$0__default["default"];
 // 统一使用 buffer 包，所有平台一致
-const { Buffer: Buffer$3 } = require$$3__default["default"];
+const { Buffer: Buffer$4 } = require$$3__default["default"];
 
 /**
  * Parameter Module
@@ -16858,13 +16858,13 @@ class ParamModule$1 {
 
     // Calculate Admin account address (globally unique)
     const [adminAccount] = PublicKey$4.findProgramAddressSync(
-      [Buffer$3.from("admin")],
+      [Buffer$4.from("admin")],
       this.sdk.programId
     );
 
     // Calculate partner parameters account address (using partner address as seed)
     const [paramsAccount] = PublicKey$4.findProgramAddressSync(
-      [Buffer$3.from("params"), partner.toBuffer()],
+      [Buffer$4.from("params"), partner.toBuffer()],
       this.sdk.programId
     );
 
@@ -16908,7 +16908,7 @@ class ParamModule$1 {
   async getParams(partner) {
     // 计算合作伙伴参数账户地址
     const [paramsAccount] = PublicKey$4.findProgramAddressSync(
-      [Buffer$3.from("params"), partner.toBuffer()],
+      [Buffer$4.from("params"), partner.toBuffer()],
       this.sdk.programId
     );
 
@@ -16945,7 +16945,7 @@ class ParamModule$1 {
   async getAdmin() {
     // Calculate Admin account address
     const [adminAccount] = PublicKey$4.findProgramAddressSync(
-      [Buffer$3.from("admin")],
+      [Buffer$4.from("admin")],
       this.sdk.programId
     );
 
@@ -16982,7 +16982,7 @@ class ParamModule$1 {
    */
   getParamsAddress(partner) {
     const [paramsAccount] = PublicKey$4.findProgramAddressSync(
-      [Buffer$3.from("params"), partner.toBuffer()],
+      [Buffer$4.from("params"), partner.toBuffer()],
       this.sdk.programId
     );
     return paramsAccount;
@@ -16994,7 +16994,7 @@ class ParamModule$1 {
    */
   getAdminAddress() {
     const [adminAccount] = PublicKey$4.findProgramAddressSync(
-      [Buffer$3.from("admin")],
+      [Buffer$4.from("admin")],
       this.sdk.programId
     );
     return adminAccount;
@@ -47234,7 +47234,7 @@ const { PublicKey: PublicKey$3 } = require$$0__default["default"];
 const anchor$2 = require$$0__default$3["default"];
 const CurveAMM$2 = curve_amm;
 // 统一使用 buffer 包，所有平台一致
-const { Buffer: Buffer$2 } = require$$3__default["default"];
+const { Buffer: Buffer$3 } = require$$3__default["default"];
 
 /**
  * Chain Data Module
@@ -47380,7 +47380,7 @@ class ChainModule$1 {
       // Use the same seeds as in the contract: [b"borrowing_curve", mint_account.key().as_ref()]
       const [curveAccountPDA] = PublicKey$3.findProgramAddressSync(
         [
-          Buffer$2.from("borrowing_curve"),
+          Buffer$3.from("borrowing_curve"),
           mintPubkey.toBuffer()
         ],
         this.sdk.programId
@@ -47418,7 +47418,7 @@ class ChainModule$1 {
       // Calculate pool account PDA addresses
       const [poolTokenAccountPDA] = PublicKey$3.findProgramAddressSync(
         [
-          Buffer$2.from("pool_token"),
+          Buffer$3.from("pool_token"),
           mintPubkey.toBuffer()
         ],
         this.sdk.programId
@@ -47426,7 +47426,7 @@ class ChainModule$1 {
 
       const [poolSolAccountPDA] = PublicKey$3.findProgramAddressSync(
         [
-          Buffer$2.from("pool_sol"),
+          Buffer$3.from("pool_sol"),
           mintPubkey.toBuffer()
         ],
         this.sdk.programId
@@ -47518,7 +47518,7 @@ class ChainModule$1 {
 
     const [curveAccountPDA] = PublicKey$3.findProgramAddressSync(
       [
-        Buffer$2.from("borrowing_curve"),
+        Buffer$3.from("borrowing_curve"),
         mintPubkey.toBuffer()
       ],
       this.sdk.programId
@@ -47560,7 +47560,7 @@ class ChainModule$1 {
       // Calculate curve_account PDA address
       const [curveAccountPDA] = PublicKey$3.findProgramAddressSync(
         [
-          Buffer$2.from("borrowing_curve"),
+          Buffer$3.from("borrowing_curve"),
           mintPubkey.toBuffer()
         ],
         this.sdk.programId
@@ -48506,6 +48506,8 @@ var chain = ChainModule$1;
 const anchor$1 = require$$0__default$3["default"];
 const { PublicKey: PublicKey$2, SystemProgram, SYSVAR_RENT_PUBKEY } = require$$0__default["default"];
 const { getAssociatedTokenAddress, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID } = cjs$3;
+// 统一使用 buffer 包，所有平台一致
+const { Buffer: Buffer$2 } = require$$3__default["default"];
 
 /**
  * Tools Module
@@ -48558,32 +48560,6 @@ class ToolsModule$1 {
     const mintPubkey = typeof mint === 'string' ? new PublicKey$2(mint) : mint;
     const walletPubkey = wallet.publicKey;
 
-    // Calculate required PDA account addresses
-    const [curveAccount] = PublicKey$2.findProgramAddressSync(
-      [Buffer.from('borrowing_curve'), mintPubkey.toBuffer()],
-      this.sdk.programId
-    );
-
-    const [poolTokenAccount] = PublicKey$2.findProgramAddressSync(
-      [Buffer.from('pool_token'), mintPubkey.toBuffer()],
-      this.sdk.programId
-    );
-
-    const [poolSolAccount] = PublicKey$2.findProgramAddressSync(
-      [Buffer.from('pool_sol'), mintPubkey.toBuffer()],
-      this.sdk.programId
-    );
-
-    const [upOrderbook] = PublicKey$2.findProgramAddressSync(
-      [Buffer.from('up_orderbook'), mintPubkey.toBuffer()],
-      this.sdk.programId
-    );
-
-    const [downOrderbook] = PublicKey$2.findProgramAddressSync(
-      [Buffer.from('down_orderbook'), mintPubkey.toBuffer()],
-      this.sdk.programId
-    );
-
     // Calculate user token account
     const userTokenAccount = await getAssociatedTokenAddress(
       mintPubkey,
@@ -48593,59 +48569,28 @@ class ToolsModule$1 {
     // Calculate trade cooldown PDA
     const [cooldown] = PublicKey$2.findProgramAddressSync(
       [
-        Buffer.from('trade_cooldown'),
+        Buffer$2.from('trade_cooldown'),
         mintPubkey.toBuffer(),
         walletPubkey.toBuffer()
       ],
       this.sdk.programId
     );
 
-    // Get curve account to fetch fee recipient addresses
-    // Use manual fetch method to avoid provider issues
-    const curveAccountInfo = await this.sdk.connection.getAccountInfo(curveAccount);
-    if (!curveAccountInfo) {
-      throw new Error(`Curve account does not exist for mint: ${mint}`);
-    }
-
-    const accountsCoder = new anchor$1.BorshAccountsCoder(this.sdk.program.idl);
-    let curveAccountData;
-    try {
-      curveAccountData = accountsCoder.decode('BorrowingBondingCurve', curveAccountInfo.data);
-    } catch (e1) {
-      try {
-        curveAccountData = accountsCoder.decode('borrowingBondingCurve', curveAccountInfo.data);
-      } catch (e2) {
-        throw new Error(`Cannot decode curve account: ${e1.message}`);
-      }
-    }
-
     // Build transaction
     const transaction = await this.sdk.program.methods
       .approveTrade()
       .accounts({
         payer: walletPubkey,
         mintAccount: mintPubkey,
-        curveAccount: curveAccount,
-        poolTokenAccount: poolTokenAccount,
-        poolSolAccount: poolSolAccount,
-        upOrderbook: upOrderbook,
-        downOrderbook: downOrderbook,
         userTokenAccount: userTokenAccount,
+        cooldown: cooldown,
         tokenProgram: TOKEN_PROGRAM_ID,
+        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
         systemProgram: SystemProgram.programId,
         rent: SYSVAR_RENT_PUBKEY,
-        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-        feeRecipientAccount: curveAccountData.feeRecipient,
-        baseFeeRecipientAccount: curveAccountData.baseFeeRecipient,
-        cooldown: cooldown,
       })
       .transaction();
 
-    // Get latest blockhash
-    const { blockhash } = await this.sdk.connection.getLatestBlockhash();
-    transaction.recentBlockhash = blockhash;
-    transaction.feePayer = walletPubkey;
-
     // Return result
     return {
       transaction,
@@ -48653,7 +48598,6 @@ class ToolsModule$1 {
       accounts: {
         payer: walletPubkey,
         mintAccount: mintPubkey,
-        curveAccount: curveAccount,
         userTokenAccount: userTokenAccount,
         cooldown: cooldown,
       }
@@ -48715,7 +48659,7 @@ class ToolsModule$1 {
     // Calculate trade cooldown PDA
     const [cooldown] = PublicKey$2.findProgramAddressSync(
       [
-        Buffer.from('trade_cooldown'),
+        Buffer$2.from('trade_cooldown'),
         mintPubkey.toBuffer(),
         walletPubkey.toBuffer()
       ],
@@ -48755,11 +48699,6 @@ class ToolsModule$1 {
       })
       .transaction();
 
-    // Get latest blockhash
-    const { blockhash } = await this.sdk.connection.getLatestBlockhash();
-    transaction.recentBlockhash = blockhash;
-    transaction.feePayer = walletPubkey;
-
     // Return result
     return {
       transaction,
@@ -48834,7 +48773,7 @@ class ToolsModule$1 {
     // Calculate trade cooldown PDA
     const [cooldown] = PublicKey$2.findProgramAddressSync(
       [
-        Buffer.from('trade_cooldown'),
+        Buffer$2.from('trade_cooldown'),
         mintPubkey.toBuffer(),
         walletPubkey.toBuffer()
       ],
@@ -48974,160 +48913,23 @@ var instructions = [
 		accounts: [
 			{
 				name: "payer",
+				docs: [
+					"发起批准的用户"
+				],
 				writable: true,
 				signer: true
 			},
 			{
 				name: "mint_account",
-				writable: true
-			},
-			{
-				name: "curve_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "const",
-							value: [
-								98,
-								111,
-								114,
-								114,
-								111,
-								119,
-								105,
-								110,
-								103,
-								95,
-								99,
-								117,
-								114,
-								118,
-								101
-							]
-						},
-						{
-							kind: "account",
-							path: "mint_account"
-						}
-					]
-				}
-			},
-			{
-				name: "pool_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "const",
-							value: [
-								112,
-								111,
-								111,
-								108,
-								95,
-								116,
-								111,
-								107,
-								101,
-								110
-							]
-						},
-						{
-							kind: "account",
-							path: "mint_account"
-						}
-					]
-				}
-			},
-			{
-				name: "pool_sol_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "const",
-							value: [
-								112,
-								111,
-								111,
-								108,
-								95,
-								115,
-								111,
-								108
-							]
-						},
-						{
-							kind: "account",
-							path: "mint_account"
-						}
-					]
-				}
-			},
-			{
-				name: "up_orderbook",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "const",
-							value: [
-								117,
-								112,
-								95,
-								111,
-								114,
-								100,
-								101,
-								114,
-								98,
-								111,
-								111,
-								107
-							]
-						},
-						{
-							kind: "account",
-							path: "mint_account"
-						}
-					]
-				}
-			},
-			{
-				name: "down_orderbook",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "const",
-							value: [
-								100,
-								111,
-								119,
-								110,
-								95,
-								111,
-								114,
-								100,
-								101,
-								114,
-								98,
-								111,
-								111,
-								107
-							]
-						},
-						{
-							kind: "account",
-							path: "mint_account"
-						}
-					]
-				}
+				docs: [
+					"代币 mint 账户（用于 PDA seed）"
+				]
 			},
 			{
 				name: "user_token_account",
-				writable: true,
+				docs: [
+					"用户的代币账户（读取余额）"
+				],
 				pda: {
 					seeds: [
 						{
@@ -49215,35 +49017,10 @@ var instructions = [
 					}
 				}
 			},
-			{
-				name: "token_program",
-				address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-			},
-			{
-				name: "system_program",
-				address: "11111111111111111111111111111111"
-			},
-			{
-				name: "rent",
-				address: "SysvarRent111111111111111111111111111111111"
-			},
-			{
-				name: "associated_token_program",
-				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
-			},
-			{
-				name: "fee_recipient_account",
-				writable: true
-			},
-			{
-				name: "base_fee_recipient_account",
-				writable: true
-			},
 			{
 				name: "cooldown",
 				docs: [
-					"交易冷却时间PDA",
-					"首次交易时自动创建，后续交易验证冷却时间"
+					"交易冷却时间 PDA"
 				],
 				writable: true,
 				pda: {
@@ -49277,6 +49054,34 @@ var instructions = [
 						}
 					]
 				}
+			},
+			{
+				name: "token_program",
+				docs: [
+					"SPL Token 程序"
+				],
+				address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+			},
+			{
+				name: "associated_token_program",
+				docs: [
+					"Associated Token 程序"
+				],
+				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+			},
+			{
+				name: "system_program",
+				docs: [
+					"系统程序"
+				],
+				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "rent",
+				docs: [
+					"租金系统变量"
+				],
+				address: "SysvarRent111111111111111111111111111111111"
 			}
 		],
 		args: [
@@ -52478,6 +52283,10 @@ var types = [
 					name: "order_id",
 					type: "u64"
 				},
+				{
+					name: "order_index",
+					type: "u16"
+				},
 				{
 					name: "liquidate_indices",
 					type: {
@@ -52504,6 +52313,10 @@ var types = [
 					name: "order_id",
 					type: "u64"
 				},
+				{
+					name: "order_index",
+					type: "u16"
+				},
 				{
 					name: "latest_price",
 					type: "u128"
@@ -52798,6 +52611,10 @@ var types = [
 					name: "order_id",
 					type: "u64"
 				},
+				{
+					name: "order_index",
+					type: "u16"
+				},
 				{
 					name: "order_type",
 					type: "u8"
@@ -52830,10 +52647,6 @@ var types = [
 					name: "end_time",
 					type: "u32"
 				},
-				{
-					name: "margin_init_sol_amount",
-					type: "u64"
-				},
 				{
 					name: "margin_sol_amount",
 					type: "u64"