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

do not include parent block.

This commit is contained in:
Christopher Jeffrey 2014-11-14 15:00:15 -08:00
parent 2c0010a31f
commit 8eb0e2d810
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/bitcoindjs.cc
View File

@ -384,7 +384,7 @@ static inline void
cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object> jsblock, bool is_new); cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object> jsblock, bool is_new);
static inline void static inline void
ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx, bool parent=false); ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx /*, bool parent=false*/ );
static inline void static inline void
jsblock_to_cblock(const Local<Object> jsblock, CBlock& cblock); jsblock_to_cblock(const Local<Object> jsblock, CBlock& cblock);
@ -5602,7 +5602,7 @@ cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object>
BOOST_FOREACH(const CTransaction& ctx, cblock.vtx) { BOOST_FOREACH(const CTransaction& ctx, cblock.vtx) {
Local<Object> jstx = NanNew<Object>(); Local<Object> jstx = NanNew<Object>();
const uint256 block_hash = cblock.GetHash(); const uint256 block_hash = cblock.GetHash();
ctx_to_jstx(ctx, block_hash, jstx, true); ctx_to_jstx(ctx, block_hash, jstx /*, true*/ );
txs->Set(ti, jstx); txs->Set(ti, jstx);
ti++; ti++;
} }
@ -5621,7 +5621,7 @@ cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object>
} }
static inline void static inline void
ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx, bool parent=false) { ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx /*, bool parent=false*/ ) {
// With v0.9.0 // With v0.9.0
// jstx->Set(NanNew<String>("mintxfee"), NanNew<Number>((int64_t)ctx.nMinTxFee)->ToInteger()); // jstx->Set(NanNew<String>("mintxfee"), NanNew<Number>((int64_t)ctx.nMinTxFee)->ToInteger());
// jstx->Set(NanNew<String>("minrelaytxfee"), NanNew<Number>((int64_t)ctx.nMinRelayTxFee)->ToInteger()); // jstx->Set(NanNew<String>("minrelaytxfee"), NanNew<Number>((int64_t)ctx.nMinRelayTxFee)->ToInteger());
@ -5737,16 +5737,16 @@ ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx, boo
jstx->Set(NanNew<String>("walletconflicts"), conflicts); jstx->Set(NanNew<String>("walletconflicts"), conflicts);
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; // CBlock cblock;
//CBlockIndex *cblock_index = mapBlockIndex[cwtx.hashBlock]; // //CBlockIndex *cblock_index = mapBlockIndex[cwtx.hashBlock];
CBlockIndex *cblock_index = mapBlockIndex[block_hash]; // CBlockIndex *cblock_index = mapBlockIndex[block_hash];
if (ReadBlockFromDisk(cblock, cblock_index)) { // if (ReadBlockFromDisk(cblock, cblock_index)) {
Local<Object> jsblock = NanNew<Object>(); // Local<Object> jsblock = NanNew<Object>();
cblock_to_jsblock(cblock, cblock_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));