Merge branch 'master' into master

config_examples/fuego.json

@@ -1,13 +1,13 @@
 {
 	"poolHost": "your.pool.host",
 
-	"coin": "fango",
+	"coin": "fuego",
 	"symbol": "XFG",
 	"coinUnits": 10000000,
 	"coinDecimalPlaces": 7,
 	"coinDifficultyTarget": 480,
-	"blockchainExplorer": "http://explorer.fandom.gold/block/{id}",
-	"transactionExplorer": "http://explorer.fandom.gold/tx/{id}",
+	"blockchainExplorer": "http://fuego.spaceportx.net/block/{id}",
+	"transactionExplorer": "http://fuego.spaceportx.net/tx/{id}",
 	"daemonType": "default",
 	"cnAlgorithm": "cryptonight",
 	"cnVariant": 8,
@@ -115,7 +115,7 @@
 		"maxAddresses": 50,
 		"mixin": 2,
 		"priority": 0,
-		"transferFee": 800000,
+		"transferFee": 80000,
 		"dynamicTransferFee": true,
 		"minerPayFee": true,
 		"minPayment": 1000000000,

config_examples/graft.json

@@ -6,11 +6,13 @@
 	"coinUnits": 10000000000,
 	"coinDecimalPlaces": 4,
 	"coinDifficultyTarget": 120,
-	"blockchainExplorer": "http://blockexplorer.arqma.com/block/{id}",
-	"transactionExplorer": "http://blockexplorer.arqma.com/tx/{id}",
+	"blockchainExplorer": "https://blockexplorer.graft.network/block/{id}",
+	"transactionExplorer": "https://blockexplorer.graft.network/tx/{id}",
 	"daemonType": "default",
-	"cnAlgorithm": "cryptonight",
-	"cnVariant": 15,
+	"cnAlgorithm": "randomx",
+	"isRandomX": true,
+        "includeHeight": true,
+	"cnVariant": 20,
 	"cnBlobType": 0,
 
 	"logging": {

config_examples/safex/config.json

@@ -9,8 +9,8 @@
 
 	"daemonType": "default",
 	"cnAlgorithm": "randomx",
-	"cnVariant": 0,
-	"cnBlobType": 23,
+	"cnVariant": 23,
+	"cnBlobType": 0,
 	"includeHeight": false,
 	"isRandomX": true,
 
@@ -32,7 +32,7 @@
 		"mergedMining": false,
 		"clusterForks": "auto",
 		"poolAddress": "** Your pool wallet address **",
-		"intAddressPrefix": 251,
+		"intAddressPrefix": "Safexi",
 		"blockRefreshInterval": 1000,
 		"minerTimeout": 900,
 		"sslCert": "./cert.pem",
@@ -132,7 +132,8 @@
 		"depth": 60,
 		"poolFee": 0.8,
 		"devDonation": 0.2,
-		"networkFee": 0.0
+		"networkFee": 0.0,
+        "fixBlockHeightRPC": true
 	},
 
 	"api": {

lib/pool.js

@@ -395,7 +395,7 @@ function Miner (rewardType, childRewardType, id, childPoolIndex, login, pass, ip
 	this.noRetarget = noRetarget;
 	this.difficulty = startingDiff;
 	this.validJobs = [];
-	this.workerName2 = pass;
+	this.workerName = pass;
 
 	// Vardiff related variables
 	this.shareTimeRing = utils.ringBuffer(16);

package.json

@@ -1,27 +1,16 @@
 {
-	"name": "cryptonote-nodejs-pool",
-	"version": "1.4.0",
-	"license": "GPL-2.0",
-	"Original author": "Daniel Vandal",
-	"Maintained by": "Musclesonvacation",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/dvandal/cryptonote-nodejs-pool.git"
-	},
-	"dependencies": {
-		"async": "^3.2.0",
+	"name": "cryptonote-nodejs-pool",+https
+	"version": "1+https.4.0",
+	"license": "GPL-2.0
 		"base58-native": "*",
 		"bignum": "*",
 		"bufferutil": "*",
 		"cli-color": "*",
-		"cryptoforknote-util": "git://github.com/MoneroOcean/node-cryptoforknote-util.git",
-		"cryptonight-hashing": "git://github.com/MoneroOcean/node-cryptonight-hashing.git",
+		"cryptoforknote-util": "git+https://github.com/MoneroOcean/node-cryptoforknote-util.git",
+		"cryptonight-hashing": "git+https://github.com/MoneroOcean/node-cryptonight-hashing.git",
 		"dateformat": "4.5.1",
 		"domexception": "*",
-		"mailgun.js": "*",
 		"node-telegram-bot-api": "*",
-		"nodemailer": "^6.4.18",
-		"nodemailer-sendmail-transport": "*",
 		"redis": "3.1.2",
 		"socket.io": "^3.1.1",
 		"time-ago": "*",