@weblock-wallet/sdk 0.1.58 → 0.1.60

package/dist/index.js

@@ -104550,7 +104550,15 @@ var WalletService = class {
       method: "eth_sendRawTransaction" /* ETH_SEND_RAW_TRANSACTION */,
       params: [signedTx]
     });
-    return response.result;
+    const txHash = response?.result;
+    if (!txHash || typeof txHash !== "string") {
+      throw new SDKError(
+        "RPC returned empty tx hash",
+        "TRANSACTION_FAILED" /* TRANSACTION_FAILED */,
+        response
+      );
+    }
+    return txHash;
   }
   async getTransactionReceipt(txHash, chainId) {
     const response = await this.rpcClient.sendRpc({
@@ -104631,10 +104639,33 @@ var WalletService = class {
           return s5;
         }
       };
-      const [share1, share2] = await Promise.all([
-        this.walletClient.getWallet().then((wallet2) => wallet2.share1),
-        LocalForage.get(STORAGE_KEYS.share2(this.orgHost))
-      ]);
+      const walletInfo = await this.walletClient.getWallet();
+      const share1 = walletInfo?.share1;
+      let share2 = await LocalForage.get(
+        STORAGE_KEYS.share2(this.orgHost)
+      );
+      if (!share2) {
+        try {
+          const firebaseId = await LocalForage.get(
+            STORAGE_KEYS.firebaseId(this.orgHost)
+          );
+          const encryptedDevice = await LocalForage.get(
+            STORAGE_KEYS.encryptedShare2Device(this.orgHost)
+          );
+          const deviceSecret = await LocalForage.get(
+            STORAGE_KEYS.deviceSecret(this.orgHost)
+          );
+          if (firebaseId && encryptedDevice && deviceSecret) {
+            share2 = Crypto.decryptShare(
+              encryptedDevice,
+              deviceSecret,
+              firebaseId
+            );
+            await LocalForage.save(STORAGE_KEYS.share2(this.orgHost), share2);
+          }
+        } catch {
+        }
+      }
       if (!share1 || !share2) {
         throw new SDKError(
           "Wallet shares not found",
@@ -104660,27 +104691,28 @@ var WalletService = class {
           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;
+          const data = (params.data || "0x").toLowerCase();
+          const isApprove = data.startsWith("0x095ea7b3");
+          const fallback = isApprove ? 12e4 : data !== "0x" ? 8e5 : 21e3;
           gasLimit = "0x" + fallback.toString(16);
         }
       }
+      const value = params.value ?? "0";
       const signedTx = await wallet.signTransaction({
         to: params.to,
-        value: params.value ?? "0x0",
+        value,
         data: params.data || "0x",
         chainId: params.chainId,
         nonce,
         gasPrice,
         gasLimit
       });
-      return this.sendRawTransaction(signedTx, params.chainId);
+      const txHash = await this.sendRawTransaction(signedTx, params.chainId);
+      await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
+      return txHash;
     } catch (error) {
-      const detail = String(
-        error?.shortMessage ?? error?.reason ?? error?.message ?? ""
-      ).trim();
       throw new SDKError(
-        detail ? `Transaction failed: ${detail}` : "Transaction failed",
+        "Transaction failed",
         "TRANSACTION_FAILED" /* TRANSACTION_FAILED */,
         error
       );
@@ -105155,9 +105187,19 @@ var RpcClient = class {
       method: request.method,
       params: request.params
     };
-    return this.client.post(this.baseUrl, rpcRequest, {
-      needsAccessToken: true
-    });
+    const res = await this.client.post(
+      this.baseUrl,
+      rpcRequest,
+      {
+        needsAccessToken: true
+      }
+    );
+    if (res?.error) {
+      const err = res.error;
+      const msg = err?.message || "RPC error";
+      throw new SDKError(msg, "REQUEST_FAILED" /* REQUEST_FAILED */, err);
+    }
+    return res;
   }
 };