BTCPrivate
/
z-nomp
mirror of https://github.com/BTCPrivate/z-nomp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #170 from hellcatz/zen-updates 

Zen Updates
This commit is contained in:
sennevb 2017-07-21 22:25:54 +02:00 committed by GitHub
parent e1675cb5fe d8dd19ff8b
commit 15f4912b4a
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
coins/zen.json
View File

@ -57,6 +57,15 @@
"zsi5Yr4Z8HwBvdBqQE8gk7ahExDu95J4oqZ",
"zsy6ryEaxfk8emJ8bGVB7tmwRwBL8cfSqBW"
],
"percentTreasuryReward": 12.0,
"treasuryRewardStartBlockHeight": 139200,
"treasuryRewardAddressChangeInterval": 50000,
"vTreasuryRewardAddress": [
"zsyF68hcYYNLPj5i4PfQJ1kUY6nsFnZkc82",
"zsfULrmbX7xbhqhAFRffVqCw9RyGv2hqNNG",
"zsoemTfqjicem2QVU8cgBHquKb1o9JR5p4Z",
"zt339oiGL6tTgc9Q71f5g1sFTZf6QiXrRUr"
],
"peerMagic": "63617368",
"txfee": 0.0004
}

6
coins/zen_testnet.json
View File

@ -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
}

6
libs/paymentProcessor.js
View File

@ -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.');
}
});
@ -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;