From 6a551d9e1ea41b727be9782bd90f2edbc976de5f Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 16 Mar 2015 10:37:28 +1100 Subject: [PATCH 1/7] networks: s/magicPrefix/messagePrefix, adds magic constant --- src/networks.js | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/networks.js b/src/networks.js index 7395aa4..3a5ffc5 100644 --- a/src/networks.js +++ b/src/networks.js @@ -3,7 +3,8 @@ var networks = { bitcoin: { - magicPrefix: '\x18Bitcoin Signed Message:\n', + magic: 0xd9b4bef9, + messagePrefix: '\x18Bitcoin Signed Message:\n', bip32: { public: 0x0488b21e, private: 0x0488ade4 @@ -16,7 +17,8 @@ var networks = { estimateFee: estimateFee('bitcoin') }, testnet: { - magicPrefix: '\x18Bitcoin Signed Message:\n', + magic: 0xd9b4bef9, + messagePrefix: '\x18Bitcoin Signed Message:\n', bip32: { public: 0x043587cf, private: 0x04358394 @@ -29,7 +31,8 @@ var networks = { estimateFee: estimateFee('testnet') }, litecoin: { - magicPrefix: '\x19Litecoin Signed Message:\n', + magic: 0xd9b4bef9, + messagePrefix: '\x19Litecoin Signed Message:\n', bip32: { public: 0x019da462, private: 0x019d9cfe @@ -43,7 +46,7 @@ var networks = { estimateFee: estimateFee('litecoin') }, dogecoin: { - magicPrefix: '\x19Dogecoin Signed Message:\n', + messagePrefix: '\x19Dogecoin Signed Message:\n', bip32: { public: 0x02facafd, private: 0x02fac398 @@ -57,7 +60,7 @@ var networks = { estimateFee: estimateFee('dogecoin') }, viacoin: { - magicPrefix: '\x18Viacoin Signed Message:\n', + messagePrefix: '\x18Viacoin Signed Message:\n', bip32: { public: 0x0488b21e, private: 0x0488ade4 @@ -71,7 +74,7 @@ var networks = { estimateFee: estimateFee('viacoin') }, viacointestnet: { - magicPrefix: '\x18Viacoin Signed Message:\n', + messagePrefix: '\x18Viacoin Signed Message:\n', bip32: { public: 0x043587cf, private: 0x04358394 @@ -85,7 +88,7 @@ var networks = { estimateFee: estimateFee('viacointestnet') }, gamerscoin: { - magicPrefix: '\x19Gamerscoin Signed Message:\n', + messagePrefix: '\x19Gamerscoin Signed Message:\n', bip32: { public: 0x019da462, private: 0x019d9cfe @@ -99,7 +102,7 @@ var networks = { estimateFee: estimateFee('gamerscoin') }, jumbucks: { - magicPrefix: '\x19Jumbucks Signed Message:\n', + messagePrefix: '\x19Jumbucks Signed Message:\n', bip32: { public: 0x037a689a, private: 0x037a6460 @@ -113,7 +116,7 @@ var networks = { estimateFee: estimateFee('jumbucks') }, zetacoin: { - magicPrefix: '\x18Zetacoin Signed Message:\n', + messagePrefix: '\x18Zetacoin Signed Message:\n', bip32: { public: 0x0488b21e, private: 0x0488ade4 @@ -146,4 +149,11 @@ function estimateFee (type) { } } +// FIXME: 1.5.3 compatibility patch(s) +for (var networkName in networks) { + var network = networks[networkName] + + network.magicPrefix = network.messagePrefix +} + module.exports = networks From c3a39444e39cd3ce9044fbb889abbeba0d26e001 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 16 Mar 2015 10:38:20 +1100 Subject: [PATCH 2/7] networks: extract estimateFee as a bind --- src/networks.js | 57 ++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/src/networks.js b/src/networks.js index 3a5ffc5..264ce8f 100644 --- a/src/networks.js +++ b/src/networks.js @@ -13,8 +13,7 @@ var networks = { scriptHash: 0x05, wif: 0x80, dustThreshold: 546, // https://github.com/bitcoin/bitcoin/blob/v0.9.2/src/core.h#L151-L162 - feePerKb: 10000, // https://github.com/bitcoin/bitcoin/blob/v0.9.2/src/main.cpp#L53 - estimateFee: estimateFee('bitcoin') + feePerKb: 10000 // https://github.com/bitcoin/bitcoin/blob/v0.9.2/src/main.cpp#L53 }, testnet: { magic: 0xd9b4bef9, @@ -27,8 +26,7 @@ var networks = { scriptHash: 0xc4, wif: 0xef, dustThreshold: 546, - feePerKb: 10000, - estimateFee: estimateFee('testnet') + feePerKb: 10000 }, litecoin: { magic: 0xd9b4bef9, @@ -42,8 +40,7 @@ var networks = { wif: 0xb0, dustThreshold: 0, // https://github.com/litecoin-project/litecoin/blob/v0.8.7.2/src/main.cpp#L360-L365 dustSoftThreshold: 100000, // https://github.com/litecoin-project/litecoin/blob/v0.8.7.2/src/main.h#L53 - feePerKb: 100000, // https://github.com/litecoin-project/litecoin/blob/v0.8.7.2/src/main.cpp#L56 - estimateFee: estimateFee('litecoin') + feePerKb: 100000 // https://github.com/litecoin-project/litecoin/blob/v0.8.7.2/src/main.cpp#L56 }, dogecoin: { messagePrefix: '\x19Dogecoin Signed Message:\n', @@ -56,8 +53,7 @@ var networks = { wif: 0x9e, dustThreshold: 0, // https://github.com/dogecoin/dogecoin/blob/v1.7.1/src/core.h#L155-L160 dustSoftThreshold: 100000000, // https://github.com/dogecoin/dogecoin/blob/v1.7.1/src/main.h#L62 - feePerKb: 100000000, // https://github.com/dogecoin/dogecoin/blob/v1.7.1/src/main.cpp#L58 - estimateFee: estimateFee('dogecoin') + feePerKb: 100000000 // https://github.com/dogecoin/dogecoin/blob/v1.7.1/src/main.cpp#L58 }, viacoin: { messagePrefix: '\x18Viacoin Signed Message:\n', @@ -70,8 +66,7 @@ var networks = { wif: 0xc7, dustThreshold: 560, dustSoftThreshold: 100000, - feePerKb: 100000, // - estimateFee: estimateFee('viacoin') + feePerKb: 100000 }, viacointestnet: { messagePrefix: '\x18Viacoin Signed Message:\n', @@ -84,8 +79,7 @@ var networks = { wif: 0xff, dustThreshold: 560, dustSoftThreshold: 100000, - feePerKb: 100000, - estimateFee: estimateFee('viacointestnet') + feePerKb: 100000 }, gamerscoin: { messagePrefix: '\x19Gamerscoin Signed Message:\n', @@ -98,8 +92,7 @@ var networks = { wif: 0xA6, dustThreshold: 0, // https://github.com/gamers-coin/gamers-coinv3/blob/master/src/main.cpp#L358-L363 dustSoftThreshold: 100000, // https://github.com/gamers-coin/gamers-coinv3/blob/master/src/main.cpp#L51 - feePerKb: 100000, // https://github.com/gamers-coin/gamers-coinv3/blob/master/src/main.cpp#L54 - estimateFee: estimateFee('gamerscoin') + feePerKb: 100000 // https://github.com/gamers-coin/gamers-coinv3/blob/master/src/main.cpp#L54 }, jumbucks: { messagePrefix: '\x19Jumbucks Signed Message:\n', @@ -112,8 +105,7 @@ var networks = { wif: 0xab, dustThreshold: 0, dustSoftThreshold: 10000, - feePerKb: 10000, - estimateFee: estimateFee('jumbucks') + feePerKb: 10000 }, zetacoin: { messagePrefix: '\x18Zetacoin Signed Message:\n', @@ -125,34 +117,35 @@ var networks = { scriptHash: 0x09, wif: 0xe0, dustThreshold: 546, // https://github.com/zetacoin/zetacoin/blob/master/src/core.h#L159 - feePerKb: 10000, // https://github.com/zetacoin/zetacoin/blob/master/src/main.cpp#L54 - estimateFee: estimateFee('zetacoin') + feePerKb: 10000 // https://github.com/zetacoin/zetacoin/blob/master/src/main.cpp#L54 } } -function estimateFee (type) { - return function (tx) { - var network = networks[type] - var baseFee = network.feePerKb - var byteSize = tx.toBuffer().length +function estimateFee (tx, network) { + var baseFee = network.feePerKb + var byteSize = tx.toBuffer().length - var fee = baseFee * Math.ceil(byteSize / 1000) - if (network.dustSoftThreshold === undefined) return fee + var fee = baseFee * Math.ceil(byteSize / 1000) + if (network.dustSoftThreshold === undefined) return fee - tx.outs.forEach(function (e) { - if (e.value < network.dustSoftThreshold) { - fee += baseFee - } - }) + tx.outs.forEach(function (e) { + if (e.value < network.dustSoftThreshold) { + fee += baseFee + } + }) - return fee - } + return fee } // FIXME: 1.5.3 compatibility patch(s) +function patchEstimateFee (network, tx) { + return estimateFee(tx, network) +} + for (var networkName in networks) { var network = networks[networkName] + network.estimateFee = patchEstimateFee.bind(null, network) network.magicPrefix = network.messagePrefix } From 9cda36fc76109149442ec2d57adafc11bebb8be5 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 16 Mar 2015 10:50:47 +1100 Subject: [PATCH 3/7] Transaction: extract byteLength calculation to prototype method --- src/transaction.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/transaction.js b/src/transaction.js index fa1b18a..6e8fc6c 100644 --- a/src/transaction.js +++ b/src/transaction.js @@ -137,6 +137,22 @@ Transaction.prototype.addOutput = function (scriptPubKey, value) { }) - 1) } +Transaction.prototype.byteLength = function () { + function scriptSize (script) { + var length = script.buffer.length + + return bufferutils.varIntSize(length) + length + } + + return ( + 8 + + bufferutils.varIntSize(this.ins.length) + + bufferutils.varIntSize(this.outs.length) + + this.ins.reduce(function (sum, input) { return sum + 40 + scriptSize(input.script) }, 0) + + this.outs.reduce(function (sum, output) { return sum + 8 + scriptSize(output.script) }, 0) + ) +} + Transaction.prototype.clone = function () { var newTx = new Transaction() newTx.version = this.version @@ -215,19 +231,7 @@ Transaction.prototype.getId = function () { } Transaction.prototype.toBuffer = function () { - function scriptSize (script) { - var length = script.buffer.length - - return bufferutils.varIntSize(length) + length - } - - var buffer = new Buffer( - 8 + - bufferutils.varIntSize(this.ins.length) + - bufferutils.varIntSize(this.outs.length) + - this.ins.reduce(function (sum, input) { return sum + 40 + scriptSize(input.script) }, 0) + - this.outs.reduce(function (sum, output) { return sum + 8 + scriptSize(output.script) }, 0) - ) + var buffer = new Buffer(this.byteLength()) var offset = 0 function writeSlice (slice) { From 607b3b79833f8b62bf1d80aadae6692a50abf511 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 16 Mar 2015 10:51:21 +1100 Subject: [PATCH 4/7] networks: use byteLength over toBuffer --- src/networks.js | 2 +- test/networks.js | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/networks.js b/src/networks.js index 264ce8f..d4ba24e 100644 --- a/src/networks.js +++ b/src/networks.js @@ -123,7 +123,7 @@ var networks = { function estimateFee (tx, network) { var baseFee = network.feePerKb - var byteSize = tx.toBuffer().length + var byteSize = tx.byteLength() var fee = baseFee * Math.ceil(byteSize / 1000) if (network.dustSoftThreshold === undefined) return fee diff --git a/test/networks.js b/test/networks.js index 79c9288..ead69d8 100644 --- a/test/networks.js +++ b/test/networks.js @@ -10,13 +10,13 @@ var Transaction = require('../src/transaction') var fixtures = require('./fixtures/network') describe('networks', function () { - var txToBuffer + var txByteLength before(function () { - txToBuffer = sinon.stub(Transaction.prototype, 'toBuffer') + txByteLength = sinon.stub(Transaction.prototype, 'byteLength') }) after(function () { - Transaction.prototype.toBuffer.restore() + Transaction.prototype.byteLength.restore() }) describe('constants', function () { @@ -39,8 +39,7 @@ describe('networks', function () { var network = networks[f.network] it('calculates the fee correctly for ' + f.description, function () { - var buffer = new Buffer(f.txSize) - txToBuffer.returns(buffer) + txByteLength.returns(f.txSize) var estimateFee = network.estimateFee var tx = new Transaction() From 1079bf95c1095f7fb018f6e4757277d83b7b9d07 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 16 Mar 2015 10:57:39 +1100 Subject: [PATCH 5/7] message: use messagePrefix naming over magicPrefix --- src/message.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/message.js b/src/message.js index ecb1f18..a210c76 100644 --- a/src/message.js +++ b/src/message.js @@ -11,11 +11,11 @@ var ecurve = require('ecurve') var ecparams = ecurve.getCurveByName('secp256k1') function magicHash (message, network) { - var magicPrefix = new Buffer(network.magicPrefix) + var messagePrefix = new Buffer(network.messagePrefix) var messageBuffer = new Buffer(message) var lengthBuffer = bufferutils.varIntBuffer(messageBuffer.length) - var buffer = Buffer.concat([magicPrefix, lengthBuffer, messageBuffer]) + var buffer = Buffer.concat([messagePrefix, lengthBuffer, messageBuffer]) return crypto.hash256(buffer) } From fc8dd65c0e5e87b963a0d849ec807b5377065506 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 16 Mar 2015 11:03:19 +1100 Subject: [PATCH 6/7] networks: name e variable in loop --- src/networks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/networks.js b/src/networks.js index d4ba24e..0836840 100644 --- a/src/networks.js +++ b/src/networks.js @@ -128,8 +128,8 @@ function estimateFee (tx, network) { var fee = baseFee * Math.ceil(byteSize / 1000) if (network.dustSoftThreshold === undefined) return fee - tx.outs.forEach(function (e) { - if (e.value < network.dustSoftThreshold) { + tx.outs.forEach(function (output) { + if (output.value < network.dustSoftThreshold) { fee += baseFee } }) From 063b0369887d55285bf78ce7036376a8bafa01d6 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 16 Mar 2015 11:14:29 +1100 Subject: [PATCH 7/7] networks: remove magicPrefix double up --- src/networks.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/networks.js b/src/networks.js index 0836840..f2d6bc5 100644 --- a/src/networks.js +++ b/src/networks.js @@ -146,7 +146,6 @@ for (var networkName in networks) { var network = networks[networkName] network.estimateFee = patchEstimateFee.bind(null, network) - network.magicPrefix = network.messagePrefix } module.exports = networks