Skip to content

Commit 0cedacd

Browse files
committed
Merge pull request bitcoinjs#557 from fanatid/feature/buffer-reverse
Use equal and reverse for buffer from bufferutils
2 parents f999ff6 + bc9a95e commit 0cedacd

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/block.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var bufferutils = require('./bufferutils')
22
var bcrypto = require('./crypto')
3-
var compare = require('buffer-compare')
3+
var bufferCompare = require('buffer-compare')
4+
var bufferReverse = require('buffer-reverse')
45

56
var Transaction = require('./transaction')
67

@@ -71,7 +72,7 @@ Block.prototype.getHash = function () {
7172
}
7273

7374
Block.prototype.getId = function () {
74-
return [].reverse.call(this.getHash()).toString('hex')
75+
return bufferReverse(this.getHash()).toString('hex')
7576
}
7677

7778
Block.prototype.getUTCDate = function () {
@@ -133,10 +134,10 @@ Block.calculateTarget = function (bits) {
133134
}
134135

135136
Block.prototype.checkProofOfWork = function () {
136-
var hash = [].reverse.call(this.getHash())
137+
var hash = bufferReverse(this.getHash())
137138
var target = Block.calculateTarget(this.bits)
138139

139-
return compare(hash, target) <= 0
140+
return bufferCompare(hash, target) <= 0
140141
}
141142

142143
module.exports = Block

src/transaction.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var bcrypto = require('./crypto')
22
var bscript = require('./script')
33
var bufferutils = require('./bufferutils')
4+
var bufferReverse = require('buffer-reverse')
45
var opcodes = require('./opcodes')
56
var typeforce = require('typeforce')
67
var types = require('./types')
@@ -247,7 +248,7 @@ Transaction.prototype.getHash = function () {
247248

248249
Transaction.prototype.getId = function () {
249250
// transaction hash's are displayed in reverse order
250-
return [].reverse.call(this.getHash()).toString('hex')
251+
return bufferReverse(this.getHash()).toString('hex')
251252
}
252253

253254
Transaction.prototype.toBuffer = function () {

src/transaction_builder.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var baddress = require('./address')
22
var bcrypto = require('./crypto')
33
var bscript = require('./script')
44
var bufferEquals = require('buffer-equals')
5+
var bufferReverse = require('buffer-reverse')
56
var networks = require('./networks')
67
var ops = require('./opcodes')
78
var typeforce = require('typeforce')
@@ -198,7 +199,7 @@ TransactionBuilder.prototype.addInput = function (txHash, vout, sequence, prevOu
198199
// is it a hex string?
199200
if (typeof txHash === 'string') {
200201
// transaction hashs's are displayed in reverse order, un-reverse it
201-
txHash = [].reverse.call(new Buffer(txHash, 'hex'))
202+
txHash = bufferReverse(new Buffer(txHash, 'hex'))
202203

203204
// is it a Transaction object?
204205
} else if (txHash instanceof Transaction) {

0 commit comments

Comments
 (0)