@fileverse-dev/formulajs 4.4.11-mod-76 → 4.4.11-mod-77

package/lib/cjs/index.cjs

@@ -13132,7 +13132,6 @@ const UTILITY = {
 };
 const MAX_PAGE_LIMIT = 250;
 
-// if data block need API key
 const SERVICES_API_KEY = {
   Etherscan: 'Etherscan',
   Coingecko: 'Coingecko',
@@ -13145,6 +13144,27 @@ const SERVICES_API_KEY = {
   Defillama: 'Defillama'
 };
 
+const fromTimeStampToBlock = async (timestamp, chain, 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);
+
+  };
+
+var fromTimestampToBlock = {
+  fromTimeStampToBlock
+};
+
+function toTimestamp(dateStr) {
+  // Expecting format: "DD/MM/YYYY"
+  const [day, month, year] = dateStr.split("/").map(Number);
+  const date = new Date(year, month - 1, day);
+  return Math.floor(date.getTime() / 1000); // Unix timestamp in seconds
+}
+
 class ValidationError extends Error {
   constructor(message) {
     super(message);
@@ -13189,139 +13209,6 @@ class InvalidApiKeyError extends Error {
   }
 }
 
-const stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
-const productionFileverseProxyUrl = `${process.env.NEXT_PUBLIC_PROXY_BASE_URL}/proxy`;
-// Proxy map configuration
-const PROXY_MAP = {
-    Etherscan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['apikey']
-    },
-    Basescan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['apikey']
-    },
-    Gnosisscan: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['apikey']
-    },
-    Coingecko: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['apikey']
-    },
-    Firefly: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['apikey']
-    },
-    Neynar: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['api_key']
-    },
-    Safe: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['api_key']
-    },
-    Defillama: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['api_key']
-    },
-    GnosisPay: {
-        url: productionFileverseProxyUrl || stagingFileverseProxyUrl,
-        removeParams: ['api_key']
-    },
-    // Add more services as needed. It can be direct url instead of ENV variable
-    // ANOTHER_SERVICE: "https://another-proxy-url.com"
-};
-
-/**
- * Removes specified parameters from a URL
- * @param {string} url - The original URL
- * @param {string[]} paramsToRemove - Array of parameter names to remove
- * @returns {string} URL with specified parameters removed
- */
-function removeUrlParams(url, paramsToRemove) {
-    if (!paramsToRemove || paramsToRemove.length === 0) {
-        return url;
-    }
-
-    const urlObj = new URL(url);
-
-    paramsToRemove.forEach(param => {
-        if (urlObj.searchParams.has(param)) {
-            urlObj.searchParams.delete(param);
-        }
-    });
-
-    return urlObj.toString();
-}
-
-/**
- * Handles URL routing through proxy or direct API calls
- * @param {string} url - The original API URL
- * @param {string} serviceName - [OPTIONAL] The name of the service (e.g., 'EOA')
- * @param {object} headers - [OPTIONAL] The name of the service (e.g., 'EOA')
- * @returns {Object} Object containing URL and HEADERS for the fetch request
- */
-function getUrlAndHeaders({ url, serviceName, headers = {} }) {
-    // Check if proxy is enabled in localStorage
-    const apiKeyLS = window.localStorage.getItem(SERVICES_API_KEY[serviceName]);
-    const isProxyModeEnabledValue = apiKeyLS === 'DEFAULT_PROXY_MODE';
-
-    // Check if proxy URL exists for this service
-    const proxyConfig = PROXY_MAP[serviceName];
-
-    if (!proxyConfig && SERVICES_API_KEY[serviceName] && (!apiKeyLS || apiKeyLS === '')) {
-        throw new MissingApiKeyError(SERVICES_API_KEY[serviceName])
-    }
-
-    // If proxy mode is enabled AND proxy URL exists for this service
-    if ((isProxyModeEnabledValue || !apiKeyLS || apiKeyLS === '') && proxyConfig) {
-        // Remove specified parameters from the target URL
-        const cleanedUrl = removeUrlParams(url, proxyConfig.removeParams);
-
-        return {
-            URL: proxyConfig.url,
-            HEADERS: {
-                'target-url': cleanedUrl,
-                method: 'GET',
-                'Content-Type': 'application/json'
-            }
-        };
-    }
-
-    return {
-        URL: url,
-        HEADERS: {
-            ...headers,
-        }
-    };
-}
-
-const fromTimeStampToBlock = async (timestamp, chain, apiKey) => {
-  if (!timestamp || !chain) 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 { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
-  const res = await fetch(finalUrl, {
-    method: 'GET',
-    headers: HEADERS,
-  });
-  const json = await res.json();
-  return parseInt(json.result);
-
-};
-
-var fromTimestampToBlock = {
-  fromTimeStampToBlock
-};
-
-function toTimestamp(dateStr) {
-  // Expecting format: "DD/MM/YYYY"
-  const [day, month, year] = dateStr.split("/").map(Number);
-  const date = new Date(year, month - 1, day);
-  return Math.floor(date.getTime() / 1000); // Unix timestamp in seconds
-}
-
 const isAddress = (input) => {
         return (/^0x[a-fA-F0-9]{40}$/.test(input)) 
 };
@@ -13362,9 +13249,16 @@ async function fromEnsNameToAddress(name) {
     return null
   }
 }
