@fileverse-dev/formulajs 4.4.11-mod-15-patch-2 → 4.4.11-mod-16

package/lib/cjs/index.cjs

@@ -13001,25 +13001,20 @@ const SERVICE_API_KEY = {
   BASESCAN: 'Basescan'
 };
 
-const CHAIN_API_BASE = {
-    ethereum: 'https://api.etherscan.io/api',
-    gnosis: 'https://api.gnosisscan.io/api',
-    base: 'https://api.basescan.org/api',
-};
+const CHAIN_ID_MAP = {
+    ethereum: 1,
+    gnosis: 100,
+    base: 8453,
+  };
 
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-          const baseUrl = CHAIN_API_BASE[chain];
-          if(!baseUrl){
-            throw new Error('Unsupported Chain')
-          }
-    try {
-      const url = `${baseUrl}?module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before&apikey=${apiKey}`;
+if(!timestamp || !chain || !apiKey) return 
+      const chainId = CHAIN_ID_MAP[chain];
+      const url = `https://api.etherscan.io/v2/api?module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before&apikey=${apiKey}&chainId=${chainId}`;
       const res = await fetch(url);
       const json = await res.json();
       return parseInt(json.result);
-    } catch {
-      return 0;
-    }
+
   };
 
 async function ETHERSCAN(address, page, offset) {
@@ -13087,20 +13082,23 @@ async function OX(address, categories, chain, startTime, endTime) {
     gnosis: window.localStorage.getItem(SERVICE_API_KEY.Gnosisscan),
     base: window.localStorage.getItem(SERVICE_API_KEY.Basescan),
   };
-
   const apiKey = API_KEYS[chain];
-  const baseUrl = CHAIN_API_BASE[chain];
-
-  const startBlock = await fromTimeStampToBlock(startTime, chain, apiKey);
-  const endBlock = await fromTimeStampToBlock(endTime);
+  const chainId = CHAIN_ID_MAP[chain];
+  if (!apiKey || !chainId) return `${chain.toUpperCase()}_MISSING`;
 
   let action = '';
-  if (categories === 'txns') action = 'txlist';
-  else if (categories === 'balances') action = 'balance';
-  else if (categories === 'portfolio') action = 'tokentx';
-
-  let url = `${baseUrl}?module=account&action=${action}&address=${address}&startblock=${startBlock}&endblock=${endBlock}&sort=asc&apikey=${apiKey}`;
-
+  if (categories === 'txns') action = 'account.txlist';
+  else {action = 'account.balance';}  let timeQuery = '';
+  if(!isNaN(startTime) && !isNaN(endTime)){
+      const startBlock = await fromTimeStampToBlock(startTime, chain, apiKey);
+      const endBlock = await fromTimeStampToBlock(endTime, chain, apiKey);
+    timeQuery = `&startblock=${startBlock}&endblock=${endBlock}`;
+  } else if(categories === 'balance') {
+    timeQuery = `&tag=latest`;
+  } else {
+    throw new Error('Start and End Time is required for querying transaction list ')
+  }
+  const url = `https://api.etherscan.io/v2/api?module=${action.split('.')[0]}&action=${action.split('.')[1]}&address=${address}&sort=asc&chainid=${chainId}&apikey=${apiKey}${timeQuery}`;
   try {
     const response = await fetch(url);
     if (!response.ok) throw new Error(`HTTP error! Status: ${response.status}`);

package/lib/esm/crypto-constants.mjs

@@ -48,7 +48,7 @@ var FUNCTION_LOCALE = [
     n: "Ox",
     t: 20,
     d: "Fetches address data like transactions, balances, or portfolio info from multiple supported chains.",
-    a: "Dynamically queries blockchain data such as transactions, balances, or token portfolio by resolving time ranges to block ranges.",
+    a: "Dynamically queries blockchain data such as transactions, balances by resolving time ranges to block ranges.",
     p: [
       {
         name: "address",
@@ -58,7 +58,7 @@ var FUNCTION_LOCALE = [
       },
       {
         name: "categories",
-        detail: `Type of data to fetch. Supported values: "txns", "balances", "portfolio".`,
+        detail: `Type of data to fetch. Supported values: "txns", "balance".`,
         example: `"txns"`,
         require: "m"
       },
@@ -70,14 +70,14 @@ var FUNCTION_LOCALE = [
       },
       {
         name: "startTime",
-        detail: "Start time in UNIX timestamp (seconds). Will be converted to a starting block.",
+        detail: "Start time in UNIX timestamp (seconds). Will be converted to a starting block. Required for txns category",
         example: "1680300000",
         require: "m",
         type: "rangenumber"
       },
       {
         name: "endTime",
-        detail: "End time in UNIX timestamp (seconds). Will be converted to an ending block.",
+        detail: "End time in UNIX timestamp (seconds). Will be converted to an ending block. Required for txns category",
         example: "1680900000",
         require: "m",
         type: "rangenumber"

package/lib/esm/index.mjs

@@ -12999,25 +12999,20 @@ const SERVICE_API_KEY = {
   BASESCAN: 'Basescan'
 };
 
-const CHAIN_API_BASE = {
-    ethereum: 'https://api.etherscan.io/api',
-    gnosis: 'https://api.gnosisscan.io/api',
-    base: 'https://api.basescan.org/api',
-};
+const CHAIN_ID_MAP = {
+    ethereum: 1,
+    gnosis: 100,
+    base: 8453,
+  };
 
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-          const baseUrl = CHAIN_API_BASE[chain];
-          if(!baseUrl){
-            throw new Error('Unsupported Chain')
-          }
-    try {
-      const url = `${baseUrl}?module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before&apikey=${apiKey}`;
+if(!timestamp || !chain || !apiKey) return 
+      const chainId = CHAIN_ID_MAP[chain];
+      const url = `https://api.etherscan.io/v2/api?module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before&apikey=${apiKey}&chainId=${chainId}`;
       const res = await fetch(url);
       const json = await res.json();
       return parseInt(json.result);
-    } catch {
-      return 0;
-    }
+
   };
 
 async function ETHERSCAN(address, page, offset) {
@@ -13085,20 +13080,23 @@ async function OX(address, categories, chain, startTime, endTime) {
     gnosis: window.localStorage.getItem(SERVICE_API_KEY.Gnosisscan),
     base: window.localStorage.getItem(SERVICE_API_KEY.Basescan),
   };
-
   const apiKey = API_KEYS[chain];
-  const baseUrl = CHAIN_API_BASE[chain];
-
-  const startBlock = await fromTimeStampToBlock(startTime, chain, apiKey);
-  const endBlock = await fromTimeStampToBlock(endTime);
+  const chainId = CHAIN_ID_MAP[chain];
+  if (!apiKey || !chainId) return `${chain.toUpperCase()}_MISSING`;
 
   let action = '';
-  if (categories === 'txns') action = 'txlist';
-  else if (categories === 'balances') action = 'balance';
-  else if (categories === 'portfolio') action = 'tokentx';
-
-  let url = `${baseUrl}?module=account&action=${action}&address=${address}&startblock=${startBlock}&endblock=${endBlock}&sort=asc&apikey=${apiKey}`;
-
+  if (categories === 'txns') action = 'account.txlist';
+  else {action = 'account.balance';}  let timeQuery = '';
+  if(!isNaN(startTime) && !isNaN(endTime)){
+      const startBlock = await fromTimeStampToBlock(startTime, chain, apiKey);
+      const endBlock = await fromTimeStampToBlock(endTime, chain, apiKey);
+    timeQuery = `&startblock=${startBlock}&endblock=${endBlock}`;
+  } else if(categories === 'balance') {
+    timeQuery = `&tag=latest`;
+  } else {
+    throw new Error('Start and End Time is required for querying transaction list ')
+  }
+  const url = `https://api.etherscan.io/v2/api?module=${action.split('.')[0]}&action=${action.split('.')[1]}&address=${address}&sort=asc&chainid=${chainId}&apikey=${apiKey}${timeQuery}`;
   try {
     const response = await fetch(url);
     if (!response.ok) throw new Error(`HTTP error! Status: ${response.status}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/formulajs",
-  "version": "4.4.11-mod-15-patch-2",
+  "version": "4.4.11-mod-16",
   "description": "JavaScript implementation of most Microsoft Excel formula functions",
   "author": "Formulajs",
   "publishConfig": {