@pioneer-platform/pioneer-sdk 4.20.12 → 4.20.15

package/dist/index.cjs

@@ -1754,10 +1754,19 @@ var extractChainIdFromNetworkId = (networkId) => {
   }
   return parseInt(id);
 };
-async function fetchEthPriceInUsd() {
-  const response = await fetch("https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd");
-  const data = await response.json();
-  return data.ethereum.usd;
+async function fetchEthPriceInUsd(pioneer, networkId) {
+  const gasCaip = `${networkId}/slip44:60`;
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([gasCaip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    console.warn("ETH price not available from Pioneer API, using fallback");
+    return 0;
+  } catch (error) {
+    console.error("Error fetching ETH price from Pioneer API:", error);
+    return 0;
+  }
 }
 var extractContractAddressFromCaip = (caip) => {
   const parts = caip.split("/");
@@ -1784,14 +1793,18 @@ var encodeTransferData = (toAddress, amountWei) => {
   const data = "0x" + functionSignature + toAddressPadded + amountPadded;
   return data;
 };
-async function fetchTokenPriceInUsd(contractAddress) {
-  const response = await fetch(`https://api.coingecko.com/api/v3/simple/token_price/ethereum?contract_addresses=${contractAddress}&vs_currencies=usd`);
-  const data = await response.json();
-  const price = data[contractAddress.toLowerCase()]?.usd;
-  if (!price) {
-    throw new Error("Failed to fetch token price");
+async function fetchTokenPriceInUsd(pioneer, caip) {
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([caip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    console.warn(`Token price not available from Pioneer API for ${caip}, using 0`);
+    return 0;
+  } catch (error) {
+    console.error(`Error fetching token price from Pioneer API for ${caip}:`, error);
+    return 0;
   }
-  return price;
 }
 async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pubkeyContext, isMax, feeLevel = 5) {
   const tag5 = TAG + " | createUnsignedEvmTx | ";
@@ -2022,11 +2035,20 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
       }
       case "erc20": {
         const contractAddress = extractContractAddressFromCaip(caip);
-        let tokenDecimals = 18;
-        const contractLower = contractAddress.toLowerCase();
-        if (contractLower === "0xdac17f958d2ee523a2206206994597c13d831ec7" || contractLower === "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48" || contractLower === "0x4fabb145d64652a948d72533023f6e7a623c7c53" || contractLower === "0x8e870d67f660d95d5be530380d0ec0bd388289e1") {
-          tokenDecimals = 6;
-          console.log(tag5, "Using 6 decimals for stablecoin:", contractAddress);
+        console.log(tag5, "Fetching token decimals from contract:", contractAddress, "on network:", networkId);
+        let tokenDecimals;
+        try {
+          console.log(tag5, "Fetching token decimals via pioneer-server API for", contractAddress, "on", networkId);
+          const decimalsResponse = await pioneer.GetTokenDecimals({
+            networkId,
+            contractAddress
+          });
+          tokenDecimals = Number(decimalsResponse.data.decimals);
+          console.log(tag5, "✅ Fetched decimals from pioneer-server:", tokenDecimals);
+        } catch (error) {
+          console.error(tag5, "Failed to fetch token decimals from pioneer-server:", error);
+          console.warn(tag5, "⚠️ FALLBACK: Using default 18 decimals - THIS MAY BE INCORRECT!");
+          tokenDecimals = 18;
         }
         const tokenMultiplier = 10n ** BigInt(tokenDecimals);
         let gasLimit = BigInt(1e5);
@@ -2057,9 +2079,9 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
           throw new Error("Insufficient ETH balance to cover gas fees");
         }
         const data = encodeTransferData(to, amountWei);
-        const ethPriceInUsd = await fetchEthPriceInUsd();
+        const ethPriceInUsd = await fetchEthPriceInUsd(pioneer, networkId);
         const gasFeeUsd = Number(gasFee) / 1000000000000000000 * ethPriceInUsd;
-        const tokenPriceInUsd = await fetchTokenPriceInUsd(contractAddress);
+        const tokenPriceInUsd = await fetchTokenPriceInUsd(pioneer, caip);
         const amountUsd = Number(amountWei) / Number(tokenMultiplier) * tokenPriceInUsd;
         unsignedTx = {
           chainId,
@@ -2364,12 +2386,14 @@ async function createUnsignedTendermintTx(caip, type, amount, memo, pubkeys, pio
     let balanceInfo = await pioneer.GetPubkeyBalance({ asset: chain, pubkey: fromAddress });
     console.log(tag5, `\uD83D\uDCB0 balanceInfo:`, balanceInfo);
     let account_number, sequence;
-    if (networkId === "cosmos:cosmoshub-4" || networkId === "cosmos:osmosis-1") {
+    if (accountInfo.account) {
       account_number = accountInfo.account.account_number || "0";
       sequence = accountInfo.account.sequence || "0";
-    } else if (networkId === "cosmos:thorchain-mainnet-v1" || networkId === "cosmos:mayachain-mainnet-v1") {
+    } else if (accountInfo.result?.value) {
       account_number = accountInfo.result.value.account_number || "0";
       sequence = accountInfo.result.value.sequence || "0";
+    } else {
+      throw new Error(`Unexpected account info format for ${networkId}: ${JSON.stringify(accountInfo)}`);
     }
     console.log(tag5, `\uD83D\uDCCA Extracted account_number: ${account_number}, sequence: ${sequence}`);
     if (account_number === "0" || account_number === 0) {
@@ -4118,7 +4142,7 @@ class SDK {
     this.status = "preInit";
     this.appName = config.appName || "unknown app";
     this.appIcon = config.appIcon || "https://pioneers.dev/coins/keepkey.png";
-    this.spec = spec || config.spec || "https://pioneers.dev/spec/swagger";
+    this.spec = spec || config.spec || "https://api.keepkey.info/spec/swagger";
     this.wss = config.wss || "wss://pioneers.dev";
     this.assets = import_pioneer_discovery2.assetData;
     this.assetsMap = new Map;

package/dist/index.es.js

@@ -1930,10 +1930,19 @@ var extractChainIdFromNetworkId = (networkId) => {
   }
   return parseInt(id);
 };
-async function fetchEthPriceInUsd() {
-  const response = await fetch("https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd");
-  const data = await response.json();
-  return data.ethereum.usd;
+async function fetchEthPriceInUsd(pioneer, networkId) {
+  const gasCaip = `${networkId}/slip44:60`;
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([gasCaip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    console.warn("ETH price not available from Pioneer API, using fallback");
+    return 0;
+  } catch (error) {
+    console.error("Error fetching ETH price from Pioneer API:", error);
+    return 0;
+  }
 }
 var extractContractAddressFromCaip = (caip) => {
   const parts = caip.split("/");
@@ -1960,14 +1969,18 @@ var encodeTransferData = (toAddress, amountWei) => {
   const data = "0x" + functionSignature + toAddressPadded + amountPadded;
   return data;
 };
-async function fetchTokenPriceInUsd(contractAddress) {
-  const response = await fetch(`https://api.coingecko.com/api/v3/simple/token_price/ethereum?contract_addresses=${contractAddress}&vs_currencies=usd`);
-  const data = await response.json();
-  const price = data[contractAddress.toLowerCase()]?.usd;
-  if (!price) {
-    throw new Error("Failed to fetch token price");
+async function fetchTokenPriceInUsd(pioneer, caip) {
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([caip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    console.warn(`Token price not available from Pioneer API for ${caip}, using 0`);
+    return 0;
+  } catch (error) {
+    console.error(`Error fetching token price from Pioneer API for ${caip}:`, error);
+    return 0;
   }
-  return price;
 }
 async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pubkeyContext, isMax, feeLevel = 5) {
   const tag5 = TAG + " | createUnsignedEvmTx | ";
@@ -2198,11 +2211,20 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
       }
       case "erc20": {
         const contractAddress = extractContractAddressFromCaip(caip);
-        let tokenDecimals = 18;
-        const contractLower = contractAddress.toLowerCase();
-        if (contractLower === "0xdac17f958d2ee523a2206206994597c13d831ec7" || contractLower === "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48" || contractLower === "0x4fabb145d64652a948d72533023f6e7a623c7c53" || contractLower === "0x8e870d67f660d95d5be530380d0ec0bd388289e1") {
-          tokenDecimals = 6;
-          console.log(tag5, "Using 6 decimals for stablecoin:", contractAddress);
+        console.log(tag5, "Fetching token decimals from contract:", contractAddress, "on network:", networkId);
+        let tokenDecimals;
+        try {
+          console.log(tag5, "Fetching token decimals via pioneer-server API for", contractAddress, "on", networkId);
+          const decimalsResponse = await pioneer.GetTokenDecimals({
+            networkId,
+            contractAddress
+          });
+          tokenDecimals = Number(decimalsResponse.data.decimals);
+          console.log(tag5, "✅ Fetched decimals from pioneer-server:", tokenDecimals);
+        } catch (error) {
+          console.error(tag5, "Failed to fetch token decimals from pioneer-server:", error);
+          console.warn(tag5, "⚠️ FALLBACK: Using default 18 decimals - THIS MAY BE INCORRECT!");
+          tokenDecimals = 18;
         }
         const tokenMultiplier = 10n ** BigInt(tokenDecimals);
         let gasLimit = BigInt(1e5);
@@ -2233,9 +2255,9 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
           throw new Error("Insufficient ETH balance to cover gas fees");
         }
         const data = encodeTransferData(to, amountWei);
-        const ethPriceInUsd = await fetchEthPriceInUsd();
+        const ethPriceInUsd = await fetchEthPriceInUsd(pioneer, networkId);
         const gasFeeUsd = Number(gasFee) / 1000000000000000000 * ethPriceInUsd;
-        const tokenPriceInUsd = await fetchTokenPriceInUsd(contractAddress);
+        const tokenPriceInUsd = await fetchTokenPriceInUsd(pioneer, caip);
         const amountUsd = Number(amountWei) / Number(tokenMultiplier) * tokenPriceInUsd;
         unsignedTx = {
           chainId,
@@ -2540,12 +2562,14 @@ async function createUnsignedTendermintTx(caip, type, amount, memo, pubkeys, pio
     let balanceInfo = await pioneer.GetPubkeyBalance({ asset: chain, pubkey: fromAddress });
     console.log(tag5, `\uD83D\uDCB0 balanceInfo:`, balanceInfo);
     let account_number, sequence;
-    if (networkId === "cosmos:cosmoshub-4" || networkId === "cosmos:osmosis-1") {
+    if (accountInfo.account) {
       account_number = accountInfo.account.account_number || "0";
       sequence = accountInfo.account.sequence || "0";
-    } else if (networkId === "cosmos:thorchain-mainnet-v1" || networkId === "cosmos:mayachain-mainnet-v1") {
+    } else if (accountInfo.result?.value) {
       account_number = accountInfo.result.value.account_number || "0";
       sequence = accountInfo.result.value.sequence || "0";
+    } else {
+      throw new Error(`Unexpected account info format for ${networkId}: ${JSON.stringify(accountInfo)}`);
     }
     console.log(tag5, `\uD83D\uDCCA Extracted account_number: ${account_number}, sequence: ${sequence}`);
     if (account_number === "0" || account_number === 0) {
@@ -4294,7 +4318,7 @@ class SDK {
     this.status = "preInit";
     this.appName = config.appName || "unknown app";
     this.appIcon = config.appIcon || "https://pioneers.dev/coins/keepkey.png";
-    this.spec = spec || config.spec || "https://pioneers.dev/spec/swagger";
+    this.spec = spec || config.spec || "https://api.keepkey.info/spec/swagger";
     this.wss = config.wss || "wss://pioneers.dev";
     this.assets = assetData2;
     this.assetsMap = new Map;

package/dist/index.js

@@ -1930,10 +1930,19 @@ var extractChainIdFromNetworkId = (networkId) => {
   }
   return parseInt(id);
 };
-async function fetchEthPriceInUsd() {
-  const response = await fetch("https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd");
-  const data = await response.json();
-  return data.ethereum.usd;
+async function fetchEthPriceInUsd(pioneer, networkId) {
+  const gasCaip = `${networkId}/slip44:60`;
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([gasCaip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    console.warn("ETH price not available from Pioneer API, using fallback");
+    return 0;
+  } catch (error) {
+    console.error("Error fetching ETH price from Pioneer API:", error);
+    return 0;
+  }
 }
 var extractContractAddressFromCaip = (caip) => {
   const parts = caip.split("/");
@@ -1960,14 +1969,18 @@ var encodeTransferData = (toAddress, amountWei) => {
   const data = "0x" + functionSignature + toAddressPadded + amountPadded;
   return data;
 };
-async function fetchTokenPriceInUsd(contractAddress) {
-  const response = await fetch(`https://api.coingecko.com/api/v3/simple/token_price/ethereum?contract_addresses=${contractAddress}&vs_currencies=usd`);
-  const data = await response.json();
-  const price = data[contractAddress.toLowerCase()]?.usd;
-  if (!price) {
-    throw new Error("Failed to fetch token price");
+async function fetchTokenPriceInUsd(pioneer, caip) {
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([caip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    console.warn(`Token price not available from Pioneer API for ${caip}, using 0`);
+    return 0;
+  } catch (error) {
+    console.error(`Error fetching token price from Pioneer API for ${caip}:`, error);
+    return 0;
   }
-  return price;
 }
 async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pubkeyContext, isMax, feeLevel = 5) {
   const tag5 = TAG + " | createUnsignedEvmTx | ";
@@ -2198,11 +2211,20 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
       }
       case "erc20": {
         const contractAddress = extractContractAddressFromCaip(caip);
-        let tokenDecimals = 18;
-        const contractLower = contractAddress.toLowerCase();
-        if (contractLower === "0xdac17f958d2ee523a2206206994597c13d831ec7" || contractLower === "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48" || contractLower === "0x4fabb145d64652a948d72533023f6e7a623c7c53" || contractLower === "0x8e870d67f660d95d5be530380d0ec0bd388289e1") {
-          tokenDecimals = 6;
-          console.log(tag5, "Using 6 decimals for stablecoin:", contractAddress);
+        console.log(tag5, "Fetching token decimals from contract:", contractAddress, "on network:", networkId);
+        let tokenDecimals;
+        try {
+          console.log(tag5, "Fetching token decimals via pioneer-server API for", contractAddress, "on", networkId);
+          const decimalsResponse = await pioneer.GetTokenDecimals({
+            networkId,
+            contractAddress
+          });
+          tokenDecimals = Number(decimalsResponse.data.decimals);
+          console.log(tag5, "✅ Fetched decimals from pioneer-server:", tokenDecimals);
+        } catch (error) {
+          console.error(tag5, "Failed to fetch token decimals from pioneer-server:", error);
+          console.warn(tag5, "⚠️ FALLBACK: Using default 18 decimals - THIS MAY BE INCORRECT!");
+          tokenDecimals = 18;
         }
         const tokenMultiplier = 10n ** BigInt(tokenDecimals);
         let gasLimit = BigInt(1e5);
@@ -2233,9 +2255,9 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
           throw new Error("Insufficient ETH balance to cover gas fees");
         }
         const data = encodeTransferData(to, amountWei);
-        const ethPriceInUsd = await fetchEthPriceInUsd();
+        const ethPriceInUsd = await fetchEthPriceInUsd(pioneer, networkId);
         const gasFeeUsd = Number(gasFee) / 1000000000000000000 * ethPriceInUsd;
-        const tokenPriceInUsd = await fetchTokenPriceInUsd(contractAddress);
+        const tokenPriceInUsd = await fetchTokenPriceInUsd(pioneer, caip);
         const amountUsd = Number(amountWei) / Number(tokenMultiplier) * tokenPriceInUsd;
         unsignedTx = {
           chainId,
@@ -2540,12 +2562,14 @@ async function createUnsignedTendermintTx(caip, type, amount, memo, pubkeys, pio
     let balanceInfo = await pioneer.GetPubkeyBalance({ asset: chain, pubkey: fromAddress });
     console.log(tag5, `\uD83D\uDCB0 balanceInfo:`, balanceInfo);
     let account_number, sequence;
-    if (networkId === "cosmos:cosmoshub-4" || networkId === "cosmos:osmosis-1") {
+    if (accountInfo.account) {
       account_number = accountInfo.account.account_number || "0";
       sequence = accountInfo.account.sequence || "0";
-    } else if (networkId === "cosmos:thorchain-mainnet-v1" || networkId === "cosmos:mayachain-mainnet-v1") {
+    } else if (accountInfo.result?.value) {
       account_number = accountInfo.result.value.account_number || "0";
       sequence = accountInfo.result.value.sequence || "0";
+    } else {
+      throw new Error(`Unexpected account info format for ${networkId}: ${JSON.stringify(accountInfo)}`);
     }
     console.log(tag5, `\uD83D\uDCCA Extracted account_number: ${account_number}, sequence: ${sequence}`);
     if (account_number === "0" || account_number === 0) {
@@ -4294,7 +4318,7 @@ class SDK {
     this.status = "preInit";
     this.appName = config.appName || "unknown app";
     this.appIcon = config.appIcon || "https://pioneers.dev/coins/keepkey.png";
-    this.spec = spec || config.spec || "https://pioneers.dev/spec/swagger";
+    this.spec = spec || config.spec || "https://api.keepkey.info/spec/swagger";
     this.wss = config.wss || "wss://pioneers.dev";
     this.assets = assetData2;
     this.assetsMap = new Map;

package/package.json

@@ -1,12 +1,12 @@
 {
   "author": "highlander",
   "name": "@pioneer-platform/pioneer-sdk",
-  "version": "4.20.12",
+  "version": "4.20.15",
   "dependencies": {
     "@keepkey/keepkey-sdk": "^0.2.62",
     "@pioneer-platform/loggerdog": "^8.11.0",
     "@pioneer-platform/pioneer-caip": "^9.10.0",
-    "@pioneer-platform/pioneer-client": "^9.10.4",
+    "@pioneer-platform/pioneer-client": "^9.10.5",
     "@pioneer-platform/pioneer-coins": "^9.11.0",
     "@pioneer-platform/pioneer-discovery": "^0.8.0",
     "@pioneer-platform/pioneer-events": "^8.11.0",

package/src/index.ts

@@ -172,7 +172,7 @@ export class SDK {
     this.status = 'preInit';
     this.appName = config.appName || 'unknown app';
     this.appIcon = config.appIcon || 'https://pioneers.dev/coins/keepkey.png';
-    this.spec = spec || config.spec || 'https://pioneers.dev/spec/swagger';
+    this.spec = spec || config.spec || 'https://api.keepkey.info/spec/swagger';
     this.wss = config.wss || 'wss://pioneers.dev';
     this.assets = assetData;
     this.assetsMap = new Map();

package/src/txbuilder/createUnsignedEvmTx.ts

@@ -32,13 +32,24 @@ const extractChainIdFromNetworkId = (networkId) => {
   return parseInt(id);
 };
 
-// Fetch the current ETH price in USD from CoinGecko
-async function fetchEthPriceInUsd() {
-  const response = await fetch(
-    'https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd',
-  );
-  const data = await response.json();
-  return data.ethereum.usd;
+// Fetch the current ETH price in USD from Pioneer API
+async function fetchEthPriceInUsd(pioneer: any, networkId: string) {
+  // Build CAIP for the native gas token based on networkId
+  // For EVM chains, the native gas asset uses slip44 format
+  const gasCaip = `${networkId}/slip44:60`; // ETH slip44 code
+
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([gasCaip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    // Fallback if price not available
+    console.warn('ETH price not available from Pioneer API, using fallback');
+    return 0;
+  } catch (error) {
+    console.error('Error fetching ETH price from Pioneer API:', error);
+    return 0;
+  }
 }
 
 // Extract contract address from CAIP
@@ -75,19 +86,21 @@ const encodeTransferData = (toAddress, amountWei) => {
   return data;
 };
 
-//TODO use assetData here, this is horrible
-// Helper function to fetch token price in USD
-async function fetchTokenPriceInUsd(contractAddress) {
-  // Use CoinGecko API to get token price by contract address
-  const response = await fetch(
-    `https://api.coingecko.com/api/v3/simple/token_price/ethereum?contract_addresses=${contractAddress}&vs_currencies=usd`,
-  );
-  const data = await response.json();
-  const price = data[contractAddress.toLowerCase()]?.usd;
-  if (!price) {
-    throw new Error('Failed to fetch token price');
+// Helper function to fetch token price in USD from Pioneer API
+async function fetchTokenPriceInUsd(pioneer: any, caip: string) {
+  // Use the full CAIP string to get price from Pioneer API
+  try {
+    const marketInfo = await pioneer.GetMarketInfo([caip]);
+    if (marketInfo?.data && marketInfo.data.length > 0 && marketInfo.data[0] > 0) {
+      return marketInfo.data[0];
+    }
+    // Fallback if price not available
+    console.warn(`Token price not available from Pioneer API for ${caip}, using 0`);
+    return 0;
+  } catch (error) {
+    console.error(`Error fetching token price from Pioneer API for ${caip}:`, error);
+    return 0;
   }
-  return price;
 }
 
 // Create an unsigned EVM transaction
@@ -455,26 +468,27 @@ export async function createUnsignedEvmTx(
       case 'erc20': {
         const contractAddress = extractContractAddressFromCaip(caip);
 
-        // Get token decimals - CRITICAL for correct amount calculation
-        // Common token decimals:
-        // USDT: 6, USDC: 6, DAI: 18, WETH: 18, most others: 18
-        let tokenDecimals = 18; // Default to 18 if not specified
-
-        // Check for known stablecoins with 6 decimals
-        const contractLower = contractAddress.toLowerCase();
-        if (
-          contractLower === '0xdac17f958d2ee523a2206206994597c13d831ec7' || // USDT on Ethereum
-          contractLower === '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' || // USDC on Ethereum
-          contractLower === '0x4fabb145d64652a948d72533023f6e7a623c7c53' || // BUSD on Ethereum
-          contractLower === '0x8e870d67f660d95d5be530380d0ec0bd388289e1'
-        ) {
-          // USDP on Ethereum
-          tokenDecimals = 6;
-          console.log(tag, 'Using 6 decimals for stablecoin:', contractAddress);
-        }
+        // Get token decimals from contract - CRITICAL for correct amount calculation
+        // Fetch decimals from contract directly (handles all tokens on all chains)
+        console.log(tag, 'Fetching token decimals from contract:', contractAddress, 'on network:', networkId);
 
-        // TODO: Fetch decimals from contract in the future:
-        // const decimals = await getTokenDecimals(contractAddress, networkId);
+        let tokenDecimals: number;
+        try {
+          // Call pioneer-server API to get token decimals (server handles RPC calls)
+          console.log(tag, 'Fetching token decimals via pioneer-server API for', contractAddress, 'on', networkId);
+          const decimalsResponse = await pioneer.GetTokenDecimals({
+            networkId,
+            contractAddress,
+          });
+
+          tokenDecimals = Number(decimalsResponse.data.decimals);
+          console.log(tag, '✅ Fetched decimals from pioneer-server:', tokenDecimals);
+        } catch (error: any) {
+          console.error(tag, 'Failed to fetch token decimals from pioneer-server:', error);
+          // Fallback to 18 decimals as last resort (but log warning)
+          console.warn(tag, '⚠️ FALLBACK: Using default 18 decimals - THIS MAY BE INCORRECT!');
+          tokenDecimals = 18;
+        }
 
         // Use BigInt for precise decimal math (no float drift)
         const tokenMultiplier = 10n ** BigInt(tokenDecimals);
@@ -526,11 +540,11 @@ export async function createUnsignedEvmTx(
 
         const data = encodeTransferData(to, amountWei);
 
-        const ethPriceInUsd = await fetchEthPriceInUsd();
+        const ethPriceInUsd = await fetchEthPriceInUsd(pioneer, networkId);
         const gasFeeUsd = (Number(gasFee) / 1e18) * ethPriceInUsd;
 
-        // For token price, need to fetch from API
-        const tokenPriceInUsd = await fetchTokenPriceInUsd(contractAddress);
+        // For token price, fetch from Pioneer API using the full CAIP
+        const tokenPriceInUsd = await fetchTokenPriceInUsd(pioneer, caip);
         // Use the correct decimals for USD calculation
         const amountUsd = (Number(amountWei) / Number(tokenMultiplier)) * tokenPriceInUsd;
 

package/src/txbuilder/createUnsignedTendermintTx.ts

@@ -73,15 +73,19 @@ export async function createUnsignedTendermintTx(
     console.log(tag, `💰 balanceInfo:`, balanceInfo);
 
     let account_number, sequence;
-    if (networkId === 'cosmos:cosmoshub-4' || networkId === 'cosmos:osmosis-1') {
+
+    // Handle both old (result.value) and new (account) API formats
+    // Thorchain upgraded to Cosmos SDK v0.47+ format, similar to Cosmoshub/Osmosis
+    if (accountInfo.account) {
+      // New format (Cosmos SDK v0.47+): used by all chains now
       account_number = accountInfo.account.account_number || '0';
       sequence = accountInfo.account.sequence || '0';
-    } else if (
-      networkId === 'cosmos:thorchain-mainnet-v1' ||
-      networkId === 'cosmos:mayachain-mainnet-v1'
-    ) {
+    } else if (accountInfo.result?.value) {
+      // Old format (Cosmos SDK v0.45): legacy fallback
       account_number = accountInfo.result.value.account_number || '0';
       sequence = accountInfo.result.value.sequence || '0';
+    } else {
+      throw new Error(`Unexpected account info format for ${networkId}: ${JSON.stringify(accountInfo)}`);
     }
 
     console.log(tag, `📊 Extracted account_number: ${account_number}, sequence: ${sequence}`);