@ethereansos/interfaces-core 0.4.84 → 0.4.88

package/dist/index.cjs.js

@@ -32118,7 +32118,7 @@ function _getAddress() {
   }]
 }, {}, [30]);
 
-var web3$1 = new Web3__default["default"]();
+var web3 = new Web3__default["default"]();
 
 var getEtherscanAddress = function getEtherscanAddress(postFix, chainId) {
   var address = 'http://';
@@ -32140,12 +32140,13 @@ var getEtherscanAddress = function getEtherscanAddress(postFix, chainId) {
   return address;
 };
 
-function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, value) {
+function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, value, additionalData) {
+  additionalData = additionalData || {};
   var address = fromOrPlainPrivateKey;
   var privateKey;
 
   try {
-    address = web3$1.eth.accounts.privateKeyToAccount(fromOrPlainPrivateKey).address;
+    address = web3.eth.accounts.privateKeyToAccount(fromOrPlainPrivateKey).address;
     privateKey = Buffer.from(fromOrPlainPrivateKey, 'hex');
   } catch (e) {}
 
@@ -32163,138 +32164,150 @@ function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, va
 
             case 4:
               nonce = _context2.sent;
-              nonce = web3$1.utils.toHex(nonce);
+              nonce = web3.utils.toHex(nonce);
               tx.nonce = nonce;
               tx.from = address;
               to && (tx.to = to);
               tx.data = data;
-              tx.value = web3$1.utils.toHex(value || '0');
-              _context2.t0 = web3$1.utils;
+              tx.value = web3.utils.toHex(value || '0');
+              _context2.t0 = web3.utils;
               _context2.next = 14;
               return sendAsync(provider, 'eth_chainId');
 
             case 14:
               _context2.t1 = _context2.sent;
               tx.chainId = _context2.t0.toHex.call(_context2.t0, _context2.t1);
-              _context2.t2 = web3$1.utils;
-              _context2.next = 19;
+              _context2.t2 = web3.utils;
+              _context2.t3 = additionalData.gasLimit;
+
+              if (_context2.t3) {
+                _context2.next = 22;
+                break;
+              }
+
+              _context2.next = 21;
               return sendAsync(provider, 'eth_getBlockByNumber', 'latest', false);
 
-            case 19:
+            case 21:
               _context2.t3 = _context2.sent.gasLimit;
-              tx.gasLimit = _context2.t2.toHex.call(_context2.t2, _context2.t3);
+
+            case 22:
+              _context2.t4 = _context2.t3;
+              tx.gasLimit = _context2.t2.toHex.call(_context2.t2, _context2.t4);
 
               if (!provider.blockchainConnection) {
-                _context2.next = 41;
+                _context2.next = 44;
                 break;
               }
 
-              _context2.prev = 22;
-              _context2.t4 = provider.accounts.indexOf(tx.from) === -1;
+              _context2.prev = 25;
+              _context2.t5 = provider.accounts.indexOf(tx.from) === -1;
 
-              if (!_context2.t4) {
-                _context2.next = 27;
+              if (!_context2.t5) {
+                _context2.next = 30;
                 break;
               }
 
-              _context2.next = 27;
+              _context2.next = 30;
               return provider.blockchainConnection.unlockAccounts(tx.from);
 
-            case 27:
-              _context2.next = 31;
+            case 30:
+              _context2.next = 34;
               break;
 
-            case 29:
-              _context2.prev = 29;
-              _context2.t5 = _context2["catch"](22);
-
-            case 31:
-              _context2.t6 = ok;
-              _context2.t7 = sendAsync;
-              _context2.t8 = provider;
-              _context2.next = 36;
-              return sendAsync(provider, 'eth_sendTransaction', tx);
+            case 32:
+              _context2.prev = 32;
+              _context2.t6 = _context2["catch"](25);
 
-            case 36:
-              _context2.t9 = _context2.sent;
+            case 34:
+              _context2.t7 = ok;
+              _context2.t8 = sendAsync;
+              _context2.t9 = provider;
               _context2.next = 39;
-              return (0, _context2.t7)(_context2.t8, 'eth_getTransactionReceipt', _context2.t9);
+              return sendAsync(provider, 'eth_sendTransaction', tx);
 
             case 39:
               _context2.t10 = _context2.sent;
-              return _context2.abrupt("return", (0, _context2.t6)(_context2.t10));
+              _context2.next = 42;
+              return (0, _context2.t8)(_context2.t9, 'eth_getTransactionReceipt', _context2.t10);
 
-            case 41:
-              if (!window.bypassEstimation) {
-                _context2.next = 45;
+            case 42:
+              _context2.t11 = _context2.sent;
+              return _context2.abrupt("return", (0, _context2.t7)(_context2.t11));
+
+            case 44:
+              if (!(window.bypassEstimation || additionalData.gasLimit)) {
+                _context2.next = 48;
                 break;
               }
 
-              _context2.t11 = tx.gasLimit;
-              _context2.next = 57;
+              _context2.t12 = tx.gasLimit;
+              _context2.next = 60;
               break;
 
-            case 45:
-              _context2.t12 = web3$1.utils;
-              _context2.t13 = web3$1.utils;
-              _context2.t14 = parseInt;
+            case 48:
+              _context2.t13 = web3.utils;
+              _context2.t14 = web3.utils;
               _context2.t15 = parseInt;
-              _context2.next = 51;
+              _context2.t16 = parseInt;
+              _context2.next = 54;
               return sendAsync(provider, 'eth_estimateGas', tx);
 
-            case 51:
-              _context2.t16 = _context2.sent;
-              _context2.t17 = (0, _context2.t15)(_context2.t16);
-              _context2.t18 = _context2.t17 * 1.10269;
-              _context2.t19 = (0, _context2.t14)(_context2.t18);
-              _context2.t20 = _context2.t13.toBN.call(_context2.t13, _context2.t19).toString();
-              _context2.t11 = _context2.t12.toHex.call(_context2.t12, _context2.t20);
+            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 57:
-              tx.gasLimit = _context2.t11;
-              _context2.t21 = !window.bypassEstimation;
+            case 60:
+              tx.gasLimit = _context2.t12;
+              _context2.t22 = !window.bypassEstimation;
 
-              if (!_context2.t21) {
-                _context2.next = 62;
+              if (!_context2.t22) {
+                _context2.next = 65;
                 break;
               }
 
-              _context2.next = 62;
+              _context2.next = 65;
               return sendAsync(provider, 'eth_estimateGas', tx);
 
-            case 62:
+            case 65:
+              tx.gas = tx.gasLimit;
+
               if (!privateKey) {
-                _context2.next = 77;
+                _context2.next = 81;
                 break;
               }
 
-              _context2.t22 = global.EthereumJSTransaction.Transaction;
-              _context2.t23 = tx;
-              _context2.t24 = parseInt;
-              _context2.next = 68;
+              _context2.t23 = global.EthereumJSTransaction.Transaction;
+              _context2.t24 = tx;
+              _context2.t25 = parseInt;
+              _context2.next = 72;
               return sendAsync(provider, 'eth_chainId');
 
-            case 68:
-              _context2.t25 = _context2.sent;
-              _context2.t26 = (0, _context2.t24)(_context2.t25);
-              _context2.t27 = {
-                chain: _context2.t26
+            case 72:
+              _context2.t26 = _context2.sent;
+              _context2.t27 = (0, _context2.t25)(_context2.t26);
+              _context2.t28 = {
+                chain: _context2.t27
               };
-              transaction = new _context2.t22(_context2.t23, _context2.t27);
+              transaction = new _context2.t23(_context2.t24, _context2.t28);
               transaction.sign(privateKey);
               serializedTx = '0x' + transaction.serialize().toString('hex');
               sendTransaction = sendAsync(provider, 'eth_sendRawTransaction', serializedTx);
-              _context2.next = 78;
+              _context2.next = 82;
               break;
 
-            case 77:
+            case 81:
               sendTransaction = sendAsync(provider, 'eth_sendTransaction', tx);
 
-            case 78:
-              _context2.next = 80;
+            case 82:
+              _context2.next = 84;
               return sendTransaction;
 
-            case 80:
+            case 84:
               transactionHash = _context2.sent;
               console.log(new Date().toUTCString(), 'Transaction!', getEtherscanAddress('tx/' + transactionHash, tx.chainId));
 
@@ -32352,20 +32365,20 @@ function sendBlockchainTransaction(provider, fromOrPlainPrivateKey, to, data, va
               }();
 
               setTimeout(timeout);
-              _context2.next = 89;
+              _context2.next = 93;
               break;
 
-            case 86:
-              _context2.prev = 86;
-              _context2.t28 = _context2["catch"](0);
-              return _context2.abrupt("return", ko(_context2.t28));
+            case 90:
+              _context2.prev = 90;
+              _context2.t29 = _context2["catch"](0);
+              return _context2.abrupt("return", ko(_context2.t29));
 
-            case 89:
+            case 93:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[0, 86], [22, 29]]);
+      }, _callee2, null, [[0, 90], [25, 32]]);
     }));
 
     return function (_x, _x2) {
@@ -32522,8 +32535,6 @@ var getAllContracts = function getAllContracts() {
   return allContracts;
 };
 
-var web3 = new Web3__default["default"]();
-
 function blockchainCall() {
   return _blockchainCall.apply(this, arguments);
 }
@@ -32538,8 +32549,10 @@ function _blockchainCall() {
         data,
         fromForSend,
         to,
+        dataInput,
         result,
         address,
+        web3,
         _args3 = arguments;
     return regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
@@ -32555,74 +32568,76 @@ function _blockchainCall() {
               method = (method.implementation ? method.get : method["new"] ? method["new"] : method).apply(void 0, _toConsumableArray(args));
             } catch (e) {
               data = args[args.length - 1];
-              from = data.from || from;
+              from = data.fromOrPlainPrivateKey || data.from || from;
               value = data.value || value;
               blockNumber = data.blockNumber || blockNumber;
-              method = (method.implementation ? method.get : method["new"] ? method["new"] : method).apply(void 0, _toConsumableArray(args = args.slice(0, args.length - 1)));
+              args = args.slice(0, args.length - 1);
+              method = (method.implementation ? method.get : method["new"] ? method["new"] : method).apply(void 0, _toConsumableArray(args));
             }
 
-            _context3.prev = 6;
-
             if (!(from === VOID_ETHEREUM_ADDRESS)) {
-              _context3.next = 13;
+              _context3.next = 23;
               break;
             }
 
-            _context3.next = 10;
-            return getAddress({
-              provider: method._parent.currentProvider
-            });
-
-          case 10:
-            _context3.t0 = _context3.sent;
-            _context3.next = 14;
+            _context3.prev = 7;
+            from = method._parent.currentProvider.accounts[0];
+            _context3.next = 23;
             break;
 
-          case 13:
-            _context3.t0 = from;
+          case 11:
+            _context3.prev = 11;
+            _context3.t0 = _context3["catch"](7);
+            _context3.prev = 13;
+            _context3.next = 16;
+            return method._parent.currentProvider.request({
+              method: 'eth_requestAccounts'
+            });
 
-          case 14:
-            from = _context3.t0;
-            _context3.next = 21;
+          case 16:
+            from = _context3.sent[0];
+            _context3.next = 23;
             break;
 
-          case 17:
-            _context3.prev = 17;
-            _context3.t1 = _context3["catch"](6);
+          case 19:
+            _context3.prev = 19;
+            _context3.t1 = _context3["catch"](13);
             data = args[args.length - 1];
 
             if (data) {
-              from = data.from || from;
+              from = data.fromOrPlainPrivateKey || data.from || from;
               value = data.value || value;
               blockNumber = data.blockNumber || blockNumber;
             }
 
-          case 21:
+          case 23:
             fromForSend = from;
 
             try {
-              from = web3.eth.accounts.privateKeyToAccount(fromForSend).address;
+              from = new Web3__default["default"](method._parent.currentProvider).eth.accounts.privateKeyToAccount(fromForSend).address;
             } catch (e) {}
 
             to = method._parent.options.address;
+            dataInput = data;
             data = method.encodeABI();
-            _context3.next = 27;
+            _context3.next = 30;
             return method._method.stateMutability === 'view' || method._method.stateMutability === 'pure' ? method.call({
               from: from,
               value: value
-            }, blockNumber) : sendBlockchainTransaction(method._parent.currentProvider, fromForSend, to, data, value);
+            }, blockNumber) : sendBlockchainTransaction(method._parent.currentProvider, fromForSend, to, data, value, dataInput);
 
