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

fix error. fix parent block.

This commit is contained in:
Christopher Jeffrey 2014-11-14 14:59:51 -08:00
parent 20faa1225b
commit 2c0010a31f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bitcoindjs.cc
View File

@ -5738,11 +5738,15 @@ ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx, boo
jstx->Set(NanNew<String>("time"), NanNew<Number>(cwtx.GetTxTime())); jstx->Set(NanNew<String>("time"), NanNew<Number>(cwtx.GetTxTime()));
jstx->Set(NanNew<String>("timereceived"), NanNew<Number>((int64_t)cwtx.nTimeReceived)); jstx->Set(NanNew<String>("timereceived"), NanNew<Number>((int64_t)cwtx.nTimeReceived));
if (!parent) { if (!parent) {
CBlock cblock = mapBlockIndex[cwtx.hashBlock]; CBlock cblock;
//CBlockIndex *cblock_index = mapBlockIndex[cwtx.hashBlock];
CBlockIndex *cblock_index = mapBlockIndex[block_hash];
if (ReadBlockFromDisk(cblock, cblock_index)) {
Local<Object> jsblock = NanNew<Object>(); Local<Object> jsblock = NanNew<Object>();
cblock_to_jsblock(cblock, block_index, jsblock, false); cblock_to_jsblock(cblock, cblock_index, jsblock, false);
jstx->Set(NanNew<String>("_block"), jsblock); jstx->Set(NanNew<String>("_block"), jsblock);
} }
}
} else { } else {
jstx->Set(NanNew<String>("blockhash"), NanNew<String>(uint256(0).GetHex())); jstx->Set(NanNew<String>("blockhash"), NanNew<String>(uint256(0).GetHex()));
jstx->Set(NanNew<String>("confirmations"), NanNew<Number>(-1)); jstx->Set(NanNew<String>("confirmations"), NanNew<Number>(-1));
@ -5811,7 +5815,8 @@ jstx_to_ctx(const Local<Object> jstx, CTransaction& ctx_) {
try { try {
ssData >> ctx_; ssData >> ctx_;
} catch (std::exception &e) { } catch (std::exception &e) {
return NanThrowError("Bad TX decode"); NanThrowError("Bad TX decode");
return;
} }
return; return;