zecfoundation
/
s-nomp
mirror of https://github.com/ZcashFoundation/s-nomp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from UdjinM6/master 

fixing timeout issue in paymentProcessor (and get rid of paytxfee - it doesn't help)
This commit is contained in:
Matthew Little 2014-03-27 11:53:52 -06:00
parent 42ae0a4231 d3699b3d08
commit e4e1d1ecc7
1 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
libs/paymentProcessor.js
View File

@ -399,13 +399,13 @@ function SetupForPool(logger, poolOptions){
finalRedisCommands.push(['hincrbyfloat', coin + '_stats', 'totalPaid', (toBePaid / magnitude).toFixed(coinPrecision)]); finalRedisCommands.push(['hincrbyfloat', coin + '_stats', 'totalPaid', (toBePaid / magnitude).toFixed(coinPrecision)]);
callback(null, magnitude, results[0].response, workerPayments, finalRedisCommands); callback(null, magnitude, workerPayments, finalRedisCommands);
}); });
}, },
function(magnitude, balanceBefore, workerPayments, finalRedisCommands, callback){ function(magnitude, workerPayments, finalRedisCommands, callback){
//This does the final all-or-nothing atom transaction if block deamon sent payments //This does the final all-or-nothing atom transaction if block deamon sent payments
var finalizeRedisTx = function(){ var finalizeRedisTx = function(){
@ -445,26 +445,23 @@ function SetupForPool(logger, poolOptions){
finalizeRedisTx(); finalizeRedisTx();
var totalWorkers = Object.keys(workerPayments).length; var totalWorkers = Object.keys(workerPayments).length;
logger.debug(logSystem, logComponent, 'Payments sent, a total of ' + totalAmountUnits + ' ' + poolOptions.coin.symbol +
logger.debug(logSystem, logComponent, 'Payments sent, a total of ' + totalAmountUnits ' was sent to ' + totalWorkers + ' miners');
+ ' ' + poolOptions.coin.symbol + ' was sent to ' + totalWorkers + ' miners'); daemon.cmd('gettransaction', [results[0].response], function(results){
if (results[0].error){
setTimeout(function() { // not sure if we need some time to let daemon update the wallet balance callback('Check finished - error with gettransaction ' + JSON.stringify(results[0].error));
daemon.cmd('getbalance', [''], function(results){ return;
var balanceDiff = balanceBefore - results[0].response; }
var txFee = balanceDiff - totalAmountUnits; var feeAmountUnits = parseFloat((totalAmountUnits / (1 - processingConfig.feePercent) * processingConfig.feePercent).toFixed(coinPrecision));
var leftOver = totalAmountUnits / (1 - processingConfig.feePercent); var poolFees = feeAmountUnits - results[0].response.fee;
var feeAmountUnits = toPrecision(leftOver * processingConfig.feePercent, coinPrecision); daemon.cmd('move', ['', processingConfig.feeCollectAccount, poolFees], function(results){
var poolFees = feeAmountUnits - txFee; if (results[0].error){
daemon.cmd('move', ['', processingConfig.feeCollectAccount, poolFees], function(results){ callback('Check finished - error with move ' + JSON.stringify(results[0].error));
if (results[0].error){ return;
callback('Check finished - error with move ' + JSON.stringify(results[0].error)); }
return; callback(null, poolFees + ' ' + poolOptions.coin.symbol + ' collected as pool fee');
}
callback(null, poolFees + ' ' + poolOptions.coin.symbol + ' collected as pool fee');
});
}); });
}, 1000); });
}); });
} }
} }
@ -488,45 +485,28 @@ function SetupForPool(logger, poolOptions){
logger.debug(logSystem, logComponent, 'Profit withdrawal started'); logger.debug(logSystem, logComponent, 'Profit withdrawal started');
daemon.cmd('getbalance', [processingConfig.feeCollectAccount], function(results){ daemon.cmd('getbalance', [processingConfig.feeCollectAccount], function(results){
/* We have to pay some tx fee here too but maybe we shoudn't really care about it too much as long as fee // We have to pay some tx fee here too but maybe we shoudn't really care about it too much as long as fee is less
is less then minimumReserve value. Because in this case even if feeCollectAccount account will have // then minimumReserve value. Because in this case even if feeCollectAccount account will have negative balance
negative balance total wallet balance will be positive and feeCollectAccount account will be refilled // total wallet balance will be positive and feeCollectAccount account will be refilled during next payment processing.
during next payment processing. But to be as much accurate as we can we use getinfo command to retrieve var withdrawalAmount = results[0].response;
minimum tx fee (paytxfee). */
daemon.cmd('getinfo', [], function(result){
var paytxfee; if (withdrawalAmount < processingConfig.feeWithdrawalThreshold){
if (!result[0].response || !result[0].response.paytxfee){ logger.debug(logSystem, logComponent, 'Not enough profit to withdraw yet');
logger.error(logSystem, logComponent, }
'Daemon does not have paytxfee - withdrawal processing could be broken with this daemon'); else{
paytxfee = 0;
} else {
paytxfee = result[0].response.paytxfee;
}
var withdrawalAmount = results[0].response - paytxfee; var withdrawal = {};
withdrawal[processingConfig.feeReceiveAddress] = withdrawalAmount;
if (withdrawalAmount < processingConfig.feeWithdrawalThreshold){
logger.debug(logSystem, logComponent, 'Not enough profit to withdraw yet');
}
else{
var withdrawal = {};
withdrawal[processingConfig.feeReceiveAddress] = withdrawalAmount;
daemon.cmd('sendmany', [processingConfig.feeCollectAccount, withdrawal], function(results){
if (results[0].error){
logger.debug(logSystem, logComponent,
'Profit withdrawal finished - error with sendmany ' + JSON.stringify(results[0].error));
return;
}
logger.debug(logSystem, logComponent,
'Profit sent, a total of ' + withdrawalAmount + ' ' + poolOptions.coin.symbol +
' was sent to ' + processingConfig.feeReceiveAddress);
});
}
});
daemon.cmd('sendmany', [processingConfig.feeCollectAccount, withdrawal], function(results){
if (results[0].error){
logger.debug(logSystem, logComponent, 'Profit withdrawal finished - error with sendmany ' + JSON.stringify(results[0].error));
return;
}
logger.debug(logSystem, logComponent, 'Profit sent, a total of ' + withdrawalAmount + ' ' + poolOptions.coin.symbol +
' was sent to ' + processingConfig.feeReceiveAddress);
});
}
}); });
}; };