@fileverse-dev/formulajs 4.4.11-mod-66 → 4.4.11-mod-67

package/lib/cjs/index.cjs

@@ -13118,15 +13118,19 @@ const SAFE_CHAIN_MAP = {
 };
 
 const ERROR_MESSAGES_FLAG = {
-  INVALID_API_KEY: '_INVALID_KEY',
-  RATE_LIMIT: '_RATE_LIMIT_REACHED',
-  DEFAULT: 'FETCH_ERROR',
-  MISSING_KEY: '_MISSING',
-  INVALID_CHAIN: '_INVALID_CHAIN',
-  INVALID_TYPE: '_INVALID_TYPE',
-  INVALID_ADDRESS: '_INVALID_ADDRESS',
-  INVALID_PARAM: '_INVALID_PARAM',
-  MAX_PAGE_LIMIT: 'Max page limit is 250'
+  INVALID_API_KEY: 'INVALID_API_KEY',
+  RATE_LIMIT: 'RATE_LIMIT',
+  DEFAULT: 'DEFAULT',
+  MISSING_KEY: 'MISSING_KEY',
+  INVALID_CHAIN: 'INVALID_CHAIN',
+  INVALID_TYPE: 'INVALID_TYPE',
+  INVALID_ADDRESS: 'INVALID_ADDRESS',
+  INVALID_PARAM: 'INVALID_PARAM',
+  MAX_PAGE_LIMIT: 'MAX_PAGE_LIMIT',
+  NETWORK_ERROR: 'NETWORK_ERROR',
+  ENS: 'ENS',
+  CUSTOM: 'CUSTOM',
+  MISSING_PARAM: 'MISSING_PARAM'
 };
 
 const UTILITY = {
@@ -13134,16 +13138,16 @@ const UTILITY = {
 };
 const MAX_PAGE_LIMIT = 250;
 
-const SERVICE_API_KEY = {
-  Etherscan: 'ETHERSCAN_API_KEY',
-  Coingecko: 'COINGECKO_API_KEY',
-  Safe: 'SAFE_API_KEY',
-  Basescan: 'BASESCAN_API_KEY',
-  Gnosisscan: 'GNOSIS_API_KEY',
-  Firefly: 'FIRE_FLY_API_KEY',
-  GnosisPay: 'GNOSIS_API_KEY',
-  Neynar: 'NEYNAR_API_KEY',
-  Defillama: 'DEFILLAMA_API_KEY'
+const SERVICES_API_KEY = {
+  Etherscan: 'Etherscan',
+  Coingecko: 'Coingecko',
+  Safe: 'Safe',
+  Basescan: 'Basescan',
+  Gnosisscan: 'Gnosisscan',
+  Firefly: 'Firefly',
+  GnosisPay: 'GnosisPay',
+  Neynar: 'Neynar',
+  Defillama: 'Defillama'
 };
 
 const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
@@ -13156,6 +13160,10 @@ if(!timestamp || !chain || !apiKey) return
 
   };
 
+var fromTimestampToBlock = {
+  fromTimeStampToBlock
+};
+
 function toTimestamp(dateStr) {
   // Expecting format: "DD/MM/YYYY"
   const [day, month, year] = dateStr.split("/").map(Number);
@@ -13167,6 +13175,16 @@ const isAddress = (input) => {
         return (/^0x[a-fA-F0-9]{40}$/.test(input)) 
 };
 
+var isAddress$1 = {
+  isAddress
+};
+
+/* global document */
+/* global window */
+/* global ethers */
+
+
+
 async function fromEnsNameToAddress(name) {
   if (typeof ethers === 'undefined') {
     await new Promise((resolve, reject) => {
@@ -13194,33 +13212,170 @@ async function fromEnsNameToAddress(name) {
   }
 }
 
+var fromEnsNameToAddress$1 = {
+  fromEnsNameToAddress
+};
+
+const errorMessageHandler = (errorFlag, input, functionName) => {
+  if (!functionName) {
+    const stack = new Error().stack?.split('\n')[2];
+    const match = stack?.match(/at (.+?) \(/);
+    const rawFnName = match?.[1];
+    functionName = rawFnName?.split('.').pop() || '[unable to detect function name]';
+  }
+
+  switch (errorFlag) {
+    case ERROR_MESSAGES_FLAG.INVALID_ADDRESS:
+      return {
+        message: `${input} is not a supported address`,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.INVALID_PARAM: {
+      const key = Object.keys(input)[0];
+      const value = input[key];
+      return {
+        message: `${value} is an invalid value for ${key}`,
+        functionName,
+        type: errorFlag
+      }
+    }
+
+    case ERROR_MESSAGES_FLAG.INVALID_CHAIN:
+      return {
+        message: `${input} is not a supported chain for this function `,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.RATE_LIMIT:
+      return {
+        message: `Rate limit for ${input || functionName || 'this api'} has been reached`,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.MISSING_KEY:
+      return {
+        message: `Api key for ${input || functionName || 'this api'} is missing`,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.NETWORK_ERROR:
+      if (input === 429) {
+        return {
+          message: `Rate limit for ${functionName || 'this function'} has been reached`,
+          functionName,
+          type: ERROR_MESSAGES_FLAG.RATE_LIMIT
+        }
+      }
+      return {
+        message: `Api failed with status code ${input}`,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.MISSING_PARAM:
+      return {
+        message: `Missing param: ${input}`,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.ENS:
+      return {
+        message: `${input} is not a supported ens name`,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.CUSTOM:
+      return {
+        message: input.message,
+        functionName,
+        type: errorFlag,
+        reason: input.reason || input.message
+      }
+
+    case ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT:
+      return {
+        message: `Max page limit is ${MAX_PAGE_LIMIT}`,
+        functionName,
+        type: errorFlag
+      }
+
+    case ERROR_MESSAGES_FLAG.INVALID_API_KEY:
+      return {
+        message: `${input}: Invalid API key`,
+        functionName,
+        type: errorFlag
+      }
+
+    default:
+      return {
+        message: 'An unexpected error occured',
+        functionName,
+        type: errorFlag,
+        reason: input
+      }
+  }
+};
+
+
+
+
+
+const checkRequiredParams = (inputMap) => {
+  for (const key in inputMap) {
+    if (!inputMap[key]) {
+      const stack = new Error().stack?.split('\n')[2];
+
+      const match = stack?.match(/at (.+?) \(/);
+      const rawFnName = match?.[1];
+      const parentFunctionName = rawFnName?.split('.').pop() || '[unable to detect function name]';
+
+      const paramName = key;
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_PARAM, paramName, parentFunctionName);
+    }
+  }
+};
+
 async function handleScanRequest({
-  scanKey,
-  baseUrl,
   type,
-  chain,
   address,
   startDate,
   endDate,
   page = 1,
-  offset = 10
+  offset = 10,
+  apiKey,
+  functionName,
+  chainId,
+  network
 }) {
-  const API_KEY = window.localStorage.getItem(scanKey);
-  if (!API_KEY) return `${scanKey}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
-  if (API_KEY === 'xxxx') return `${scanKey}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`
-  if (offset > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
-  }
-
-  let chainId = CHAIN_ID_MAP[chain?.toLowerCase()];
-  if (!chainId) return `${scanKey}${ERROR_MESSAGES_FLAG.INVALID_CHAIN}`
+  const API_INFO_MAP = {
+    BASE: { url: 'https://api.basescan.org/api', apiKeyName: SERVICES_API_KEY.Basescan },
+    ETHERSCAN: { url: 'https://api.etherscan.io/v2/api', apiKeyName: SERVICES_API_KEY.Etherscan },
+    GNOSIS: { url: 'https://api.gnosisscan.io/api', apiKeyName: SERVICES_API_KEY.Gnosisscan }
+  };
 
-  if (!isAddress(address)) {
-    address = await fromEnsNameToAddress(address);
+  if (!isAddress$1.isAddress(address)) {
+    const ensName = address;
+    address = await fromEnsNameToAddress$1.fromEnsNameToAddress(address);
+    if (!address) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.ENS, ensName, functionName)
+    }
   }
 
-  if (!address) {
-    return `${address}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+  const apiInfo = API_INFO_MAP[functionName];
+  const baseUrl = apiInfo?.url;
+
+  if (!baseUrl) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.CUSTOM, {
+      message: 'Api not found',
+      reason: ` Api not found for: ${functionName}`
+    }, functionName)
   }
 
   const ACTION_MAP = {
@@ -13231,41 +13386,40 @@ async function handleScanRequest({
   };
 
   const action = ACTION_MAP[type];
-  if (!action) return `${scanKey}${ERROR_MESSAGES_FLAG.INVALID_TYPE}`
-
-  if (scanKey === SERVICE_API_KEY.Basescan) chainId = 'base';
-  if (scanKey === SERVICE_API_KEY.Gnosisscan) chainId = 'gnosis';
+  if (!action) return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { type }, functionName)
 
-  let url = `${baseUrl}?chainid=${chainId}&module=account&action=${action}&apikey=${API_KEY}`;
+  let url = `${baseUrl}?chainid=${chainId}&module=account&action=${action}&apikey=${apiKey}`;
 
   if (['all-txns', 'token-txns', 'nft-txns'].includes(type)) {
-    if (!address) return `${scanKey}${ERROR_MESSAGES_FLAG.INVALID_ADDRESS}`
     url += `&address=${address}&startblock=0&endblock=99999999&sort=asc`;
 
     if (!isNaN(startDate) && !isNaN(endDate)) {
       const [startBlock, endBlock] = await Promise.all([
-        fromTimeStampToBlock(toTimestamp(startDate), chain, API_KEY),
-        fromTimeStampToBlock(toTimestamp(endDate), chain, API_KEY)
+        fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(startDate), network, apiKey),
+        fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(endDate), network, apiKey)
       ]);
-      url += `&startblock=${startBlock}&endblock=${endBlock}`;
+      url += `&startblock=${startBlock || '0'}&endblock=${endBlock || '99999999'}`;
     }
     url += `&page=${page}&offset=${offset}`;
   }
 
   try {
     const res = await fetch(url);
-    if (!res.ok) throw new Error(`HTTP error: ${res.status}`)
+    if (!res.ok) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, res.status, functionName)
+    }
     const json = await res.json();
 
     if (typeof json.result === 'string') {
-      if (json.result.includes('Invalid API Key')) return `${scanKey}${ERROR_MESSAGES_FLAG.INVALID_API_KEY}`
-      if (json.result.includes('Max rate limit reached')) return `${scanKey}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`
+      if (json.result.includes('Invalid API Key'))
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_API_KEY, apiInfo.apiKeyName, functionName)
+      if (json.result.includes('Max rate limit reached'))
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.RATE_LIMIT, apiInfo.apiKeyName, functionName)
     }
 
     return json.result
   } catch (err) {
-    console.error(`[${scanKey}]`, err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err, functionName)
   }
 }
 
@@ -13283,6 +13437,9 @@ const fromUsernameToFid = async (username, apiKey) => {
   const user = users.find(user => user.username === username);
   return user && user.fid || null;
 };
+var fromUsernameToFid$1 = {
+  fromUsernameToFid
+};
 
 // remove nested structure from the response
 const removeNestedStructure = (json) => {
@@ -13297,13 +13454,22 @@ const removeNestedStructure = (json) => {
   });
 };
 
+/* global window */
+
 async function FIREFLY() {
   const [platform, contentType, identifier, start = 0, end = 10] = argsToArray(arguments);
+  const missingParamsError = checkRequiredParams({ platform, contentType, identifier });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
+
   if (end > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
   }
-  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Firefly);
-  if (!API_KEY) return `${SERVICE_API_KEY.Firefly}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
+
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Firefly)
 
   const baseUrl = 'https://openapi.firefly.land/v1/fileverse/fetch';
   const headers = { 'x-api-key': API_KEY };
@@ -13319,10 +13485,14 @@ async function FIREFLY() {
       replies: 'lenspostid'
     }
   };
-
-  const platformType = typeMap[platform]?.[contentType];
-  if (!platformType) return `${SERVICE_API_KEY.Firefly}${ERROR_MESSAGES_FLAG.INVALID_TYPE}`
-
+  const platformType = typeMap[platform];
+  if (!platformType) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { platform })
+  }
+  const platformContentType = platformType[contentType];
+  if (!platformContentType) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { contentType })
+  }
   const query = identifier
     .split(',')
     .map((s) => s.trim())
@@ -13337,7 +13507,7 @@ async function FIREFLY() {
 
   try {
     const res = await fetch(url.toString(), { headers });
-    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    if (!res.ok) return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, res.status)
 
     const json = await res.json();
     if (!Array.isArray(json?.data)) return []
@@ -13353,19 +13523,21 @@ async function FIREFLY() {
       return flat
     })
   } catch (err) {
-    console.error('FIREFLY fetch error:', err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err)
   }
 }
 
 async function LENS() {
   const [contentType, identifier, start = 0, end = 10] = argsToArray(arguments);
-  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Firefly);
-  if (!API_KEY) return `${SERVICE_API_KEY.Firefly}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
-
+  const missingParamsError = checkRequiredParams({ contentType, identifier });
+  if (missingParamsError) {
+    return missingParamsError
+  }
   if (end > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
   }
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Firefly)
 
   const baseUrl = 'https://openapi.firefly.land/v1/fileverse/fetch';
   const headers = { 'x-api-key': API_KEY };
@@ -13374,10 +13546,10 @@ async function LENS() {
     posts: 'lensid',
     replies: 'lenspostid'
   };
-
-  const platformType = typeMap[contentType];
-  if (!platformType) return `Lens: ${ERROR_MESSAGES_FLAG.INVALID_TYPE}`
-
+  const platformContentType = typeMap[contentType];
+  if (!platformContentType) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { contentType })
+  }
   const query = identifier
     .split(',')
     .map((s) => s.trim())
@@ -13386,13 +13558,15 @@ async function LENS() {
 
   const url = new URL(baseUrl);
   url.searchParams.set('query', query);
-  url.searchParams.set('type', platformType);
+  url.searchParams.set('type', platformContentType);
   url.searchParams.set('start', String(start));
   url.searchParams.set('end', String(end));
 
   try {
     const res = await fetch(url.toString(), { headers });
-    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    if (!res.ok) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, res.status)
+    }
 
     const json = await res.json();
     if (!Array.isArray(json?.data)) return []
@@ -13408,18 +13582,21 @@ async function LENS() {
       return flat
     })
   } catch (err) {
-    console.error('LENS fetch error:', err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err)
   }
 }
 
 async function FARCASTER() {
   const [contentType, identifier, start = 0, end = 10] = argsToArray(arguments);
-  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Firefly);
-  if (!API_KEY) return `${SERVICE_API_KEY.Firefly}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
+  const missingParamsError = checkRequiredParams({ contentType, identifier });
+  if (missingParamsError) {
+    return missingParamsError
+  }
   if (end > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
   }
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Firefly)
   const baseUrl = 'https://openapi.firefly.land/v1/fileverse/fetch';
   const headers = { 'x-api-key': API_KEY };
 
@@ -13429,9 +13606,10 @@ async function FARCASTER() {
     channels: 'farcasterchannels'
   };
 
-  const platformType = typeMap[contentType];
-  if (!platformType) return `Farcaster: ${ERROR_MESSAGES_FLAG.INVALID_TYPE}`
-
+  const platformContentType = typeMap[contentType];
+  if (!platformContentType) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { contentType })
+  }
   const query = identifier
     .split(',')
     .map((s) => s.trim())
@@ -13440,13 +13618,13 @@ async function FARCASTER() {
 
   const url = new URL(baseUrl);
   url.searchParams.set('query', query);
-  url.searchParams.set('type', platformType);
+  url.searchParams.set('type', platformContentType);
   url.searchParams.set('start', String(start));
   url.searchParams.set('end', String(end));
 
   try {
     const res = await fetch(url.toString(), { headers });
-    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    if (!res.ok) return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, res.status)
 
     const json = await res.json();
     if (!Array.isArray(json?.data)) return []
@@ -13462,24 +13640,24 @@ async function FARCASTER() {
       return flat
     })
   } catch (err) {
-    console.error('Farcaster fetch error:', err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err)
   }
 }
 
 async function BLOCKSCOUT() {
   let [address, type, chain, startTimestamp, endTimestamp, page = 1, offset = 10] = argsToArray(arguments);
+  const missingParamsError = checkRequiredParams({ address, type });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
   if (offset > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
   }
   if (!chain) {
     chain = 'ethereum';
   }
 
-  if (!type) {
-    return 'TYPE_MISSING'
-  }
-
   if (!startTimestamp) {
     const currentTimestamp = Date.now();
     startTimestamp = currentTimestamp - 30 * 24 * 60 * 60 * 1000;
@@ -13494,16 +13672,19 @@ async function BLOCKSCOUT() {
     endTimestamp = toTimestamp(endTimestamp);
   }
 
-  if (!isAddress(address)) {
-    address = await fromEnsNameToAddress(address);
+  if (!isAddress$1.isAddress(address)) {
+    const ensName = address;
+    address = await fromEnsNameToAddress$1.fromEnsNameToAddress(address);
+    if (!address) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.ENS, ensName)
+    }
   }
+  const hostname = BLOCKSCOUT_CHAINS_MAP[chain];
 
-  if (!address) {
-    return `${address}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+  if (!hostname) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_CHAIN, chain)
   }
 
