@ethereansos/interfaces-core 0.4.92 → 0.4.95

package/dist/index.esm.js

@@ -32118,6 +32118,7 @@ var getEtherscanAddress = function getEtherscanAddress(postFix, chainId) {
 };
 
 function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, value, additionalData) {
+  provider = window.ganache || provider;
   additionalData = additionalData || {};
   var address = fromOrPlainPrivateKey;
   var privateKey;
@@ -32172,119 +32173,99 @@ function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, va
               _context2.t4 = _context2.t3;
               tx.gasLimit = _context2.t2.toHex.call(_context2.t2, _context2.t4);
 
-              if (!provider.blockchainConnection) {
-                _context2.next = 44;
-                break;
-              }
-
-              _context2.prev = 25;
-              _context2.t5 = provider.accounts.indexOf(tx.from) === -1;
-
-              if (!_context2.t5) {
-                _context2.next = 30;
+              if (!window.ganache) {
+                _context2.next = 35;
                 break;
               }
 
+              _context2.t5 = ok;
+              _context2.t6 = sendAsync;
+              _context2.t7 = window.ganache;
               _context2.next = 30;
-              return provider.blockchainConnection.unlockAccounts(tx.from);
-
-            case 30:
-              _context2.next = 34;
-              break;
-
-            case 32:
-              _context2.prev = 32;
-              _context2.t6 = _context2["catch"](25);
-
-            case 34:
-              _context2.t7 = ok;
-              _context2.t8 = sendAsync;
-              _context2.t9 = provider;
-              _context2.next = 39;
               return sendAsync(provider, 'eth_sendTransaction', tx);
 
-            case 39:
-              _context2.t10 = _context2.sent;
-              _context2.next = 42;
-              return (0, _context2.t8)(_context2.t9, 'eth_getTransactionReceipt', _context2.t10);
+            case 30:
+              _context2.t8 = _context2.sent;
+              _context2.next = 33;
+              return (0, _context2.t6)(_context2.t7, 'eth_getTransactionReceipt', _context2.t8);
 
-            case 42:
-              _context2.t11 = _context2.sent;
-              return _context2.abrupt("return", (0, _context2.t7)(_context2.t11));
+            case 33:
+              _context2.t9 = _context2.sent;
+              return _context2.abrupt("return", (0, _context2.t5)(_context2.t9));
 
-            case 44:
+            case 35:
               if (!(window.bypassEstimation || additionalData.gasLimit)) {
-                _context2.next = 48;
+                _context2.next = 39;
                 break;
               }
 
-              _context2.t12 = tx.gasLimit;
-              _context2.next = 60;
+              _context2.t10 = tx.gasLimit;
+              _context2.next = 51;
               break;
 
-            case 48:
-              _context2.t13 = web3.utils;
-              _context2.t14 = web3.utils;
-              _context2.t15 = parseInt;
-              _context2.t16 = parseInt;
-              _context2.next = 54;
+            case 39:
+              _context2.t11 = web3.utils;
+              _context2.t12 = web3.utils;
+              _context2.t13 = parseInt;
+              _context2.t14 = parseInt;
+              _context2.next = 45;
               return sendAsync(provider, 'eth_estimateGas', tx);
 
-            case 54:
-              _context2.t17 = _context2.sent;
-              _context2.t18 = (0, _context2.t16)(_context2.t17);
-              _context2.t19 = _context2.t18 * 1.10269;
-              _context2.t20 = (0, _context2.t15)(_context2.t19);
-              _context2.t21 = _context2.t14.toBN.call(_context2.t14, _context2.t20).toString();
-              _context2.t12 = _context2.t13.toHex.call(_context2.t13, _context2.t21);
+            case 45:
+              _context2.t15 = _context2.sent;
+              _context2.t16 = (0, _context2.t14)(_context2.t15);
+              _context2.t17 = _context2.t16 * 1.10269;
+              _context2.t18 = (0, _context2.t13)(_context2.t17);
+              _context2.t19 = _context2.t12.toBN.call(_context2.t12, _context2.t18).toString();
+              _context2.t10 = _context2.t11.toHex.call(_context2.t11, _context2.t19);
 
-            case 60:
-              tx.gasLimit = _context2.t12;
-              _context2.t22 = !window.bypassEstimation;
+            case 51:
+              tx.gasLimit = _context2.t10;
+              _context2.t20 = !window.bypassEstimation;
 
-              if (!_context2.t22) {
-                _context2.next = 65;
+              if (!_context2.t20) {
+                _context2.next = 56;
                 break;
               }
 
-              _context2.next = 65;
+              _context2.next = 56;
               return sendAsync(provider, 'eth_estimateGas', tx);
 
-            case 65:
+            case 56:
               tx.gas = tx.gasLimit;
 
               if (!privateKey) {
-                _context2.next = 81;
+                _context2.next = 72;
                 break;
               }
 
-              _context2.t23 = global.EthereumJSTransaction.Transaction;
-              _context2.t24 = tx;
-              _context2.t25 = parseInt;
-              _context2.next = 72;
+              _context2.t21 = global.EthereumJSTransaction.Transaction;
+              _context2.t22 = tx;
+              _context2.t23 = parseInt;
+              _context2.next = 63;
               return sendAsync(provider, 'eth_chainId');
 
-            case 72:
-              _context2.t26 = _context2.sent;
-              _context2.t27 = (0, _context2.t25)(_context2.t26);
-              _context2.t28 = {
-                chain: _context2.t27
+            case 63:
+              _context2.t24 = _context2.sent;
+              _context2.t25 = (0, _context2.t23)(_context2.t24);
+              _context2.t26 = {
+                chain: _context2.t25
               };
-              transaction = new _context2.t23(_context2.t24, _context2.t28);
+              transaction = new _context2.t21(_context2.t22, _context2.t26);
               transaction.sign(privateKey);
               serializedTx = '0x' + transaction.serialize().toString('hex');
               sendTransaction = sendAsync(provider, 'eth_sendRawTransaction', serializedTx);
-              _context2.next = 82;
+              _context2.next = 73;
               break;
 
-            case 81:
+            case 72:
               sendTransaction = sendAsync(provider, 'eth_sendTransaction', tx);
 
-            case 82:
-              _context2.next = 84;
+            case 73:
+              _context2.next = 75;
               return sendTransaction;
 
-            case 84:
+            case 75:
               transactionHash = _context2.sent;
               console.log(new Date().toUTCString(), 'Transaction!', getEtherscanAddress('tx/' + transactionHash, tx.chainId));
 
@@ -32301,13 +32282,7 @@ function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, va
                         case 2:
                           receipt = _context.sent;
 
-                          if (!(!receipt || !receipt.blockNumber
-                          /* ||
-                          parseInt(
-                          (await sendAsync(provider, 'eth_getBlockByNumber', 'latest', false))
-                          .number
-                          ) <= parseInt(receipt.blockNumber)*/
-                          )) {
+                          if (!(!receipt || !receipt.blockNumber)) {
                             _context.next = 5;
                             break;
                           }
@@ -32331,20 +32306,20 @@ function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, va
               }();
 
               setTimeout(timeout);
-              _context2.next = 93;
+              _context2.next = 84;
               break;
 
-            case 90:
-              _context2.prev = 90;
-              _context2.t29 = _context2["catch"](0);
-              return _context2.abrupt("return", ko(_context2.t29));
+            case 81:
+              _context2.prev = 81;
+              _context2.t27 = _context2["catch"](0);
+              return _context2.abrupt("return", ko(_context2.t27));
 
-            case 93:
+            case 84:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[0, 90], [25, 32]]);
+      }, _callee2, null, [[0, 81]]);
     }));
 
     return function (_x, _x2) {
@@ -33507,41 +33482,91 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
   }
 
   function _tryUpdateBlock() {
-    _tryUpdateBlock = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee(force) {
+    _tryUpdateBlock = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(force) {
       var currentBlock, currentBlockNumber;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _context.prev = 0;
-              _context.next = 3;
+              _context2.prev = 0;
+              _context2.next = 3;
               return sendAsync(wallet.ethereum, 'eth_getBlockByNumber', 'latest', true);
 
             case 3:
-              currentBlock = _context.sent;
+              currentBlock = _context2.sent;
               currentBlockNumber = parseInt(currentBlock.number);
 
               if (force === true || currentBlockNumber - block >= realBlockInterval) {
                 setBlock(currentBlockNumber);
               }
 
-              _context.next = 10;
+              _context2.next = 10;
               break;
 
             case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](0);
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](0);
 
             case 10:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, null, [[0, 8]]);
