update assets. improve millix node performance

chrome/browser/browser_resources.grd

@@ -148,6 +148,16 @@
         <include name="IDR_MILLIX_APP_GLYPHICONS_REGULAR_WOFF" file="resources\millix\app\static\media\glyphicons-halflings-regular.woff" type="BINDATA" />
         <include name="IDR_MILLIX_APP_GLYPHICONS_REGULAR_WOFF2" file="resources\millix\app\static\media\glyphicons-halflings-regular.woff2" type="BINDATA" />
         <include name="IDR_MILLIX_APP_GLYPHICONS_REGULAR_TTF" file="resources\millix\app\static\media\glyphicons-halflings-regular.ttf" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_PRIMEICONS_EOT" file="resources\millix\app\static\media\primeicons.eot" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_PRIMEICONS_SVG" file="resources\millix\app\static\media\primeicons.svg" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_PRIMEICONS_WOFF" file="resources\millix\app\static\media\primeicons.woff" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_PRIMEICONS_TTF" file="resources\millix\app\static\media\primeicons.ttf" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_ROBOTO_BOLD_WOFF" file="resources\millix\app\static\media\roboto_bold.woff" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_ROBOTO_BOLD_WOFF2" file="resources\millix\app\static\media\roboto_bold.woff2" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_ROBOTO_MEDIUM_WOFF" file="resources\millix\app\static\media\roboto_medium.woff" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_ROBOTO_MEDIUM_WOFF2" file="resources\millix\app\static\media\roboto_medium.woff2" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_ROBOTO_REGULAR_WOFF" file="resources\millix\app\static\media\roboto_regular.woff" type="BINDATA" />
+        <include name="IDR_MILLIX_APP_ROBOTO_REGULAR_WOFF2" file="resources\millix\app\static\media\roboto_regular.woff2" type="BINDATA" />
         <include name="IDR_MILLIX_APP_PEINCON7_EOT" file="resources\millix\app\static\media\Pe-icon-7-stroke.eot" type="BINDATA" />
         <include name="IDR_MILLIX_APP_PEINCON7_SVG" file="resources\millix\app\static\media\Pe-icon-7-stroke.svg" type="BINDATA" />
         <include name="IDR_MILLIX_APP_PEINCON7_WOFF" file="resources\millix\app\static\media\Pe-icon-7-stroke.woff" type="BINDATA" />

chrome/browser/ui/webui/millix/untrusted_millix_app.cc

@@ -36,6 +36,16 @@ UntrustedMillixAppUI::UntrustedMillixAppUI(content::WebUI* web_ui)
   untrusted_source->AddResourcePath("static/media/glyphicons-halflings-regular.woff", IDR_MILLIX_APP_GLYPHICONS_REGULAR_WOFF);
   untrusted_source->AddResourcePath("static/media/glyphicons-halflings-regular.woff2", IDR_MILLIX_APP_GLYPHICONS_REGULAR_WOFF2);
   untrusted_source->AddResourcePath("static/media/glyphicons-halflings-regular.ttf", IDR_MILLIX_APP_GLYPHICONS_REGULAR_TTF);
+  untrusted_source->AddResourcePath("static/media/primeicons.eot", IDR_MILLIX_APP_PRIMEICONS_EOT);
+  untrusted_source->AddResourcePath("static/media/primeicons.svg", IDR_MILLIX_APP_PRIMEICONS_SVG);
+  untrusted_source->AddResourcePath("static/media/primeicons.woff", IDR_MILLIX_APP_PRIMEICONS_WOFF);
+  untrusted_source->AddResourcePath("static/media/primeicons.ttf", IDR_MILLIX_APP_PRIMEICONS_TTF);
+  untrusted_source->AddResourcePath("static/media/roboto_bold.woff", IDR_MILLIX_APP_ROBOTO_BOLD_WOFF);
+  untrusted_source->AddResourcePath("static/media/roboto_bold.woff", IDR_MILLIX_APP_ROBOTO_BOLD_WOFF2);
+  untrusted_source->AddResourcePath("static/media/roboto_medium.woff", IDR_MILLIX_APP_ROBOTO_MEDIUM_WOFF);
+  untrusted_source->AddResourcePath("static/media/roboto_medium.woff", IDR_MILLIX_APP_ROBOTO_MEDIUM_WOFF2);
+  untrusted_source->AddResourcePath("static/media/roboto_regular.woff", IDR_MILLIX_APP_ROBOTO_REGULAR_WOFF);
+  untrusted_source->AddResourcePath("static/media/roboto_regular.woff", IDR_MILLIX_APP_ROBOTO_REGULAR_WOFF2);
   untrusted_source->AddResourcePath("static/media/Pe-icon-7-stroke.eot", IDR_MILLIX_APP_PEINCON7_EOT);
   untrusted_source->AddResourcePath("static/media/Pe-icon-7-stroke.svg", IDR_MILLIX_APP_PEINCON7_SVG);
   untrusted_source->AddResourcePath("static/media/Pe-icon-7-stroke.woff", IDR_MILLIX_APP_PEINCON7_WOFF);

millix_node/core/config/config.js

