zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup fill transaction more.

This commit is contained in:
Christopher Jeffrey 2014-09-30 13:35:38 -07:00
parent 1bb9d1cebd
commit c8377f7c08
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bitcoindjs.cc
View File

@ -1235,26 +1235,13 @@ NAN_METHOD(FillTransaction) {
CDataStream ssData(ParseHex(tx_hex), SER_NETWORK, PROTOCOL_VERSION);
ssData >> tx;
// Destination output
unsigned int d_output = 0;
if (options->Get(NanNew<String>("output"))->IsNumber()) {
d_output = options->Get(NanNew<String>("output"))->IntegerValue();
if (d_output >= tx.vout.size()) {
return NanThrowError("Destination output does not exist");
}
}
// Get total value of outputs
// Get the scriptPubKey of the first output (presumably our destination)
int64_t nValue = 0;
CScript scriptPubKeyMain;
for (unsigned int vo = 0; vo < tx.vout.size(); vo++) {
const CTxOut& txout = tx.vout[vo];
int64_t value = txout.nValue;
const CScript& scriptPubKey = txout.scriptPubKey;
if (vo == d_output) {
scriptPubKeyMain = scriptPubKey;
}
nValue += value;
}
@ -1263,8 +1250,6 @@ NAN_METHOD(FillTransaction) {
if (nValue + nTransactionFee > pwalletMain->GetBalance())
return NanThrowError("Insufficient funds");
CScript scriptPubKey = scriptPubKeyMain;
int64_t nFeeRet = nTransactionFee;
if (pwalletMain->IsLocked()) {