debugging. nHeight is incorrect.

This commit is contained in:
Christopher Jeffrey 2014-12-03 15:09:34 -08:00
parent 0955056d5c
commit 2e5c43a5e6
1 changed files with 13 additions and 3 deletions

View File

@ -589,7 +589,7 @@ struct async_rescan_data {
#if USE_LDB_ADDR #if USE_LDB_ADDR
static ctx_list * static ctx_list *
read_addr(const std::string addr); read_addr(const std::string addr, const int64_t blockindex);
#endif #endif
static bool static bool
@ -2036,7 +2036,7 @@ done:
} }
return; return;
#else #else
ctx_list *ctxs = read_addr(data->addr); ctx_list *ctxs = read_addr(data->addr, data->blockindex);
if (!ctxs->err_msg.empty()) { if (!ctxs->err_msg.empty()) {
data->err_msg = ctxs->err_msg; data->err_msg = ctxs->err_msg;
return; return;
@ -6068,16 +6068,20 @@ jstx_to_ctx(const Local<Object> jstx, CTransaction& ctx_) {
#if USE_LDB_ADDR #if USE_LDB_ADDR
static ctx_list * static ctx_list *
read_addr(const std::string addr) { read_addr(const std::string addr, const int64_t blockindex) {
ctx_list *head = new ctx_list(); ctx_list *head = new ctx_list();
ctx_list *cur = NULL; ctx_list *cur = NULL;
// XXX Do something with this:
// blockindex
head->err_msg = std::string(""); head->err_msg = std::string("");
CScript expectedScriptSig = GetScriptForDestination(CBitcoinAddress(addr).Get()); CScript expectedScriptSig = GetScriptForDestination(CBitcoinAddress(addr).Get());
leveldb::Iterator* pcursor = pblocktree->pdb->NewIterator(pblocktree->iteroptions); leveldb::Iterator* pcursor = pblocktree->pdb->NewIterator(pblocktree->iteroptions);
// Seek to blockindex:
pcursor->SeekToFirst(); pcursor->SeekToFirst();
while (pcursor->Valid()) { while (pcursor->Valid()) {
@ -6142,9 +6146,15 @@ read_addr(const std::string addr) {
CBlockHeader header; CBlockHeader header;
ssValue >> header; ssValue >> header;
// XXX nHeight is incorrect:
int nHeight; int nHeight;
//unsigned int nHeight;
//int64_t nHeight; //int64_t nHeight;
ssValue >> nHeight; ssValue >> nHeight;
//printf("%u\n", nHeight);
//if (nHeight != blockindex) {
// goto found;
//}
unsigned int nTx; unsigned int nTx;
ssValue >> nTx; ssValue >> nTx;