@weblock-wallet/sdk 0.1.56 → 0.1.58

package/dist/index.js

@@ -104474,14 +104474,9 @@ var WalletService = class {
     });
     const network = await this.networkService.getCurrentNetwork();
     const decimals = network?.decimals || DECIMALS.ETH;
-    const formatted = TokenAmount.format(response.result, decimals);
     return {
       raw: response.result,
-      // aliases (helpful for apps that expect numeric fields)
-      balanceWei: response.result,
-      result: response.result,
-      formatted,
-      balance: formatted,
+      formatted: TokenAmount.format(response.result, decimals),
       decimals,
       symbol: network?.symbol || "ETH"
     };
@@ -104624,6 +104619,18 @@ var WalletService = class {
       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();
+        if (!s5) return "0x0";
+        if (s5.startsWith("0x") || s5.startsWith("0X")) return s5;
+        try {
+          const bi = BigInt(s5);
+          return "0x" + bi.toString(16);
+        } catch {
+          return s5;
+        }
+      };
       const [share1, share2] = await Promise.all([
         this.walletClient.getWallet().then((wallet2) => wallet2.share1),
         LocalForage.get(STORAGE_KEYS.share2(this.orgHost))
@@ -104638,19 +104645,42 @@ var WalletService = class {
       const wallet = new Wallet(privateKey);
       const nonce = params.nonce ?? await this.getTransactionCount(from, params.chainId);
       const gasPrice = params.gasPrice ?? await this.getGasPrice(params.chainId);
+      let gasLimit = params.gasLimit;
+      if (!gasLimit) {
+        try {
+          const est = await this.estimateGas(
+            {
+              from,
+              to: params.to,
+              value: toHexQuantity(params.value),
+              data: params.data || "0x"
+            },
+            params.chainId
+          );
+          const buffered = Math.max(21e3, Math.ceil(est * 1.2));
+          gasLimit = "0x" + buffered.toString(16);
+        } catch (e7) {
+          const data = (params.data || "").toLowerCase();
+          const fallback = data.startsWith("0x095ea7b3") ? 12e4 : data && data !== "0x" ? 8e5 : 21e3;
+          gasLimit = "0x" + fallback.toString(16);
+        }
+      }
       const signedTx = await wallet.signTransaction({
         to: params.to,
-        value: params.value,
+        value: params.value ?? "0x0",
         data: params.data || "0x",
         chainId: params.chainId,
         nonce,
         gasPrice,
-        gasLimit: params.gasLimit
+        gasLimit
       });
       return this.sendRawTransaction(signedTx, params.chainId);
     } catch (error) {
+      const detail = String(
+        error?.shortMessage ?? error?.reason ?? error?.message ?? ""
+      ).trim();
       throw new SDKError(
-        "Transaction failed",
+        detail ? `Transaction failed: ${detail}` : "Transaction failed",
         "TRANSACTION_FAILED" /* TRANSACTION_FAILED */,
         error
       );
@@ -104704,11 +104734,34 @@ var NetworkService = class {
   async switchNetwork(networkId) {
     try {
       const networks = await this.getRegisteredNetworks();
-      const network = networks.find((n5) => n5.id === networkId);
+      const key = String(networkId || "").trim();
+      let network = networks.find((n5) => n5.id === key);
+      if (!network) {
+        const lower = key.toLowerCase();
+        network = networks.find((n5) => (n5.name || "").toLowerCase() === lower);
+      }
+      if (!network && /^\d+$/.test(key)) {
+        const chainId = Number(key);
+        network = networks.find((n5) => n5.chainId === chainId);
+      }
+      if (!network) {
+        const alias = key.toLowerCase();
+        const aliasChainId = {
+          fuji: 43113,
+          avalanchefuji: 43113,
+          "avalanche-fuji": 43113,
+          avaxfuji: 43113,
+          "avax-fuji": 43113
+        };
+        const chainId = aliasChainId[alias];
+        if (chainId) {
+          network = networks.find((n5) => n5.chainId === chainId);
+        }
+      }
       if (!network) {
         throw new SDKError("Network not found", "INVALID_NETWORK" /* INVALID_NETWORK */);
       }
-      await LocalForage.save(`${this.orgHost}:currentNetwork`, networkId);
+      await LocalForage.save(`${this.orgHost}:currentNetwork`, network.id);
     } catch (error) {
       if (error instanceof SDKError) throw error;
       throw new SDKError("Failed to switch network", "NETWORK_ERROR" /* NETWORK_ERROR */);