Skip to content

unomp #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yunsite wants to merge 11 commits into
base: master
Choose a base branch
from
Open

unomp #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
af52fe3
patch-2 scrypt-og
chrisfranko Nov 14, 2014
02e78da
Merge pull request #102 from chrisfranko/patch-2
zone117x Jul 16, 2015
25f6535
Variable length integer IntBuffer fix
romanornr Nov 30, 2016
13653a3
version
romanornr Nov 30, 2016
7830585
Lyra2RE diff by 128
romanornr Dec 1, 2016
786a19b
Merge pull request #113 from romanornr/Romano
zone117x Dec 1, 2016
0cd4fcb
revert Lyra2RE
romanornr Dec 10, 2016
1b8c708
Update util.js
zone117x Dec 23, 2016
7894c47
segwit support
jonnybravo0311 Dec 11, 2016
ff92d28
segwit support
jonnybravo0311 Dec 11, 2016
f2c90d4
segwit support
jonnybravo0311 Dec 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/blockTemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool

function getTransactionBuffers(txs){
var txHashes = txs.map(function(tx){
if (tx.txid !== undefined) {
return util.uint256BufferFromHash(tx.txid);
}
return util.uint256BufferFromHash(tx.hash);
});
return [null].concat(txHashes);
Expand Down Expand Up @@ -136,4 +139,4 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
}
return this.jobParams;
};
};
};
6 changes: 6 additions & 0 deletions lib/jobManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ var JobManager = module.exports = function JobManager(options){
return util.reverseBuffer(hashDigest.apply(this, arguments));
};
}
case 'scrypt-og':
if (options.coin.reward === 'POS') {
return function (d) {
return util.reverseBuffer(hashDigest.apply(this, arguments));
};
}
case 'scrypt-jane':
if (options.coin.reward === 'POS') {
return function (d) {
Expand Down
4 changes: 2 additions & 2 deletions lib/pool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ var pool = module.exports = function pool(options, authorizeFn){
function OnBlockchainSynced(syncedCallback){

var checkSynced = function(displayNotSynced){
_this.daemon.cmd('getblocktemplate', [], function(results){
_this.daemon.cmd('getblocktemplate', [{"capabilities": [ "coinbasetxn", "workid", "coinbase/append" ], "rules": [ "segwit" ]}], function(results){
var synced = results.every(function(r){
return !r.error || r.error.code !== -10;
});
Expand Down Expand Up @@ -566,7 +566,7 @@ var pool = module.exports = function pool(options, authorizeFn){

function GetBlockTemplate(callback){
_this.daemon.cmd('getblocktemplate',
[{"capabilities": [ "coinbasetxn", "workid", "coinbase/append" ]}],
[{"capabilities": [ "coinbasetxn", "workid", "coinbase/append" ], "rules": [ "segwit" ]}],
function(result){
if (result.error){
emitErrorLog('getblocktemplate call failed for daemon instance ' +
Expand Down
10 changes: 9 additions & 1 deletion lib/transactions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,15 @@ var generateOutputTransactions = function(poolRecipient, recipients, rpcData){
util.varIntBuffer(poolRecipient.length),
poolRecipient
]));


if (rpcData.default_witness_commitment !== undefined){
witness_commitment = new Buffer(rpcData.default_witness_commitment, 'hex');
txOutputBuffers.unshift(Buffer.concat([
util.packInt64LE(0),
util.varIntBuffer(witness_commitment.length),
witness_commitment
]));
}

return Buffer.concat([
util.varIntBuffer(txOutputBuffers.length),
Expand Down
6 changes: 3 additions & 3 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ Defined in bitcoin protocol here:
exports.varIntBuffer = function(n){
if (n < 0xfd)
return new Buffer([n]);
else if (n < 0xffff){
else if (n <= 0xffff){
var buff = new Buffer(3);
buff[0] = 0xfd;
buff.writeUInt16LE(n, 1);
return buff;
}
else if (n < 0xffffffff){
else if (n <= 0xffffffff){
var buff = new Buffer(5);
buff[0] = 0xfe;
buff.writeUInt32LE(n, 1);
Expand Down Expand Up @@ -373,4 +373,4 @@ exports.convertBitsToBuff = function(bitsBuff){

exports.getTruncatedDiff = function(shift){
return exports.convertBitsToBuff(exports.bufferToCompactBits(exports.shiftMax256Right(shift)));
};
};
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stratum-pool",
"version": "0.1.6",
"version": "0.1.9",
"description": "High performance Stratum poolserver in Node.js",
"keywords": [
"stratum",
Expand Down