Auto stash before merge of "master" and "origin/master"

Author: ahmyi

.travis.yml

@@ -29,8 +29,6 @@ addons:
       - libldns-dev 
       - libexpat1-dev
 
-language: node_js
-
 env:
   - CXX=g++-7 COMPILER=g++-7 BUILD=Debug STANDARD=14
 
@@ -40,7 +38,7 @@ jobs:
 services:
   - redis
 
-cache: false  
+cache: npm  
 
 before_install:
     - "npm install -g npm@latest"

defaults/config.travis.json

@@ -19,7 +19,7 @@
     	"timeout":1000,
         "enabled": true,
         "clusterForks": 4,
-	"poolAddress":"Svk1ZQ6mPfjhYR3Nnp3kifZLimjuDcmyMHecLmY6Ek2QbGQi93XzkJFbdFDaQZVdBF2V43q79z2UTirvJcHT3TnC2h988J2hF",
+	    "poolAddress":"Svk1ZQ6mPfjhYR3Nnp3kifZLimjuDcmyMHecLmY6Ek2QbGQi93XzkJFbdFDaQZVdBF2V43q79z2UTirvJcHT3TnC2h988J2hF",
         "blockRefreshInterval": 500,
         "minerTimeout": 750,
         "sslCert": "./cert.pem",
@@ -30,8 +30,8 @@
                 "port": 3333,
                 "difficulty": 10000,
                 "desc": "Props Low end hardware diff: 10000",
-		"poolType":"props",
-		"donation":0
+        		"poolType":"props",
+        		"donation":0
             },
 	    {
     		"port": 5555,
@@ -44,8 +44,8 @@
                 "port": 7777,
                 "difficulty": 5000000,
                 "desc": "Props High end hardware diff: 1000000",
-		"poolType":"props",
-		"donation":0
+        		"poolType":"props",
+        		"donation":0
             },
 	    {
                 "port":8888,

defaults/scalapool.service

@@ -7,14 +7,14 @@ Type=forking
 GuessMainPID=no
 ExecStart=/home/scala/Scala/build/release/bin/scalad \
 --rpc-bind-ip 127.0.0.1 \
---rpc-bind-port 20189 \
+--rpc-bind-port 11812 \
 --p2p-bind-ip 0.0.0.0 \
---p2p-bind-port 20188 \
+--p2p-bind-port 11811 \
 --rpc-bind-ip 127.0.0.1 \
 --confirm-external-bind --detach
 
 Restart=always
-User=stellite
+User=scalad
 
 [Install]
 WantedBy=multi-user.target

lib/api.js

@@ -320,19 +320,19 @@ function collectStats(){
                 for(let ubs in replies[3].reverse()){
                     const unblockStat = replies[3][ubs];
                     const block = new BlockModel(unblockStat);
-         	    if(block.poolType === 'ppbs') {
-			continue;
- 		    }
+        		    if(block.poolType === 'ppbs') {
+        			     continue;
+        		    }
                     block.miner = utils.truncateAddress(block.miner);
                     blockStats.push(block.toRedis());
                 }
 		//Block Matured
                 for(let bsi in replies[4]){
                     const blockStat = replies[4][bsi];
                     const block = new BlockModel(blockStat);
-		    if(block.poolType === 'ppbs') {
-			continue;
-		    }
+        		    if(block.poolType === 'ppbs') {
+        			     continue;
+        		    }
                     block.miner = utils.truncateAddress(block.miner);
                     blockStats.push(block.toRedis());
 

package.json

@@ -24,7 +24,7 @@
         "redis": "*"
     },
     "engines": {
-        "node": "14.x"
+        "node": ">=14.0.0 <16.0.0"
     },
     "devDependencies": {
         "ava": "^3.10.1",

tests/utils/address.js

@@ -70,13 +70,14 @@ test("Benchmark Address Validations", t => {
 	let start = process.hrtime.bigint();
 	for(let i =0;i<10000;i++) r.test(address)
 	let end = process.hrtime.bigint();
-    console.log('Regex time taken ' + utils.readableSI(Number(end - start)," ", "nsecs", true));
+
+    // console.log('Regex time taken ' + utils.readableSI(Number(end - start)," ", "nsecs", true));
 
 
 	start = process.hrtime.bigint();
 	for(let i =0;i<10000;i++) utils.getAddressPrefix(address) === 155
 	end = process.hrtime.bigint();
-    console.log('Utils time taken ' + utils.readableSI(Number(end - start)," ", "nsecs", true));
+    // console.log('Utils time taken ' + utils.readableSI(Number(end - start)," ", "nsecs", true));
 
 	t.pass()
 })