RanchiMall/node-stratum-pool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tx was removed during merge

Browse Source
This commit is contained in:
Matt 2014-03-14 17:37:10 -06:00
parent a4ba169300
commit b85f78ef09
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/pool.js
View File

@ -155,8 +155,9 @@ var pool = module.exports = function pool(options, authorizeFn){
emitShare(); emitShare();
else{ else{
SubmitBlock(blockHex, function(){ SubmitBlock(blockHex, function(){
CheckBlockAccepted(shareData.solution, function(isAccepted){ CheckBlockAccepted(shareData.solution, function(isAccepted, tx){
isValidBlock = isAccepted; isValidBlock = isAccepted;
shareData.tx = tx;
emitShare(); emitShare();
}); });
}); });
@ -428,9 +429,13 @@ var pool = module.exports = function pool(options, authorizeFn){
_this.daemon.cmd('getblock', _this.daemon.cmd('getblock',
[blockHash], [blockHash],
function(results){ function(results){
if (results.filter(function(result){return result.response && var validResults = results.filter(function(result){
(result.response.hash === blockHash)}).length >= 1){ return result.response && (result.response.hash === blockHash)
callback(true); });
if (validResults.length >= 1){
console.dir(validResults);
callback(true, validResults[0].response.tx[0]);
} }
else{ else{
callback(false); callback(false);

1
lib/stratum.js
View File

@ -337,7 +337,6 @@ var StratumServer = exports.Server = function StratumServer(ports, connectionTim
stratumClients[subscriptionId] = client; stratumClients[subscriptionId] = client;
_this.emit('client.connected', client); _this.emit('client.connected', client);
client.on('socketDisconnect', function() { client.on('socketDisconnect', function() {
console.log("Socket disconnected for: "+client);
_this.removeStratumClientBySubId(subscriptionId); _this.removeStratumClientBySubId(subscriptionId);
_this.emit('client.disconnected', client); _this.emit('client.disconnected', client);
}).on('ban', function(ipAddress){ }).on('ban', function(ipAddress){

2
lib/varDiff.js
View File

@ -69,7 +69,7 @@ var varDiff = module.exports = function varDiff(port, varDiffOptions){
if (stratumPort != port) { if (stratumPort != port) {
console.error("Handling a client which is not of this vardiff?"); console.error("Handling a client which is not of this vardiff?");
} }
var options = varDiffOptions var options = varDiffOptions;
var lastTs; var lastTs;
var lastRtc; var lastRtc;