diff --git a/.travis.yml b/.travis.yml index 3c3eff4..397dc23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ sudo: false language: node_js node_js: - - "8" + - "lts/*" - "9" - "10" matrix: include: - - node_js: "8" + - node_js: "lts/*" env: TEST_SUITE=standard - - node_js: "8" + - node_js: "lts/*" env: TEST_SUITE=coverage env: - TEST_SUITE=unit diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a0e2f..10d3eb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 4.0.1 +__fixed__ +- Fixed `tiny-secp256k1` dependency version (used `ecurve`) (#1139) +- Fixed `TransactionBuilder` throwing when trying to sign `P2WSH(P2WPKH)` (#1135) + # 4.0.0 __added__ - Added [`bip32`](https://github.com/bitcoinjs/bip32) dependency as a primary export (#1073) diff --git a/package.json b/package.json index beae8cb..b9be434 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bitcoinjs-lib", - "version": "4.0.0", + "version": "4.0.1", "description": "Client-side Bitcoin JavaScript library", "main": "./src/index.js", "engines": { @@ -31,7 +31,7 @@ ], "dependencies": { "bech32": "^1.1.2", - "bip32": "^0.1.0", + "bip32": "^1.0.0", "bip66": "^1.1.0", "bitcoin-ops": "^1.4.0", "bs58check": "^2.0.0", @@ -41,7 +41,7 @@ "pushdata-bitcoin": "^1.0.1", "randombytes": "^2.0.1", "safe-buffer": "^5.1.1", - "tiny-secp256k1": "^0.2.2", + "tiny-secp256k1": "^1.0.0", "typeforce": "^1.11.3", "varuint-bitcoin": "^1.0.4", "wif": "^2.0.1" diff --git a/test/integration/crypto.js b/test/integration/crypto.js index 611b306..864f4e7 100644 --- a/test/integration/crypto.js +++ b/test/integration/crypto.js @@ -7,9 +7,6 @@ const bip32 = require('bip32') const crypto = require('crypto') const tinysecp = require('tiny-secp256k1') -const ecurve = require('ecurve') -const secp256k1 = ecurve.getCurveByName('secp256k1') - describe('bitcoinjs-lib (crypto)', function () { it('can recover a private key from duplicate R values', function () { this.timeout(30000) @@ -29,8 +26,7 @@ describe('bitcoinjs-lib (crypto)', function () { input.z = new BN(m) }) - // finally, run the tasks, then on to the math - const n = new BN(secp256k1.n.toString()) + const n = new BN('fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141', 16) for (var i = 0; i < tx.ins.length; ++i) { for (var j = i + 1; j < tx.ins.length; ++j) {