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 #30 from joshuayabut/revert-29-pr/28 

Revert "Fix overflowing, have payments use only the payment address, optional to keep previous rounds"
This commit is contained in:
Procrastinator 2016-12-11 23:23:15 -05:00 committed by GitHub
parent 4d0029aab1 dcfc533afc
commit 2d40c5e3dc
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config_example.json
View File

@ -25,8 +25,7 @@
}, },
"redis": { "redis": {
"host": "127.0.0.1", "host": "127.0.0.1",
"port": 6379, "port": 6379
"keepRounds": false
} }
}, },

11
libs/paymentProcessor.js
View File

@ -10,7 +10,6 @@ var util = require('stratum-pool/lib/util.js');
module.exports = function(logger){ module.exports = function(logger){
var poolConfigs = JSON.parse(process.env.pools); var poolConfigs = JSON.parse(process.env.pools);
var portalConfig = JSON.parse(process.env.portalConfig);
var enabledPools = []; var enabledPools = [];
@ -165,7 +164,7 @@ function SetupForPool(logger, poolOptions, setupFinished){
else { else {
var tBalance = 0; var tBalance = 0;
for (var i = 0, len = result[0].response.length; i < len; i++) { for (var i = 0, len = result[0].response.length; i < len; i++) {
tBalance = tBalance + Number((result[0].response[i].amount * magnitude)); tBalance = Number(tBalance + (result[0].response[i].amount * 100000000)).toFixed(0);
} }
logger.debug(logSystem, logComponent, addr + ' contains a balance of: ' + (tBalance / magnitude)); logger.debug(logSystem, logComponent, addr + ' contains a balance of: ' + (tBalance / magnitude));
callback(null, tBalance); callback(null, tBalance);
@ -510,7 +509,7 @@ function SetupForPool(logger, poolOptions, setupFinished){
return; return;
} }
daemon.cmd('sendmany', [addressAccount, addressAmounts], function (result) { daemon.cmd('sendmany', [addressAccount || '', addressAmounts], function (result) {
//Check if payments failed because wallet doesn't have enough coins to pay for tx fees //Check if payments failed because wallet doesn't have enough coins to pay for tx fees
if (result.error && result.error.code === -6) { if (result.error && result.error.code === -6) {
var higherPercent = withholdPercent + 0.01; var higherPercent = withholdPercent + 0.01;
@ -589,11 +588,7 @@ function SetupForPool(logger, poolOptions, setupFinished){
return; return;
case 'generate': case 'generate':
movePendingCommands.push(['smove', coin + ':blocksPending', coin + ':blocksConfirmed', r.serialized]); movePendingCommands.push(['smove', coin + ':blocksPending', coin + ':blocksConfirmed', r.serialized]);
if (portalConfig.defaultPoolConfigs.redis.keepRounds) { roundsToDelete.push(coin + ':shares:round' + r.height);
//Do nothing
} else {
roundsToDelete.push(coin + ':shares:round' + r.height);
}
return; return;
} }