@ethereansos/interfaces-core 0.4.116 → 0.4.119

package/dist/index.cjs.js

@@ -48776,6 +48776,7 @@ var useEthosContext = function useEthosContext() {
   return context;
 };
 
+var abi$8 = new AbiCoder();
 var Web3Context = /*#__PURE__*/React__default["default"].createContext('web3');
 var DEFAULT_BLOCK_INTERVAL = 15;
 var DEFAULT_BLOCK_INTERVAL_TIMEOUT = 40000;
@@ -48919,15 +48920,65 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
       return _ref2.apply(this, arguments);
     };
   }(), [realBlockInterval]);
+  var tryUpdateBlockDual = React.useCallback( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(provider, oldValue, setter, force) {
+      var currentBlockNumber;
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (provider) {
+                _context2.next = 2;
+                break;
+              }
+
+              return _context2.abrupt("return", setter(0));
+
+            case 2:
+              _context2.prev = 2;
+              _context2.next = 5;
+              return sendAsync(provider, 'eth_call', {
+                to: '0x4200000000000000000000000000000000000013',
+                data: web3Utils__default["default"].sha3('getL1BlockNumber()').substring(0, 10)
+              });
+
+            case 5:
+              currentBlockNumber = _context2.sent;
+              currentBlockNumber = abi$8.decode(['uint256'], currentBlockNumber)[0].toString();
+              currentBlockNumber = parseInt(currentBlockNumber);
+
+              if (force === true || currentBlockNumber - oldValue >= realBlockInterval) {
+                setter(currentBlockNumber);
+              }
+
+              _context2.next = 13;
+              break;
+
+            case 11:
+              _context2.prev = 11;
+              _context2.t0 = _context2["catch"](2);
+
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, null, [[2, 11]]);
+    }));
+
+    return function (_x5, _x6, _x7, _x8) {
+      return _ref3.apply(this, arguments);
+    };
+  }(), [realBlockInterval]);
   var resetBlockInterval = React.useCallback(function () {
     intervalId && clearInterval(intervalId);
     tryUpdateBlock(wallet === null || wallet === void 0 ? void 0 : wallet.ethereum, block, setBlock, true);
-    tryUpdateBlock(dualProvider, dualBlock, setDualBlock, true);
+    tryUpdateBlockDual(dualProvider && (wallet === null || wallet === void 0 ? void 0 : wallet.ethereum), dualBlock, setDualBlock, true);
 
     if (wallet && wallet.ethereum || dualProvider) {
       setIntervalId(setInterval(function () {
         wallet && wallet.ethereum && tryUpdateBlock(wallet.ethereum, block, setBlock);
-        dualProvider && tryUpdateBlock(dualProvider, dualBlock, setDualBlock);
+        dualProvider && wallet && wallet.ethereum && tryUpdateBlockDual(wallet.ethereum, dualBlock, setDualBlock);
       }, realBlockIntervalTimeout));
     }
   }, [wallet, dualProvider, realBlockIntervalTimeout, intervalId]);
@@ -49000,31 +49051,31 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
   };
 
   window.setAccount = /*#__PURE__*/function () {
-    var _setAccount = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(acc) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _setAccount = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(acc) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               delete window.account;
               acc && (window.account = acc);
-              _context2.prev = 2;
-              _context2.t0 = acc && window.ganache;
+              _context3.prev = 2;
+              _context3.t0 = acc && window.ganache;
 
-              if (!_context2.t0) {
-                _context2.next = 7;
+              if (!_context3.t0) {
+                _context3.next = 7;
                 break;
               }
 
-              _context2.next = 7;
+              _context3.next = 7;
               return sendAsync(window.ganache, 'evm_addAccount', acc, 0);
 
             case 7:
-              _context2.next = 11;
+              _context3.next = 11;
               break;
 
             case 9:
-              _context2.prev = 9;
-              _context2.t1 = _context2["catch"](2);
+              _context3.prev = 9;
+              _context3.t1 = _context3["catch"](2);
 
             case 11:
               setBlock(new Date().getTime());
@@ -49033,13 +49084,13 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
 
             case 14:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[2, 9]]);