+      }, _callee2, null, [[0, 8]]);
     }));
     return _tryUpdateBlock.apply(this, arguments);
   }
 
+  window.updateAccount = window.updateAccount || /*#__PURE__*/function () {
+    var _updateAccount = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee(acc) {
+      var blk;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              delete window.account;
+              acc && (window.account = acc);
+              _context.prev = 2;
+              _context.t0 = acc && window.ganache;
+
+              if (!_context.t0) {
+                _context.next = 7;
+                break;
+              }
+
+              _context.next = 7;
+              return sendAsync(window.ganache, 'evm_addAccount', acc, 0);
+
+            case 7:
+              _context.next = 11;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t1 = _context["catch"](2);
+
+            case 11:
+              blk = block;
+              setBlock(0);
+              setTimeout(function () {
+                return setBlock(blk);
+              });
+
+            case 14:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[2, 9]]);
+    }));
+
+    function updateAccount(_x2) {
+      return _updateAccount.apply(this, arguments);
+    }
+
+    return updateAccount;
+  }();
+
   function resetBlockInterval() {
     intervalId && clearInterval(intervalId);
     wallet && wallet.ethereum && tryUpdateBlock(true);
@@ -33624,7 +33649,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     }),
     ipfsHttpClient: ipfsHttpClient
   }, wallet && connectionStatus === CONNECTED && {
-    account: wallet.account,
+    account: window.account || wallet.account,
     chainId: chainId,
     chainName: wallet.networkName,
     web3: web3Instance,
@@ -34950,10 +34975,10 @@ function formatMoney(value, decPlaces, thouSeparator, decSeparator) {
 function fromDecimals(number, decimals, skipFormat) {
   var _number, _decimals;
 
-  number = Number(!isNaN((_number = number) === null || _number === void 0 ? void 0 : _number.value) ? number.value : number);
+  number = !isNaN((_number = number) === null || _number === void 0 ? void 0 : _number.value) ? number.value : number;
   decimals = Number(!isNaN((_decimals = decimals) === null || _decimals === void 0 ? void 0 : _decimals.value) ? decimals.value : decimals);
 
-  if (!number) {
+  if (!number || number === '0') {
     number = '0';
   }
 
@@ -34961,7 +34986,7 @@ function fromDecimals(number, decimals, skipFormat) {
     return number;
   }
 
-  if (!number || !decimals) {
+  if (!number || number === '0' || !decimals) {
     return '0';
   }