@pioneer-platform/pioneer-sdk 4.20.11 → 4.20.13

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 | ";
@@ -1891,7 +1904,7 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
     let nonce;
     try {
       const nonceData = await pioneer.GetNonceByNetwork({ networkId, address });
-      nonce = nonceData.data;
+      nonce = nonceData.data.nonce;
       if (nonce === undefined || nonce === null) {
         console.log(tag5, "No nonce found for address (likely fresh address), defaulting to 0");
         nonce = 0;
@@ -1901,7 +1914,7 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
       nonce = 0;
     }
     const balanceData = await pioneer.GetBalanceAddressByNetwork({ networkId, address });
-    const balanceEth = balanceData.data;
+    const balanceEth = parseFloat(balanceData.data.balance);
     const balance = BigInt(Math.round(balanceEth * 1000000000000000000));
     if (balance <= 0n)
       throw new Error("Wallet balance is zero");
@@ -2057,9 +2070,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,

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 | ";
@@ -2067,7 +2080,7 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
     let nonce;
     try {
       const nonceData = await pioneer.GetNonceByNetwork({ networkId, address });
-      nonce = nonceData.data;
+      nonce = nonceData.data.nonce;
       if (nonce === undefined || nonce === null) {
         console.log(tag5, "No nonce found for address (likely fresh address), defaulting to 0");
         nonce = 0;
@@ -2077,7 +2090,7 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
       nonce = 0;
     }
     const balanceData = await pioneer.GetBalanceAddressByNetwork({ networkId, address });
-    const balanceEth = balanceData.data;
+    const balanceEth = parseFloat(balanceData.data.balance);
     const balance = BigInt(Math.round(balanceEth * 1000000000000000000));
     if (balance <= 0n)
       throw new Error("Wallet balance is zero");
@@ -2233,9 +2246,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,

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 | ";
@@ -2067,7 +2080,7 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
     let nonce;
     try {
       const nonceData = await pioneer.GetNonceByNetwork({ networkId, address });
-      nonce = nonceData.data;
+      nonce = nonceData.data.nonce;
       if (nonce === undefined || nonce === null) {
         console.log(tag5, "No nonce found for address (likely fresh address), defaulting to 0");
         nonce = 0;
@@ -2077,7 +2090,7 @@ async function createUnsignedEvmTx(caip, to, amount, memo, pubkeys, pioneer, pub
       nonce = 0;
     }
     const balanceData = await pioneer.GetBalanceAddressByNetwork({ networkId, address });
-    const balanceEth = balanceData.data;
+    const balanceEth = parseFloat(balanceData.data.balance);
     const balance = BigInt(Math.round(balanceEth * 1000000000000000000));
     if (balance <= 0n)
       throw new Error("Wallet balance is zero");
@@ -2233,9 +2246,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,

package/package.json

@@ -1,12 +1,12 @@
 {
   "author": "highlander",
   "name": "@pioneer-platform/pioneer-sdk",
-  "version": "4.20.11",
+  "version": "4.20.13",
   "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/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
@@ -241,8 +254,8 @@ export async function createUnsignedEvmTx(
     let nonce;
     try {
       const nonceData = await pioneer.GetNonceByNetwork({ networkId, address });
-      nonce = nonceData.data;
-      
+      nonce = nonceData.data.nonce;
+
       // Handle fresh addresses that have never sent a transaction
       if (nonce === undefined || nonce === null) {
         console.log(tag, 'No nonce found for address (likely fresh address), defaulting to 0');
@@ -256,7 +269,7 @@ export async function createUnsignedEvmTx(
     //console.log(tag, 'nonce:', nonce);
 
     const balanceData = await pioneer.GetBalanceAddressByNetwork({ networkId, address });
-    const balanceEth = balanceData.data; // Assuming this is in ETH
+    const balanceEth = parseFloat(balanceData.data.balance); // Assuming this is in ETH
     const balance = BigInt(Math.round(balanceEth * 1e18)); // Convert to wei
     //console.log(tag, 'balance (wei):', balance.toString());
     if (balance <= 0n) throw new Error('Wallet balance is zero');
@@ -526,11 +539,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;