From df68d339834048fde95950b871dc90b374093485 Mon Sep 17 00:00:00 2001
From: "Eugene@ubuntu" <e_mailov@mail.ru>
Date: Wed, 26 Mar 2014 19:43:52 +0400
Subject: [PATCH] add fees withdrawal

---
 libs/paymentProcessor.js                   | 37 +++++++++++++++-------
 pool_configs/litecoin_testnet_example.json |  1 +
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/libs/paymentProcessor.js b/libs/paymentProcessor.js
index aa5d0e9..9221cb4 100644
--- a/libs/paymentProcessor.js
+++ b/libs/paymentProcessor.js
@@ -257,7 +257,7 @@ function SetupForPool(logger, poolOptions){
                 //number of satoshis in a single coin unit - this can be different for coins so we calculate it :)
 
 
-                daemon.cmd('getbalance', [], function(results){
+                daemon.cmd('getbalance', [''], function(results){
 
                     var totalBalance = results[0].response * magnitude;
                     var toBePaid = 0;
@@ -365,10 +365,11 @@ function SetupForPool(logger, poolOptions){
                     var addressAmounts = {};
                     var totalAmountUnits = 0;
                     for (var address in workerPayments){
-                        var coinUnits = parseFloat((workerPayments[address] / magnitude).toFixed(coinPrecision));;
+                        var coinUnits = parseFloat((workerPayments[address] / magnitude).toFixed(coinPrecision));
                         addressAmounts[address] = coinUnits;
                         totalAmountUnits += coinUnits;
                     }
+                    var feeAmountUnits = parseFloat((totalAmountUnits / (1 - processingConfig.feePercent) * processingConfig.feePercent).toFixed(coinPrecision));
 
                     logger.debug(logSystem, logComponent, 'Payments about to be sent to: ' + JSON.stringify(addressAmounts));
                     daemon.cmd('sendmany', ['', addressAmounts], function(results){
@@ -380,9 +381,16 @@ function SetupForPool(logger, poolOptions){
                         var totalWorkers = Object.keys(workerPayments).length;
                         logger.debug(logSystem, logComponent, 'Payments sent, a total of ' + totalAmountUnits +
                             ' was sent to ' + totalWorkers + ' miners');
+                        daemon.cmd('move', ['', processingConfig.feeCollectAccount, feeAmountUnits], function(results){
+                            if (results[0].error){
+                                callback('Check finished - error with move ' + JSON.stringify(results[0].error));
+                                return;
+                            }
+                            var totalWorkers = Object.keys(workerPayments).length;
+                            logger.debug(logSystem, logComponent, feeAmountUnits + ' collected as fee');
+                        });
                     });
                 }
-
             }
         ], function(error, result){
             if (error)
@@ -400,19 +408,26 @@ function SetupForPool(logger, poolOptions){
 
         if (!processingConfig.feeWithdrawalThreshold) return;
 
-        daemon.cmd('getbalance', [], function(results){
+        daemon.cmd('getbalance', [processingConfig.feeCollectAccount], function(results){
 
-            var totalBalance = results[0].response;
-            var withdrawalAmount = totalBalance - processingConfig.minimumReserve;
-            var leftOverBalance = totalBalance - withdrawalAmount;
+            var withdrawalAmount = results[0].response;
 
-
-            if (leftOverBalance < processingConfig.minimumReserve || withdrawalAmount < processingConfig.feeWithdrawalThreshold){
+            if (withdrawalAmount < processingConfig.feeWithdrawalThreshold){
                 logger.debug(logSystem, logComponent, 'Not enough profit to withdrawal yet');
             }
             else{
-                //Need to figure out how much of the balance is profit... ???
-                logger.debug(logSystem, logComponent, 'Can send profit');
+
+                var withdrawal = {};
+                withdrawal[processingConfig.feeReceiveAddress] = withdrawalAmount;
+
+                daemon.cmd('sendmany', [processingConfig.feeCollectAccount, withdrawal], function(results){
+                    if (results[0].error){
+                        logger.debug(logSystem, logComponent, 'Withdrawal profit finished - error with sendmany ' + JSON.stringify(results[0].error));
+                        return;
+                    }
+                    logger.debug(logSystem, logComponent, 'Profit sent, a total of ' + withdrawalAmount +
+                        ' was sent to ' + processingConfig.feeReceiveAddress);
+                });
             }
 
         });
diff --git a/pool_configs/litecoin_testnet_example.json b/pool_configs/litecoin_testnet_example.json
index ba66286..6efb22f 100644
--- a/pool_configs/litecoin_testnet_example.json
+++ b/pool_configs/litecoin_testnet_example.json
@@ -10,6 +10,7 @@
             "minimumPayment": 100.001,
             "minimumReserve": 10,
             "feePercent": 0.02,
+            "feeCollectAccount": "feesCollected",
             "feeReceiveAddress": "LZz44iyF4zLCXJTU8RxztyyJZBntdS6fvv",
             "feeWithdrawalThreshold": 5,
             "daemon": {