Merge branch 'master' into codesep

This commit is contained in:
Daniel Cousens 2016-06-30 16:13:08 +10:00 committed by GitHub
commit 148e9fc7a8
2 changed files with 9 additions and 8 deletions

View file

@ -163,6 +163,13 @@ TransactionBuilder.prototype.setLockTime = function (locktime) {
this.tx.locktime = locktime
}
TransactionBuilder.prototype.setVersion = function (version) {
typeforce(types.UInt32, version)
// XXX: this might eventually become more complex depending on what the versions represent
this.tx.version = version
}
TransactionBuilder.fromTransaction = function (transaction, network) {
var txb = new TransactionBuilder(network)