@fileverse-dev/formulajs 4.4.11-mod-22-patch-4 → 4.4.11-mod-23

package/lib/esm/index.mjs

@@ -13099,7 +13099,10 @@ const ERROR_MESSAGES_FLAG = {
   INVALID_API_KEY: '_INVALID_KEY',
   RATE_LIMIT: '_RATE_LIMIT_REACHED',
   DEFAULT: 'FETCH_ERROR',
-  MISSING_KEY: '_MISSING'
+  MISSING_KEY: '_MISSING',
+  INVALID_CHAIN: '_INVALID_CHAIN',
+  INVALID_TYPE: '_INVALID_TYPE',
+  INVALID_ADDRESS: '_INVALID_ADDRESS'
 };
 
 const SERVICE_API_KEY = {
@@ -13118,7 +13121,7 @@ if(!timestamp || !chain || !apiKey) return
 
   };
 
-async function BLOCKSCOUT(address, type, chain, page, offset, startTimestamp, endTimestamp) {
+async function BLOCKSCOUT(address, type, chain, startTimestamp, endTimestamp, page, offset) {
   if (!chain) {
     chain = 'ethereum';
   }
@@ -13187,38 +13190,73 @@ async function BLOCKSCOUT(address, type, chain, page, offset, startTimestamp, en
   }
 }
 
-async function ETHERSCAN(address, page, offset) {
+async function ETHERSCAN(...args) {
+  const [type, chain, address, startDate, endDate] = args;
+
   const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Etherscan);
-  if(!API_KEY){
-    return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
+  if (!API_KEY) {
+    return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.MISSING_KEY}`;
+  }
+  // TO REMOVE - TEMORARY ADDED TO TEST RATE LIMIT FLOW
+  if (API_KEY === 'xxxx') {
+    return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`;
+  }
+
+  const chainId = CHAIN_ID_MAP[chain?.toLowerCase()];
+  if (!chainId) {
+    return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.INVALID_CHAIN}`;
   }
-  // temporary added for testing rate limit flow
-  if(API_KEY === 'xxxx'){
-  return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`
+
+  let action;
+  switch (type) {
+    case 'all-txns':
+      action = 'txlist';
+      break;
+    case 'token-txns':
+      action = 'tokentx';
+      break;
+    case 'nft-txns':
+      action = 'tokennfttx';
+      break;
+    case 'gas':
+      action = 'gastracker';
+      break;
+    default:
+      return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.INVALID_TYPE}`;
+  }
+
+  let url = `https://api.etherscan.io/v2/api?chainid=${chainId}&module=account&action=${action}&apikey=${API_KEY}`;
+
+  if (['all-txns', 'token-txns', 'nft-txns'].includes(type)) {
+    if (!address) return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.INVALID_ADDRESS}`;
+    url += `&address=${address}&startblock=0&endblock=99999999&sort=asc`;
+    if (startDate && endDate && !isNaN(startDate) && !isNaN(endDate)) {
+      const startBlock = await fromTimeStampToBlock(startDate, chain, API_KEY);
+      const endBlock = await fromTimeStampToBlock(endDate, chain, API_KEY);
+      url += `&startblock=${startBlock}&endblock=${endBlock}`;
+    }
   }
-  const url = `https://api.etherscan.io/v2/api?chainid=1&module=account&action=txlist&address=${address}&startblock=0&endblock=99999999&page=${page || 1}&offset=${offset || 10}&sort=asc&apikey=${API_KEY}`;
 
   try {
     const response = await fetch(url);
-    if (!response.ok) {
-      throw new Error(`HTTP error! Status: ${response.status}`)
-    }
+    if (!response.ok) throw new Error(`HTTP error! Status: ${response.status}`);
     const json = await response.json();
-    if (json.result.includes("Invalid API Key")) {
-      return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.INVALID_API_KEY}`
+
+    if (typeof json.result === 'string' && json.result.includes('Invalid API Key')) {
+      return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.INVALID_API_KEY}`;
     }
-    if(json.result.includes('Max rate limit reached')){
-      return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`
+
+    if (typeof json.result === 'string' && json.result.includes('Max rate limit reached')) {
+      return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`;
     }
-    /*
-    [{blockNumber: '0x1d3d1', timeStamp: '0x5f7e4f', hash: '0x3c3c3c3c', nonce: '0x1',}]
-    */
+
     return json.result;
   } catch (error) {
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return ERROR_MESSAGES_FLAG.DEFAULT;
   }
 }
 
+
 async function COINGECKO(token, vs_currencies) {
   const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Coingecko);
   const url = `https://api.coingecko.com/api/v3/simple/price?vs_currencies=${vs_currencies}&ids=${token}`;
@@ -13255,50 +13293,76 @@ async function COINGECKO(token, vs_currencies) {
     */
     return [output];
   } catch (error) {
+    console.log(error);
     return ERROR_MESSAGES_FLAG.DEFAULT
   }
 }
 
