@zubari/sdk 0.1.21 → 0.1.22

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 = require('@scure/bip39/wordlists/english');
+var english_js = require('@scure/bip39/wordlists/english.js');
 var bip32 = require('@scure/bip32');
 var base = require('@scure/base');
-var sha256 = require('@noble/hashes/sha256');
-var ripemd160 = require('@noble/hashes/ripemd160');
+var sha2_js = require('@noble/hashes/sha2.js');
+var legacy_js = require('@noble/hashes/legacy.js');
 
 // src/config/networks.ts
 var NETWORKS = {
@@ -138,16 +138,18 @@ var ZUBARI_CONTRACTS = {
     // Ethereum Sepolia (11155111) - Deployed 2024-12-09
     registry: "0xEdDf443D48832f23D4A0bED4C4c5eF200B38A7d3",
     nft: "0xdc37e25650D685e4c38124aC314477Ea5f508a9e",
-    marketplace: ZERO_ADDRESS,
-    // Not yet deployed
+    marketplace: "0x48D0F3b6552A8CcDA7528db5aE8be004fCC3D3D9",
+    // ZubariMarket deployed 2024-12-22
     tips: "0xFDc353edC63Cd3D4bba35bB43861369516a9Dc85",
     subscriptions: "0x8C05F8aD2F295fB7f3596043a7c37C98A5F7fAB8",
     payouts: "0x804Fe503936E8b8d3D5Dbb62AF4fB6Fe7265Fb2c",
     entryPoint: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
     paymaster: ZERO_ADDRESS,
-    // Not yet deployed
+    // Deploy with: npx hardhat run deploy/deploy.ts --network ethereum-sepolia
     accountFactory: ZERO_ADDRESS,
     // Not yet deployed
+    usdc: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
+    // USDC on Sepolia
     usdt: "0xaA8E23Fb1079EA71e0a56F48a2aA51851D8433D0",
     // USDT on Sepolia
     weth: "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"
@@ -163,6 +165,8 @@ var ZUBARI_CONTRACTS = {
     entryPoint: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
     paymaster: ZERO_ADDRESS,
     accountFactory: ZERO_ADDRESS,
+    usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    // USDC on Ethereum
     usdt: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
     // USDT on Ethereum
     weth: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
@@ -845,7 +849,7 @@ function deriveBitcoinAddress(seed, network = "testnet") {
     if (!child.publicKey) {
       throw new Error("Failed to derive public key");
     }
-    const pubKeyHash = ripemd160.ripemd160(sha256.sha256(child.publicKey));
+    const pubKeyHash = legacy_js.ripemd160(sha2_js.sha256(child.publicKey));
     const witnessVersion = 0;
     const words = base.bech32.toWords(pubKeyHash);
     words.unshift(witnessVersion);
@@ -886,7 +890,7 @@ async function deriveTonAddress(seed) {
     const publicKey = keypair.publicKey;
     const workchain = 0;
     const flags = 17;
-    const hash = sha256.sha256(publicKey);
+    const hash = sha2_js.sha256(publicKey);
     const addressData = new Uint8Array(34);
     addressData[0] = flags;
     addressData[1] = workchain;
@@ -923,7 +927,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(sha256.sha256);
+    const tronBase58check = base.base58check(sha2_js.sha256);
     return tronBase58check.encode(addressBytes);
   } catch (error) {
     console.error("TRON address derivation failed:", error);
@@ -938,7 +942,7 @@ function deriveSparkAddress(seed, network = "testnet") {
     if (!child.publicKey) {
       throw new Error("Failed to derive public key");
     }
-    const pubKeyHash = ripemd160.ripemd160(sha256.sha256(child.publicKey));
+    const pubKeyHash = legacy_js.ripemd160(sha2_js.sha256(child.publicKey));
     const witnessVersion = 0;
     const words = base.bech32.toWords(pubKeyHash);
     words.unshift(witnessVersion);
@@ -996,10 +1000,10 @@ async function deriveAllAddresses(seed, network = "testnet") {
   return addresses;
 }
 function isValidSeed(seed) {
-  return bip39.validateMnemonic(seed, english.wordlist);
+  return bip39.validateMnemonic(seed, english_js.wordlist);
 }
 function generateSeedPhrase() {
-  return bip39.generateMnemonic(english.wordlist);
+  return bip39.generateMnemonic(english_js.wordlist);
 }
 
 // src/services/ZubariWdkService.ts
@@ -1762,33 +1766,6 @@ 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
    */
@@ -1796,11 +1773,8 @@ var WalletManager = class _WalletManager {
     try {
       const stored = await this.storage.getItem(STORAGE_KEYS.DERIVED_ADDRESSES);
       if (stored) {
-        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);
+        const addresses = JSON.parse(stored);
+        console.log("Loaded derived addresses from storage:", Object.keys(addresses));
         return addresses;
       }
     } catch (error) {
@@ -1838,15 +1812,8 @@ var WalletManager = class _WalletManager {
    * Returns cached address or null - use deriveAllAddressesAsync to derive addresses
    */
   getAddressForChain(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 (this.derivedAddresses[chain]) {
+      return this.derivedAddresses[chain];
     }
     if (chain === "ethereum" && this.currentSeed) {
       this.derivedAddresses[chain] = _WalletManager.deriveAddressForChain(this.currentSeed, chain);
@@ -1858,7 +1825,7 @@ var WalletManager = class _WalletManager {
    * Get all derived addresses
    */
   getAllAddresses() {
-    return this.normalizeAddresses(this.derivedAddresses);
+    return { ...this.derivedAddresses };
   }
   /**
    * Set the selected chain
@@ -1900,7 +1867,6 @@ 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, {
@@ -1915,9 +1881,8 @@ var WalletManager = class _WalletManager {
           address
         });
         balance = viem.formatEther(rawBalance);
-        console.log(`[WalletManager] ${chain} balance fetched: ${balance} (raw: ${rawBalance})`);
       } catch (error) {
-        console.error(`[WalletManager] Failed to fetch ${chain} balance from ${this.config.rpcUrl}:`, error);
+        console.warn(`Failed to fetch ${chain} balance:`, error);
       }
     } else if (chain === "bitcoin") {
       const isMainnet = this.config.network === "mainnet" || address.startsWith("bc1") || address.startsWith("1") || address.startsWith("3");