-  const hostname = BLOCKSCOUT_CHAINS_MAP[chain];
-
   let requestUrl;
 
   switch (type) {
@@ -13517,22 +13698,26 @@ async function BLOCKSCOUT() {
       requestUrl = `${hostname}/api?module=account&action=tokenlist&address=${address}`;
       break
     default:
-      return 'INVALID_TYPE'
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { type })
   }
   try {
     const response = await fetch(requestUrl);
 
     if (!response.ok) {
-      throw new Error(`HTTP error! Status: ${response.status}`)
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, response.status)
     }
     const json = await response.json();
-
-    console.log(json);
     if (json?.result?.includes('Invalid parameter(s)')) {
-      return `INVALID_REQUEST_PARAMS`
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.CUSTOM, {
+        message: 'Invalid parameters',
+        reason: json.result
+      })
     }
     if (json?.result?.includes('Not found')) {
-      return `ADDRESS_NOT_FOUND`
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.CUSTOM, {
+        message: 'Address information not found',
+        reason: json.result
+      })
     }
 
     if (type === 'stat') {
@@ -13552,52 +13737,75 @@ async function BLOCKSCOUT() {
     */
     return json.result
   } catch (error) {
-    return 'ERROR IN FETCHING'
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, error)
   }
 }
 
 async function BASE() {
-  const [type, chain, address, startDate, endDate, page, limit] = argsToArray(arguments);
+  const [type, address, startDate, endDate, page, limit] = argsToArray(arguments);
+  const missingParamsError = checkRequiredParams({ type, address });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Basescan);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Basescan)
+  if (limit > MAX_PAGE_LIMIT) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
+  }
   return handleScanRequest({
-    scanKey: SERVICE_API_KEY.Basescan,
-    baseUrl: 'https://api.basescan.org/api',
     type,
-    chain,
     address,
     startDate,
     endDate,
     page,
-    offset: limit
+    offset: limit,
+    apiKey: API_KEY,
+    functionName: 'BASE',
+    chainId: CHAIN_ID_MAP.base,
+    network: 'base'
   })
 }
 async function GNOSIS() {
-  const [type, chain, address, startDate, endDate, page, limit] = argsToArray(arguments);
+  const [type, address, startDate, endDate, page, limit] = argsToArray(arguments);
+  const missingParamsError = checkRequiredParams({ type, address });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Gnosisscan);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Gnosisscan)
+  if (limit > MAX_PAGE_LIMIT) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
+  }
   return handleScanRequest({
-    scanKey: SERVICE_API_KEY.Gnosisscan,
-    baseUrl: 'https://api.gnosisscan.io/api',
     type,
-    chain,
+    network: 'gnosis',
     address,
     startDate,
     endDate,
     page,
-    offset: limit
+    apiKey: API_KEY,
+    offset: limit,
+    chainId: CHAIN_ID_MAP.gnosis,
+    functionName: 'GNOSIS'
   })
 }
 
 async function NEYNAR() {
   const [username] = argsToArray(arguments);
-  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Neynar);
-  if (!API_KEY) return `${SERVICE_API_KEY.Neynar}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
+  const missingParamsError = checkRequiredParams({ username });
 
-  if (!username) {
-    return `${SERVICE_API_KEY.Neynar}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+  if (missingParamsError) {
+    return missingParamsError
   }
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Neynar);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Neynar)
 
