DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

try this

Browse Source
This commit is contained in:
blackjok3r
2018-10-27 00:29:21 +08:00
parent fd8fe7b404
commit baa6c49084
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/rpcblockchain.cpp
View File

@@ -365,6 +365,7 @@ UniValue getdatafromblock(const UniValue& params, bool fHelp)
int did1 = 0; int did1 = 0;
int skippedtxs = 0; int skippedtxs = 0;
int failed = 0; int failed = 0;
int getfirstblock = 0;
static std::string streamid,firsttxid; static std::string streamid,firsttxid;
static int firsttxnHeight; static int firsttxnHeight;
std::string blockdata; std::string blockdata;
@@ -392,6 +393,7 @@ UniValue getdatafromblock(const UniValue& params, bool fHelp)
ss >> seqid; ss >> seqid;
if ( seqid == 1 ) { if ( seqid == 1 ) {
streamid = idstr; streamid = idstr;
getfirstblock = 1;
} else if ( seqid == 2 ) { } else if ( seqid == 2 ) {
firsttxid = idstr; firsttxid = idstr;
} else if (firsttxid.empty()) { } else if (firsttxid.empty()) {
@@ -403,7 +405,6 @@ UniValue getdatafromblock(const UniValue& params, bool fHelp)
streamid.clear(); streamid.clear();
firsttxnHeight = 0; firsttxnHeight = 0;
} }
if ( seqid == (lastseqid + 1) || did1 == 0 ) { if ( seqid == (lastseqid + 1) || did1 == 0 ) {
blockdata.append(data); blockdata.append(data);
} else { } else {
@@ -425,24 +426,22 @@ UniValue getdatafromblock(const UniValue& params, bool fHelp)
} }
i = i + 1; i = i + 1;
} }
if (streamid.empty()) { if (streamid.empty() || getfirstblock == 1) {
if ( lastseqid == 1) {
firsttxid = block.vtx[1].GetHash().GetHex();
}
uint256 hash; CTransaction firsttx; uint256 hash; CTransaction firsttx;
uint256 firsttxid_256(uint256S(firsttxid)); uint256 firsttxid_256(uint256S(firsttxid));
if (GetTransaction(firsttxid_256,firsttx,hash,false)) { if (GetTransaction(firsttxid_256,firsttx,hash,false)) {
std::string firststreamid = HexStr(firsttx.vout[2].scriptPubKey.begin(), firsttx.vout[2].scriptPubKey.end()); std::string firststreamid = HexStr(firsttx.vout[2].scriptPubKey.begin(), firsttx.vout[2].scriptPubKey.end());
streamid.append(firststreamid.substr (8,64)); streamid.append(firststreamid.substr (8,64));
printf("first stream id changed to: %s\n", streamid.c_str()); printf("first stream id changed to: %s\n", streamid.c_str());
if ( firstseqid == 1 ) { BlockMap::iterator mi = mapBlockIndex.find(hash);
firsttxnHeight == pblockindex->nHeight; if (mi != mapBlockIndex.end() && (*mi).second) {
printf("first seq id is 1 and found height: %d\n",firsttxnHeight ); CBlockIndex* pindex = (*mi).second;
} else { printf("found block height: %d\n",pindex->nHeight);
BlockMap::iterator mi = mapBlockIndex.find(hash); if (chainActive.Contains(pindex)) {
if (mi != mapBlockIndex.end() && (*mi).second) { firsttxnHeight = pindex->nHeight;
CBlockIndex* pindex = (*mi).second;
printf("found block height: %d\n",pindex->nHeight);
if (chainActive.Contains(pindex)) {
firsttxnHeight = pindex->nHeight;
}
} }
} }
} }