@weblock-wallet/sdk 0.1.65 → 0.1.67

package/dist/index.cjs

@@ -1938,26 +1938,6 @@ var AuthService = class {
 var import_ethers2 = require("ethers");
 var import_bip39 = require("bip39");
 
-// src/utils/secrets.ts
-var import_shamir_secret_sharing = require("shamir-secret-sharing");
-var Secrets = {
-  async split(secret, total, threshold) {
-    if (secret.startsWith("0x")) {
-      secret = secret.substring(2);
-    }
-    const array = await (0, import_shamir_secret_sharing.split)(
-      new Uint8Array(Buffer2.from(secret, "hex")),
-      total,
-      threshold
-    );
-    return array.map((item) => Buffer2.from(item).toString("hex"));
-  },
-  async combine(shares) {
-    const array = shares.map((item) => new Uint8Array(Buffer2.from(item, "hex")));
-    return `0x${Buffer2.from(await (0, import_shamir_secret_sharing.combine)(array)).toString("hex")}`;
-  }
-};
-
 // node_modules/.pnpm/@jspm+core@2.1.0/node_modules/@jspm/core/nodelibs/browser/chunk-CcCWfKp1.js
 var exports$22 = {};
 var _dewExec$12 = false;
@@ -103973,6 +103953,26 @@ var webcrypto = exports11.webcrypto;
 var getRandomValues = exports11.getRandomValues;
 var randomUUID = exports11.randomUUID;
 
+// src/utils/secrets.ts
+var import_shamir_secret_sharing = require("shamir-secret-sharing");
+var Secrets = {
+  async split(secret, total, threshold) {
+    if (secret.startsWith("0x")) {
+      secret = secret.substring(2);
+    }
+    const array = await (0, import_shamir_secret_sharing.split)(
+      new Uint8Array(Buffer2.from(secret, "hex")),
+      total,
+      threshold
+    );
+    return array.map((item) => Buffer2.from(item).toString("hex"));
+  },
+  async combine(shares) {
+    const array = shares.map((item) => new Uint8Array(Buffer2.from(item, "hex")));
+    return `0x${Buffer2.from(await (0, import_shamir_secret_sharing.combine)(array)).toString("hex")}`;
+  }
+};
+
 // src/utils/crypto.ts
 var ed = __toESM(require("@noble/ed25519"), 1);
 function urlEncode(pemKey) {
@@ -104020,6 +104020,65 @@ var Crypto = {
   }
 };
 
+// src/utils/numbers.ts
+var import_ethers = require("ethers");
+var TokenAmount = class {
+  /**
+   * Wei 단위의 값을 사용자가 읽을 수 있는 형태로 변환
+   * @param value - Wei 단위의 값 (hex string 또는 decimal string)
+   * @param decimals - 토큰의 소수점 자리수
+   * @returns 변환된 문자열
+   */
+  static fromWei(value, decimals) {
+    try {
+      return (0, import_ethers.formatUnits)(value, decimals);
+    } catch (error) {
+      console.error("Error converting from wei:", error);
+      return "0.0";
+    }
+  }
+  /**
+   * 사용자 입력값을 Wei 단위로 변환
+   * @param value - 사용자 입력값 (예: "1.5")
+   * @param decimals - 토큰의 소수점 자리수
+   * @returns Wei 단위의 값
+   */
+  static toWei(value, decimals) {
+    try {
+      return (0, import_ethers.parseUnits)(value, decimals).toString();
+    } catch (error) {
+      console.error("Error converting to wei:", error);
+      return "0";
+    }
+  }
+  /**
+   * 표시용 포맷으로 변환
+   * @param value - Wei 단위의 값
+   * @param decimals - 토큰의 소수점 자리수
+   * @param maxDecimals - 최대 표시할 소수점 자리수 (기본값: 4)
+   * @returns 포맷된 문자열
+   */
+  static format(value, decimals, maxDecimals = 4) {
+    const fullNumber = this.fromWei(value, decimals);
+    const [beforeDecimal, afterDecimal = ""] = fullNumber.split(".");
+    return `${beforeDecimal}.${afterDecimal.slice(0, maxDecimals)}`;
+  }
+  /**
+   * 값이 유효한지 검증
+   * @param value - 검증할 값
+   * @returns 유효성 여부
+   */
+  static isValid(value) {
+    return /^\d*\.?\d*$/.test(value) && value !== "";
+  }
+};
+var DECIMALS = {
+  ETH: 18,
+  USDC: 6,
+  USDT: 6,
+  DAI: 18
+};
+
 // src/types/error.ts
 var SDKErrorCode = /* @__PURE__ */ ((SDKErrorCode2) => {
   SDKErrorCode2["NOT_INITIALIZED"] = "NOT_INITIALIZED";
@@ -104088,65 +104147,6 @@ var SignInStatus = /* @__PURE__ */ ((SignInStatus2) => {
   return SignInStatus2;
 })(SignInStatus || {});
 
-// src/utils/numbers.ts
-var import_ethers = require("ethers");
-var TokenAmount = class {
-  /**
-   * Wei 단위의 값을 사용자가 읽을 수 있는 형태로 변환
-   * @param value - Wei 단위의 값 (hex string 또는 decimal string)
-   * @param decimals - 토큰의 소수점 자리수
-   * @returns 변환된 문자열
-   */
-  static fromWei(value, decimals) {
-    try {
-      return (0, import_ethers.formatUnits)(value, decimals);
-    } catch (error) {
-      console.error("Error converting from wei:", error);
-      return "0.0";
-    }
-  }
-  /**
-   * 사용자 입력값을 Wei 단위로 변환
-   * @param value - 사용자 입력값 (예: "1.5")
-   * @param decimals - 토큰의 소수점 자리수
-   * @returns Wei 단위의 값
-   */
-  static toWei(value, decimals) {
-    try {
-      return (0, import_ethers.parseUnits)(value, decimals).toString();
-    } catch (error) {
-      console.error("Error converting to wei:", error);
-      return "0";
-    }
-  }
-  /**
-   * 표시용 포맷으로 변환
-   * @param value - Wei 단위의 값
-   * @param decimals - 토큰의 소수점 자리수
-   * @param maxDecimals - 최대 표시할 소수점 자리수 (기본값: 4)
-   * @returns 포맷된 문자열
-   */
-  static format(value, decimals, maxDecimals = 4) {
-    const fullNumber = this.fromWei(value, decimals);
-    const [beforeDecimal, afterDecimal = ""] = fullNumber.split(".");
-    return `${beforeDecimal}.${afterDecimal.slice(0, maxDecimals)}`;
-  }
-  /**
-   * 값이 유효한지 검증
-   * @param value - 검증할 값
-   * @returns 유효성 여부
-   */
-  static isValid(value) {
-    return /^\d*\.?\d*$/.test(value) && value !== "";
-  }
-};
-var DECIMALS = {
-  ETH: 18,
-  USDC: 6,
-  USDT: 6,
-  DAI: 18
-};
-
 // src/core/services/wallet.ts
 var ERC20_ABI = [
   "function balanceOf(address owner) view returns (uint256)",
@@ -104172,7 +104172,7 @@ var WalletService = class {
     this.walletAddress = null;
   }
   /**
-   * Wallet PIN/password mismatch handling.
+   * Password/PIN mismatch detection for decrypt errors.
    */
   isInvalidPasswordError(error) {
     if (!error) return false;
@@ -104191,9 +104191,8 @@ var WalletService = class {
     return /^[0-9]{6}$/.test(pin);
   }
   /**
-   * deviceSecret은 "PIN과 무관한 로컬 복구용 비밀값"입니다.
-   * - 같은 디바이스에서만 PIN reset이 가능하도록 하는 역할
-   * - 서버에는 절대 전달하지 않습니다.
+   * deviceSecret: local-only secret for device recovery material.
+   * This must never be sent to server.
    */
   async getOrCreateDeviceSecret() {
     const key = STORAGE_KEYS.deviceSecret(this.orgHost);
@@ -104203,19 +104202,20 @@ var WalletService = class {
     await LocalForage.save(key, secret);
     return secret;
   }
+  /**
+   * PATCH APPLIED:
+   * Always overwrite encryptedShare2_device when we have a fresh share2.
+   * Keeping an old device share causes (share1 new + share2 old) => different derived wallet.
+   */
   async ensureDeviceEncryptedShare2(share2Plain, firebaseId) {
     const encryptedKey = STORAGE_KEYS.encryptedShare2Device(this.orgHost);
-    const existing = await LocalForage.get(encryptedKey);
-    if (existing) return;
     const deviceSecret = await this.getOrCreateDeviceSecret();
     const encrypted = Crypto.encryptShare(share2Plain, deviceSecret, firebaseId);
     await LocalForage.save(encryptedKey, encrypted);
   }
   async getAddress() {
     try {
-      if (this.walletAddress) {
-        return this.walletAddress;
-      }
+      if (this.walletAddress) return this.walletAddress;
       const savedAddress = await LocalForage.get(
         STORAGE_KEYS.walletAddress(this.orgHost)
       );
@@ -104246,7 +104246,6 @@ var WalletService = class {
       const firebaseId = await LocalForage.get(
         STORAGE_KEYS.firebaseId(this.orgHost)
       );
-      console.log("1. FirebaseId:", firebaseId);
       if (!firebaseId) {
         throw new SDKError("Not logged in", "AUTH_REQUIRED" /* AUTH_REQUIRED */);
       }
@@ -104268,27 +104267,18 @@ var WalletService = class {
           "WALLET_ALREADY_EXISTS" /* WALLET_ALREADY_EXISTS */
         );
       }
-      console.log("2. Generating wallet...");
       const mnemonic = (0, import_bip39.generateMnemonic)();
       const seed = await (0, import_bip39.mnemonicToSeed)(mnemonic);
       const wallet = new import_ethers2.Wallet(seed.slice(0, 32).toString("hex"));
-      console.log("3. Wallet created:", {
-        address: wallet.address,
-        publicKey: wallet.signingKey.publicKey
-      });
-      console.log("4. Splitting private key...");
       const shares = await Secrets.split(wallet.privateKey, 3, 2);
       const [share1, share2, share3] = shares;
-      console.log("6. Encrypting shares...");
       const encryptedShare2 = Crypto.encryptShare(share2, password, firebaseId);
       const encryptedShare3 = Crypto.encryptShare(share3, password, firebaseId);
-      console.log("8. Saving encryptedShare2 to LocalForage...");
       await LocalForage.save(
         STORAGE_KEYS.encryptedShare2(this.orgHost),
         encryptedShare2
       );
       await this.ensureDeviceEncryptedShare2(share2, firebaseId);
-      console.log("10. Creating wallet on server...");
       await this.walletClient.createWallet({
         address: wallet.address,
         publicKey: wallet.signingKey.publicKey,
@@ -104302,7 +104292,6 @@ var WalletService = class {
       );
       return wallet.address;
     } catch (error) {
-      console.error("Error in create wallet:", error);
       if (error instanceof SDKError) throw error;
       throw new SDKError(
         "Failed to create wallet",
@@ -104357,8 +104346,13 @@ var WalletService = class {
           share2 = decryptShareOrThrow(encryptedShare2);
           await LocalForage.save(STORAGE_KEYS.share2(this.orgHost), share2);
         } else {
-          const share3 = decryptShareOrThrow(walletInfo.encryptedShare3);
-          const privateKey2 = await Secrets.combine([walletInfo.share1, share3]);
+          const share3 = decryptShareOrThrow(
+            walletInfo.encryptedShare3
+          );
+          const privateKey2 = await Secrets.combine([
+            walletInfo.share1,
+            share3
+          ]);
           const wallet2 = new import_ethers2.Wallet(privateKey2);
           const newShares = await Secrets.split(wallet2.privateKey, 3, 2);
           const [newShare1, newShare2, newShare3] = newShares;
@@ -104385,7 +104379,10 @@ var WalletService = class {
           return wallet2.address;
         }
       }
-      const privateKey = await Secrets.combine([walletInfo.share1, share2]);
+      const privateKey = await Secrets.combine([
+        walletInfo.share1,
+        share2
+      ]);
       const wallet = new import_ethers2.Wallet(privateKey);
       await this.ensureDeviceEncryptedShare2(share2, firebaseId);
       this.walletAddress = wallet.address;
@@ -104398,7 +104395,6 @@ var WalletService = class {
     } catch (error) {
       this.walletAddress = null;
       await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
-      console.error("Error in retrieveWallet:", error);
       if (error instanceof SDKError) throw error;
       throw new SDKError(
         "Failed to retrieve wallet",
@@ -104408,9 +104404,7 @@ var WalletService = class {
     }
   }
   /**
-   * NEW: PIN reset (프라이빗키/주소 유지)
-   * - 같은 디바이스에 남아있는 encryptedShare2_device를 이용
-   * - 서버는 PATCH /v1/wallets/keys 로 share1 / encryptedShare3 만 업데이트
+   * PIN reset (same private key/address) using encryptedShare2_device.
    */
   async resetPin(newPassword) {
     try {
@@ -104435,16 +104429,10 @@ var WalletService = class {
       const encryptedDevice = await LocalForage.get(
         STORAGE_KEYS.encryptedShare2Device(this.orgHost)
       );
-      if (!encryptedDevice) {
-        throw new SDKError(
-          "PIN reset is not available on this device",
-          "RECOVERY_NOT_AVAILABLE" /* RECOVERY_NOT_AVAILABLE */
-        );
-      }
       const deviceSecret = await LocalForage.get(
         STORAGE_KEYS.deviceSecret(this.orgHost)
       );
-      if (!deviceSecret) {
+      if (!encryptedDevice || !deviceSecret) {
         throw new SDKError(
           "PIN reset is not available on this device",
           "RECOVERY_NOT_AVAILABLE" /* RECOVERY_NOT_AVAILABLE */
@@ -104461,7 +104449,10 @@ var WalletService = class {
         );
       }
       const walletInfo = await this.walletClient.getWallet();
-      const privateKey = await Secrets.combine([walletInfo.share1, share2]);
+      const privateKey = await Secrets.combine([
+        walletInfo.share1,
+        share2
+      ]);
       const wallet = new import_ethers2.Wallet(privateKey);
       const newShares = await Secrets.split(wallet.privateKey, 3, 2);
       const [newShare1, newShare2, newShare3] = newShares;
@@ -104477,15 +104468,7 @@ var WalletService = class {
         STORAGE_KEYS.encryptedShare2(this.orgHost),
         Crypto.encryptShare(newShare2, newPassword, firebaseId)
       );
-      const newEncryptedDevice = Crypto.encryptShare(
-        newShare2,
-        deviceSecret,
-        firebaseId
-      );
-      await LocalForage.save(
-        STORAGE_KEYS.encryptedShare2Device(this.orgHost),
-        newEncryptedDevice
-      );
+      await this.ensureDeviceEncryptedShare2(newShare2, firebaseId);
       this.walletAddress = wallet.address;
       await LocalForage.save(
         STORAGE_KEYS.walletAddress(this.orgHost),
@@ -104494,7 +104477,6 @@ var WalletService = class {
       await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
       return wallet.address;
     } catch (error) {
-      console.error("Error in resetPin:", error);
       if (error instanceof SDKError) throw error;
       throw new SDKError(
         "Failed to reset PIN",
@@ -104532,38 +104514,20 @@ var WalletService = class {
     const rawBalance = await this.rpcClient.sendRpc({
       chainId,
       method: "eth_call" /* ETH_CALL */,
-      params: [
-        {
-          to: tokenAddress,
-          data
-        },
-        "latest"
-      ]
+      params: [{ to: tokenAddress, data }, "latest"]
     });
     const decimalsData = erc20.encodeFunctionData("decimals", []);
     const decimalsRes = await this.rpcClient.sendRpc({
       chainId,
       method: "eth_call" /* ETH_CALL */,
-      params: [
-        {
-          to: tokenAddress,
-          data: decimalsData
-        },
-        "latest"
-      ]
+      params: [{ to: tokenAddress, data: decimalsData }, "latest"]
     });
     const decimals = parseInt(decimalsRes.result, 16);
     const symbolData = erc20.encodeFunctionData("symbol", []);
     const symbolRes = await this.rpcClient.sendRpc({
       chainId,
       method: "eth_call" /* ETH_CALL */,
-      params: [
-        {
-          to: tokenAddress,
-          data: symbolData
-        },
-        "latest"
-      ]
+      params: [{ to: tokenAddress, data: symbolData }, "latest"]
     });
     const symbol = erc20.decodeFunctionResult("symbol", symbolRes.result)[0];
     return {
@@ -104652,34 +104616,36 @@ var WalletService = class {
         method: "eth_getTransactionCount" /* ETH_GET_TRANSACTION_COUNT */,
         params: [address, "latest"]
       });
-      if (!nonce.result || nonce.result === "0x0") {
-        return void 0;
-      }
+      if (!nonce.result || nonce.result === "0x0") return void 0;
       return {
         hash: "",
         status: "SUCCESS" /* SUCCESS */,
         timestamp: Date.now(),
         value: "0"
       };
-    } catch (error) {
-      console.error("Failed to get latest transaction:", error);
+    } catch {
       return void 0;
     }
   }
+  /**
+   * PATCH APPLIED (critical):
+   * - Never overwrite cached walletAddress with derived signer address.
+   * - If server/cached address != derived address => throw WALLET_RECOVERY_FAILED.
+   */
   async sendTransaction(params) {
+    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;
+      }
+    };
     try {
-      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 walletInfo = await this.walletClient.getWallet();
       const share1 = walletInfo?.share1;
       let share2 = await LocalForage.get(
@@ -104716,25 +104682,25 @@ var WalletService = class {
       const privateKey = await Secrets.combine([share1, share2]);
       const wallet = new import_ethers2.Wallet(privateKey);
       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
+      const serverAddress = String(walletInfo?.address ?? "").trim();
+      const cachedAddress = String(
+        await LocalForage.get(
+          STORAGE_KEYS.walletAddress(this.orgHost)
+        ) ?? ""
+      ).trim();
+      const mismatch = (a5, b4) => a5 && b4 && a5.toLowerCase() !== b4.toLowerCase();
+      if (mismatch(serverAddress, from) || mismatch(cachedAddress, from)) {
+        throw new SDKError(
+          `Wallet share mismatch detected. server=${serverAddress || "N/A"} cached=${cachedAddress || "N/A"} derived=${from}. Please re-enter PIN (retrieveWallet/resetPin) to refresh shares.`,
+          "WALLET_RECOVERY_FAILED" /* WALLET_RECOVERY_FAILED */
         );
-        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)) {
+      if (!nativeBal?.result || BigInt(nativeBal.result) === 0n) {
         throw new SDKError(
           `Insufficient native balance for gas. sender=${from} balance=${nativeBal?.result ?? "0x0"}`,
           "TRANSACTION_FAILED" /* TRANSACTION_FAILED */
@@ -104770,17 +104736,16 @@ var WalletService = class {
           );
           const buffered = Math.max(21e3, Math.ceil(est * 1.2));
           gasLimit = "0x" + buffered.toString(16);
-        } catch (e7) {
+        } catch {
           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,
+        value: params.value ?? "0",
         data: params.data || "0x",
         chainId: params.chainId,
         nonce,
@@ -104791,12 +104756,10 @@ var WalletService = class {
         const parsed = import_ethers2.Transaction.from(signedTx);
         const derivedFrom = parsed?.from;
         if (derivedFrom && String(derivedFrom).toLowerCase() !== from.toLowerCase()) {
-          console.warn(
-            "[WalletService] signedTx sender mismatch. wallet=",
-            from,
-            "txFrom=",
-            derivedFrom
-          );
+          console.warn("[WalletService] signedTx sender mismatch.", {
+            walletFrom: from,
+            txFrom: derivedFrom
+          });
         }
       } catch {
       }
@@ -104804,9 +104767,8 @@ var WalletService = class {
       await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
       return txHash;
     } catch (error) {
-      if (error instanceof SDKError) {
-        throw error;
-      }
+      await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
+      if (error instanceof SDKError) throw error;
       const msg = (() => {
         try {
           const anyErr = error;