-  const fid = await fromUsernameToFid(username, API_KEY);
+  const fid = await fromUsernameToFid$1.fromUsernameToFid(username, API_KEY);
 
   if (!fid) {
-    return `${SERVICE_API_KEY.Neynar}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { username })
   }
 
   const url = `https://api.neynar.com/v2/farcaster/followers?fid=${fid}`;
@@ -13609,7 +13817,9 @@ async function NEYNAR() {
         'x-neynar-experimental': 'false'
       }
     });
-    if (!response.ok) throw new Error(`HTTP ${response.status}`)
+    if (!response.ok) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, response.status)
+    }
     const json = await response.json();
     if (!json?.users?.length) return []
 
@@ -13621,83 +13831,108 @@ async function NEYNAR() {
       city: user.profile?.location?.address?.city || ''
     }))
   } catch (err) {
-    console.error('NEYNAR_FETCH_FOLLOWERS error:', err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
-  }
-}
-async function GNOSISPAY({ cardId, startDate, endDate, limit = 20, offset = 0 }) {
-  const apiKeyKey = SERVICE_API_KEY.GnosisPay;
-  const API_KEY = window.localStorage.getItem(apiKeyKey);
-  if (!API_KEY) return `${apiKeyKey}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
-  if (!cardId) return `${apiKeyKey}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
-  if (limit > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
-  }
-
-  const url = new URL(`https://api.gnosispay.com/cards/${cardId}/transactions`);
-  url.searchParams.set('limit', limit.toString());
-  url.searchParams.set('offset', offset.toString());
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err)
+  }
+}
+// export async function GNOSISPAY({
+//   cardId,
+//   startDate,
+//   endDate,
+//   limit = 20,
+//   offset = 0,
+// }) {
+//   const apiKeyKey = SERVICES_API_KEY.GnosisPay
+//   const API_KEY = window.localStorage.getItem(apiKeyKey);
+//   if (!API_KEY) return `${apiKeyKey}${ERROR_MESSAGES_FLAG.MISSING_KEY}`;
+//   if (!cardId) return `${apiKeyKey}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`;
+//     if(limit > MAX_PAGE_LIMIT){
+//     return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
+//   }
 
