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

package/lib/browser/formula.js

@@ -1,4 +1,4 @@
-/* @fileverse-dev/formulajs v4.4.11-mod-15-patch-2 */
+/* @fileverse-dev/formulajs v4.4.11-mod-16 */
 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() {
@@ -10745,49 +10745,43 @@ function _typeof(o) {
     Gnosisscan: "GNOSISSSCAN",
     BASESCAN: "Basescan"
   };
-  var CHAIN_API_BASE = {
-    ethereum: "https://api.etherscan.io/api",
-    gnosis: "https://api.gnosisscan.io/api",
-    base: "https://api.basescan.org/api"
+  var CHAIN_ID_MAP = {
+    ethereum: 1,
+    gnosis: 100,
+    base: 8453
   };
   var fromTimeStampToBlock = function() {
     var _ref = _asyncToGenerator(_regeneratorRuntime().mark((function _callee(timestamp, chain, apiKey) {
-      var baseUrl, url, res, json;
+      var chainId, url, res, json;
       return _regeneratorRuntime().wrap((function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
          case 0:
-          baseUrl = CHAIN_API_BASE[chain];
-          if (baseUrl) {
-            _context.next = 3;
+          if (!(!timestamp || !chain || !apiKey)) {
+            _context.next = 2;
             break;
           }
-          throw new Error("Unsupported Chain");
+          return _context.abrupt("return");
 
-         case 3:
-          _context.prev = 3;
-          url = "".concat(baseUrl, "?module=block&action=getblocknobytime&timestamp=").concat(timestamp, "&closest=before&apikey=").concat(apiKey);
-          _context.next = 7;
+         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 7:
+         case 6:
           res = _context.sent;
-          _context.next = 10;
+          _context.next = 9;
           return res.json();
 
-         case 10:
+         case 9:
           json = _context.sent;
           return _context.abrupt("return", parseInt(json.result));
 
-         case 14:
-          _context.prev = 14;
-          _context.t0 = _context["catch"](3);
-          return _context.abrupt("return", 0);
-
-         case 17:
+         case 11:
          case "end":
           return _context.stop();
         }
-      }), _callee, null, [ [ 3, 14 ] ]);
+      }), _callee);
     })));
     return function fromTimeStampToBlock(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -10920,7 +10914,7 @@ function _typeof(o) {
   }
   function _OX() {
     _OX = _asyncToGenerator(_regeneratorRuntime().mark((function _callee4(address, categories, chain, startTime, endTime) {
-      var API_KEYS, apiKey, baseUrl, startBlock, endBlock, action, url, _json$result, _json$result$includes, response, json;
+      var API_KEYS, apiKey, chainId, action, timeQuery, startBlock, endBlock, url, _json$result, _json$result$includes, response, json;
       return _regeneratorRuntime().wrap((function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
          case 0:
@@ -10930,58 +10924,89 @@ function _typeof(o) {
             base: window.localStorage.getItem(SERVICE_API_KEY.Basescan)
           };
           apiKey = API_KEYS[chain];
-          baseUrl = CHAIN_API_BASE[chain];
-          _context4.next = 5;
-          return fromTimeStampToBlock(startTime, chain, apiKey);
+          chainId = CHAIN_ID_MAP[chain];
+          if (!(!apiKey || !chainId)) {
+            _context4.next = 5;
+            break;
+          }
+          return _context4.abrupt("return", "".concat(chain.toUpperCase(), "_MISSING"));
 
          case 5:
+          action = "";
+          if (categories === "txns") action = "account.txlist"; else {
+            action = "account.balance";
+          }
+          timeQuery = "";
+          if (!(!isNaN(startTime) && !isNaN(endTime))) {
+            _context4.next = 18;
+            break;
+          }
+          _context4.next = 11;
+          return fromTimeStampToBlock(startTime, chain, apiKey);
+
+         case 11:
           startBlock = _context4.sent;
-          _context4.next = 8;
-          return fromTimeStampToBlock(endTime);
+          _context4.next = 14;
+          return fromTimeStampToBlock(endTime, chain, apiKey);
 
-         case 8:
+         case 14:
           endBlock = _context4.sent;
-          action = "";
-          if (categories === "txns") action = "txlist"; else if (categories === "balances") action = "balance"; else if (categories === "portfolio") action = "tokentx";
-          url = "".concat(baseUrl, "?module=account&action=").concat(action, "&address=").concat(address, "&startblock=").concat(startBlock, "&endblock=").concat(endBlock, "&sort=asc&apikey=").concat(apiKey);
-          _context4.prev = 12;
-          _context4.next = 15;
+          timeQuery = "&startblock=".concat(startBlock, "&endblock=").concat(endBlock);
+          _context4.next = 23;
+          break;
+
+         case 18:
+          if (!(categories === "balance")) {
+            _context4.next = 22;
+            break;
+          }
+          timeQuery = "&tag=latest";
+          _context4.next = 23;
+          break;
+
+         case 22:
+          throw new Error("Start and End Time is required for querying transaction list ");
+
+         case 23:
+          url = "https://api.etherscan.io/v2/api?module=".concat(action.split(".")[0], "&action=").concat(action.split(".")[1], "&address=").concat(address, "&sort=asc&chainid=").concat(chainId, "&apikey=").concat(apiKey).concat(timeQuery);
+          _context4.prev = 24;
+          _context4.next = 27;
           return fetch(url);
 
-         case 15:
+         case 27:
           response = _context4.sent;
           if (response.ok) {
-            _context4.next = 18;
+            _context4.next = 30;
             break;
           }
           throw new Error("HTTP error! Status: ".concat(response.status));
 
-         case 18:
-          _context4.next = 20;
+         case 30:
+          _context4.next = 32;
           return response.json();
 
-         case 20:
+         case 32:
           json = _context4.sent;
           if (!((_json$result = json.result) !== null && _json$result !== void 0 && (_json$result$includes = _json$result.includes) !== null && _json$result$includes !== void 0 && _json$result$includes.call(_json$result, "Invalid API Key"))) {
-            _context4.next = 23;
+            _context4.next = 35;
             break;
           }
           return _context4.abrupt("return", "".concat(SERVICE_API_KEY[chain.charAt(0).toUpperCase() + chain.slice(1)], "_MISSING"));
 
-         case 23:
+         case 35:
           return _context4.abrupt("return", json.result);
 
-         case 26:
-          _context4.prev = 26;
-          _context4.t0 = _context4["catch"](12);
+         case 38:
+          _context4.prev = 38;
+          _context4.t0 = _context4["catch"](24);
           console.log(_context4.t0);
           return _context4.abrupt("return", "ERROR IN FETCHING");
 
-         case 30:
+         case 42:
          case "end":
           return _context4.stop();
         }
-      }), _callee4, null, [ [ 12, 26 ] ]);
+      }), _callee4, null, [ [ 24, 38 ] ]);
     })));
     return _OX.apply(this, arguments);
   }