Use proxyTarget for all proxy-related retarget branches

Author: MoneroOcean

lib/pool/miners.js

@@ -404,19 +404,25 @@ module.exports = function createMinerFactory(deps) {
             let minDiff;
             let historyTime;
             const proxyMiner = state.proxyMiners[proxyMinerName];
-            if (proxyMiner && proxyMiner.hashes / (timeNow - proxyMiner.connectTime) > miner.difficulty) {
+            const proxyTarget = 15;
+            let proxyDiff = 0;
+            if (proxyMiner) {
+                const proxyPeriod = (timeNow - proxyMiner.connectTime) / 1000;
+                if (proxyPeriod > 0) proxyDiff = proxyMiner.hashes * proxyTarget / proxyPeriod;
+            }
+            if (proxyMiner && proxyDiff > miner.difficulty) {
                 source = proxyMiner;
-                target = 15;
+                target = proxyTarget;
                 minDiff = 10 * global.config.pool.minDifficulty;
                 historyTime = 5;
             } else if (miner.payout in state.minerWallets && state.minerWallets[miner.payout].last_ver_shares >= global.config.pool.minerThrottleSharePerSec * global.config.pool.minerThrottleShareWindow) {
                 source = state.minerWallets[miner.payout];
-                target = 15;
+                target = proxyTarget;
                 minDiff = 10 * global.config.pool.minDifficulty;
                 historyTime = 5;
             } else {
                 source = miner;
-                target = miner.proxy ? 15 : global.config.pool.targetTime;
+                target = miner.proxy ? proxyTarget : global.config.pool.targetTime;
                 minDiff = miner.proxy ? 10 * global.config.pool.minDifficulty : global.config.pool.minDifficulty;
                 historyTime = 60;
             }