-  if (!isNaN(toTimestamp(startDate))) {
-    url.searchParams.set('startDate', new Date(startDate * 1000).toISOString());
-  }
+//   const url = new URL(`https://api.gnosispay.com/cards/${cardId}/transactions`);
+//   url.searchParams.set('limit', limit.toString());
+//   url.searchParams.set('offset', offset.toString());
 
-  if (!isNaN(toTimestamp(endDate))) {
-    url.searchParams.set('endDate', new Date(endDate * 1000).toISOString());
-  }
+//   if (!isNaN(toTimestamp(startDate))) {
+//     url.searchParams.set('startDate', new Date(startDate * 1000).toISOString());
+//   }
 
-  try {
-    const res = await fetch(url.toString(), {
-      headers: {
-        Authorization: `Bearer ${API_KEY}`,
-        'Content-Type': 'application/json'
-      }
-    });
+//   if (!isNaN(toTimestamp(endDate))) {
+//     url.searchParams.set('endDate', new Date(endDate * 1000).toISOString());
+//   }
 
-    if (!res.ok) throw new Error(`HTTP error! Status: ${res.status}`)
+//   try {
+//     const res = await fetch(url.toString(), {
+//       headers: {
+//         Authorization: `Bearer ${API_KEY}`,
+//         'Content-Type': 'application/json',
+//       },
+//     });
+
+//     if (!res.ok) throw new Error(`HTTP error! Status: ${res.status}`);
+
+//     const json = await res.json();
+
+//     if (!Array.isArray(json)) return [];
+
+//     return json.map(tx => ({
+//       createdAt: tx.createdAt,
+//       clearedAt: tx.clearedAt,
+//       country: tx.country,
+//       merchant: tx.merchant,
+//       billingAmount: tx.billingAmount,
+//       billingCurrency: tx.billingCurrency,
+//       transactionAmount: tx.transactionAmount,
+//       transactionCurrency: tx.transactionCurrency,
+//       transactionType: tx.transactionType,
+//       kind: tx.kind,
+//       status: tx.status || null,
+//       mcc: tx.mcc,
+//     }));
+//   } catch (err) {
+//     console.error('GNOSISPAY_CARD_TXNS error:', err);
+//     return ERROR_MESSAGES_FLAG.DEFAULT;
+//   }
+// }
 
-    const json = await res.json();
+async function ETHERSCAN(...args) {
+  const [type, chain, address, startDate, endDate, page, limit] = args;
+  const missingParamsError = checkRequiredParams({ type, address, chain });
 
-    if (!Array.isArray(json)) return []
-
-    return json.map((tx) => ({
-      createdAt: tx.createdAt,
-      clearedAt: tx.clearedAt,
-      country: tx.country,
-      merchant: tx.merchant,
-      billingAmount: tx.billingAmount,
-      billingCurrency: tx.billingCurrency,
-      transactionAmount: tx.transactionAmount,
-      transactionCurrency: tx.transactionCurrency,
-      transactionType: tx.transactionType,
-      kind: tx.kind,
-      status: tx.status || null,
-      mcc: tx.mcc
-    }))
-  } catch (err) {
-    console.error('GNOSISPAY_CARD_TXNS error:', err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+  if (missingParamsError) {
+    return missingParamsError
   }
-}
 
-async function ETHERSCAN(...args) {
-  const [type, chain, address, startDate, endDate, page, limit] = args;
+  const chainId = CHAIN_ID_MAP[chain];
+
+  if (!chainId?.toString()) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_CHAIN, chain)
+  }
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Etherscan)
   return handleScanRequest({
-    scanKey: SERVICE_API_KEY.Etherscan,
-    baseUrl: 'https://api.etherscan.io/v2/api',
     type,
-    chain,
     address,
     startDate,
     endDate,
     page,
-    offset: limit
+    offset: limit,
+    chainId,
+    network: chain,
+    functionName: 'ETHERSCAN',
+    apiKey: API_KEY
   })
 }
 