-async function EOA(address, categories, chain, startTime, endTime) {
-  const API_KEYS = {
-    ethereum: window.localStorage.getItem(SERVICE_API_KEY.Etherscan),
-    gnosis: window.localStorage.getItem(SERVICE_API_KEY.Gnosisscan),
-    base: window.localStorage.getItem(SERVICE_API_KEY.Basescan),
-  };
-  const apiKey = API_KEYS[chain];
-  const chainId = CHAIN_ID_MAP[chain];
-  if (!apiKey || !chainId) return `${chain.toUpperCase()}_MISSING`;
-
-  let action = '';
-  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}`;
+async function EOA(addresses, category, chains, startTime, endTime) {
   try {
-    const response = await fetch(url);
-    if (!response.ok) throw new Error(`HTTP error! Status: ${response.status}`);
-    const json = await response.json();
-    if (json.result?.includes?.("Invalid API Key")) {
-      return `${SERVICE_API_KEY[chain.charAt(0).toUpperCase() + chain.slice(1)]}_MISSING`;
-    }
-    if(json.result.includes('Max rate limit reached')){
-      return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`
+    const ADDRESSES = addresses.split(',').map(a => a.trim());
+    const CHAINS = typeof chains === 'string' ? chains.split(',').map(c => c.trim()) : chains;
+
+    const flatResults = [];
+    const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Etherscan);
+
+    if (!API_KEY) return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.MISSING_KEY}`;
+
+    for (const chain of CHAINS) {
+      const chainId = CHAIN_ID_MAP[chain];
+      if (!chainId) throw new Error('Unsupported chain');
+
+      for (const address of ADDRESSES) {
+        let action = category === 'txns' ? 'account.txlist' : 'account.balance';
+        let timeQuery = '';
+
+        if (category === 'txns') {
+          const startBlock = await fromTimeStampToBlock(startTime, chain, API_KEY);
+          const endBlock = await fromTimeStampToBlock(endTime, chain, API_KEY);
+          timeQuery = `&startblock=${startBlock}&endblock=${endBlock}`;
+        } else {
+          timeQuery = `&tag=latest`;
+        }
+
+        const url = `https://api.etherscan.io/v2/api?module=${action.split('.')[0]}&action=${action.split('.')[1]}&address=${address}&sort=asc&chainid=${chainId}&apikey=${API_KEY}${timeQuery}`;
+
+        try {
+          const response = await fetch(url);
+          if (!response.ok) {
+            return `HTTP_${response.status}`;
+          }
+
+          const json = await response.json();
+
+          if (json.result?.includes?.('Invalid API Key')) {
+            return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.INVALID_API_KEY}`;
+          }
+
+          if (json.result?.includes?.('Max rate limit reached')) {
+            return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`;
+          }
+
+          const entries = Array.isArray(json.result) ? json.result : [json.result];
+          for (const entry of entries) {
+            flatResults.push({ chain, address, ...entry });
+          }
+
+        } catch (e) {
+          return ERROR_MESSAGES_FLAG.DEFAULT;
+        }
+      }
     }
-    return json.result;
-  } catch (e) {
-    console.log(e);
+
+    return flatResults;
+  } catch (error) {
+    console.log(error);
     return ERROR_MESSAGES_FLAG.DEFAULT;
   }
 }
 
+
+
+
 async function FLVURL(token, vs_currencies) {
   return new Promise((resolve) => {
     setTimeout(() => {

package/package.json

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

package/types/cjs/index.d.cts

@@ -419,7 +419,7 @@ export function BITRSHIFT(number: any, shift_amount: any): number | Error;
  * @returns
  */
 export function BITXOR(number1: any, number2: any): number | Error;
-export function BLOCKSCOUT(address: any, type: any, chain: any, page: any, offset: any, startTimestamp: any, endTimestamp: any): Promise<any>;
+export function BLOCKSCOUT(address: any, type: any, chain: any, startTimestamp: any, endTimestamp: any, page: any, offset: any): Promise<any>;
 /**
  * Rounds a number to the nearest integer or to the nearest multiple of significance.
  *
@@ -1295,7 +1295,7 @@ export function EDATE(start_date: any, months: any): any;
  * @returns
  */
 export function EFFECT(nominal_rate: any, npery: any): number | Error;
-export function EOA(address: any, categories: any, chain: any, startTime: any, endTime: any): Promise<any>;
+export function EOA(addresses: any, category: any, chains: any, startTime: any, endTime: any): Promise<string | any[]>;
 /**
  * Returns the serial number of the last day of the month before or after a specified number of months.
  *
@@ -1330,7 +1330,7 @@ export const ERFPRECISE: any;
 export namespace ERROR {
     function TYPE(error_val: any): Error | 1 | 2 | 3 | 4 | 8 | 5 | 6 | 7;
 }
-export function ETHERSCAN(address: any, page: any, offset: any): Promise<any>;
+export function ETHERSCAN(...args: any[]): Promise<any>;
 /**
  * Rounds a number up to the nearest even integer.
  *

package/types/esm/index.d.mts

@@ -419,7 +419,7 @@ export function BITRSHIFT(number: any, shift_amount: any): number | Error;
  * @returns
  */
 export function BITXOR(number1: any, number2: any): number | Error;
-export function BLOCKSCOUT(address: any, type: any, chain: any, page: any, offset: any, startTimestamp: any, endTimestamp: any): Promise<any>;
+export function BLOCKSCOUT(address: any, type: any, chain: any, startTimestamp: any, endTimestamp: any, page: any, offset: any): Promise<any>;
 /**
  * Rounds a number to the nearest integer or to the nearest multiple of significance.
  *
@@ -1295,7 +1295,7 @@ export function EDATE(start_date: any, months: any): any;
  * @returns
  */
 export function EFFECT(nominal_rate: any, npery: any): number | Error;
-export function EOA(address: any, categories: any, chain: any, startTime: any, endTime: any): Promise<any>;
+export function EOA(addresses: any, category: any, chains: any, startTime: any, endTime: any): Promise<string | any[]>;
 /**
  * Returns the serial number of the last day of the month before or after a specified number of months.
  *
@@ -1330,7 +1330,7 @@ export const ERFPRECISE: any;
 export namespace ERROR {
     function TYPE(error_val: any): Error | 1 | 2 | 3 | 4 | 8 | 5 | 6 | 7;
 }
-export function ETHERSCAN(address: any, page: any, offset: any): Promise<any>;
+export function ETHERSCAN(...args: any[]): Promise<any>;
 /**
  * Rounds a number up to the nearest even integer.
  *