LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed issues with testnet and createTx

Browse source
This commit is contained in:
William Cotton 2014-04-25 12:39:30 -07:00
parent 960d931010
commit a9bc42019a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/wallet.js
View file

@ -2,6 +2,7 @@ var convert = require('./convert')
var Transaction = require('./transaction').Transaction var Transaction = require('./transaction').Transaction
var HDNode = require('./hdwallet.js') var HDNode = require('./hdwallet.js')
var rng = require('secure-random') var rng = require('secure-random')
var Network = require('./network')
function Wallet(seed, options) { function Wallet(seed, options) {
if (!(this instanceof Wallet)) { return new Wallet(seed, options); } if (!(this instanceof Wallet)) { return new Wallet(seed, options); }
@ -173,7 +174,7 @@ function Wallet(seed, options) {
checkDust(value) checkDust(value)
var tx = new Transaction() var tx = new Transaction()
tx.addOutput(to, value) tx.addOutput(to, value, Network[network])
var utxo = getCandidateOutputs(value) var utxo = getCandidateOutputs(value)
var totalInValue = 0 var totalInValue = 0
@ -189,7 +190,7 @@ function Wallet(seed, options) {
var change = totalInValue - value - fee var change = totalInValue - value - fee
if(change > 0 && !isDust(change)) { if(change > 0 && !isDust(change)) {
tx.addOutput(getChangeAddress(), change) tx.addOutput(getChangeAddress(), change, Network[network])
} }
break break
} }
@ -245,7 +246,7 @@ function Wallet(seed, options) {
function estimateFeePadChangeOutput(tx){ function estimateFeePadChangeOutput(tx){
var tmpTx = tx.clone() var tmpTx = tx.clone()
tmpTx.addOutput(getChangeAddress(), 0) tmpTx.addOutput(getChangeAddress(), 0, Network[network])
return tmpTx.estimateFee() return tmpTx.estimateFee()
} }
@ -265,7 +266,7 @@ function Wallet(seed, options) {
tx.ins.forEach(function(inp,i) { tx.ins.forEach(function(inp,i) {
var output = me.outputs[inp.outpoint.hash + ':' + inp.outpoint.index] var output = me.outputs[inp.outpoint.hash + ':' + inp.outpoint.index]
if (output) { if (output) {
tx.sign(i, me.getPrivateKeyForAddress(output.address)) tx.sign(i, me.getPrivateKeyForAddress(output.address), false, Network[network])
} }
}) })
return tx return tx