-async function COINGECKO(category, param1, param2) {
-  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Coingecko);
-  if (!API_KEY) return `${SERVICE_API_KEY.Coingecko}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
+async function COINGECKO() {
+  const [category, param1, param2] = argsToArray(arguments);
+  const missingParamsError = checkRequiredParams({ category, param1 });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Coingecko);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Coingecko)
 
   const headers = {
     accept: 'application/json',
@@ -13705,14 +13940,14 @@ async function COINGECKO(category, param1, param2) {
   };
 
   let url = '';
-  const lowerCategory = (category || '').toLowerCase();
+  const lowerCategory = (category || '').toLowerCase?.();
 
   switch (lowerCategory) {
     case 'price': {
       const token = param1;
       const vsCurrencies = param2;
       if (!token) {
-        return `${SERVICE_API_KEY.Coingecko}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { param1 })
       }
       url = `https://api.coingecko.com/api/v3/simple/price?vs_currencies=${vsCurrencies ? vsCurrencies : 'usd'}&symbols=${token}`;
       break
@@ -13761,7 +13996,7 @@ async function COINGECKO(category, param1, param2) {
     }
 
     default:
-      return `${SERVICE_API_KEY.Coingecko}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { category })
   }
 
   try {
@@ -13770,12 +14005,10 @@ async function COINGECKO(category, param1, param2) {
 
     if (!response.ok) {
       const message = json?.status?.error_message || '';
-      if (response.status === 429) {
-        return `${SERVICE_API_KEY.Coingecko}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`
-      }
       if (message.includes('API Key Missing')) {
-        return `${SERVICE_API_KEY.Coingecko}${ERROR_MESSAGES_FLAG.INVALID_API_KEY}`
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_API_KEY, SERVICES_API_KEY.Coingecko)
       }
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, response.status)
     }
 
     if (lowerCategory === 'price') {
@@ -13828,18 +14061,27 @@ async function COINGECKO(category, param1, param2) {
       return flat
     })
   } catch (error) {
-    console.error(error);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, error)
   }
 }
 
 async function EOA() {
-  const API_KEY = window.localStorage.getItem(SERVICE_API_KEY.Etherscan);
-  if (!API_KEY) return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
   let [addresses, category, chains, startTime, endTime, page = 1, offset = 10] = argsToArray(arguments);
+
+  const optionalParams = category === 'balance' ? {} : {startTime, endTime};
+
+  const missingParamsError = checkRequiredParams({ addresses, category, chains, ...optionalParams });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
+
   if (offset > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
   }
+
+  const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
+  if (!API_KEY) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Etherscan)
   const INPUTS = addresses
     .split(',')
     .map((a) => a.trim())
@@ -13852,21 +14094,21 @@ async function EOA() {
   // Map: finalAddress => ENS name (if applicable)
   const ADDRESS_MAP = {};
   for (const input of INPUTS) {
-    if (isAddress(input)) {
+    if (isAddress$1.isAddress(input)) {
       ADDRESS_MAP[input.toLowerCase()] = null; // it's a direct address
     } else {
       try {
-        const resolved = await fromEnsNameToAddress(input); // ENS -> address
+        const resolved = await fromEnsNameToAddress$1.fromEnsNameToAddress(input); // ENS -> address
         if (resolved) ADDRESS_MAP[resolved.toLowerCase()] = input;
       } catch {
-        return `${input}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { addresses })
       }
     }
   }
   const ADDRS = Object.keys(ADDRESS_MAP);
   for (const chain of CHAINS) {
     const chainId = CHAIN_ID_MAP[chain];
-    if (!chainId) return ERROR_MESSAGES_FLAG.UNSUPPORTED_CHAIN
+    if (!chainId) return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_CHAIN, chain)
     if (category === 'balance') {
       for (let i = 0; i < ADDRS.length; i += 20) {
         const slice = ADDRS.slice(i, i + 20).join(',');
@@ -13875,8 +14117,8 @@ async function EOA() {
           `https://api.etherscan.io/v2/api?chainid=${chainId}` +
           `&module=account&action=${action}&address=${slice}` +
           `&page=${page}&offset=100&apikey=${API_KEY}`;
-        const data = await fetchJSON(url);
-        if (typeof data === 'string') return data
+        const data = await fetchJSON(url, 'EOA');
+        if (!Array.isArray(data)) return data
         data.forEach((tx) =>
           out.push({
             chain,
@@ -13889,16 +14131,22 @@ async function EOA() {
       continue
     }
     if (category === 'txns') {
-      const startBlock = await fromTimeStampToBlock(toTimestamp(startTime), chain, API_KEY);
-      const endBlock = await fromTimeStampToBlock(toTimestamp(endTime), chain, API_KEY);
+      const startBlock = await fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(startTime), chain, API_KEY);
+      const endBlock = await fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(endTime), chain, API_KEY);
+      if (!startBlock?.toString()) {
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { startTime })
+      }
+      if (!endBlock?.toString()) {
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { endTime })
+      }
       for (const addr of ADDRS) {
         const url =
           `https://api.etherscan.io/v2/api?chainid=${chainId}` +
           `&module=account&action=tokentx&address=${addr}` +
           `&startblock=${startBlock}&endblock=${endBlock}` +
           `&page=${page}&offset=${offset}&sort=asc&apikey=${API_KEY}`;
-        const data = await fetchJSON(url);
-        if (typeof data === 'string') return data
+        const data = await fetchJSON(url, 'EOA');
+        if (!Array.isArray(data)) return data
         data.forEach((tx) =>
           out.push({
             chain,
@@ -13910,29 +14158,35 @@ async function EOA() {
       }
       continue
     }
-    return ERROR_MESSAGES_FLAG.INVALID_CATEGORY
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { category })
   }
 
   return out
 
-  async function fetchJSON(url) {
+  async function fetchJSON(url, fnName) {
     try {
       const res = await fetch(url);
-      if (!res.ok) return `HTTP_${res.status}`
+      if (!res.ok) {
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, res.status, fnName)
+      }
 
       const json = await res.json();
 
       if (json.result?.includes?.('Invalid API Key'))
-        return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.INVALID_API_KEY}`
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_API_KEY, SERVICES_API_KEY.Etherscan, fnName)
 
       if (json.result?.includes?.('Max rate limit reached'))
-        return `${SERVICE_API_KEY.Etherscan}${ERROR_MESSAGES_FLAG.RATE_LIMIT}`
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.RATE_LIMIT, SERVICES_API_KEY.Etherscan, fnName)
 
-      if (json.status === '0' && json.message !== 'No transactions found') return ERROR_MESSAGES_FLAG.DEFAULT
+      if (json.status === '0' && json.message !== 'No transactions found')
+        return errorMessageHandler(ERROR_MESSAGES_FLAG.CUSTOM, {
+          message: 'Api Error',
+          reason: json?.result || 'json.status === "0" && json.message !== "No transactions found"'
+        }, fnName)
 
       return json.result
-    } catch {
-      return ERROR_MESSAGES_FLAG.DEFAULT
+    } catch (err) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err, fnName)
     }
   }
 }
@@ -13948,25 +14202,38 @@ async function FLVURL(token, vs_currencies) {
 async function SAFE() {
   let [address, utility, chain, limit = 10, offset = 0] = argsToArray(arguments);
 
-  if (typeof limit !== 'number' || limit < 0) return 'INVALID_LIMIT'
-  if (typeof offset !== 'number' || offset < 0) return 'INVALID_OFFSET'
-  if (utility !== 'txns') return 'UTILITY IS NOT SUPPORTED'
-  if (limit > MAX_PAGE_LIMIT) {
-    return ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT
+  const missingParamsError = checkRequiredParams({ address, utility, chain });
+
+  if (missingParamsError) {
+    return missingParamsError
   }
 
-  const apiKey = window.localStorage.getItem(SERVICE_API_KEY.Safe);
-  const chainIdentifier = SAFE_CHAIN_MAP[chain];
+  if (offset > MAX_PAGE_LIMIT) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
+  }
+
+  const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Safe);
 
-  if (!apiKey) return `${SERVICE_API_KEY.Safe}_MISSING`
-  if (!chainIdentifier) return 'CHAIN IS NOT SUPPORTED'
+  if (!apiKey) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Safe)
 
-  if (!isAddress(address)) {
-    address = await fromEnsNameToAddress(address);
+  if (typeof limit !== 'number' || limit < 0) return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { limit })
+  if (typeof offset !== 'number' || offset < 0)
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { offset })
+  if (utility !== 'txns') return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { utility })
+  if (limit > MAX_PAGE_LIMIT) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.MAX_PAGE_LIMIT)
   }
 
-  if (!address) {
-    return `${address}${ERROR_MESSAGES_FLAG.INVALID_PARAM}`
+  const chainIdentifier = SAFE_CHAIN_MAP[chain];
+
+  if (!chainIdentifier) return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_CHAIN, chain)
+
+  if (!isAddress$1.isAddress(address)) {
+    const ensName = address;
+    address = await fromEnsNameToAddress$1.fromEnsNameToAddress(address);
+    if (!address) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.ENS, ensName)
+    }
   }
 
   const url = `https://api.safe.global/tx-service/${chainIdentifier}/api/v2/safes/${address}/multisig-transactions?limit=${limit}&offset=${offset}`;
@@ -13976,23 +14243,29 @@ async function SAFE() {
         Authorization: `Bearer ${apiKey}`
       }
     });
-    if (!response.ok) throw new Error(`HTTP error! Status: ${response.status}`)
+    if (!response.ok) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, response.status)
+    }
     const json = await response.json();
     if (!Array.isArray(json.results)) {
-      return 'INVALID API RESPONSE'
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.CUSTOM, { message: 'Invalid API response' })
     }
     // remove nested structure from the response
     return json.results.map(({ confirmations, dataDecoded, ...rest }) => rest)
   } catch (e) {
-    console.log(e);
-    return 'ERROR IN FETCHING'
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, e)
   }
 }
 
 async function DEFILLAMA() {
   let [category] = argsToArray(arguments);
-  const apiKey = window.localStorage.getItem(SERVICE_API_KEY.Defillama);
-  if (!apiKey) return `${SERVICE_API_KEY.Defillama}${ERROR_MESSAGES_FLAG.MISSING_KEY}`
+  const missingParamsError = checkRequiredParams({ category });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
+  const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Defillama);
+  if (!apiKey) return errorMessageHandler(ERROR_MESSAGES_FLAG.MISSING_KEY, SERVICES_API_KEY.Defillama)
   const categoryList = ['protocols', 'yields', 'dex', 'fees'];
   const categoryMap = {
     [categoryList[0]]: 'https://api.llama.fi/protocols',
@@ -14004,9 +14277,13 @@ async function DEFILLAMA() {
   };
   let url = categoryMap[category];
 
+  if (!url) {
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.INVALID_PARAM, { category })
+  }
+
   try {
     const response = await fetch(url);
-    if (!response.ok) throw new Error(`HTTP error! Status: ${response.status}`)
+    if (!response.ok) return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, response.status)
     let json = await response.json();
     switch (category) {
       case categoryList[0]: {
@@ -14031,38 +14308,59 @@ async function DEFILLAMA() {
 
     return removeNestedStructure(Array.isArray(json) ? json : [json])
   } catch (e) {
-    console.log(e);
-    return 'ERROR IN FETCHING'
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, e)
   }
 }
 
 async function UNISWAP() {
   const [graphType, category, param1, param2] = argsToArray(arguments);
+  const missingParamsError = checkRequiredParams({ graphType, category, param1 });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
   const baseUrl = 'https://onchain-proxy.fileverse.io/third-party';
   try {
     const url = `${baseUrl}?service=uniswap&graphType=${graphType}&category=${category}&input1=${param1}&input2=${param2}`;
     const res = await fetch(url);
-    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    if (!res.ok) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, res.status)
+    }
     const json = await res.json();
