Skip to content

processTx considered harmful followup #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 6, 2014
Merged

processTx considered harmful followup #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f9674e
tests: code formatting
dcousens Aug 18, 2014
735feab
Wallet: remove txId:index storage for spent outputs
dcousens Aug 17, 2014
33955a7
Wallet: store txHash, vout separately instead of "from: txid:vout"
dcousens Aug 17, 2014
71d4c78
bufferutils: add Buffer reverse
dcousens Aug 17, 2014
02e71e4
Wallet: revert 2f00c9a
dcousens Aug 17, 2014
d24fdef
Wallet: consistent variable naming
dcousens Aug 17, 2014
06f13db
Wallet: rename outputs to unspentsMap
dcousens Aug 18, 2014
b727a65
Wallet: refactor to use Array unspents solely, deprecating unspentsMap
dcousens Aug 18, 2014
6e15174
tests: avoid use of deprecated APIs
dcousens Aug 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/bufferutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,18 @@ function writeVarInt(buffer, number, offset) {
return size
}

function reverse(buffer) {
var buffer2 = new Buffer(buffer)
Array.prototype.reverse.call(buffer2)
return buffer2
}

module.exports = {
pushDataSize: pushDataSize,
readPushDataInt: readPushDataInt,
readUInt64LE: readUInt64LE,
readVarInt: readVarInt,
reverse: reverse,
varIntSize: varIntSize,
writePushDataInt: writePushDataInt,
writeUInt64LE: writeUInt64LE,
Expand Down
12 changes: 3 additions & 9 deletions src/transaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ Transaction.prototype.addInput = function(tx, index, sequence) {
var hash

if (typeof tx === 'string') {
hash = new Buffer(tx, 'hex')

// TxId hex is big-endian, we need little-endian
Array.prototype.reverse.call(hash)
hash = bufferutils.reverse(new Buffer(tx, 'hex'))

} else if (tx instanceof Transaction) {
hash = tx.getHash()
Expand Down Expand Up @@ -211,12 +209,8 @@ Transaction.prototype.getHash = function () {
}

Transaction.prototype.getId = function () {
var buffer = this.getHash()

// Big-endian is used for TxHash
Array.prototype.reverse.call(buffer)

return buffer.toString('hex')
// TxHash is little-endian, we need big-endian
return bufferutils.reverse(this.getHash()).toString('hex')
}

Transaction.prototype.clone = function () {
Expand Down
Loading