Skip to content

Commit 14f9218

Browse files
committed
package: bump bs58check, drop node 0.12
1 parent 4aadbf5 commit 14f9218

File tree

8 files changed

+14
-18
lines changed

8 files changed

+14
-18
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
sudo: false
22
language: node_js
33
node_js:
4-
- "0.12"
54
- "4"
65
- "5"
76
- "6"
7+
- "7"
88
matrix:
99
include:
10-
- node_js: "6"
10+
- node_js: "7"
1111
env: TEST_SUITE=standard
12-
- node_js: "6"
12+
- node_js: "7"
1313
env: TEST_SUITE=coverage
1414
env:
1515
- TEST_SUITE=integration

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
"bigi": "^1.4.0",
5555
"bip66": "^1.1.0",
5656
"bitcoin-ops": "^1.3.0",
57-
"bs58check": "^1.0.5",
58-
"buffer-reverse": "^1.0.0",
57+
"bs58check": "^2.0.0",
5958
"create-hash": "^1.1.0",
6059
"create-hmac": "^1.1.3",
6160
"ecurve": "^1.0.0",
@@ -68,7 +67,7 @@
6867
},
6968
"devDependencies": {
7069
"async": "^2.0.1",
71-
"bs58": "^3.0.0",
70+
"bs58": "^4.0.0",
7271
"cb-http-client": "^0.2.0",
7372
"coinselect": "^3.1.1",
7473
"minimaldata": "^1.0.2",

src/block.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
var bufferutils = require('./bufferutils')
22
var bcrypto = require('./crypto')
3-
var bufferReverse = require('buffer-reverse')
43
var fastMerkleRoot = require('merkle-lib/fastRoot')
54
var typeforce = require('typeforce')
65
var types = require('./types')
@@ -80,7 +79,7 @@ Block.prototype.getHash = function () {
8079
}
8180

8281
Block.prototype.getId = function () {
83-
return bufferReverse(this.getHash()).toString('hex')
82+
return this.getHash().reverse().toString('hex')
8483
}
8584

8685
Block.prototype.getUTCDate = function () {
@@ -164,7 +163,7 @@ Block.prototype.checkMerkleRoot = function () {
164163
}
165164

166165
Block.prototype.checkProofOfWork = function () {
167-
var hash = bufferReverse(this.getHash())
166+
var hash = this.getHash().reverse()
168167
var target = Block.calculateTarget(this.bits)
169168

170169
return hash.compare(target) <= 0

src/transaction.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
var bcrypto = require('./crypto')
22
var bscript = require('./script')
33
var bufferutils = require('./bufferutils')
4-
var bufferReverse = require('buffer-reverse')
54
var opcodes = require('bitcoin-ops')
65
var typeforce = require('typeforce')
76
var types = require('./types')
@@ -395,7 +394,7 @@ Transaction.prototype.getHash = function () {
395394

396395
Transaction.prototype.getId = function () {
397396
// transaction hash's are displayed in reverse order
398-
return bufferReverse(this.getHash()).toString('hex')
397+
return this.getHash().reverse().toString('hex')
399398
}
400399

401400
Transaction.prototype.toBuffer = function (buffer, initialOffset) {

src/transaction_builder.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
var baddress = require('./address')
22
var bcrypto = require('./crypto')
33
var bscript = require('./script')
4-
var bufferReverse = require('buffer-reverse')
54
var networks = require('./networks')
65
var ops = require('bitcoin-ops')
76
var typeforce = require('typeforce')
@@ -299,7 +298,7 @@ TransactionBuilder.prototype.addInput = function (txHash, vout, sequence, prevOu
299298
// is it a hex string?
300299
if (typeof txHash === 'string') {
301300
// transaction hashs's are displayed in reverse order, un-reverse it
302-
txHash = bufferReverse(new Buffer(txHash, 'hex'))
301+
txHash = new Buffer(txHash, 'hex').reverse()
303302

304303
// is it a Transaction object?
305304
} else if (txHash instanceof Transaction) {

test/bitcoin.core.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('Bitcoin-core', function () {
2222

2323
it('can decode ' + fb58, function () {
2424
var buffer = base58.decode(fb58)
25-
var actual = new Buffer(buffer).toString('hex')
25+
var actual = buffer.toString('hex')
2626

2727
assert.strictEqual(actual, fhex)
2828
})
@@ -150,7 +150,7 @@ describe('Bitcoin-core', function () {
150150
var input = inputs[i]
151151

152152
// reverse because test data is reversed
153-
var prevOutHash = [].reverse.call(new Buffer(input[0], 'hex'))
153+
var prevOutHash = new Buffer(input[0], 'hex').reverse()
154154
var prevOutIndex = input[1]
155155

156156
assert.deepEqual(txIn.hash, prevOutHash)
@@ -193,7 +193,7 @@ describe('Bitcoin-core', function () {
193193
var hash = transaction.hashForSignature(inIndex, script, hashType)
194194

195195
// reverse because test data is reversed
196-
assert.equal([].reverse.call(hash).toString('hex'), expectedHash)
196+
assert.equal(hash.reverse().toString('hex'), expectedHash)
197197
})
198198
})
199199
})

test/integration/crypto.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('bitcoinjs-lib (crypto)', function () {
4545

4646
assert(bitcoin.script.pubKeyHash.input.check(scriptChunks), 'Expected pubKeyHash script')
4747

48-
var prevOutTxId = [].reverse.call(new Buffer(transaction.ins[input.vout].hash)).toString('hex')
48+
var prevOutTxId = new Buffer(transaction.ins[input.vout].hash).reverse().toString('hex')
4949
var prevVout = transaction.ins[input.vout].index
5050

5151
tasks.push(function (callback) {

test/transaction_builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe('TransactionBuilder', function () {
9595
var tx = new Transaction()
9696

9797
f.inputs.forEach(function (input) {
98-
var txHash = [].reverse.call(new Buffer(input.txId, 'hex'))
98+
var txHash = new Buffer(input.txId, 'hex').reverse()
9999

100100
tx.addInput(txHash, input.vout, undefined, bscript.fromASM(input.scriptSig))
101101
})

0 commit comments

Comments
 (0)