-    return removeNestedStructure(json)
+    if(Array.isArray(json)){
+          return removeNestedStructure(json)
+    } else {
+    return json
+    }
+
   } catch (err) {
-    console.error('UNISWAP fetch error:', err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err)
   }
 }
 
 async function AAVE() {
   const [graphType, category, param1, param2] = argsToArray(arguments);
+  const missingParamsError = checkRequiredParams({ graphType, category, param1 });
+
+  if (missingParamsError) {
+    return missingParamsError
+  }
   const baseUrl = 'https://onchain-proxy.fileverse.io/third-party';
   try {
     const url = `${baseUrl}?service=aave&graphType=${graphType}&category=${category}&input1=${param1}&input2=${param2}`;
     const res = await fetch(url);
-    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    if (!res.ok) {
+      return errorMessageHandler(ERROR_MESSAGES_FLAG.NETWORK_ERROR, res.status)
+    }
     const json = await res.json();
-    return removeNestedStructure(json)
+    if(Array.isArray(json)){
+          return removeNestedStructure(json)
+    } else {
+    return json
+    }
+
   } catch (err) {
-    console.error('AAVE fetch error:', err);
-    return ERROR_MESSAGES_FLAG.DEFAULT
+    return errorMessageHandler(ERROR_MESSAGES_FLAG.DEFAULT, err)
   }
 }
 
@@ -14259,7 +14557,6 @@ exports.GCD = GCD;
 exports.GEOMEAN = GEOMEAN;
 exports.GESTEP = GESTEP;
 exports.GNOSIS = GNOSIS;
-exports.GNOSISPAY = GNOSISPAY;
 exports.GROWTH = GROWTH;
 exports.HARMEAN = HARMEAN;
 exports.HEX2BIN = HEX2BIN;