From e8682f7c947ca574b27ebe11fa65216ed2ee86ad Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 15:33:27 -0500 Subject: [PATCH 1/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49b4db6..cc01747 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ Explanation for each field: "cnVariant": 1, "cnBlobType": 0, "includeHeight":false, /*true to include block.height in job to miner*/ -"includeAlgo":"cn/wow", /*wownero specific change to include algo in job to miner*/ "includeAlgo":"cn/wow", /*wownero specific change to include algo in job to miner*/ +"includeAlgo":"cn/wow", /*wownero specific change to include algo in job to miner*/ "isRandomX": true, /* Logging */ "logging": { From 9649a37d362eff50e9843fa90221d5330f4e3350 Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 15:36:45 -0500 Subject: [PATCH 2/8] Update crystaleum.json --- config_examples/crystaleum.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config_examples/crystaleum.json b/config_examples/crystaleum.json index 54e30a1..34119ef 100644 --- a/config_examples/crystaleum.json +++ b/config_examples/crystaleum.json @@ -1,6 +1,10 @@ { "poolHost": "CRFI_POOL_ADDRESS", - + "blockchainExplorer": "https://oracle.crystaleum.com/block/{id}", + "transactionExplorer": "https://oracle.crystaleum.com/tx/{id}", + "includeHeight": false, + "includeAlgo": null, + "isRandomX": false, "coin": "Crystaleum", "symbol": "CRFI", "coinUnits": 1000000000000, From 4a5c4c2387841d6923fdbed8a7980110c3487cec Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 15:38:56 -0500 Subject: [PATCH 3/8] enable addressBase58Prefix in config --- lib/utils.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/utils.js b/lib/utils.js index 73f9999..a6c9b35 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -24,8 +24,7 @@ exports.instanceId = function () { /** * Validate miner address **/ -let addressBase58Prefix = parseInt(cnUtil.address_decode(Buffer.from(config.poolServer.poolAddress)) - .toString()); +let addressBase58Prefix = config.poolServer.pubAddressPrefix ? parseInt(config.poolServer.pubAddressPrefix) : parseInt(cnUtil.address_decode(Buffer.from(config.poolServer.poolAddress)).toString()); let integratedAddressBase58Prefix = config.poolServer.intAddressPrefix ? parseInt(config.poolServer.intAddressPrefix) : addressBase58Prefix + 1; let subAddressBase58Prefix = config.poolServer.subAddressPrefix ? parseInt(config.poolServer.subAddressPrefix) : "N/A"; From 267bc53b36bc0730fb68f13716fbd7dde80db346 Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 15:51:50 -0500 Subject: [PATCH 4/8] Update crystaleum.json --- config_examples/crystaleum.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config_examples/crystaleum.json b/config_examples/crystaleum.json index 34119ef..8debe75 100644 --- a/config_examples/crystaleum.json +++ b/config_examples/crystaleum.json @@ -1,7 +1,7 @@ { "poolHost": "CRFI_POOL_ADDRESS", - "blockchainExplorer": "https://oracle.crystaleum.com/block/{id}", - "transactionExplorer": "https://oracle.crystaleum.com/tx/{id}", + "blockchainExplorer": "https://oracle.crystaleum.org/block/{id}", + "transactionExplorer": "https://oracle.crystaleum.org/tx/{id}", "includeHeight": false, "includeAlgo": null, "isRandomX": false, From 7a7ddbca586e69c217c08cafb703692da70ba3d4 Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 16:04:03 -0500 Subject: [PATCH 5/8] Update crystaleum.json --- config_examples/crystaleum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_examples/crystaleum.json b/config_examples/crystaleum.json index 8debe75..9f0f5b9 100644 --- a/config_examples/crystaleum.json +++ b/config_examples/crystaleum.json @@ -5,12 +5,12 @@ "includeHeight": false, "includeAlgo": null, "isRandomX": false, + "finderReward": 0.0, "coin": "Crystaleum", "symbol": "CRFI", "coinUnits": 1000000000000, "coinDecimalPlaces": 12, "coinDifficultyTarget": 6, - "daemonType": "default", "cnAlgorithm": "cryptonight", "cnVariant": 4, From 326268b43b1f10ab040395970834f14cbc5a8c23 Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 16:08:41 -0500 Subject: [PATCH 6/8] Update crystaleum.json --- config_examples/crystaleum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_examples/crystaleum.json b/config_examples/crystaleum.json index 9f0f5b9..875ee81 100644 --- a/config_examples/crystaleum.json +++ b/config_examples/crystaleum.json @@ -5,7 +5,6 @@ "includeHeight": false, "includeAlgo": null, "isRandomX": false, - "finderReward": 0.0, "coin": "Crystaleum", "symbol": "CRFI", "coinUnits": 1000000000000, @@ -131,6 +130,7 @@ "depth": 30, "poolFee": 0.0, "devDonation": 0.0, + "finderReward": 0.0, "networkFee": 0.0 }, From 08b1123db6505ca888382b9105a0f095a42ed58e Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 16:22:49 -0500 Subject: [PATCH 7/8] Update crystaleum.json --- config_examples/crystaleum.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config_examples/crystaleum.json b/config_examples/crystaleum.json index 875ee81..284ab16 100644 --- a/config_examples/crystaleum.json +++ b/config_examples/crystaleum.json @@ -130,8 +130,9 @@ "depth": 30, "poolFee": 0.0, "devDonation": 0.0, + "networkFee": 0.0, "finderReward": 0.0, - "networkFee": 0.0 + "soloFee": 0.0 }, "api": { From 702a2587fad67db6bf76913ddb4335502bd93edb Mon Sep 17 00:00:00 2001 From: Interchained Date: Mon, 4 Jan 2021 16:26:50 -0500 Subject: [PATCH 8/8] Update index.html --- website_example/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website_example/index.html b/website_example/index.html index 7972445..815a065 100644 --- a/website_example/index.html +++ b/website_example/index.html @@ -4,9 +4,9 @@ - Arqma with PLE or XCY or TRTL Mining Pool - Merged Mining by Muscleman - - + Arqma with PLE or XCY or TRTL Mining Pool + + @@ -92,7 +92,7 @@