@zubari/sdk 0.1.26 → 0.1.27

package/dist/wallet/index.js

@@ -4,11 +4,11 @@ var ethers = require('ethers');
 var viem = require('viem');
 var chains = require('viem/chains');
 var bip39 = require('@scure/bip39');
-var english_js = require('@scure/bip39/wordlists/english.js');
+var english = require('@scure/bip39/wordlists/english');
 var bip32 = require('@scure/bip32');
 var base = require('@scure/base');
-var sha2_js = require('@noble/hashes/sha2.js');
-var legacy_js = require('@noble/hashes/legacy.js');
+var sha256 = require('@noble/hashes/sha256');
+var ripemd160 = require('@noble/hashes/ripemd160');
 
 // src/config/networks.ts
 var NETWORKS = {
@@ -98,6 +98,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,
@@ -911,7 +916,7 @@ function deriveBitcoinAddress(seed, network = "testnet") {
     if (!child.publicKey) {
       throw new Error("Failed to derive public key");
     }
-    const pubKeyHash = legacy_js.ripemd160(sha2_js.sha256(child.publicKey));
+    const pubKeyHash = ripemd160.ripemd160(sha256.sha256(child.publicKey));
     const witnessVersion = 0;
     const words = base.bech32.toWords(pubKeyHash);
     words.unshift(witnessVersion);
@@ -952,7 +957,7 @@ async function deriveTonAddress(seed) {
     const publicKey = keypair.publicKey;
     const workchain = 0;
     const flags = 17;
-    const hash = sha2_js.sha256(publicKey);
+    const hash = sha256.sha256(publicKey);
     const addressData = new Uint8Array(34);
     addressData[0] = flags;
     addressData[1] = workchain;
@@ -989,7 +994,7 @@ function deriveTronAddress(seed) {
     for (let i = 0; i < 20; i++) {
       addressBytes[i + 1] = parseInt(ethAddressHex.slice(i * 2, i * 2 + 2), 16);
     }
-    const tronBase58check = base.base58check(sha2_js.sha256);
+    const tronBase58check = base.base58check(sha256.sha256);
     return tronBase58check.encode(addressBytes);
   } catch (error) {
     console.error("TRON address derivation failed:", error);
@@ -1004,7 +1009,7 @@ function deriveSparkAddress(seed, network = "testnet") {
     if (!child.publicKey) {
       throw new Error("Failed to derive public key");
     }
-    const pubKeyHash = legacy_js.ripemd160(sha2_js.sha256(child.publicKey));
+    const pubKeyHash = ripemd160.ripemd160(sha256.sha256(child.publicKey));
     const witnessVersion = 0;
     const words = base.bech32.toWords(pubKeyHash);
     words.unshift(witnessVersion);
@@ -1062,10 +1067,10 @@ async function deriveAllAddresses(seed, network = "testnet") {
   return addresses;
 }
 function isValidSeed(seed) {
-  return bip39.validateMnemonic(seed, english_js.wordlist);
+  return bip39.validateMnemonic(seed, english.wordlist);
 }
 function generateSeedPhrase() {
-  return bip39.generateMnemonic(english_js.wordlist);
+  return bip39.generateMnemonic(english.wordlist);
 }
 
 // src/services/ZubariWdkService.ts
@@ -1843,6 +1848,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
    */
@@ -1850,8 +1882,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) {
@@ -1889,8 +1924,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);
@@ -1902,7 +1944,7 @@ var WalletManager = class _WalletManager {
    * Get all derived addresses
    */
   getAllAddresses() {
-    return { ...this.derivedAddresses };
+    return this.normalizeAddresses(this.derivedAddresses);
   }
   /**
    * Set the selected chain
@@ -1944,6 +1986,7 @@ var WalletManager = class _WalletManager {
     let balance = "0";
     if (chain === "ethereum") {
       const viemChain = this.config.network === "mainnet" ? chains.mainnet : chains.sepolia;
+      console.log(`[WalletManager] Fetching ${chain} balance for ${address} using RPC: ${this.config.rpcUrl}`);
       const client = viem.createPublicClient({
         chain: viemChain,
         transport: viem.http(this.config.rpcUrl, {
@@ -1958,8 +2001,9 @@ var WalletManager = class _WalletManager {
           address
         });
         balance = viem.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");