pinpet-sdk 2.1.28 → 2.1.29

package/dist/pinpet-sdk.cjs.js

@@ -15579,9 +15579,9 @@ const MIN_STOP_LOSS_PERCENT$1 = 40; // 4.0%
 
 // Maximum number of candidate indices to include in close_insert_indices
 // This represents: 1 main position + N nodes before + N nodes after
-// Must be an odd number >= 1 (e.g., 21 = 1 main + 10 before + 10 after)
-// The contract accepts up to 20, we use 21 to provide more flexibility
-const MAX_CANDIDATE_INDICES$3 = 31;
+// Must be an odd number >= 1 (e.g., 41 = 1 main + 20 before + 20 after)
+// The contract accepts up to 41
+const MAX_CANDIDATE_INDICES$3 = 19;
 
 
 /**
@@ -16471,7 +16471,7 @@ class TradingModule$1 {
 
 var trading = TradingModule$1;
 
-const { ComputeBudgetProgram, PublicKey: PublicKey$5, Transaction: Transaction$2, Keypair, SystemProgram: SystemProgram$2, SYSVAR_RENT_PUBKEY: SYSVAR_RENT_PUBKEY$1, VersionedTransaction, TransactionMessage } = require$$0__default["default"];
+const { ComputeBudgetProgram, PublicKey: PublicKey$5, Transaction: Transaction$2, Keypair, SystemProgram: SystemProgram$2, SYSVAR_RENT_PUBKEY: SYSVAR_RENT_PUBKEY$1 } = require$$0__default["default"];
 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 包，所有平台一致
@@ -16708,13 +16708,8 @@ class TokenModule$1 {
   }
 
   /**
-   * Create token and buy in one transaction (使用 VersionedTransaction v0)
-   * 将 create 和 buy 两个指令合并到一个 v0 交易中，一次签名提交
-   *
-   * 注意：返回的 transaction 是 VersionedTransaction 类型（非 Legacy Transaction）
-   * - feePayer 和 recentBlockhash 已在 SDK 端设置，网站端不需要再设置
-   * - 签名方式：先 transaction.sign([mintKeypair])，再 phantom.signTransaction(tx)
-   * - 发送方式：connection.sendRawTransaction(signedTx.serialize())
+   * Create token and buy in one transaction
+   * 将 create 和 buy 两个指令合并到一个交易中，一次签名提交
    *
    * @param {Object} params - Creation and buy parameters
    * @param {Keypair} params.mint - Token mint keypair
@@ -16734,20 +16729,7 @@ class TokenModule$1 {
    *
    * @param {Object} options - Optional parameters
    * @param {number} options.computeUnits - Compute units limit, default 1800000
-   * @returns {Promise<Object>} Object containing VersionedTransaction, signers, accounts and blockhashInfo
-   *
-   * @example
-   * // Node.js 环境
-   * const result = await sdk.token.createAndBuy({...});
-   * result.transaction.sign([wallet, ...result.signers]);
-   * const sig = await connection.sendRawTransaction(result.transaction.serialize());
-   *
-   * @example
-   * // 浏览器 Phantom 环境
-   * const result = await sdk.token.createAndBuy({...});
-   * result.transaction.sign(result.signers);          // mint keypair 先签名
-   * const signed = await phantom.signTransaction(result.transaction); // Phantom 追加 payer 签名
-   * const sig = await connection.sendRawTransaction(signed.serialize());
+   * @returns {Promise<Object>} Object containing transaction, signers and account info
    */
   async createAndBuy({
     mint,
@@ -16766,7 +16748,7 @@ class TokenModule$1 {
   }, options = {}) {
     const { computeUnits = 1800000 } = options;
 
-    console.log('Token Module - CreateAndBuy (VersionedTransaction):', {
+    console.log('Token Module - CreateAndBuy:', {
       mint: mint.publicKey.toString(),
       name,
       symbol,
@@ -16802,6 +16784,7 @@ class TokenModule$1 {
     console.log('Step 2: Fetching fee recipient accounts from params...');
 
     // 直接从 SDK 配置中获取手续费接收账户（这些在 SDK 初始化时已经设置）
+    // 避免使用 program.account.params.fetch() 因为可能有 provider 配置问题
     const feeRecipientAccount = this.sdk.feeRecipient;
     const baseFeeRecipientAccount = this.sdk.baseFeeRecipient;
 
@@ -16892,54 +16875,42 @@ class TokenModule$1 {
       })
       .instruction();
 
-    // 7. 收集所有指令
-    console.log('Step 6: Building VersionedTransaction (v0)...');
-    const instructions = [];
+    // 7. 合并交易：create + buy
+    console.log('Step 6: Merging create and buy transactions...');
+    const transaction = new Transaction$2();
 
     // 设置计算单元限制
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
       units: computeUnits
     });
-    instructions.push(modifyComputeUnits);
+    transaction.add(modifyComputeUnits);
 
     // 添加 create 交易的所有指令（跳过 create 中的计算单元指令）
     createResult.transaction.instructions.forEach(ix => {
+      // 跳过 create 交易中的计算单元指令（我们已经添加了）
       if (ix.programId.equals(ComputeBudgetProgram.programId)) {
         return;
       }
-      instructions.push(ix);
+      transaction.add(ix);
     });
 
     // 添加 ATA 创建指令（如果需要）
     if (createAtaIx) {
-      instructions.push(createAtaIx);
+      transaction.add(createAtaIx);
     }
 
-    // 添加 buy 指令
-    instructions.push(buyIx);
-
-    // 8. 获取最新 blockhash 并构建 VersionedTransaction
-    const blockhashResult = await this.sdk.connection.getLatestBlockhash('confirmed');
-
-    const messageV0 = new TransactionMessage({
-      payerKey: payer,
-      recentBlockhash: blockhashResult.blockhash,
-      instructions: instructions,
-    }).compileToV0Message();
-
-    const transaction = new VersionedTransaction(messageV0);
-
-    // 9. 用 mint keypair 预签名（调用方只需 payer 签名）
-    transaction.sign([mint]);
+    // 添加 buy 指令 
+    transaction.add(buyIx);
 
-    console.log('CreateAndBuy VersionedTransaction built successfully:');
-    console.log('  Total instructions:', instructions.length);
+    console.log('CreateAndBuy transaction built successfully:');
+    console.log('  Total instructions:', transaction.instructions.length);
     console.log('  Compute units:', computeUnits);
-    console.log('  mint keypair pre-signed, caller only needs payer signature');
+    console.log('  Signers required:', [payer.toString(), mint.publicKey.toString()]);
 
-    // 10. 返回 VersionedTransaction（mint 已预签名）
+    // 8. 返回合并后的交易
     return {
-      transaction,  // 已包含 mint 签名
+      transaction,
+      signers: [mint],  // mint keypair 需要签名
       accounts: {
         // create 的账户
         ...createResult.accounts,
@@ -16948,23 +16919,10 @@ class TokenModule$1 {
         cooldown: cooldownPDA,
         feeRecipientAccount,
         baseFeeRecipientAccount
-      },
-      // 返回 blockhash 信息供调用方确认交易使用
-      blockhashInfo: {
-        blockhash: blockhashResult.blockhash,
-        lastValidBlockHeight: blockhashResult.lastValidBlockHeight
       }
     };
   }
 
-  /**
-   * createAndBuy 的别名（功能完全相同）
-   * 保留此方法以保持向后兼容
-   */
-  async createAndBuySign(params, options = {}) {
-    return this.createAndBuy(params, options);
-  }
-
 }
 
 var token = TokenModule$1;

package/dist/pinpet-sdk.esm.js

@@ -20253,9 +20253,9 @@ const MIN_STOP_LOSS_PERCENT$1 = 40; // 4.0%
 
 // Maximum number of candidate indices to include in close_insert_indices
 // This represents: 1 main position + N nodes before + N nodes after
-// Must be an odd number >= 1 (e.g., 21 = 1 main + 10 before + 10 after)
-// The contract accepts up to 20, we use 21 to provide more flexibility
-const MAX_CANDIDATE_INDICES$3 = 31;
+// Must be an odd number >= 1 (e.g., 41 = 1 main + 20 before + 20 after)
+// The contract accepts up to 41
+const MAX_CANDIDATE_INDICES$3 = 19;
 
 
 /**
@@ -21142,7 +21142,7 @@ class TradingModule$1 {
 
 var trading = TradingModule$1;
 
-const { ComputeBudgetProgram, PublicKey: PublicKey$5, Transaction: Transaction$2, Keypair, SystemProgram: SystemProgram$2, SYSVAR_RENT_PUBKEY: SYSVAR_RENT_PUBKEY$1, VersionedTransaction, TransactionMessage } = require$$2$1;
+const { ComputeBudgetProgram, PublicKey: PublicKey$5, Transaction: Transaction$2, Keypair, SystemProgram: SystemProgram$2, SYSVAR_RENT_PUBKEY: SYSVAR_RENT_PUBKEY$1 } = require$$2$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;
 // 统一使用 buffer 包，所有平台一致
@@ -21379,13 +21379,8 @@ class TokenModule$1 {
   }
 
   /**
-   * Create token and buy in one transaction (使用 VersionedTransaction v0)
-   * 将 create 和 buy 两个指令合并到一个 v0 交易中，一次签名提交
-   *
-   * 注意：返回的 transaction 是 VersionedTransaction 类型（非 Legacy Transaction）
-   * - feePayer 和 recentBlockhash 已在 SDK 端设置，网站端不需要再设置
-   * - 签名方式：先 transaction.sign([mintKeypair])，再 phantom.signTransaction(tx)
-   * - 发送方式：connection.sendRawTransaction(signedTx.serialize())
+   * Create token and buy in one transaction
+   * 将 create 和 buy 两个指令合并到一个交易中，一次签名提交
    *
    * @param {Object} params - Creation and buy parameters
    * @param {Keypair} params.mint - Token mint keypair
@@ -21405,20 +21400,7 @@ class TokenModule$1 {
    *
    * @param {Object} options - Optional parameters
    * @param {number} options.computeUnits - Compute units limit, default 1800000
-   * @returns {Promise<Object>} Object containing VersionedTransaction, signers, accounts and blockhashInfo
-   *
-   * @example
-   * // Node.js 环境
-   * const result = await sdk.token.createAndBuy({...});
-   * result.transaction.sign([wallet, ...result.signers]);
-   * const sig = await connection.sendRawTransaction(result.transaction.serialize());
-   *
-   * @example
-   * // 浏览器 Phantom 环境
-   * const result = await sdk.token.createAndBuy({...});
-   * result.transaction.sign(result.signers);          // mint keypair 先签名
-   * const signed = await phantom.signTransaction(result.transaction); // Phantom 追加 payer 签名
-   * const sig = await connection.sendRawTransaction(signed.serialize());
+   * @returns {Promise<Object>} Object containing transaction, signers and account info
    */
   async createAndBuy({
     mint,
@@ -21437,7 +21419,7 @@ class TokenModule$1 {
   }, options = {}) {
     const { computeUnits = 1800000 } = options;
 
-    console.log('Token Module - CreateAndBuy (VersionedTransaction):', {
+    console.log('Token Module - CreateAndBuy:', {
       mint: mint.publicKey.toString(),
       name,
       symbol,
@@ -21473,6 +21455,7 @@ class TokenModule$1 {
     console.log('Step 2: Fetching fee recipient accounts from params...');
 
     // 直接从 SDK 配置中获取手续费接收账户（这些在 SDK 初始化时已经设置）
+    // 避免使用 program.account.params.fetch() 因为可能有 provider 配置问题
     const feeRecipientAccount = this.sdk.feeRecipient;
     const baseFeeRecipientAccount = this.sdk.baseFeeRecipient;
 
@@ -21563,54 +21546,42 @@ class TokenModule$1 {
       })
       .instruction();
 
-    // 7. 收集所有指令
-    console.log('Step 6: Building VersionedTransaction (v0)...');
-    const instructions = [];
+    // 7. 合并交易：create + buy
+    console.log('Step 6: Merging create and buy transactions...');
+    const transaction = new Transaction$2();
 
     // 设置计算单元限制
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
       units: computeUnits
     });
-    instructions.push(modifyComputeUnits);
+    transaction.add(modifyComputeUnits);
 
     // 添加 create 交易的所有指令（跳过 create 中的计算单元指令）
     createResult.transaction.instructions.forEach(ix => {
+      // 跳过 create 交易中的计算单元指令（我们已经添加了）
       if (ix.programId.equals(ComputeBudgetProgram.programId)) {
         return;
       }
-      instructions.push(ix);
+      transaction.add(ix);
     });
 
     // 添加 ATA 创建指令（如果需要）
     if (createAtaIx) {
-      instructions.push(createAtaIx);
+      transaction.add(createAtaIx);
     }
 
-    // 添加 buy 指令
-    instructions.push(buyIx);
-
-    // 8. 获取最新 blockhash 并构建 VersionedTransaction
-    const blockhashResult = await this.sdk.connection.getLatestBlockhash('confirmed');
-
-    const messageV0 = new TransactionMessage({
-      payerKey: payer,
-      recentBlockhash: blockhashResult.blockhash,
-      instructions: instructions,
-    }).compileToV0Message();
-
-    const transaction = new VersionedTransaction(messageV0);
-
-    // 9. 用 mint keypair 预签名（调用方只需 payer 签名）
-    transaction.sign([mint]);
+    // 添加 buy 指令 
+    transaction.add(buyIx);
 
-    console.log('CreateAndBuy VersionedTransaction built successfully:');
-    console.log('  Total instructions:', instructions.length);
+    console.log('CreateAndBuy transaction built successfully:');
+    console.log('  Total instructions:', transaction.instructions.length);
     console.log('  Compute units:', computeUnits);
-    console.log('  mint keypair pre-signed, caller only needs payer signature');
+    console.log('  Signers required:', [payer.toString(), mint.publicKey.toString()]);
 
-    // 10. 返回 VersionedTransaction（mint 已预签名）
+    // 8. 返回合并后的交易
     return {
-      transaction,  // 已包含 mint 签名
+      transaction,
+      signers: [mint],  // mint keypair 需要签名
       accounts: {
         // create 的账户
         ...createResult.accounts,
@@ -21619,23 +21590,10 @@ class TokenModule$1 {
         cooldown: cooldownPDA,
         feeRecipientAccount,
         baseFeeRecipientAccount
-      },
-      // 返回 blockhash 信息供调用方确认交易使用
-      blockhashInfo: {
-        blockhash: blockhashResult.blockhash,
-        lastValidBlockHeight: blockhashResult.lastValidBlockHeight
       }
     };
   }
 
-  /**
-   * createAndBuy 的别名（功能完全相同）
-   * 保留此方法以保持向后兼容
-   */
-  async createAndBuySign(params, options = {}) {
-    return this.createAndBuy(params, options);
-  }
-
 }
 
 var token = TokenModule$1;

package/dist/pinpet-sdk.js

@@ -20261,9 +20261,9 @@
 
 	// Maximum number of candidate indices to include in close_insert_indices
 	// This represents: 1 main position + N nodes before + N nodes after
-	// Must be an odd number >= 1 (e.g., 21 = 1 main + 10 before + 10 after)
-	// The contract accepts up to 20, we use 21 to provide more flexibility
-	const MAX_CANDIDATE_INDICES$3 = 31;
+	// Must be an odd number >= 1 (e.g., 41 = 1 main + 20 before + 20 after)
+	// The contract accepts up to 41
+	const MAX_CANDIDATE_INDICES$3 = 19;
 
 
 	/**
@@ -21150,7 +21150,7 @@
 
 	var trading = TradingModule$1;
 
-	const { ComputeBudgetProgram, PublicKey: PublicKey$5, Transaction: Transaction$2, Keypair, SystemProgram: SystemProgram$2, SYSVAR_RENT_PUBKEY: SYSVAR_RENT_PUBKEY$1, VersionedTransaction, TransactionMessage } = require$$0__default["default"];
+	const { ComputeBudgetProgram, PublicKey: PublicKey$5, Transaction: Transaction$2, Keypair, SystemProgram: SystemProgram$2, SYSVAR_RENT_PUBKEY: SYSVAR_RENT_PUBKEY$1 } = require$$0__default["default"];
 	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$1["default"];
 	// 统一使用 buffer 包，所有平台一致
@@ -21387,13 +21387,8 @@
 	  }
 
 	  /**
-	   * Create token and buy in one transaction (使用 VersionedTransaction v0)
-	   * 将 create 和 buy 两个指令合并到一个 v0 交易中，一次签名提交
-	   *
-	   * 注意：返回的 transaction 是 VersionedTransaction 类型（非 Legacy Transaction）
-	   * - feePayer 和 recentBlockhash 已在 SDK 端设置，网站端不需要再设置
-	   * - 签名方式：先 transaction.sign([mintKeypair])，再 phantom.signTransaction(tx)
-	   * - 发送方式：connection.sendRawTransaction(signedTx.serialize())
+	   * Create token and buy in one transaction
+	   * 将 create 和 buy 两个指令合并到一个交易中，一次签名提交
 	   *
 	   * @param {Object} params - Creation and buy parameters
 	   * @param {Keypair} params.mint - Token mint keypair
@@ -21413,20 +21408,7 @@
 	   *
 	   * @param {Object} options - Optional parameters
 	   * @param {number} options.computeUnits - Compute units limit, default 1800000
-	   * @returns {Promise<Object>} Object containing VersionedTransaction, signers, accounts and blockhashInfo
-	   *
-	   * @example
-	   * // Node.js 环境
-	   * const result = await sdk.token.createAndBuy({...});
-	   * result.transaction.sign([wallet, ...result.signers]);
-	   * const sig = await connection.sendRawTransaction(result.transaction.serialize());
-	   *
-	   * @example
-	   * // 浏览器 Phantom 环境
-	   * const result = await sdk.token.createAndBuy({...});
-	   * result.transaction.sign(result.signers);          // mint keypair 先签名
-	   * const signed = await phantom.signTransaction(result.transaction); // Phantom 追加 payer 签名
-	   * const sig = await connection.sendRawTransaction(signed.serialize());
+	   * @returns {Promise<Object>} Object containing transaction, signers and account info
 	   */
 	  async createAndBuy({
 	    mint,
@@ -21445,7 +21427,7 @@
 	  }, options = {}) {
 	    const { computeUnits = 1800000 } = options;
 
-	    console.log('Token Module - CreateAndBuy (VersionedTransaction):', {
+	    console.log('Token Module - CreateAndBuy:', {
 	      mint: mint.publicKey.toString(),
 	      name,
 	      symbol,
@@ -21481,6 +21463,7 @@
 	    console.log('Step 2: Fetching fee recipient accounts from params...');
 
 	    // 直接从 SDK 配置中获取手续费接收账户（这些在 SDK 初始化时已经设置）
+	    // 避免使用 program.account.params.fetch() 因为可能有 provider 配置问题
 	    const feeRecipientAccount = this.sdk.feeRecipient;
 	    const baseFeeRecipientAccount = this.sdk.baseFeeRecipient;
 
@@ -21571,54 +21554,42 @@
 	      })
 	      .instruction();
 
-	    // 7. 收集所有指令
-	    console.log('Step 6: Building VersionedTransaction (v0)...');
-	    const instructions = [];
+	    // 7. 合并交易：create + buy
+	    console.log('Step 6: Merging create and buy transactions...');
+	    const transaction = new Transaction$2();
 
 	    // 设置计算单元限制
 	    const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
 	      units: computeUnits
 	    });
-	    instructions.push(modifyComputeUnits);
+	    transaction.add(modifyComputeUnits);
 
 	    // 添加 create 交易的所有指令（跳过 create 中的计算单元指令）
 	    createResult.transaction.instructions.forEach(ix => {
+	      // 跳过 create 交易中的计算单元指令（我们已经添加了）
 	      if (ix.programId.equals(ComputeBudgetProgram.programId)) {
 	        return;
 	      }
-	      instructions.push(ix);
+	      transaction.add(ix);
 	    });
 
 	    // 添加 ATA 创建指令（如果需要）
 	    if (createAtaIx) {
-	      instructions.push(createAtaIx);
+	      transaction.add(createAtaIx);
 	    }
 
-	    // 添加 buy 指令
-	    instructions.push(buyIx);
-
-	    // 8. 获取最新 blockhash 并构建 VersionedTransaction
-	    const blockhashResult = await this.sdk.connection.getLatestBlockhash('confirmed');
-
-	    const messageV0 = new TransactionMessage({
-	      payerKey: payer,
-	      recentBlockhash: blockhashResult.blockhash,
-	      instructions: instructions,
-	    }).compileToV0Message();
-
-	    const transaction = new VersionedTransaction(messageV0);
-
-	    // 9. 用 mint keypair 预签名（调用方只需 payer 签名）
-	    transaction.sign([mint]);
+	    // 添加 buy 指令 
+	    transaction.add(buyIx);
 
-	    console.log('CreateAndBuy VersionedTransaction built successfully:');
-	    console.log('  Total instructions:', instructions.length);
+	    console.log('CreateAndBuy transaction built successfully:');
+	    console.log('  Total instructions:', transaction.instructions.length);
 	    console.log('  Compute units:', computeUnits);
-	    console.log('  mint keypair pre-signed, caller only needs payer signature');
+	    console.log('  Signers required:', [payer.toString(), mint.publicKey.toString()]);
 
-	    // 10. 返回 VersionedTransaction（mint 已预签名）
+	    // 8. 返回合并后的交易
 	    return {
-	      transaction,  // 已包含 mint 签名
+	      transaction,
+	      signers: [mint],  // mint keypair 需要签名
 	      accounts: {
 	        // create 的账户
 	        ...createResult.accounts,
@@ -21627,23 +21598,10 @@
 	        cooldown: cooldownPDA,
 	        feeRecipientAccount,
 	        baseFeeRecipientAccount
-	      },
-	      // 返回 blockhash 信息供调用方确认交易使用
-	      blockhashInfo: {
-	        blockhash: blockhashResult.blockhash,
-	        lastValidBlockHeight: blockhashResult.lastValidBlockHeight
 	      }
 	    };
 	  }
 
-	  /**
-	   * createAndBuy 的别名（功能完全相同）
-	   * 保留此方法以保持向后兼容
-	   */
-	  async createAndBuySign(params, options = {}) {
-	    return this.createAndBuy(params, options);
-	  }
-
 	}
 
 	var token = TokenModule$1;