@weblock-wallet/sdk 0.1.43 → 0.1.45

package/dist/index.d.cts

@@ -12,6 +12,8 @@ declare enum SDKErrorCode {
     WALLET_ALREADY_EXISTS = "WALLET_ALREADY_EXISTS",
     WALLET_CREATION_FAILED = "WALLET_CREATION_FAILED",
     INVALID_PASSWORD = "INVALID_PASSWORD",
+    RECOVERY_NOT_AVAILABLE = "RECOVERY_NOT_AVAILABLE",
+    PIN_RESET_FAILED = "PIN_RESET_FAILED",
     ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
     INSUFFICIENT_BALANCE = "INSUFFICIENT_BALANCE",
     TRANSFER_FAILED = "TRANSFER_FAILED",

package/dist/index.d.ts

@@ -12,6 +12,8 @@ declare enum SDKErrorCode {
     WALLET_ALREADY_EXISTS = "WALLET_ALREADY_EXISTS",
     WALLET_CREATION_FAILED = "WALLET_CREATION_FAILED",
     INVALID_PASSWORD = "INVALID_PASSWORD",
+    RECOVERY_NOT_AVAILABLE = "RECOVERY_NOT_AVAILABLE",
+    PIN_RESET_FAILED = "PIN_RESET_FAILED",
     ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
     INSUFFICIENT_BALANCE = "INSUFFICIENT_BALANCE",
     TRANSFER_FAILED = "TRANSFER_FAILED",

package/dist/index.js

@@ -103990,6 +103990,8 @@ var SDKErrorCode = /* @__PURE__ */ ((SDKErrorCode2) => {
   SDKErrorCode2["WALLET_ALREADY_EXISTS"] = "WALLET_ALREADY_EXISTS";
   SDKErrorCode2["WALLET_CREATION_FAILED"] = "WALLET_CREATION_FAILED";
   SDKErrorCode2["INVALID_PASSWORD"] = "INVALID_PASSWORD";
+  SDKErrorCode2["RECOVERY_NOT_AVAILABLE"] = "RECOVERY_NOT_AVAILABLE";
+  SDKErrorCode2["PIN_RESET_FAILED"] = "PIN_RESET_FAILED";
   SDKErrorCode2["ASSET_NOT_FOUND"] = "ASSET_NOT_FOUND";
   SDKErrorCode2["INSUFFICIENT_BALANCE"] = "INSUFFICIENT_BALANCE";
   SDKErrorCode2["TRANSFER_FAILED"] = "TRANSFER_FAILED";
@@ -104106,6 +104108,16 @@ var ERC20_ABI = [
   "function decimals() view returns (uint8)",
   "function symbol() view returns (string)"
 ];
+var STORAGE_KEYS = {
+  walletAddress: (orgHost) => `${orgHost}:walletAddress`,
+  share2: (orgHost) => `${orgHost}:share2`,
+  encryptedShare2: (orgHost) => `${orgHost}:encryptedShare2`,
+  encryptedShare2Device: (orgHost) => `${orgHost}:encryptedShare2_device`,
+  deviceSecret: (orgHost) => `${orgHost}:deviceSecret`,
+  firebaseId: (orgHost) => `${orgHost}:firebaseId`,
+  accessToken: (orgHost) => `${orgHost}:accessToken`,
+  isNewUser: (orgHost) => `${orgHost}:isNewUser`
+};
 var WalletService = class {
   constructor(walletClient, rpcClient, orgHost, networkService) {
     this.walletClient = walletClient;
@@ -104114,13 +104126,53 @@ var WalletService = class {
     this.networkService = networkService;
     this.walletAddress = null;
   }
+  /**
+   * Wallet PIN/password mismatch handling.
+   */
+  isInvalidPasswordError(error) {
+    if (!error) return false;
+    if (error instanceof Error) {
+      const msg = (error.message || "").toLowerCase();
+      return msg.includes("wrong password") || msg.includes("unable to decrypt") || msg.includes("bad decrypt") || msg.includes("invalid key");
+    }
+    try {
+      const msg = String(error?.message ?? "").toLowerCase();
+      return msg.includes("wrong password") || msg.includes("unable to decrypt") || msg.includes("bad decrypt") || msg.includes("invalid key");
+    } catch {
+      return false;
+    }
+  }
+  isSixDigitPin(pin) {
+    return /^[0-9]{6}$/.test(pin);
+  }
+  /**
+   * deviceSecret은 "PIN과 무관한 로컬 복구용 비밀값"입니다.
+   * - 같은 디바이스에서만 PIN reset이 가능하도록 하는 역할
+   * - 서버에는 절대 전달하지 않습니다.
+   */
+  async getOrCreateDeviceSecret() {
+    const key = STORAGE_KEYS.deviceSecret(this.orgHost);
+    const existing = await LocalForage.get(key);
+    if (existing) return existing;
+    const secret = randomBytes(32).toString("hex");
+    await LocalForage.save(key, secret);
+    return secret;
+  }
+  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;
       }
       const savedAddress = await LocalForage.get(
-        `${this.orgHost}:walletAddress`
+        STORAGE_KEYS.walletAddress(this.orgHost)
       );
       if (savedAddress) {
         this.walletAddress = savedAddress;
@@ -104130,7 +104182,7 @@ var WalletService = class {
       if (walletInfo?.address) {
         this.walletAddress = walletInfo.address;
         await LocalForage.save(
-          `${this.orgHost}:walletAddress`,
+          STORAGE_KEYS.walletAddress(this.orgHost),
           walletInfo.address
         );
         return walletInfo.address;
@@ -104147,7 +104199,7 @@ var WalletService = class {
   async create(password) {
     try {
       const firebaseId = await LocalForage.get(
-        `${this.orgHost}:firebaseId`
+        STORAGE_KEYS.firebaseId(this.orgHost)
       );
       console.log("1. FirebaseId:", firebaseId);
       if (!firebaseId) {
@@ -104156,8 +104208,14 @@ var WalletService = class {
       if (!password) {
         throw new SDKError("Password is required", "INVALID_PARAMS" /* INVALID_PARAMS */);
       }
+      if (!this.isSixDigitPin(password)) {
+        throw new SDKError(
+          "PIN must be a 6-digit number",
+          "INVALID_PARAMS" /* INVALID_PARAMS */
+        );
+      }
       const isNewUser = await LocalForage.get(
-        `${this.orgHost}:isNewUser`
+        STORAGE_KEYS.isNewUser(this.orgHost)
       );
       if (!isNewUser) {
         throw new SDKError(
@@ -104176,21 +104234,15 @@ var WalletService = class {
       console.log("4. Splitting private key...");
       const shares = await Secrets.split(wallet.privateKey, 3, 2);
       const [share1, share2, share3] = shares;
-      console.log("5. Shares created:", {
-        share1Length: share1.length,
-        share2Length: share2.length,
-        share3Length: share3.length
-      });
       console.log("6. Encrypting shares...");
       const encryptedShare2 = Crypto.encryptShare(share2, password, firebaseId);
       const encryptedShare3 = Crypto.encryptShare(share3, password, firebaseId);
-      console.log("7. Shares encrypted:", {
-        encryptedShare2Length: encryptedShare2.length,
-        encryptedShare3Length: encryptedShare3.length
-      });
       console.log("8. Saving encryptedShare2 to LocalForage...");
-      await LocalForage.save(`${this.orgHost}:encryptedShare2`, encryptedShare2);
-      console.log("9. encryptedShare2 saved");
+      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,
@@ -104198,9 +104250,11 @@ var WalletService = class {
         share1,
         encryptedShare3
       });
-      console.log("11. Wallet created on server");
       this.walletAddress = wallet.address;
-      await LocalForage.save(`${this.orgHost}:walletAddress`, wallet.address);
+      await LocalForage.save(
+        STORAGE_KEYS.walletAddress(this.orgHost),
+        wallet.address
+      );
       return wallet.address;
     } catch (error) {
       console.error("Error in create wallet:", error);
@@ -104215,44 +104269,54 @@ var WalletService = class {
   async retrieveWallet(password) {
     try {
       const accessToken = await LocalForage.get(
-        `${this.orgHost}:accessToken`
+        STORAGE_KEYS.accessToken(this.orgHost)
       );
       if (!accessToken) {
         throw new SDKError("Access token not found", "AUTH_REQUIRED" /* AUTH_REQUIRED */);
       }
-      console.log("1. Checking login status...");
       const firebaseId = await LocalForage.get(
-        `${this.orgHost}:firebaseId`
+        STORAGE_KEYS.firebaseId(this.orgHost)
       );
       if (!firebaseId) {
         throw new SDKError("Not logged in", "AUTH_REQUIRED" /* AUTH_REQUIRED */);
       }
-      console.log("2. Getting wallet info from server...");
+      if (!this.isSixDigitPin(password)) {
+        throw new SDKError(
+          "PIN must be a 6-digit number",
+          "INVALID_PARAMS" /* INVALID_PARAMS */
+        );
+      }
+      const decryptShareOrThrow = (encryptedShare) => {
+        try {
+          return Crypto.decryptShare(encryptedShare, password, firebaseId);
+        } catch (e7) {
+          if (this.isInvalidPasswordError(e7)) {
+            throw new SDKError(
+              "Incorrect PIN code",
+              "INVALID_PASSWORD" /* INVALID_PASSWORD */,
+              e7
+            );
+          }
+          throw e7;
+        }
+      };
       const walletInfo = await this.walletClient.getWallet();
-      console.log("3. Wallet info received:", { address: walletInfo.address });
-      let share2 = await LocalForage.get(`${this.orgHost}:share2`);
+      let share2 = await LocalForage.get(
+        STORAGE_KEYS.share2(this.orgHost)
+      );
       if (!share2) {
         const encryptedShare2 = await LocalForage.get(
-          `${this.orgHost}:encryptedShare2`
+          STORAGE_KEYS.encryptedShare2(this.orgHost)
         );
         if (encryptedShare2) {
-          share2 = Crypto.decryptShare(encryptedShare2, password, firebaseId);
-          await LocalForage.save(`${this.orgHost}:share2`, share2);
+          share2 = decryptShareOrThrow(encryptedShare2);
+          await LocalForage.save(STORAGE_KEYS.share2(this.orgHost), share2);
         } else {
-          console.log("8. No encryptedShare2, recovering using share3...");
-          const share3 = Crypto.decryptShare(
-            walletInfo.encryptedShare3,
-            password,
-            firebaseId
-          );
-          console.log("9. Share3 decrypted, combining with share1...");
+          const share3 = decryptShareOrThrow(walletInfo.encryptedShare3);
           const privateKey2 = await Secrets.combine([walletInfo.share1, share3]);
           const wallet2 = new Wallet(privateKey2);
-          console.log("10. Generating new shares...");
           const newShares = await Secrets.split(wallet2.privateKey, 3, 2);
           const [newShare1, newShare2, newShare3] = newShares;
-          console.log("11. New shares generated");
-          console.log("12. Updating wallet keys on server...");
           await this.walletClient.updateWalletKey({
             share1: newShare1,
             encryptedShare3: Crypto.encryptShare(
@@ -104261,28 +104325,34 @@ var WalletService = class {
               firebaseId
             )
           });
-          console.log("13. Saving new shares locally...");
-          await LocalForage.save(`${this.orgHost}:share2`, newShare2);
+          await LocalForage.save(STORAGE_KEYS.share2(this.orgHost), newShare2);
           await LocalForage.save(
-            `${this.orgHost}:encryptedShare2`,
+            STORAGE_KEYS.encryptedShare2(this.orgHost),
             Crypto.encryptShare(newShare2, password, firebaseId)
           );
-          console.log("14. Wallet recovered with share3:", wallet2.address);
+          await this.ensureDeviceEncryptedShare2(newShare2, firebaseId);
           this.walletAddress = wallet2.address;
-          console.log("15. Wallet address set:", this.walletAddress);
+          await LocalForage.save(
+            STORAGE_KEYS.walletAddress(this.orgHost),
+            wallet2.address
+          );
+          await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
           return wallet2.address;
         }
       }
-      console.log("15. Combining share1 and share2...");
       const privateKey = await Secrets.combine([walletInfo.share1, share2]);
       const wallet = new Wallet(privateKey);
+      await this.ensureDeviceEncryptedShare2(share2, firebaseId);
       this.walletAddress = wallet.address;
-      await LocalForage.save(`${this.orgHost}:walletAddress`, wallet.address);
-      await LocalForage.delete(`${this.orgHost}:share2`);
+      await LocalForage.save(
+        STORAGE_KEYS.walletAddress(this.orgHost),
+        wallet.address
+      );
+      await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
       return wallet.address;
     } catch (error) {
       this.walletAddress = null;
-      await LocalForage.delete(`${this.orgHost}:share2`);
+      await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
       console.error("Error in retrieveWallet:", error);
       if (error instanceof SDKError) throw error;
       throw new SDKError(
@@ -104292,11 +104362,109 @@ var WalletService = class {
       );
     }
   }
+  /**
+   * NEW: PIN reset (프라이빗키/주소 유지)
+   * - 같은 디바이스에 남아있는 encryptedShare2_device를 이용
+   * - 서버는 PATCH /v1/wallets/keys 로 share1 / encryptedShare3 만 업데이트
+   */
+  async resetPin(newPassword) {
+    try {
+      const accessToken = await LocalForage.get(
+        STORAGE_KEYS.accessToken(this.orgHost)
+      );
+      if (!accessToken) {
+        throw new SDKError("Access token not found", "AUTH_REQUIRED" /* AUTH_REQUIRED */);
+      }
+      const firebaseId = await LocalForage.get(
+        STORAGE_KEYS.firebaseId(this.orgHost)
+      );
+      if (!firebaseId) {
+        throw new SDKError("Not logged in", "AUTH_REQUIRED" /* AUTH_REQUIRED */);
+      }
+      if (!newPassword || !this.isSixDigitPin(newPassword)) {
+        throw new SDKError(
+          "PIN must be a 6-digit number",
+          "INVALID_PARAMS" /* INVALID_PARAMS */
+        );
+      }
+      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) {
+        throw new SDKError(
+          "PIN reset is not available on this device",
+          "RECOVERY_NOT_AVAILABLE" /* RECOVERY_NOT_AVAILABLE */
+        );
+      }
+      let share2;
+      try {
+        share2 = Crypto.decryptShare(encryptedDevice, deviceSecret, firebaseId);
+      } catch (e7) {
+        throw new SDKError(
+          "PIN reset is not available on this device",
+          "RECOVERY_NOT_AVAILABLE" /* RECOVERY_NOT_AVAILABLE */,
+          e7
+        );
+      }
+      const walletInfo = await this.walletClient.getWallet();
+      const privateKey = await Secrets.combine([walletInfo.share1, share2]);
+      const wallet = new Wallet(privateKey);
+      const newShares = await Secrets.split(wallet.privateKey, 3, 2);
+      const [newShare1, newShare2, newShare3] = newShares;
+      await this.walletClient.updateWalletKey({
+        share1: newShare1,
+        encryptedShare3: Crypto.encryptShare(
+          newShare3,
+          newPassword,
+          firebaseId
+        )
+      });
+      await LocalForage.save(
+        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
+      );
+      this.walletAddress = wallet.address;
+      await LocalForage.save(
+        STORAGE_KEYS.walletAddress(this.orgHost),
+        wallet.address
+      );
+      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",
+        "PIN_RESET_FAILED" /* PIN_RESET_FAILED */,
+        error
+      );
+    }
+  }
   async clearWalletState() {
     this.walletAddress = null;
-    await LocalForage.delete(`${this.orgHost}:walletAddress`);
-    await LocalForage.delete(`${this.orgHost}:share2`);
-    await LocalForage.delete(`${this.orgHost}:encryptedShare2`);
+    await LocalForage.delete(STORAGE_KEYS.walletAddress(this.orgHost));
+    await LocalForage.delete(STORAGE_KEYS.share2(this.orgHost));
+    await LocalForage.delete(STORAGE_KEYS.encryptedShare2(this.orgHost));
+    await LocalForage.delete(STORAGE_KEYS.encryptedShare2Device(this.orgHost));
+    await LocalForage.delete(STORAGE_KEYS.deviceSecret(this.orgHost));
   }
   async getBalance(address, chainId) {
     const response = await this.rpcClient.sendRpc({
@@ -104453,7 +104621,7 @@ var WalletService = class {
       }
       const [share1, share2] = await Promise.all([
         this.walletClient.getWallet().then((wallet2) => wallet2.share1),
-        LocalForage.get(`${this.orgHost}:share2`)
+        LocalForage.get(STORAGE_KEYS.share2(this.orgHost))
       ]);
       if (!share1 || !share2) {
         throw new SDKError(
@@ -105949,6 +106117,7 @@ var InternalCoreImpl = class {
       getAddress: () => this.walletService.getAddress(),
       create: (password) => this.walletService.create(password),
       retrieveWallet: (password) => this.walletService.retrieveWallet(password),
+      resetPin: (newPassword) => this.walletService.resetPin(newPassword),
       getBalance: (address, chainId) => this.walletService.getBalance(address, chainId),
       getTokenBalance: (tokenAddress, walletAddress, chainId) => this.walletService.getTokenBalance(tokenAddress, walletAddress, chainId),
       sendTransaction: (params) => this.walletService.sendTransaction(params),
@@ -105970,21 +106139,20 @@ var InternalCoreImpl = class {
     };
     this.asset = {
       transfer: (params) => this.assetService.transfer(params),
-      addToken: (params) => this.assetService.addToken(params),
-      // New ERC20 methods
+      /**
+       * ✅ 타입 정합성:
+       * - InternalCore는 decimals?: number
+       * - 기존 AssetService 내부 구현이 decimals를 string으로 받는 경우가 있어,
+       *   여기서 안전하게 string으로 변환해서 전달합니다.
+       */
+      addToken: (params) => this.assetService.addToken({
+        ...params,
+        decimals: typeof params.decimals === "number" ? String(params.decimals) : void 0
+      }),
       getTokenBalance: (params) => this.assetService.getTokenBalance(params),
       approveToken: (params) => this.assetService.approveToken(params),
       getAllowance: (params) => this.assetService.getAllowance(params),
-      // getTokenInfo: (params: TokenInfoParams) =>
-      //   this.assetService.getTokenInfo(params),
       addNFTCollection: (params) => this.assetService.addNFTCollection(params),
-      // checkSecurityTokenCompliance: (params: {
-      //   networkId: string
-      //   tokenAddress: string
-      //   from: string
-      //   to: string
-      //   amount: string
-      // }) => this.assetService.checkSecurityTokenCompliance(params),
       on: (event, listener) => this.assetService.on(event, listener),
       off: (event, listener) => this.assetService.off(event, listener),
       getTokenInfo: (params) => this.assetService.getTokenInfo(params),
@@ -106073,6 +106241,18 @@ var UserModule = class {
     const wallet = await this.walletModule.getInfo();
     return { wallet };
   }
+  /**
+   * PIN을 모르는 상태에서 같은 디바이스에 남아있는 복구용 share2(encryptedShare2_device)로
+   * PIN을 재설정합니다. (프라이빗키/주소 유지)
+   */
+  async resetPin(newPassword) {
+    if (!newPassword) {
+      throw new SDKError("Password is required", "INVALID_PARAMS" /* INVALID_PARAMS */);
+    }
+    await this.core.wallet.resetPin(newPassword);
+    const wallet = await this.walletModule.getInfo();
+    return { wallet };
+  }
   async signOut() {
     return this.core.auth.signOut();
   }