From b85f78ef0959d0551fad7d59c5b60ecaa2bde8ad Mon Sep 17 00:00:00 2001
From: Matt <zone117x@gmail.com>
Date: Fri, 14 Mar 2014 17:37:10 -0600
Subject: [PATCH] Fixed tx was removed during merge

---
 lib/pool.js    | 13 +++++++++----
 lib/stratum.js |  1 -
 lib/varDiff.js |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/pool.js b/lib/pool.js
index 98df4e3..e50e39b 100644
--- a/lib/pool.js
+++ b/lib/pool.js
@@ -155,8 +155,9 @@ var pool = module.exports = function pool(options, authorizeFn){
                 emitShare();
             else{
                 SubmitBlock(blockHex, function(){
-                    CheckBlockAccepted(shareData.solution, function(isAccepted){
+                    CheckBlockAccepted(shareData.solution, function(isAccepted, tx){
                         isValidBlock = isAccepted;
+                        shareData.tx = tx;
                         emitShare();
                     });
                 });
@@ -428,9 +429,13 @@ var pool = module.exports = function pool(options, authorizeFn){
         _this.daemon.cmd('getblock',
             [blockHash],
             function(results){
-                if (results.filter(function(result){return result.response &&
-                    (result.response.hash === blockHash)}).length >= 1){
-                    callback(true);
+                var validResults = results.filter(function(result){
+                    return result.response && (result.response.hash === blockHash)
+                });
+
+                if (validResults.length >= 1){
+                    console.dir(validResults);
+                    callback(true, validResults[0].response.tx[0]);
                 }
                 else{
                     callback(false);
diff --git a/lib/stratum.js b/lib/stratum.js
index 0257259..7084f9d 100644
--- a/lib/stratum.js
+++ b/lib/stratum.js
@@ -337,7 +337,6 @@ var StratumServer = exports.Server = function StratumServer(ports, connectionTim
         stratumClients[subscriptionId] = client;
         _this.emit('client.connected', client);
         client.on('socketDisconnect', function() {
-            console.log("Socket disconnected for: "+client);
             _this.removeStratumClientBySubId(subscriptionId);
             _this.emit('client.disconnected', client);
         }).on('ban', function(ipAddress){
diff --git a/lib/varDiff.js b/lib/varDiff.js
index 188e3eb..b9622fc 100644
--- a/lib/varDiff.js
+++ b/lib/varDiff.js
@@ -69,7 +69,7 @@ var varDiff = module.exports = function varDiff(port, varDiffOptions){
         if (stratumPort != port) {
             console.error("Handling a client which is not of this vardiff?");
         }
-        var options = varDiffOptions
+        var options = varDiffOptions;
 
         var lastTs;
         var lastRtc;