Skip to content

Commit

Permalink
Merge pull request #1139 from bitcoinjs/deps
Browse files Browse the repository at this point in the history
4.0.1 | bump dependencies to 1.0.0 versions (and simplify Travis)
  • Loading branch information
junderw authored Jul 23, 2018
2 parents d67e975 + 3bb3b9f commit d8b6664
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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"
Expand Down
6 changes: 1 addition & 5 deletions test/integration/crypto.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) {
Expand Down

0 comments on commit d8b6664

Please sign in to comment.