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

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.11-mod-75 */
+/* @fileverse-dev/formulajs v4.4.11-mod-77 */
 var _excluded = [ "confirmations", "dataDecoded" ];
 
 function _objectWithoutProperties(e, t) {
@@ -21,6 +21,38 @@ function _objectWithoutPropertiesLoose(r, e) {
   return t;
 }
 
+function ownKeys(e, r) {
+  var t = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter((function(r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    }))), t.push.apply(t, o);
+  }
+  return t;
+}
+
+function _objectSpread(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach((function(r) {
+      _defineProperty(e, r, t[r]);
+    })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach((function(r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+    }));
+  }
+  return e;
+}
+
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
+}
+
 function _createForOfIteratorHelper(r, e) {
   var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (!t) {
@@ -67,6 +99,128 @@ function _createForOfIteratorHelper(r, e) {
   };
 }
 
+function _defineProperties(e, r) {
+  for (var t = 0; t < r.length; t++) {
+    var o = r[t];
+    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), 
+    Object.defineProperty(e, _toPropertyKey(o.key), o);
+  }
+}
+
+function _createClass(e, r, t) {
+  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+    writable: !1
+  }), e;
+}
+
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == _typeof(i) ? i : i + "";
+}
+
+function _toPrimitive(t, r) {
+  if ("object" != _typeof(t) || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != _typeof(i)) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+
+function _classCallCheck(a, n) {
+  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+}
+
+function _callSuper(t, o, e) {
+  return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
+}
+
+function _possibleConstructorReturn(t, e) {
+  if (e && ("object" == _typeof(e) || "function" == typeof e)) return e;
+  if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+  return _assertThisInitialized(t);
+}
+
+function _assertThisInitialized(e) {
+  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  return e;
+}
+
+function _inherits(t, e) {
+  if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+  t.prototype = Object.create(e && e.prototype, {
+    constructor: {
+      value: t,
+      writable: !0,
+      configurable: !0
+    }
+  }), Object.defineProperty(t, "prototype", {
+    writable: !1
+  }), e && _setPrototypeOf(t, e);
+}
+
+function _wrapNativeSuper(t) {
+  var r = "function" == typeof Map ? new Map : void 0;
+  return _wrapNativeSuper = function _wrapNativeSuper(t) {
+    if (null === t || !_isNativeFunction(t)) return t;
+    if ("function" != typeof t) throw new TypeError("Super expression must either be null or a function");
+    if (void 0 !== r) {
+      if (r.has(t)) return r.get(t);
+      r.set(t, Wrapper);
+    }
+    function Wrapper() {
+      return _construct(t, arguments, _getPrototypeOf(this).constructor);
+    }
+    return Wrapper.prototype = Object.create(t.prototype, {
+      constructor: {
+        value: Wrapper,
+        enumerable: !1,
+        writable: !0,
+        configurable: !0
+      }
+    }), _setPrototypeOf(Wrapper, t);
+  }, _wrapNativeSuper(t);
+}
+
+function _construct(t, e, r) {
+  if (_isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments);
+  var o = [ null ];
+  o.push.apply(o, e);
+  var p = new (t.bind.apply(t, o));
+  return r && _setPrototypeOf(p, r.prototype), p;
+}
+
+function _isNativeReflectConstruct() {
+  try {
+    var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], (function() {})));
+  } catch (t) {}
+  return (_isNativeReflectConstruct = function _isNativeReflectConstruct() {
+    return !!t;
+  })();
+}
+
+function _isNativeFunction(t) {
+  try {
+    return -1 !== Function.toString.call(t).indexOf("[native code]");
+  } catch (n) {
+    return "function" == typeof t;
+  }
+}
+
+function _setPrototypeOf(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function(t, e) {
+    return t.__proto__ = e, t;
+  }, _setPrototypeOf(t, e);
+}
+
+function _getPrototypeOf(t) {
+  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function(t) {
+    return t.__proto__ || Object.getPrototypeOf(t);
+  }, _getPrototypeOf(t);
+}
+
 function _regeneratorRuntime() {
   "use strict";
  /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */  _regeneratorRuntime = function _regeneratorRuntime() {
@@ -357,160 +511,6 @@ function _asyncToGenerator(n) {
   };
 }
 
-function ownKeys(e, r) {
-  var t = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var o = Object.getOwnPropertySymbols(e);
-    r && (o = o.filter((function(r) {
-      return Object.getOwnPropertyDescriptor(e, r).enumerable;
-    }))), t.push.apply(t, o);
-  }
-  return t;
-}
-
-function _objectSpread(e) {
-  for (var r = 1; r < arguments.length; r++) {
-    var t = null != arguments[r] ? arguments[r] : {};
-    r % 2 ? ownKeys(Object(t), !0).forEach((function(r) {
-      _defineProperty(e, r, t[r]);
-    })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach((function(r) {
-      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
-    }));
-  }
-  return e;
-}
-
-function _defineProperty(e, r, t) {
-  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
-    value: t,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : e[r] = t, e;
-}
-
-function _defineProperties(e, r) {
-  for (var t = 0; t < r.length; t++) {
-    var o = r[t];
-    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), 
-    Object.defineProperty(e, _toPropertyKey(o.key), o);
-  }
-}
-
-function _createClass(e, r, t) {
-  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
-    writable: !1
-  }), e;
-}
-
-function _toPropertyKey(t) {
-  var i = _toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : i + "";
-}
-
-function _toPrimitive(t, r) {
-  if ("object" != _typeof(t) || !t) return t;
-  var e = t[Symbol.toPrimitive];
-  if (void 0 !== e) {
-    var i = e.call(t, r || "default");
-    if ("object" != _typeof(i)) return i;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return ("string" === r ? String : Number)(t);
-}
-
-function _classCallCheck(a, n) {
-  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
-}
-
-function _callSuper(t, o, e) {
-  return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
-}
-
-function _possibleConstructorReturn(t, e) {
-  if (e && ("object" == _typeof(e) || "function" == typeof e)) return e;
-  if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
-  return _assertThisInitialized(t);
-}
-
-function _assertThisInitialized(e) {
-  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  return e;
-}
-
-function _inherits(t, e) {
-  if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
-  t.prototype = Object.create(e && e.prototype, {
-    constructor: {
-      value: t,
-      writable: !0,
-      configurable: !0
-    }
-  }), Object.defineProperty(t, "prototype", {
-    writable: !1
-  }), e && _setPrototypeOf(t, e);
-}
-
-function _wrapNativeSuper(t) {
-  var r = "function" == typeof Map ? new Map : void 0;
-  return _wrapNativeSuper = function _wrapNativeSuper(t) {
-    if (null === t || !_isNativeFunction(t)) return t;
-    if ("function" != typeof t) throw new TypeError("Super expression must either be null or a function");
-    if (void 0 !== r) {
-      if (r.has(t)) return r.get(t);
-      r.set(t, Wrapper);
-    }
-    function Wrapper() {
-      return _construct(t, arguments, _getPrototypeOf(this).constructor);
-    }
-    return Wrapper.prototype = Object.create(t.prototype, {
-      constructor: {
-        value: Wrapper,
-        enumerable: !1,
-        writable: !0,
-        configurable: !0
-      }
-    }), _setPrototypeOf(Wrapper, t);
-  }, _wrapNativeSuper(t);
-}
-
-function _construct(t, e, r) {
-  if (_isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments);
-  var o = [ null ];
-  o.push.apply(o, e);
-  var p = new (t.bind.apply(t, o));
-  return r && _setPrototypeOf(p, r.prototype), p;
-}
-
-function _isNativeReflectConstruct() {
-  try {
-    var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], (function() {})));
-  } catch (t) {}
-  return (_isNativeReflectConstruct = function _isNativeReflectConstruct() {
-    return !!t;
-  })();
-}
-
-function _isNativeFunction(t) {
-  try {
-    return -1 !== Function.toString.call(t).indexOf("[native code]");
-  } catch (n) {
-    return "function" == typeof t;
-  }
-}
-
-function _setPrototypeOf(t, e) {
-  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function(t, e) {
-    return t.__proto__ = e, t;
-  }, _setPrototypeOf(t, e);
-}
-
-function _getPrototypeOf(t) {
-  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function(t) {
-    return t.__proto__ || Object.getPrototypeOf(t);
-  }, _getPrototypeOf(t);
-}
-
 function _slicedToArray(r, e) {
   return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
@@ -11068,6 +11068,51 @@ function _typeof(o) {
     Neynar: "Neynar",
     Defillama: "Defillama"
   };
+  var fromTimeStampToBlock = function() {
+    var _ref = _asyncToGenerator(_regeneratorRuntime().mark((function _callee(timestamp, chain, apiKey) {
+      var chainId, url, res, json;
+      return _regeneratorRuntime().wrap((function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+         case 0:
+          if (!(!timestamp || !chain || !apiKey)) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return");
+
+         case 2:
+          chainId = CHAIN_ID_MAP[chain];
+          url = "https://api.etherscan.io/v2/api?module=block&action=getblocknobytime&timestamp=".concat(timestamp, "&closest=before&apikey=").concat(apiKey, "&chainId=").concat(chainId);
+          _context.next = 6;
+          return fetch(url);
+
+         case 6:
+          res = _context.sent;
+          _context.next = 9;
+          return res.json();
+
+         case 9:
+          json = _context.sent;
+          return _context.abrupt("return", parseInt(json.result));
+
+         case 11:
+         case "end":
+          return _context.stop();
+        }
+      }), _callee);
+    })));
+    return function fromTimeStampToBlock(_x2, _x3, _x4) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var fromTimestampToBlock = {
+    fromTimeStampToBlock: fromTimeStampToBlock
+  };
+  function toTimestamp(dateStr) {
+    var _dateStr$split$map = dateStr.split("/").map(Number), _dateStr$split$map2 = _slicedToArray(_dateStr$split$map, 3), day = _dateStr$split$map2[0], month = _dateStr$split$map2[1], year = _dateStr$split$map2[2];
+    var date = new Date(year, month - 1, day);
+    return Math.floor(date.getTime() / 1e3);
+  }
   var ValidationError = function(_Error) {
     function ValidationError(message) {
       _classCallCheck(this, ValidationError);
@@ -11114,147 +11159,18 @@ function _typeof(o) {
     }
     _inherits(EnsError, _Error5);
     return _createClass(EnsError);
-  }(_wrapNativeSuper(Error));
-  var InvalidApiKeyError = function(_Error6) {
-    function InvalidApiKeyError(apiKeyName) {
-      var _this3;
-      _classCallCheck(this, InvalidApiKeyError);
-      _this3 = _callSuper(this, InvalidApiKeyError, [ "Api key is invalid for ".concat(apiKeyName) ]);
-      _this3.api = apiKeyName;
-      return _this3;
-    }
-    _inherits(InvalidApiKeyError, _Error6);
-    return _createClass(InvalidApiKeyError);
-  }(_wrapNativeSuper(Error));
-  var stagingFileverseProxyUrl = "https://staging-api-proxy-ca4268d7d581.herokuapp.com/proxy";
-  var productionFileverseProxyUrl = "".concat(process.env.NEXT_PUBLIC_PROXY_BASE_URL, "/proxy");
-  var 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" ]
-    }
-  };
-  function removeUrlParams(url, paramsToRemove) {
-    if (!paramsToRemove || paramsToRemove.length === 0) {
-      return url;
-    }
-    var urlObj = new URL(url);
-    paramsToRemove.forEach((function(param) {
-      if (urlObj.searchParams.has(param)) {
-        urlObj.searchParams["delete"](param);
-      }
-    }));
-    return urlObj.toString();
-  }
-  function getUrlAndHeaders(_ref) {
-    var url = _ref.url, serviceName = _ref.serviceName, _ref$headers = _ref.headers, headers = _ref$headers === void 0 ? {} : _ref$headers;
-    var apiKeyLS = window.localStorage.getItem(SERVICES_API_KEY[serviceName]);
-    var isProxyModeEnabledValue = apiKeyLS === "DEFAULT_PROXY_MODE";
-    var proxyConfig = PROXY_MAP[serviceName];
-    if (!proxyConfig && SERVICES_API_KEY[serviceName] && (!apiKeyLS || apiKeyLS === "")) {
-      throw new MissingApiKeyError(SERVICES_API_KEY[serviceName]);
-    }
-    if ((isProxyModeEnabledValue || !apiKeyLS || apiKeyLS === "") && proxyConfig) {
-      var cleanedUrl = removeUrlParams(url, proxyConfig.removeParams);
-      return {
-        URL: proxyConfig.url,
-        HEADERS: {
-          "target-url": cleanedUrl,
-          method: "GET",
-          "Content-Type": "application/json"
-        }
-      };
-    }
-    return {
-      URL: url,
-      HEADERS: _objectSpread({}, headers)
-    };
-  }
-  var fromTimeStampToBlock = function() {
-    var _ref2 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee(timestamp, chain, apiKey) {
-      var chainId, url, _getUrlAndHeaders, finalUrl, HEADERS, res, json;
-      return _regeneratorRuntime().wrap((function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-         case 0:
-          if (!(!timestamp || !chain || !apiKey)) {
-            _context.next = 2;
-            break;
-          }
-          return _context.abrupt("return");
-
-         case 2:
-          chainId = CHAIN_ID_MAP[chain];
-          url = "https://api.etherscan.io/v2/api?module=block&action=getblocknobytime&timestamp=".concat(timestamp, "&closest=before&apikey=").concat(apiKey, "&chainId=").concat(chainId);
-          _getUrlAndHeaders = getUrlAndHeaders({
-            url: url,
-            serviceName: "Etherscan",
-            headers: {}
-          }), finalUrl = _getUrlAndHeaders.URL, HEADERS = _getUrlAndHeaders.HEADERS;
-          _context.next = 7;
-          return fetch(finalUrl, {
-            method: "GET",
-            headers: HEADERS
-          });
-
-         case 7:
-          res = _context.sent;
-          _context.next = 10;
-          return res.json();
-
-         case 10:
-          json = _context.sent;
-          return _context.abrupt("return", parseInt(json.result));
-
-         case 12:
-         case "end":
-          return _context.stop();
-        }
-      }), _callee);
-    })));
-    return function fromTimeStampToBlock(_x2, _x3, _x4) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  var fromTimestampToBlock = {
-    fromTimeStampToBlock: fromTimeStampToBlock
-  };
-  function toTimestamp(dateStr) {
-    var _dateStr$split$map = dateStr.split("/").map(Number), _dateStr$split$map2 = _slicedToArray(_dateStr$split$map, 3), day = _dateStr$split$map2[0], month = _dateStr$split$map2[1], year = _dateStr$split$map2[2];
-    var date = new Date(year, month - 1, day);
-    return Math.floor(date.getTime() / 1e3);
-  }
+  }(_wrapNativeSuper(Error));
+  var InvalidApiKeyError = function(_Error6) {
+    function InvalidApiKeyError(apiKeyName) {
+      var _this3;
+      _classCallCheck(this, InvalidApiKeyError);
+      _this3 = _callSuper(this, InvalidApiKeyError, [ "Api key is invalid for ".concat(apiKeyName) ]);
+      _this3.api = apiKeyName;
+      return _this3;
+    }
+    _inherits(InvalidApiKeyError, _Error6);
+    return _createClass(InvalidApiKeyError);
+  }(_wrapNativeSuper(Error));
   var isAddress = function isAddress(input) {
     return /^0x[a-fA-F0-9]{40}$/.test(input);
   };
