Compare commits

..

No commits in common. "0af31019319c3ad6fbca9920b7068d1d8ed1e7af" and "60c88a7c5ff6b22a814f41a86cc906d11661adb2" have entirely different histories.

6 changed files with 56 additions and 71 deletions

View File

@ -9,7 +9,7 @@ var util = require('./util.js');
* The BlockTemplate class holds a single job.
* and provides several methods to validate and submit it to the daemon coin
**/
var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, poolAddressScript, extraNoncePlaceholder, reward, txMessages, recipients, network){
var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, poolAddressScript, extraNoncePlaceholder, reward, txMessages, recipients){
//private members
@ -71,8 +71,7 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
extraNoncePlaceholder,
reward,
txMessages,
recipients,
network
recipients
);
this.serializeCoinbase = function(extraNonce1, extraNonce2){

View File

@ -123,8 +123,7 @@ var JobManager = module.exports = function JobManager(options){
_this.extraNoncePlaceholder,
options.coin.reward,
options.coin.txMessages,
options.recipients,
options.network
options.recipients
);
_this.currentJob = tmpBlockTemplate;
@ -159,8 +158,7 @@ var JobManager = module.exports = function JobManager(options){
_this.extraNoncePlaceholder,
options.coin.reward,
options.coin.txMessages,
options.recipients,
options.network
options.recipients
);
this.currentJob = tmpBlockTemplate;

View File

@ -20,9 +20,6 @@ var pool = module.exports = function pool(options, authorizeFn){
var _this = this;
var blockPollingIntervalId;
if (!(options.address)) {
_this.newAddressOnNewBlock = true;
}
var emitLog = function(text) { _this.emit('log', 'debug' , text); };
var emitWarningLog = function(text) { _this.emit('log', 'warning', text); };
@ -226,6 +223,7 @@ var pool = module.exports = function pool(options, authorizeFn){
Coin daemons either use submitblock or getblocktemplate for submitting new blocks
*/
function SubmitBlock(blockHex, callback){
var rpcCommand, rpcArgs;
if (options.hasSubmitMethod){
rpcCommand = 'submitblock';
@ -236,16 +234,6 @@ var pool = module.exports = function pool(options, authorizeFn){
rpcArgs = [{'mode': 'submit', 'data': blockHex}];
}
if (_this.newAddressOnNewBlock) {
_this.daemon.cmd('getnewaddress', [], function(results) {
options.poolAddressScript = (function(){
return util.addressToScript(options.network, results[0].response);
})();
options.address = results[0].response;
});
}
_this.daemon.cmd(rpcCommand,
rpcArgs,
@ -285,7 +273,7 @@ var pool = module.exports = function pool(options, authorizeFn){
if (r.length === 40)
rObj.script = util.miningKeyToScript(r);
else
rObj.script = util.addressToScript(options.network, r);
rObj.script = util.addressToScript(r);
recipients.push(rObj);
options.feePercent += percent;
}
@ -362,13 +350,7 @@ var pool = module.exports = function pool(options, authorizeFn){
});
_this.daemon.once('online', function(){
if (options.address == false) {
_this.daemon.cmd('getnewaddress', [], function(results) {
options.address = results[0].response;
finishedCallback();
})
}
finishedCallback();
finishedCallback();
}).on('connectionFailed', function(error){
emitErrorLog('Failed to connect daemon(s): ' + JSON.stringify(error));
@ -432,19 +414,17 @@ var pool = module.exports = function pool(options, authorizeFn){
return;
}
options.testnet = (rpcResults.getblockchaininfo.chain === 'test') ? true : false;
options.network = (options.testnet ? options.coin.testnet : options.coin.mainnet);
options.poolAddressScript = (function(){
switch(options.coin.reward){
case 'POS':
return util.pubkeyToScript(rpcResults.validateaddress.pubkey);
case 'POW':
return util.addressToScript(options.network, rpcResults.validateaddress.address);
return util.addressToScript(rpcResults.validateaddress.address);
}
})();
options.testnet = (rpcResults.getblockchaininfo.chain === 'test') ? true : false;
options.protocolVersion = rpcResults.getnetworkinfo.protocolversion;
options.initStats = {

View File

@ -123,7 +123,7 @@ For some (probably outdated and incorrect) documentation about whats kinda going
see: https://en.bitcoin.it/wiki/Protocol_specification#tx
*/
var generateOutputTransactions = function(poolRecipient, recipients, rpcData, network){
var generateOutputTransactions = function(poolRecipient, recipients, rpcData){
var reward = rpcData.coinbasevalue;
var rewardToPool = reward;
@ -132,52 +132,52 @@ var generateOutputTransactions = function(poolRecipient, recipients, rpcData, ne
/* Dash 12.1 */
if (rpcData.masternode && rpcData.superblock) {
if (rpcData.masternode.payee) {
/* Dash 12.1 */
if (rpcData.masternode && rpcData.superblock) {
if (rpcData.masternode.payee) {
var payeeReward = 0;
payeeReward = rpcData.masternode.amount;
reward -= payeeReward;
rewardToPool -= payeeReward;
var payeeScript = util.addressToScript(rpcData.masternode.payee);
txOutputBuffers.push(Buffer.concat([
util.packInt64LE(payeeReward),
util.varIntBuffer(payeeScript.length),
payeeScript
]));
} else if (rpcData.superblock.length > 0) {
for(var i in rpcData.superblock){
var payeeReward = 0;
payeeReward = rpcData.masternode.amount;
payeeReward = rpcData.superblock[i].amount;
reward -= payeeReward;
rewardToPool -= payeeReward;
var payeeScript = util.addressToScript(network, rpcData.masternode.payee);
var payeeScript = util.addressToScript(rpcData.superblock[i].payee);
txOutputBuffers.push(Buffer.concat([
util.packInt64LE(payeeReward),
util.varIntBuffer(payeeScript.length),
payeeScript
]));
} else if (rpcData.superblock.length > 0) {
for(var i in rpcData.superblock){
var payeeReward = 0;
payeeReward = rpcData.superblock[i].amount;
reward -= payeeReward;
rewardToPool -= payeeReward;
var payeeScript = util.addressToScript(network, rpcData.superblock[i].payee);
txOutputBuffers.push(Buffer.concat([
util.packInt64LE(payeeReward),
util.varIntBuffer(payeeScript.length),
payeeScript
]));
}
}
}
}
if (rpcData.payee) {
var payeeReward = 0;
if (rpcData.payee) {
var payeeReward = 0;
if (rpcData.payee_amount) {
payeeReward = rpcData.payee_amount;
} else {
payeeReward = Math.ceil(reward / 5);
}
if (rpcData.payee_amount) {
payeeReward = rpcData.payee_amount;
} else {
payeeReward = Math.ceil(reward / 5);
}
reward -= payeeReward;
rewardToPool -= payeeReward;
var payeeScript = util.addressToScript(network, rpcData.payee);
var payeeScript = util.addressToScript(rpcData.payee);
txOutputBuffers.push(Buffer.concat([
util.packInt64LE(payeeReward),
util.varIntBuffer(payeeScript.length),
@ -222,7 +222,7 @@ var generateOutputTransactions = function(poolRecipient, recipients, rpcData, ne
};
exports.CreateGeneration = function(rpcData, publicKey, extraNoncePlaceholder, reward, txMessages, recipients, network){
exports.CreateGeneration = function(rpcData, publicKey, extraNoncePlaceholder, reward, txMessages, recipients){
var txInputsCount = 1;
var txOutputsCount = 1;
@ -272,7 +272,7 @@ exports.CreateGeneration = function(rpcData, publicKey, extraNoncePlaceholder, r
*/
var outputTransactions = generateOutputTransactions(publicKey, recipients, rpcData, network);
var outputTransactions = generateOutputTransactions(publicKey, recipients, rpcData);
var p2 = Buffer.concat([
scriptSigPart2,

View File

@ -2,7 +2,6 @@ var crypto = require('crypto');
var base58 = require('base58-native');
var bignum = require('bignum');
var bitcoin = require('bitcoinjs-lib');
exports.addressFromEx = function(exAddress, ripdm160Key){
@ -262,16 +261,26 @@ exports.miningKeyToScript = function(key){
/*
For POW coins - used to format wallet address for use in generation transaction's output
*/
exports.addressToScript = function(network, addr){
exports.addressToScript = function(addr){
if (typeof network !== 'undefined' && network !== null){
return bitcoin.address.toOutputScript(addr, network);
} else {
return Buffer.concat([new Buffer([0x76, 0xa9, 0x14]), bitcoin.address.fromBase58Check(addr).hash, new Buffer([0x88, 0xac])]);
var decoded = base58.decode(addr);
if (decoded.length != 25){
console.error('invalid address length for ' + addr);
throw new Error();
}
if (!decoded){
console.error('base58 decode failed for ' + addr);
throw new Error();
}
var pubkey = decoded.slice(1,-4);
return Buffer.concat([new Buffer([0x76, 0xa9, 0x14]), pubkey, new Buffer([0x88, 0xac])]);
};
exports.getReadableHashRateString = function(hashrate){
var i = -1;
var byteUnits = [ ' KH', ' MH', ' GH', ' TH', ' PH' ];

View File

@ -29,7 +29,6 @@
},
"dependencies": {
"multi-hashing": "git://github.com/zone117x/node-multi-hashing.git",
"bitcoinjs-lib": "*",
"bignum": "*",
"base58-native": "*",
"async": "*"