From 43f724cb0b515cefec0ec9afe51fc7658ad31ad1 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Sun, 19 Oct 2014 01:10:20 +1100
Subject: [PATCH 01/13] integration tests: add brainwallet/README examples

---
 test/integration/brainwallet.js | 31 +++++++++++++++++++++++
 test/integration/readme.js      | 44 +++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 test/integration/brainwallet.js
 create mode 100644 test/integration/readme.js

diff --git a/test/integration/brainwallet.js b/test/integration/brainwallet.js
new file mode 100644
index 0000000..251696b
--- /dev/null
+++ b/test/integration/brainwallet.js
@@ -0,0 +1,31 @@
+var assert = require('assert')
+
+var bigi = require('bigi')
+var bitcoin = require('../../')
+
+describe('bitcoinjs-lib (brainwallet examples)', function() {
+  it('can initialize a ECKey from a sha256 hash', function() {
+    var hash = bitcoin.crypto.sha256('correct horse battery staple')
+    var d = bigi.fromBuffer(hash)
+
+    var key = new bitcoin.ECKey(d)
+
+    assert.equal(key.pub.getAddress().toString(), '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8')
+  })
+
+  it('can sign a bitcoin message', function() {
+    var key = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
+    var message = 'This is an example of a signed message.'
+
+    var signature = bitcoin.Message.sign(key, message)
+    assert.equal(signature.toString('base64'), 'G9L5yLFjti0QTHhPyFrZCT1V/MMnBtXKmoiKDZ78NDBjERki6ZTQZdSMCtkgoNmp17By9ItJr8o7ChX0XxY91nk=')
+  })
+
+  it('can verify a bitcoin message', function() {
+    var address = '1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN'
+    var signature = 'HJLQlDWLyb1Ef8bQKEISzFbDAKctIlaqOpGbrk3YVtRsjmC61lpE5ErkPRUFtDKtx98vHFGUWlFhsh3DiW6N0rE'
+    var message = 'This is an example of a signed message.'
+
+    assert(bitcoin.Message.verify(address, signature, message))
+  })
+})
diff --git a/test/integration/readme.js b/test/integration/readme.js
new file mode 100644
index 0000000..0a32a00
--- /dev/null
+++ b/test/integration/readme.js
@@ -0,0 +1,44 @@
+var assert = require('assert')
+
+var bitcoin = require('../../')
+
+describe('bitcoinjs-lib (README)', function() {
+  it('can generate a Bitcoin address from a WIF private key', function() {
+    var key = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct')
+
+    assert.equal(key.pub.getAddress().toString(), '19AAjaTUbRjQCMuVczepkoPswiZRhjtg31')
+  })
+
+  it('can create a Transaction', function() {
+    var tx = new bitcoin.TransactionBuilder()
+
+    // Add the input (who is paying) of the form [previous transaction hash, index of the output to use]
+    tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
+
+    // Add the output (who to pay to) of the form [payee's address, amount in satoshis]
+    tx.addOutput("1Gokm82v6DmtwKEB8AiVhm82hyFSsEvBDK", 15000)
+
+    // Initialize a private key using WIF
+    var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
+
+    // Sign the first input with the new key
+    tx.sign(0, key)
+
+    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006b483045022100aefbcf847900b01dd3e3debe054d3b6d03d715d50aea8525f5ea3396f168a1fb022013d181d05b15b90111808b22ef4f9ebe701caf2ab48db269691fdf4e9048f4f60121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000')
+  })
+
+  it('can create a P2SH Multisig Address', function() {
+    var privKeys = [
+      'Kwv4iik3zSrMoR8RztogbMzV3i3CFRHjFPyQ8SME88g8c7fB4ouL',
+      'KyahXPPP45jSmWVSd9687wPhqEAtRZCNfP3ENyZyV7CJ5gWWWWW1',
+      'KzGaNk5adgZsjfsaWqwrCZhQn63BkQiKUWrCYBLTNspoDZ1d83F3'
+    ].map(bitcoin.ECKey.fromWIF)
+    var pubKeys = privKeys.map(function(x) { return x.pub })
+
+    var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
+    var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
+    var p2shAddress = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
+
+    assert.equal(p2shAddress, '36NUkt6FWUi3LAWBqWRdDmdTWbt91Yvfu7')
+  })
+})

From ddc947323e1bde67a003dc0242f57a24e3047c57 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Sun, 19 Oct 2014 01:11:19 +1100
Subject: [PATCH 02/13] integration tests: refactor helloblock P2SH spending
 test

---
 test/integration/helloblock.js | 68 +++++++++++++++++++++++++++++++
 test/integration/p2sh.js       | 74 ----------------------------------
 2 files changed, 68 insertions(+), 74 deletions(-)
 create mode 100644 test/integration/helloblock.js
 delete mode 100644 test/integration/p2sh.js

