From 4901d41fa94c8886d2c8dc743acf348743fe93cd Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Wed, 11 Jul 2018 16:19:32 +1000 Subject: [PATCH] tests/integration: change tests to not use templates --- test/integration/bip32.js | 10 ++--- test/integration/cltv.js | 68 ++++++++++++++++++++------------ test/integration/crypto.js | 13 ++---- test/integration/transactions.js | 2 +- 4 files changed, 51 insertions(+), 42 deletions(-) diff --git a/test/integration/bip32.js b/test/integration/bip32.js index e6d5721..3d2f12c 100644 --- a/test/integration/bip32.js +++ b/test/integration/bip32.js @@ -76,12 +76,10 @@ describe('bitcoinjs-lib (BIP32)', function () { const path = "m/49'/1'/0'/0/0" const child = root.derivePath(path) - const keyhash = bitcoin.crypto.hash160(child.publicKey) - const scriptSig = bitcoin.script.witnessPubKeyHash.output.encode(keyhash) - const addressBytes = bitcoin.crypto.hash160(scriptSig) - const outputScript = bitcoin.script.scriptHash.output.encode(addressBytes) - const address = bitcoin.address.fromOutputScript(outputScript, bitcoin.networks.testnet) - + const { address } = bitcoin.payments.p2sh({ + redeem: bitcoin.payments.p2wpkh({ pubkey: child.publicKey, network: bitcoin.networks.testnet }), + network: bitcoin.networks.testnet + }) assert.equal(address, '2Mww8dCYPUpKHofjgcXcBCEGmniw9CoaiD2') }) diff --git a/test/integration/cltv.js b/test/integration/cltv.js index d508f74..626c7e9 100644 --- a/test/integration/cltv.js +++ b/test/integration/cltv.js @@ -46,8 +46,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // 3 hours ago const lockTime = bip65.encode({ utc: utcNow() - (3600 * 3) }) const redeemScript = cltvCheckSigOutput(alice, bob, lockTime) - const scriptPubKey = bitcoin.script.scriptHash.output.encode(bitcoin.crypto.hash160(redeemScript)) - const address = bitcoin.address.fromOutputScript(scriptPubKey, regtest) + const { address } = bitcoin.payments.p2sh({ redeem: { output: redeemScript, network: regtest }, network: regtest }) // fund the P2SH(CLTV) address regtestUtils.faucet(address, 1e5, function (err, unspent) { @@ -61,10 +60,15 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // {Alice's signature} OP_TRUE const tx = txb.buildIncomplete() const signatureHash = tx.hashForSignature(0, redeemScript, hashType) - const redeemScriptSig = bitcoin.script.scriptHash.input.encode([ - bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), - bitcoin.opcodes.OP_TRUE - ], redeemScript) + const redeemScriptSig = bitcoin.payments.p2sh({ + redeem: { + input: bitcoin.script.compile([ + bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), + bitcoin.opcodes.OP_TRUE + ]), + output: redeemScript + } + }).input tx.setInputScript(0, redeemScriptSig) regtestUtils.broadcast(tx.toHex(), function (err) { @@ -90,8 +94,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // 5 blocks from now const lockTime = bip65.encode({ blocks: height + 5 }) const redeemScript = cltvCheckSigOutput(alice, bob, lockTime) - const scriptPubKey = bitcoin.script.scriptHash.output.encode(bitcoin.crypto.hash160(redeemScript)) - const address = bitcoin.address.fromOutputScript(scriptPubKey, regtest) + const { address } = bitcoin.payments.p2sh({ redeem: { output: redeemScript, network: regtest }, network: regtest }) // fund the P2SH(CLTV) address regtestUtils.faucet(address, 1e5, function (err, unspent) { @@ -105,10 +108,15 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // {Alice's signature} OP_TRUE const tx = txb.buildIncomplete() const signatureHash = tx.hashForSignature(0, redeemScript, hashType) - const redeemScriptSig = bitcoin.script.scriptHash.input.encode([ - bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), - bitcoin.opcodes.OP_TRUE - ], redeemScript) + const redeemScriptSig = bitcoin.payments.p2sh({ + redeem: { + input: bitcoin.script.compile([ + bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), + bitcoin.opcodes.OP_TRUE + ]), + output: redeemScript + } + }).input tx.setInputScript(0, redeemScriptSig) // TODO: test that it failures _prior_ to expiry, unfortunately, race conditions when run concurrently @@ -139,8 +147,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // two hours ago const lockTime = bip65.encode({ utc: utcNow() - (3600 * 2) }) const redeemScript = cltvCheckSigOutput(alice, bob, lockTime) - const scriptPubKey = bitcoin.script.scriptHash.output.encode(bitcoin.crypto.hash160(redeemScript)) - const address = bitcoin.address.fromOutputScript(scriptPubKey, regtest) + const { address } = bitcoin.payments.p2sh({ redeem: { output: redeemScript, network: regtest }, network: regtest }) // fund the P2SH(CLTV) address regtestUtils.faucet(address, 2e5, function (err, unspent) { @@ -154,11 +161,16 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // {Alice's signature} {Bob's signature} OP_FALSE const tx = txb.buildIncomplete() const signatureHash = tx.hashForSignature(0, redeemScript, hashType) - const redeemScriptSig = bitcoin.script.scriptHash.input.encode([ - bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), - bitcoin.script.signature.encode(bob.sign(signatureHash), hashType), - bitcoin.opcodes.OP_FALSE - ], redeemScript) + const redeemScriptSig = bitcoin.payments.p2sh({ + redeem: { + input: bitcoin.script.compile([ + bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), + bitcoin.script.signature.encode(bob.sign(signatureHash), hashType), + bitcoin.opcodes.OP_FALSE + ]), + output: redeemScript + } + }).input tx.setInputScript(0, redeemScriptSig) regtestUtils.broadcast(tx.toHex(), function (err) { @@ -181,8 +193,7 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // two hours from now const lockTime = bip65.encode({ utc: utcNow() + (3600 * 2) }) const redeemScript = cltvCheckSigOutput(alice, bob, lockTime) - const scriptPubKey = bitcoin.script.scriptHash.output.encode(bitcoin.crypto.hash160(redeemScript)) - const address = bitcoin.address.fromOutputScript(scriptPubKey, regtest) + const { address } = bitcoin.payments.p2sh({ redeem: { output: redeemScript, network: regtest }, network: regtest }) // fund the P2SH(CLTV) address regtestUtils.faucet(address, 2e4, function (err, unspent) { @@ -196,11 +207,16 @@ describe('bitcoinjs-lib (transactions w/ CLTV)', function () { // {Alice's signature} OP_TRUE const tx = txb.buildIncomplete() const signatureHash = tx.hashForSignature(0, redeemScript, hashType) - const redeemScriptSig = bitcoin.script.scriptHash.input.encode([ - bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), - bitcoin.script.signature.encode(bob.sign(signatureHash), hashType), - bitcoin.opcodes.OP_TRUE - ], redeemScript) + const redeemScriptSig = bitcoin.payments.p2sh({ + redeem: { + input: bitcoin.script.compile([ + bitcoin.script.signature.encode(alice.sign(signatureHash), hashType), + bitcoin.script.signature.encode(bob.sign(signatureHash), hashType), + bitcoin.opcodes.OP_TRUE + ]), + output: redeemScript + } + }).input tx.setInputScript(0, redeemScriptSig) regtestUtils.broadcast(tx.toHex(), function (err) { diff --git a/test/integration/crypto.js b/test/integration/crypto.js index 78a6ab0..611b306 100644 --- a/test/integration/crypto.js +++ b/test/integration/crypto.js @@ -18,16 +18,11 @@ describe('bitcoinjs-lib (crypto)', function () { const tx = bitcoin.Transaction.fromHex('01000000020b668015b32a6178d8524cfef6dc6fc0a4751915c2e9b2ed2d2eab02424341c8000000006a47304402205e00298dc5265b7a914974c9d0298aa0e69a0ca932cb52a360436d6a622e5cd7022024bf5f506968f5f23f1835574d5afe0e9021b4a5b65cf9742332d5e4acb68f41012103fd089f73735129f3d798a657aaaa4aa62a00fa15c76b61fc7f1b27ed1d0f35b8ffffffffa95fa69f11dc1cbb77ef64f25a95d4b12ebda57d19d843333819d95c9172ff89000000006b48304502205e00298dc5265b7a914974c9d0298aa0e69a0ca932cb52a360436d6a622e5cd7022100832176b59e8f50c56631acbc824bcba936c9476c559c42a4468be98975d07562012103fd089f73735129f3d798a657aaaa4aa62a00fa15c76b61fc7f1b27ed1d0f35b8ffffffff02b000eb04000000001976a91472956eed9a8ecb19ae7e3ebd7b06cae4668696a788ac303db000000000001976a9146c0bd55dd2592287cd9992ce3ba3fc1208fb76da88ac00000000') tx.ins.forEach(function (input, vin) { - const script = input.script - const scriptChunks = bitcoin.script.decompile(script) + const { output: prevOutput, pubkey, signature } = bitcoin.payments.p2pkh({ input: input.script }) - assert(bitcoin.script.pubKeyHash.input.check(scriptChunks), 'Expected pubKeyHash script') - const prevOutScript = bitcoin.address.toOutputScript('1ArJ9vRaQcoQ29mTWZH768AmRwzb6Zif1z') - const scriptSignature = bitcoin.script.signature.decode(scriptChunks[0]) - const publicKey = bitcoin.ECPair.fromPublicKey(scriptChunks[1]) - - const m = tx.hashForSignature(vin, prevOutScript, scriptSignature.hashType) - assert(publicKey.verify(m, scriptSignature.signature), 'Invalid m') + const scriptSignature = bitcoin.script.signature.decode(signature) + const m = tx.hashForSignature(vin, prevOutput, scriptSignature.hashType) + assert(bitcoin.ECPair.fromPublicKey(pubkey).verify(m, scriptSignature.signature), 'Invalid m') // store the required information input.signature = scriptSignature.signature diff --git a/test/integration/transactions.js b/test/integration/transactions.js index a4a1747..5bb1342 100644 --- a/test/integration/transactions.js +++ b/test/integration/transactions.js @@ -91,7 +91,7 @@ describe('bitcoinjs-lib (transactions)', function () { const txb = new bitcoin.TransactionBuilder(regtest) const data = Buffer.from('bitcoinjs-lib', 'utf8') - const dataScript = bitcoin.script.nullData.output.encode([data]) + const dataScript = require('../../src/templates/nulldata').output.encode([data]) txb.addInput(unspent.txId, unspent.vout) txb.addOutput(dataScript, 1000)