rever electron to 2.0.3

index.js

@@ -53,7 +53,8 @@ function createWindow() {
     minWidth: 800,
     minHeight: 600,
     frame: true,
-    icon: path.join(__dirname, 'src/assets/icons/ico/simpleos.ico')
+    icon: path.join(__dirname, 'src/assets/icons/ico/simpleos.ico'),
+    allowRunningInsecureContent: true
   });
   win.setMenu(null);
 

ng-dist/3rdpartylicenses.txt

@@ -275,6 +275,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
+@angular-devkit/[email protected]
+MIT
+The MIT License
+
+Copyright (c) 2017 Google, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 @fortawesome/[email protected]
 UNLICENSED
 Font Awesome Pro License
@@ -597,29 +621,6 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-[email protected]
-MIT
-Copyright JS Foundation and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 @angular/[email protected]
 MIT
 MIT

ng-dist/assets/eos.js

@@ -3096,15 +3096,20 @@ function WriteApi(Network, network, config, Transaction) {
         return callback(null, argHeaders);
       };
     } else if (config.transactionHeaders) {
-      assert.equal((0, _typeof3.default)(config.transactionHeaders), 'function', 'config.transactionHeaders');
-      headers = config.transactionHeaders;
+      if ((0, _typeof3.default)(config.transactionHeaders) === 'object') {
+        headers = function headers(exp, callback) {
+          return callback(null, config.transactionHeaders);
+        };
+      } else {
+        assert.equal((0, _typeof3.default)(config.transactionHeaders), 'function', 'config.transactionHeaders');
+        headers = config.transactionHeaders;
+      }
     } else {
-      assert(network, 'Network is required, provide config.httpEndpoint');
+      assert(network, 'Network is required, provide httpEndpoint or own transaction headers');
       headers = network.createTransaction;
     }
