From 5515fa6c492082d79769c61d5b6ce501fb11a19a Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 21 Apr 2014 21:23:30 +1000 Subject: [PATCH 1/4] Removes convert module usage --- test/message.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/message.js b/test/message.js index b66cd16..c4cda2e 100644 --- a/test/message.js +++ b/test/message.js @@ -1,5 +1,4 @@ var assert = require('assert') -var convert = require('../').convert var ECKey = require('../src/eckey').ECKey var Message = require('../').Message @@ -17,8 +16,8 @@ describe('Message', function() { addr = '16UwLL9Risc3QfPqBUvKofHmBQ7wMtjvM' // uncompressed caddr = '1PMycacnJaSqwwJqjawXBErnLsZ7RkXUAs' // compressed - sig = convert.hexToBytes('1bc25ac0fb503abc9bad23f558742740fafaec1f52deaaf106b9759a5ce84c93921c4a669c5ec3dfeb7e2d7d177a2f49db407900874f6de2f701a4c16783776d8d') - csig = convert.hexToBytes('1fc25ac0fb503abc9bad23f558742740fafaec1f52deaaf106b9759a5ce84c93921c4a669c5ec3dfeb7e2d7d177a2f49db407900874f6de2f701a4c16783776d8d') + sig = new Buffer('1bc25ac0fb503abc9bad23f558742740fafaec1f52deaaf106b9759a5ce84c93921c4a669c5ec3dfeb7e2d7d177a2f49db407900874f6de2f701a4c16783776d8d', 'hex') + csig = new Buffer('1fc25ac0fb503abc9bad23f558742740fafaec1f52deaaf106b9759a5ce84c93921c4a669c5ec3dfeb7e2d7d177a2f49db407900874f6de2f701a4c16783776d8d', 'hex') }) it('can verify a signed message', function() { @@ -38,7 +37,7 @@ describe('Message', function() { it('supports alternate network addresses', function() { var taddr = 'mxnQZKxSKjzaMgrdXzk35rif3u62TLDrg9' - var tsig = convert.base64ToBytes('IGucnrTku3KLCCHUMwq9anawfrlN8RK1HWMN+10LhsHJeysBdWfj5ohJcS/+oqrlVFNvEgbgEeAQUL6r3sZwnj8=') + var tsig = new Buffer('IGucnrTku3KLCCHUMwq9anawfrlN8RK1HWMN+10LhsHJeysBdWfj5ohJcS/+oqrlVFNvEgbgEeAQUL6r3sZwnj8=', 'base64') assert.ok(Message.verify(taddr, tsig, msg)) assert.ok(!Message.verify(taddr, tsig, 'foobar')) From 69823552c3b29f8256a194ca9720e259ccc5acab Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 21 Apr 2014 21:24:44 +1000 Subject: [PATCH 2/4] Moves network import to top --- test/message.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/message.js b/test/message.js index c4cda2e..a18c3f5 100644 --- a/test/message.js +++ b/test/message.js @@ -1,6 +1,7 @@ var assert = require('assert') var ECKey = require('../src/eckey').ECKey var Message = require('../').Message +var network = require('../').network describe('Message', function() { var msg @@ -69,12 +70,10 @@ describe('Message', function() { describe('testnet address', function(){ it('works', function(){ - var testnet = require('../').network.testnet - var key = ECKey.makeRandom() var sig = Message.sign(key, msg) - var addr = key.pub.getAddress(testnet.pubKeyHash) + var addr = key.pub.getAddress(network.testnet.pubKeyHash) assert(Message.verify(addr, sig, msg)) }) }) From dd049fc76454a77f2a7b5d1f6c53ba9ad78fb5dd Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 21 Apr 2014 21:24:58 +1000 Subject: [PATCH 3/4] Adds magicHash test fixtures --- test/fixtures/message.js | 12 ++++++++++++ test/message.js | 13 +++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 test/fixtures/message.js diff --git a/test/fixtures/message.js b/test/fixtures/message.js new file mode 100644 index 0000000..0210c38 --- /dev/null +++ b/test/fixtures/message.js @@ -0,0 +1,12 @@ +module.exports = { + magicHash: [ + { + message: '', + hash256: '80e795d4a4caadd7047af389d9f7f220562feb6196032e2131e10563352c4bcc' + }, + { + message: 'Vires is Numeris', + hash256: 'f8a5affbef4a3241b19067aa694562f64f513310817297089a8929a930f4f933' + } + ] +} diff --git a/test/message.js b/test/message.js index a18c3f5..6589250 100644 --- a/test/message.js +++ b/test/message.js @@ -3,6 +3,8 @@ var ECKey = require('../src/eckey').ECKey var Message = require('../').Message var network = require('../').network +var fixtures = require('./fixtures/message') + describe('Message', function() { var msg @@ -10,6 +12,17 @@ describe('Message', function() { msg = 'vires is numeris' }) + describe('magicHash', function() { + it('matches the test vectors', function() { + fixtures.magicHash.forEach(function(f) { + var actual = Message.magicHash(f.message) + var expected = f.hash256 + + assert.equal(actual.toString('hex'), expected) + }) + }) + }) + describe('verify', function() { var addr, sig, caddr, csig From 1b46a10d2a9b6363dcf6284ae34cd594c995089c Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 21 Apr 2014 21:44:07 +1000 Subject: [PATCH 4/4] magicHash now uses Buffers internally --- src/message.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/message.js b/src/message.js index 6b0738c..8fc558c 100644 --- a/src/message.js +++ b/src/message.js @@ -7,17 +7,17 @@ var ecdsa = require('./ecdsa') var ECPubKey = require('./eckey').ECPubKey // FIXME: magicHash is incompatible with other magic messages -var magicBytes = convert.stringToBytes('Bitcoin Signed Message:\n') +var magicBytes = new Buffer('Bitcoin Signed Message:\n') function magicHash(message) { - var messageBytes = convert.stringToBytes(message) + var messageBytes = new Buffer(message) - var buffer = [].concat( - convert.numToVarInt(magicBytes.length), + var buffer = Buffer.concat([ + new Buffer(convert.numToVarInt(magicBytes.length)), magicBytes, - convert.numToVarInt(messageBytes.length), + new Buffer(convert.numToVarInt(messageBytes.length)), messageBytes - ) + ]) return crypto.hash256(buffer) }