@zubari/sdk 0.1.26 → 0.1.27

package/dist/wallet/index.mjs

@@ -2,11 +2,11 @@ import { Wallet, HDNodeWallet } from 'ethers';
 import { createPublicClient, http, formatEther } from 'viem';
 import { mainnet, sepolia } from 'viem/chains';
 import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from '@scure/bip39';
-import { wordlist } from '@scure/bip39/wordlists/english.js';
+import { wordlist } from '@scure/bip39/wordlists/english';
 import { HDKey } from '@scure/bip32';
 import { bech32, base58check } from '@scure/base';
-import { sha256 } from '@noble/hashes/sha2.js';
-import { ripemd160 } from '@noble/hashes/legacy.js';
+import { sha256 } from '@noble/hashes/sha256';
+import { ripemd160 } from '@noble/hashes/ripemd160';
 
 // src/config/networks.ts
 var NETWORKS = {
@@ -96,6 +96,11 @@ var NETWORKS = {
   }
 };
 var TESTNET_NETWORKS = {
+  bitcoin: {
+    name: "Bitcoin Testnet",
+    rpcUrl: "https://blockstream.info/testnet/api",
+    explorerUrl: "https://mempool.space/testnet"
+  },
   ethereum: {
     name: "Sepolia",
     chainId: 11155111,
@@ -1841,6 +1846,33 @@ var WalletManager = class _WalletManager {
       console.warn("Failed to save addresses to storage:", error);
     }
   }
+  /**
+   * Normalize an address value - extract string from object format if needed
+   * Handles both string addresses and object format {chain, address, path}
+   */
+  normalizeAddress(value) {
+    if (typeof value === "string") {
+      return value;
+    }
+    if (value && typeof value === "object" && "address" in value) {
+      const addr = value.address;
+      return typeof addr === "string" ? addr : null;
+    }
+    return null;
+  }
+  /**
+   * Normalize all addresses in an object - extract strings from object format
+   */
+  normalizeAddresses(addresses) {
+    const normalized = {};
+    for (const [chain, value] of Object.entries(addresses)) {
+      const addr = this.normalizeAddress(value);
+      if (addr) {
+        normalized[chain] = addr;
+      }
+    }
+    return normalized;
+  }
   /**
    * Load derived addresses from storage
    */
@@ -1848,8 +1880,11 @@ var WalletManager = class _WalletManager {
     try {
       const stored = await this.storage.getItem(STORAGE_KEYS.DERIVED_ADDRESSES);
       if (stored) {
-        const addresses = JSON.parse(stored);
-        console.log("Loaded derived addresses from storage:", Object.keys(addresses));
+        const rawAddresses = JSON.parse(stored);
+        console.log("[WalletManager] Raw addresses from storage:", rawAddresses);
+        const addresses = this.normalizeAddresses(rawAddresses);
+        console.log("[WalletManager] Normalized addresses:", addresses);
+        await this.saveAddressesToStorage(addresses);
         return addresses;
       }
     } catch (error) {
@@ -1887,8 +1922,15 @@ var WalletManager = class _WalletManager {
    * Returns cached address or null - use deriveAllAddressesAsync to derive addresses
    */
   getAddressForChain(chain) {
-    if (this.derivedAddresses[chain]) {
-      return this.derivedAddresses[chain];
+    const cachedValue = this.derivedAddresses[chain];
+    if (cachedValue) {
+      console.log(`[WalletManager] getAddressForChain(${chain}) cached value:`, cachedValue, "type:", typeof cachedValue);
+      const addr = this.normalizeAddress(cachedValue);
+      console.log(`[WalletManager] getAddressForChain(${chain}) normalized:`, addr);
+      if (addr) {
+        this.derivedAddresses[chain] = addr;
+        return addr;
+      }
     }
     if (chain === "ethereum" && this.currentSeed) {
       this.derivedAddresses[chain] = _WalletManager.deriveAddressForChain(this.currentSeed, chain);
@@ -1900,7 +1942,7 @@ var WalletManager = class _WalletManager {
    * Get all derived addresses
    */
   getAllAddresses() {
-    return { ...this.derivedAddresses };
+    return this.normalizeAddresses(this.derivedAddresses);
   }
   /**
    * Set the selected chain
@@ -1942,6 +1984,7 @@ var WalletManager = class _WalletManager {
     let balance = "0";
     if (chain === "ethereum") {
       const viemChain = this.config.network === "mainnet" ? mainnet : sepolia;
+      console.log(`[WalletManager] Fetching ${chain} balance for ${address} using RPC: ${this.config.rpcUrl}`);
       const client = createPublicClient({
         chain: viemChain,
         transport: http(this.config.rpcUrl, {
@@ -1956,8 +1999,9 @@ var WalletManager = class _WalletManager {
           address
         });
         balance = formatEther(rawBalance);
+        console.log(`[WalletManager] ${chain} balance fetched: ${balance} (raw: ${rawBalance})`);
       } catch (error) {
-        console.warn(`Failed to fetch ${chain} balance:`, error);
+        console.error(`[WalletManager] Failed to fetch ${chain} balance from ${this.config.rpcUrl}:`, error);
       }
     } else if (chain === "bitcoin") {
       const isMainnet = this.config.network === "mainnet" || address.startsWith("bc1") || address.startsWith("1") || address.startsWith("3");