-
     headers(options.expireInSeconds, checkError(callback, config.logger, function _callee2(rawTx) {
-      var txObject, buf, tr, transactionId, sigs, chainIdBuf, signBuf;
+      var defaultHeaders, txObject, buf, tr, transactionId, sigs, chainIdBuf, signBuf;
       return _regenerator2.default.async(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -3115,7 +3120,14 @@ function WriteApi(Network, network, config, Transaction) {
               assert.equal((0, _typeof3.default)(rawTx.ref_block_num), 'number', 'expecting ref_block_num number');
               assert.equal((0, _typeof3.default)(rawTx.ref_block_prefix), 'number', 'expecting ref_block_prefix number');
 
-              rawTx = Object.assign({}, rawTx);
+              defaultHeaders = {
+                net_usage_words: 0,
+                max_cpu_usage_ms: 0,
+                delay_sec: 0
+              };
+
+
+              rawTx = Object.assign({}, defaultHeaders, rawTx);
 
               rawTx.actions = arg.actions;
 
@@ -3184,19 +3196,17 @@ function WriteApi(Network, network, config, Transaction) {
                     transaction: packedTr
                   });
                 } else {
-                  network.pushTransaction(packedTr, function (error) {
+                  network.pushTransaction(packedTr, function (error, processedTransaction) {
                     if (!error) {
-                      callback(null, {
-                        transaction_id: transactionId,
+                      callback(null, Object.assign({
                         broadcast: true,
-                        transaction: packedTr
-                      });
+                        transaction: packedTr,
+                        transaction_id: transactionId
+                      }, processedTransaction));
                     } else {
-
                       if (config.logger.error) {
                         config.logger.error('[push_transaction error] \'' + error.message + '\', transaction \'' + buf.toString('hex') + '\'');
                       }
-
                       callback(error.message);
                     }
                   });
@@ -3208,7 +3218,7 @@ function WriteApi(Network, network, config, Transaction) {
                 callback(error);
               });
 
-            case 13:
+            case 14:
             case 'end':
               return _context2.stop();
           }
@@ -30692,7 +30702,7 @@ function hasOwnProperty(obj, prop) {
 },{}],206:[function(require,module,exports){
 module.exports={
   "name": "eosjs",
-  "version": "15.0.1",
+  "version": "15.0.2",
   "description": "General purpose library for the EOS blockchain.",
   "main": "lib/index.js",
   "scripts": {

package.json

@@ -67,11 +67,6 @@
         }
       ],
       "icon": "src/favicon.ico"
-    },
-    "nsisWeb": {
-      "oneClick": false,
-      "allowToChangeInstallationDirectory": true,
-      "installerIcon": "src/favicon.ico"
     }
   },
   "devDependencies": {
@@ -91,10 +86,10 @@
     "bootstrap": "^4.1.1",
     "codelyzer": "~4.2.1",
     "core-js": "^2.5.4",
-    "electron": "^3.0.0-beta.1",
+    "electron": "^2.0.3",
     "electron-builder": "^20.15.3",
     "electron-reload": "^1.2.2",
-    "eosjs": "^15.0.1",
+    "eosjs": "^15.0.2",
     "hammerjs": "^2.0.8",
     "jquery": "^3.3.1",
     "moment": "^2.22.2",
@@ -110,7 +105,8 @@
     "ts-node": "~5.0.1",
     "tslint": "~5.9.1",
     "typescript": "~2.7.2",
-    "zone.js": "^0.8.26"
+    "zone.js": "^0.8.26",
+    "webpack": "^4.12.0"
   },
   "dependencies": {
     "@angular/animations": "^6.0.6",
@@ -135,10 +131,10 @@
     "@fortawesome/pro-light-svg-icons": "^5.1.0",
     "@fortawesome/pro-regular-svg-icons": "^5.1.0",
     "@fortawesome/pro-solid-svg-icons": "^5.1.0",
-    "electron-updater": "^2.21.11",
+    "electron-updater": "^2.21.10",
     "electron-webpack": "^2.1.2",
     "menu": "^0.2.5",
-    "opn":"^5.3.0",
+    "opn": "^5.3.0",
     "primeicons": "^1.0.0-beta.9"
   }
 }

src/assets/eos.js

@@ -3096,15 +3096,20 @@ function WriteApi(Network, network, config, Transaction) {
         return callback(null, argHeaders);
       };
     } else if (config.transactionHeaders) {
-      assert.equal((0, _typeof3.default)(config.transactionHeaders), 'function', 'config.transactionHeaders');
-      headers = config.transactionHeaders;
+      if ((0, _typeof3.default)(config.transactionHeaders) === 'object') {
+        headers = function headers(exp, callback) {
+          return callback(null, config.transactionHeaders);
+        };
+      } else {
+        assert.equal((0, _typeof3.default)(config.transactionHeaders), 'function', 'config.transactionHeaders');
+        headers = config.transactionHeaders;
+      }
     } else {
-      assert(network, 'Network is required, provide config.httpEndpoint');
+      assert(network, 'Network is required, provide httpEndpoint or own transaction headers');
       headers = network.createTransaction;
     }
-
     headers(options.expireInSeconds, checkError(callback, config.logger, function _callee2(rawTx) {
-      var txObject, buf, tr, transactionId, sigs, chainIdBuf, signBuf;
+      var defaultHeaders, txObject, buf, tr, transactionId, sigs, chainIdBuf, signBuf;
       return _regenerator2.default.async(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -3115,7 +3120,14 @@ function WriteApi(Network, network, config, Transaction) {
               assert.equal((0, _typeof3.default)(rawTx.ref_block_num), 'number', 'expecting ref_block_num number');
               assert.equal((0, _typeof3.default)(rawTx.ref_block_prefix), 'number', 'expecting ref_block_prefix number');
 
-              rawTx = Object.assign({}, rawTx);
+              defaultHeaders = {
+                net_usage_words: 0,
+                max_cpu_usage_ms: 0,
+                delay_sec: 0
+              };
+
+
+              rawTx = Object.assign({}, defaultHeaders, rawTx);
 
               rawTx.actions = arg.actions;
 
@@ -3184,19 +3196,17 @@ function WriteApi(Network, network, config, Transaction) {
                     transaction: packedTr
                   });
                 } else {
-                  network.pushTransaction(packedTr, function (error) {
+                  network.pushTransaction(packedTr, function (error, processedTransaction) {
                     if (!error) {
-                      callback(null, {
-                        transaction_id: transactionId,
+                      callback(null, Object.assign({
                         broadcast: true,
-                        transaction: packedTr
-                      });
+                        transaction: packedTr,
+                        transaction_id: transactionId
+                      }, processedTransaction));
                     } else {
-
                       if (config.logger.error) {
                         config.logger.error('[push_transaction error] \'' + error.message + '\', transaction \'' + buf.toString('hex') + '\'');
                       }
-
                       callback(error.message);
                     }
                   });
@@ -3208,7 +3218,7 @@ function WriteApi(Network, network, config, Transaction) {
                 callback(error);
               });
 
-            case 13:
+            case 14:
             case 'end':
               return _context2.stop();
           }
@@ -30692,7 +30702,7 @@ function hasOwnProperty(obj, prop) {
 },{}],206:[function(require,module,exports){
 module.exports={
   "name": "eosjs",
-  "version": "15.0.1",
+  "version": "15.0.2",
   "description": "General purpose library for the EOS blockchain.",
   "main": "lib/index.js",
   "scripts": {