@weblock-wallet/sdk 0.1.61 → 0.1.63

package/dist/index.js

@@ -1890,7 +1890,7 @@ var AuthService = class {
 };
 
 // src/core/services/wallet.ts
-import { Wallet, Interface } from "ethers";
+import { Wallet, Interface, Transaction as EthersTx } from "ethers";
 import { generateMnemonic, mnemonicToSeed } from "bip39";
 
 // src/utils/secrets.ts
@@ -104623,10 +104623,6 @@ var WalletService = class {
   }
   async sendTransaction(params) {
     try {
-      const from = await this.getAddress();
-      if (!from) {
-        throw new SDKError("Wallet not found", "WALLET_NOT_FOUND" /* WALLET_NOT_FOUND */);
-      }
       const toHexQuantity = (v5) => {
         if (v5 === void 0 || v5 === null) return "0x0";
         const s5 = String(v5).trim();
@@ -104674,8 +104670,47 @@ var WalletService = class {
       }
       const privateKey = await Secrets.combine([share1, share2]);
       const wallet = new Wallet(privateKey);
-      const nonce = params.nonce ?? await this.getTransactionCount(from, params.chainId);
-      const gasPrice = params.gasPrice ?? await this.getGasPrice(params.chainId);
+      const from = wallet.address;
+      const cachedAddress = await LocalForage.get(
+        STORAGE_KEYS.walletAddress(this.orgHost)
+      );
+      if (cachedAddress && cachedAddress.toLowerCase() !== from.toLowerCase()) {
+        console.warn(
+          "[WalletService] walletAddress mismatch detected. cached=",
+          cachedAddress,
+          "derived=",
+          from
+        );
+        this.walletAddress = from;
+        await LocalForage.save(STORAGE_KEYS.walletAddress(this.orgHost), from);
+      }
+      const nativeBal = await this.rpcClient.sendRpc({
+        chainId: params.chainId,
+        method: "eth_getBalance" /* ETH_GET_BALANCE */,
+        params: [from, "latest"]
+      });
+      if (!nativeBal?.result || BigInt(nativeBal.result) === BigInt(0)) {
+        throw new SDKError(
+          `Insufficient native balance for gas. sender=${from} balance=${nativeBal?.result ?? "0x0"}`,
+          "TRANSACTION_FAILED" /* TRANSACTION_FAILED */
+        );
+      }
+      const pendingNonceHex = await this.rpcClient.sendRpc({
+        chainId: params.chainId,
+        method: "eth_getTransactionCount" /* ETH_GET_TRANSACTION_COUNT */,
+        params: [from, "pending"]
+      });
+      const pendingNonce = parseInt(
+        pendingNonceHex?.result ?? "0x0",
+        16
+      );
+      const nonce = params.nonce ?? pendingNonce;
+      let gasPrice = params.gasPrice ?? await this.getGasPrice(params.chainId);
+      try {
+        const bumped = BigInt(gasPrice) * 12n / 10n;
+        gasPrice = "0x" + bumped.toString(16);
+      } catch {
+      }
       let gasLimit = params.gasLimit;
       if (!gasLimit) {
         try {
@@ -104707,6 +104742,19 @@ var WalletService = class {
         gasPrice,
         gasLimit
       });
+      try {
+        const parsed = EthersTx.from(signedTx);
+        const derivedFrom = parsed?.from;
+        if (derivedFrom && String(derivedFrom).toLowerCase() !== from.toLowerCase()) {
+          console.warn(
+            "[WalletService] signedTx sender mismatch. wallet=",
+            from,
+            "txFrom=",
+            derivedFrom
+          );
+        }
+      } catch {
+      }
       const txHash = await this.sendRawTransaction(signedTx, params.chainId);
       await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
       return txHash;
@@ -104714,10 +104762,16 @@ var WalletService = class {
       if (error instanceof SDKError) {
         throw error;
       }
-      const anyErr = error;
-      const causeMsg = anyErr?.shortMessage || anyErr?.reason || anyErr?.message || anyErr?.error?.message || "Unknown error";
+      const msg = (() => {
+        try {
+          const anyErr = error;
+          return anyErr?.shortMessage || anyErr?.reason || anyErr?.message || String(error);
+        } catch {
+          return "Unknown error";
+        }
+      })();
       throw new SDKError(
-        `Transaction failed: ${causeMsg}`,
+        `Transaction failed: ${msg}`,
         "TRANSACTION_FAILED" /* TRANSACTION_FAILED */,
         error
       );