@pioneer-platform/pioneer-sdk 8.15.34 → 8.15.40

package/dist/index.cjs

@@ -472,6 +472,14 @@ function processPortfolioBalance(balance, primaryAddress, context, blockchains)
     valueUsd: balance.valueUsd.toString(),
     updated: new Date().getTime()
   };
+  if (balance.caip === "cosmos:cosmoshub-4/slip44:118" || balance.caip === "cosmos:osmosis-1/slip44:118") {
+    console.log(tag2, `\uD83D\uDCCA [CHART CREATED] ${assetInfo?.symbol || balance.symbol}:`, {
+      caip: balance.caip,
+      decimal: chartBalance.decimal,
+      decimals: chartBalance.decimals,
+      precision: chartBalance.precision
+    });
+  }
   if (balance.display) {
     chartBalance.icon = ["multi", chartBalance.icon, balance.display.toString()].toString();
   }
@@ -4463,6 +4471,13 @@ function enrichBalancesWithAssetInfo(balances, assetsMap, caipToNetworkId7) {
       valueUsd: balance.valueUsd,
       priceUsd: balance.priceUsd
     });
+    if (balance.caip === "cosmos:cosmoshub-4/slip44:118" || balance.caip === "cosmos:osmosis-1/slip44:118") {
+      console.log(tag, `✅ [DEBUG] Enriched ${balance.symbol}:`, {
+        caip: balance.caip,
+        decimals: balance.decimals,
+        precision: balance.precision
+      });
+    }
     enrichedBalances.push(balance);
   }
   if (enrichedBalances.length < balances.length) {
@@ -4837,14 +4852,17 @@ class SDK {
     this.getUnifiedPortfolio = async function() {
       const tag6 = `${TAG12} | getUnifiedPortfolio | `;
       try {
+        console.log(tag6, " checkpoint 4.0 - getUnifiedPortfolio start");
         const startTime = performance.now();
         try {
           const baseUrl = this.keepkeyEndpoint?.baseUrl || "kkapi://";
           const portfolioUrl = `${baseUrl}/api/portfolio`;
+          console.log(tag6, " checkpoint 4.1 - Fetching portfolio from:", portfolioUrl);
           const portfolioResponse = await fetch(portfolioUrl, {
             method: "GET",
             signal: AbortSignal.timeout(2000)
           });
+          console.log(tag6, " checkpoint 4.2 - Portfolio fetch returned, status:", portfolioResponse.status);
           if (!portfolioResponse.ok) {
             console.warn(tag6, "Portfolio endpoint returned", portfolioResponse.status);
             return null;
@@ -4957,7 +4975,9 @@ class SDK {
               };
               console.log("\uD83D\uDD11 [INIT] Initializing KeepKey SDK...");
               const keepKeySdk = await import_keepkey_sdk.KeepKeySdk.create(configKeepKey);
+              console.log(tag6, " checkpoint 1.1 - KeepKeySdk created");
               const features = await keepKeySdk.system.info.getFeatures();
+              console.log(tag6, " checkpoint 1.2 - features retrieved:", features);
               this.keepkeyApiKey = configKeepKey.apiKey;
               this.keepKeySdk = keepKeySdk;
               this.context = "keepkey:" + features.label + ".json";
@@ -4971,14 +4991,18 @@ class SDK {
           console.log("\uD83D\uDC41️ [VIEW-ONLY] Skipping vault endpoint detection");
           this.keepkeyEndpoint = null;
         }
+        console.log(tag6, " checkpoint 2 - Starting WebSocket initialization");
         let configWss = {
           username: this.username,
           queryKey: this.queryKey,
           wss: this.wss
         };
         let clientEvents = new import_pioneer_events.Events(configWss);
+        console.log(tag6, " checkpoint 2.1 - Events created, calling init()");
         await clientEvents.init();
+        console.log(tag6, " checkpoint 2.2 - Events init complete, setting username");
         await clientEvents.setUsername(this.username);
+        console.log(tag6, " checkpoint 2.3 - Username set, WebSocket ready");
         clientEvents.events.on("message", (request) => {
           this.events.emit("message", request);
         });
@@ -5044,11 +5068,14 @@ class SDK {
           }
         });
         this.events.emit("SET_STATUS", "init");
+        console.log(tag6, " checkpoint 3 - Starting fast portfolio check");
         if (this.keepKeySdk && !skipSync) {
           console.log("⚡ [FAST PORTFOLIO] Attempting fast load...");
+          console.log(tag6, " checkpoint 3.1 - Calling getUnifiedPortfolio()");
           const fastStart = performance.now();
           try {
             const unifiedResult = await this.getUnifiedPortfolio();
+            console.log(tag6, " checkpoint 3.2 - getUnifiedPortfolio() returned");
             console.log("unifiedResult: ", unifiedResult);
             if (unifiedResult && unifiedResult.cached && unifiedResult.totalValueUsd > 0) {
               console.log(`✅ [FAST PORTFOLIO] Loaded in ${(performance.now() - fastStart).toFixed(0)}ms`);
@@ -5813,7 +5840,7 @@ class SDK {
         const { getCharts: getChartsModular } = await Promise.resolve().then(() => (init_charts(), exports_charts));
         const newBalances = await getChartsModular(this.blockchains, this.pioneer, this.pubkeys, this.context);
         console.log(tag6, `Modular charts returned ${newBalances.length} balances (native + tokens + staking)`);
-        const uniqueBalances = new Map([...this.balances, ...newBalances].map((balance) => [
+        const uniqueBalances = new Map([...newBalances, ...this.balances].map((balance) => [
           balance.identifier || `${balance.caip}:${balance.pubkey}`,
           {
             ...balance,
@@ -5979,7 +6006,16 @@ class SDK {
           const networkId2 = import_pioneer_caip8.caipToNetworkId(asset.caip || asset.networkId);
           const currentContextValid = this.pubkeyContext?.networks?.includes(networkId2);
           if (!this.pubkeyContext || !currentContextValid) {
-            this.pubkeyContext = assetPubkeys[0];
+            let preferredPubkey = assetPubkeys[0];
+            const isBitcoin = networkId2?.includes("bip122:000000000019d6689c085ae165831e93") || asset.symbol === "BTC" || asset.name?.toLowerCase().includes("bitcoin");
+            if (isBitcoin) {
+              const nativeSegwitPubkey = assetPubkeys.find((pk) => pk.script_type === "p2wpkh" || pk.scriptType === "p2wpkh" || pk.note?.toLowerCase().includes("native") && pk.note?.toLowerCase().includes("segwit") || pk.pathMaster?.includes("84'"));
+              if (nativeSegwitPubkey) {
+                preferredPubkey = nativeSegwitPubkey;
+                console.log(tag6, "Preferring Native Segwit (Bech32) for Bitcoin");
+              }
+            }
+            this.pubkeyContext = preferredPubkey;
             console.log(tag6, "Auto-set pubkey context for network:", this.pubkeyContext.address || this.pubkeyContext.pubkey);
           } else {
             console.log(tag6, "Preserving existing pubkey context for network:", this.pubkeyContext.address || this.pubkeyContext.pubkey, `(addressNList: [${(this.pubkeyContext.addressNList || this.pubkeyContext.addressNListMaster).join(", ")}])`);

package/dist/index.es.js

@@ -463,6 +463,14 @@ function processPortfolioBalance(balance, primaryAddress, context, blockchains)
     valueUsd: balance.valueUsd.toString(),
     updated: new Date().getTime()
   };
+  if (balance.caip === "cosmos:cosmoshub-4/slip44:118" || balance.caip === "cosmos:osmosis-1/slip44:118") {
+    console.log(tag2, `\uD83D\uDCCA [CHART CREATED] ${assetInfo?.symbol || balance.symbol}:`, {
+      caip: balance.caip,
+      decimal: chartBalance.decimal,
+      decimals: chartBalance.decimals,
+      precision: chartBalance.precision
+    });
+  }
   if (balance.display) {
     chartBalance.icon = ["multi", chartBalance.icon, balance.display.toString()].toString();
   }
@@ -4647,6 +4655,13 @@ function enrichBalancesWithAssetInfo(balances, assetsMap, caipToNetworkId7) {
       valueUsd: balance.valueUsd,
       priceUsd: balance.priceUsd
     });
+    if (balance.caip === "cosmos:cosmoshub-4/slip44:118" || balance.caip === "cosmos:osmosis-1/slip44:118") {
+      console.log(tag, `✅ [DEBUG] Enriched ${balance.symbol}:`, {
+        caip: balance.caip,
+        decimals: balance.decimals,
+        precision: balance.precision
+      });
+    }
     enrichedBalances.push(balance);
   }
   if (enrichedBalances.length < balances.length) {
@@ -5021,14 +5036,17 @@ class SDK {
     this.getUnifiedPortfolio = async function() {
       const tag6 = `${TAG12} | getUnifiedPortfolio | `;
       try {
+        console.log(tag6, " checkpoint 4.0 - getUnifiedPortfolio start");
         const startTime = performance.now();
         try {
           const baseUrl = this.keepkeyEndpoint?.baseUrl || "kkapi://";
           const portfolioUrl = `${baseUrl}/api/portfolio`;
+          console.log(tag6, " checkpoint 4.1 - Fetching portfolio from:", portfolioUrl);
           const portfolioResponse = await fetch(portfolioUrl, {
             method: "GET",
             signal: AbortSignal.timeout(2000)
           });
+          console.log(tag6, " checkpoint 4.2 - Portfolio fetch returned, status:", portfolioResponse.status);
           if (!portfolioResponse.ok) {
             console.warn(tag6, "Portfolio endpoint returned", portfolioResponse.status);
             return null;
@@ -5141,7 +5159,9 @@ class SDK {
               };
               console.log("\uD83D\uDD11 [INIT] Initializing KeepKey SDK...");
               const keepKeySdk = await KeepKeySdk.create(configKeepKey);
+              console.log(tag6, " checkpoint 1.1 - KeepKeySdk created");
               const features = await keepKeySdk.system.info.getFeatures();
+              console.log(tag6, " checkpoint 1.2 - features retrieved:", features);
               this.keepkeyApiKey = configKeepKey.apiKey;
               this.keepKeySdk = keepKeySdk;
               this.context = "keepkey:" + features.label + ".json";
@@ -5155,14 +5175,18 @@ class SDK {
           console.log("\uD83D\uDC41️ [VIEW-ONLY] Skipping vault endpoint detection");
           this.keepkeyEndpoint = null;
         }
+        console.log(tag6, " checkpoint 2 - Starting WebSocket initialization");
         let configWss = {
           username: this.username,
           queryKey: this.queryKey,
           wss: this.wss
         };
         let clientEvents = new Events(configWss);
+        console.log(tag6, " checkpoint 2.1 - Events created, calling init()");
         await clientEvents.init();
+        console.log(tag6, " checkpoint 2.2 - Events init complete, setting username");
         await clientEvents.setUsername(this.username);
+        console.log(tag6, " checkpoint 2.3 - Username set, WebSocket ready");
         clientEvents.events.on("message", (request) => {
           this.events.emit("message", request);
         });
@@ -5228,11 +5252,14 @@ class SDK {
           }
         });
         this.events.emit("SET_STATUS", "init");
+        console.log(tag6, " checkpoint 3 - Starting fast portfolio check");
         if (this.keepKeySdk && !skipSync) {
           console.log("⚡ [FAST PORTFOLIO] Attempting fast load...");
+          console.log(tag6, " checkpoint 3.1 - Calling getUnifiedPortfolio()");
           const fastStart = performance.now();
           try {
             const unifiedResult = await this.getUnifiedPortfolio();
+            console.log(tag6, " checkpoint 3.2 - getUnifiedPortfolio() returned");
             console.log("unifiedResult: ", unifiedResult);
             if (unifiedResult && unifiedResult.cached && unifiedResult.totalValueUsd > 0) {
               console.log(`✅ [FAST PORTFOLIO] Loaded in ${(performance.now() - fastStart).toFixed(0)}ms`);
@@ -5997,7 +6024,7 @@ class SDK {
         const { getCharts: getChartsModular } = await Promise.resolve().then(() => (init_charts(), exports_charts));
         const newBalances = await getChartsModular(this.blockchains, this.pioneer, this.pubkeys, this.context);
         console.log(tag6, `Modular charts returned ${newBalances.length} balances (native + tokens + staking)`);
-        const uniqueBalances = new Map([...this.balances, ...newBalances].map((balance) => [
+        const uniqueBalances = new Map([...newBalances, ...this.balances].map((balance) => [
           balance.identifier || `${balance.caip}:${balance.pubkey}`,
           {
             ...balance,
@@ -6163,7 +6190,16 @@ class SDK {
           const networkId2 = caipToNetworkId7(asset.caip || asset.networkId);
           const currentContextValid = this.pubkeyContext?.networks?.includes(networkId2);
           if (!this.pubkeyContext || !currentContextValid) {
-            this.pubkeyContext = assetPubkeys[0];
+            let preferredPubkey = assetPubkeys[0];
+            const isBitcoin = networkId2?.includes("bip122:000000000019d6689c085ae165831e93") || asset.symbol === "BTC" || asset.name?.toLowerCase().includes("bitcoin");
+            if (isBitcoin) {
+              const nativeSegwitPubkey = assetPubkeys.find((pk) => pk.script_type === "p2wpkh" || pk.scriptType === "p2wpkh" || pk.note?.toLowerCase().includes("native") && pk.note?.toLowerCase().includes("segwit") || pk.pathMaster?.includes("84'"));
+              if (nativeSegwitPubkey) {
+                preferredPubkey = nativeSegwitPubkey;
+                console.log(tag6, "Preferring Native Segwit (Bech32) for Bitcoin");
+              }
+            }
+            this.pubkeyContext = preferredPubkey;
             console.log(tag6, "Auto-set pubkey context for network:", this.pubkeyContext.address || this.pubkeyContext.pubkey);
           } else {
             console.log(tag6, "Preserving existing pubkey context for network:", this.pubkeyContext.address || this.pubkeyContext.pubkey, `(addressNList: [${(this.pubkeyContext.addressNList || this.pubkeyContext.addressNListMaster).join(", ")}])`);

package/dist/index.js

@@ -463,6 +463,14 @@ function processPortfolioBalance(balance, primaryAddress, context, blockchains)
     valueUsd: balance.valueUsd.toString(),
     updated: new Date().getTime()
   };
+  if (balance.caip === "cosmos:cosmoshub-4/slip44:118" || balance.caip === "cosmos:osmosis-1/slip44:118") {
+    console.log(tag2, `\uD83D\uDCCA [CHART CREATED] ${assetInfo?.symbol || balance.symbol}:`, {
+      caip: balance.caip,
+      decimal: chartBalance.decimal,
+      decimals: chartBalance.decimals,
+      precision: chartBalance.precision
+    });
+  }
   if (balance.display) {
     chartBalance.icon = ["multi", chartBalance.icon, balance.display.toString()].toString();
   }
@@ -4647,6 +4655,13 @@ function enrichBalancesWithAssetInfo(balances, assetsMap, caipToNetworkId7) {
       valueUsd: balance.valueUsd,
       priceUsd: balance.priceUsd
     });
+    if (balance.caip === "cosmos:cosmoshub-4/slip44:118" || balance.caip === "cosmos:osmosis-1/slip44:118") {
+      console.log(tag, `✅ [DEBUG] Enriched ${balance.symbol}:`, {
+        caip: balance.caip,
+        decimals: balance.decimals,
+        precision: balance.precision
+      });
+    }
     enrichedBalances.push(balance);
   }
   if (enrichedBalances.length < balances.length) {
@@ -5021,14 +5036,17 @@ class SDK {
     this.getUnifiedPortfolio = async function() {
       const tag6 = `${TAG12} | getUnifiedPortfolio | `;
       try {
+        console.log(tag6, " checkpoint 4.0 - getUnifiedPortfolio start");
         const startTime = performance.now();
         try {
           const baseUrl = this.keepkeyEndpoint?.baseUrl || "kkapi://";
           const portfolioUrl = `${baseUrl}/api/portfolio`;
+          console.log(tag6, " checkpoint 4.1 - Fetching portfolio from:", portfolioUrl);
           const portfolioResponse = await fetch(portfolioUrl, {
             method: "GET",
             signal: AbortSignal.timeout(2000)
           });
+          console.log(tag6, " checkpoint 4.2 - Portfolio fetch returned, status:", portfolioResponse.status);
           if (!portfolioResponse.ok) {
             console.warn(tag6, "Portfolio endpoint returned", portfolioResponse.status);
             return null;
@@ -5141,7 +5159,9 @@ class SDK {
               };
               console.log("\uD83D\uDD11 [INIT] Initializing KeepKey SDK...");
               const keepKeySdk = await KeepKeySdk.create(configKeepKey);
+              console.log(tag6, " checkpoint 1.1 - KeepKeySdk created");
               const features = await keepKeySdk.system.info.getFeatures();
+              console.log(tag6, " checkpoint 1.2 - features retrieved:", features);
               this.keepkeyApiKey = configKeepKey.apiKey;
               this.keepKeySdk = keepKeySdk;
               this.context = "keepkey:" + features.label + ".json";
@@ -5155,14 +5175,18 @@ class SDK {
           console.log("\uD83D\uDC41️ [VIEW-ONLY] Skipping vault endpoint detection");
           this.keepkeyEndpoint = null;
         }
+        console.log(tag6, " checkpoint 2 - Starting WebSocket initialization");
         let configWss = {
           username: this.username,
           queryKey: this.queryKey,
           wss: this.wss
         };
         let clientEvents = new Events(configWss);
+        console.log(tag6, " checkpoint 2.1 - Events created, calling init()");
         await clientEvents.init();
+        console.log(tag6, " checkpoint 2.2 - Events init complete, setting username");
         await clientEvents.setUsername(this.username);
+        console.log(tag6, " checkpoint 2.3 - Username set, WebSocket ready");
         clientEvents.events.on("message", (request) => {
           this.events.emit("message", request);
         });
@@ -5228,11 +5252,14 @@ class SDK {
           }
         });
         this.events.emit("SET_STATUS", "init");
+        console.log(tag6, " checkpoint 3 - Starting fast portfolio check");
         if (this.keepKeySdk && !skipSync) {
           console.log("⚡ [FAST PORTFOLIO] Attempting fast load...");
+          console.log(tag6, " checkpoint 3.1 - Calling getUnifiedPortfolio()");
           const fastStart = performance.now();
           try {
             const unifiedResult = await this.getUnifiedPortfolio();
+            console.log(tag6, " checkpoint 3.2 - getUnifiedPortfolio() returned");
             console.log("unifiedResult: ", unifiedResult);
             if (unifiedResult && unifiedResult.cached && unifiedResult.totalValueUsd > 0) {
               console.log(`✅ [FAST PORTFOLIO] Loaded in ${(performance.now() - fastStart).toFixed(0)}ms`);
@@ -5997,7 +6024,7 @@ class SDK {
         const { getCharts: getChartsModular } = await Promise.resolve().then(() => (init_charts(), exports_charts));
         const newBalances = await getChartsModular(this.blockchains, this.pioneer, this.pubkeys, this.context);
         console.log(tag6, `Modular charts returned ${newBalances.length} balances (native + tokens + staking)`);
-        const uniqueBalances = new Map([...this.balances, ...newBalances].map((balance) => [
+        const uniqueBalances = new Map([...newBalances, ...this.balances].map((balance) => [
           balance.identifier || `${balance.caip}:${balance.pubkey}`,
           {
             ...balance,
@@ -6163,7 +6190,16 @@ class SDK {
           const networkId2 = caipToNetworkId7(asset.caip || asset.networkId);
           const currentContextValid = this.pubkeyContext?.networks?.includes(networkId2);
           if (!this.pubkeyContext || !currentContextValid) {
-            this.pubkeyContext = assetPubkeys[0];
+            let preferredPubkey = assetPubkeys[0];
+            const isBitcoin = networkId2?.includes("bip122:000000000019d6689c085ae165831e93") || asset.symbol === "BTC" || asset.name?.toLowerCase().includes("bitcoin");
+            if (isBitcoin) {
+              const nativeSegwitPubkey = assetPubkeys.find((pk) => pk.script_type === "p2wpkh" || pk.scriptType === "p2wpkh" || pk.note?.toLowerCase().includes("native") && pk.note?.toLowerCase().includes("segwit") || pk.pathMaster?.includes("84'"));
+              if (nativeSegwitPubkey) {
+                preferredPubkey = nativeSegwitPubkey;
+                console.log(tag6, "Preferring Native Segwit (Bech32) for Bitcoin");
+              }
+            }
+            this.pubkeyContext = preferredPubkey;
             console.log(tag6, "Auto-set pubkey context for network:", this.pubkeyContext.address || this.pubkeyContext.pubkey);
           } else {
             console.log(tag6, "Preserving existing pubkey context for network:", this.pubkeyContext.address || this.pubkeyContext.pubkey, `(addressNList: [${(this.pubkeyContext.addressNList || this.pubkeyContext.addressNListMaster).join(", ")}])`);

package/package.json

@@ -1,14 +1,14 @@
 {
   "author": "highlander",
   "name": "@pioneer-platform/pioneer-sdk",
-  "version": "8.15.34",
+  "version": "8.15.40",
   "dependencies": {
     "@keepkey/keepkey-sdk": "^0.2.62",
-    "@pioneer-platform/pioneer-caip": "^9.10.11",
-    "@pioneer-platform/pioneer-client": "^9.10.17",
-    "@pioneer-platform/pioneer-coins": "^9.11.11",
-    "@pioneer-platform/pioneer-discovery": "^8.15.34",
-    "@pioneer-platform/pioneer-events": "^8.12.6",
+    "@pioneer-platform/pioneer-caip": "^9.10.17",
+    "@pioneer-platform/pioneer-client": "^9.10.23",
+    "@pioneer-platform/pioneer-coins": "^9.11.17",
+    "@pioneer-platform/pioneer-discovery": "^8.15.40",
+    "@pioneer-platform/pioneer-events": "^8.12.12",
     "coinselect": "^3.1.13",
     "eventemitter3": "^5.0.1",
     "neotraverse": "^0.6.8",

package/src/charts/evm.ts

@@ -120,6 +120,7 @@ export async function getEvmCharts(params: ChartParams): Promise<ChartBalance[]>
 
       for (const token of portfolio.tokens) {
         const processedToken = processPortfolioToken(token, primaryAddress, context, blockchains);
+
         if (processedToken && !checkDuplicateBalance(balances, processedToken.caip, processedToken.pubkey)) {
           balances.push(processedToken);
         }
@@ -224,6 +225,16 @@ function processPortfolioBalance(
     updated: new Date().getTime(),
   };
 
+  // DEBUG: Log ATOM and OSMO chart balance creation
+  if (balance.caip === 'cosmos:cosmoshub-4/slip44:118' || balance.caip === 'cosmos:osmosis-1/slip44:118') {
+    console.log(tag, `📊 [CHART CREATED] ${assetInfo?.symbol || balance.symbol}:`, {
+      caip: balance.caip,
+      decimal: chartBalance.decimal,
+      decimals: chartBalance.decimals,
+      precision: chartBalance.precision,
+    });
+  }
+
   // Handle display icon for multi-asset icons
   if (balance.display) {
     chartBalance.icon = ['multi', chartBalance.icon, balance.display.toString()].toString();

package/src/charts/types.ts

@@ -15,6 +15,8 @@ export interface ChartBalance {
   type: string;
   token?: boolean;  // Indicates if this is a token balance
   decimal?: number;
+  decimals?: number;   // Number of decimal places (NEW standard)
+  precision?: number;  // Precision for the asset (alias for decimals)
   balance: string;
   priceUsd: number;
   valueUsd: number | string;

package/src/index.ts

@@ -333,6 +333,7 @@ export class SDK {
     this.getUnifiedPortfolio = async function () {
       const tag = `${TAG} | getUnifiedPortfolio | `;
       try {
+        console.log(tag,' checkpoint 4.0 - getUnifiedPortfolio start')
         const startTime = performance.now();
 
         // Check if kkapi is available and use the detected endpoint
@@ -340,11 +341,13 @@ export class SDK {
           // Use the detected endpoint instead of hardcoded kkapi://
           const baseUrl = this.keepkeyEndpoint?.baseUrl || 'kkapi://';
           const portfolioUrl = `${baseUrl}/api/portfolio`;
+          console.log(tag,' checkpoint 4.1 - Fetching portfolio from:', portfolioUrl)
 
           const portfolioResponse = await fetch(portfolioUrl, {
             method: 'GET',
             signal: AbortSignal.timeout(2000), // 2 second timeout
           });
+          console.log(tag,' checkpoint 4.2 - Portfolio fetch returned, status:', portfolioResponse.status)
 
           if (!portfolioResponse.ok) {
             console.warn(tag, 'Portfolio endpoint returned', portfolioResponse.status);
@@ -495,8 +498,9 @@ export class SDK {
 
               console.log('🔑 [INIT] Initializing KeepKey SDK...');
               const keepKeySdk = await KeepKeySdk.create(configKeepKey);
+              console.log(tag,' checkpoint 1.1 - KeepKeySdk created')
               const features = await keepKeySdk.system.info.getFeatures();
-
+              console.log(tag,' checkpoint 1.2 - features retrieved:', features)
               this.keepkeyApiKey = configKeepKey.apiKey;
               this.keepKeySdk = keepKeySdk;
               this.context = 'keepkey:' + features.label + '.json';
@@ -512,6 +516,7 @@ export class SDK {
         }
 
         // Initialize WebSocket events
+        console.log(tag,' checkpoint 2 - Starting WebSocket initialization')
         let configWss = {
           username: this.username,
           queryKey: this.queryKey,
@@ -519,8 +524,11 @@ export class SDK {
         };
 
         let clientEvents = new Events(configWss);
+        console.log(tag,' checkpoint 2.1 - Events created, calling init()')
         await clientEvents.init();
+        console.log(tag,' checkpoint 2.2 - Events init complete, setting username')
         await clientEvents.setUsername(this.username);
+        console.log(tag,' checkpoint 2.3 - Username set, WebSocket ready')
 
         clientEvents.events.on('message', (request) => {
           this.events.emit('message', request);
@@ -620,12 +628,15 @@ export class SDK {
         this.events.emit('SET_STATUS', 'init');
 
         // Fast Portfolio Pattern: Try unified portfolio first, then sync if needed
+        console.log(tag,' checkpoint 3 - Starting fast portfolio check')
         if (this.keepKeySdk && !skipSync) {
           console.log('⚡ [FAST PORTFOLIO] Attempting fast load...');
+          console.log(tag,' checkpoint 3.1 - Calling getUnifiedPortfolio()')
           const fastStart = performance.now();
 
           try {
             const unifiedResult = await this.getUnifiedPortfolio();
+            console.log(tag,' checkpoint 3.2 - getUnifiedPortfolio() returned')
             console.log('unifiedResult: ', unifiedResult);
 
             if (unifiedResult && unifiedResult.cached && unifiedResult.totalValueUsd > 0) {
@@ -1744,8 +1755,10 @@ export class SDK {
         console.log(tag, `Modular charts returned ${newBalances.length} balances (native + tokens + staking)`);
 
         // Deduplicate balances using a Map with `identifier` as the key
+        // CRITICAL: Put newBalances FIRST so this.balances (with enriched data) override incomplete newBalances
+        // When Map is constructed from an array with duplicate keys, the LAST occurrence wins
         const uniqueBalances = new Map(
-          [...this.balances, ...newBalances].map((balance: any) => [
+          [...newBalances, ...this.balances].map((balance: any) => [
             balance.identifier || `${balance.caip}:${balance.pubkey}`,
             {
               ...balance,
@@ -1976,8 +1989,30 @@ export class SDK {
           const currentContextValid = this.pubkeyContext?.networks?.includes(networkId);
 
           if (!this.pubkeyContext || !currentContextValid) {
-            // No context or wrong network - auto-set to first matching pubkey
-            this.pubkeyContext = assetPubkeys[0];
+            // No context or wrong network - auto-set to preferred pubkey
+            // For Bitcoin, prefer Native Segwit (Bech32) over legacy
+            let preferredPubkey = assetPubkeys[0];
+
+            const isBitcoin = networkId?.includes('bip122:000000000019d6689c085ae165831e93') ||
+                             asset.symbol === 'BTC' ||
+                             asset.name?.toLowerCase().includes('bitcoin');
+
+            if (isBitcoin) {
+              // Find Native Segwit pubkey (script_type: 'p2wpkh', path includes 84')
+              const nativeSegwitPubkey = assetPubkeys.find((pk: any) =>
+                pk.script_type === 'p2wpkh' ||
+                pk.scriptType === 'p2wpkh' ||
+                (pk.note?.toLowerCase().includes('native') && pk.note?.toLowerCase().includes('segwit')) ||
+                pk.pathMaster?.includes("84'")
+              );
+
+              if (nativeSegwitPubkey) {
+                preferredPubkey = nativeSegwitPubkey;
+                console.log(tag, 'Preferring Native Segwit (Bech32) for Bitcoin');
+              }
+            }
+
+            this.pubkeyContext = preferredPubkey;
             console.log(
               tag,
               'Auto-set pubkey context for network:',

package/src/utils/portfolio-helpers.ts

@@ -376,6 +376,15 @@ export function enrichBalancesWithAssetInfo(
       priceUsd: balance.priceUsd,
     });
 
+    // DEBUG: Verify ATOM and OSMO after enrichment
+    if (balance.caip === 'cosmos:cosmoshub-4/slip44:118' || balance.caip === 'cosmos:osmosis-1/slip44:118') {
+      console.log(tag, `✅ [DEBUG] Enriched ${balance.symbol}:`, {
+        caip: balance.caip,
+        decimals: balance.decimals,
+        precision: balance.precision,
+      });
+    }
+
     enrichedBalances.push(balance);
   }