diff --git a/test/integration/helloblock.js b/test/integration/helloblock.js
new file mode 100644
index 0000000..7cd04dd
--- /dev/null
+++ b/test/integration/helloblock.js
@@ -0,0 +1,68 @@
+var assert = require('assert')
+
+var bitcoin = require('../../')
+var networks = bitcoin.networks
+var scripts = bitcoin.scripts
+
+var Address = bitcoin.Address
+var ECKey = bitcoin.ECKey
+var TransactionBuilder = bitcoin.TransactionBuilder
+
+var helloblock = require('helloblock-js')({
+  network: 'testnet'
+})
+
+describe('bitcoinjs-lib (helloblock)', function() {
+  this.timeout(20000)
+
+  it('can spend from a 2-of-2 address', function(done) {
+    var privKeys = [
+      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx',
+      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT'
+    ].map(ECKey.fromWIF)
+    var pubKeys = privKeys.map(function(x) { return x.pub })
+
+    var redeemScript = scripts.multisigOutput(2, pubKeys)
+    var scriptPubKey = scripts.scriptHashOutput(redeemScript.getHash())
+    var p2shAddress = Address.fromOutputScript(scriptPubKey, networks.testnet).toString()
+
+    // Attempt to send funds to the source address
+    helloblock.faucet.withdraw(p2shAddress, 2e4, function(err) {
+      if (err) return done(err)
+
+      // get latest unspents from the p2shAddress
+      helloblock.addresses.getUnspents(p2shAddress, function(err, res, unspents) {
+        if (err) return done(err)
+
+        // use the oldest unspent
+        var unspent = unspents[unspents.length - 1]
+        var spendAmount = Math.min(unspent.value, 1e4)
+
+        // make a random destination address
+        var targetAddress = ECKey.makeRandom().pub.getAddress(networks.testnet).toString()
+
+        var txb = new TransactionBuilder()
+        txb.addInput(unspent.txHash, unspent.index)
+        txb.addOutput(targetAddress, spendAmount)
+
+        privKeys.forEach(function(privKey) {
+          txb.sign(0, privKey, redeemScript)
+        })
+
+        // broadcast our transaction
+        helloblock.transactions.propagate(txb.build().toHex(), function(err) {
+          // no err means that the transaction has been successfully propagated
+          if (err) return done(err)
+
+          // check that the funds (spendAmount Satoshis) indeed arrived at the intended address
+          helloblock.addresses.get(targetAddress, function(err, res, addrInfo) {
+            if (err) return done(err)
+
+            assert.equal(addrInfo.balance, spendAmount)
+            done()
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/test/integration/p2sh.js b/test/integration/p2sh.js
deleted file mode 100644
index 0b975b6..0000000
--- a/test/integration/p2sh.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var assert = require('assert')
-
-var bitcoin = require('../../')
-var networks = bitcoin.networks
-var scripts = bitcoin.scripts
-
-var Address = bitcoin.Address
-var ECKey = bitcoin.ECKey
-var TransactionBuilder = bitcoin.TransactionBuilder
-
-var helloblock = require('helloblock-js')({
-  network: 'testnet'
-})
-
-describe('Bitcoin-js', function() {
-  this.timeout(10000)
-
-  it('can spend from a 2-of-2 address', function(done) {
-    var privKeys = [
-      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx',
-      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT'
-    ].map(function(wif) {
-      return ECKey.fromWIF(wif)
-    })
-
-    var coldAmount = 2e4
-    var outputAmount = 1e4
-
-    var pubKeys = privKeys.map(function(eck) { return eck.pub })
-    var redeemScript = scripts.multisigOutput(2, pubKeys)
-    var scriptPubKey = scripts.scriptHashOutput(redeemScript.getHash())
-
-    var multisigAddress = Address.fromOutputScript(scriptPubKey, networks.testnet).toString()
-
-    // Attempt to send funds to the source address, providing some unspents for later
-    helloblock.faucet.withdraw(multisigAddress, coldAmount, function(err) {
-      if (err) return done(err)
-    })
-
-    // make a random private key
-    var targetAddress = ECKey.makeRandom().pub.getAddress(networks.testnet).toString()
-
-    // get latest unspents from the multisigAddress
-    helloblock.addresses.getUnspents(multisigAddress, function(err, res, unspents) {
-      if (err) return done(err)
-
-      // use the oldest unspent
-      var unspent = unspents[unspents.length - 1]
-      var spendAmount = Math.min(unspent.value, outputAmount)
-
-      var txb = new TransactionBuilder()
-      txb.addInput(unspent.txHash, unspent.index)
-      txb.addOutput(targetAddress, spendAmount)
-
-      privKeys.forEach(function(privKey) {
-        txb.sign(0, privKey, redeemScript)
-      })
-
-      // broadcast our transaction
-      helloblock.transactions.propagate(txb.build().toHex(), function(err) {
-        // no err means that the transaction has been successfully propagated
-        if (err) return done(err)
-
-        // Check that the funds (spendAmount Satoshis) indeed arrived at the intended address
-        helloblock.addresses.get(targetAddress, function(err, res, addrInfo) {
-          if (err) return done(err)
-
-          assert.equal(addrInfo.balance, spendAmount)
-          done()
-        })
-      })
-    })
-  })
-})

From ccd0bb54366b0e7dee3d1fd78adf1bba665d9f69 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Sun, 19 Oct 2014 12:29:55 +1100
Subject: [PATCH 03/13] integration tests: add example OP_RETURN transaction

---
 test/integration/readme.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/test/integration/readme.js b/test/integration/readme.js
index 0a32a00..cd4bf8c 100644
--- a/test/integration/readme.js
+++ b/test/integration/readme.js
@@ -10,21 +10,28 @@ describe('bitcoinjs-lib (README)', function() {
   })
 
   it('can create a Transaction', function() {
+    var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
     var tx = new bitcoin.TransactionBuilder()
 
-    // Add the input (who is paying) of the form [previous transaction hash, index of the output to use]
     tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
-
-    // Add the output (who to pay to) of the form [payee's address, amount in satoshis]
     tx.addOutput("1Gokm82v6DmtwKEB8AiVhm82hyFSsEvBDK", 15000)
+    tx.sign(0, key)
+
+    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006b483045022100aefbcf847900b01dd3e3debe054d3b6d03d715d50aea8525f5ea3396f168a1fb022013d181d05b15b90111808b22ef4f9ebe701caf2ab48db269691fdf4e9048f4f60121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000')
+  })
 
-    // Initialize a private key using WIF
+  it('can create an OP_RETURN transaction', function() {
     var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
+    var tx = new bitcoin.TransactionBuilder()
+
+    var data = new Buffer('cafedeadbeef', 'hex')
+    var dataScript = bitcoin.scripts.dataOutput(data)
 
-    // Sign the first input with the new key
+    tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
+    tx.addOutput(dataScript, 1000)
     tx.sign(0, key)
 
-    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006b483045022100aefbcf847900b01dd3e3debe054d3b6d03d715d50aea8525f5ea3396f168a1fb022013d181d05b15b90111808b22ef4f9ebe701caf2ab48db269691fdf4e9048f4f60121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000')
+    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006a4730440220578f9df41a0e5c5052ad6eef46d005b41f966c7fda01d5f71e9c65026c9025c002202e0159ea0db47ca1bf7713e3a08bbba8cc4fdd90a2eff12591c42049c7cad6c30121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01e803000000000000086a06cafedeadbeef00000000')
   })
 
   it('can create a P2SH Multisig Address', function() {

From 6db700c214a470bfd5411ab2b2ee8a60b4ccc2d7 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Sun, 19 Oct 2014 13:37:15 +1100
Subject: [PATCH 04/13] integration tests: add stealth address example

---
 test/integration/darkwallet.js | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 test/integration/darkwallet.js

diff --git a/test/integration/darkwallet.js b/test/integration/darkwallet.js
new file mode 100644
index 0000000..e07b9aa
--- /dev/null
+++ b/test/integration/darkwallet.js
@@ -0,0 +1,39 @@
+var assert = require('assert')
+
+var bigi = require('bigi')
+var bitcoin = require('../../')
+
+describe('bitcoinjs-lib (darkwallet examples)', function() {
+  it('can generate a single-key stealth address', function() {
+    var receiver = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
+    var sender = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct') // XXX: ephemeral, must be random to preserve privacy
+
+    var G = bitcoin.ECKey.curve.G
+    var d = receiver.d // secret (receiver only)
+    var Q = receiver.pub.Q // shared
+
+    var e = sender.d // secret (sender only)
+    var P = sender.pub.Q // shared
+
+    // derived shared secret
+    var eQ = Q.multiply(e) // sender
+    var dP = P.multiply(d) // receiver
+    assert.deepEqual(eQ.getEncoded(), dP.getEncoded())
+
+    var c = bigi.fromBuffer(bitcoin.crypto.sha256(eQ.getEncoded()))
+    var cG = G.multiply(c)
+
+    // derived public key
+    var QprimeS = Q.add(cG)
+    var QprimeR = G.multiply(d.add(c))
+    assert.deepEqual(QprimeR.getEncoded(), QprimeS.getEncoded())
+
+    // derived shared-secret address
+    var address = new bitcoin.ECPubKey(QprimeS).getAddress().toString()
+
+    assert.equal(address, '1EwCNJNZM5q58YPPTnjR1H5BvYRNeyZi47')
+  })
+
+  // TODO
+  it.skip('can generate a dual-key stealth address', function() {})
+})

From a6febb0bedcfff2228f33170e042e75d8c2410db Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Mon, 24 Nov 2014 21:02:19 +1100
Subject: [PATCH 05/13] integration tests: add more basic examples

---
 test/integration/readme.js | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/test/integration/readme.js b/test/integration/readme.js
index cd4bf8c..524ab3e 100644
--- a/test/integration/readme.js
+++ b/test/integration/readme.js
@@ -1,12 +1,27 @@
 var assert = require('assert')
 
 var bitcoin = require('../../')
+var crypto = require('crypto')
+var sinon = require('sinon')
 
 describe('bitcoinjs-lib (README)', function() {
-  it('can generate a Bitcoin address from a WIF private key', function() {
+  it('can generate a random bitcoin address', sinon.test(function() {
+    // for testing only
+    this.mock(crypto).expects('randomBytes')
+      .onCall(0).returns(new Buffer('zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'))
+
+    // generate random key
+    var key = bitcoin.ECKey.makeRandom()
+    var address = key.pub.getAddress().toString()
+
+    assert.equal(address, '1F5VhMHukdnUES9kfXqzPzMeF1GPHKiF64')
+  }))
+
+  it('can import a WIF encoded private key', function() {
     var key = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct')
+    var address = key.pub.getAddress().toString()
 
-    assert.equal(key.pub.getAddress().toString(), '19AAjaTUbRjQCMuVczepkoPswiZRhjtg31')
+    assert.equal(address, '19AAjaTUbRjQCMuVczepkoPswiZRhjtg31')
   })
 
   it('can create a Transaction', function() {
@@ -35,17 +50,16 @@ describe('bitcoinjs-lib (README)', function() {
   })
 
   it('can create a P2SH Multisig Address', function() {
-    var privKeys = [
-      'Kwv4iik3zSrMoR8RztogbMzV3i3CFRHjFPyQ8SME88g8c7fB4ouL',
-      'KyahXPPP45jSmWVSd9687wPhqEAtRZCNfP3ENyZyV7CJ5gWWWWW1',
-      'KzGaNk5adgZsjfsaWqwrCZhQn63BkQiKUWrCYBLTNspoDZ1d83F3'
-    ].map(bitcoin.ECKey.fromWIF)
-    var pubKeys = privKeys.map(function(x) { return x.pub })
+    var pubKeys = [
+      '026477115981fe981a6918a6297d9803c4dc04f328f22041bedff886bbc2962e01',
+      '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
+      '03c6103b3b83e4a24a0e33a4df246ef11772f9992663db0c35759a5e2ebf68d8e9'
+    ].map(bitcoin.ECPubKey.fromHex)
 
     var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
     var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
-    var p2shAddress = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
+    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
 
-    assert.equal(p2shAddress, '36NUkt6FWUi3LAWBqWRdDmdTWbt91Yvfu7')
+    assert.equal(address, '36NUkt6FWUi3LAWBqWRdDmdTWbt91Yvfu7')
   })
 })

From f81a47a8b93d7906c37dd459c80fa7fe33e6ced3 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Mon, 24 Nov 2014 21:15:28 +1100
Subject: [PATCH 06/13] integration tests: rename all files to
 basic/advanced/multisig

---
 test/integration/advanced.js             | 71 ++++++++++++++++++++++
 test/integration/{readme.js => basic.js} | 40 ++++---------
 test/integration/brainwallet.js          | 31 ----------
 test/integration/darkwallet.js           | 39 ------------
 test/integration/helloblock.js           | 68 ---------------------
 test/integration/multisig.js             | 76 ++++++++++++++++++++++++
 6 files changed, 158 insertions(+), 167 deletions(-)
 create mode 100644 test/integration/advanced.js
 rename test/integration/{readme.js => basic.js} (51%)
 delete mode 100644 test/integration/brainwallet.js
 delete mode 100644 test/integration/darkwallet.js
 delete mode 100644 test/integration/helloblock.js
 create mode 100644 test/integration/multisig.js

diff --git a/test/integration/advanced.js b/test/integration/advanced.js
new file mode 100644
index 0000000..da2e7fd
--- /dev/null
+++ b/test/integration/advanced.js
@@ -0,0 +1,71 @@
+var assert = require('assert')
+
+var bigi = require('bigi')
+var bitcoin = require('../../')
+
+describe('bitcoinjs-lib (advanced)', function() {
+  it('can sign a bitcoin message', function() {
+    var key = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
+    var message = 'This is an example of a signed message.'
+
+    var signature = bitcoin.Message.sign(key, message)
+    assert.equal(signature.toString('base64'), 'G9L5yLFjti0QTHhPyFrZCT1V/MMnBtXKmoiKDZ78NDBjERki6ZTQZdSMCtkgoNmp17By9ItJr8o7ChX0XxY91nk=')
+  })
+
+  it('can verify a bitcoin message', function() {
+    var address = '1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN'
+    var signature = 'HJLQlDWLyb1Ef8bQKEISzFbDAKctIlaqOpGbrk3YVtRsjmC61lpE5ErkPRUFtDKtx98vHFGUWlFhsh3DiW6N0rE'
+    var message = 'This is an example of a signed message.'
+
+    assert(bitcoin.Message.verify(address, signature, message))
+  })
+
+  it('can generate a single-key stealth address', function() {
+    var receiver = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
+
+    // XXX: ephemeral, must be random (and secret to sender) to preserve privacy
+    var sender = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct')
+
+    var G = bitcoin.ECKey.curve.G
+    var d = receiver.d // secret (receiver only)
+    var Q = receiver.pub.Q // shared
+
+    var e = sender.d // secret (sender only)
+    var P = sender.pub.Q // shared
+
+    // derived shared secret
+    var eQ = Q.multiply(e) // sender
+    var dP = P.multiply(d) // receiver
+    assert.deepEqual(eQ.getEncoded(), dP.getEncoded())
+
+    var c = bigi.fromBuffer(bitcoin.crypto.sha256(eQ.getEncoded()))
+    var cG = G.multiply(c)
+
+    // derived public key
+    var QprimeS = Q.add(cG)
+    var QprimeR = G.multiply(d.add(c))
+    assert.deepEqual(QprimeR.getEncoded(), QprimeS.getEncoded())
+
+    // derived shared-secret address
+    var address = new bitcoin.ECPubKey(QprimeS).getAddress().toString()
+
+    assert.equal(address, '1EwCNJNZM5q58YPPTnjR1H5BvYRNeyZi47')
+  })
+
+  // TODO
+  it.skip('can generate a dual-key stealth address', function() {})
+
+  it('can create an OP_RETURN transaction', function() {
+    var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
+    var tx = new bitcoin.TransactionBuilder()
+
+    var data = new Buffer('cafedeadbeef', 'hex')
+    var dataScript = bitcoin.scripts.dataOutput(data)
+
+    tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
+    tx.addOutput(dataScript, 1000)
+    tx.sign(0, key)
+
+    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006a4730440220578f9df41a0e5c5052ad6eef46d005b41f966c7fda01d5f71e9c65026c9025c002202e0159ea0db47ca1bf7713e3a08bbba8cc4fdd90a2eff12591c42049c7cad6c30121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01e803000000000000086a06cafedeadbeef00000000')
+  })
+})
diff --git a/test/integration/readme.js b/test/integration/basic.js
similarity index 51%
rename from test/integration/readme.js
rename to test/integration/basic.js
index 524ab3e..2066b55 100644
--- a/test/integration/readme.js
+++ b/test/integration/basic.js
@@ -1,10 +1,11 @@
 var assert = require('assert')
 
+var bigi = require('bigi')
 var bitcoin = require('../../')
 var crypto = require('crypto')
 var sinon = require('sinon')
 
-describe('bitcoinjs-lib (README)', function() {
+describe('bitcoinjs-lib (basic)', function() {
   it('can generate a random bitcoin address', sinon.test(function() {
     // for testing only
     this.mock(crypto).expects('randomBytes')
@@ -17,6 +18,15 @@ describe('bitcoinjs-lib (README)', function() {
     assert.equal(address, '1F5VhMHukdnUES9kfXqzPzMeF1GPHKiF64')
   }))
 
+  it('can initialize a ECKey from a sha256 hash', function() {
+    var hash = bitcoin.crypto.sha256('correct horse battery staple')
+    var d = bigi.fromBuffer(hash)
+
+    var key = new bitcoin.ECKey(d)
+
+    assert.equal(key.pub.getAddress().toString(), '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8')
+  })
+
   it('can import a WIF encoded private key', function() {
     var key = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct')
     var address = key.pub.getAddress().toString()
@@ -34,32 +44,4 @@ describe('bitcoinjs-lib (README)', function() {
 
     assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006b483045022100aefbcf847900b01dd3e3debe054d3b6d03d715d50aea8525f5ea3396f168a1fb022013d181d05b15b90111808b22ef4f9ebe701caf2ab48db269691fdf4e9048f4f60121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000')
   })
-
-  it('can create an OP_RETURN transaction', function() {
-    var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
-    var tx = new bitcoin.TransactionBuilder()
-
-    var data = new Buffer('cafedeadbeef', 'hex')
-    var dataScript = bitcoin.scripts.dataOutput(data)
-
-    tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
-    tx.addOutput(dataScript, 1000)
-    tx.sign(0, key)
-
-    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006a4730440220578f9df41a0e5c5052ad6eef46d005b41f966c7fda01d5f71e9c65026c9025c002202e0159ea0db47ca1bf7713e3a08bbba8cc4fdd90a2eff12591c42049c7cad6c30121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01e803000000000000086a06cafedeadbeef00000000')
-  })
-
-  it('can create a P2SH Multisig Address', function() {
-    var pubKeys = [
-      '026477115981fe981a6918a6297d9803c4dc04f328f22041bedff886bbc2962e01',
-      '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
-      '03c6103b3b83e4a24a0e33a4df246ef11772f9992663db0c35759a5e2ebf68d8e9'
-    ].map(bitcoin.ECPubKey.fromHex)
-
-    var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
-    var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
-    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
-
-    assert.equal(address, '36NUkt6FWUi3LAWBqWRdDmdTWbt91Yvfu7')
-  })
 })
diff --git a/test/integration/brainwallet.js b/test/integration/brainwallet.js
deleted file mode 100644
index 251696b..0000000
--- a/test/integration/brainwallet.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var assert = require('assert')
-
-var bigi = require('bigi')
-var bitcoin = require('../../')
-
-describe('bitcoinjs-lib (brainwallet examples)', function() {
-  it('can initialize a ECKey from a sha256 hash', function() {
-    var hash = bitcoin.crypto.sha256('correct horse battery staple')
-    var d = bigi.fromBuffer(hash)
-
-    var key = new bitcoin.ECKey(d)
-
-    assert.equal(key.pub.getAddress().toString(), '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8')
-  })
-
-  it('can sign a bitcoin message', function() {
-    var key = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
-    var message = 'This is an example of a signed message.'
-
-    var signature = bitcoin.Message.sign(key, message)
-    assert.equal(signature.toString('base64'), 'G9L5yLFjti0QTHhPyFrZCT1V/MMnBtXKmoiKDZ78NDBjERki6ZTQZdSMCtkgoNmp17By9ItJr8o7ChX0XxY91nk=')
-  })
-
-  it('can verify a bitcoin message', function() {
-    var address = '1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN'
-    var signature = 'HJLQlDWLyb1Ef8bQKEISzFbDAKctIlaqOpGbrk3YVtRsjmC61lpE5ErkPRUFtDKtx98vHFGUWlFhsh3DiW6N0rE'
-    var message = 'This is an example of a signed message.'
-
-    assert(bitcoin.Message.verify(address, signature, message))
-  })
-})
diff --git a/test/integration/darkwallet.js b/test/integration/darkwallet.js
deleted file mode 100644
index e07b9aa..0000000
--- a/test/integration/darkwallet.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var assert = require('assert')
-
-var bigi = require('bigi')
-var bitcoin = require('../../')
-
-describe('bitcoinjs-lib (darkwallet examples)', function() {
-  it('can generate a single-key stealth address', function() {
-    var receiver = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
-    var sender = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct') // XXX: ephemeral, must be random to preserve privacy
-
-    var G = bitcoin.ECKey.curve.G
-    var d = receiver.d // secret (receiver only)
-    var Q = receiver.pub.Q // shared
-
-    var e = sender.d // secret (sender only)
-    var P = sender.pub.Q // shared
-
-    // derived shared secret
-    var eQ = Q.multiply(e) // sender
-    var dP = P.multiply(d) // receiver
-    assert.deepEqual(eQ.getEncoded(), dP.getEncoded())
-
-    var c = bigi.fromBuffer(bitcoin.crypto.sha256(eQ.getEncoded()))
-    var cG = G.multiply(c)
-
-    // derived public key
-    var QprimeS = Q.add(cG)
-    var QprimeR = G.multiply(d.add(c))
-    assert.deepEqual(QprimeR.getEncoded(), QprimeS.getEncoded())
-
-    // derived shared-secret address
-    var address = new bitcoin.ECPubKey(QprimeS).getAddress().toString()
-
-    assert.equal(address, '1EwCNJNZM5q58YPPTnjR1H5BvYRNeyZi47')
-  })
-
-  // TODO
-  it.skip('can generate a dual-key stealth address', function() {})
-})
diff --git a/test/integration/helloblock.js b/test/integration/helloblock.js
deleted file mode 100644
index 7cd04dd..0000000
--- a/test/integration/helloblock.js
+++ /dev/null
@@ -1,68 +0,0 @@
-var assert = require('assert')
-
-var bitcoin = require('../../')
-var networks = bitcoin.networks
-var scripts = bitcoin.scripts
-
-var Address = bitcoin.Address
-var ECKey = bitcoin.ECKey
-var TransactionBuilder = bitcoin.TransactionBuilder
-
-var helloblock = require('helloblock-js')({
-  network: 'testnet'
-})
-
-describe('bitcoinjs-lib (helloblock)', function() {
-  this.timeout(20000)
-
-  it('can spend from a 2-of-2 address', function(done) {
-    var privKeys = [
-      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx',
-      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT'
-    ].map(ECKey.fromWIF)
-    var pubKeys = privKeys.map(function(x) { return x.pub })
-
-    var redeemScript = scripts.multisigOutput(2, pubKeys)
-    var scriptPubKey = scripts.scriptHashOutput(redeemScript.getHash())
-    var p2shAddress = Address.fromOutputScript(scriptPubKey, networks.testnet).toString()
-
-    // Attempt to send funds to the source address
-    helloblock.faucet.withdraw(p2shAddress, 2e4, function(err) {
-      if (err) return done(err)
-
-      // get latest unspents from the p2shAddress
-      helloblock.addresses.getUnspents(p2shAddress, function(err, res, unspents) {
-        if (err) return done(err)
-
-        // use the oldest unspent
-        var unspent = unspents[unspents.length - 1]
-        var spendAmount = Math.min(unspent.value, 1e4)
-
-        // make a random destination address
-        var targetAddress = ECKey.makeRandom().pub.getAddress(networks.testnet).toString()
-
-        var txb = new TransactionBuilder()
-        txb.addInput(unspent.txHash, unspent.index)
-        txb.addOutput(targetAddress, spendAmount)
-
-        privKeys.forEach(function(privKey) {
-          txb.sign(0, privKey, redeemScript)
-        })
-
-        // broadcast our transaction
-        helloblock.transactions.propagate(txb.build().toHex(), function(err) {
-          // no err means that the transaction has been successfully propagated
-          if (err) return done(err)
-
-          // check that the funds (spendAmount Satoshis) indeed arrived at the intended address
-          helloblock.addresses.get(targetAddress, function(err, res, addrInfo) {
-            if (err) return done(err)
-
-            assert.equal(addrInfo.balance, spendAmount)
-            done()
-          })
-        })
-      })
-    })
-  })
-})
diff --git a/test/integration/multisig.js b/test/integration/multisig.js
new file mode 100644
index 0000000..05bec9e
--- /dev/null
+++ b/test/integration/multisig.js
@@ -0,0 +1,76 @@
+var assert = require('assert')
+
+var bitcoin = require('../../')
+
+var helloblock = require('helloblock-js')({
+  network: 'testnet'
+})
+
+describe('bitcoinjs-lib (multisig)', function() {
+  it('can create a 2-of-3 multisig P2SH address', function() {
+    var pubKeys = [
+      '026477115981fe981a6918a6297d9803c4dc04f328f22041bedff886bbc2962e01',
+      '02c96db2302d19b43d4c69368babace7854cc84eb9e061cde51cfa77ca4a22b8b9',
+      '03c6103b3b83e4a24a0e33a4df246ef11772f9992663db0c35759a5e2ebf68d8e9'
+    ].map(bitcoin.ECPubKey.fromHex)
+
+    var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
+    var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
+    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
+
+    assert.equal(address, '36NUkt6FWUi3LAWBqWRdDmdTWbt91Yvfu7')
+  })
+
+  it('can spend from a 2-of-2 multsig P2SH address', function(done) {
+    var privKeys = [
+      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx',
+      '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT'
+    ].map(bitcoin.ECKey.fromWIF)
+    var pubKeys = privKeys.map(function(x) { return x.pub })
+
+    var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 2
+    var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
+    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
+
+    // Attempt to send funds to the source address
+    helloblock.faucet.withdraw(address, 2e4, function(err) {
+      if (err) return done(err)
+
+      // get latest unspents from the address
+      helloblock.addresses.getUnspents(address, function(err, res, unspents) {
+        if (err) return done(err)
+
+        // filter small unspents
+        unspents = unspents.filter(function(unspent) { return unspent.value > 1e4 })
+
+        // use the oldest unspent
+        var unspent = unspents.pop()
+
+        // make a random destination address
+        var targetAddress = bitcoin.ECKey.makeRandom().pub.getAddress(bitcoin.networks.testnet).toString()
+
+        var txb = new bitcoin.TransactionBuilder()
+        txb.addInput(unspent.txHash, unspent.index)
+        txb.addOutput(targetAddress, 1e4)
+
+        // sign w/ each private key
+        privKeys.forEach(function(privKey) {
+          txb.sign(0, privKey, redeemScript)
+        })
+
+        // broadcast our transaction
+        helloblock.transactions.propagate(txb.build().toHex(), function(err) {
+          if (err) return done(err)
+
+          // check that the funds (1e4 Satoshis) indeed arrived at the intended address
+          helloblock.addresses.get(targetAddress, function(err, res, addrInfo) {
+            if (err) return done(err)
+
+            assert.equal(addrInfo.balance, 1e4)
+            done()
+          })
+        })
+      })
+    })
+  })
+})

From ec517376c257b1274a59f97ee8a46579031ddecc Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 25 Nov 2014 14:07:30 +1100
Subject: [PATCH 07/13] integration tests: test description rephrasing

---
 test/integration/advanced.js | 4 ++--
 test/integration/basic.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/advanced.js b/test/integration/advanced.js
index da2e7fd..6fd0d72 100644
--- a/test/integration/advanced.js
+++ b/test/integration/advanced.js
@@ -4,7 +4,7 @@ var bigi = require('bigi')
 var bitcoin = require('../../')
 
 describe('bitcoinjs-lib (advanced)', function() {
-  it('can sign a bitcoin message', function() {
+  it('can sign a Bitcoin message', function() {
     var key = bitcoin.ECKey.fromWIF('5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss')
     var message = 'This is an example of a signed message.'
 
@@ -12,7 +12,7 @@ describe('bitcoinjs-lib (advanced)', function() {
     assert.equal(signature.toString('base64'), 'G9L5yLFjti0QTHhPyFrZCT1V/MMnBtXKmoiKDZ78NDBjERki6ZTQZdSMCtkgoNmp17By9ItJr8o7ChX0XxY91nk=')
   })
 
-  it('can verify a bitcoin message', function() {
+  it('can verify a Bitcoin message', function() {
     var address = '1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN'
     var signature = 'HJLQlDWLyb1Ef8bQKEISzFbDAKctIlaqOpGbrk3YVtRsjmC61lpE5ErkPRUFtDKtx98vHFGUWlFhsh3DiW6N0rE'
     var message = 'This is an example of a signed message.'
diff --git a/test/integration/basic.js b/test/integration/basic.js
index 2066b55..c14c3c9 100644
--- a/test/integration/basic.js
+++ b/test/integration/basic.js
@@ -18,7 +18,7 @@ describe('bitcoinjs-lib (basic)', function() {
     assert.equal(address, '1F5VhMHukdnUES9kfXqzPzMeF1GPHKiF64')
   }))
 
-  it('can initialize a ECKey from a sha256 hash', function() {
+  it('can generate an address from a SHA256 hash', function() {
     var hash = bitcoin.crypto.sha256('correct horse battery staple')
     var d = bigi.fromBuffer(hash)
 
@@ -27,7 +27,7 @@ describe('bitcoinjs-lib (basic)', function() {
     assert.equal(key.pub.getAddress().toString(), '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8')
   })
 
-  it('can import a WIF encoded private key', function() {
+  it('can import an address via WIF', function() {
     var key = bitcoin.ECKey.fromWIF('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct')
     var address = key.pub.getAddress().toString()
 

From d9c716cc293b11eb606acb7d154072b1bcd8f1c0 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 25 Nov 2014 14:07:40 +1100
Subject: [PATCH 08/13] README: remove examples and link to integration tests

---
 README.md | 73 +++++++++++--------------------------------------------
 1 file changed, 14 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index 133b082..13f4a9b 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ A continued implementation of the original `0.1.3` version used by over a millio
 
 
 ## Should I use this in production?
+
 If you are thinking of using the master branch of this library in production, *stop*.
 Master is not stable; it is our development branch, and only tagged releases may be classified as stable.
 
@@ -64,73 +65,27 @@ From NPM:
 After loading this file in your browser, you will be able to use the global `bitcoin` object.
 
 
-## Usage
-
-These examples assume you are running bitcoinjs-lib in the browser.
-
-
-### Generating a Bitcoin address
-
-```javascript
-
-key = bitcoin.ECKey.makeRandom()
-
-// Print your private key (in WIF format)
-console.log(key.toWIF())
-// => Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct
-
-// Print your public key (toString defaults to a Bitcoin address)
-console.log(key.pub.getAddress().toString())
-// => 14bZ7YWde4KdRb5YN7GYkToz3EHVCvRxkF
-```
-
-
-### Creating a Transaction
-
-```javascript
-tx = new bitcoin.Transaction()
+## Examples
 
-// Add the input (who is paying) of the form [previous transaction hash, index of the output to use]
-tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
+The below examples are implemented as integration tests, but should be very easy to follow.  Pull requests welcome.
 
-// Add the output (who to pay to) of the form [payee's address, amount in satoshis]
-tx.addOutput("1Gokm82v6DmtwKEB8AiVhm82hyFSsEvBDK", 15000)
+- [Generate a random address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L9)
+- [Generate a address from a SHA256 hash](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L21)
+- [Import an address via WIF](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L30)
+- [Create a Transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L37)
 
-// Initialize a private key using WIF
-key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
+- [Sign a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L7)
+- [Verify a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L15)
+- [Generate a single-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L23)
+- [Generate a dual-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L56)
+- [Create an OP RETURN transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L58)
 
-// Sign the first input with the new key
-tx.sign(0, key)
-
-// Print transaction serialized as hex
-console.log(tx.toHex())
-// => 0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000008a47304402200169f1f844936dc60df54e812345f5dd3e6681fea52e33c25154ad9cc23a330402204381ed8e73d74a95b15f312f33d5a0072c7a12dd6c3294df6e8efbe4aff27426014104e75628573696aed32d7656fb35e9c71ea08eb6492837e13d2662b9a36821d0fff992692fd14d74fdec20fae29128ba12653249cbeef521fc5eba84dde0689f27ffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000
-
-// You could now push the transaction onto the Bitcoin network manually (see https://blockchain.info/pushtx)
-```
-
-
-### Creating a P2SH Multisig Address
-
-``` javascript
-var bitcoin = require('bitcoinjs-lib')
-
-var privKeys = [bitcoin.ECKey.makeRandom(), bitcoin.ECKey.makeRandom(), bitcoin.ECKey.makeRandom()]
-var pubKeys = privKeys.map(function(x) { return x.pub })
-
-var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
-var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
-
-var multisigAddress = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
-
-console.log("multisigP2SH:", multisigAddress)
-// => multisigP2SH: 35k9EWv2F1X5JKXHSF1DhTm7Ybdiwx4RkD
-```
+- [Create a 2-of-3 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L10)
+- [Spend from a 2-of-2 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L24)
 
 
 ## Projects utilizing BitcoinJS
 
-
 - [BitAddress](https://www.bitaddress.org)
 - [Blockchain.info](https://blockchain.info/wallet)
 - [Brainwallet](https://brainwallet.github.io)

From 67e97f70d422b0fd613130c577584c550e2b57bf Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 25 Nov 2014 14:21:10 +1100
Subject: [PATCH 09/13] integration tests: fix 2-of-2 spend address network

---
 test/integration/basic.js    | 1 -
 test/integration/multisig.js | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/integration/basic.js b/test/integration/basic.js
index c14c3c9..8e0b3d8 100644
--- a/test/integration/basic.js
+++ b/test/integration/basic.js
@@ -1,5 +1,4 @@
 var assert = require('assert')
-
 var bigi = require('bigi')
 var bitcoin = require('../../')
 var crypto = require('crypto')
diff --git a/test/integration/multisig.js b/test/integration/multisig.js
index 05bec9e..13fb115 100644
--- a/test/integration/multisig.js
+++ b/test/integration/multisig.js
@@ -1,7 +1,5 @@
 var assert = require('assert')
-
 var bitcoin = require('../../')
-
 var helloblock = require('helloblock-js')({
   network: 'testnet'
 })
@@ -30,14 +28,14 @@ describe('bitcoinjs-lib (multisig)', function() {
 
     var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 2
     var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
-    var address = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
+    var address = bitcoin.Address.fromOutputScript(scriptPubKey, bitcoin.networks.testnet).toString()
 
     // Attempt to send funds to the source address
     helloblock.faucet.withdraw(address, 2e4, function(err) {
       if (err) return done(err)
 
       // get latest unspents from the address
-      helloblock.addresses.getUnspents(address, function(err, res, unspents) {
+      helloblock.addresses.getUnspents(address, function(err, _, unspents) {
         if (err) return done(err)
 
         // filter small unspents

From 37a1c93d8af94d40503de9aa53950a9c524b6ab7 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 25 Nov 2014 14:21:48 +1100
Subject: [PATCH 10/13] integration tests: merge #312 test equivalent

---
 test/integration/advanced.js | 55 ++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/test/integration/advanced.js b/test/integration/advanced.js
index 6fd0d72..f4479a5 100644
--- a/test/integration/advanced.js
+++ b/test/integration/advanced.js
@@ -1,7 +1,9 @@
 var assert = require('assert')
-
 var bigi = require('bigi')
 var bitcoin = require('../../')
+var helloblock = require('helloblock-js')({
+  network: 'testnet'
+})
 
 describe('bitcoinjs-lib (advanced)', function() {
   it('can sign a Bitcoin message', function() {
@@ -55,17 +57,52 @@ describe('bitcoinjs-lib (advanced)', function() {
   // TODO
   it.skip('can generate a dual-key stealth address', function() {})
 
-  it('can create an OP_RETURN transaction', function() {
+  it('can create an OP_RETURN transaction', function(done) {
+    this.timeout(20000)
+
     var key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
-    var tx = new bitcoin.TransactionBuilder()
+    var address = key.pub.getAddress(bitcoin.networks.testnet).toString()
+
+    helloblock.faucet.withdraw(address, 2e4, function(err) {
+      if (err) return done(err)
+
+      helloblock.addresses.getUnspents(address, function(err, _, unspents) {
+        if (err) return done(err)
+
+        // filter small unspents
+        unspents = unspents.filter(function(unspent) { return unspent.value > 1e4 })
+
+        // use the oldest unspent
+        var unspent = unspents.pop()
+
+        var tx = new bitcoin.TransactionBuilder()
+
+        var data = new Buffer('cafedeadbeef', 'hex')
+        var dataScript = bitcoin.scripts.dataOutput(data)
+
+        tx.addInput(unspent.txHash, unspent.index)
+        tx.addOutput(dataScript, 1000)
+        tx.sign(0, key)
+
+        helloblock.transactions.propagate(tx.build().toHex(), function(err) {
+          if (err) return done(err)
+
+          // check that the message was propagated
+          helloblock.addresses.getTransactions(address, function(err, res, transactions) {
+            if (err) return done(err)
 
-    var data = new Buffer('cafedeadbeef', 'hex')
-    var dataScript = bitcoin.scripts.dataOutput(data)
+            var transaction = transactions[0]
+            var output = transaction.outputs[0]
+            var dataScript2 = bitcoin.Script.fromHex(output.scriptPubKey)
+            var data2 = dataScript2.chunks[1]
 
-    tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
-    tx.addOutput(dataScript, 1000)
-    tx.sign(0, key)
+            assert.deepEqual(dataScript, dataScript2)
+            assert.deepEqual(data, data2)
 
-    assert.equal(tx.build().toHex(), '0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000006a4730440220578f9df41a0e5c5052ad6eef46d005b41f966c7fda01d5f71e9c65026c9025c002202e0159ea0db47ca1bf7713e3a08bbba8cc4fdd90a2eff12591c42049c7cad6c30121029f50f51d63b345039a290c94bffd3180c99ed659ff6ea6b1242bca47eb93b59fffffffff01e803000000000000086a06cafedeadbeef00000000')
+            done()
+          })
+        })
+      })
+    })
   })
 })

From 7e7071b1859a33c9da7ca8d912de770498860a18 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 25 Nov 2014 14:24:05 +1100
Subject: [PATCH 11/13] integration tests: add timeout for 2-of-2 spend

---
 test/integration/multisig.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/integration/multisig.js b/test/integration/multisig.js
index 13fb115..60f46c9 100644
--- a/test/integration/multisig.js
+++ b/test/integration/multisig.js
@@ -20,6 +20,8 @@ describe('bitcoinjs-lib (multisig)', function() {
   })
 
   it('can spend from a 2-of-2 multsig P2SH address', function(done) {
+    this.timeout(20000)
+
     var privKeys = [
       '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx',
       '91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT'

From 126567b56d1ea30a68314aaf044a062aedb42b7f Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 25 Nov 2014 14:30:55 +1100
Subject: [PATCH 12/13] README: fix test line numbers

---
 README.md | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 13f4a9b..0bdb1fc 100644
--- a/README.md
+++ b/README.md
@@ -69,19 +69,17 @@ After loading this file in your browser, you will be able to use the global `bit
 
 The below examples are implemented as integration tests, but should be very easy to follow.  Pull requests welcome.
 
-- [Generate a random address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L9)
-- [Generate a address from a SHA256 hash](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L21)
-- [Import an address via WIF](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L30)
-- [Create a Transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L37)
-
-- [Sign a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L7)
-- [Verify a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L15)
-- [Generate a single-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L23)
-- [Generate a dual-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L56)
-- [Create an OP RETURN transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L58)
-
-- [Create a 2-of-3 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L10)
-- [Spend from a 2-of-2 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L24)
+- [Generate a random address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L8)
+- [Generate a address from a SHA256 hash](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L20)
+- [Import an address via WIF](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L29)
+- [Create a Transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L36)
+- [Sign a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L9)
+- [Verify a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L17)
+- [Generate a single-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L25)
+- [Generate a dual-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L58)
+- [Create an OP RETURN transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L60)
+- [Create a 2-of-3 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L8)
+- [Spend from a 2-of-2 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L22)
 
 
 ## Projects utilizing BitcoinJS

From e547ea3140a1ac107468677ff94108aee5d3dcf3 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Tue, 25 Nov 2014 14:32:47 +1100
Subject: [PATCH 13/13] README: s/inttests/master/

---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 0bdb1fc..e64353e 100644
--- a/README.md
+++ b/README.md
@@ -69,17 +69,17 @@ After loading this file in your browser, you will be able to use the global `bit
 
 The below examples are implemented as integration tests, but should be very easy to follow.  Pull requests welcome.
 
-- [Generate a random address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L8)
-- [Generate a address from a SHA256 hash](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L20)
-- [Import an address via WIF](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L29)
-- [Create a Transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/basic.js#L36)
-- [Sign a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L9)
-- [Verify a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L17)
-- [Generate a single-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L25)
-- [Generate a dual-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L58)
-- [Create an OP RETURN transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/advanced.js#L60)
-- [Create a 2-of-3 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L8)
-- [Spend from a 2-of-2 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/inttests/test/integration/multisig.js#L22)
+- [Generate a random address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L8)
+- [Generate a address from a SHA256 hash](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L20)
+- [Import an address via WIF](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L29)
+- [Create a Transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L36)
+- [Sign a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L9)
+- [Verify a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L17)
+- [Generate a single-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L25)
+- [Generate a dual-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L58)
+- [Create an OP RETURN transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L60)
+- [Create a 2-of-3 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/multisig.js#L8)
+- [Spend from a 2-of-2 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/multisig.js#L22)
 
 
 ## Projects utilizing BitcoinJS