@@ -11265,16 +11181,16 @@ function _typeof(o) {
     return _fromEnsNameToAddress.apply(this, arguments);
   }
   function _fromEnsNameToAddress() {
-    _fromEnsNameToAddress = _asyncToGenerator(_regeneratorRuntime().mark((function _callee1(name) {
+    _fromEnsNameToAddress = _asyncToGenerator(_regeneratorRuntime().mark((function _callee10(name) {
       var ALCHEMY_KEY, provider, resolved;
-      return _regeneratorRuntime().wrap((function _callee1$(_context1) {
-        while (1) switch (_context1.prev = _context1.next) {
+      return _regeneratorRuntime().wrap((function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
          case 0:
           if (!(typeof ethers === "undefined")) {
-            _context1.next = 3;
+            _context10.next = 3;
             break;
           }
-          _context1.next = 3;
+          _context10.next = 3;
           return new Promise((function(resolve, reject) {
             var script = document.createElement("script");
             script.src = "https://cdn.jsdelivr.net/npm/ethers@6.10.0/dist/ethers.umd.min.js";
@@ -11286,47 +11202,84 @@ function _typeof(o) {
          case 3:
           ALCHEMY_KEY = window.localStorage.getItem(UTILITY.ALCHEMY_API_KEY);
           if (ALCHEMY_KEY) {
-            _context1.next = 7;
+            _context10.next = 7;
             break;
           }
           console.error("alchemy api key missing");
-          return _context1.abrupt("return", null);
+          return _context10.abrupt("return", null);
 
          case 7:
           provider = new ethers.AlchemyProvider("mainnet", ALCHEMY_KEY);
-          _context1.prev = 8;
-          _context1.next = 11;
+          _context10.prev = 8;
+          _context10.next = 11;
           return provider.resolveName(name);
 
          case 11:
-          resolved = _context1.sent;
-          return _context1.abrupt("return", resolved || null);
+          resolved = _context10.sent;
+          return _context10.abrupt("return", resolved || null);
 
          case 15:
-          _context1.prev = 15;
-          _context1.t0 = _context1["catch"](8);
-          console.error("ENS resolution failed:", _context1.t0.message);
-          return _context1.abrupt("return", null);
+          _context10.prev = 15;
+          _context10.t0 = _context10["catch"](8);
+          console.error("ENS resolution failed:", _context10.t0.message);
+          return _context10.abrupt("return", null);
 
          case 19:
          case "end":
-          return _context1.stop();
+          return _context10.stop();
         }
-      }), _callee1, null, [ [ 8, 15 ] ]);
+      }), _callee10, null, [ [ 8, 15 ] ]);
     })));
     return _fromEnsNameToAddress.apply(this, arguments);
   }
+  var validateAndGetAddress = function() {
+    var _ref2 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee2(address) {
+      var resolvedAddress;
+      return _regeneratorRuntime().wrap((function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+         case 0:
+          if (!isAddress$1.isAddress(address)) {
+            _context2.next = 2;
+            break;
+          }
+          return _context2.abrupt("return", address);
+
+         case 2:
+          _context2.next = 4;
+          return fromEnsNameToAddress(address);
+
+         case 4:
+          resolvedAddress = _context2.sent;
+          if (!resolvedAddress) {
+            _context2.next = 7;
+            break;
+          }
+          return _context2.abrupt("return", resolvedAddress);
+
+         case 7:
+          throw new ValidationError("Invalid address");
+
+         case 8:
+         case "end":
+          return _context2.stop();
+        }
+      }), _callee2);
+    })));
+    return function validateAndGetAddress(_x6) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var fromEnsNameToAddress$1 = {
-    fromEnsNameToAddress: fromEnsNameToAddress
+    validateAndGetAddress: validateAndGetAddress
   };
-  function handleScanRequest(_x6) {
+  function handleScanRequest(_x7) {
     return _handleScanRequest.apply(this, arguments);
   }
   function _handleScanRequest() {
-    _handleScanRequest = _asyncToGenerator(_regeneratorRuntime().mark((function _callee10(_ref3) {
-      var type, address, startDate, endDate, _ref3$page, page, _ref3$offset, offset, apiKey, functionName, chainId, network, API_INFO_MAP, ensName, apiInfo, baseUrl, ACTION_MAP, action, module, url, _yield$Promise$all, _yield$Promise$all2, startBlock, endBlock, _getUrlAndHeaders3, finalUrl, HEADERS, res, json;
-      return _regeneratorRuntime().wrap((function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+    _handleScanRequest = _asyncToGenerator(_regeneratorRuntime().mark((function _callee11(_ref3) {
+      var type, address, startDate, endDate, _ref3$page, page, _ref3$offset, offset, apiKey, functionName, chainId, network, API_INFO_MAP, apiInfo, baseUrl, ACTION_MAP, action, module, url, _yield$Promise$all, _yield$Promise$all2, startBlock, endBlock, res, json;
+      return _regeneratorRuntime().wrap((function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
          case 0:
           type = _ref3.type, address = _ref3.address, startDate = _ref3.startDate, endDate = _ref3.endDate, 
           _ref3$page = _ref3.page, page = _ref3$page === void 0 ? 1 : _ref3$page, _ref3$offset = _ref3.offset, 
@@ -11346,32 +11299,26 @@ function _typeof(o) {
               apiKeyName: SERVICES_API_KEY.Gnosisscan
             }
           };
-          if (!(!isAddress$1.isAddress(address) && type !== "gas")) {
-            _context10.next = 9;
+          if (!(type !== "gas")) {
+            _context11.next = 6;
             break;
           }
-          ensName = address;
-          _context10.next = 6;
-          return fromEnsNameToAddress$1.fromEnsNameToAddress(address);
+          _context11.next = 5;
+          return fromEnsNameToAddress$1.validateAndGetAddress(address);
 
-         case 6:
-          address = _context10.sent;
-          if (address) {
-            _context10.next = 9;
-            break;
-          }
-          throw new EnsError(ensName);
+         case 5:
+          address = _context11.sent;
 
-         case 9:
+         case 6:
           apiInfo = API_INFO_MAP[functionName];
           baseUrl = apiInfo === null || apiInfo === void 0 ? void 0 : apiInfo.url;
           if (baseUrl) {
-            _context10.next = 13;
+            _context11.next = 10;
             break;
           }
           throw new ValidationError("Api not found for: ".concat(functionName));
 
-         case 13:
+         case 10:
           ACTION_MAP = {
             "all-txns": "txlist",
             "token-txns": "tokentx",
@@ -11380,138 +11327,124 @@ function _typeof(o) {
           };
           action = ACTION_MAP[type];
           if (action) {
-            _context10.next = 17;
+            _context11.next = 14;
             break;
           }
           throw new ValidationError("Invalid type: ".concat(type));
 
-         case 17:
+         case 14:
           module = action === "gasoracle" ? "gastracker" : "account";
           url = "".concat(baseUrl, "?chainid=").concat(chainId, "&module=").concat(module, "&action=").concat(action, "&apikey=").concat(apiKey);
           if (![ "all-txns", "token-txns", "nft-txns" ].includes(type)) {
-            _context10.next = 30;
+            _context11.next = 27;
             break;
           }
           url += "&address=".concat(address, "&startblock=0&endblock=99999999&sort=asc");
           if (!(!isNaN(startDate) && !isNaN(endDate))) {
-            _context10.next = 29;
+            _context11.next = 26;
             break;
           }
-          _context10.next = 24;
+          _context11.next = 21;
           return Promise.all([ fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(startDate), network, apiKey), fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(endDate), network, apiKey) ]);
 
-         case 24:
-          _yield$Promise$all = _context10.sent;
+         case 21:
+          _yield$Promise$all = _context11.sent;
           _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
           startBlock = _yield$Promise$all2[0];
           endBlock = _yield$Promise$all2[1];
           url += "&startblock=".concat(startBlock || "0", "&endblock=").concat(endBlock || "99999999");
 
-         case 29:
+         case 26:
           url += "&page=".concat(page, "&offset=").concat(offset);
 
-         case 30:
-          _getUrlAndHeaders3 = getUrlAndHeaders({
-            url: url,
-            serviceName: apiInfo.apiKeyName,
-            headers: {}
-          }), finalUrl = _getUrlAndHeaders3.URL, HEADERS = _getUrlAndHeaders3.HEADERS;
-          _context10.next = 33;
-          return fetch(finalUrl, {
-            method: "GET",
-            headers: HEADERS
-          });
+         case 27:
+          _context11.next = 29;
+          return fetch(url);
 
-         case 33:
-          res = _context10.sent;
+         case 29:
+          res = _context11.sent;
           if (res.ok) {
-            _context10.next = 36;
+            _context11.next = 32;
             break;
           }
           throw new NetworkError(apiInfo.apiKeyName, res.status);
 
-         case 36:
-          _context10.next = 38;
+         case 32:
+          _context11.next = 34;
           return res.json();
 
-         case 38:
-          json = _context10.sent;
+         case 34:
+          json = _context11.sent;
           if (!(typeof json.result === "string")) {
-            _context10.next = 44;
+            _context11.next = 40;
             break;
           }
           if (!json.result.includes("Invalid API Key")) {
-            _context10.next = 42;
+            _context11.next = 38;
             break;
           }
           throw new InvalidApiKeyError(apiInfo.apiKeyName);
 
-         case 42:
+         case 38:
           if (!json.result.includes("Max rate limit reached")) {
-            _context10.next = 44;
+            _context11.next = 40;
             break;
           }
           throw new RateLimitError(apiInfo.apiKeyName);
 
-         case 44:
-          return _context10.abrupt("return", type === "gas" && !Array.isArray(json.result) ? [ json.result ] : json.result);
+         case 40:
+          return _context11.abrupt("return", type === "gas" && !Array.isArray(json.result) ? [ json.result ] : json.result);
 
-         case 45:
+         case 41:
          case "end":
-          return _context10.stop();
+          return _context11.stop();
         }
-      }), _callee10);
+      }), _callee11);
     })));
     return _handleScanRequest.apply(this, arguments);
   }
   var fromUsernameToFid = function() {
-    var _ref4 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee2(username, apiKey) {
-      var url, _getUrlAndHeaders2, finalUrl, HEADERS, res, json, users, user;
-      return _regeneratorRuntime().wrap((function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref4 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee3(username, apiKey) {
+      var url, res, json, users, user;
+      return _regeneratorRuntime().wrap((function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
          case 0:
           if (username) {
-            _context2.next = 2;
+            _context3.next = 2;
             break;
           }
-          return _context2.abrupt("return", null);
+          return _context3.abrupt("return", null);
 
          case 2:
           url = "https://api.neynar.com/v2/farcaster/user/search/?q=".concat(username, "&limit=5");
-          _getUrlAndHeaders2 = getUrlAndHeaders({
-            url: url,
-            serviceName: "Neynar",
+          _context3.next = 5;
+          return fetch(url, {
             headers: {
               "x-api-key": apiKey,
               "x-neynar-experimental": "false"
             }
-          }), finalUrl = _getUrlAndHeaders2.URL, HEADERS = _getUrlAndHeaders2.HEADERS;
-          _context2.next = 6;
-          return fetch(finalUrl, {
-            method: "GET",
-            headers: HEADERS
           });
 
-         case 6:
-          res = _context2.sent;
-          _context2.next = 9;
+         case 5:
+          res = _context3.sent;
+          _context3.next = 8;
           return res.json();
 
-         case 9:
-          json = _context2.sent;
+         case 8:
+          json = _context3.sent;
           users = json.result ? json.result.users : [];
           user = users.find((function(user) {
             return user.username === username;
           }));
-          return _context2.abrupt("return", user && user.fid || null);
+          return _context3.abrupt("return", user && user.fid || null);
 
-         case 13:
+         case 12:
          case "end":
-          return _context2.stop();
+          return _context3.stop();
         }
-      }), _callee2);
+      }), _callee3);
     })));
-    return function fromUsernameToFid(_x7, _x8) {
+    return function fromUsernameToFid(_x8, _x9) {
       return _ref4.apply(this, arguments);
     };
   }();
@@ -12072,65 +12005,65 @@ function _typeof(o) {
     }, {
       key: "mergeObjectAsync",
       value: function() {
-        var _mergeObjectAsync = _asyncToGenerator(_regeneratorRuntime().mark((function _callee3(status, pairs) {
+        var _mergeObjectAsync = _asyncToGenerator(_regeneratorRuntime().mark((function _callee4(status, pairs) {
           var syncPairs, _iterator8, _step8, pair, key, _value5;
-          return _regeneratorRuntime().wrap((function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
+          return _regeneratorRuntime().wrap((function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
              case 0:
               syncPairs = [];
               _iterator8 = _createForOfIteratorHelper(pairs);
-              _context3.prev = 2;
+              _context4.prev = 2;
               _iterator8.s();
 
              case 4:
               if ((_step8 = _iterator8.n()).done) {
-                _context3.next = 15;
+                _context4.next = 15;
                 break;
               }
               pair = _step8.value;
-              _context3.next = 8;
+              _context4.next = 8;
               return pair.key;
 
              case 8:
-              key = _context3.sent;
-              _context3.next = 11;
+              key = _context4.sent;
+              _context4.next = 11;
               return pair.value;
 
              case 11:
-              _value5 = _context3.sent;
+              _value5 = _context4.sent;
               syncPairs.push({
                 key: key,
                 value: _value5
               });
 
              case 13:
-              _context3.next = 4;
+              _context4.next = 4;
               break;
 
              case 15:
-              _context3.next = 20;
+              _context4.next = 20;
               break;
 
              case 17:
-              _context3.prev = 17;
-              _context3.t0 = _context3["catch"](2);
-              _iterator8.e(_context3.t0);
+              _context4.prev = 17;
+              _context4.t0 = _context4["catch"](2);
+              _iterator8.e(_context4.t0);
 
              case 20:
-              _context3.prev = 20;
+              _context4.prev = 20;
               _iterator8.f();
-              return _context3.finish(20);
+              return _context4.finish(20);
 
              case 23:
-              return _context3.abrupt("return", ParseStatus.mergeObjectSync(status, syncPairs));
+              return _context4.abrupt("return", ParseStatus.mergeObjectSync(status, syncPairs));
 
              case 24:
              case "end":
-              return _context3.stop();
+              return _context4.stop();
             }
-          }), _callee3, null, [ [ 2, 17, 20, 23 ] ]);
+          }), _callee4, null, [ [ 2, 17, 20, 23 ] ]);
         })));
-        function mergeObjectAsync(_x9, _x0) {
+        function mergeObjectAsync(_x0, _x1) {
           return _mergeObjectAsync.apply(this, arguments);
         }
         return mergeObjectAsync;
@@ -12456,32 +12389,32 @@ function _typeof(o) {
     }, {
       key: "parseAsync",
       value: function() {
-        var _parseAsync2 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee4(data, params) {
+        var _parseAsync2 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee5(data, params) {
           var result;
-          return _regeneratorRuntime().wrap((function _callee4$(_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
+          return _regeneratorRuntime().wrap((function _callee5$(_context5) {
+            while (1) switch (_context5.prev = _context5.next) {
              case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return this.safeParseAsync(data, params);
 
              case 2:
-              result = _context4.sent;
+              result = _context5.sent;
               if (!result.success) {
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
               }
-              return _context4.abrupt("return", result.data);
+              return _context5.abrupt("return", result.data);
 
              case 5:
               throw result.error;
 
              case 6:
              case "end":
-              return _context4.stop();
+              return _context5.stop();
             }
-          }), _callee4, this);
+          }), _callee5, this);
         })));
-        function parseAsync(_x1, _x10) {
+        function parseAsync(_x10, _x11) {
           return _parseAsync2.apply(this, arguments);
         }
         return parseAsync;
@@ -12489,10 +12422,10 @@ function _typeof(o) {
     }, {
       key: "safeParseAsync",
       value: function() {
-        var _safeParseAsync = _asyncToGenerator(_regeneratorRuntime().mark((function _callee5(data, params) {
+        var _safeParseAsync = _asyncToGenerator(_regeneratorRuntime().mark((function _callee6(data, params) {
           var ctx, maybeAsyncResult, result;
-          return _regeneratorRuntime().wrap((function _callee5$(_context5) {
-            while (1) switch (_context5.prev = _context5.next) {
+          return _regeneratorRuntime().wrap((function _callee6$(_context6) {
+            while (1) switch (_context6.prev = _context6.next) {
              case 0:
               ctx = {
                 common: {
@@ -12511,20 +12444,20 @@ function _typeof(o) {
                 path: ctx.path,
                 parent: ctx
               });
-              _context5.next = 4;
+              _context6.next = 4;
               return isAsync(maybeAsyncResult) ? maybeAsyncResult : Promise.resolve(maybeAsyncResult);
 
              case 4:
-              result = _context5.sent;
-              return _context5.abrupt("return", handleResult(ctx, result));
+              result = _context6.sent;
+              return _context6.abrupt("return", handleResult(ctx, result));
 
              case 6:
              case "end":
-              return _context5.stop();
+              return _context6.stop();
             }
-          }), _callee5, this);
+          }), _callee6, this);
         })));
-        function safeParseAsync(_x11, _x12) {
+        function safeParseAsync(_x12, _x13) {
           return _safeParseAsync.apply(this, arguments);
         }
         return safeParseAsync;
@@ -14683,32 +14616,32 @@ function _typeof(o) {
           }
         }
         if (ctx.common.async) {
-          return Promise.resolve().then(_asyncToGenerator(_regeneratorRuntime().mark((function _callee6() {
+          return Promise.resolve().then(_asyncToGenerator(_regeneratorRuntime().mark((function _callee7() {
             var syncPairs, _iterator24, _step24, pair, _key4, _value8;
-            return _regeneratorRuntime().wrap((function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
+            return _regeneratorRuntime().wrap((function _callee7$(_context7) {
+              while (1) switch (_context7.prev = _context7.next) {
                case 0:
                 syncPairs = [];
                 _iterator24 = _createForOfIteratorHelper(pairs);
-                _context6.prev = 2;
+                _context7.prev = 2;
                 _iterator24.s();
 
                case 4:
                 if ((_step24 = _iterator24.n()).done) {
-                  _context6.next = 15;
+                  _context7.next = 15;
                   break;
                 }
                 pair = _step24.value;
-                _context6.next = 8;
+                _context7.next = 8;
                 return pair.key;
 
                case 8:
-                _key4 = _context6.sent;
-                _context6.next = 11;
+                _key4 = _context7.sent;
+                _context7.next = 11;
                 return pair.value;
 
                case 11:
-                _value8 = _context6.sent;
+                _value8 = _context7.sent;
                 syncPairs.push({
                   key: _key4,
                   value: _value8,
@@ -14716,31 +14649,31 @@ function _typeof(o) {
                 });
 
                case 13:
-                _context6.next = 4;
+                _context7.next = 4;
                 break;
 
                case 15:
-                _context6.next = 20;
+                _context7.next = 20;
                 break;
 
                case 17:
-                _context6.prev = 17;
-                _context6.t0 = _context6["catch"](2);
-                _iterator24.e(_context6.t0);
+                _context7.prev = 17;
+                _context7.t0 = _context7["catch"](2);
+                _iterator24.e(_context7.t0);
 
                case 20:
-                _context6.prev = 20;
+                _context7.prev = 20;
                 _iterator24.f();
-                return _context6.finish(20);
+                return _context7.finish(20);
 
                case 23:
-                return _context6.abrupt("return", syncPairs);
+                return _context7.abrupt("return", syncPairs);
 
                case 24:
                case "end":
-                return _context6.stop();
+                return _context7.stop();
               }
-            }), _callee6, null, [ [ 2, 17, 20, 23 ] ]);
+            }), _callee7, null, [ [ 2, 17, 20, 23 ] ]);
           })))).then((function(syncPairs) {
             return ParseStatus.mergeObjectSync(status, syncPairs);
           }));
@@ -15016,10 +14949,10 @@ function _typeof(o) {
         }
         if (ctx.common.async) {
           return Promise.all(options.map(function() {
-            var _ref8 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee7(option) {
+            var _ref8 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee8(option) {
               var childCtx;
-              return _regeneratorRuntime().wrap((function _callee7$(_context7) {
-                while (1) switch (_context7.prev = _context7.next) {
+              return _regeneratorRuntime().wrap((function _callee8$(_context8) {
+                while (1) switch (_context8.prev = _context8.next) {
                  case 0:
                   childCtx = _objectSpread(_objectSpread({}, ctx), {}, {
                     common: _objectSpread(_objectSpread({}, ctx.common), {}, {
@@ -15027,7 +14960,7 @@ function _typeof(o) {
                     }),
                     parent: null
                   });
-                  _context7.next = 3;
+                  _context8.next = 3;
                   return option._parseAsync({
                     data: ctx.data,
                     path: ctx.path,
@@ -15035,20 +14968,20 @@ function _typeof(o) {
                   });
 
                  case 3:
-                  _context7.t0 = _context7.sent;
-                  _context7.t1 = childCtx;
-                  return _context7.abrupt("return", {
-                    result: _context7.t0,
-                    ctx: _context7.t1
+                  _context8.t0 = _context8.sent;
+                  _context8.t1 = childCtx;
+                  return _context8.abrupt("return", {
+                    result: _context8.t0,
+                    ctx: _context8.t1
                   });
 
                  case 6:
                  case "end":
-                  return _context7.stop();
+                  return _context8.stop();
                 }
-              }), _callee7);
+              }), _callee8);
             })));
-            return function(_x13) {
+            return function(_x14) {
               return _ref8.apply(this, arguments);
             };
           }())).then(handleResults);
@@ -15494,36 +15427,36 @@ function _typeof(o) {
         }));
         if (ctx.common.async) {
           var finalMap = new Map;
-          return Promise.resolve().then(_asyncToGenerator(_regeneratorRuntime().mark((function _callee8() {
+          return Promise.resolve().then(_asyncToGenerator(_regeneratorRuntime().mark((function _callee9() {
             var _iterator35, _step35, pair, key, _value1;
-            return _regeneratorRuntime().wrap((function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+            return _regeneratorRuntime().wrap((function _callee9$(_context9) {
+              while (1) switch (_context9.prev = _context9.next) {
                case 0:
                 _iterator35 = _createForOfIteratorHelper(pairs);
-                _context8.prev = 1;
+                _context9.prev = 1;
                 _iterator35.s();
 
                case 3:
                 if ((_step35 = _iterator35.n()).done) {
-                  _context8.next = 17;
+                  _context9.next = 17;
                   break;
                 }
                 pair = _step35.value;
-                _context8.next = 7;
+                _context9.next = 7;
                 return pair.key;
 
                case 7:
-                key = _context8.sent;
-                _context8.next = 10;
+                key = _context9.sent;
+                _context9.next = 10;
                 return pair.value;
 
                case 10:
-                _value1 = _context8.sent;
+                _value1 = _context9.sent;
                 if (!(key.status === "aborted" || _value1.status === "aborted")) {
-                  _context8.next = 13;
+                  _context9.next = 13;
                   break;
                 }
-                return _context8.abrupt("return", INVALID);
+                return _context9.abrupt("return", INVALID);
 
                case 13:
                 if (key.status === "dirty" || _value1.status === "dirty") {
@@ -15532,34 +15465,34 @@ function _typeof(o) {
                 finalMap.set(key.value, _value1.value);
 
                case 15:
-                _context8.next = 3;
+                _context9.next = 3;
                 break;
 
                case 17:
-                _context8.next = 22;
+                _context9.next = 22;
                 break;
 
                case 19:
-                _context8.prev = 19;
-                _context8.t0 = _context8["catch"](1);
-                _iterator35.e(_context8.t0);
+                _context9.prev = 19;
+                _context9.t0 = _context9["catch"](1);
+                _iterator35.e(_context9.t0);
 
                case 22:
-                _context8.prev = 22;
+                _context9.prev = 22;
                 _iterator35.f();
-                return _context8.finish(22);
+                return _context9.finish(22);
 
                case 25:
-                return _context8.abrupt("return", {
+                return _context9.abrupt("return", {
                   status: status.value,
                   value: finalMap
                 });
 
                case 26:
                case "end":
-                return _context8.stop();
+                return _context9.stop();
               }
-            }), _callee8, null, [ [ 1, 19, 22, 25 ] ]);
+            }), _callee9, null, [ [ 1, 19, 22, 25 ] ]);
           }))));
         } else {
           var _finalMap = new Map;
@@ -16020,19 +15953,19 @@ function _typeof(o) {
           var processed = effect.transform(ctx.data, checkCtx);
           if (ctx.common.async) {
             return Promise.resolve(processed).then(function() {
-              var _ref12 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee9(processed) {
+              var _ref12 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee0(processed) {
                 var result;
-                return _regeneratorRuntime().wrap((function _callee9$(_context9) {
-                  while (1) switch (_context9.prev = _context9.next) {
+                return _regeneratorRuntime().wrap((function _callee0$(_context0) {
+                  while (1) switch (_context0.prev = _context0.next) {
                    case 0:
                     if (!(status.value === "aborted")) {
-                      _context9.next = 2;
+                      _context0.next = 2;
                       break;
                     }
-                    return _context9.abrupt("return", INVALID);
+                    return _context0.abrupt("return", INVALID);
 
                    case 2:
-                    _context9.next = 4;
+                    _context0.next = 4;
                     return _this14._def.schema._parseAsync({
                       data: processed,
                       path: ctx.path,
@@ -16040,37 +15973,37 @@ function _typeof(o) {
                     });
 
                    case 4:
-                    result = _context9.sent;
+                    result = _context0.sent;
                     if (!(result.status === "aborted")) {
-                      _context9.next = 7;
+                      _context0.next = 7;
                       break;
                     }
-                    return _context9.abrupt("return", INVALID);
+                    return _context0.abrupt("return", INVALID);
 
                    case 7:
                     if (!(result.status === "dirty")) {
-                      _context9.next = 9;
+                      _context0.next = 9;
                       break;
                     }
-                    return _context9.abrupt("return", DIRTY(result.value));
+                    return _context0.abrupt("return", DIRTY(result.value));
 
                    case 9:
                     if (!(status.value === "dirty")) {
-                      _context9.next = 11;
+                      _context0.next = 11;
                       break;
                     }
-                    return _context9.abrupt("return", DIRTY(result.value));
+                    return _context0.abrupt("return", DIRTY(result.value));
 
                    case 11:
-                    return _context9.abrupt("return", result);
+                    return _context0.abrupt("return", result);
 
                    case 12:
                    case "end":
-                    return _context9.stop();
+                    return _context0.stop();
                   }
-                }), _callee9);
+                }), _callee0);
               })));
-              return function(_x14) {
+              return function(_x15) {
                 return _ref12.apply(this, arguments);
               };
             }());
@@ -16402,12 +16335,12 @@ function _typeof(o) {
         var _this$_processInputPa13 = this._processInputParams(input), status = _this$_processInputPa13.status, ctx = _this$_processInputPa13.ctx;
         if (ctx.common.async) {
           var handleAsync = function() {
-            var _ref13 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee0() {
+            var _ref13 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee1() {
               var inResult;
-              return _regeneratorRuntime().wrap((function _callee0$(_context0) {
-                while (1) switch (_context0.prev = _context0.next) {
+              return _regeneratorRuntime().wrap((function _callee1$(_context1) {
+                while (1) switch (_context1.prev = _context1.next) {
                  case 0:
-                  _context0.next = 2;
+                  _context1.next = 2;
                   return _this16._def["in"]._parseAsync({
                     data: ctx.data,
                     path: ctx.path,
@@ -16415,23 +16348,23 @@ function _typeof(o) {
                   });
 
                  case 2:
-                  inResult = _context0.sent;
+                  inResult = _context1.sent;
                   if (!(inResult.status === "aborted")) {
-                    _context0.next = 5;
+                    _context1.next = 5;
                     break;
                   }
-                  return _context0.abrupt("return", INVALID);
+                  return _context1.abrupt("return", INVALID);
 
                  case 5:
                   if (!(inResult.status === "dirty")) {
-                    _context0.next = 10;
+                    _context1.next = 10;
                     break;
                   }
                   status.dirty();
-                  return _context0.abrupt("return", DIRTY(inResult.value));
+                  return _context1.abrupt("return", DIRTY(inResult.value));
 
                  case 10:
-                  return _context0.abrupt("return", _this16._def.out._parseAsync({
+                  return _context1.abrupt("return", _this16._def.out._parseAsync({
                     data: inResult.value,
                     path: ctx.path,
                     parent: ctx
@@ -16439,9 +16372,9 @@ function _typeof(o) {
 
                  case 11:
                  case "end":
-                  return _context0.stop();
+                  return _context1.stop();
                 }
-              }), _callee0);
+              }), _callee1);
             })));
             return function handleAsync() {
               return _ref13.apply(this, arguments);
@@ -16784,13 +16717,13 @@ function _typeof(o) {
     return _FIREFLY.apply(this, arguments);
   }
   function _FIREFLY() {
-    _FIREFLY = _asyncToGenerator(_regeneratorRuntime().mark((function _callee11() {
-      var _argsToArray3, _argsToArray4, platform, contentType, identifier, _argsToArray4$, start, _argsToArray4$2, end, apiKey, url, _getUrlAndHeaders4, finalUrl, HEADERS, response, _yield$response$json, _data, _args11 = arguments;
-      return _regeneratorRuntime().wrap((function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+    _FIREFLY = _asyncToGenerator(_regeneratorRuntime().mark((function _callee12() {
+      var _argsToArray3, _argsToArray4, platform, contentType, identifier, _argsToArray4$, start, _argsToArray4$2, end, apiKey, url, response, _yield$response$json, _data, _args12 = arguments;
+      return _regeneratorRuntime().wrap((function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
          case 0:
-          _context11.prev = 0;
-          _argsToArray3 = argsToArray(_args11), _argsToArray4 = _slicedToArray(_argsToArray3, 5), 
+          _context12.prev = 0;
+          _argsToArray3 = argsToArray(_args12), _argsToArray4 = _slicedToArray(_argsToArray3, 5), 
           platform = _argsToArray4[0], contentType = _argsToArray4[1], identifier = _argsToArray4[2], 
           _argsToArray4$ = _argsToArray4[3], start = _argsToArray4$ === void 0 ? 0 : _argsToArray4$, 
           _argsToArray4$2 = _argsToArray4[4], end = _argsToArray4$2 === void 0 ? 10 : _argsToArray4$2;
@@ -16802,6 +16735,13 @@ function _typeof(o) {
             end: end
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
+          if (apiKey) {
+            _context12.next = 6;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Firefly);
+
+         case 6:
           url = new URL("https://openapi.firefly.land/v1/fileverse/fetch");
           url.searchParams.set("query", identifier.split(",").map((function(s) {
             return s.trim();
@@ -16809,42 +16749,36 @@ function _typeof(o) {
           url.searchParams.set("type", fireFlyPlaformType[platform][contentType]);
           url.searchParams.set("start", String(start));
           url.searchParams.set("end", String(end));
-          _getUrlAndHeaders4 = getUrlAndHeaders({
-            url: url.toString(),
-            serviceName: "Firefly",
+          _context12.next = 13;
+          return fetch(url.toString(), {
             headers: {
               "x-api-key": apiKey
             }
-          }), finalUrl = _getUrlAndHeaders4.URL, HEADERS = _getUrlAndHeaders4.HEADERS;
-          _context11.next = 12;
-          return fetch(finalUrl, {
-            method: "GET",
-            headers: HEADERS
           });
 
-         case 12:
-          response = _context11.sent;
+         case 13:
+          response = _context12.sent;
           if (response.ok) {
-            _context11.next = 15;
+            _context12.next = 16;
             break;
           }
           throw new NetworkError(SERVICES_API_KEY.Firefly, response.status);
 
-         case 15:
-          _context11.next = 17;
+         case 16:
+          _context12.next = 18;
           return response.json();
 
-         case 17:
-          _yield$response$json = _context11.sent;
+         case 18:
+          _yield$response$json = _context12.sent;
           _data = _yield$response$json.data;
           if (Array.isArray(_data)) {
-            _context11.next = 21;
+            _context12.next = 22;
             break;
           }
-          return _context11.abrupt("return", []);
+          return _context12.abrupt("return", []);
 
-         case 21:
-          return _context11.abrupt("return", _data.map((function(item) {
+         case 22:
+          return _context12.abrupt("return", _data.map((function(item) {
             var flat = {};
             for (var _i10 = 0, _Object$entries = Object.entries(item); _i10 < _Object$entries.length; _i10++) {
               var _Object$entries$_i = _slicedToArray(_Object$entries[_i10], 2), key = _Object$entries$_i[0], _value11 = _Object$entries$_i[1];
@@ -16856,16 +16790,16 @@ function _typeof(o) {
             return flat;
           })));
 
-         case 24:
-          _context11.prev = 24;
-          _context11.t0 = _context11["catch"](0);
-          return _context11.abrupt("return", errorMessageHandler(_context11.t0, "FIREFLY"));
+         case 25:
+          _context12.prev = 25;
+          _context12.t0 = _context12["catch"](0);
+          return _context12.abrupt("return", errorMessageHandler(_context12.t0, "FIREFLY"));
 
-         case 27:
+         case 28:
          case "end":
-          return _context11.stop();
+          return _context12.stop();
         }
-      }), _callee11, null, [ [ 0, 24 ] ]);
+      }), _callee12, null, [ [ 0, 25 ] ]);
     })));
     return _FIREFLY.apply(this, arguments);
   }
@@ -16873,13 +16807,13 @@ function _typeof(o) {
     return _LENS.apply(this, arguments);
   }
   function _LENS() {
-    _LENS = _asyncToGenerator(_regeneratorRuntime().mark((function _callee12() {
-      var _argsToArray5, _argsToArray6, contentType, identifier, _argsToArray6$, start, _argsToArray6$2, end, apiKey, url, typeMap, _getUrlAndHeaders5, finalUrl, HEADERS, response, _yield$response$json2, _data2, _args12 = arguments;
-      return _regeneratorRuntime().wrap((function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+    _LENS = _asyncToGenerator(_regeneratorRuntime().mark((function _callee13() {
+      var _argsToArray5, _argsToArray6, contentType, identifier, _argsToArray6$, start, _argsToArray6$2, end, apiKey, url, typeMap, response, _yield$response$json2, _data2, _args13 = arguments;
+      return _regeneratorRuntime().wrap((function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
          case 0:
-          _context12.prev = 0;
-          _argsToArray5 = argsToArray(_args12), _argsToArray6 = _slicedToArray(_argsToArray5, 4), 
+          _context13.prev = 0;
+          _argsToArray5 = argsToArray(_args13), _argsToArray6 = _slicedToArray(_argsToArray5, 4), 
           contentType = _argsToArray6[0], identifier = _argsToArray6[1], _argsToArray6$ = _argsToArray6[2], 
           start = _argsToArray6$ === void 0 ? 0 : _argsToArray6$, _argsToArray6$2 = _argsToArray6[3], 
           end = _argsToArray6$2 === void 0 ? 10 : _argsToArray6$2;
@@ -16890,6 +16824,13 @@ function _typeof(o) {
             end: end
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
+          if (apiKey) {
+            _context13.next = 6;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Firefly);
+
+         case 6:
           url = new URL("https://openapi.firefly.land/v1/fileverse/fetch");
           url.searchParams.set("query", identifier.split(",").map((function(s) {
             return s.trim();
@@ -16901,42 +16842,36 @@ function _typeof(o) {
           url.searchParams.set("type", typeMap[contentType]);
           url.searchParams.set("start", String(start));
           url.searchParams.set("end", String(end));
-          _getUrlAndHeaders5 = getUrlAndHeaders({
-            url: url.toString(),
-            serviceName: "Firefly",
+          _context13.next = 14;
+          return fetch(url.toString(), {
             headers: {
               "x-api-key": apiKey
             }
-          }), finalUrl = _getUrlAndHeaders5.URL, HEADERS = _getUrlAndHeaders5.HEADERS;
-          _context12.next = 13;
-          return fetch(finalUrl, {
-            method: "GET",
-            headers: HEADERS
           });
 
-         case 13:
-          response = _context12.sent;
+         case 14:
+          response = _context13.sent;
           if (response.ok) {
-            _context12.next = 16;
+            _context13.next = 17;
             break;
           }
           throw new NetworkError(SERVICES_API_KEY.Firefly, response.status);
 
-         case 16:
-          _context12.next = 18;
+         case 17:
+          _context13.next = 19;
           return response.json();
 
-         case 18:
-          _yield$response$json2 = _context12.sent;
+         case 19:
+          _yield$response$json2 = _context13.sent;
           _data2 = _yield$response$json2.data;
           if (Array.isArray(_data2)) {
-            _context12.next = 22;
+            _context13.next = 23;
             break;
           }
-          return _context12.abrupt("return", []);
+          return _context13.abrupt("return", []);
 
-         case 22:
-          return _context12.abrupt("return", _data2.map((function(item) {
+         case 23:
+          return _context13.abrupt("return", _data2.map((function(item) {
             var flat = {};
             for (var _i11 = 0, _Object$entries2 = Object.entries(item); _i11 < _Object$entries2.length; _i11++) {
               var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i11], 2), key = _Object$entries2$_i[0], _value12 = _Object$entries2$_i[1];
@@ -16948,16 +16883,16 @@ function _typeof(o) {
             return flat;
           })));
 
-         case 25:
-          _context12.prev = 25;
-          _context12.t0 = _context12["catch"](0);
-          return _context12.abrupt("return", errorMessageHandler(_context12.t0, "LENS"));
+         case 26:
+          _context13.prev = 26;
+          _context13.t0 = _context13["catch"](0);
+          return _context13.abrupt("return", errorMessageHandler(_context13.t0, "LENS"));
 
-         case 28:
+         case 29:
          case "end":
-          return _context12.stop();
+          return _context13.stop();
         }
-      }), _callee12, null, [ [ 0, 25 ] ]);
+      }), _callee13, null, [ [ 0, 26 ] ]);
     })));
     return _LENS.apply(this, arguments);
   }
@@ -16965,13 +16900,13 @@ function _typeof(o) {
     return _FARCASTER.apply(this, arguments);
   }
   function _FARCASTER() {
-    _FARCASTER = _asyncToGenerator(_regeneratorRuntime().mark((function _callee13() {
-      var _argsToArray7, _argsToArray8, contentType, identifier, _argsToArray8$, start, _argsToArray8$2, end, apiKey, url, typeMap, _getUrlAndHeaders6, finalUrl, HEADERS, response, _yield$response$json3, _data3, _args13 = arguments;
-      return _regeneratorRuntime().wrap((function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+    _FARCASTER = _asyncToGenerator(_regeneratorRuntime().mark((function _callee14() {
+      var _argsToArray7, _argsToArray8, contentType, identifier, _argsToArray8$, start, _argsToArray8$2, end, apiKey, url, typeMap, response, _yield$response$json3, _data3, _args14 = arguments;
+      return _regeneratorRuntime().wrap((function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
          case 0:
-          _context13.prev = 0;
-          _argsToArray7 = argsToArray(_args13), _argsToArray8 = _slicedToArray(_argsToArray7, 4), 
+          _context14.prev = 0;
+          _argsToArray7 = argsToArray(_args14), _argsToArray8 = _slicedToArray(_argsToArray7, 4), 
           contentType = _argsToArray8[0], identifier = _argsToArray8[1], _argsToArray8$ = _argsToArray8[2], 
           start = _argsToArray8$ === void 0 ? 0 : _argsToArray8$, _argsToArray8$2 = _argsToArray8[3], 
           end = _argsToArray8$2 === void 0 ? 10 : _argsToArray8$2;
@@ -16982,6 +16917,13 @@ function _typeof(o) {
             end: end
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Firefly);
+          if (apiKey) {
+            _context14.next = 6;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Firefly);
+
+         case 6:
           url = new URL("https://openapi.firefly.land/v1/fileverse/fetch");
           url.searchParams.set("query", identifier.split(",").map((function(s) {
             return s.trim();
@@ -16994,42 +16936,36 @@ function _typeof(o) {
           url.searchParams.set("type", typeMap[contentType]);
           url.searchParams.set("start", String(start));
           url.searchParams.set("end", String(end));
-          _getUrlAndHeaders6 = getUrlAndHeaders({
-            url: url.toString(),
-            serviceName: "Firefly",
+          _context14.next = 14;
+          return fetch(url.toString(), {
             headers: {
               "x-api-key": apiKey
             }
-          }), finalUrl = _getUrlAndHeaders6.URL, HEADERS = _getUrlAndHeaders6.HEADERS;
-          _context13.next = 13;
-          return fetch(finalUrl, {
-            method: "GET",
-            headers: HEADERS
           });
 
-         case 13:
-          response = _context13.sent;
+         case 14:
+          response = _context14.sent;
           if (response.ok) {
-            _context13.next = 16;
+            _context14.next = 17;
             break;
           }
           throw new NetworkError(SERVICES_API_KEY.Firefly, response.status);
 
-         case 16:
-          _context13.next = 18;
+         case 17:
+          _context14.next = 19;
           return response.json();
 
-         case 18:
-          _yield$response$json3 = _context13.sent;
+         case 19:
+          _yield$response$json3 = _context14.sent;
           _data3 = _yield$response$json3.data;
           if (Array.isArray(_data3)) {
-            _context13.next = 22;
+            _context14.next = 23;
             break;
           }
-          return _context13.abrupt("return", []);
+          return _context14.abrupt("return", []);
 
-         case 22:
-          return _context13.abrupt("return", _data3.map((function(item) {
+         case 23:
+          return _context14.abrupt("return", _data3.map((function(item) {
             var flat = {};
             for (var _i12 = 0, _Object$entries3 = Object.entries(item); _i12 < _Object$entries3.length; _i12++) {
               var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i12], 2), k = _Object$entries3$_i[0], v = _Object$entries3$_i[1];
@@ -17041,16 +16977,16 @@ function _typeof(o) {
             return flat;
           })));
 
-         case 25:
-          _context13.prev = 25;
-          _context13.t0 = _context13["catch"](0);
-          return _context13.abrupt("return", errorMessageHandler(_context13.t0, "FARCASTER"));
+         case 26:
+          _context14.prev = 26;
+          _context14.t0 = _context14["catch"](0);
+          return _context14.abrupt("return", errorMessageHandler(_context14.t0, "FARCASTER"));
 
-         case 28:
+         case 29:
          case "end":
-          return _context13.stop();
+          return _context14.stop();
         }
-      }), _callee13, null, [ [ 0, 25 ] ]);
+      }), _callee14, null, [ [ 0, 26 ] ]);
     })));
     return _FARCASTER.apply(this, arguments);
   }
@@ -17058,13 +16994,13 @@ function _typeof(o) {
     return _BLOCKSCOUT.apply(this, arguments);
   }
   function _BLOCKSCOUT() {
-    _BLOCKSCOUT = _asyncToGenerator(_regeneratorRuntime().mark((function _callee14() {
-      var _json$result, _json$result2, _argsToArray9, _argsToArray0, address, type, _argsToArray0$, chain, startTimestamp, endTimestamp, page, offset, startTs, endTs, resolvedAddress, ensName, hostname, requestUrl, response, json, _args14 = arguments;
-      return _regeneratorRuntime().wrap((function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+    _BLOCKSCOUT = _asyncToGenerator(_regeneratorRuntime().mark((function _callee15() {
+      var _json$result, _json$result2, _argsToArray9, _argsToArray0, address, type, _argsToArray0$, chain, startTimestamp, endTimestamp, page, offset, startTs, endTs, resolvedAddress, hostname, requestUrl, response, json, _args15 = arguments;
+      return _regeneratorRuntime().wrap((function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
          case 0:
-          _context14.prev = 0;
-          _argsToArray9 = argsToArray(_args14), _argsToArray0 = _slicedToArray(_argsToArray9, 7), 
+          _context15.prev = 0;
+          _argsToArray9 = argsToArray(_args15), _argsToArray0 = _slicedToArray(_argsToArray9, 7), 
           address = _argsToArray0[0], type = _argsToArray0[1], _argsToArray0$ = _argsToArray0[2], 
           chain = _argsToArray0$ === void 0 ? "ethereum" : _argsToArray0$, startTimestamp = _argsToArray0[3], 
           endTimestamp = _argsToArray0[4], page = _argsToArray0[5], offset = _argsToArray0[6];
@@ -17079,85 +17015,72 @@ function _typeof(o) {
           });
           startTs = startTimestamp !== null && startTimestamp !== void 0 ? startTimestamp : Math.floor((Date.now() - 30 * 24 * 3600 * 1e3) / 1e3);
           endTs = endTimestamp;
-          resolvedAddress = address;
-          if (isAddress$1.isAddress(resolvedAddress)) {
-            _context14.next = 13;
-            break;
-          }
-          ensName = resolvedAddress;
-          _context14.next = 10;
-          return fromEnsNameToAddress$1.fromEnsNameToAddress(ensName);
-
-         case 10:
-          resolvedAddress = _context14.sent;
-          if (resolvedAddress) {
-            _context14.next = 13;
-            break;
-          }
-          throw new EnsError(ensName);
+          _context15.next = 7;
+          return fromEnsNameToAddress$1.validateAndGetAddress(address);
 
-         case 13:
+         case 7:
+          resolvedAddress = _context15.sent;
           hostname = BLOCKSCOUT_CHAINS_MAP[chain];
-          _context14.t0 = type;
-          _context14.next = _context14.t0 === "stat" ? 17 : _context14.t0 === "txns" ? 19 : _context14.t0 === "tokens" ? 21 : 23;
+          _context15.t0 = type;
+          _context15.next = _context15.t0 === "stat" ? 12 : _context15.t0 === "txns" ? 14 : _context15.t0 === "tokens" ? 16 : 18;
           break;
 
-         case 17:
+         case 12:
           requestUrl = "".concat(hostname, "/api/v2/addresses/").concat(resolvedAddress, "/counters");
-          return _context14.abrupt("break", 23);
+          return _context15.abrupt("break", 18);
 
-         case 19:
+         case 14:
           requestUrl = "".concat(hostname, "/api?module=account&action=txlist") + "&address=".concat(resolvedAddress) + "&start_timestamp=".concat(startTs) + "&end_timestamp=".concat(endTs !== null && endTs !== void 0 ? endTs : "") + "&page=".concat(page) + "&offset=".concat(offset) + "&sort=asc";
-          return _context14.abrupt("break", 23);
+          return _context15.abrupt("break", 18);
 
-         case 21:
+         case 16:
           requestUrl = "".concat(hostname, "/api?module=account&action=tokenlist") + "&address=".concat(resolvedAddress);
-          return _context14.abrupt("break", 23);
+          return _context15.abrupt("break", 18);
 
-         case 23:
-          _context14.next = 25;
+         case 18:
+          _context15.next = 20;
           return fetch(requestUrl);
 
-         case 25:
-          response = _context14.sent;
+         case 20:
+          response = _context15.sent;
           if (response.ok) {
-            _context14.next = 28;
+            _context15.next = 23;
             break;
           }
           throw new NetworkError("BLOCKSCOUT", response.status);
 
-         case 28:
-          _context14.next = 30;
+         case 23:
+          _context15.next = 25;
           return response.json();
 
-         case 30:
-          json = _context14.sent;
+         case 25:
+          json = _context15.sent;
           if (!(json !== null && json !== void 0 && (_json$result = json.result) !== null && _json$result !== void 0 && _json$result.includes("Invalid parameter(s)"))) {
-            _context14.next = 33;
+            _context15.next = 28;
             break;
           }
           throw new ValidationError("Invalid parameters");
 
-         case 33:
+         case 28:
           if (!(json !== null && json !== void 0 && (_json$result2 = json.result) !== null && _json$result2 !== void 0 && _json$result2.includes("Not found"))) {
-            _context14.next = 35;
+            _context15.next = 30;
             break;
           }
           throw new ValidationError("Address information not found");
 
-         case 35:
-          return _context14.abrupt("return", type === "stat" ? [ json ] : json.result);
+         case 30:
+          return _context15.abrupt("return", type === "stat" ? [ json ] : json.result);
 
-         case 38:
-          _context14.prev = 38;
-          _context14.t1 = _context14["catch"](0);
-          return _context14.abrupt("return", errorMessageHandler(_context14.t1, "BLOCKSCOUT"));
+         case 33:
+          _context15.prev = 33;
+          _context15.t1 = _context15["catch"](0);
+          return _context15.abrupt("return", errorMessageHandler(_context15.t1, "BLOCKSCOUT"));
 
-         case 41:
+         case 36:
          case "end":
-          return _context14.stop();
+          return _context15.stop();
         }
-      }), _callee14, null, [ [ 0, 38 ] ]);
+      }), _callee15, null, [ [ 0, 33 ] ]);
     })));
     return _BLOCKSCOUT.apply(this, arguments);
   }
@@ -17165,13 +17088,13 @@ function _typeof(o) {
     return _BASE.apply(this, arguments);
   }
   function _BASE() {
-    _BASE = _asyncToGenerator(_regeneratorRuntime().mark((function _callee15() {
-      var _argsToArray1, _argsToArray10, type, address, startDate, endDate, page, limit, API_KEY, _args15 = arguments;
-      return _regeneratorRuntime().wrap((function _callee15$(_context15) {
-        while (1) switch (_context15.prev = _context15.next) {
+    _BASE = _asyncToGenerator(_regeneratorRuntime().mark((function _callee16() {
+      var _argsToArray1, _argsToArray10, type, address, startDate, endDate, page, limit, API_KEY, _args16 = arguments;
+      return _regeneratorRuntime().wrap((function _callee16$(_context16) {
+        while (1) switch (_context16.prev = _context16.next) {
          case 0:
-          _context15.prev = 0;
-          _argsToArray1 = argsToArray(_args15), _argsToArray10 = _slicedToArray(_argsToArray1, 6), 
+          _context16.prev = 0;
+          _argsToArray1 = argsToArray(_args16), _argsToArray10 = _slicedToArray(_argsToArray1, 6), 
           type = _argsToArray10[0], address = _argsToArray10[1], startDate = _argsToArray10[2], 
           endDate = _argsToArray10[3], page = _argsToArray10[4], limit = _argsToArray10[5];
           validateParams(baseParamsSchema, {
@@ -17183,7 +17106,14 @@ function _typeof(o) {
             limit: limit
           });
           API_KEY = window.localStorage.getItem(SERVICES_API_KEY.Basescan);
-          _context15.next = 6;
+          if (API_KEY) {
+            _context16.next = 6;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Basescan);
+
+         case 6:
+          _context16.next = 8;
           return handleScanRequest({
             type: type,
             address: address,
@@ -17197,19 +17127,19 @@ function _typeof(o) {
             network: "base"
           });
 
-         case 6:
-          return _context15.abrupt("return", _context15.sent);
+         case 8:
+          return _context16.abrupt("return", _context16.sent);
 
-         case 9:
-          _context15.prev = 9;
-          _context15.t0 = _context15["catch"](0);
-          return _context15.abrupt("return", errorMessageHandler(_context15.t0, "BASE"));
+         case 11:
+          _context16.prev = 11;
+          _context16.t0 = _context16["catch"](0);
+          return _context16.abrupt("return", errorMessageHandler(_context16.t0, "BASE"));
 
-         case 12:
+         case 14:
          case "end":
-          return _context15.stop();
+          return _context16.stop();
         }
-      }), _callee15, null, [ [ 0, 9 ] ]);
+      }), _callee16, null, [ [ 0, 11 ] ]);
     })));
     return _BASE.apply(this, arguments);
   }
@@ -17217,13 +17147,13 @@ function _typeof(o) {
     return _GNOSIS.apply(this, arguments);
   }
   function _GNOSIS() {
-    _GNOSIS = _asyncToGenerator(_regeneratorRuntime().mark((function _callee16() {
-      var _argsToArray11, _argsToArray12, type, address, startDate, endDate, _argsToArray12$, page, _argsToArray12$2, limit, apiKey, _args16 = arguments;
-      return _regeneratorRuntime().wrap((function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+    _GNOSIS = _asyncToGenerator(_regeneratorRuntime().mark((function _callee17() {
+      var _argsToArray11, _argsToArray12, type, address, startDate, endDate, _argsToArray12$, page, _argsToArray12$2, limit, apiKey, _args17 = arguments;
+      return _regeneratorRuntime().wrap((function _callee17$(_context17) {
+        while (1) switch (_context17.prev = _context17.next) {
          case 0:
-          _context16.prev = 0;
-          _argsToArray11 = argsToArray(_args16), _argsToArray12 = _slicedToArray(_argsToArray11, 6), 
+          _context17.prev = 0;
+          _argsToArray11 = argsToArray(_args17), _argsToArray12 = _slicedToArray(_argsToArray11, 6), 
           type = _argsToArray12[0], address = _argsToArray12[1], startDate = _argsToArray12[2], 
           endDate = _argsToArray12[3], _argsToArray12$ = _argsToArray12[4], page = _argsToArray12$ === void 0 ? 1 : _argsToArray12$, 
           _argsToArray12$2 = _argsToArray12[5], limit = _argsToArray12$2 === void 0 ? 10 : _argsToArray12$2;
@@ -17236,7 +17166,14 @@ function _typeof(o) {
             limit: limit
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Gnosisscan);
-          _context16.next = 6;
+          if (apiKey) {
+            _context17.next = 6;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Gnosisscan);
+
+         case 6:
+          _context17.next = 8;
           return handleScanRequest({
             type: type,
             address: address,
@@ -17250,19 +17187,19 @@ function _typeof(o) {
             network: "gnosis"
           });
 
-         case 6:
-          return _context16.abrupt("return", _context16.sent);
+         case 8:
+          return _context17.abrupt("return", _context17.sent);
 
-         case 9:
-          _context16.prev = 9;
-          _context16.t0 = _context16["catch"](0);
-          return _context16.abrupt("return", errorMessageHandler(_context16.t0, "GNOSIS"));
+         case 11:
+          _context17.prev = 11;
+          _context17.t0 = _context17["catch"](0);
+          return _context17.abrupt("return", errorMessageHandler(_context17.t0, "GNOSIS"));
 
-         case 12:
+         case 14:
          case "end":
-          return _context16.stop();
+          return _context17.stop();
         }
-      }), _callee16, null, [ [ 0, 9 ] ]);
+      }), _callee17, null, [ [ 0, 11 ] ]);
     })));
     return _GNOSIS.apply(this, arguments);
   }
@@ -17270,71 +17207,72 @@ function _typeof(o) {
     return _NEYNAR.apply(this, arguments);
   }
   function _NEYNAR() {
-    _NEYNAR = _asyncToGenerator(_regeneratorRuntime().mark((function _callee17() {
-      var neynarParamsSchema, _argsToArray13, _argsToArray14, username, apiKey, fid, url, _getUrlAndHeaders7, finalUrl, HEADERS, response, json, users, _args17 = arguments;
-      return _regeneratorRuntime().wrap((function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
+    _NEYNAR = _asyncToGenerator(_regeneratorRuntime().mark((function _callee18() {
+      var neynarParamsSchema, _argsToArray13, _argsToArray14, username, apiKey, fid, url, response, json, users, _args18 = arguments;
+      return _regeneratorRuntime().wrap((function _callee18$(_context18) {
+        while (1) switch (_context18.prev = _context18.next) {
          case 0:
-          _context17.prev = 0;
+          _context18.prev = 0;
           neynarParamsSchema = objectType({
             username: stringType().nonempty()
           });
-          _argsToArray13 = argsToArray(_args17), _argsToArray14 = _slicedToArray(_argsToArray13, 1), 
+          _argsToArray13 = argsToArray(_args18), _argsToArray14 = _slicedToArray(_argsToArray13, 1), 
           username = _argsToArray14[0];
           validateParams(neynarParamsSchema, {
             username: username
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Neynar);
-          _context17.next = 7;
-          return fromUsernameToFid$1.fromUsernameToFid(username, apiKey);
+          if (apiKey) {
+            _context18.next = 7;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Neynar);
 
          case 7:
-          fid = _context17.sent;
+          _context18.next = 9;
+          return fromUsernameToFid$1.fromUsernameToFid(username, apiKey);
+
+         case 9:
+          fid = _context18.sent;
           if (fid) {
-            _context17.next = 10;
+            _context18.next = 12;
             break;
           }
           throw new ValidationError("Invalid username: ".concat(username));
 
-         case 10:
+         case 12:
           url = "https://api.neynar.com/v2/farcaster/followers?fid=".concat(fid);
-          _getUrlAndHeaders7 = getUrlAndHeaders({
-            url: url.toString(),
-            serviceName: "Neynar",
+          _context18.next = 15;
+          return fetch(url, {
             headers: {
               "x-api-key": apiKey,
               "x-neynar-experimental": "false"
             }
-          }), finalUrl = _getUrlAndHeaders7.URL, HEADERS = _getUrlAndHeaders7.HEADERS;
-          _context17.next = 14;
-          return fetch(finalUrl, {
-            method: "GET",
-            headers: HEADERS
           });
 
-         case 14:
-          response = _context17.sent;
+         case 15:
+          response = _context18.sent;
           if (response.ok) {
-            _context17.next = 17;
+            _context18.next = 18;
             break;
           }
           throw new NetworkError(SERVICES_API_KEY.Neynar, response.status);
 
-         case 17:
-          _context17.next = 19;
+         case 18:
+          _context18.next = 20;
           return response.json();
 
-         case 19:
-          json = _context17.sent;
+         case 20:
+          json = _context18.sent;
           users = (json === null || json === void 0 ? void 0 : json.users) || [];
           if (users.length) {
-            _context17.next = 23;
+            _context18.next = 24;
             break;
           }
-          return _context17.abrupt("return", []);
+          return _context18.abrupt("return", []);
 
-         case 23:
-          return _context17.abrupt("return", users.map((function(_ref14) {
+         case 24:
+          return _context18.abrupt("return", users.map((function(_ref14) {
             var _user$profile, _user$profile2;
             var user = _ref14.user;
             return {
@@ -17346,16 +17284,16 @@ function _typeof(o) {
             };
           })));
 
-         case 26:
-          _context17.prev = 26;
-          _context17.t0 = _context17["catch"](0);
-          return _context17.abrupt("return", errorMessageHandler(_context17.t0, "NEYNAR"));
+         case 27:
+          _context18.prev = 27;
+          _context18.t0 = _context18["catch"](0);
+          return _context18.abrupt("return", errorMessageHandler(_context18.t0, "NEYNAR"));
 
-         case 29:
+         case 30:
          case "end":
-          return _context17.stop();
+          return _context18.stop();
         }
-      }), _callee17, null, [ [ 0, 26 ] ]);
+      }), _callee18, null, [ [ 0, 27 ] ]);
     })));
     return _NEYNAR.apply(this, arguments);
   }
@@ -17363,13 +17301,13 @@ function _typeof(o) {
     return _ETHERSCAN.apply(this, arguments);
   }
   function _ETHERSCAN() {
-    _ETHERSCAN = _asyncToGenerator(_regeneratorRuntime().mark((function _callee18() {
-      var _argsToArray15, _argsToArray16, type, chain, address, startDate, endDate, _argsToArray16$, page, _argsToArray16$2, limit, chainId, apiKey, _args18 = arguments;
-      return _regeneratorRuntime().wrap((function _callee18$(_context18) {
-        while (1) switch (_context18.prev = _context18.next) {
+    _ETHERSCAN = _asyncToGenerator(_regeneratorRuntime().mark((function _callee19() {
+      var _argsToArray15, _argsToArray16, type, chain, address, startDate, endDate, _argsToArray16$, page, _argsToArray16$2, limit, chainId, apiKey, _args19 = arguments;
+      return _regeneratorRuntime().wrap((function _callee19$(_context19) {
+        while (1) switch (_context19.prev = _context19.next) {
          case 0:
-          _context18.prev = 0;
-          _argsToArray15 = argsToArray(_args18), _argsToArray16 = _slicedToArray(_argsToArray15, 7), 
+          _context19.prev = 0;
+          _argsToArray15 = argsToArray(_args19), _argsToArray16 = _slicedToArray(_argsToArray15, 7), 
           type = _argsToArray16[0], chain = _argsToArray16[1], address = _argsToArray16[2], 
           startDate = _argsToArray16[3], endDate = _argsToArray16[4], _argsToArray16$ = _argsToArray16[5], 
           page = _argsToArray16$ === void 0 ? 1 : _argsToArray16$, _argsToArray16$2 = _argsToArray16[6], 
@@ -17385,14 +17323,21 @@ function _typeof(o) {
           });
           chainId = CHAIN_ID_MAP[chain];
           if (chainId) {
-            _context18.next = 6;
+            _context19.next = 6;
             break;
           }
           throw new ValidationError("Invalid chain: ".concat(chain));
 
          case 6:
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
-          _context18.next = 9;
+          if (apiKey) {
+            _context19.next = 9;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Etherscan);
+
+         case 9:
+          _context19.next = 11;
           return handleScanRequest({
             type: type,
             address: address,
@@ -17406,19 +17351,19 @@ function _typeof(o) {
             network: chain
           });
 
-         case 9:
-          return _context18.abrupt("return", _context18.sent);
+         case 11:
+          return _context19.abrupt("return", _context19.sent);
 
-         case 12:
-          _context18.prev = 12;
-          _context18.t0 = _context18["catch"](0);
-          return _context18.abrupt("return", errorMessageHandler(_context18.t0, "ETHERSCAN"));
+         case 14:
+          _context19.prev = 14;
+          _context19.t0 = _context19["catch"](0);
+          return _context19.abrupt("return", errorMessageHandler(_context19.t0, "ETHERSCAN"));
 
-         case 15:
+         case 17:
          case "end":
-          return _context18.stop();
+          return _context19.stop();
         }
-      }), _callee18, null, [ [ 0, 12 ] ]);
+      }), _callee19, null, [ [ 0, 14 ] ]);
     })));
     return _ETHERSCAN.apply(this, arguments);
   }
@@ -17426,13 +17371,13 @@ function _typeof(o) {
     return _COINGECKO.apply(this, arguments);
   }
   function _COINGECKO() {
-    _COINGECKO = _asyncToGenerator(_regeneratorRuntime().mark((function _callee19() {
-      var _category$toLowerCase, _argsToArray17, _argsToArray18, category, param1, param2, apiKey, headers, url, vs, map, _category, trend, _category2, _trend, _getUrlAndHeaders8, finalUrl, HEADERS, res, json, _json$status, msg, out, _i13, _Object$entries4, _Object$entries4$_i, token, prices, _i14, _Object$entries5, _Object$entries5$_i, cur, val, _data4, _args19 = arguments;
-      return _regeneratorRuntime().wrap((function _callee19$(_context19) {
-        while (1) switch (_context19.prev = _context19.next) {
+    _COINGECKO = _asyncToGenerator(_regeneratorRuntime().mark((function _callee20() {
+      var _category$toLowerCase, _argsToArray17, _argsToArray18, category, param1, param2, apiKey, headers, url, vs, map, _category, trend, _category2, _trend, res, json, _json$status, msg, out, _i13, _Object$entries4, _Object$entries4$_i, token, prices, _i14, _Object$entries5, _Object$entries5$_i, cur, val, _data4, _args20 = arguments;
+      return _regeneratorRuntime().wrap((function _callee20$(_context20) {
+        while (1) switch (_context20.prev = _context20.next) {
          case 0:
-          _context19.prev = 0;
-          _argsToArray17 = argsToArray(_args19), _argsToArray18 = _slicedToArray(_argsToArray17, 3), 
+          _context20.prev = 0;
+          _argsToArray17 = argsToArray(_args20), _argsToArray18 = _slicedToArray(_argsToArray17, 3), 
           category = _argsToArray18[0], param1 = _argsToArray18[1], param2 = _argsToArray18[2];
           validateParams(coingeckoParamsSchema, {
             category: category,
@@ -17440,21 +17385,28 @@ function _typeof(o) {
             param2: param2
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Coingecko);
+          if (apiKey) {
+            _context20.next = 6;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Coingecko);
+
+         case 6:
           headers = {
             accept: "application/json",
             "x-cg-demo-api-key": apiKey
           };
           url = "";
-          _context19.t0 = category === null || category === void 0 || (_category$toLowerCase = category.toLowerCase) === null || _category$toLowerCase === void 0 ? void 0 : _category$toLowerCase.call(category);
-          _context19.next = _context19.t0 === "price" ? 9 : _context19.t0 === "market" ? 12 : _context19.t0 === "stablecoins" ? 17 : _context19.t0 === "derivatives" ? 21 : 23;
+          _context20.t0 = category === null || category === void 0 || (_category$toLowerCase = category.toLowerCase) === null || _category$toLowerCase === void 0 ? void 0 : _category$toLowerCase.call(category);
+          _context20.next = _context20.t0 === "price" ? 11 : _context20.t0 === "market" ? 14 : _context20.t0 === "stablecoins" ? 19 : _context20.t0 === "derivatives" ? 23 : 25;
           break;
 
-         case 9:
+         case 11:
           vs = param2 || "usd";
           url = "https://api.coingecko.com/api/v3/simple/price?vs_currencies=".concat(vs, "&symbols=").concat(param1);
-          return _context19.abrupt("break", 23);
+          return _context20.abrupt("break", 25);
 
-         case 12:
+         case 14:
           map = {
             all: "",
             base: "base-ecosystem",
@@ -17469,53 +17421,48 @@ function _typeof(o) {
           _category = map[param1] || "";
           trend = param2 ? "&price_change_percentage=".concat(param2) : "";
           url = "https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&include_tokens=top&page=1&per_page=100".concat(_category ? "&category=".concat(_category) : "").concat(trend);
-          return _context19.abrupt("break", 23);
+          return _context20.abrupt("break", 25);
 
-         case 17:
+         case 19:
           _category2 = param1 === "all" ? "stablecoins" : param1;
           _trend = param2 ? "&price_change_percentage=".concat(param2) : "";
           url = "https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&category=".concat(_category2, "&order=market_cap_desc&page=1&per_page=100").concat(_trend);
-          return _context19.abrupt("break", 23);
+          return _context20.abrupt("break", 25);
 
-         case 21:
+         case 23:
           url = !param1 || param1 === "all" ? "https://api.coingecko.com/api/v3/derivatives" : "https://api.coingecko.com/api/v3/derivatives/exchanges/".concat(param1, "?include_tickers=all");
-          return _context19.abrupt("break", 23);
+          return _context20.abrupt("break", 25);
 
-         case 23:
-          _getUrlAndHeaders8 = getUrlAndHeaders({
-            url: url,
-            serviceName: "Coingecko",
+         case 25:
+          _context20.next = 27;
+          return fetch(url, {
             headers: headers
-          }), finalUrl = _getUrlAndHeaders8.URL, HEADERS = _getUrlAndHeaders8.HEADERS;
-          _context19.next = 26;
-          return fetch(finalUrl, {
-            headers: HEADERS
           });
 
-         case 26:
-          res = _context19.sent;
-          _context19.next = 29;
+         case 27:
+          res = _context20.sent;
+          _context20.next = 30;
           return res.json();
 
-         case 29:
-          json = _context19.sent;
+         case 30:
+          json = _context20.sent;
           if (res.ok) {
-            _context19.next = 35;
+            _context20.next = 36;
             break;
           }
           msg = (json === null || json === void 0 || (_json$status = json.status) === null || _json$status === void 0 ? void 0 : _json$status.error_message) || "";
           if (!msg.includes("API Key Missing")) {
-            _context19.next = 34;
+            _context20.next = 35;
             break;
           }
           throw new InvalidApiKeyError(SERVICES_API_KEY.Coingecko);
 
-         case 34:
+         case 35:
           throw new NetworkError(SERVICES_API_KEY.Coingecko, res.status);
 
-         case 35:
+         case 36:
           if (!(category === "price")) {
-            _context19.next = 39;
+            _context20.next = 40;
             break;
           }
           out = {};
@@ -17528,11 +17475,11 @@ function _typeof(o) {
               out["".concat(token.charAt(0).toUpperCase() + token.slice(1), "_").concat(cur.toUpperCase())] = val;
             }
           }
-          return _context19.abrupt("return", [ out ]);
+          return _context20.abrupt("return", [ out ]);
 
-         case 39:
+         case 40:
           _data4 = Array.isArray(json) ? json : [ json ];
-          return _context19.abrupt("return", _data4.map((function(item) {
+          return _context20.abrupt("return", _data4.map((function(item) {
             var flat = {};
             for (var _i15 = 0, _Object$entries6 = Object.entries(item); _i15 < _Object$entries6.length; _i15++) {
               var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i15], 2), key = _Object$entries6$_i[0], _value13 = _Object$entries6$_i[1];
@@ -17543,16 +17490,16 @@ function _typeof(o) {
             return flat;
           })));
 
-         case 43:
-          _context19.prev = 43;
-          _context19.t1 = _context19["catch"](0);
-          return _context19.abrupt("return", errorMessageHandler(_context19.t1, "COINGECKO"));
+         case 44:
+          _context20.prev = 44;
+          _context20.t1 = _context20["catch"](0);
+          return _context20.abrupt("return", errorMessageHandler(_context20.t1, "COINGECKO"));
 
-         case 46:
+         case 47:
          case "end":
-          return _context19.stop();
+          return _context20.stop();
         }
-      }), _callee19, null, [ [ 0, 43 ] ]);
+      }), _callee20, null, [ [ 0, 44 ] ]);
     })));
     return _COINGECKO.apply(this, arguments);
   }
@@ -17560,74 +17507,66 @@ function _typeof(o) {
     return _EOA.apply(this, arguments);
   }
   function _EOA() {
-    _EOA = _asyncToGenerator(_regeneratorRuntime().mark((function _callee21() {
-      var fetchJSON, _argsToArray19, _argsToArray20, addresses, category, chains, startTime, endTime, _argsToArray20$, page, _argsToArray20$2, offset, apiKey, INPUTS, CHAINS, ADDRESS_MAP, _iterator41, _step41, inp, ens, resolved, ADDRS, out, _iterator42, _step42, _loop, _ret, _args24 = arguments;
-      return _regeneratorRuntime().wrap((function _callee21$(_context24) {
-        while (1) switch (_context24.prev = _context24.next) {
+    _EOA = _asyncToGenerator(_regeneratorRuntime().mark((function _callee22() {
+      var fetchJSON, _argsToArray19, _argsToArray20, addresses, category, chains, startTime, endTime, _argsToArray20$, page, _argsToArray20$2, offset, apiKey, INPUTS, CHAINS, ADDRESS_MAP, _iterator41, _step41, inp, _address, ADDRS, out, _iterator42, _step42, _loop, _ret, _args25 = arguments;
+      return _regeneratorRuntime().wrap((function _callee22$(_context25) {
+        while (1) switch (_context25.prev = _context25.next) {
          case 0:
-          _context24.prev = 0;
+          _context25.prev = 0;
           fetchJSON = function() {
-            var _ref15 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee20(url) {
-              var _getUrlAndHeaders9, finalUrl, HEADERS, res, json;
-              return _regeneratorRuntime().wrap((function _callee20$(_context20) {
-                while (1) switch (_context20.prev = _context20.next) {
+            var _ref15 = _asyncToGenerator(_regeneratorRuntime().mark((function _callee21(url) {
+              var res, json;
+              return _regeneratorRuntime().wrap((function _callee21$(_context21) {
+                while (1) switch (_context21.prev = _context21.next) {
                  case 0:
-                  _getUrlAndHeaders9 = getUrlAndHeaders({
-                    url: url,
-                    serviceName: "Etherscan",
-                    headers: {}
-                  }), finalUrl = _getUrlAndHeaders9.URL, HEADERS = _getUrlAndHeaders9.HEADERS;
-                  _context20.next = 3;
-                  return fetch(finalUrl, {
-                    method: "GET",
-                    headers: HEADERS
-                  });
+                  _context21.next = 2;
+                  return fetch(url);
 
-                 case 3:
-                  res = _context20.sent;
+                 case 2:
+                  res = _context21.sent;
                   if (res.ok) {
-                    _context20.next = 6;
+                    _context21.next = 5;
                     break;
                   }
                   throw new NetworkError(SERVICES_API_KEY.Etherscan, res.status);
 
-                 case 6:
-                  _context20.next = 8;
+                 case 5:
+                  _context21.next = 7;
                   return res.json();
 
-                 case 8:
-                  json = _context20.sent;
+                 case 7:
+                  json = _context21.sent;
                   if (!(typeof json.result === "string")) {
-                    _context20.next = 14;
+                    _context21.next = 13;
                     break;
                   }
                   if (!json.result.includes("Invalid API Key")) {
-                    _context20.next = 12;
+                    _context21.next = 11;
                     break;
                   }
                   throw new InvalidApiKeyError(SERVICES_API_KEY.Etherscan);
 
-                 case 12:
+                 case 11:
                   if (!json.result.includes("Max rate limit reached")) {
-                    _context20.next = 14;
+                    _context21.next = 13;
                     break;
                   }
                   throw new RateLimitError(SERVICES_API_KEY.Etherscan);
 
-                 case 14:
-                  return _context20.abrupt("return", json.result);
+                 case 13:
+                  return _context21.abrupt("return", json.result);
 
-                 case 15:
+                 case 14:
                  case "end":
-                  return _context20.stop();
+                  return _context21.stop();
                 }
-              }), _callee20);
+              }), _callee21);
             })));
-            return function fetchJSON(_x17) {
+            return function fetchJSON(_x18) {
               return _ref15.apply(this, arguments);
             };
           }();
-          _argsToArray19 = argsToArray(_args24), _argsToArray20 = _slicedToArray(_argsToArray19, 7), 
+          _argsToArray19 = argsToArray(_args25), _argsToArray20 = _slicedToArray(_argsToArray19, 7), 
           addresses = _argsToArray20[0], category = _argsToArray20[1], chains = _argsToArray20[2], 
           startTime = _argsToArray20[3], endTime = _argsToArray20[4], _argsToArray20$ = _argsToArray20[5], 
           page = _argsToArray20$ === void 0 ? 1 : _argsToArray20$, _argsToArray20$2 = _argsToArray20[6], 
@@ -17642,6 +17581,13 @@ function _typeof(o) {
             offset: offset
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Etherscan);
+          if (apiKey) {
+            _context25.next = 7;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Etherscan);
+
+         case 7:
           INPUTS = addresses.split(",").map((function(s) {
             return s.trim();
           })).filter(Boolean);
@@ -17650,97 +17596,89 @@ function _typeof(o) {
           })).filter(Boolean);
           ADDRESS_MAP = {};
           _iterator41 = _createForOfIteratorHelper(INPUTS);
-          _context24.prev = 9;
+          _context25.prev = 11;
           _iterator41.s();
 
-         case 11:
+         case 13:
           if ((_step41 = _iterator41.n()).done) {
-            _context24.next = 26;
+            _context25.next = 25;
             break;
           }
           inp = _step41.value;
           if (!isAddress$1.isAddress(inp)) {
-            _context24.next = 17;
+            _context25.next = 19;
             break;
           }
           ADDRESS_MAP[inp.toLowerCase()] = null;
-          _context24.next = 24;
+          _context25.next = 23;
           break;
 
-         case 17:
-          ens = inp;
-          _context24.next = 20;
-          return fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
+         case 19:
+          _context25.next = 21;
+          return fromEnsNameToAddress$1.validateAndGetAddress(inp);
 
-         case 20:
-          resolved = _context24.sent;
-          if (resolved) {
-            _context24.next = 23;
-            break;
-          }
-          throw new EnsError(ens);
+         case 21:
+          _address = _context25.sent;
+          ADDRESS_MAP[_address.toLowerCase()] = _address;
 
          case 23:
-          ADDRESS_MAP[resolved.toLowerCase()] = ens;
-
-         case 24:
-          _context24.next = 11;
+          _context25.next = 13;
           break;
 
-         case 26:
-          _context24.next = 31;
+         case 25:
+          _context25.next = 30;
           break;
 
-         case 28:
-          _context24.prev = 28;
-          _context24.t0 = _context24["catch"](9);
-          _iterator41.e(_context24.t0);
+         case 27:
+          _context25.prev = 27;
+          _context25.t0 = _context25["catch"](11);
+          _iterator41.e(_context25.t0);
 
-         case 31:
-          _context24.prev = 31;
+         case 30:
+          _context25.prev = 30;
           _iterator41.f();
-          return _context24.finish(31);
+          return _context25.finish(30);
 
-         case 34:
+         case 33:
           ADDRS = Object.keys(ADDRESS_MAP);
           out = [];
           _iterator42 = _createForOfIteratorHelper(CHAINS);
-          _context24.prev = 37;
+          _context25.prev = 36;
           _loop = _regeneratorRuntime().mark((function _loop() {
             var chain, chainId, _loop2, _ret2, i, sb, eb, _loop3, _ret3, _i16, _ADDRS;
-            return _regeneratorRuntime().wrap((function _loop$(_context23) {
-              while (1) switch (_context23.prev = _context23.next) {
+            return _regeneratorRuntime().wrap((function _loop$(_context24) {
+              while (1) switch (_context24.prev = _context24.next) {
                case 0:
                 chain = _step42.value;
                 chainId = CHAIN_ID_MAP[chain];
                 if (chainId) {
-                  _context23.next = 4;
+                  _context24.next = 4;
                   break;
                 }
                 throw new ValidationError("Invalid chain: ".concat(chain));
 
                case 4:
                 if (!(category === "balance")) {
-                  _context23.next = 17;
+                  _context24.next = 17;
                   break;
                 }
                 _loop2 = _regeneratorRuntime().mark((function _loop2(i) {
                   var slice, url, data;
-                  return _regeneratorRuntime().wrap((function _loop2$(_context21) {
-                    while (1) switch (_context21.prev = _context21.next) {
+                  return _regeneratorRuntime().wrap((function _loop2$(_context22) {
+                    while (1) switch (_context22.prev = _context22.next) {
                      case 0:
                       slice = ADDRS.slice(i, i + 20).join(",");
                       url = "https://api.etherscan.io/v2/api?chainid=".concat(chainId) + "&module=account&action=addresstokenbalance&address=".concat(slice) + "&page=".concat(page, "&offset=").concat(offset, "&apikey=").concat(apiKey);
-                      _context21.next = 4;
+                      _context22.next = 4;
                       return fetchJSON(url);
 
                      case 4:
-                      data = _context21.sent;
+                      data = _context22.sent;
                       if (Array.isArray(data)) {
-                        _context21.next = 7;
+                        _context22.next = 7;
                         break;
                       }
-                      return _context21.abrupt("return", {
+                      return _context22.abrupt("return", {
                         v: {
                           v: data
                         }
@@ -17757,7 +17695,7 @@ function _typeof(o) {
 
                      case 8:
                      case "end":
-                      return _context21.stop();
+                      return _context22.stop();
                     }
                   }), _loop2);
                 }));
@@ -17765,48 +17703,48 @@ function _typeof(o) {
 
                case 7:
                 if (!(i < ADDRS.length)) {
-                  _context23.next = 15;
+                  _context24.next = 15;
                   break;
                 }
-                return _context23.delegateYield(_loop2(i), "t0", 9);
+                return _context24.delegateYield(_loop2(i), "t0", 9);
 
                case 9:
-                _ret2 = _context23.t0;
+                _ret2 = _context24.t0;
                 if (!_ret2) {
-                  _context23.next = 12;
+                  _context24.next = 12;
                   break;
                 }
-                return _context23.abrupt("return", _ret2.v);
+                return _context24.abrupt("return", _ret2.v);
 
                case 12:
                 i += 20;
-                _context23.next = 7;
+                _context24.next = 7;
                 break;
 
                case 15:
-                _context23.next = 37;
+                _context24.next = 37;
                 break;
 
                case 17:
-                _context23.next = 19;
+                _context24.next = 19;
                 return fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(startTime), chain, apiKey);
 
                case 19:
-                sb = _context23.sent;
-                _context23.next = 22;
+                sb = _context24.sent;
+                _context24.next = 22;
                 return fromTimestampToBlock.fromTimeStampToBlock(toTimestamp(endTime), chain, apiKey);
 
                case 22:
-                eb = _context23.sent;
+                eb = _context24.sent;
                 if (sb) {
-                  _context23.next = 25;
+                  _context24.next = 25;
                   break;
                 }
                 throw new ValidationError("Invalid startTime: ".concat(startTime));
 
                case 25:
                 if (eb) {
-                  _context23.next = 27;
+                  _context24.next = 27;
                   break;
                 }
                 throw new ValidationError("Invalid endTime: ".concat(endTime));
@@ -17814,21 +17752,21 @@ function _typeof(o) {
                case 27:
                 _loop3 = _regeneratorRuntime().mark((function _loop3() {
                   var addr, url, data;
-                  return _regeneratorRuntime().wrap((function _loop3$(_context22) {
-                    while (1) switch (_context22.prev = _context22.next) {
+                  return _regeneratorRuntime().wrap((function _loop3$(_context23) {
+                    while (1) switch (_context23.prev = _context23.next) {
                      case 0:
                       addr = _ADDRS[_i16];
                       url = "https://api.etherscan.io/v2/api?chainid=".concat(chainId) + "&module=account&action=tokentx&address=".concat(addr) + "&startblock=".concat(sb, "&endblock=").concat(eb) + "&page=".concat(page, "&offset=").concat(offset, "&sort=asc&apikey=").concat(apiKey);
-                      _context22.next = 4;
+                      _context23.next = 4;
                       return fetchJSON(url);
 
                      case 4:
-                      data = _context22.sent;
+                      data = _context23.sent;
                       if (Array.isArray(data)) {
-                        _context22.next = 7;
+                        _context23.next = 7;
                         break;
                       }
-                      return _context22.abrupt("return", {
+                      return _context23.abrupt("return", {
                         v: {
                           v: data
                         }
@@ -17845,7 +17783,7 @@ function _typeof(o) {
 
                      case 8:
                      case "end":
-                      return _context22.stop();
+                      return _context23.stop();
                     }
                   }), _loop3);
                 }));
@@ -17853,90 +17791,90 @@ function _typeof(o) {
 
                case 29:
                 if (!(_i16 < _ADDRS.length)) {
-                  _context23.next = 37;
+                  _context24.next = 37;
                   break;
                 }
-                return _context23.delegateYield(_loop3(), "t1", 31);
+                return _context24.delegateYield(_loop3(), "t1", 31);
 
                case 31:
-                _ret3 = _context23.t1;
+                _ret3 = _context24.t1;
                 if (!_ret3) {
-                  _context23.next = 34;
+                  _context24.next = 34;
                   break;
                 }
-                return _context23.abrupt("return", _ret3.v);
+                return _context24.abrupt("return", _ret3.v);
 
                case 34:
                 _i16++;
-                _context23.next = 29;
+                _context24.next = 29;
                 break;
 
                case 37:
                case "end":
-                return _context23.stop();
+                return _context24.stop();
               }
             }), _loop);
           }));
           _iterator42.s();
 
-         case 40:
+         case 39:
           if ((_step42 = _iterator42.n()).done) {
-            _context24.next = 47;
+            _context25.next = 46;
             break;
           }
-          return _context24.delegateYield(_loop(), "t1", 42);
+          return _context25.delegateYield(_loop(), "t1", 41);
 
-         case 42:
-          _ret = _context24.t1;
+         case 41:
+          _ret = _context25.t1;
           if (!_ret) {
-            _context24.next = 45;
+            _context25.next = 44;
             break;
           }
-          return _context24.abrupt("return", _ret.v);
+          return _context25.abrupt("return", _ret.v);
 
-         case 45:
-          _context24.next = 40;
+         case 44:
+          _context25.next = 39;
           break;
 
-         case 47:
-          _context24.next = 52;
+         case 46:
+          _context25.next = 51;
           break;
 
-         case 49:
-          _context24.prev = 49;
-          _context24.t2 = _context24["catch"](37);
-          _iterator42.e(_context24.t2);
+         case 48:
+          _context25.prev = 48;
+          _context25.t2 = _context25["catch"](36);
+          _iterator42.e(_context25.t2);
 
-         case 52:
-          _context24.prev = 52;
+         case 51:
+          _context25.prev = 51;
           _iterator42.f();
-          return _context24.finish(52);
+          return _context25.finish(51);
 
-         case 55:
-          return _context24.abrupt("return", out);
+         case 54:
+          return _context25.abrupt("return", out);
 
-         case 58:
-          _context24.prev = 58;
-          _context24.t3 = _context24["catch"](0);
-          return _context24.abrupt("return", errorMessageHandler(_context24.t3, "EOA"));
+         case 57:
+          _context25.prev = 57;
+          _context25.t3 = _context25["catch"](0);
+          return _context25.abrupt("return", errorMessageHandler(_context25.t3, "EOA"));
 
-         case 61:
+         case 60:
          case "end":
-          return _context24.stop();
+          return _context25.stop();
         }
-      }), _callee21, null, [ [ 0, 58 ], [ 9, 28, 31, 34 ], [ 37, 49, 52, 55 ] ]);
+      }), _callee22, null, [ [ 0, 57 ], [ 11, 27, 30, 33 ], [ 36, 48, 51, 54 ] ]);
     })));
     return _EOA.apply(this, arguments);
   }
-  function FLVURL(_x15, _x16) {
+  function FLVURL(_x16, _x17) {
     return _FLVURL.apply(this, arguments);
   }
   function _FLVURL() {
-    _FLVURL = _asyncToGenerator(_regeneratorRuntime().mark((function _callee22(token, vs_currencies) {
-      return _regeneratorRuntime().wrap((function _callee22$(_context25) {
-        while (1) switch (_context25.prev = _context25.next) {
+    _FLVURL = _asyncToGenerator(_regeneratorRuntime().mark((function _callee23(token, vs_currencies) {
+      return _regeneratorRuntime().wrap((function _callee23$(_context26) {
+        while (1) switch (_context26.prev = _context26.next) {
          case 0:
-          return _context25.abrupt("return", new Promise((function(resolve) {
+          return _context26.abrupt("return", new Promise((function(resolve) {
             setTimeout((function() {
               resolve([ {
                 Yoo: "gotcha"
@@ -17946,9 +17884,9 @@ function _typeof(o) {
 
          case 1:
          case "end":
-          return _context25.stop();
+          return _context26.stop();
         }
-      }), _callee22);
+      }), _callee23);
     })));
     return _FLVURL.apply(this, arguments);
   }
@@ -17956,13 +17894,13 @@ function _typeof(o) {
     return _SAFE.apply(this, arguments);
   }
   function _SAFE() {
-    _SAFE = _asyncToGenerator(_regeneratorRuntime().mark((function _callee23() {
-      var _argsToArray21, _argsToArray22, address, utility, chain, _argsToArray22$, limit, _argsToArray22$2, offset, apiKey, chainId, resolved, ens, url, _getUrlAndHeaders0, finalUrl, HEADERS, res, json, _args26 = arguments;
-      return _regeneratorRuntime().wrap((function _callee23$(_context26) {
-        while (1) switch (_context26.prev = _context26.next) {
+    _SAFE = _asyncToGenerator(_regeneratorRuntime().mark((function _callee24() {
+      var _argsToArray21, _argsToArray22, address, utility, chain, _argsToArray22$, limit, _argsToArray22$2, offset, apiKey, chainId, resolved, url, res, json, _args27 = arguments;
+      return _regeneratorRuntime().wrap((function _callee24$(_context27) {
+        while (1) switch (_context27.prev = _context27.next) {
          case 0:
-          _context26.prev = 0;
-          _argsToArray21 = argsToArray(_args26), _argsToArray22 = _slicedToArray(_argsToArray21, 5), 
+          _context27.prev = 0;
+          _argsToArray21 = argsToArray(_args27), _argsToArray22 = _slicedToArray(_argsToArray21, 5), 
           address = _argsToArray22[0], utility = _argsToArray22[1], chain = _argsToArray22[2], 
           _argsToArray22$ = _argsToArray22[3], limit = _argsToArray22$ === void 0 ? 10 : _argsToArray22$, 
           _argsToArray22$2 = _argsToArray22[4], offset = _argsToArray22$2 === void 0 ? 0 : _argsToArray22$2;
@@ -17974,81 +17912,70 @@ function _typeof(o) {
             offset: offset
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Safe);
-          chainId = SAFE_CHAIN_MAP[chain];
-          if (chainId) {
-            _context26.next = 7;
+          if (apiKey) {
+            _context27.next = 6;
             break;
           }
-          throw new ValidationError("Invalid chain: ".concat(chain));
+          throw new MissingApiKeyError(SERVICES_API_KEY.Safe);
 
-         case 7:
-          resolved = address;
-          if (isAddress$1.isAddress(resolved)) {
-            _context26.next = 15;
+         case 6:
+          chainId = SAFE_CHAIN_MAP[chain];
+          if (chainId) {
+            _context27.next = 9;
             break;
           }
-          ens = resolved;
-          _context26.next = 12;
-          return fromEnsNameToAddress$1.fromEnsNameToAddress(ens);
+          throw new ValidationError("Invalid chain: ".concat(chain));
 
-         case 12:
-          resolved = _context26.sent;
-          if (resolved) {
-            _context26.next = 15;
-            break;
-          }
-          throw new EnsError(ens);
+         case 9:
+          _context27.next = 11;
+          return fromEnsNameToAddress$1.validateAndGetAddress(address);
 
-         case 15:
+         case 11:
+          resolved = _context27.sent;
           url = "https://api.safe.global/tx-service/".concat(chainId, "/api/v2/safes/").concat(resolved, "/multisig-transactions?limit=").concat(limit, "&offset=").concat(offset);
-          _getUrlAndHeaders0 = getUrlAndHeaders({
-            url: url,
-            serviceName: "Etherscan",
+          _context27.next = 15;
+          return fetch(url, {
             headers: {
               Authorization: "Bearer ".concat(apiKey)
             }
-          }), finalUrl = _getUrlAndHeaders0.URL, HEADERS = _getUrlAndHeaders0.HEADERS;
-          _context26.next = 19;
-          return fetch(finalUrl, {
-            headers: HEADERS
           });
 
-         case 19:
-          res = _context26.sent;
+         case 15:
+          res = _context27.sent;
           if (res.ok) {
-            _context26.next = 22;
+            _context27.next = 18;
             break;
           }
           throw new NetworkError(SERVICES_API_KEY.Safe, res.status);
 
-         case 22:
-          _context26.next = 24;
+         case 18:
+          _context27.next = 20;
           return res.json();
 
-         case 24:
-          json = _context26.sent;
+         case 20:
+          json = _context27.sent;
           if (Array.isArray(json.results)) {
-            _context26.next = 27;
+            _context27.next = 23;
             break;
           }
           throw new ValidationError("Invalid API response");
 
-         case 27:
-          return _context26.abrupt("return", json.results.map((function(_ref16) {
+         case 23:
+          return _context27.abrupt("return", json.results.map((function(_ref16) {
             var confirmations = _ref16.confirmations, dataDecoded = _ref16.dataDecoded, rest = _objectWithoutProperties(_ref16, _excluded);
             return rest;
           })));
 
-         case 30:
-          _context26.prev = 30;
-          _context26.t0 = _context26["catch"](0);
-          return _context26.abrupt("return", errorMessageHandler(_context26.t0, "SAFE"));
+         case 26:
+          _context27.prev = 26;
+          _context27.t0 = _context27["catch"](0);
+          return _context27.abrupt("return", errorMessageHandler(_context27.t0, "SAFE"));
 
-         case 33:
+         case 29:
          case "end":
-          return _context26.stop();
+          return _context27.stop();
         }
-      }), _callee23, null, [ [ 0, 30 ] ]);
+      }), _callee24, null, [ [ 0, 26 ] ]);
     })));
     return _SAFE.apply(this, arguments);
   }
@@ -18056,61 +17983,68 @@ function _typeof(o) {
     return _DEFILLAMA.apply(this, arguments);
   }
   function _DEFILLAMA() {
-    _DEFILLAMA = _asyncToGenerator(_regeneratorRuntime().mark((function _callee24() {
-      var _argsToArray23, _argsToArray24, category, apiKey, url, res, json, _args27 = arguments;
-      return _regeneratorRuntime().wrap((function _callee24$(_context27) {
-        while (1) switch (_context27.prev = _context27.next) {
+    _DEFILLAMA = _asyncToGenerator(_regeneratorRuntime().mark((function _callee25() {
+      var _argsToArray23, _argsToArray24, category, apiKey, url, res, json, _args28 = arguments;
+      return _regeneratorRuntime().wrap((function _callee25$(_context28) {
+        while (1) switch (_context28.prev = _context28.next) {
          case 0:
-          _context27.prev = 0;
-          _argsToArray23 = argsToArray(_args27), _argsToArray24 = _slicedToArray(_argsToArray23, 1), 
+          _context28.prev = 0;
+          _argsToArray23 = argsToArray(_args28), _argsToArray24 = _slicedToArray(_argsToArray23, 1), 
           category = _argsToArray24[0];
           validateParams(defillamaParamsSchema, {
             category: category
           });
           apiKey = window.localStorage.getItem(SERVICES_API_KEY.Defillama);
+          if (apiKey) {
+            _context28.next = 6;
+            break;
+          }
+          throw new MissingApiKeyError(SERVICES_API_KEY.Defillama);
+
+         case 6:
           url = CATEGORY_URLS[category];
           if (url) {
-            _context27.next = 7;
+            _context28.next = 9;
             break;
           }
           throw new ValidationError("Invalid category: ".concat(category));
 
-         case 7:
-          _context27.next = 9;
+         case 9:
+          _context28.next = 11;
           return fetch(url);
 
-         case 9:
-          res = _context27.sent;
+         case 11:
+          res = _context28.sent;
           if (res.ok) {
-            _context27.next = 12;
+            _context28.next = 14;
             break;
           }
           throw new NetworkError(SERVICES_API_KEY.Defillama, res.status);
 
-         case 12:
-          _context27.next = 14;
+         case 14:
+          _context28.next = 16;
           return res.json();
 
-         case 14:
-          json = _context27.sent;
-          _context27.t0 = category;
-          _context27.next = _context27.t0 === "protocols" ? 18 : _context27.t0 === "yields" ? 20 : _context27.t0 === "dex" ? 22 : _context27.t0 === "fees" ? 22 : 24;
+         case 16:
+          json = _context28.sent;
+          _context28.t0 = category;
+          _context28.next = _context28.t0 === "protocols" ? 20 : _context28.t0 === "yields" ? 22 : _context28.t0 === "dex" ? 24 : _context28.t0 === "fees" ? 24 : 26;
           break;
 
-         case 18:
+         case 20:
           json = Array.isArray(json) ? json.slice(0, 500) : [];
-          return _context27.abrupt("break", 24);
+          return _context28.abrupt("break", 26);
 
-         case 20:
+         case 22:
           json = Array.isArray(json.data) ? json.data.slice(0, 500) : [];
-          return _context27.abrupt("break", 24);
+          return _context28.abrupt("break", 26);
 
-         case 22:
+         case 24:
           json = Array.isArray(json.protocols) ? json.protocols.slice(0, 500) : [];
-          return _context27.abrupt("break", 24);
+          return _context28.abrupt("break", 26);
 
-         case 24:
-          return _context27.abrupt("return", (Array.isArray(json) ? json : [ json ]).map((function(item) {
+         case 26:
+          return _context28.abrupt("return", (Array.isArray(json) ? json : [ json ]).map((function(item) {
             var out = {};
             for (var _i17 = 0, _Object$entries7 = Object.entries(item); _i17 < _Object$entries7.length; _i17++) {
               var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i17], 2), k = _Object$entries7$_i[0], v = _Object$entries7$_i[1];
@@ -18119,16 +18053,16 @@ function _typeof(o) {
             return out;
           })));
 
-         case 27:
-          _context27.prev = 27;
-          _context27.t1 = _context27["catch"](0);
-          return _context27.abrupt("return", errorMessageHandler(_context27.t1, "DEFILLAMA"));
+         case 29:
+          _context28.prev = 29;
+          _context28.t1 = _context28["catch"](0);
+          return _context28.abrupt("return", errorMessageHandler(_context28.t1, "DEFILLAMA"));
 
-         case 30:
+         case 32:
          case "end":
-          return _context27.stop();
+          return _context28.stop();
         }
-      }), _callee24, null, [ [ 0, 27 ] ]);
+      }), _callee25, null, [ [ 0, 29 ] ]);
     })));
     return _DEFILLAMA.apply(this, arguments);
   }
@@ -18136,13 +18070,13 @@ function _typeof(o) {
     return _UNISWAP.apply(this, arguments);
   }
   function _UNISWAP() {
-    _UNISWAP = _asyncToGenerator(_regeneratorRuntime().mark((function _callee25() {
-      var _argsToArray25, _argsToArray26, graphType, category, param1, param2, baseUrl, url, res, json, _args28 = arguments;
-      return _regeneratorRuntime().wrap((function _callee25$(_context28) {
-        while (1) switch (_context28.prev = _context28.next) {
+    _UNISWAP = _asyncToGenerator(_regeneratorRuntime().mark((function _callee26() {
+      var _argsToArray25, _argsToArray26, graphType, category, param1, param2, baseUrl, url, res, json, _args29 = arguments;
+      return _regeneratorRuntime().wrap((function _callee26$(_context29) {
+        while (1) switch (_context29.prev = _context29.next) {
          case 0:
-          _context28.prev = 0;
-          _argsToArray25 = argsToArray(_args28), _argsToArray26 = _slicedToArray(_argsToArray25, 4), 
+          _context29.prev = 0;
+          _argsToArray25 = argsToArray(_args29), _argsToArray26 = _slicedToArray(_argsToArray25, 4), 
           graphType = _argsToArray26[0], category = _argsToArray26[1], param1 = _argsToArray26[2], 
           param2 = _argsToArray26[3];
           validateParams(uniswapParamsSchema, {
@@ -18153,28 +18087,28 @@ function _typeof(o) {
           });
           baseUrl = "https://onchain-proxy.fileverse.io/third-party";
           url = "".concat(baseUrl) + "?service=uniswap" + "&graphType=".concat(graphType) + "&category=".concat(category) + "&input1=".concat(encodeURIComponent(param1)) + (param2 ? "&input2=".concat(encodeURIComponent(param2)) : "");
-          _context28.next = 7;
+          _context29.next = 7;
           return fetch(url);
 
          case 7:
-          res = _context28.sent;
+          res = _context29.sent;
           if (res.ok) {
-            _context28.next = 10;
+            _context29.next = 10;
             break;
           }
           throw new NetworkError("UNISWAP", res.status);
 
          case 10:
-          _context28.next = 12;
+          _context29.next = 12;
           return res.json();
 
          case 12:
-          json = _context28.sent;
+          json = _context29.sent;
           if (!Array.isArray(json)) {
-            _context28.next = 15;
+            _context29.next = 15;
             break;
           }
-          return _context28.abrupt("return", json.map((function(item) {
+          return _context29.abrupt("return", json.map((function(item) {
             var flat = {};
             Object.entries(item).forEach((function(_ref17) {
               var _ref18 = _slicedToArray(_ref17, 2), k = _ref18[0], v = _ref18[1];
@@ -18184,18 +18118,18 @@ function _typeof(o) {
           })));
 
          case 15:
-          return _context28.abrupt("return", json);
+          return _context29.abrupt("return", json);
 
          case 18:
-          _context28.prev = 18;
-          _context28.t0 = _context28["catch"](0);
-          return _context28.abrupt("return", errorMessageHandler(_context28.t0, "UNISWAP"));
+          _context29.prev = 18;
+          _context29.t0 = _context29["catch"](0);
+          return _context29.abrupt("return", errorMessageHandler(_context29.t0, "UNISWAP"));
 
          case 21:
          case "end":
-          return _context28.stop();
+          return _context29.stop();
         }
-      }), _callee25, null, [ [ 0, 18 ] ]);
+      }), _callee26, null, [ [ 0, 18 ] ]);
     })));
     return _UNISWAP.apply(this, arguments);
   }
@@ -18203,13 +18137,13 @@ function _typeof(o) {
     return _AAVE.apply(this, arguments);
   }
   function _AAVE() {
-    _AAVE = _asyncToGenerator(_regeneratorRuntime().mark((function _callee26() {
-      var _argsToArray27, _argsToArray28, graphType, category, param1, param2, baseUrl, url, res, json, _args29 = arguments;
-      return _regeneratorRuntime().wrap((function _callee26$(_context29) {
-        while (1) switch (_context29.prev = _context29.next) {
+    _AAVE = _asyncToGenerator(_regeneratorRuntime().mark((function _callee27() {
+      var _argsToArray27, _argsToArray28, graphType, category, param1, param2, baseUrl, url, res, json, _args30 = arguments;
+      return _regeneratorRuntime().wrap((function _callee27$(_context30) {
+        while (1) switch (_context30.prev = _context30.next) {
          case 0:
-          _context29.prev = 0;
-          _argsToArray27 = argsToArray(_args29), _argsToArray28 = _slicedToArray(_argsToArray27, 4), 
+          _context30.prev = 0;
+          _argsToArray27 = argsToArray(_args30), _argsToArray28 = _slicedToArray(_argsToArray27, 4), 
           graphType = _argsToArray28[0], category = _argsToArray28[1], param1 = _argsToArray28[2], 
           param2 = _argsToArray28[3];
           validateParams(aaveParamsSchema, {
@@ -18220,28 +18154,28 @@ function _typeof(o) {
           });
           baseUrl = "https://onchain-proxy.fileverse.io/third-party";
           url = "".concat(baseUrl) + "?service=aave" + "&graphType=".concat(encodeURIComponent(graphType)) + "&category=".concat(encodeURIComponent(category)) + "&input1=".concat(encodeURIComponent(param1)) + (param2 ? "&input2=".concat(encodeURIComponent(param2)) : "");
-          _context29.next = 7;
+          _context30.next = 7;
           return fetch(url);
 
          case 7:
-          res = _context29.sent;
+          res = _context30.sent;
           if (res.ok) {
-            _context29.next = 10;
+            _context30.next = 10;
             break;
           }
           throw new NetworkError("AAVE", res.status);
 
          case 10:
-          _context29.next = 12;
+          _context30.next = 12;
           return res.json();
 
          case 12:
-          json = _context29.sent;
+          json = _context30.sent;
           if (!Array.isArray(json)) {
-            _context29.next = 15;
+            _context30.next = 15;
             break;
           }
-          return _context29.abrupt("return", json.map((function(item) {
+          return _context30.abrupt("return", json.map((function(item) {
             var flat = {};
             Object.entries(item).forEach((function(_ref19) {
               var _ref20 = _slicedToArray(_ref19, 2), k = _ref20[0], v = _ref20[1];
@@ -18251,18 +18185,18 @@ function _typeof(o) {
           })));
 
          case 15:
-          return _context29.abrupt("return", json);
+          return _context30.abrupt("return", json);
 
          case 18:
-          _context29.prev = 18;
-          _context29.t0 = _context29["catch"](0);
-          return _context29.abrupt("return", errorMessageHandler(_context29.t0, "AAVE"));
+          _context30.prev = 18;
+          _context30.t0 = _context30["catch"](0);
+          return _context30.abrupt("return", errorMessageHandler(_context30.t0, "AAVE"));
 
          case 21:
          case "end":
-          return _context29.stop();
+          return _context30.stop();
         }
-      }), _callee26, null, [ [ 0, 18 ] ]);
+      }), _callee27, null, [ [ 0, 18 ] ]);
     })));
     return _AAVE.apply(this, arguments);
   }