@ethereansos/interfaces-core 0.4.118 → 0.4.121

package/dist/index.esm.js

@@ -23746,46 +23746,107 @@ var URL_REGEXP = new RegExp('(http://www.|https://www.|http://|https://)?[a-z0-9
 var solidityImportRule = new RegExp('import( )+"(\\d+)"( )*;', 'gs');
 var pragmaSolidityRule = new RegExp('pragma( )+solidity( )*(\\^|>)\\d+.\\d+.\\d+;', 'gs');
 
-function sendAsync(provider, method) {
-  var params = Array.prototype.slice.call(arguments).slice(2) || [];
-  return new Promise( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee(ok, ko) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              _context.next = 3;
-              return (provider.sendAsync || provider.send).call(provider, {
-                jsonrpc: '2.0',
-                method: method,
-                params: params,
-                id: new Date().getTime()
-              }, function (error, response) {
-                return error || response && response.error ? ko(error || response && response.error) : ok(response && response.result);
-              });
+var instrumentedProviders = {};
 
-            case 3:
-              _context.next = 8;
+function sendAsync(_x, _x2) {
+  return _sendAsync.apply(this, arguments);
+}
+
+function _sendAsync() {
+  _sendAsync = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(inputProvider, method) {
+    var provider,
+        chainId,
+        _ref,
+        chainProvider,
+        params,
+        _args2 = arguments;
+
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            provider = inputProvider;
+
+            if (!(method !== 'eth_chainId')) {
+              _context2.next = 12;
               break;
+            }
 
-            case 5:
-              _context.prev = 5;
-              _context.t0 = _context["catch"](0);
-              return _context.abrupt("return", ko(_context.t0));
+            _context2.t0 = provider.chainId;
 
-            case 8:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[0, 5]]);
-    }));
+            if (_context2.t0) {
+              _context2.next = 9;
+              break;
+            }
 
-    return function (_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }());
+            _context2.t1 = parseInt;
+            _context2.next = 7;
+            return sendAsync(provider, 'eth_chainId');
+
+          case 7:
+            _context2.t2 = _context2.sent;
+            _context2.t0 = (0, _context2.t1)(_context2.t2);
+
+          case 9:
+            chainId = provider.chainId = _context2.t0;
+            _ref = sendAsync.context || {
+              chainProvider: {}
+            }, chainProvider = _ref.chainProvider;
+            provider = chainProvider[chainId] ? instrumentedProviders[chainId] = instrumentedProviders[chainId] || new Web3.providers.HttpProvider(chainProvider[chainId]) : provider;
+
+          case 12:
+            params = Array.prototype.slice.call(_args2).slice(2) || [];
+            _context2.next = 15;
+            return new Promise( /*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee(ok, ko) {
+                return regeneratorRuntime.wrap(function _callee$(_context) {
+                  while (1) {
+                    switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.prev = 0;
+                        _context.next = 3;
+                        return (provider.request || provider.sendAsync || provider.send).call(provider, {
+                          jsonrpc: '2.0',
+                          method: method,
+                          params: params,
+                          id: new Date().getTime()
+                        }, function (error, response) {
+                          return error || response && response.error ? ko(error || response && response.error) : ok(response && response.result);
+                        });
+
+                      case 3:
+                        _context.next = 8;
+                        break;
+
+                      case 5:
+                        _context.prev = 5;
+                        _context.t0 = _context["catch"](0);
+                        return _context.abrupt("return", ko(_context.t0));
+
+                      case 8:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }
+                }, _callee, null, [[0, 5]]);
+              }));
+
+              return function (_x3, _x4) {
+                return _ref2.apply(this, arguments);
+              };
+            }());
+
+          case 15:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 16:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _sendAsync.apply(this, arguments);
 }
 
 /**
@@ -48764,6 +48825,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;
@@ -48777,6 +48839,7 @@ var useWeb3 = function useWeb3() {
 };
 var Web3ContextProvider = function Web3ContextProvider(props) {
   var context = useEthosContext();
+  sendAsync.context = sendAsync.context || context;
   var connectors = context.useWalletSettings.reduce(function (acc, connector) {
     return _objectSpread2(_objectSpread2({}, acc), _defineProperty({}, connector.id, _objectSpread2(_objectSpread2({}, connector.settings), {}, {
       buttonText: connector.buttonText
@@ -48854,8 +48917,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 +48970,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 +49044,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]);
 
@@ -48987,32 +49100,37 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     return globalContracts[index];
   };
 
+  useEffect(function () {
+    chainId && web3Instance && web3Instance.currentProvider && !web3Instance.currentProvider.chainId && (web3Instance.currentProvider.chainId = chainId);
+    dualChainId && dualChainWeb3 && dualChainWeb3.currentProvider && !dualChainWeb3.currentProvider.chainId && (dualChainWeb3.currentProvider.chainId = dualChainId);
+  }, [chainId, web3Instance, dualChainId, dualChainWeb3]);
+
   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 +49139,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 +49173,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     newContract: newContract,
     dualChainId: dualChainId,
     dualBlock: dualBlock,
-    dualProvider: dualProvider
+    dualChainWeb3: dualChainWeb3
   }), wallet && wallet.error && {
     errorMessage: wallet.error.message
   });