pinpet-sdk 2.1.26 → 2.1.28

package/dist/pinpet-sdk.cjs.js

@@ -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 } = require$$0__default["default"];
+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 { 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,8 +16708,13 @@ class TokenModule$1 {
   }
 
   /**
-   * Create token and buy in one transaction
-   * 将 create 和 buy 两个指令合并到一个交易中，一次签名提交
+   * 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())
    *
    * @param {Object} params - Creation and buy parameters
    * @param {Keypair} params.mint - Token mint keypair
@@ -16729,7 +16734,20 @@ class TokenModule$1 {
    *
    * @param {Object} options - Optional parameters
    * @param {number} options.computeUnits - Compute units limit, default 1800000
-   * @returns {Promise<Object>} Object containing transaction, signers and account info
+   * @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());
    */
   async createAndBuy({
     mint,
@@ -16748,7 +16766,7 @@ class TokenModule$1 {
   }, options = {}) {
     const { computeUnits = 1800000 } = options;
 
-    console.log('Token Module - CreateAndBuy:', {
+    console.log('Token Module - CreateAndBuy (VersionedTransaction):', {
       mint: mint.publicKey.toString(),
       name,
       symbol,
@@ -16784,7 +16802,6 @@ 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;
 
@@ -16875,42 +16892,54 @@ class TokenModule$1 {
       })
       .instruction();
 
-    // 7. 合并交易：create + buy
-    console.log('Step 6: Merging create and buy transactions...');
-    const transaction = new Transaction$2();
+    // 7. 收集所有指令
+    console.log('Step 6: Building VersionedTransaction (v0)...');
+    const instructions = [];
 
     // 设置计算单元限制
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
       units: computeUnits
     });
-    transaction.add(modifyComputeUnits);
+    instructions.push(modifyComputeUnits);
 
     // 添加 create 交易的所有指令（跳过 create 中的计算单元指令）
     createResult.transaction.instructions.forEach(ix => {
-      // 跳过 create 交易中的计算单元指令（我们已经添加了）
       if (ix.programId.equals(ComputeBudgetProgram.programId)) {
         return;
       }
-      transaction.add(ix);
+      instructions.push(ix);
     });
 
     // 添加 ATA 创建指令（如果需要）
     if (createAtaIx) {
-      transaction.add(createAtaIx);
+      instructions.push(createAtaIx);
     }
 
     // 添加 buy 指令
-    transaction.add(buyIx);
+    instructions.push(buyIx);
 
-    console.log('CreateAndBuy transaction built successfully:');
-    console.log('  Total instructions:', transaction.instructions.length);
+    // 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]);
+
+    console.log('CreateAndBuy VersionedTransaction built successfully:');
+    console.log('  Total instructions:', instructions.length);
     console.log('  Compute units:', computeUnits);
-    console.log('  Signers required:', [payer.toString(), mint.publicKey.toString()]);
+    console.log('  mint keypair pre-signed, caller only needs payer signature');
 
-    // 8. 返回合并后的交易
+    // 10. 返回 VersionedTransaction（mint 已预签名）
     return {
-      transaction,
-      signers: [mint],  // mint keypair 需要签名
+      transaction,  // 已包含 mint 签名
       accounts: {
         // create 的账户
         ...createResult.accounts,
@@ -16919,10 +16948,23 @@ 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

@@ -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 } = require$$2$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 { 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,8 +21379,13 @@ class TokenModule$1 {
   }
 
   /**
-   * Create token and buy in one transaction
-   * 将 create 和 buy 两个指令合并到一个交易中，一次签名提交
+   * 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())
    *
    * @param {Object} params - Creation and buy parameters
    * @param {Keypair} params.mint - Token mint keypair
@@ -21400,7 +21405,20 @@ class TokenModule$1 {
    *
    * @param {Object} options - Optional parameters
    * @param {number} options.computeUnits - Compute units limit, default 1800000
-   * @returns {Promise<Object>} Object containing transaction, signers and account info
+   * @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());
    */
   async createAndBuy({
     mint,
@@ -21419,7 +21437,7 @@ class TokenModule$1 {
   }, options = {}) {
     const { computeUnits = 1800000 } = options;
 
-    console.log('Token Module - CreateAndBuy:', {
+    console.log('Token Module - CreateAndBuy (VersionedTransaction):', {
       mint: mint.publicKey.toString(),
       name,
       symbol,
@@ -21455,7 +21473,6 @@ 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;
 
@@ -21546,42 +21563,54 @@ class TokenModule$1 {
       })
       .instruction();
 
-    // 7. 合并交易：create + buy
-    console.log('Step 6: Merging create and buy transactions...');
-    const transaction = new Transaction$2();
+    // 7. 收集所有指令
+    console.log('Step 6: Building VersionedTransaction (v0)...');
+    const instructions = [];
 
     // 设置计算单元限制
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
       units: computeUnits
     });
-    transaction.add(modifyComputeUnits);
+    instructions.push(modifyComputeUnits);
 
     // 添加 create 交易的所有指令（跳过 create 中的计算单元指令）
     createResult.transaction.instructions.forEach(ix => {
-      // 跳过 create 交易中的计算单元指令（我们已经添加了）
       if (ix.programId.equals(ComputeBudgetProgram.programId)) {
         return;
       }
-      transaction.add(ix);
+      instructions.push(ix);
     });
 
     // 添加 ATA 创建指令（如果需要）
     if (createAtaIx) {
-      transaction.add(createAtaIx);
+      instructions.push(createAtaIx);
     }
 
     // 添加 buy 指令
-    transaction.add(buyIx);
+    instructions.push(buyIx);
 
-    console.log('CreateAndBuy transaction built successfully:');
-    console.log('  Total instructions:', transaction.instructions.length);
+    // 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]);
+
+    console.log('CreateAndBuy VersionedTransaction built successfully:');
+    console.log('  Total instructions:', instructions.length);
     console.log('  Compute units:', computeUnits);
-    console.log('  Signers required:', [payer.toString(), mint.publicKey.toString()]);
+    console.log('  mint keypair pre-signed, caller only needs payer signature');
 
-    // 8. 返回合并后的交易
+    // 10. 返回 VersionedTransaction（mint 已预签名）
     return {
-      transaction,
-      signers: [mint],  // mint keypair 需要签名
+      transaction,  // 已包含 mint 签名
       accounts: {
         // create 的账户
         ...createResult.accounts,
@@ -21590,10 +21619,23 @@ 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

@@ -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 } = require$$0__default["default"];
+	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 { 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,8 +21387,13 @@
 	  }
 
 	  /**
-	   * Create token and buy in one transaction
-	   * 将 create 和 buy 两个指令合并到一个交易中，一次签名提交
+	   * 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())
 	   *
 	   * @param {Object} params - Creation and buy parameters
 	   * @param {Keypair} params.mint - Token mint keypair
@@ -21408,7 +21413,20 @@
 	   *
 	   * @param {Object} options - Optional parameters
 	   * @param {number} options.computeUnits - Compute units limit, default 1800000
-	   * @returns {Promise<Object>} Object containing transaction, signers and account info
+	   * @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());
 	   */
 	  async createAndBuy({
 	    mint,
@@ -21427,7 +21445,7 @@
 	  }, options = {}) {
 	    const { computeUnits = 1800000 } = options;
 
-	    console.log('Token Module - CreateAndBuy:', {
+	    console.log('Token Module - CreateAndBuy (VersionedTransaction):', {
 	      mint: mint.publicKey.toString(),
 	      name,
 	      symbol,
@@ -21463,7 +21481,6 @@
 	    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;
 
@@ -21554,42 +21571,54 @@
 	      })
 	      .instruction();
 
-	    // 7. 合并交易：create + buy
-	    console.log('Step 6: Merging create and buy transactions...');
-	    const transaction = new Transaction$2();
+	    // 7. 收集所有指令
+	    console.log('Step 6: Building VersionedTransaction (v0)...');
+	    const instructions = [];
 
 	    // 设置计算单元限制
 	    const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
 	      units: computeUnits
 	    });
-	    transaction.add(modifyComputeUnits);
+	    instructions.push(modifyComputeUnits);
 
 	    // 添加 create 交易的所有指令（跳过 create 中的计算单元指令）
 	    createResult.transaction.instructions.forEach(ix => {
-	      // 跳过 create 交易中的计算单元指令（我们已经添加了）
 	      if (ix.programId.equals(ComputeBudgetProgram.programId)) {
 	        return;
 	      }
-	      transaction.add(ix);
+	      instructions.push(ix);
 	    });
 
 	    // 添加 ATA 创建指令（如果需要）
 	    if (createAtaIx) {
-	      transaction.add(createAtaIx);
+	      instructions.push(createAtaIx);
 	    }
 
 	    // 添加 buy 指令
-	    transaction.add(buyIx);
+	    instructions.push(buyIx);
 
-	    console.log('CreateAndBuy transaction built successfully:');
-	    console.log('  Total instructions:', transaction.instructions.length);
+	    // 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]);
+
+	    console.log('CreateAndBuy VersionedTransaction built successfully:');
+	    console.log('  Total instructions:', instructions.length);
 	    console.log('  Compute units:', computeUnits);
-	    console.log('  Signers required:', [payer.toString(), mint.publicKey.toString()]);
+	    console.log('  mint keypair pre-signed, caller only needs payer signature');
 
-	    // 8. 返回合并后的交易
+	    // 10. 返回 VersionedTransaction（mint 已预签名）
 	    return {
-	      transaction,
-	      signers: [mint],  // mint keypair 需要签名
+	      transaction,  // 已包含 mint 签名
 	      accounts: {
 	        // create 的账户
 	        ...createResult.accounts,
@@ -21598,10 +21627,23 @@
 	        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;