From 7a3bf72d413c9e780355e2ae9bae7b6f87d2d03b Mon Sep 17 00:00:00 2001 From: hellcatz Date: Tue, 18 Jul 2017 19:30:43 -0700 Subject: [PATCH 1/4] Update zen.json Support Zen HF at block 139200 --- coins/zen.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/coins/zen.json b/coins/zen.json index 8ee7167..0af00ff 100644 --- a/coins/zen.json +++ b/coins/zen.json @@ -57,6 +57,15 @@ "zsi5Yr4Z8HwBvdBqQE8gk7ahExDu95J4oqZ", "zsy6ryEaxfk8emJ8bGVB7tmwRwBL8cfSqBW" ], + "percentTreasuryReward": 12.0, + "treasuryRewardStartBlockHeight": 139200, + "treasuryRewardAddressChangeInterval": 50000, + "vTreasuryRewardAddress": [ + "zsyF68hcYYNLPj5i4PfQJ1kUY6nsFnZkc82", + "zsfULrmbX7xbhqhAFRffVqCw9RyGv2hqNNG", + "zsoemTfqjicem2QVU8cgBHquKb1o9JR5p4Z", + "zt339oiGL6tTgc9Q71f5g1sFTZf6QiXrRUr" + ], "peerMagic": "63617368", "txfee": 0.0004 } From 24a84c6380b3d5f87f05617da738dae2e373394c Mon Sep 17 00:00:00 2001 From: hellcatz Date: Tue, 18 Jul 2017 21:17:16 -0700 Subject: [PATCH 2/4] Update zen_testnet.json --- coins/zen_testnet.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coins/zen_testnet.json b/coins/zen_testnet.json index ce5571b..374c8ac 100644 --- a/coins/zen_testnet.json +++ b/coins/zen_testnet.json @@ -21,5 +21,11 @@ "zrEFrGWLX4hPHuHRUD3TPbMAJyeSpMSctUc", "zr5c3f8PTnW8qBFX1GvK2LhyLBBCb1WDdGG", "zrGkAZkZLqC9QKJR3XomgxNizCpNuAupTeg", "zrM7muDowiun9tCHhu5K9vcDGfUptuYorfZ", "zrCsWfwKotWnQmFviqAHAPAJ2jXqZYW966P", "zrLLB3JB3jozUoMGFEGhjqyVXTpngVQ8c4T", "zrAEa8YjJ2f3m2VsM1Xa9EwibZxEnRoSLUx", "zrAdJgp7Cx35xTvB7ABWP8YLTNDArMjP1s3" ], + "percentTreasuryReward": 12.0, + "treasuryRewardStartBlockHeight": 85500, + "treasuryRewardAddressChangeInterval": 10000, + "vTreasuryRewardAddress": [ + "zrRBQ5heytPMN5nY3ssPf3cG4jocXeD8fm1", "zrRBQ5heytPMN5nY3ssPf3cG4jocXeD8fm1", "zrRBQ5heytPMN5nY3ssPf3cG4jocXeD8fm1", "zrRBQ5heytPMN5nY3ssPf3cG4jocXeD8fm1" + ], "txfee": 0.0004 } From b16990e18a6222fbab64ad121da911be5638cd17 Mon Sep 17 00:00:00 2001 From: hellcatz Date: Tue, 18 Jul 2017 22:06:47 -0700 Subject: [PATCH 3/4] Update paymentProcessor.js Trim address of space that somehow get in the beginning or end. --- libs/paymentProcessor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/paymentProcessor.js b/libs/paymentProcessor.js index 4e317e2..26b1538 100644 --- a/libs/paymentProcessor.js +++ b/libs/paymentProcessor.js @@ -985,7 +985,7 @@ function SetupForPool(logger, poolOptions, setupFinished){ worker.reward = worker.reward || 0; // get miner payout totals var toSendSatoshis = Math.round((worker.balance + worker.reward) * (1 - withholdPercent)); - var address = worker.address = (worker.address || getProperAddress(w.split('.')[0])); + var address = worker.address = (worker.address || getProperAddress(w.split('.')[0])).trim(); if (minerTotals[address] != null && minerTotals[address] > 0) { minerTotals[address] += toSendSatoshis; } else { @@ -998,7 +998,7 @@ function SetupForPool(logger, poolOptions, setupFinished){ worker.balance = worker.balance || 0; worker.reward = worker.reward || 0; var toSendSatoshis = Math.round((worker.balance + worker.reward) * (1 - withholdPercent)); - var address = worker.address = (worker.address || getProperAddress(w.split('.')[0])); + var address = worker.address = (worker.address || getProperAddress(w.split('.')[0])).trim(); // if miners total is enough, go ahead and add this worker balance if (minerTotals[address] >= minPaymentSatoshis) { totalSent += toSendSatoshis; From d8dd19ff8b09131ec673110430221e5a955b046f Mon Sep 17 00:00:00 2001 From: hellcatz Date: Wed, 19 Jul 2017 18:41:18 -0700 Subject: [PATCH 4/4] Update paymentProcessor.js BugFix `result.result[i]` can be undefined in RPC response errors. --- libs/paymentProcessor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/paymentProcessor.js b/libs/paymentProcessor.js index 26b1538..124da5e 100644 --- a/libs/paymentProcessor.js +++ b/libs/paymentProcessor.js @@ -476,7 +476,7 @@ function SetupForPool(logger, poolOptions, setupFinished){ } // check result execution_secs vs pool_config results.forEach(function(result, i) { - if (parseFloat(result.result[i].execution_secs || 0) > shielding_interval) { + if (result.result[i] && parseFloat(result.result[i].execution_secs || 0) > shielding_interval) { logger.warning(logSystem, logComponent, 'Warning, walletInverval shorter than opid execution time of '+result.result[i].execution_secs+' secs.'); } });