Merge remote-tracking branch 'origin/master' into issue/TG-7

millix_node/README.md

@@ -2,7 +2,7 @@
   <br>
   <a href="#"><img src="https://github.com/millix/millix-wallet/blob/master/app/icon.png?raw=true" alt="millix node" width="200"></a>
   <br>
-  millix node <small>v1.11.2</small>
+  millix node <small>v1.11.3</small>
   <br>
 </h1>
 

millix_node/core/config/config.js

@@ -774,8 +774,8 @@ export const NETWORK_SHORT_TIME_WAIT_MAX                       = 1500;
 export const DATABASE_ENGINE                                   = 'sqlite';
 export const DATABASE_CONNECTION                               = {};
 export const MILLIX_CIRCULATION                                = 9e15;
-export const NODE_MILLIX_BUILD_DATE                            = 1629213000;
-export const NODE_MILLIX_VERSION                               = '1.11.2-tangled';
+export const NODE_MILLIX_BUILD_DATE                            = 1629813663;
+export const NODE_MILLIX_VERSION                               = '1.11.4-tangled';
 export const DATA_BASE_DIR_MAIN_NETWORK                        = './millix-tangled';
 export const DATA_BASE_DIR_TEST_NETWORK                        = './millix-tangled';
 let DATA_BASE_DIR                                              = MODE_TEST_NETWORK ? DATA_BASE_DIR_TEST_NETWORK : DATA_BASE_DIR_MAIN_NETWORK;
@@ -786,6 +786,7 @@ export const WALLET_KEY_PATH                                   = DATA_BASE_DIR +
 export const JOB_CONFIG_PATH                                   = DATA_BASE_DIR + '/job.json';
 export const JOB_CONFIG_VERSION                                = 4;
 export const SHARD_ZERO_NAME                                   = 'shard_zero';
+export const DEBUG_LOG_FILTER                                  = [];
 export const PEER_ROTATION_MORE_THAN_AVERAGE                   = 0.5;
 export const PEER_ROTATION_MORE_THAN_MOST                      = 0.2;
 export const PEER_ROTATION_MORE_THAN_ALL                       = 0.01;
@@ -893,5 +894,6 @@ export default {
     PEER_ROTATION_MORE_THAN_ALL,
     PEER_ROTATION_CONFIG,
     JOB_CONFIG_PATH,
-    JOB_CONFIG_VERSION
+    JOB_CONFIG_VERSION,
+    DEBUG_LOG_FILTER
 };

millix_node/core/console.js

@@ -19,4 +19,6 @@ console.log       = function() {
     enabled && showLog && config.MODE_DEBUG && _consoleLog.apply(console, arguments);
 };
 
+config.DEBUG_LOG_FILTER.forEach(filter => console.addFilter(filter));
+
 export default console;

millix_node/core/task.js

@@ -29,7 +29,13 @@ class Task {
                 });
             }
             else {
-                task();
+                try {
+                    task();
+                }
+                catch (e) {
+                    this.debug && console.log(`[task] error running task ${taskName}: ${e}`);
+                }
+
                 if (!once) {
                     self.runningTask[taskName] = setTimeout(run, waitTime);
                 }

millix_node/core/wallet/wallet-transaction-consensus.js

@@ -225,7 +225,7 @@ export class WalletTransactionConsensus {
                         message            : `not validated in a depth of ${depth}`
                     });
                 }
-                else if (transaction.status === 2 || database.getRepository('transaction').isExpired(transaction.transaction_date)) {
+                else if (transaction && (transaction.status === 2 || database.getRepository('transaction').isExpired(transaction.transaction_date))) {
                     return reject({
                         cause              : 'transaction_validation_max_depth',
                         transaction_id_fail: transactionID,
@@ -883,7 +883,9 @@ export class WalletTransactionConsensus {
             }
 
             delete this._consensusRoundState[lockerID];
-            this._consensusRoundState[transactionID] = {};
+            this._consensusRoundState[transactionID] = {
+                timestamp: Date.now()
+            };
 
             let unstableDateStart = ntp.now();
             unstableDateStart.setMinutes(unstableDateStart.getMinutes() - config.TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN);
@@ -901,7 +903,8 @@ export class WalletTransactionConsensus {
 
             return (() => {
                 if (unstableDateStart.getTime() < pendingTransaction.transaction_date.getTime()) { // if not hibernated yet, we try to do a local validation first
-                    return this._validateTransaction(transactionID, null, 0);
+                    return this._validateTransaction(transactionID, null, 0)
+                               .catch(() => Promise.resolve());
                 }
                 else {
                     return Promise.resolve();

millix_node/index.js

@@ -108,4 +108,4 @@ db.initialize()
               });
       }
   });
-  //millix v1.11.2-tangled
+  //millix v1.11.4-tangled

millix_node/net/network.js

@@ -287,11 +287,11 @@ class Network {
         database.getRepository('node')
                 .listNodes()
                 .then((nodes) => {
-                    async.eachSeries(nodes, (node, callback) => {
+                    async.eachSeries(_.shuffle(nodes), (node, callback) => {
                         this.addNode(node.node_prefix, node.node_address, node.node_port, node.node_port_api, node.node_id);
                         callback();
                     }, () => {
-                        _.each(config.NODE_INITIAL_LIST, ({host, port_protocol: port, port_api: portApi}) => {
+                        _.each(_.shuffle(config.NODE_INITIAL_LIST), ({host, port_protocol: port, port_api: portApi}) => {
                             let prefix = config.WEBSOCKET_PROTOCOL;
                             let url    = `${prefix}://${host}:${port}`;
                             if ((!this._nodeList[url] || !this._nodeList[url].node_id) && (prefix && host && port && portApi)) {