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

@ -17,14 +17,8 @@ function construct (f, sign) {
var network = NETWORKS[f.network]
var txb = new TransactionBuilder(network)
// FIXME: add support for version in TransactionBuilder API
if (f.version !== undefined) {
txb.tx.version = f.version
}
if (f.locktime !== undefined) {
txb.setLockTime(f.locktime)
}
if (f.version !== undefined) txb.setVersion(f.version)
if (f.locktime !== undefined) txb.setLockTime(f.locktime)
f.inputs.forEach(function (input) {
var prevTxScript