lukechilds
/
bitcoinjs-lib
mirror of https://github.com/lukechilds/bitcoinjs-lib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #212 from dcousens/txclean 

Transaction Clean
hk-custom-address
Wei Lu 11 years ago
parent
bf42341fdc c5252fc509
commit
4f0ae1a9df
6 changed files with 259 additions and 332 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/index.js
  2. 242
      src/transaction.js
  3. 44
      src/wallet.js
  4. 13
      test/bitcoin.core.js
  5. 162
      test/transaction.js
  6. 94
      test/wallet.js

6
src/index.js
View File

@ -1,5 +1,3 @@
var T = require('./transaction')
module.exports = { module.exports = {
Address: require('./address'), Address: require('./address'),
base58: require('./base58'), base58: require('./base58'),
@ -15,9 +13,7 @@ module.exports = {
HDNode: require('./hdnode'), HDNode: require('./hdnode'),
Script: require('./script'), Script: require('./script'),
scripts: require('./scripts'), scripts: require('./scripts'),
Transaction: T.Transaction, Transaction: require('./transaction'),
TransactionIn: T.TransactionIn,
TransactionOut: T.TransactionOut,
networks: require('./networks'), networks: require('./networks'),
Wallet: require('./wallet') Wallet: require('./wallet')
} }

242
src/transaction.js
View File

@ -1,5 +1,3 @@
// FIXME: To all ye that enter here, be weary of Buffers, Arrays and Hex interchanging between the outpoints
var assert = require('assert') var assert = require('assert')
var bufferutils = require('./bufferutils') var bufferutils = require('./bufferutils')
var crypto = require('./crypto') var crypto = require('./crypto')
@ -12,32 +10,16 @@ var ECKey = require('./eckey')
var Script = require('./script') var Script = require('./script')
var DEFAULT_SEQUENCE = 0xffffffff var DEFAULT_SEQUENCE = 0xffffffff
var SIGHASH_ALL = 0x01
var SIGHASH_NONE = 0x02
var SIGHASH_SINGLE = 0x03
var SIGHASH_ANYONECANPAY = 0x80
function Transaction(doc) { function Transaction() {
if (!(this instanceof Transaction)) { return new Transaction(doc) }
this.version = 1 this.version = 1
this.locktime = 0 this.locktime = 0
this.ins = [] this.ins = []
this.outs = [] this.outs = []
if (doc) {
if (doc.hash) this.hash = doc.hash;
if (doc.version) this.version = doc.version;
if (doc.locktime) this.locktime = doc.locktime;
if (doc.ins && doc.ins.length) {
doc.ins.forEach(function(input) {
this.addInput(new TransactionIn(input))
}, this)
}
if (doc.outs && doc.outs.length) {
doc.outs.forEach(function(output) {
this.addOutput(new TransactionOut(output))
}, this)
}
this.hash = this.hash || this.getHash()
}
} }
/** /**
@ -45,36 +27,35 @@ function Transaction(doc) {
* *
* Can be called with any of: * Can be called with any of:
* *
* - An existing TransactionIn object
* - A transaction and an index * - A transaction and an index
* - A transaction hash and an index * - A transaction hash and an index
* - A single string argument of the form txhash:index
* *
* Note that this method does not sign the created input. * Note that this method does not sign the created input.
*/ */
Transaction.prototype.addInput = function (tx, outIndex) { Transaction.prototype.addInput = function(tx, index) {
if (arguments[0] instanceof TransactionIn) {
this.ins.push(arguments[0])
return
}
var hash var hash
if (arguments[0].length > 65) {
var args = arguments[0].split(':') if (typeof tx === 'string') {
hash = args[0] hash = new Buffer(tx, 'hex')
outIndex = parseInt(args[1]) assert.equal(hash.length, 32, 'Expected Transaction or string, got ' + tx)
// TxHash hex is big-endian, we need little-endian
Array.prototype.reverse.call(hash)
} else { } else {
hash = typeof tx === "string" ? tx : tx.hash assert(tx instanceof Transaction, 'Expected Transaction or string, got ' + tx)
hash = crypto.hash256(tx.toBuffer())
} }
this.ins.push(new TransactionIn({ assert.equal(typeof index, 'number', 'Expected number index, got ' + index)
outpoint: {
return (this.ins.push({
hash: hash, hash: hash,
index: outIndex index: index,
}, script: Script.EMPTY,
script: Script.EMPTY sequence: DEFAULT_SEQUENCE
})) }) - 1)
} }
/** /**
@ -82,33 +63,27 @@ Transaction.prototype.addInput = function (tx, outIndex) {
* *
* Can be called with: * Can be called with:
* *
* i) An existing TransactionOut object * - A base58 address string and a value
* ii) An address object or a string address, and a value * - An Address object and a value
* iii) An address:value string * - A scriptPubKey Script and a value
*
* FIXME: This is a bit convoluted
*/ */
Transaction.prototype.addOutput = function (address, value) { Transaction.prototype.addOutput = function(scriptPubKey, value) {
if (arguments[0] instanceof TransactionOut) { // Attempt to get a valid address if it's a base58 address string
this.outs.push(arguments[0]) if (typeof scriptPubKey === 'string') {
return scriptPubKey = Address.fromBase58Check(scriptPubKey)
} }
if (typeof address === 'string') { // Attempt to get a valid script if it's an Address object
if (arguments[0].indexOf(':') >= 0) { if (scriptPubKey instanceof Address) {
var args = arguments[0].split(':') var address = scriptPubKey
address = args[0]
value = parseInt(args[1])
}
address = Address.fromBase58Check(address) scriptPubKey = address.toOutputScript()
} }
this.outs.push(new TransactionOut({ return (this.outs.push({
script: scriptPubKey,
value: value, value: value,
script: address.toOutputScript(), }) - 1)
address: address // TODO: Remove me
}))
} }
Transaction.prototype.toBuffer = function () { Transaction.prototype.toBuffer = function () {
@ -150,13 +125,8 @@ Transaction.prototype.toBuffer = function () {
writeVarInt(this.ins.length) writeVarInt(this.ins.length)
this.ins.forEach(function(txin) { this.ins.forEach(function(txin) {
var hash = new Buffer(txin.outpoint.hash, 'hex') // FIXME: Performance: convert on tx.addInput instead writeSlice(txin.hash)
writeUInt32(txin.index)
// TxHash hex is big-endian, we need little-endian
Array.prototype.reverse.call(hash)
writeSlice(hash)
writeUInt32(txin.outpoint.index)
writeVarInt(txin.script.buffer.length) writeVarInt(txin.script.buffer.length)
writeSlice(txin.script.buffer) writeSlice(txin.script.buffer)
writeUInt32(txin.sequence) writeUInt32(txin.sequence)
@ -179,11 +149,6 @@ Transaction.prototype.toHex = function() {
return this.toBuffer().toString('hex') return this.toBuffer().toString('hex')
} }
var SIGHASH_ALL = 0x01
var SIGHASH_NONE = 0x02
var SIGHASH_SINGLE = 0x03
var SIGHASH_ANYONECANPAY = 0x80
/** /**
* Hash transaction for signing a specific input. * Hash transaction for signing a specific input.
* *
@ -226,7 +191,7 @@ Transaction.prototype.hashForSignature = function(prevOutScript, inIndex, hashTy
return crypto.hash256(buffer) return crypto.hash256(buffer)
} }
Transaction.prototype.getHash = function () { Transaction.prototype.getId = function () {
var buffer = crypto.hash256(this.toBuffer()) var buffer = crypto.hash256(this.toBuffer())
// Big-endian is used for TxHash // Big-endian is used for TxHash
@ -240,21 +205,26 @@ Transaction.prototype.clone = function () {
newTx.version = this.version newTx.version = this.version
newTx.locktime = this.locktime newTx.locktime = this.locktime
this.ins.forEach(function(txin) { newTx.ins = this.ins.map(function(txin) {
newTx.addInput(txin.clone()) return {
hash: txin.hash,
index: txin.index,
script: txin.script,
sequence: txin.sequence
}
}) })
this.outs.forEach(function(txout) { newTx.outs = this.outs.map(function(txout) {
newTx.addOutput(txout.clone()) return {
script: txout.script,
value: txout.value
}
}) })
return newTx return newTx
} }
Transaction.fromBuffer = function(buffer) { Transaction.fromBuffer = function(buffer) {
// Copy because we mutate (reverse TxOutHashs)
buffer = new Buffer(buffer)
var offset = 0 var offset = 0
function readSlice(n) { function readSlice(n) {
offset += n offset += n
@ -276,55 +246,41 @@ Transaction.fromBuffer = function(buffer) {
return vi.number return vi.number
} }
var ins = [] var tx = new Transaction()
var outs = [] tx.version = readUInt32()
var version = readUInt32()
var vinLen = readVarInt() var vinLen = readVarInt()
for (var i = 0; i < vinLen; ++i) { for (var i = 0; i < vinLen; ++i) {
var hash = readSlice(32) var hash = readSlice(32)
// TxHash is little-endian, we want big-endian hex
Array.prototype.reverse.call(hash)
var vout = readUInt32() var vout = readUInt32()
var scriptLen = readVarInt() var scriptLen = readVarInt()
var script = readSlice(scriptLen) var script = readSlice(scriptLen)
var sequence = readUInt32() var sequence = readUInt32()
ins.push({ tx.ins.push({
outpoint: { hash: hash,
hash: hash.toString('hex'),
index: vout, index: vout,
},
script: Script.fromBuffer(script), script: Script.fromBuffer(script),
sequence: sequence sequence: sequence
}) })
} }
var voutLen = readVarInt() var voutLen = readVarInt()
for (i = 0; i < voutLen; ++i) { for (i = 0; i < voutLen; ++i) {
var value = readUInt64() var value = readUInt64()
var scriptLen = readVarInt() var scriptLen = readVarInt()
var script = readSlice(scriptLen) var script = readSlice(scriptLen)
outs.push({ tx.outs.push({
value: value, value: value,
script: Script.fromBuffer(script) script: Script.fromBuffer(script)
}) })
} }
var locktime = readUInt32() tx.locktime = readUInt32()
assert.equal(offset, buffer.length, 'Invalid transaction') assert.equal(offset, buffer.length, 'Invalid transaction')
return new Transaction({ return tx
version: version,
ins: ins,
outs: outs,
locktime: locktime
})
} }
Transaction.fromHex = function(hex) { Transaction.fromHex = function(hex) {
@ -334,26 +290,26 @@ Transaction.fromHex = function(hex) {
/** /**
* Signs a pubKeyHash output at some index with the given key * Signs a pubKeyHash output at some index with the given key
*/ */
Transaction.prototype.sign = function(index, key, type) { Transaction.prototype.sign = function(index, privKey, hashType) {
var prevOutScript = key.pub.getAddress().toOutputScript() var prevOutScript = privKey.pub.getAddress().toOutputScript()
var signature = this.signInput(index, prevOutScript, key, type) var signature = this.signInput(index, prevOutScript, privKey, hashType)
// FIXME: Assumed prior TX was pay-to-pubkey-hash // FIXME: Assumed prior TX was pay-to-pubkey-hash
var scriptSig = scripts.pubKeyHashInput(signature, key.pub) var scriptSig = scripts.pubKeyHashInput(signature, privKey.pub)
this.setInputScript(index, scriptSig) this.setInputScript(index, scriptSig)
} }
Transaction.prototype.signInput = function(index, prevOutScript, key, type) { Transaction.prototype.signInput = function(index, prevOutScript, privKey, hashType) {
type = type || SIGHASH_ALL hashType = hashType || SIGHASH_ALL
assert(key instanceof ECKey, 'Invalid private key') assert(privKey instanceof ECKey, 'Expected ECKey, got ' + privKey)
var hash = this.hashForSignature(prevOutScript, index, type) var hash = this.hashForSignature(prevOutScript, index, hashType)
var signature = key.sign(hash) var signature = privKey.sign(hash)
var DERencoded = ecdsa.serializeSig(signature) var DERencoded = ecdsa.serializeSig(signature)
return Buffer.concat([ return Buffer.concat([
new Buffer(DERencoded), new Buffer(DERencoded),
new Buffer([type]) new Buffer([hashType])
]) ])
} }
@ -361,63 +317,15 @@ Transaction.prototype.setInputScript = function(index, script) {
this.ins[index].script = script this.ins[index].script = script
} }
// FIXME: should probably be validateInput(index, pub) // FIXME: could be validateInput(index, prevTxOut, pub)
Transaction.prototype.validateInput = function(index, script, pub, DERsig) { Transaction.prototype.validateInput = function(index, prevOutScript, pubKey, DERsig) {
var type = DERsig.readUInt8(DERsig.length - 1) var type = DERsig.readUInt8(DERsig.length - 1)
DERsig = DERsig.slice(0, -1) DERsig = DERsig.slice(0, -1)
var hash = this.hashForSignature(script, index, type) var hash = this.hashForSignature(prevOutScript, index, type)
var sig = ecdsa.parseSig(DERsig) var signature = ecdsa.parseSig(DERsig)
return pub.verify(hash, sig)
}
Transaction.feePerKb = 20000
Transaction.prototype.estimateFee = function(feePerKb){
var uncompressedInSize = 180
var outSize = 34
var fixedPadding = 34
if(feePerKb == undefined) feePerKb = Transaction.feePerKb;
var size = this.ins.length * uncompressedInSize + this.outs.length * outSize + fixedPadding
return feePerKb * Math.ceil(size / 1000)
}
function TransactionIn(data) {
assert(data.outpoint && data.script, 'Invalid TxIn parameters')
this.outpoint = data.outpoint
this.script = data.script
this.sequence = data.sequence == undefined ? DEFAULT_SEQUENCE : data.sequence
}
TransactionIn.prototype.clone = function () {
return new TransactionIn({
outpoint: {
hash: this.outpoint.hash,
index: this.outpoint.index
},
script: this.script,
sequence: this.sequence
})
}
function TransactionOut(data) {
this.script = data.script
this.value = data.value
this.address = data.address
}
TransactionOut.prototype.clone = function() { return pubKey.verify(hash, signature)
return new TransactionOut({
script: this.script,
value: this.value,
address: this.address
})
} }
module.exports = { module.exports = Transaction
Transaction: Transaction,
TransactionIn: TransactionIn,
TransactionOut: TransactionOut
}

44
src/wallet.js
View File

@ -4,7 +4,7 @@ var rng = require('secure-random')
var Address = require('./address') var Address = require('./address')
var HDNode = require('./hdnode') var HDNode = require('./hdnode')
var Transaction = require('./transaction').Transaction var Transaction = require('./transaction')
function Wallet(seed, network) { function Wallet(seed, network) {
network = network || networks.bitcoin network = network || networks.bitcoin
@ -146,7 +146,7 @@ function Wallet(seed, network) {
} }
function processTx(tx, isPending) { function processTx(tx, isPending) {
var txhash = tx.getHash() var txid = tx.getId()
tx.outs.forEach(function(txOut, i) { tx.outs.forEach(function(txOut, i) {
var address var address
@ -158,7 +158,7 @@ function Wallet(seed, network) {
} }
if (isMyAddress(address)) { if (isMyAddress(address)) {
var output = txhash + ':' + i var output = txid + ':' + i
me.outputs[output] = { me.outputs[output] = {
receive: output, receive: output,
@ -169,9 +169,13 @@ function Wallet(seed, network) {
} }
}) })
tx.ins.forEach(function(txIn, i){ tx.ins.forEach(function(txIn) {
var op = txIn.outpoint // copy and convert to big-endian hex
var output = op.hash + ':' + op.index var txinId = new Buffer(txIn.hash)
Array.prototype.reverse.call(txinId)
txinId = txinId.toString('hex')
var output = txinId + ':' + txIn.index
if(me.outputs[output]) delete me.outputs[output] if(me.outputs[output]) delete me.outputs[output]
}) })
@ -183,18 +187,21 @@ function Wallet(seed, network) {
var utxos = getCandidateOutputs(value) var utxos = getCandidateOutputs(value)
var accum = 0 var accum = 0
var subTotal = value var subTotal = value
var addresses = []
var tx = new Transaction() var tx = new Transaction()
tx.addOutput(to, value) tx.addOutput(to, value)
for (var i = 0; i < utxos.length; ++i) { for (var i = 0; i < utxos.length; ++i) {
var utxo = utxos[i] var utxo = utxos[i]
addresses.push(utxo.address)
tx.addInput(utxo.receive) var outpoint = utxo.receive.split(':')
accum += utxo.value tx.addInput(outpoint[0], parseInt(outpoint[1]))
var fee = fixedFee == undefined ? estimateFeePadChangeOutput(tx) : fixedFee var fee = fixedFee == undefined ? estimateFeePadChangeOutput(tx) : fixedFee
accum += utxo.value
subTotal = value + fee subTotal = value + fee
if (accum >= subTotal) { if (accum >= subTotal) {
var change = accum - subTotal var change = accum - subTotal
@ -209,7 +216,7 @@ function Wallet(seed, network) {
assert(accum >= subTotal, 'Not enough funds (incl. fee): ' + accum + ' < ' + subTotal) assert(accum >= subTotal, 'Not enough funds (incl. fee): ' + accum + ' < ' + subTotal)
this.sign(tx) this.signWith(tx, addresses)
return tx return tx
} }
@ -228,10 +235,13 @@ function Wallet(seed, network) {
return sortByValueDesc return sortByValueDesc
} }
var feePerKb = 20000
function estimateFeePadChangeOutput(tx) { function estimateFeePadChangeOutput(tx) {
var tmpTx = tx.clone() var tmpTx = tx.clone()
tmpTx.addOutput(getChangeAddress(), 0) tmpTx.addOutput(getChangeAddress(), 0)
return tmpTx.estimateFee()
var byteSize = tmpTx.toBuffer().length
return feePerKb * Math.ceil(byteSize / 1000)
} }
function getChangeAddress() { function getChangeAddress() {
@ -239,13 +249,15 @@ function Wallet(seed, network) {
return me.changeAddresses[me.changeAddresses.length - 1] return me.changeAddresses[me.changeAddresses.length - 1]
} }
this.sign = function(tx) { this.signWith = function(tx, addresses) {
tx.ins.forEach(function(inp,i) { assert.equal(tx.ins.length, addresses.length, 'Number of addresses must match number of transaction inputs')
var output = me.outputs[inp.outpoint.hash + ':' + inp.outpoint.index]
if (output) { addresses.forEach(function(address, i) {
tx.sign(i, me.getPrivateKeyForAddress(output.address)) var key = me.getPrivateKeyForAddress(address)
}
tx.sign(i, key)
}) })
return tx return tx
} }

13
test/bitcoin.core.js
View File

@ -6,7 +6,7 @@ var networks = require('../src/networks')
var Address = require('../src/address') var Address = require('../src/address')
var BigInteger = require('bigi') var BigInteger = require('bigi')
var ECKey = require('../src/eckey') var ECKey = require('../src/eckey')
var Transaction = require('../src/transaction').Transaction var Transaction = require('../src/transaction')
var Script = require('../src/script') var Script = require('../src/script')
var base58_encode_decode = require("./fixtures/core/base58_encode_decode.json") var base58_encode_decode = require("./fixtures/core/base58_encode_decode.json")
@ -147,10 +147,15 @@ describe('Bitcoin-core', function() {
var prevOutIndex = input[1] var prevOutIndex = input[1]
// var prevOutScriptPubKey = input[2] // TODO: we don't have a ASM parser // var prevOutScriptPubKey = input[2] // TODO: we don't have a ASM parser
assert.equal(txin.outpoint.hash, prevOutHash) var actualHash = txin.hash
// Test data is big-endian
Array.prototype.reverse.call(actualHash)
assert.equal(actualHash.toString('hex'), prevOutHash)
// we read UInt32, not Int32 // we read UInt32, not Int32
assert.equal(txin.outpoint.index & 0xffffffff, prevOutIndex) assert.equal(txin.index & 0xffffffff, prevOutIndex)
}) })
}) })
}) })
@ -184,7 +189,7 @@ describe('Bitcoin-core', function() {
} }
if (actualHash != undefined) { if (actualHash != undefined) {
// BigEndian test data // Test data is big-endian
Array.prototype.reverse.call(actualHash) Array.prototype.reverse.call(actualHash)
assert.equal(actualHash.toString('hex'), expectedHash) assert.equal(actualHash.toString('hex'), expectedHash)

162
test/transaction.js
View File

@ -4,7 +4,7 @@ var scripts = require('../src/scripts')
var Address = require('../src/address') var Address = require('../src/address')
var ECKey = require('../src/eckey') var ECKey = require('../src/eckey')
var Transaction = require('../src/transaction').Transaction var Transaction = require('../src/transaction')
var Script = require('../src/script') var Script = require('../src/script')
var fixtureTxes = require('./fixtures/mainnet_tx') var fixtureTxes = require('./fixtures/mainnet_tx')
@ -12,31 +12,24 @@ var fixtureTx1Hex = fixtureTxes.prevTx
var fixtureTx2Hex = fixtureTxes.tx var fixtureTx2Hex = fixtureTxes.tx
var fixtureTxBigHex = fixtureTxes.bigTx var fixtureTxBigHex = fixtureTxes.bigTx
function b2h(b) { return new Buffer(b).toString('hex') }
function h2b(h) { return new Buffer(h, 'hex') }
describe('Transaction', function() { describe('Transaction', function() {
describe('deserialize', function() { describe('toBuffer', function() {
it('matches the expected output', function() {
var expected = '010000000189632848f99722915727c5c75da8db2dbf194342a0429828f66ff88fab2af7d600000000fd1b0100483045022100e5be20d440b2bbbc886161f9095fa6d0bca749a4e41d30064f30eb97adc7a1f5022061af132890d8e4e90fedff5e9365aeeb77021afd8ef1d5c114d575512e9a130a0147304402205054e38e9d7b5c10481b6b4991fde5704cd94d49e344406e3c2ce4d18a43bf8e022051d7ba8479865b53a48bee0cce86e89a25633af5b2918aa276859489e232f51c014c8752410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b84104c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee51ae168fea63dc339a3c58419466ceaeef7f632653266d0e1236431a950cfe52a52aeffffffff0101000000000000001976a914751e76e8199196d454941c45d1b3a323f1433bd688ac00000000'
var actual = Transaction.fromHex(expected).toHex()
assert.equal(actual, expected)
})
})
describe('fromBuffer', function() {
var tx, serializedTx var tx, serializedTx
beforeEach(function() { beforeEach(function() {
serializedTx = [ serializedTx = '0100000001344630cbff61fbc362f7e1ff2f11a344c29326e4ee96e787dc0d4e5cc02fd069000000004a493046022100ef89701f460e8660c80808a162bbf2d676f40a331a243592c36d6bd1f81d6bdf022100d29c072f1b18e59caba6e1f0b8cadeb373fd33a25feded746832ec179880c23901ffffffff0100f2052a010000001976a914dd40dedd8f7e37466624c4dacc6362d8e7be23dd88ac00000000'
'0100000001344630cbff61fbc362f7e1ff2f11a344c29326e4ee96e78',
'7dc0d4e5cc02fd069000000004a493046022100ef89701f460e8660c8',
'0808a162bbf2d676f40a331a243592c36d6bd1f81d6bdf022100d29c0',
'72f1b18e59caba6e1f0b8cadeb373fd33a25feded746832ec179880c2',
'3901ffffffff0100f2052a010000001976a914dd40dedd8f7e3746662',
'4c4dacc6362d8e7be23dd88ac00000000'
].join('')
tx = Transaction.fromHex(serializedTx) tx = Transaction.fromHex(serializedTx)
}) })
it('returns the original after serialized again', function() {
var actual = tx.toBuffer()
var expected = serializedTx
assert.equal(b2h(actual), expected)
})
it('does not mutate the input buffer', function() { it('does not mutate the input buffer', function() {
var buffer = new Buffer(serializedTx, 'hex') var buffer = new Buffer(serializedTx, 'hex')
Transaction.fromBuffer(buffer) Transaction.fromBuffer(buffer)
@ -58,11 +51,10 @@ describe('Transaction', function() {
var input = tx.ins[0] var input = tx.ins[0]
assert.equal(input.sequence, 4294967295) assert.equal(input.sequence, 4294967295)
assert.equal(input.outpoint.index, 0) assert.equal(input.index, 0)
assert.equal(input.outpoint.hash, "69d02fc05c4e0ddc87e796eee42693c244a3112fffe1f762c3fb61ffcb304634") assert.equal(input.hash.toString('hex'), "344630cbff61fbc362f7e1ff2f11a344c29326e4ee96e787dc0d4e5cc02fd069")
assert.equal(b2h(input.script.buffer), assert.equal(input.script.toHex(), "493046022100ef89701f460e8660c80808a162bbf2d676f40a331a243592c36d6bd1f81d6bdf022100d29c072f1b18e59caba6e1f0b8cadeb373fd33a25feded746832ec179880c23901")
"493046022100ef89701f460e8660c80808a162bbf2d676f40a331a243592c36d6bd1f81d6bdf022100d29c072f1b18e59caba6e1f0b8cadeb373fd33a25feded746832ec179880c23901")
}) })
it('decodes outputs correctly', function() { it('decodes outputs correctly', function() {
@ -74,11 +66,6 @@ describe('Transaction', function() {
assert.deepEqual(output.script, Address.fromBase58Check('n1gqLjZbRH1biT5o4qiVMiNig8wcCPQeB9').toOutputScript()) assert.deepEqual(output.script, Address.fromBase58Check('n1gqLjZbRH1biT5o4qiVMiNig8wcCPQeB9').toOutputScript())
}) })
it('assigns hash to deserialized object', function(){
var hashHex = "a9d4599e15b53f3eb531608ddb31f48c695c3d0b3538a6bda871e8b34f2f430c"
assert.equal(tx.hash, hashHex)
})
it('decodes large inputs correctly', function() { it('decodes large inputs correctly', function() {
// transaction has only 1 input // transaction has only 1 input
var tx = new Transaction() var tx = new Transaction()
@ -108,28 +95,21 @@ describe('Transaction', function() {
}) })
describe('addInput', function() { describe('addInput', function() {
it('allows a Transaction object to be passed in', function(){ it('accepts a transaction hash', function() {
tx.addInput(prevTx, 0) var prevTxHash = prevTx.getId()
verifyTransactionIn()
})
it('allows a Transaction hash to be passed in', function(){ tx.addInput(prevTxHash, 0)
tx.addInput("0cb859105100ebc3344f749c835c7af7d7103ec0d8cbc3d8ccbd5d28c3c36b57", 0)
verifyTransactionIn() verifyTransactionIn()
}) })
it('allows a TransactionIn object to be passed in', function(){ it('accepts a Transaction object', function() {
var txCopy = tx.clone() tx.addInput(prevTx, 0)
txCopy.addInput(prevTx, 0)
var transactionIn = txCopy.ins[0]
tx.addInput(transactionIn)
verifyTransactionIn() verifyTransactionIn()
}) })
it('allows a string in the form of txhash:index to be passed in', function(){ it('returns an index', function() {
tx.addInput("0cb859105100ebc3344f749c835c7af7d7103ec0d8cbc3d8ccbd5d28c3c36b57:0") assert.equal(tx.addInput(prevTx, 0), 0)
verifyTransactionIn() assert.equal(tx.addInput(prevTx, 0), 1)
}) })
function verifyTransactionIn() { function verifyTransactionIn() {
@ -138,45 +118,40 @@ describe('Transaction', function() {
var input = tx.ins[0] var input = tx.ins[0]
assert.equal(input.sequence, 4294967295) assert.equal(input.sequence, 4294967295)
assert.equal(input.outpoint.index, 0) assert.equal(input.index, 0)
assert.equal(input.outpoint.hash, "0cb859105100ebc3344f749c835c7af7d7103ec0d8cbc3d8ccbd5d28c3c36b57") assert.equal(input.hash.toString('hex'), "576bc3c3285dbdccd8c3cbd8c03e10d7f77a5c839c744f34c3eb00511059b80c")
assert.equal(input.script, Script.EMPTY) assert.equal(input.script, Script.EMPTY)
} }
}) })
describe('addOutput', function() { describe('addOutput', function() {
it('allows an address and a value to be passed in', function(){ it('accepts an address string', function() {
tx.addOutput("15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3", 40000) var dest = '15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3'
verifyTransactionOut()
})
it('allows an Address object and value to be passed in', function(){ tx.addOutput(dest, 40000)
tx.addOutput(Address.fromBase58Check('15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3'), 40000)
verifyTransactionOut() verifyTransactionOut()
}) })
it('allows a string in the form of address:index to be passed in', function(){ it('accepts an Address', function() {
tx.addOutput("15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3:40000") var dest = Address.fromBase58Check('15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3')
tx.addOutput(dest, 40000)
verifyTransactionOut() verifyTransactionOut()
}) })
it('allows a TransactionOut object to be passed in', function(){ it('accepts a scriptPubKey', function() {
var txCopy = tx.clone() var dest = Address.fromBase58Check('15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3').toOutputScript()
txCopy.addOutput("15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3:40000")
var transactionOut = txCopy.outs[0]
tx.addOutput(transactionOut) tx.addOutput(dest, 40000)
verifyTransactionOut() verifyTransactionOut()
}) })
it('supports alternative networks', function(){ it('returns an index', function() {
var addr = 'mkHJaNR7uuwRG1JrmTZsV4MszaTKjCBvCR' var dest = '15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3'
tx.addOutput(addr, 40000)
verifyTransactionOut()
assert.equal(tx.outs[0].address.toString(), addr) assert.equal(tx.addOutput(dest, 40000), 0)
assert.equal(tx.addOutput(dest, 40000), 1)
}) })
function verifyTransactionOut() { function verifyTransactionOut() {
@ -184,15 +159,15 @@ describe('Transaction', function() {
var output = tx.outs[0] var output = tx.outs[0]
assert.equal(output.value, 40000) assert.equal(output.value, 40000)
assert.equal(b2h(output.script.buffer), "76a9143443bc45c560866cfeabf1d52f50a6ed358c69f288ac") assert.equal(output.script.toHex(), "76a9143443bc45c560866cfeabf1d52f50a6ed358c69f288ac")
} }
}) })
describe('sign', function() { describe('sign', function() {
it('works', function() { it('works', function() {
tx.addInput("0cb859105100ebc3344f749c835c7af7d7103ec0d8cbc3d8ccbd5d28c3c36b57:0") tx.addInput("0cb859105100ebc3344f749c835c7af7d7103ec0d8cbc3d8ccbd5d28c3c36b57", 0)
tx.addOutput("15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3:40000") tx.addOutput("15mMHKL96tWAUtqF3tbVf99Z8arcmnJrr3", 40000)
tx.addOutput("1Bu3bhwRmevHLAy1JrRB6AfcxfgDG2vXRd:50000") tx.addOutput("1Bu3bhwRmevHLAy1JrRB6AfcxfgDG2vXRd", 50000)
var key = ECKey.fromWIF('L44f7zxJ5Zw4EK9HZtyAnzCYz2vcZ5wiJf9AuwhJakiV4xVkxBeb') var key = ECKey.fromWIF('L44f7zxJ5Zw4EK9HZtyAnzCYz2vcZ5wiJf9AuwhJakiV4xVkxBeb')
tx.sign(0, key) tx.sign(0, key)
@ -219,28 +194,6 @@ describe('Transaction', function() {
assert.equal(validTx.validateInput(0, script, key.pub, sig), true) assert.equal(validTx.validateInput(0, script, key.pub, sig), true)
}) })
}) })
describe('estimateFee', function(){
it('works for fixture tx 1', function(){
var tx = Transaction.fromHex(fixtureTx1Hex)
assert.equal(tx.estimateFee(), 20000)
})
it('works for fixture big tx', function(){
var tx = Transaction.fromHex(fixtureTxBigHex)
assert.equal(tx.estimateFee(), 60000)
})
it('allow feePerKb to be passed in as an argument', function(){
var tx = Transaction.fromHex(fixtureTx2Hex)
assert.equal(tx.estimateFee(10000), 10000)
})
it('allow feePerKb to be set to 0', function(){
var tx = Transaction.fromHex(fixtureTx2Hex)
assert.equal(tx.estimateFee(0), 0)
})
})
}) })
describe('signInput', function() { describe('signInput', function() {
@ -274,5 +227,32 @@ describe('Transaction', function() {
assert.equal(tx.toHex(), expected) assert.equal(tx.toHex(), expected)
}) })
}) })
describe('getId', function() {
it('returns the expected txid', function() {
var tx = new Transaction()
tx.addInput('d6f72aab8ff86ff6289842a0424319bf2ddba85dc7c52757912297f948286389', 0)
tx.addOutput('mrCDrCybB6J1vRfbwM5hemdJz73FwDBC8r', 1)
assert.equal(tx.getId(), '7c3275f1212fd1a2add614f47a1f1f7b6d9570a97cb88e0e2664ab1752976e9f')
})
})
describe('clone', function() {
it('creates a new object', function() {
var txA = new Transaction()
txA.addInput('d6f72aab8ff86ff6289842a0424319bf2ddba85dc7c52757912297f948286389', 0)
txA.addOutput('mrCDrCybB6J1vRfbwM5hemdJz73FwDBC8r', 1000)
var txB = txA.clone()
// Enforce value equality
assert.deepEqual(txA, txB)
// Enforce reference inequality
assert.notEqual(txA.ins[0], txB.ins[0])
assert.notEqual(txA.outs[0], txB.outs[0])
})
})
}) })

94
test/wallet.js
View File

@ -6,7 +6,7 @@ var scripts = require('../src/scripts')
var Address = require('../src/address') var Address = require('../src/address')
var HDNode = require('../src/hdnode') var HDNode = require('../src/hdnode')
var Transaction = require('../src/transaction').Transaction var Transaction = require('../src/transaction')
var Wallet = require('../src/wallet') var Wallet = require('../src/wallet')
var fixtureTxes = require('./fixtures/mainnet_tx') var fixtureTxes = require('./fixtures/mainnet_tx')
@ -14,7 +14,15 @@ var fixtureTx1Hex = fixtureTxes.prevTx
var fixtureTx2Hex = fixtureTxes.tx var fixtureTx2Hex = fixtureTxes.tx
function fakeTxHash(i) { function fakeTxHash(i) {
return "efefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe" + i var hash = new Buffer(32)
hash.fill(i)
return hash
}
function fakeTxId(i) {
var hash = fakeTxHash(i)
Array.prototype.reverse.call(hash)
return hash.toString('hex')
} }
describe('Wallet', function() { describe('Wallet', function() {
@ -263,12 +271,11 @@ describe('Wallet', function() {
}) })
describe('processConfirmedTx', function(){ describe('processConfirmedTx', function(){
it('does not fail on scripts with no corresponding Address', function() { it('does not fail on scripts with no corresponding Address', function() {
var pubKey = wallet.getPrivateKey(0).pub var pubKey = wallet.getPrivateKey(0).pub
var script = scripts.pubKeyOutput(pubKey) var script = scripts.pubKeyOutput(pubKey)
var tx2 = new Transaction() var tx2 = new Transaction()
tx2.addInput(fakeTxHash(1), 0) tx2.addInput(fakeTxId(1), 0)
// FIXME: Transaction doesn't support custom ScriptPubKeys... yet // FIXME: Transaction doesn't support custom ScriptPubKeys... yet
// So for now, we hijack the script with our own, and undefine the cached address // So for now, we hijack the script with our own, and undefine the cached address
@ -303,44 +310,45 @@ describe('Wallet', function() {
function outputCount(){ function outputCount(){
return Object.keys(wallet.outputs).length return Object.keys(wallet.outputs).length
} }
}) })
describe("when tx ins outpoint contains a known txhash:i", function(){ describe("when tx ins outpoint contains a known txhash:i", function(){
var spendTx
beforeEach(function(){ beforeEach(function(){
wallet.addresses = [addresses[0]] // the address fixtureTx2 used as input wallet.addresses = [addresses[0]] // the address fixtureTx2 used as input
wallet.processConfirmedTx(tx) wallet.processConfirmedTx(tx)
tx = Transaction.fromHex(fixtureTx2Hex) spendTx = Transaction.fromHex(fixtureTx2Hex)
}) })
it("does not add to wallet.outputs", function(){ it("does not add to wallet.outputs", function(){
var outputs = wallet.outputs wallet.processConfirmedTx(spendTx)
wallet.processConfirmedTx(tx) assert.deepEqual(wallet.outputs, {})
assert.deepEqual(wallet.outputs, outputs)
}) })
it("deletes corresponding 'output'", function(){ it("deletes corresponding 'output'", function(){
wallet.processConfirmedTx(tx) var txIn = spendTx.ins[0]
var txInId = new Buffer(txIn.hash)
Array.prototype.reverse.call(txInId)
txInId = txInId.toString('hex')
var txIn = tx.ins[0] var expected = txInId + ':' + txIn.index
var key = txIn.outpoint.hash + ":" + txIn.outpoint.index assert(expected in wallet.outputs)
var output = wallet.outputs[key]
assert.equal(output, undefined) wallet.processConfirmedTx(spendTx)
assert(!(expected in wallet.outputs))
}) })
}) })
it("does nothing when none of the involved addresses belong to the wallet", function(){ it("does nothing when none of the involved addresses belong to the wallet", function(){
var outputs = wallet.outputs
wallet.processConfirmedTx(tx) wallet.processConfirmedTx(tx)
assert.deepEqual(wallet.outputs, outputs) assert.deepEqual(wallet.outputs, {})
}) })
}) })
function verifyOutputAdded(index, pending) { function verifyOutputAdded(index, pending) {
var txOut = tx.outs[index] var txOut = tx.outs[index]
var key = tx.getHash() + ":" + index var key = tx.getId() + ":" + index
var output = wallet.outputs[key] var output = wallet.outputs[key]
assert.equal(output.receive, key) assert.equal(output.receive, key)
assert.equal(output.value, txOut.value) assert.equal(output.value, txOut.value)
@ -366,19 +374,19 @@ describe('Wallet', function() {
// set up 3 utxo // set up 3 utxo
utxo = [ utxo = [
{ {
"hash": fakeTxHash(1), "hash": fakeTxId(1),
"outputIndex": 0, "outputIndex": 0,
"address" : address1, "address" : address1,
"value": 400000 // not enough for value "value": 400000 // not enough for value
}, },
{ {
"hash": fakeTxHash(2), "hash": fakeTxId(2),
"outputIndex": 1, "outputIndex": 1,
"address" : address1, "address" : address1,
"value": 500000 // enough for only value "value": 500000 // enough for only value
}, },
{ {
"hash": fakeTxHash(3), "hash": fakeTxId(3),
"outputIndex": 0, "outputIndex": 0,
"address" : address2, "address" : address2,
"value": 520000 // enough for value and fee "value": 520000 // enough for value and fee
@ -392,7 +400,8 @@ describe('Wallet', function() {
var tx = wallet.createTx(to, value) var tx = wallet.createTx(to, value)
assert.equal(tx.ins.length, 1) assert.equal(tx.ins.length, 1)
assert.deepEqual(tx.ins[0].outpoint, { hash: fakeTxHash(3), index: 0 }) assert.deepEqual(tx.ins[0].hash, fakeTxHash(3))
assert.equal(tx.ins[0].index, 0)
}) })
it('allows fee to be specified', function(){ it('allows fee to be specified', function(){
@ -400,8 +409,11 @@ describe('Wallet', function() {
var tx = wallet.createTx(to, value, fee) var tx = wallet.createTx(to, value, fee)
assert.equal(tx.ins.length, 2) assert.equal(tx.ins.length, 2)
assert.deepEqual(tx.ins[0].outpoint, { hash: fakeTxHash(3), index: 0 })
assert.deepEqual(tx.ins[1].outpoint, { hash: fakeTxHash(2), index: 1 }) assert.deepEqual(tx.ins[0].hash, fakeTxHash(3))
assert.equal(tx.ins[0].index, 0)
assert.deepEqual(tx.ins[1].hash, fakeTxHash(2))
assert.equal(tx.ins[1].index, 1)
}) })
it('allows fee to be set to zero', function(){ it('allows fee to be set to zero', function(){
@ -410,13 +422,14 @@ describe('Wallet', function() {
var tx = wallet.createTx(to, value, fee) var tx = wallet.createTx(to, value, fee)
assert.equal(tx.ins.length, 1) assert.equal(tx.ins.length, 1)
assert.deepEqual(tx.ins[0].outpoint, { hash: fakeTxHash(3), index: 0 }) assert.deepEqual(tx.ins[0].hash, fakeTxHash(3))
assert.equal(tx.ins[0].index, 0)
}) })
it('ignores pending outputs', function(){ it('ignores pending outputs', function(){
utxo.push( utxo.push(
{ {
"hash": fakeTxHash(4), "hash": fakeTxId(4),
"outputIndex": 0, "outputIndex": 0,
"address" : address2, "address" : address2,
"value": 530000, "value": 530000,
@ -428,7 +441,8 @@ describe('Wallet', function() {
var tx = wallet.createTx(to, value) var tx = wallet.createTx(to, value)
assert.equal(tx.ins.length, 1) assert.equal(tx.ins.length, 1)
assert.deepEqual(tx.ins[0].outpoint, { hash: fakeTxHash(3), index: 0 }) assert.deepEqual(tx.ins[0].hash, fakeTxHash(3))
assert.equal(tx.ins[0].index, 0)
}) })
}) })
@ -438,7 +452,7 @@ describe('Wallet', function() {
var address = wallet.generateAddress() var address = wallet.generateAddress()
wallet.setUnspentOutputs([{ wallet.setUnspentOutputs([{
hash: fakeTxHash(0), hash: fakeTxId(0),
outputIndex: 0, outputIndex: 0,
address: address, address: address,
value: value value: value
@ -449,7 +463,9 @@ describe('Wallet', function() {
var tx = wallet.createTx(to, toValue) var tx = wallet.createTx(to, toValue)
assert.equal(tx.outs.length, 1) assert.equal(tx.outs.length, 1)
assert.equal(tx.outs[0].address.toString(), to)
var outAddress = Address.fromOutputScript(tx.outs[0].script, networks.testnet)
assert.equal(outAddress.toString(), to)
assert.equal(tx.outs[0].value, toValue) assert.equal(tx.outs[0].value, toValue)
}) })
}) })
@ -460,7 +476,7 @@ describe('Wallet', function() {
var address = wallet.generateAddress() var address = wallet.generateAddress()
wallet.setUnspentOutputs([{ wallet.setUnspentOutputs([{
hash: fakeTxHash(0), hash: fakeTxId(0),
outputIndex: 0, outputIndex: 0,
address: address, address: address,
value: value value: value
@ -474,10 +490,14 @@ describe('Wallet', function() {
var tx = wallet.createTx(to, toValue, fee, changeAddress) var tx = wallet.createTx(to, toValue, fee, changeAddress)
assert.equal(tx.outs.length, 2) assert.equal(tx.outs.length, 2)
assert.equal(tx.outs[0].address.toString(), to)
var outAddress0 = Address.fromOutputScript(tx.outs[0].script, networks.testnet)
var outAddress1 = Address.fromOutputScript(tx.outs[1].script, networks.testnet)
assert.equal(outAddress0.toString(), to)
assert.equal(tx.outs[0].value, toValue) assert.equal(tx.outs[0].value, toValue)
assert.equal(tx.outs[1].address.toString(), changeAddress) assert.equal(outAddress1.toString(), changeAddress)
assert.equal(tx.outs[1].value, value - (toValue + fee)) assert.equal(tx.outs[1].value, value - (toValue + fee))
}) })
}) })
@ -488,7 +508,9 @@ describe('Wallet', function() {
assert.equal(tx.outs.length, 1) assert.equal(tx.outs.length, 1)
var out = tx.outs[0] var out = tx.outs[0]
assert.equal(out.address, to) var outAddress = Address.fromOutputScript(out.script)
assert.equal(outAddress.toString(), to)
assert.equal(out.value, value) assert.equal(out.value, value)
}) })
@ -501,7 +523,9 @@ describe('Wallet', function() {
assert.equal(tx.outs.length, 2) assert.equal(tx.outs.length, 2)
var out = tx.outs[1] var out = tx.outs[1]
assert.equal(out.address, wallet.changeAddresses[1]) var outAddress = Address.fromOutputScript(out.script)
assert.equal(outAddress.toString(), wallet.changeAddresses[1])
assert.equal(out.value, 15000) assert.equal(out.value, 15000)
}) })
@ -513,7 +537,9 @@ describe('Wallet', function() {
assert.equal(wallet.changeAddresses.length, 1) assert.equal(wallet.changeAddresses.length, 1)
var out = tx.outs[1] var out = tx.outs[1]
assert.equal(out.address, wallet.changeAddresses[0]) var outAddress = Address.fromOutputScript(out.script)
assert.equal(outAddress.toString(), wallet.changeAddresses[0])
assert.equal(out.value, 15000) assert.equal(out.value, 15000)
}) })

Write Preview
Loading…
Cancel
Save