@ethereansos/interfaces-core 0.4.117 → 0.4.120

package/dist/index.esm.js

@@ -48764,6 +48764,7 @@ var useEthosContext = function useEthosContext() {
   return context;
 };
 
+var abi$8 = new AbiCoder();
 var Web3Context = /*#__PURE__*/React.createContext('web3');
 var DEFAULT_BLOCK_INTERVAL = 15;
 var DEFAULT_BLOCK_INTERVAL_TIMEOUT = 40000;
@@ -48854,8 +48855,8 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
 
   var _useState23 = useState(null),
       _useState24 = _slicedToArray(_useState23, 2),
-      dualProvider = _useState24[0],
-      setDualProvider = _useState24[1];
+      dualChainWeb3 = _useState24[0],
+      setDualChainWeb3 = _useState24[1];
 
   useEffect(function () {
     setIpfsHttpClient(create(context.ipfsHost));
@@ -48907,19 +48908,69 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
       return _ref2.apply(this, arguments);
     };
   }(), [realBlockInterval]);
+  var tryUpdateDualChainBlock = useCallback( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(web3, oldValue, setter, force) {
+      var currentBlockNumber;
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (web3 !== null && web3 !== void 0 && web3.currentProvider) {
+                _context2.next = 2;
+                break;
+              }
+
+              return _context2.abrupt("return", setter(0));
+
+            case 2:
+              _context2.prev = 2;
+              _context2.next = 5;
+              return sendAsync(web3.currentProvider, 'eth_call', {
+                to: '0x4200000000000000000000000000000000000013',
+                data: web3Utils.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 = useCallback(function () {
     intervalId && clearInterval(intervalId);
     tryUpdateBlock(wallet === null || wallet === void 0 ? void 0 : wallet.ethereum, block, setBlock, true);
-    tryUpdateBlock(dualProvider, dualBlock, setDualBlock, true);
+    tryUpdateDualChainBlock(dualChainWeb3 && (wallet === null || wallet === void 0 ? void 0 : wallet.ethereum), dualBlock, setDualBlock, true);
 
-    if (wallet && wallet.ethereum || dualProvider) {
+    if (wallet && wallet.ethereum || dualChainWeb3) {
       setIntervalId(setInterval(function () {
         wallet && wallet.ethereum && tryUpdateBlock(wallet.ethereum, block, setBlock);
-        dualProvider && tryUpdateBlock(dualProvider, dualBlock, setDualBlock);
+        dualChainWeb3 && wallet && wallet.ethereum && tryUpdateDualChainBlock(wallet.ethereum, dualBlock, setDualBlock);
       }, realBlockIntervalTimeout));
     }
-  }, [wallet, dualProvider, realBlockIntervalTimeout, intervalId]);
-  useEffect(resetBlockInterval, [realBlockInterval, realBlockIntervalTimeout, wallet && wallet.ethereum, dualProvider]);
+  }, [wallet, dualChainWeb3, realBlockIntervalTimeout, intervalId]);
+  useEffect(resetBlockInterval, [realBlockInterval, realBlockIntervalTimeout, wallet && wallet.ethereum, dualChainWeb3]);
   useEffect(function () {
     setConnectionStatus(wallet && wallet.ethereum ? CONNECTED : connectionStatus === CONNECTING ? CONNECTING : NOT_CONNECTED);
     setWeb3Instance(wallet && wallet.ethereum && (web3Instance || new Web3(wallet.ethereum)) || null);
@@ -48931,7 +48982,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     setChainId(actualChainId);
     var actualDualChainId = actualChainId && context.dualChainId[actualChainId] || null;
     setDualChainId(actualDualChainId);
-    setDualProvider(actualDualChainId && new Web3.providers.HttpProvider(context.chainProvider[actualDualChainId]) || null);
+    setDualChainWeb3(actualDualChainId && new Web3(context.chainProvider[actualDualChainId]) || null);
     resetBlockInterval();
   }, [wallet && wallet.chainId]);
 
@@ -48988,31 +49039,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());
@@ -49021,13 +49072,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);
     }
 
@@ -49055,7 +49106,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     newContract: newContract,
     dualChainId: dualChainId,
     dualBlock: dualBlock,
-    dualProvider: dualProvider
+    dualChainWeb3: dualChainWeb3
   }), wallet && wallet.error && {
     errorMessage: wallet.error.message
   });
@@ -64562,7 +64613,9 @@ function _getTokenPricesInDollarsOnCoingecko() {
                         }()));
 
                       case 6:
-                        res.data = _context3.sent.reduce(({}));
+                        res.data = _context3.sent.reduce(function (acc, it) {
+                          return _objectSpread2(_objectSpread2({}, acc), it);
+                        }, {});
 
                       case 7:
                         _context3.next = 11;