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

Test

Browse Source
This commit is contained in:
jl777
2018-04-13 17:46:08 +03:00
parent 6a98bf0618
commit f527fcdb97
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/komodo_bitcoind.h
View File

@@ -662,7 +662,7 @@ int32_t komodo_block2height(CBlock *block)
void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block) void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block)
{ {
int32_t n; int32_t n;
memset(pubkey33,0,33); memset(pubkey33,0xff,33);
if ( block.vtx[0].vout.size() > 0 ) if ( block.vtx[0].vout.size() > 0 )
{ {
#ifdef KOMODO_ZCASH #ifdef KOMODO_ZCASH
@@ -732,9 +732,9 @@ void komodo_pindex_init(CBlockIndex *pindex,int32_t height)
pindex->notaryid = -1; pindex->notaryid = -1;
if ( pindex->pubkey33[0] != 2 && pindex->pubkey33[0] != 3 && pindex->pubkey33[0] != 0xff ) if ( pindex->pubkey33[0] != 2 && pindex->pubkey33[0] != 3 && pindex->pubkey33[0] != 0xff )
{ {
if ( KOMODO_LOADINGBLOCKS == 0 ) //if ( KOMODO_LOADINGBLOCKS == 0 )
memset(pindex->pubkey33,0xff,33); memset(pindex->pubkey33,0xff,33);
else memset(pindex->pubkey33,0,33); //else memset(pindex->pubkey33,0,33);
if ( komodo_blockload(block,pindex) == 0 ) if ( komodo_blockload(block,pindex) == 0 )
{ {
komodo_block2pubkey33(pindex->pubkey33,block); komodo_block2pubkey33(pindex->pubkey33,block);

21
src/main.cpp
View File

@@ -4037,6 +4037,7 @@ bool CheckDiskSpace(uint64_t nAdditionalBytes)
FILE* OpenDiskFile(const CDiskBlockPos &pos, const char *prefix, bool fReadOnly) FILE* OpenDiskFile(const CDiskBlockPos &pos, const char *prefix, bool fReadOnly)
{ {
int32_t incr;
if (pos.IsNull()) if (pos.IsNull())
return NULL; return NULL;
boost::filesystem::path path = GetBlockPosFilename(pos, prefix); boost::filesystem::path path = GetBlockPosFilename(pos, prefix);
@@ -4048,6 +4049,26 @@ FILE* OpenDiskFile(const CDiskBlockPos &pos, const char *prefix, bool fReadOnly)
LogPrintf("Unable to open file %s\n", path.string()); LogPrintf("Unable to open file %s\n", path.string());
return NULL; return NULL;
} }
if ( strcmp(prefix,(char *)"blk") == 0 )
{
long fsize,fpos; int32_t incr = 16*1024*1024;
fpos = ftell(file);
fseek(file,0,SEEK_END);
fsize = ftell(file);
if ( fsize > incr )
{
char *ignore = malloc(incr);
if ( ignore != 0 )
{
rewind(file);
while ( fread(ignore,1,incr,file) == incr )
fprintf(stderr,".");
free(ignore);
fprintf(stderr,"loaded %ld bytes set fpos.%ld\n",(long)ftell(file),(long)fpos);
}
}
fseek(file,fpos,SEEK_SET);
}
if (pos.nPos) { if (pos.nPos) {
if (fseek(file, pos.nPos, SEEK_SET)) { if (fseek(file, pos.nPos, SEEK_SET)) {
LogPrintf("Unable to seek to position %u of %s\n", pos.nPos, path.string()); LogPrintf("Unable to seek to position %u of %s\n", pos.nPos, path.string());