+      }, _callee3, null, [[2, 9]]);
     }));
 
-    function setAccount(_x5) {
+    function setAccount(_x9) {
       return _setAccount.apply(this, arguments);
     }
 
@@ -64428,12 +64479,12 @@ function getTokenPricesInDollarsOnCoingecko(_x4, _x5) {
 }
 
 function _getTokenPricesInDollarsOnCoingecko() {
-  _getTokenPricesInDollarsOnCoingecko = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(_ref2, t) {
+  _getTokenPricesInDollarsOnCoingecko = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(_ref2, t) {
     var context, web3Data, tokens, response, tkns, _iterator2, _step2, token, prom, _i, _tkns, _i2, _tkns2, _iterator3, _step3;
 
-    return regeneratorRuntime.wrap(function _callee3$(_context3) {
+    return regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
             context = _ref2.context, web3Data = _ref2.web3Data;
             tokens = (!(t instanceof Array) ? t = t.split(',') : t).map(function (it) {
@@ -64444,139 +64495,164 @@ function _getTokenPricesInDollarsOnCoingecko() {
             };
             tkns = [];
             _iterator2 = _createForOfIteratorHelper(tokens);
-            _context3.prev = 5;
+            _context4.prev = 5;
 
             _iterator2.s();
 
           case 7:
             if ((_step2 = _iterator2.n()).done) {
-              _context3.next = 29;
+              _context4.next = 29;
               break;
             }
 
             token = _step2.value;
 
             if (!(!token || token === VOID_ETHEREUM_ADDRESS)) {
-              _context3.next = 14;
+              _context4.next = 14;
               break;
             }
 
-            _context3.next = 12;
+            _context4.next = 12;
             return getEthereumPrice({
               context: context
             });
 
           case 12:
-            response.data[token] = _context3.sent;
-            return _context3.abrupt("continue", 27);
+            response.data[token] = _context4.sent;
+            return _context4.abrupt("continue", 27);
 
           case 14:
             if (!(tokenPrices[token] && tokenPrices[token].requestExpires > new Date().getTime() && tokenPrices[token].price !== 0)) {
-              _context3.next = 18;
+              _context4.next = 18;
               break;
             }
 
             response.data[token] = {
               usd: tokenPrices[token].price
             };
-            _context3.next = 27;
+            _context4.next = 27;
             break;
 
           case 18:
             if (!tokenPricesPromises[token]) {
-              _context3.next = 26;
+              _context4.next = 26;
               break;
             }
 
-            _context3.next = 21;
+            _context4.next = 21;
             return tokenPricesPromises[token];
 
           case 21:
-            _context3.t0 = token;
-            _context3.t1 = _context3.sent.data[_context3.t0].usd;
+            _context4.t0 = token;
+            _context4.t1 = _context4.sent.data[_context4.t0].usd;
             response.data[token] = {
-              usd: _context3.t1
+              usd: _context4.t1
             };
-            _context3.next = 27;
+            _context4.next = 27;
             break;
 
           case 26:
             tkns.push(token);
 
           case 27:
-            _context3.next = 7;
+            _context4.next = 7;
             break;
 
           case 29:
-            _context3.next = 34;
+            _context4.next = 34;
             break;
 
           case 31:
-            _context3.prev = 31;
-            _context3.t2 = _context3["catch"](5);
+            _context4.prev = 31;
+            _context4.t2 = _context4["catch"](5);
 
-            _iterator2.e(_context3.t2);
+            _iterator2.e(_context4.t2);
 
           case 34:
-            _context3.prev = 34;
+            _context4.prev = 34;
 
             _iterator2.f();
 
-            return _context3.finish(34);
+            return _context4.finish(34);
 
           case 37:
             prom = /*#__PURE__*/function () {
-              var _ref3 = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(t1, t2) {
+              var _ref3 = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(t1, t2) {
                 var res;
-                return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                return regeneratorRuntime.wrap(function _callee3$(_context3) {
                   while (1) {
-                    switch (_context2.prev = _context2.next) {
+                    switch (_context3.prev = _context3.next) {
                       case 0:
                         res = {
                           data: {}
                         };
-                        _context2.prev = 1;
-                        _context2.t0 = t1.length > 0;
+                        _context3.prev = 1;
+                        _context3.t0 = t1.length > 0;
 
-                        if (!_context2.t0) {
-                          _context2.next = 9;
+                        if (!_context3.t0) {
+                          _context3.next = 7;
                           break;
                         }
 
-                        _context2.next = 6;
-                        return fetch(context.coingeckoCoinPriceURL + t1.join(','));
+                        _context3.next = 6;
+                        return Promise.all(context.coingeckoCoinPriceURLTemplates.map( /*#__PURE__*/function () {
+                          var _ref4 = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(it) {
+                            return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                              while (1) {
+                                switch (_context2.prev = _context2.next) {
+                                  case 0:
+                                    _context2.next = 2;
+                                    return fetch(it + t1.join(','));
+
+                                  case 2:
+                                    _context2.next = 4;
+                                    return _context2.sent.json();
+
+                                  case 4:
+                                    return _context2.abrupt("return", _context2.sent);
+
+                                  case 5:
+                                  case "end":
+                                    return _context2.stop();
+                                }
+                              }
+                            }, _callee2);
+                          }));
+
+                          return function (_x8) {
+                            return _ref4.apply(this, arguments);
+                          };
+                        }()));
 
                       case 6:
-                        _context2.next = 8;
-                        return _context2.sent.json();
+                        res.data = _context3.sent.reduce(function (acc, it) {
+                          return _objectSpread2(_objectSpread2({}, acc), it);
+                        }, {});
 
-                      case 8:
-                        res.data = _context2.sent;
+                      case 7:
+                        _context3.next = 11;
+                        break;
 
                       case 9:
-                        _context2.next = 13;
-                        break;
+                        _context3.prev = 9;
+                        _context3.t1 = _context3["catch"](1);
 
                       case 11:
-                        _context2.prev = 11;
-                        _context2.t1 = _context2["catch"](1);
-
-                      case 13:
-                        _context2.next = 15;
+                        _context3.next = 13;
                         return elaboratePrices({
                           context: context,
                           web3Data: web3Data
                         }, res, t2);
 
-                      case 15:
-                        return _context2.abrupt("return", _context2.sent);
+                      case 13:
+                        return _context3.abrupt("return", _context3.sent);
 
-                      case 16:
+                      case 14:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
                   }
-                }, _callee2, null, [[1, 11]]);
+                }, _callee3, null, [[1, 9]]);
               }));
 
               return function prom(_x6, _x7) {
@@ -64591,11 +64667,11 @@ function _getTokenPricesInDollarsOnCoingecko() {
               tokenPricesPromises[token] = prom;
             }
 
-            _context3.next = 42;
+            _context4.next = 42;
             return prom;
 
           case 42:
-            prom = _context3.sent;
+            prom = _context4.sent;
             Object.entries(prom.data).forEach(function (it) {
               return response.data[it[0]] = it[1];
             });
@@ -64621,14 +64697,14 @@ function _getTokenPricesInDollarsOnCoingecko() {
               _iterator3.f();
             }
 
-            return _context3.abrupt("return", response);
+            return _context4.abrupt("return", response);
 
           case 48:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3, null, [[5, 31, 34, 37]]);
+    }, _callee4, null, [[5, 31, 34, 37]]);
   }));
   return _getTokenPricesInDollarsOnCoingecko.apply(this, arguments);
 }