@@ -771,7 +771,7 @@ 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                            = 1640009160;
+export const NODE_MILLIX_BUILD_DATE                            = 1642874581;
 export const NODE_MILLIX_VERSION                               = '1.14.0-tangled';
 export const DATA_BASE_DIR_MAIN_NETWORK                        = './millix-tangled';
 export const DATA_BASE_DIR_TEST_NETWORK                        = './millix-tangled';

millix_node/core/log-manager.js

@@ -55,11 +55,11 @@ class LogManager {
 
         eventBus.on('node_event_log', data => {
             this.addLog(data, this.getTime());
-            this.setBacklogSize(mutex.getKeyQueuedSize(['transaction'], true));
+            this.setBacklogSize(mutex.getKeyQueuedSize(['transaction']));
         });
         eventBus.on('wallet_event_log', data => {
             this.addLog(data, this.getTime());
-            this.setBacklogSize(mutex.getKeyQueuedSize(['transaction'], true));
+            this.setBacklogSize(mutex.getKeyQueuedSize(['transaction']));
         });
 
         return Promise.resolve();

millix_node/core/mutex.js

@@ -7,6 +7,8 @@ class Mutex {
         this.debug              = false;
         this.arrQueuedJobs      = {};
         this.arrLockedKeyArrays = [];
+
+        setInterval(() => console.log('[mutex]', this.getCountOfQueuedJobs()), 15000);
     }
 
     getCountOfQueuedJobs() {

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

@@ -888,13 +888,13 @@ export class WalletTransactionConsensus {
 
                 if (!transaction) {
                     return database.getRepository('transaction')
-                                   .setPathAsStableFrom(transactionID)
+                                   .updateTransactionAsStable(transactionID)
                                    .then(() => consensusData.resolve())
                                    .catch(() => consensusData.resolve());
                 }
 
                 return database.applyShardZeroAndShardRepository('transaction', transaction.shard_id, transactionRepository => {
-                    return transactionRepository.setPathAsStableFrom(transactionID);
+                    return transactionRepository.updateTransactionAsStable(transactionID);
                 }).then(() => wallet._checkIfWalletUpdate(new Set(_.map(transaction.transaction_output_list, o => o.address_key_identifier))))
                                .then(() => consensusData.resolve())
                                .catch(() => consensusData.resolve());

millix_node/core/wallet/wallet.js

@@ -1375,6 +1375,14 @@ class Wallet {
     }
 
     _onTransactionProxyRequest(data, ws) {
+        if (mutex.getKeyQueuedSize(['transaction-proxy-request']) > 0) {
+            peer.transactionProxyResponse({
+                transaction_id         : data.transaction_id,
+                transaction_input_chain: []
+            }, ws);
+            return;
+        }
+
         mutex.lock(['transaction-proxy-request'], unlock => {
             database.getRepository('transaction')
                     .getTransactionInputChain(data)
@@ -1385,7 +1393,7 @@ class Wallet {
                         }, ws);
                         unlock();
                     });
-        }, undefined, Date.now() + config.NETWORK_LONG_TIME_WAIT_MAX * 5);
+        });
     }
 
     _onTransactionProxy(data, ws) {
@@ -1497,11 +1505,11 @@ class Wallet {
         let networkTransactions = _.keys(this._transactionReceivedFromNetwork);
         console.log('[wallet] status (_transactionReceivedFromNetwork:', networkTransactions.length, ' | _transactionValidationRejected:', walletTransactionConsensus.getRejectedTransactionList().size, ' | _activeConsensusRound:', _.keys(this._activeConsensusRound).length + ')');
 
-        if (!this._maxBacklogThresholdReached && mutex.getKeyQueuedSize(['transaction'], true) >= config.WALLET_TRANSACTION_QUEUE_SIZE_MAX) {
+        if (!this._maxBacklogThresholdReached && mutex.getKeyQueuedSize(['transaction']) >= config.WALLET_TRANSACTION_QUEUE_SIZE_MAX) {
             this._maxBacklogThresholdReached = true;
             this.lockProcessNewTransaction();
         }
-        else if (this._maxBacklogThresholdReached && mutex.getKeyQueuedSize(['transaction'], true) <= config.WALLET_TRANSACTION_QUEUE_SIZE_MAX) {
+        else if (this._maxBacklogThresholdReached && mutex.getKeyQueuedSize(['transaction']) <= config.WALLET_TRANSACTION_QUEUE_SIZE_MAX) {
             this._maxBacklogThresholdReached = false;
             this.unlockProcessNewTransaction();
         }
@@ -1531,6 +1539,10 @@ class Wallet {
     }
 
     _doTransactionOutputExpiration() {
+        if (mutex.getKeyQueuedSize(['transaction-output-expiration']) > 0) {
+            return Promise.resolve();
+        }
+
         return new Promise(resolve => {
             console.log('[Wallet] Starting transaction output expiration');
             mutex.lock(['transaction-output-expiration'], unlock => {

millix_node/index.js

@@ -126,6 +126,6 @@ db.initialize()
               });
       }
   });
-  //millix v1.14.0-tangled
+  //millix v1.14.0-tangled 
   
   
\ No newline at end of file