anchor-sdk 0.1.40 → 0.1.41-internal.1

package/dist/AnchorERC1155Client.js

@@ -102,6 +102,14 @@ class AnchorERC1155Client {
         if (!this.walletClient || !this.account) {
             throw new Error("Wallet client and account are required to send transactions");
         }
+        // 估算 gas 和费用
+        const { maxFeePerGas, maxPriorityFeePerGas } = await this.publicClient.estimateFeesPerGas();
+        const gas = await this.publicClient.estimateGas({
+            to: contractAddress,
+            data: data,
+            value: 0n,
+            account: this.account,
+        });
         const txHash = await this.walletClient.writeContract({
             account: this.account,
             address: contractAddress,
@@ -111,7 +119,10 @@ class AnchorERC1155Client {
                 this.formatMintRequest(signedRequest.request),
                 signedRequest.signature,
             ],
-            chain: null,
+            chain: this.publicClient.chain,
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+            gas,
         });
         const receipt = await this.publicClient.waitForTransactionReceipt({
             hash: txHash,
@@ -227,13 +238,23 @@ class AnchorERC1155Client {
         if (!this.walletClient || !this.account) {
             throw new Error("Wallet client and account are required to send transactions");
         }
+        const { maxFeePerGas, maxPriorityFeePerGas } = await this.publicClient.estimateFeesPerGas();
+        const gas = await this.publicClient.estimateGas({
+            to: contractAddress,
+            data: calldata,
+            value: 0n,
+            account: this.account,
+        });
         const txHash = await this.walletClient.writeContract({
             account: this.account,
             address: contractAddress,
             abi: AnchorERC1155_1.AnchorERC1155ABI,
             functionName: "multicall",
             args: [data],
-            chain: null,
+            chain: this.publicClient.chain,
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+            gas,
         });
         return await this.publicClient.waitForTransactionReceipt({ hash: txHash });
     }

package/dist/AnchorPayClient.d.ts

@@ -1,4 +1,4 @@
-import { Address, Hex, PublicClient, WalletClient, Account, TransactionReceipt, Chain } from "viem";
+import { Account, Address, Chain, Hex, PublicClient, TransactionReceipt, WalletClient } from "viem";
 import { PaymentOptions } from "./types";
 /**
  * AnchorPay 客户端

package/dist/AnchorPayClient.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnchorPayClient = void 0;
 const viem_1 = require("viem");
-const AnchorPay_json_1 = __importDefault(require("./abi/AnchorPay.json"));
 const constants_1 = require("./constants");
+const AnchorPay_json_1 = __importDefault(require("./abi/AnchorPay.json"));
 /**
  * AnchorPay 客户端
  * 用于与 AnchorPay 合约交互
@@ -34,39 +34,51 @@ class AnchorPayClient {
      * @param options 交易选项
      * @returns 交易收据或交易数据
      */
-    async sendETH(recipient, amount, data = '0x', options) {
+    async sendETH(recipient, amount, data = "0x", options) {
         // 如果需要发送交易，但没有钱包客户端或账户
-        if (options?.sendTransaction !== false && (!this.walletClient || !this.account)) {
+        if (options?.sendTransaction !== false &&
+            (!this.walletClient || !this.account)) {
             throw new Error("Wallet client and account are required to send transactions");
         }
         // 准备交易数据
         const calldata = (0, viem_1.encodeFunctionData)({
             abi: AnchorPay_json_1.default,
-            functionName: 'send',
-            args: [recipient, constants_1.NATIVE_TOKEN_ADDRESS, amount, data]
+            functionName: "send",
+            args: [recipient, constants_1.NATIVE_TOKEN_ADDRESS, amount, data],
         });
         // 如果不需要发送交易，只返回交易数据（AA 模式）
         if (options?.sendTransaction === false) {
             return {
                 to: this.contracts?.anchorPay || "",
                 data: calldata,
-                value: amount
+                value: amount,
             };
         }
+        // 估算 gas 和费用
+        const { maxFeePerGas, maxPriorityFeePerGas } = await this.publicClient.estimateFeesPerGas();
+        const gas = await this.publicClient.estimateGas({
+            to: this.contracts?.anchorPay || "",
+            data: calldata,
+            value: amount,
+            account: this.account,
+        });
         // 发送交易（EOA 模式）
+        if (!this.walletClient || !this.account) {
+            throw new Error("Wallet client and account are required to send transactions");
+        }
         const txHash = await this.walletClient.sendTransaction({
             account: this.account,
             to: this.contracts?.anchorPay || "",
             data: calldata,
             value: amount,
-            maxFeePerGas: options?.maxFeePerGas,
-            maxPriorityFeePerGas: options?.maxPriorityFeePerGas,
-            gas: options?.gas,
-            chain: null
+            maxFeePerGas: options?.maxFeePerGas || maxFeePerGas,
+            maxPriorityFeePerGas: options?.maxPriorityFeePerGas || maxPriorityFeePerGas,
+            gas: options?.gas || gas,
+            chain: this.publicClient.chain,
         });
         // 等待交易确认并返回收据
         const receipt = await this.publicClient.waitForTransactionReceipt({
-            hash: txHash
+            hash: txHash,
         });
         return receipt;
     }
@@ -79,38 +91,57 @@ class AnchorPayClient {
      * @param options 交易选项
      * @returns 交易收据或交易数据
      */
-    async sendERC20(recipient, tokenAddress, amount, data = '0x', options) {
+    async sendERC20(recipient, tokenAddress, amount, data = "0x", options) {
         // 如果需要发送交易，但没有钱包客户端或账户
-        if (options?.sendTransaction !== false && (!this.walletClient || !this.account)) {
+        if (options?.sendTransaction !== false &&
+            (!this.walletClient || !this.account)) {
             throw new Error("Wallet client and account are required to send transactions");
         }
         // 如果需要自动批准，则先批准代币（默认开启自动批准）
-        if ((options?.autoApprove !== false) && this.walletClient && this.account) {
+        if (options?.autoApprove !== false && this.walletClient && this.account) {
             try {
                 console.log(`Checking ERC20 token approval status: ${tokenAddress}`);
                 // 检查授权
-                const allowance = await this.publicClient.readContract({
+                const allowance = (await this.publicClient.readContract({
                     address: tokenAddress,
                     abi: constants_1.ERC20_ABI,
-                    functionName: 'allowance',
-                    args: [this.account.address, this.contracts?.anchorPay]
-                });
+                    functionName: "allowance",
+                    args: [this.account.address, this.contracts?.anchorPay],
+                }));
                 console.log(`Current allowance: ${allowance}, Required amount: ${amount}, AnchorPay contract address: ${this.contracts?.anchorPay}`);
                 if (allowance < amount) {
                     console.log(`Approving ${amount} tokens to AnchorPay contract...`);
                     // 批准代币 - 使用最大可能值进行授权，避免多次授权
                     const maxApproveAmount = 2n ** 256n - 1n;
+                    // 估算 gas 和费用
+                    const { maxFeePerGas: approveMaxFeePerGas, maxPriorityFeePerGas: approveMaxPriorityFeePerGas, } = await this.publicClient.estimateFeesPerGas();
+                    const approveCalldata = (0, viem_1.encodeFunctionData)({
+                        abi: constants_1.ERC20_ABI,
+                        functionName: "approve",
+                        args: [this.contracts?.anchorPay, maxApproveAmount],
+                    });
+                    const approveGas = await this.publicClient.estimateGas({
+                        to: tokenAddress,
+                        data: approveCalldata,
+                        value: 0n,
+                        account: this.account,
+                    });
                     const approveTxHash = await this.walletClient.writeContract({
                         account: this.account,
                         address: tokenAddress,
                         abi: constants_1.ERC20_ABI,
-                        functionName: 'approve',
+                        functionName: "approve",
                         args: [this.contracts?.anchorPay, maxApproveAmount],
-                        chain: null
+                        chain: this.publicClient.chain,
+                        maxFeePerGas: approveMaxFeePerGas,
+                        maxPriorityFeePerGas: approveMaxPriorityFeePerGas,
+                        gas: approveGas,
                     });
                     console.log(`Approval transaction sent, hash: ${approveTxHash}`);
                     // 等待交易确认
-                    await this.publicClient.waitForTransactionReceipt({ hash: approveTxHash });
+                    await this.publicClient.waitForTransactionReceipt({
+                        hash: approveTxHash,
+                    });
                     console.log(`Approval transaction confirmed`);
                 }
                 else {
@@ -125,31 +156,42 @@ class AnchorPayClient {
         // 准备交易数据
         const calldata = (0, viem_1.encodeFunctionData)({
             abi: AnchorPay_json_1.default,
-            functionName: 'send',
-            args: [recipient, tokenAddress, amount, data]
+            functionName: "send",
+            args: [recipient, tokenAddress, amount, data],
         });
         // 如果不需要发送交易，只返回交易数据（AA 模式）
         if (options?.sendTransaction === false) {
             return {
                 to: this.contracts?.anchorPay || "",
                 data: calldata,
-                value: 0n
+                value: 0n,
             };
         }
+        // 估算 gas 和费用
+        const { maxFeePerGas, maxPriorityFeePerGas } = await this.publicClient.estimateFeesPerGas();
+        const gas = await this.publicClient.estimateGas({
+            to: this.contracts?.anchorPay || "",
+            data: calldata,
+            value: 0n,
+            account: this.account,
+        });
         // 发送交易（EOA 模式）
+        if (!this.walletClient || !this.account) {
+            throw new Error("Wallet client and account are required to send transactions");
+        }
         const txHash = await this.walletClient.sendTransaction({
             account: this.account,
             to: this.contracts?.anchorPay || "",
             data: calldata,
             // value: amount,
-            maxFeePerGas: options?.maxFeePerGas,
-            maxPriorityFeePerGas: options?.maxPriorityFeePerGas,
-            gas: options?.gas,
-            chain: null
+            maxFeePerGas: options?.maxFeePerGas || maxFeePerGas,
+            maxPriorityFeePerGas: options?.maxPriorityFeePerGas || maxPriorityFeePerGas,
+            gas: options?.gas || gas,
+            chain: this.publicClient.chain,
         });
         // 等待交易确认并返回收据
         const receipt = await this.publicClient.waitForTransactionReceipt({
-            hash: txHash
+            hash: txHash,
         });
         return receipt;
     }
@@ -160,12 +202,12 @@ class AnchorPayClient {
      * @returns 实现者地址
      */
     async getInterfaceImplementer(account, interfaceHash) {
-        return await this.publicClient.readContract({
+        return (await this.publicClient.readContract({
             address: this.contracts?.anchorPay || "",
             abi: AnchorPay_json_1.default,
-            functionName: 'getInterfaceImplementer',
-            args: [account, interfaceHash]
-        });
+            functionName: "getInterfaceImplementer",
+            args: [account, interfaceHash],
+        }));
     }
     /**
      * 设置接口实现者（仅限管理员）
@@ -178,17 +220,33 @@ class AnchorPayClient {
         if (!this.walletClient || !this.account) {
             throw new Error("Wallet client and account are required to send transactions");
         }
+        // 估算 gas 和费用
+        const { maxFeePerGas, maxPriorityFeePerGas } = await this.publicClient.estimateFeesPerGas();
+        const calldata = (0, viem_1.encodeFunctionData)({
+            abi: AnchorPay_json_1.default,
+            functionName: "setInterfaceImplementer",
+            args: [account, interfaceHash, implementer],
+        });
+        const gas = await this.publicClient.estimateGas({
+            to: this.contracts?.anchorPay || "",
+            data: calldata,
+            value: 0n,
+            account: this.account,
+        });
         const txHash = await this.walletClient.writeContract({
             account: this.account,
             address: this.contracts?.anchorPay || "",
             abi: AnchorPay_json_1.default,
-            functionName: 'setInterfaceImplementer',
+            functionName: "setInterfaceImplementer",
             args: [account, interfaceHash, implementer],
-            chain: null
+            chain: this.publicClient.chain,
+            maxFeePerGas,
+            maxPriorityFeePerGas,
+            gas,
         });
         // 等待交易确认并返回收据
         const receipt = await this.publicClient.waitForTransactionReceipt({
-            hash: txHash
+            hash: txHash,
         });
         return receipt;
     }
@@ -200,17 +258,17 @@ class AnchorPayClient {
      * @returns 交易数据对象，包含 to、data 和 value 字段
      */
     getERC20ApprovalData(tokenAddress, amount, spender) {
-        const approveSpender = spender || (this.contracts?.anchorPay || "");
+        const approveSpender = spender || this.contracts?.anchorPay || "";
         // 编码 approve 函数调用
         const data = (0, viem_1.encodeFunctionData)({
             abi: constants_1.ERC20_ABI,
-            functionName: 'approve',
-            args: [approveSpender, amount]
+            functionName: "approve",
+            args: [approveSpender, amount],
         });
         return {
             to: tokenAddress,
             data,
-            value: 0n // ERC20 批准不需要发送 ETH
+            value: 0n, // ERC20 批准不需要发送 ETH
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anchor-sdk",
-  "version": "0.1.40",
+  "version": "0.1.41-internal.1",
   "description": "TypeScript SDK for interacting with Anchor ecosystem - badge minting, payment processing, and ERC1155 token management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",