-          case 27:
+          case 30:
             result = _context3.sent;
 
             if (to) {
-              _context3.next = 34;
+              _context3.next = 38;
               break;
             }
 
             method._parent.options.address = result.contractAddress;
             address = method._parent.options.address;
-            _context3.next = 33;
+            web3 = new Web3__default["default"](method._parent.currentProvider);
+            _context3.next = 37;
             return new Promise( /*#__PURE__*/function () {
               var _ref = _asyncToGenerator$1( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(ok) {
                 var set;
@@ -32640,7 +32655,7 @@ function _blockchainCall() {
                                     _context.prev = 0;
                                     _context.t0 = web3.utils;
                                     _context.next = 4;
-                                    return sendAsync(method._parent.currentProvider, 'eth_getCode', address, 'latest');
+                                    return web3.eth.getCode(address);
 
                                   case 4:
                                     _context.t1 = _context.sent;
@@ -32691,18 +32706,18 @@ function _blockchainCall() {
               };
             }());
 
-          case 33:
+          case 37:
             return _context3.abrupt("return", method._parent);
 
-          case 34:
+          case 38:
             return _context3.abrupt("return", result);
 
-          case 35:
+          case 39:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[6, 17]]);
+    }, _callee3, null, [[7, 11], [13, 19]]);
   }));
   return _blockchainCall.apply(this, arguments);
 }