+const validateAndGetAddress = async (address) => {
+if(isAddress$1.isAddress(address)) return address
+
+const resolvedAddress = await fromEnsNameToAddress(address);
+if(resolvedAddress) return resolvedAddress
+throw new ValidationError("Invalid address")
+};
 
 var fromEnsNameToAddress$1 = {
-  fromEnsNameToAddress
+  validateAndGetAddress
 };
 
 async function handleScanRequest({
@@ -13385,12 +13279,8 @@ async function handleScanRequest({
     GNOSIS: { url: 'https://api.gnosisscan.io/api', apiKeyName: SERVICES_API_KEY.Gnosisscan }
   };
 
-  if (!isAddress$1.isAddress(address) && type !== 'gas') {
-    const ensName = address;
-    address = await fromEnsNameToAddress$1.fromEnsNameToAddress(address);
-    if (!address) {
-      throw new EnsError(ensName)
-    }
+  if (type !== 'gas') {
+    address = await fromEnsNameToAddress$1.validateAndGetAddress(address);
   }
 
   const apiInfo = API_INFO_MAP[functionName];
@@ -13423,11 +13313,7 @@ async function handleScanRequest({
     }
     url += `&page=${page}&offset=${offset}`;
   }
-    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({url, serviceName: apiInfo.apiKeyName, headers: {}});
-    const res = await fetch(finalUrl, {
-        method: 'GET',
-        headers: HEADERS,
-      });
+    const res = await fetch(url);
     if (!res.ok) {
       throw new NetworkError(apiInfo.apiKeyName, res.status)
     }
@@ -13446,19 +13332,14 @@ async function handleScanRequest({
 }
 
 const fromUsernameToFid = async (username, apiKey) => {
-  if (!username) return null
+  if(!username) return null
   const url = `https://api.neynar.com/v2/farcaster/user/search/?q=${username}&limit=5`;
-  const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
-    url, serviceName: 'Neynar', headers: {
+  const res = await fetch(url, {
+    headers: {
       'x-api-key': apiKey,
       'x-neynar-experimental': 'false'
     }
   });
-
-  const res = await fetch(finalUrl, {
-    method: 'GET',
-    headers: HEADERS,
-  });
   const json = await res.json();
   const users = json.result ? json.result.users : [];
   const user = users.find(user => user.username === username);
@@ -17698,9 +17579,9 @@ const aaveParamsSchema = objectType({
 
 async function FIREFLY() {
   try {
-    const [platform, contentType, identifier, start = 0, end = 10] = argsToArray(arguments);
+  const [platform, contentType, identifier, start = 0, end = 10] = argsToArray(arguments);
 
-    validateParams(fireflyParamsSchema, {
+validateParams(fireflyParamsSchema, {
       platform,
       contentType,
       identifier,
@@ -17709,6 +17590,9 @@ async function FIREFLY() {
     });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
+    if (!apiKey) {
+      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
+    }
 
     const url = new URL('https://openapi.firefly.land/v1/fileverse/fetch');
     url.searchParams
@@ -17719,14 +17603,12 @@ async function FIREFLY() {
           .filter(Boolean)
           .join(',')
       );
-    url.searchParams.set('type', fireFlyPlaformType[platform][contentType]);
-    url.searchParams.set('start', String(start));
-    url.searchParams.set('end', String(end));
+      url.searchParams.set('type',  fireFlyPlaformType[platform][contentType]);
+          url.searchParams.set('start', String(start));
+          url.searchParams.set('end',   String(end));
 
-    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url: url.toString(), serviceName: 'Firefly', headers: { 'x-api-key': apiKey } });
-    const response = await fetch(finalUrl, {
-      method: 'GET',
-      headers: HEADERS,
+    const response = await fetch(url.toString(), {
+      headers: { 'x-api-key': apiKey }
     });
     if (!response.ok) {
       throw new NetworkError(SERVICES_API_KEY.Firefly, response.status)
@@ -17768,6 +17650,9 @@ async function LENS() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Firefly
     );
+    if (!apiKey) {
+      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
+    }
 
     const url = new URL(
       'https://openapi.firefly.land/v1/fileverse/fetch'
@@ -17781,18 +17666,15 @@ async function LENS() {
         .join(',')
     );
     const typeMap = {
-      posts: 'lensid',
+      posts:   'lensid',
       replies: 'lenspostid',
     };
     url.searchParams.set('type', typeMap[contentType]);
     url.searchParams.set('start', String(start));
-    url.searchParams.set('end', String(end));
-
-    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url: url.toString(), serviceName: 'Firefly', headers: { 'x-api-key': apiKey } });
+    url.searchParams.set('end',   String(end));
 
-    const response = await fetch(finalUrl, {
-      method: 'GET',
-      headers: HEADERS,
+    const response = await fetch(url.toString(), {
+      headers: { 'x-api-key': apiKey },
     });
     if (!response.ok) {
       throw new NetworkError(SERVICES_API_KEY.Firefly, response.status)
@@ -17819,7 +17701,7 @@ async function FARCASTER() {
   try {
     const [contentType, identifier, start = 0, end = 10] =
       argsToArray(arguments);
-    validateParams(farcasterParamsSchema, {
+validateParams(farcasterParamsSchema, {
       contentType,
       identifier,
       start,
@@ -17829,6 +17711,9 @@ async function FARCASTER() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Firefly
     );
+    if (!apiKey) {
+      throw new MissingApiKeyError(SERVICES_API_KEY.Firefly)
+    }
 
     const url = new URL(
       'https://openapi.firefly.land/v1/fileverse/fetch'
@@ -17842,19 +17727,16 @@ async function FARCASTER() {
         .join(',')
     );
     const typeMap = {
-      posts: 'farcasterid',
-      replies: 'farcasterpostid',
-      channels: 'farcasterchannels',
-    };
+  posts:    'farcasterid',
+  replies:  'farcasterpostid',
+  channels: 'farcasterchannels',
+};
     url.searchParams.set('type', typeMap[contentType]);
     url.searchParams.set('start', String(start));
-    url.searchParams.set('end', String(end));
+    url.searchParams.set('end',   String(end));
 
-    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url: url.toString(), serviceName: 'Firefly', headers: { 'x-api-key': apiKey } });
-
-    const response = await fetch(finalUrl, {
-      method: 'GET',
-      headers: HEADERS,
+    const response = await fetch(url.toString(), {
+      headers: { 'x-api-key': apiKey },
     });
     if (!response.ok) {
       throw new NetworkError(
@@ -17908,14 +17790,7 @@ async function BLOCKSCOUT() {
       startTimestamp ?? Math.floor((Date.now() - 30 * 24 * 3600 * 1000) / 1000);
     const endTs = endTimestamp;
 
-    let resolvedAddress = address;
-    if (!isAddress$1.isAddress(resolvedAddress)) {
-      const ensName = resolvedAddress;
-      resolvedAddress = await fromEnsNameToAddress$1.fromEnsNameToAddress(ensName);
-      if (!resolvedAddress) {
-        throw new EnsError(ensName)
-      }
-    }
+    const resolvedAddress = await fromEnsNameToAddress$1.validateAndGetAddress(address);
 
     const hostname = BLOCKSCOUT_CHAINS_MAP[chain];
 
@@ -17963,11 +17838,12 @@ async function BLOCKSCOUT() {
 }
 
 async function BASE() {
-  try {
+try {
     const [type, address, startDate, endDate, page, limit] = argsToArray(arguments);
-    validateParams(baseParamsSchema, { type, address, startDate, endDate, page, limit });
+   validateParams(baseParamsSchema, { type, address, startDate, endDate, page, limit });
     const API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Basescan);
-
+    if (!API_KEY) throw new MissingApiKeyError(SERVICES_API_KEY.Basescan)
+  
     return await handleScanRequest({
       type,
       address,
@@ -17980,9 +17856,9 @@ async function BASE() {
       chainId: CHAIN_ID_MAP.base,
       network: 'base'
     })
-  } catch (error) {
-    return errorMessageHandler(error, 'BASE')
-  }
+} catch (error) {
+  return errorMessageHandler(error, 'BASE')
+}
 }
 async function GNOSIS() {
   try {
@@ -18002,6 +17878,7 @@ async function GNOSIS() {
     const apiKey = window.localStorage.getItem(
       SERVICES_API_KEY.Gnosisscan
     );
+    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Gnosisscan)
 
     return await handleScanRequest({
       type,
@@ -18022,33 +17899,27 @@ async function GNOSIS() {
 
 async function NEYNAR() {
   try {
-    const neynarParamsSchema = objectType({
-      username: stringType().nonempty()
-    });
+     const neynarParamsSchema = objectType({
+  username: stringType().nonempty()
+});
 
     const [username] = argsToArray(arguments);
 
     validateParams(neynarParamsSchema, { username });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Neynar);
+    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Neynar)
 
     const fid = await fromUsernameToFid$1.fromUsernameToFid(username, apiKey);
     if (!fid) throw new ValidationError(`Invalid username: ${username}`)
 
     const url = `https://api.neynar.com/v2/farcaster/followers?fid=${fid}`;
 
-    const { URL: finalUrl, HEADERS } = getUrlAndHeaders({
-      url: url.toString(), serviceName: 'Neynar',
-        headers: {
-          'x-api-key': apiKey,
-          'x-neynar-experimental': 'false'
-        }
-      
-    });
-
-    const response = await fetch(finalUrl, {
-      method: 'GET',
-      headers: HEADERS,
+    const response = await fetch(url, {
+      headers: {
+        'x-api-key': apiKey,
+        'x-neynar-experimental': 'false',
+      }
     });
     if (!response.ok) {
       throw new NetworkError(SERVICES_API_KEY.Neynar, response.status)
@@ -18143,6 +18014,7 @@ async function ETHERSCAN() {
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
+    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Etherscan)
 
     return await handleScanRequest({
       type,
@@ -18168,6 +18040,7 @@ async function COINGECKO() {
     validateParams(coingeckoParamsSchema, { category, param1, param2 });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Coingecko);
+    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Coingecko)
 
     const headers = {
       accept: 'application/json',
@@ -18181,28 +18054,27 @@ async function COINGECKO() {
         break
       }
       case 'market': {
-        const map = { all: '', base: 'base-ecosystem', meme: 'meme-token', aiagents: 'ai-agents', bitcoin: 'bitcoin-ecosystem', ethereum: 'ethereum-ecosystem', hyperliquid: 'hyperliquid-ecosystem', pump: 'pump-ecosystem', solana: 'solana-ecosystem' };
+        const map = { all:'', base:'base-ecosystem', meme:'meme-token', aiagents:'ai-agents', bitcoin:'bitcoin-ecosystem', ethereum:'ethereum-ecosystem', hyperliquid:'hyperliquid-ecosystem', pump:'pump-ecosystem', solana:'solana-ecosystem' };
         const _category = map[param1] || '';
         const trend = param2 ? `&price_change_percentage=${param2}` : '';
-        url = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&include_tokens=top&page=1&per_page=100${_category ? `&category=${_category}` : ''}${trend}`;
+        url = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&include_tokens=top&page=1&per_page=100${_category?`&category=${_category}`:''}${trend}`;
         break
       }
       case 'stablecoins': {
-        const _category = param1 === 'all' ? 'stablecoins' : param1;
+        const _category = param1==='all'? 'stablecoins' : param1;
         const trend = param2 ? `&price_change_percentage=${param2}` : '';
         url = `https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&category=${_category}&order=market_cap_desc&page=1&per_page=100${trend}`;
         break
       }
       case 'derivatives': {
-        url = (!param1 || param1 === 'all')
+        url = (!param1 || param1==='all')
           ? 'https://api.coingecko.com/api/v3/derivatives'
           : `https://api.coingecko.com/api/v3/derivatives/exchanges/${param1}?include_tickers=all`;
         break
       }
     }
-    const {URL: finalUrl, HEADERS} = getUrlAndHeaders({url, serviceName: 'Coingecko', headers});
 
-    const res = await fetch(finalUrl, { headers: HEADERS });
+    const res = await fetch(url, { headers });
     const json = await res.json();
     if (!res.ok) {
       const msg = json?.status?.error_message || '';
@@ -18210,17 +18082,17 @@ async function COINGECKO() {
       throw new NetworkError(SERVICES_API_KEY.Coingecko, res.status)
     }
 
-    if (category === 'price') {
+    if (category==='price') {
       const out = {};
       for (const [token, prices] of Object.entries(json))
-        for (const [cur, val] of Object.entries(prices))
-          out[`${token.charAt(0).toUpperCase() + token.slice(1)}_${cur.toUpperCase()}`] = val;
+        for (const [cur,val] of Object.entries(prices))
+          out[`${token.charAt(0).toUpperCase()+token.slice(1)}_${cur.toUpperCase()}`]=val;
       return [out]
     }
 
     const data = Array.isArray(json) ? json : [json];
-    return data.map(item => {
-      const flat = {};
+    return data.map(item=>{
+      const flat={};
       for (const [key, value] of Object.entries(item)) {
         if (typeof value !== 'object' || value === null) {
           flat[key] = value;
@@ -18228,8 +18100,8 @@ async function COINGECKO() {
       }
       return flat
     })
-  } catch (err) {
-    return errorMessageHandler(err, 'COINGECKO')
+  } catch(err) {
+    return errorMessageHandler(err,'COINGECKO')
   }
 }
 
@@ -18240,30 +18112,25 @@ async function EOA() {
     validateParams(eoaParamsSchema, { addresses, category, chains, startTime, endTime, page, offset });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
+    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Etherscan)
 
-    const INPUTS = addresses.split(',').map(s => s.trim()).filter(Boolean);
-    const CHAINS = chains.split(',').map(s => s.trim()).filter(Boolean);
+    const INPUTS = addresses.split(',').map(s=>s.trim()).filter(Boolean);
+    const CHAINS = chains.split(',').map(s=>s.trim()).filter(Boolean);
 
     const ADDRESS_MAP = {};
     for (const inp of INPUTS) {
       if (isAddress$1.isAddress(inp)) {
         ADDRESS_MAP[inp.toLowerCase()] = null;
       } else {
-        const ens = inp;
-        const resolved = await fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
-        if (!resolved) throw new EnsError(ens)
-        ADDRESS_MAP[resolved.toLowerCase()] = ens;
+      const _address = await fromEnsNameToAddress$1.validateAndGetAddress(inp);
+        ADDRESS_MAP[_address.toLowerCase()] = _address;
       }
     }
     const ADDRS = Object.keys(ADDRESS_MAP);
     const out = [];
 
     async function fetchJSON(url) {
-      const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: {} });
-      const res = await fetch(finalUrl, {
-        method: 'GET',
-        headers: HEADERS,
-      });
+      const res = await fetch(url);
       if (!res.ok) throw new NetworkError(SERVICES_API_KEY.Etherscan, res.status)
       const json = await res.json();
 
@@ -18281,15 +18148,15 @@ async function EOA() {
 
       if (category === 'balance') {
         // chunk 20
-        for (let i = 0; i < ADDRS.length; i += 20) {
-          const slice = ADDRS.slice(i, i + 20).join(',');
+        for (let i=0; i<ADDRS.length; i+=20) {
+          const slice = ADDRS.slice(i,i+20).join(',');
           const url =
-            `https://api.etherscan.io/v2/api?chainid=${chainId}` +
-            `&module=account&action=addresstokenbalance&address=${slice}` +
+            `https://api.etherscan.io/v2/api?chainid=${chainId}`+
+            `&module=account&action=addresstokenbalance&address=${slice}`+
             `&page=${page}&offset=${offset}&apikey=${apiKey}`;
           const data = await fetchJSON(url);
           if (!Array.isArray(data)) return data
-          data.forEach((item, idx) => out.push({ chain, address: ADDRS[i + idx], name: ADDRESS_MAP[ADDRS[i + idx]], ...item }));
+          data.forEach((item, idx) => out.push({ chain, address: ADDRS[i+idx], name: ADDRESS_MAP[ADDRS[i+idx]], ...item }));
         }
       } else {
         // txns
@@ -18299,9 +18166,9 @@ async function EOA() {
         if (!eb) throw new ValidationError(`Invalid endTime: ${endTime}`)
         for (const addr of ADDRS) {
           const url =
-            `https://api.etherscan.io/v2/api?chainid=${chainId}` +
-            `&module=account&action=tokentx&address=${addr}` +
-            `&startblock=${sb}&endblock=${eb}` +
+            `https://api.etherscan.io/v2/api?chainid=${chainId}`+
+            `&module=account&action=tokentx&address=${addr}`+
+            `&startblock=${sb}&endblock=${eb}`+
             `&page=${page}&offset=${offset}&sort=asc&apikey=${apiKey}`;
           const data = await fetchJSON(url);
           if (!Array.isArray(data)) return data
@@ -18330,22 +18197,21 @@ async function SAFE() {
     validateParams(safeParamsSchema, { address, utility, chain, limit, offset });
 
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Safe);
+    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Safe)
 
     const chainId = SAFE_CHAIN_MAP[chain];
     if (!chainId) throw new ValidationError(`Invalid chain: ${chain}`)
 
-    let resolved = address;
-    if (!isAddress$1.isAddress(resolved)) {
-      const ens = resolved;
-      resolved = await fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
-      if (!resolved) throw new EnsError(ens)
-    }
+
+    
+
+    const resolved = await fromEnsNameToAddress$1.validateAndGetAddress(address);
 
 
     const url = `https://api.safe.global/tx-service/${chainId}/api/v2/safes/${resolved}/multisig-transactions?limit=${limit}&offset=${offset}`;
 
-      const { URL: finalUrl, HEADERS } = getUrlAndHeaders({ url, serviceName: 'Etherscan', headers: { Authorization: `Bearer ${apiKey}` } });
-    const res = await fetch(finalUrl, { headers: HEADERS });
+
+    const res = await fetch(url, { headers: { Authorization: `Bearer ${apiKey}` } });
     if (!res.ok) throw new NetworkError(SERVICES_API_KEY.Safe, res.status)
     const json = await res.json();
 
@@ -18366,6 +18232,7 @@ async function DEFILLAMA() {
     const [category] = argsToArray(arguments);
     validateParams(defillamaParamsSchema, { category });
     const apiKey = window.localStorage.getItem(SERVICES_API_KEY.Defillama);
+    if (!apiKey) throw new MissingApiKeyError(SERVICES_API_KEY.Defillama)
     const url = CATEGORY_URLS[category];
     if (!url) throw new ValidationError(`Invalid category: ${category}`)
     const res = await fetch(url);
@@ -18374,20 +18241,20 @@ async function DEFILLAMA() {
 
     switch (category) {
       case 'protocols':
-        json = Array.isArray(json) ? json.slice(0, 500) : [];
+        json = Array.isArray(json) ? json.slice(0,500) : [];
         break
       case 'yields':
-        json = Array.isArray(json.data) ? json.data.slice(0, 500) : [];
+        json = Array.isArray(json.data) ? json.data.slice(0,500) : [];
         break
       case 'dex':
       case 'fees':
-        json = Array.isArray(json.protocols) ? json.protocols.slice(0, 500) : [];
+        json = Array.isArray(json.protocols) ? json.protocols.slice(0,500) : [];
         break
     }
 
     return (Array.isArray(json) ? json : [json]).map(item => {
       const out = {};
-      for (const [k, v] of Object.entries(item)) {
+      for (const [k,v] of Object.entries(item)) {
         if (v === null || typeof v !== 'object') out[k] = v;
       }
       return out
@@ -18423,7 +18290,7 @@ async function UNISWAP() {
       // flatten nested
       return json.map(item => {
         const flat = {};
-        Object.entries(item).forEach(([k, v]) => {
+        Object.entries(item).forEach(([k,v]) => {
           if (v === null || typeof v !== 'object') flat[k] = v;
         });
         return flat