From baadebd97da91ca938a9b85b5ef58ce06298465c Mon Sep 17 00:00:00 2001
From: Matt <zone117x@gmail.com>
Date: Wed, 7 May 2014 01:11:27 -0600
Subject: [PATCH] Detect kicked blocks and deal with them appropriately

---
 libs/paymentProcessor.js | 67 ++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/libs/paymentProcessor.js b/libs/paymentProcessor.js
index ecffef6..b90f646 100644
--- a/libs/paymentProcessor.js
+++ b/libs/paymentProcessor.js
@@ -213,8 +213,13 @@ function SetupForPool(logger, poolOptions, setupFinished){
                         var round = rounds[i];
 
                         if (tx.error && tx.error.code === -5){
-                            logger.error(logSystem, logComponent, 'Daemon reports invalid transaction ' + round.txHash + ' '
-                                + JSON.stringify(tx.error));
+                            logger.warning(logSystem, logComponent, 'Daemon reports invalid transaction: ' + round.txHash);
+                            round.category = 'kicked';
+                            return;
+                        }
+                        else if (!tx.result.details || (tx.result.details && tx.result.details.length === 0)){
+                            logger.warning(logSystem, logComponent, 'Daemon reports no details for transaction: ' + round.txHash);
+                            round.category = 'kicked';
                             return;
                         }
                         else if (tx.error || !tx.result){
@@ -222,16 +227,6 @@ function SetupForPool(logger, poolOptions, setupFinished){
                                 + JSON.stringify(tx));
                             return;
                         }
-                        else if (round.blockHash !== tx.result.blockhash){
-                            logger.error(logSystem, logComponent, 'Daemon reports blockhash ' + tx.result.blockhash
-                                + ' for tx ' + round.txHash + ' is not the one we have stored: ' + round.blockHash);
-                            return;
-                        }
-                        else if (!(tx.result.details instanceof Array)){
-                            logger.error(logSystem, logComponent, 'Details array missing from transaction '
-                                + round.txHash);
-                            return;
-                        }
 
                         var generationTx = tx.result.details.filter(function(tx){
                             return tx.address === poolOptions.address;
@@ -253,16 +248,29 @@ function SetupForPool(logger, poolOptions, setupFinished){
                             round.reward = generationTx.amount || generationTx.value;
                         }
 
-
                     });
 
+                    var canDeleteShares = function(r){
+                        for (var i = 0; i < rounds.length; i++){
+                            var compareR = rounds[i];
+                            if ((compareR.height === r.height)
+                                && (compareR.category !== 'kicked')
+                                && (compareR.category !== 'orphan')
+                                && (compareR.serialized !== r.serialized)){
+                                return false;
+                            }
+                        }
+                        return true;
+                    };
+
 
                     //Filter out all rounds that are immature (not confirmed or orphaned yet)
                     rounds = rounds.filter(function(r){
                         switch (r.category) {
-                            case 'generate':
-                                return true;
                             case 'orphan':
+                            case 'kicked':
+                                r.canDeleteShares = canDeleteShares(r);
+                            case 'generate':
                                 return true;
                             default:
                                 return false;
@@ -305,11 +313,8 @@ function SetupForPool(logger, poolOptions, setupFinished){
                         }
 
                         switch (round.category){
+                            case 'kicked':
                             case 'orphan':
-                                /* Each block that gets orphaned, all the shares go into the current round so that
-                                   miners still get a reward for their work. This seems unfair to those that just
-                                   started mining during this current round, but over time it balances out and rewards
-                                   loyal miners. */
                                 round.workerShares = workerShares;
                                 break;
 
@@ -373,7 +378,6 @@ function SetupForPool(logger, poolOptions, setupFinished){
                     daemon.cmd('sendmany', [addressAccount || '', addressAmounts], function (result) {
                         if (result.error && result.error.code === -6) {
                             var higherPercent = withholdPercent + 0.01;
-                            console.log('asdfasdfsadfasdf');
                             logger.warning(logSystem, logComponent, 'Not enough funds to send out payments, decreasing rewards by '
                                 + (higherPercent * 100) + '% and retrying');
                             trySend(higherPercent);
@@ -427,21 +431,30 @@ function SetupForPool(logger, poolOptions, setupFinished){
                 var roundsToDelete = [];
                 var orphanMergeCommands = [];
 
+                var moveSharesToCurrent = function(r){
+                    var workerShares = r.workerShares;
+                    Object.keys(workerShares).forEach(function(worker){
+                        orphanMergeCommands.push(['hincrby', coin + '_shares:roundCurrent',
+                            worker, workerShares[worker]]);
+                    });
+                };
+
                 rounds.forEach(function(r){
 
                     switch(r.category){
+                        case 'kicked':
+                            movePendingCommands.push(['smove', coin + '_blocksPending', coin + '_blocksKicked', r.serialized]);
                         case 'orphan':
                             movePendingCommands.push(['smove', coin + '_blocksPending', coin + '_blocksOrphaned', r.serialized]);
-                            var workerShares = r.workerShares;
-                            Object.keys(workerShares).forEach(function(worker){
-                                orphanMergeCommands.push(['hincrby', coin + '_shares:roundCurrent',
-                                    worker, workerShares[worker]]);
-                            });
-                            break;
+                            if (r.canDeleteShares){
+                                moveSharesToCurrent(r);
+                                roundsToDelete.push(coin + '_shares:round' + r.height);
+                            }
+                            return;
                         case 'generate':
                             movePendingCommands.push(['smove', coin + '_blocksPending', coin + '_blocksConfirmed', r.serialized]);
                             roundsToDelete.push(coin + '_shares:round' + r.height);
-                            break;
+                            return;
                     }
 
                 });