tests: add into-the-future CLTV test

package.json

@@ -48,6 +48,7 @@
   },
   "devDependencies": {
     "bip39": "^2.3.0",
+    "bip65": "^1.0.1",
     "bs58": "^4.0.0",
     "dhttp": "^2.4.2",
     "minimaldata": "^1.0.2",

test/integration/_regtest.js

@@ -19,6 +19,13 @@ function mine (count, callback) {
   }, callback)
 }
 
+function height (callback) {
+  dhttp({
+    method: 'GET',
+    url: APIURL + '/b/best/height'
+  }, callback)
+}
+
 function faucet (address, value, callback) {
   dhttp({
     method: 'POST',
@@ -69,6 +76,7 @@ module.exports = {
   broadcast: broadcast,
   faucet: faucet,
   fetch: fetch,
+  height: height,
   mine: mine,
   network: bitcoin.networks.testnet,
   unspents: unspents,

test/integration/cltv.js

@@ -12,11 +12,10 @@ var bob = bitcoin.ECPair.fromWIF('cMkopUXKWsEzAjfa1zApksGRwjVpJRB3831qM9W4gKZsLw
 describe('bitcoinjs-lib (transactions w/ CLTV)', function () {
   var hashType = bitcoin.Transaction.SIGHASH_ALL
 
-  // waitUntil is of the form { blocks: ... } or { utc: ... }
+  function cltvCheckSigOutput (aQ, bQ, lockTime) {
-  function cltvCheckSigOutput (aQ, bQ, waitUntil) {
     return bitcoin.script.compile([
       bitcoin.opcodes.OP_IF,
-      bitcoin.script.number.encode(bip65.encode(waitUntil)),
+      bitcoin.script.number.encode(lockTime),
       bitcoin.opcodes.OP_CHECKLOCKTIMEVERIFY,
       bitcoin.opcodes.OP_DROP,
 
@@ -39,8 +38,8 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () {
     this.timeout(30000)
 
     // 3 hours ago
-    var timeUtc = utcNow() - (3600 * 3)
+    var lockTime = bip65.encode({ utc: utcNow() - (3600 * 3) })
-    var redeemScript = cltvCheckSigOutput(alice, bob, { utc: timeUtc })
+    var redeemScript = cltvCheckSigOutput(alice, bob, lockTime)
     var scriptPubKey = bitcoin.script.scriptHash.output.encode(bitcoin.crypto.hash160(redeemScript))
     var address = bitcoin.address.fromOutputScript(scriptPubKey, regtest)
 
@@ -49,7 +48,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () {
       if (err) return done(err)
 
       var txb = new bitcoin.TransactionBuilder(regtest)
-      txb.setLockTime(timeUtc)
+      txb.setLockTime(lockTime)
       txb.addInput(unspent.txId, unspent.vout, 0xfffffffe)
       txb.addOutput(regtestUtils.RANDOM_ADDRESS, 7e4)
 
@@ -79,9 +78,12 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () {
   it('can create (and broadcast via 3PBP) a Transaction where Alice can redeem the output after the expiry (in the future)', function (done) {
     this.timeout(30000)
 
+    regtestUtils.height(function (err, height) {
+      if (err) return done(err)
+
       // 50 blocks from now
-    var time
+      var lockTime = bip65.encode({ blocks: height + 50 })
-    var redeemScript = cltvCheckSigOutput(alice, bob, timeUtc)
+      var redeemScript = cltvCheckSigOutput(alice, bob, lockTime)
       var scriptPubKey = bitcoin.script.scriptHash.output.encode(bitcoin.crypto.hash160(redeemScript))
       var address = bitcoin.address.fromOutputScript(scriptPubKey, regtest)
 
@@ -90,7 +92,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () {
         if (err) return done(err)
 
         var txb = new bitcoin.TransactionBuilder(regtest)
-      txb.setLockTime(timeUtc)
+        txb.setLockTime(lockTime)
         txb.addInput(unspent.txId, unspent.vout, 0xfffffffe)
         txb.addOutput(regtestUtils.RANDOM_ADDRESS, 7e4)
 
@@ -104,15 +106,17 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () {
         tx.setInputScript(0, redeemScriptSig)
 
         regtestUtils.broadcast(tx.toHex(), function (err) {
-        if (err) return done(err)
-
           // fails before the expiry
           assert.throws(function () {
             if (err) throw err
           }, /Error: 64: non-final/)
 
           // into the future!
-        regtestUtils.mine(
+          regtestUtils.mine(51, function (err) {
+            if (err) return done(err)
+
+            regtestUtils.broadcast(tx.toHex(), function (err) {
+              if (err) return done(err)
 
               regtestUtils.verify({
                 txId: tx.getId(),
@@ -123,6 +127,9 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () {
             })
           })
         })
+      })
+    })
+  })
 
   // expiry ignored, {Bob's signature} {Alice's signature} OP_FALSE
   it('can create (and broadcast via 3PBP) a Transaction where Alice and Bob can redeem the output at any time', function (done) {