@ethereansos/interfaces-core 0.4.119 → 0.4.122

package/dist/index.cjs.js

@@ -23758,46 +23758,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 = parseInt;
+            _context2.t1 = provider.chainId;
 
-            case 8:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[0, 5]]);
-    }));
+            if (_context2.t1) {
+              _context2.next = 8;
+              break;
+            }
 
-    return function (_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }());
+            _context2.next = 7;
+            return sendAsync(provider, 'eth_chainId');
+
+          case 7:
+            _context2.t1 = _context2.sent;
+
+          case 8:
+            _context2.t2 = _context2.t1;
+            chainId = provider.chainId = (0, _context2.t0)(_context2.t2);
+            _ref = sendAsync.context || {
+              chainProvider: {}
+            }, chainProvider = _ref.chainProvider;
+            provider = chainId !== 1 && chainProvider[chainId] ? instrumentedProviders[chainId] = instrumentedProviders[chainId] || new Web3__default["default"].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);
 }
 
 /**
@@ -48790,6 +48851,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
@@ -48867,8 +48929,8 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
 
   var _useState23 = React.useState(null),
       _useState24 = _slicedToArray(_useState23, 2),
-      dualProvider = _useState24[0],
-      setDualProvider = _useState24[1];
+      dualChainWeb3 = _useState24[0],
+      setDualChainWeb3 = _useState24[1];
 
   React.useEffect(function () {
     setIpfsHttpClient(ipfsHttpClient.create(context.ipfsHost));
@@ -48920,14 +48982,14 @@ 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 tryUpdateDualChainBlock = React.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 (provider) {
+              if (web3 !== null && web3 !== void 0 && web3.currentProvider) {
                 _context2.next = 2;
                 break;
               }
@@ -48937,7 +48999,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
             case 2:
               _context2.prev = 2;
               _context2.next = 5;
-              return sendAsync(provider, 'eth_call', {
+              return sendAsync(web3.currentProvider, 'eth_call', {
                 to: '0x4200000000000000000000000000000000000013',
                 data: web3Utils__default["default"].sha3('getL1BlockNumber()').substring(0, 10)
               });
@@ -48973,16 +49035,16 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
   var resetBlockInterval = React.useCallback(function () {
     intervalId && clearInterval(intervalId);
     tryUpdateBlock(wallet === null || wallet === void 0 ? void 0 : wallet.ethereum, block, setBlock, true);
-    tryUpdateBlockDual(dualProvider && (wallet === null || wallet === void 0 ? void 0 : wallet.ethereum), 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 && wallet && wallet.ethereum && tryUpdateBlockDual(wallet.ethereum, dualBlock, setDualBlock);
+        dualChainWeb3 && wallet && wallet.ethereum && tryUpdateDualChainBlock(wallet.ethereum, dualBlock, setDualBlock);
       }, realBlockIntervalTimeout));
     }
-  }, [wallet, dualProvider, realBlockIntervalTimeout, intervalId]);
-  React.useEffect(resetBlockInterval, [realBlockInterval, realBlockIntervalTimeout, wallet && wallet.ethereum, dualProvider]);
+  }, [wallet, dualChainWeb3, realBlockIntervalTimeout, intervalId]);
+  React.useEffect(resetBlockInterval, [realBlockInterval, realBlockIntervalTimeout, wallet && wallet.ethereum, dualChainWeb3]);
   React.useEffect(function () {
     setConnectionStatus(wallet && wallet.ethereum ? CONNECTED : connectionStatus === CONNECTING ? CONNECTING : NOT_CONNECTED);
     setWeb3Instance(wallet && wallet.ethereum && (web3Instance || new Web3__default["default"](wallet.ethereum)) || null);
@@ -48994,7 +49056,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     setChainId(actualChainId);
     var actualDualChainId = actualChainId && context.dualChainId[actualChainId] || null;
     setDualChainId(actualDualChainId);
-    setDualProvider(actualDualChainId && new Web3__default["default"].providers.HttpProvider(context.chainProvider[actualDualChainId]) || null);
+    setDualChainWeb3(actualDualChainId && new Web3__default["default"](context.chainProvider[actualDualChainId]) || null);
     resetBlockInterval();
   }, [wallet && wallet.chainId]);
 
@@ -49050,6 +49112,11 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     return globalContracts[index];
   };
 
+  React.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 _callee3(acc) {
       return regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -49118,7 +49185,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     newContract: newContract,
     dualChainId: dualChainId,
     dualBlock: dualBlock,
-    dualProvider: dualProvider
+    dualChainWeb3: dualChainWeb3
   }), wallet && wallet.error && {
     errorMessage: wallet.error.message
   });