@weblock-wallet/sdk 0.1.46 → 0.1.48

package/dist/index.js

@@ -105785,8 +105785,51 @@ var AssetService = class extends EventEmitter {
     this.networkService = networkService;
     this.userClient = userClient;
     this.orgHost = orgHost;
+    this.chainIdCache = /* @__PURE__ */ new Map();
     this.erc20Interface = new Interface2(ERC20_ABI2);
   }
+  /**
+   * Resolve a user-facing networkId (blockchainId) into an EVM chainId for /v1/rpcs.
+   *
+   * Notes
+   * - Many SDK APIs use `networkId` to mean the registered blockchain id (UUID).
+   * - The wallet-rpc endpoint (/v1/rpcs) expects `chainId`.
+   * - Some older call-sites may pass chainId as a string; we support both.
+   */
+  async resolveChainId(networkId) {
+    const trimmed = (networkId ?? "").trim();
+    const cached = this.chainIdCache.get(trimmed);
+    if (cached) return cached;
+    const numeric = Number(trimmed);
+    if (!Number.isNaN(numeric) && Number.isFinite(numeric) && numeric > 0) {
+      this.chainIdCache.set(trimmed, numeric);
+      return numeric;
+    }
+    try {
+      const current = await this.networkService.getCurrentNetwork();
+      if (current && current.id === trimmed) {
+        this.chainIdCache.set(trimmed, current.chainId);
+        return current.chainId;
+      }
+      if (current && String(current.chainId) === trimmed) {
+        this.chainIdCache.set(trimmed, current.chainId);
+        return current.chainId;
+      }
+    } catch {
+    }
+    const networks = await this.networkService.getRegisteredNetworks();
+    const found = networks.find((n5) => n5.id === trimmed);
+    if (found) {
+      this.chainIdCache.set(trimmed, found.chainId);
+      return found.chainId;
+    }
+    const foundByChainId = networks.find((n5) => String(n5.chainId) === trimmed);
+    if (foundByChainId) {
+      this.chainIdCache.set(trimmed, foundByChainId.chainId);
+      return foundByChainId.chainId;
+    }
+    throw new SDKError("Invalid network", "INVALID_NETWORK" /* INVALID_NETWORK */);
+  }
   async getTokenInfo(params) {
     try {
       const [name2, symbol, decimals] = await Promise.all([
@@ -105977,16 +106020,52 @@ var AssetService = class extends EventEmitter {
     checkStatus();
   }
   async addToken(params) {
+    const hasMeta = !!params.name && !!params.symbol && typeof params.decimals === "number";
+    const meta = hasMeta ? {
+      name: params.name,
+      symbol: params.symbol,
+      decimals: params.decimals
+    } : await this.getTokenInfo({
+      networkId: params.networkId,
+      tokenAddress: params.address
+    });
+    try {
+      await this.userClient.registerToken({
+        blockchainId: params.networkId,
+        contractAddress: params.address,
+        name: meta.name,
+        symbol: meta.symbol,
+        decimals: meta.decimals
+      });
+    } catch (error) {
+      throw new SDKError(
+        "Failed to register token",
+        "REQUEST_FAILED" /* REQUEST_FAILED */,
+        error
+      );
+    }
     const key = `${this.orgHost}:token:${params.networkId}:${params.address}`;
     await LocalForage.save(key, params);
   }
+  async getRegisteredCoins(networkId) {
+    try {
+      return await this.userClient.getRegisteredCoins(networkId);
+    } catch (error) {
+      throw new SDKError(
+        "Failed to get registered tokens",
+        "REQUEST_FAILED" /* REQUEST_FAILED */,
+        error
+      );
+    }
+  }
   async getTokenBalance(params) {
     try {
+      const chainId = await this.resolveChainId(params.networkId);
       const data = this.erc20Interface.encodeFunctionData("balanceOf", [
         params.walletAddress
       ]);
       const response = await this.rpcClient.sendRpc({
-        chainId: Number(params.networkId),
+        chainId,
         method: "eth_call" /* ETH_CALL */,
         params: [
           {
@@ -106007,12 +106086,13 @@ var AssetService = class extends EventEmitter {
   }
   async approveToken(params) {
     try {
+      const chainId = await this.resolveChainId(params.networkId);
       const data = this.erc20Interface.encodeFunctionData("approve", [
         params.spender,
         params.amount
       ]);
       const response = await this.rpcClient.sendRpc({
-        chainId: Number(params.networkId),
+        chainId,
         method: "eth_sendRawTransaction" /* ETH_SEND_RAW_TRANSACTION */,
         params: [
           {
@@ -106032,12 +106112,13 @@ var AssetService = class extends EventEmitter {
   }
   async getAllowance(params) {
     try {
+      const chainId = await this.resolveChainId(params.networkId);
       const data = this.erc20Interface.encodeFunctionData("allowance", [
         params.owner,
         params.spender
       ]);
       const response = await this.rpcClient.sendRpc({
-        chainId: Number(params.networkId),
+        chainId,
         method: "eth_call" /* ETH_CALL */,
         params: [
           {
@@ -106057,9 +106138,10 @@ var AssetService = class extends EventEmitter {
     }
   }
   async callTokenMethod(tokenAddress, networkId, method) {
+    const chainId = await this.resolveChainId(networkId);
     const data = this.erc20Interface.encodeFunctionData(method, []);
     const response = await this.rpcClient.sendRpc({
-      chainId: Number(networkId),
+      chainId,
       method: "eth_call" /* ETH_CALL */,
       params: [
         {
@@ -106117,7 +106199,6 @@ 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),
@@ -106139,25 +106220,27 @@ var InternalCoreImpl = class {
     };
     this.asset = {
       transfer: (params) => this.assetService.transfer(params),
-      /**
-       * ✅ 타입 정합성:
-       * - InternalCore는 decimals?: number
-       * - 기존 AssetService 내부 구현이 decimals를 string으로 받는 경우가 있어,
-       *   여기서 안전하게 string으로 변환해서 전달합니다.
-       */
-      addToken: (params) => this.assetService.addToken({
-        ...params,
-        decimals: typeof params.decimals === "number" ? String(params.decimals) : void 0
-      }),
+      addToken: (params) => this.assetService.addToken(params),
+      // New ERC20 methods
       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),
       registerToken: (params) => this.assetService.registerToken(params),
-      getTokenFullInfo: (params) => this.assetService.getTokenFullInfo(params)
+      getTokenFullInfo: (params) => this.assetService.getTokenFullInfo(params),
+      getRegisteredCoins: (networkId) => this.assetService.getRegisteredCoins(networkId)
     };
     const httpClient = new HttpClient(options);
     const firebase = new FirebaseAuth(options);
@@ -106312,6 +106395,34 @@ var WalletModule = class {
         network.chainId
       );
       console.log("\uCD5C\uADFC \uD2B8\uB79C\uC7AD\uC158:", latestTransaction);
+      let tokens = [];
+      try {
+        const registered = await this.core.asset.getRegisteredCoins(network.id);
+        if (registered?.length) {
+          const unique = new Map(
+            registered.map((c5) => [c5.contractAddress.toLowerCase(), c5])
+          );
+          tokens = await Promise.all(
+            Array.from(unique.values()).map(async (coin) => {
+              const full = await this.core.asset.getTokenFullInfo({
+                networkId: network.id,
+                tokenAddress: coin.contractAddress,
+                walletAddress: address
+              });
+              return {
+                ...full,
+                address: coin.contractAddress,
+                name: coin.name ?? full.name,
+                symbol: coin.symbol ?? full.symbol,
+                decimals: typeof coin.decimals === "number" ? coin.decimals : full.decimals
+              };
+            })
+          );
+        }
+      } catch (e7) {
+        console.warn("Registered token load failed:", e7);
+        tokens = [];
+      }
       const walletInfo = {
         address,
         network: {
@@ -106324,40 +106435,7 @@ var WalletModule = class {
             balance: nativeBalance,
             decimals: 18
           },
-          tokens: [
-            // {
-            //   symbol: rbtBalance.symbol,
-            //   name: 'Real-estate Backed Token',
-            //   address: '0xB10536cC40Cb6E6415f70d3a4C1AF7Fa638AE829',
-            //   balance: rbtBalance,
-            //   decimals: rbtBalance.decimals,
-            //   totalSupply: rbtBalance,
-            // },
-            // {
-            //   symbol: usdrBalance.symbol,
-            //   name: 'USD Real-estate',
-            //   address: '0x8d335fe5B30e27F2B21F057a4766cf4BB8c30785',
-            //   balance: usdrBalance,
-            //   decimals: usdrBalance.decimals,
-            //   totalSupply: usdrBalance,
-            // },
-            // {
-            //   symbol: wftBalance.symbol,
-            //   name: 'WeBlock Foundation Token',
-            //   address: '0x6fa62Eda03956ef4E54f3C8597E8c3f3bE40A45B',
-            //   balance: wftBalance,
-            //   decimals: wftBalance.decimals,
-            //   totalSupply: wftBalance,
-            // },
-            // {
-            //   symbol: usdtBalance.symbol,
-            //   name: 'USD Tether',
-            //   address: '0xfF54B9ebe777f528E64C74bc95c68433B7546038',
-            //   balance: usdtBalance,
-            //   decimals: usdtBalance.decimals,
-            //   totalSupply: usdtBalance,
-            // },
-          ],
+          tokens,
           nfts: [],
           securities: []
         },