From 314350e695f07001e2188e87bc37064b96e40e05 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 3 Nov 2017 19:22:56 +0200 Subject: [PATCH 01/58] KOMODO_ENDOFERA --- src/komodo.h | 1 + src/komodo_interest.h | 8 +++++--- src/main.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index c5057646f..95aa1583a 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -25,6 +25,7 @@ #define KOMODO_ASSETCHAINS_WAITNOTARIZE #define KOMODO_PAXMAX (10000 * COIN) +#define KOMODO_ENDOFERA 7777777 #include #include diff --git a/src/komodo_interest.h b/src/komodo_interest.h index c5a35492d..917791498 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -19,6 +19,7 @@ #define KOMODO_INTEREST ((uint64_t)(0.05 * COIN)) // 5% int64_t MAX_MONEY = 200000000 * 100000000LL; +#ifdef notanymore uint64_t komodo_earned_interest(int32_t height,int64_t paidinterest) { static uint64_t *interests; static int32_t maxheight; @@ -73,6 +74,7 @@ uint64_t komodo_moneysupply(int32_t height) return(0); else return(COIN * 100000000 + (height-1) * 3 + komodo_earned_interest(height,-1)); } +#endif uint64_t _komodo_interestnew(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime) { @@ -90,7 +92,7 @@ uint64_t _komodo_interestnew(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime uint64_t komodo_interestnew(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime) { uint64_t interest = 0; - if ( txheight < 7777777 && komodo_moneysupply(txheight) < MAX_MONEY && nLockTime >= LOCKTIME_THRESHOLD && tiptime != 0 && nLockTime < tiptime && nValue >= 10*COIN ) + if ( txheight < KOMODO_ENDOFERA && nLockTime >= LOCKTIME_THRESHOLD && tiptime != 0 && nLockTime < tiptime && nValue >= 10*COIN ) //komodo_moneysupply(txheight) < MAX_MONEY && interest = _komodo_interestnew(nValue,nLockTime,tiptime); return(interest); } @@ -101,9 +103,9 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin activation = 1491350400; // 1491350400 5th April if ( ASSETCHAINS_SYMBOL[0] != 0 ) return(0); - if ( txheight >= 7777777 ) + if ( txheight >= KOMODO_ENDOFERA ) return(0); - if ( komodo_moneysupply(txheight) < MAX_MONEY && nLockTime >= LOCKTIME_THRESHOLD && tiptime != 0 && nLockTime < tiptime && nValue >= 10*COIN ) + if ( nLockTime >= LOCKTIME_THRESHOLD && tiptime != 0 && nLockTime < tiptime && nValue >= 10*COIN ) //komodo_moneysupply(txheight) < MAX_MONEY && { if ( (minutes= (tiptime - nLockTime) / 60) >= 60 ) { diff --git a/src/main.cpp b/src/main.cpp index 8f028dbb7..e86a665ec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1490,7 +1490,7 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex) return true; } -uint64_t komodo_moneysupply(int32_t height); +//uint64_t komodo_moneysupply(int32_t height); extern char ASSETCHAINS_SYMBOL[16]; extern uint32_t ASSETCHAINS_MAGIC; extern uint64_t ASSETCHAINS_SUPPLY; @@ -1502,7 +1502,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) { if ( nHeight == 1 ) return(100000000 * COIN); // ICO allocation - else if ( komodo_moneysupply(nHeight) < MAX_MONEY ) + else if ( nHeight < KOMODO_ENDOFERA ) //komodo_moneysupply(nHeight) < MAX_MONEY ) return(3 * COIN); else return(0); } @@ -2365,8 +2365,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin return false; control.Add(vChecks); } - if ( ASSETCHAINS_SYMBOL[0] == 0 ) - komodo_earned_interest(pindex->nHeight,sum); + //if ( ASSETCHAINS_SYMBOL[0] == 0 ) + // komodo_earned_interest(pindex->nHeight,sum); CTxUndo undoDummy; if (i > 0) { blockundo.vtxundo.push_back(CTxUndo()); From e8cb981dd050908bf29b3a007fa8cd2621b995a2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 3 Nov 2017 19:24:53 +0200 Subject: [PATCH 02/58] Test --- src/komodo.h | 1 - src/komodo_interest.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index 95aa1583a..c5057646f 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -25,7 +25,6 @@ #define KOMODO_ASSETCHAINS_WAITNOTARIZE #define KOMODO_PAXMAX (10000 * COIN) -#define KOMODO_ENDOFERA 7777777 #include #include diff --git a/src/komodo_interest.h b/src/komodo_interest.h index 917791498..798eda48e 100644 --- a/src/komodo_interest.h +++ b/src/komodo_interest.h @@ -16,6 +16,7 @@ #define SATOSHIDEN ((uint64_t)100000000L) #define dstr(x) ((double)(x) / SATOSHIDEN) +#define KOMODO_ENDOFERA 7777777 #define KOMODO_INTEREST ((uint64_t)(0.05 * COIN)) // 5% int64_t MAX_MONEY = 200000000 * 100000000LL; From 17746e454a750f5c9a4ccd09d5886812f60aa17a Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 04:50:59 +0200 Subject: [PATCH 03/58] Faster init test --- src/komodo.h | 133 ++++++++++++++++++++++++++++++++++++++++++- src/komodo_gateway.h | 62 +++++++++++++++++++- 2 files changed, 192 insertions(+), 3 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index c5057646f..d555dd941 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -192,7 +192,138 @@ int32_t komodo_parsestatefile(struct komodo_state *sp,FILE *fp,char *symbol,char return(func); } else return(-1); } - + +int32_t memread(void *dest,int32_t size,uint8_t *filedata,long *fposp,long datalen) +{ + if ( *fposp+size <= datalen ) + { + memcpy(dest,&filedata[*fposp],size); + (*fposp) += size; + return(size); + } + return(-1); +} + +long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest) +{ + static int32_t errs; + int32_t func,ht,notarized_height,num,matched=0; uint256 notarized_hash,notarized_desttxid; uint8_t pubkeys[64][33]; long fpos = *fposp; + if ( fpos < datalen ) + { + func = filedata[fpos++]; + if ( ASSETCHAINS_SYMBOL[0] == 0 && strcmp(symbol,"KMD") == 0 ) + matched = 1; + else matched = (strcmp(symbol,ASSETCHAINS_SYMBOL) == 0); + if ( memread(&ht,sizeof(ht),filedata,&fpos,datalen) != sizeof(ht) ) + errs++; + if ( func == 'P' ) + { + if ( (num= filedata[fpos++]) <= 64 ) + { + if ( memread(pubkeys,33*num,filedata,&fpos,datalen) != 33*num ) + errs++; + else + { + //printf("updated %d pubkeys at %s ht.%d\n",num,symbol,ht); + if ( (KOMODO_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && KOMODO_EXTERNAL_NOTARIES == 0) ) + komodo_eventadd_pubkeys(sp,symbol,ht,num,pubkeys); + } + } else printf("illegal num.%d\n",num); + } + else if ( func == 'N' ) + { + if ( memread(¬arized_height,sizeof(notarized_height),filedata,&fpos,datalen) != sizeof(notarized_height) ) + errs++; + if ( memread(¬arized_hash,sizeof(notarized_hash),filedata,&fpos,datalen) != sizeof(notarized_hash) ) + errs++; + if ( memread(¬arized_desttxid,sizeof(notarized_desttxid),filedata,&fpos,datalen) != sizeof(notarized_desttxid) ) + errs++; + //if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 && sp != 0 ) + printf("%s load[%s.%d -> %s] NOTARIZED %d %s\n",ASSETCHAINS_SYMBOL,symbol,sp->NUM_NPOINTS,dest,notarized_height,notarized_hash.ToString().c_str()); + //if ( matched != 0 ) global independent states -> inside *sp + komodo_eventadd_notarized(sp,symbol,ht,dest,notarized_hash,notarized_desttxid,notarized_height); + } + else if ( func == 'U' ) // deprecated + { + uint8_t n,nid; uint256 hash; uint64_t mask; + n = filedata[fpos++]; + nid = filedata[fpos++]; + //printf("U %d %d\n",n,nid); + if ( memread(&mask,sizeof(mask),filedata,&fpos,datalen) != sizeof(mask) ) + errs++; + if ( memread(&hash,sizeof(hash),filedata,&fpos,datalen) != sizeof(hash) ) + errs++; + } + else if ( func == 'K' ) + { + int32_t kheight; + if ( memread(&kheight,sizeof(kheight),filedata,&fpos,datalen) != sizeof(kheight) ) + errs++; + komodo_eventadd_kmdheight(sp,symbol,ht,kheight,0); + } + else if ( func == 'T' ) + { + int32_t kheight,ktimestamp; + if ( memread(&kheight,sizeof(kheight),filedata,&fpos,datalen) != sizeof(kheight) ) + errs++; + if ( memread(&ktimestamp,sizeof(ktimestamp),filedata,&fpos,datalen) != sizeof(ktimestamp) ) + errs++; + //if ( matched != 0 ) global independent states -> inside *sp + //printf("%s.%d load[%s] ht.%d t.%u\n",ASSETCHAINS_SYMBOL,ht,symbol,kheight,ktimestamp); + komodo_eventadd_kmdheight(sp,symbol,ht,kheight,ktimestamp); + } + else if ( func == 'R' ) + { + uint16_t olen,v; uint64_t ovalue; uint256 txid; uint8_t opret[16384]; + if ( memread(&txid,sizeof(txid),filedata,&fpos,datalen) != sizeof(txid) ) + errs++; + if ( memread(&v,sizeof(v),filedata,&fpos,datalen) != sizeof(v) ) + errs++; + if ( memread(&ovalue,sizeof(ovalue),filedata,&fpos,datalen) != sizeof(ovalue) ) + errs++; + if ( memread(&olen,sizeof(olen),filedata,&fpos,datalen) != sizeof(olen) ) + errs++; + if ( olen < sizeof(opret) ) + { + if ( memread(opret,olen,filedata,&fpos,datalen) != olen ) + errs++; + if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 && matched != 0 ) + { + int32_t i; for (i=0; i global PAX + } else + { + int32_t i; + for (i=0; i global PVALS + //printf("%s load[%s] prices %d\n",ASSETCHAINS_SYMBOL,symbol,ht); + komodo_eventadd_pricefeed(sp,symbol,ht,pvals,numpvals); + //printf("load pvals ht.%d numpvals.%d\n",ht,numpvals); + } else printf("error loading pvals[%d]\n",numpvals); + } + else printf("[%s] %s illegal func.(%d %c)\n",ASSETCHAINS_SYMBOL,symbol,func,func); + *fposp = fpos; + return(fpos); + } else return(-1); +} + void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint32_t KMDtimestamp,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout) { static FILE *fp; static int32_t errs,didinit; diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 225d1a927..f7ad35e6a 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1351,11 +1351,59 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 return(typestr); } +void *OS_loadfile(char *fname,char **bufp,long *lenp,long *allocsizep) +{ + FILE *fp; + long filesize,buflen = *allocsizep; + char *buf = *bufp; + *lenp = 0; + if ( (fp= fopen(fname,"rb")) != 0 ) + { + fseek(fp,0,SEEK_END); + filesize = ftell(fp); + if ( filesize == 0 ) + { + fclose(fp); + *lenp = 0; + printf("OS_loadfile null size.(%s)\n",fname); + return(0); + } + if ( filesize > buflen-1 ) + { + *allocsizep = filesize+1; + *bufp = buf = realloc(buf,(long)*allocsizep); + } + rewind(fp); + if ( buf == 0 ) + printf("Null buf ???\n"); + else + { + if ( fread(buf,1,(long)filesize,fp) != (unsigned long)filesize ) + printf("error reading filesize.%ld\n",(long)filesize); + buf[filesize] = 0; + } + fclose(fp); + *lenp = filesize; + //printf("loaded.(%s)\n",buf); + } //else printf("OS_loadfile couldnt load.(%s)\n",fname); + return(buf); +} + +uint8_t *OS_fileptr(long *allocsizep,char *fname) +{ + long filesize = 0; char *buf = 0; void *retptr; + *allocsizep = 0; + retptr = OS_loadfile(fname,&buf,&filesize,allocsizep); + return(retptr); +} + +long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long fpos,long datalen,char *symbol,char *dest); + void komodo_passport_iteration() { static long lastpos[34]; static char userpass[33][1024]; static uint32_t lasttime,callcounter; int32_t maxseconds = 10; - FILE *fp; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0; + FILE *fp; uint8_t *filedata; long fpos,datalen; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0; //printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); expired = 0; while ( KOMODO_INITDONE == 0 ) @@ -1411,7 +1459,17 @@ void komodo_passport_iteration() komodo_nameset(symbol,dest,base); sp = komodo_stateptrget(symbol); n = 0; - if ( (fp= fopen(fname,"rb")) != 0 && sp != 0 ) + if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) + { + fpos = 0; + while ( komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest) >= 0 ) + ; + printf("took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); + lastpos[baseid] = fpos; + free(filedata), filedata = 0; + datalen = 0; + } + else if ( (fp= fopen(fname,"rb")) != 0 && sp != 0 ) { fseek(fp,0,SEEK_END); if ( ftell(fp) > lastpos[baseid] ) From e9c761589b93f2c69c2891db0312e6396fbc62cd Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 04:53:04 +0200 Subject: [PATCH 04/58] Test --- src/komodo_gateway.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index f7ad35e6a..2472f6770 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1351,11 +1351,11 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 return(typestr); } -void *OS_loadfile(char *fname,char **bufp,long *lenp,long *allocsizep) +void *OS_loadfile(char *fname,uint8_t **bufp,long *lenp,long *allocsizep) { FILE *fp; long filesize,buflen = *allocsizep; - char *buf = *bufp; + uint8_t *buf = *bufp; *lenp = 0; if ( (fp= fopen(fname,"rb")) != 0 ) { @@ -1371,7 +1371,7 @@ void *OS_loadfile(char *fname,char **bufp,long *lenp,long *allocsizep) if ( filesize > buflen-1 ) { *allocsizep = filesize+1; - *bufp = buf = realloc(buf,(long)*allocsizep); + *bufp = buf = (uint8_t *)realloc(buf,(long)*allocsizep); } rewind(fp); if ( buf == 0 ) @@ -1391,10 +1391,10 @@ void *OS_loadfile(char *fname,char **bufp,long *lenp,long *allocsizep) uint8_t *OS_fileptr(long *allocsizep,char *fname) { - long filesize = 0; char *buf = 0; void *retptr; + long filesize = 0; uint8_t *buf = 0; void *retptr; *allocsizep = 0; retptr = OS_loadfile(fname,&buf,&filesize,allocsizep); - return(retptr); + return((uint8_t *)retptr); } long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long fpos,long datalen,char *symbol,char *dest); From b356016e7782f3495e27a586e4ffdb9a4ae91ef5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 04:53:37 +0200 Subject: [PATCH 05/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 2472f6770..ae15e1019 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1397,7 +1397,7 @@ uint8_t *OS_fileptr(long *allocsizep,char *fname) return((uint8_t *)retptr); } -long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long fpos,long datalen,char *symbol,char *dest); +long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest); void komodo_passport_iteration() { From f7ec3a985a0e9ab22018476392d5218dd049fcd3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:04:26 +0200 Subject: [PATCH 06/58] Test --- src/komodo.h | 2 +- src/komodo_gateway.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index d555dd941..1bcc477ac 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -238,7 +238,7 @@ long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *f errs++; if ( memread(¬arized_desttxid,sizeof(notarized_desttxid),filedata,&fpos,datalen) != sizeof(notarized_desttxid) ) errs++; - //if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 && sp != 0 ) + if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 && sp != 0 ) printf("%s load[%s.%d -> %s] NOTARIZED %d %s\n",ASSETCHAINS_SYMBOL,symbol,sp->NUM_NPOINTS,dest,notarized_height,notarized_hash.ToString().c_str()); //if ( matched != 0 ) global independent states -> inside *sp komodo_eventadd_notarized(sp,symbol,ht,dest,notarized_hash,notarized_desttxid,notarized_height); diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ae15e1019..ca00f1531 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1452,7 +1452,7 @@ void komodo_passport_iteration() base = (char *)CURRENCIES[baseid]; if ( baseid+1 != refid ) { - if ( baseid == 32 || ASSETCHAINS_SYMBOL[0] == 0 ) + if ( baseid == 32 || strcmp(ASSETCHAINS_SYMBOL,base) == 0 ) { refsp->RTmask &= ~(1LL << baseid); komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"komodostate"); @@ -1462,6 +1462,7 @@ void komodo_passport_iteration() if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) { fpos = 0; + printf("processing %s %ldKB\n",fname,datalen/1024); while ( komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest) >= 0 ) ; printf("took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); @@ -1472,6 +1473,7 @@ void komodo_passport_iteration() else if ( (fp= fopen(fname,"rb")) != 0 && sp != 0 ) { fseek(fp,0,SEEK_END); + printf("couldnt OS_fileptr(%s), freading %ldKB\n",fname,ftell(fp)/1024) if ( ftell(fp) > lastpos[baseid] ) { if ( ASSETCHAINS_SYMBOL[0] != 0 ) From 5b32c90080cfa03e1ded7224a002a032b2d71835 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:05:55 +0200 Subject: [PATCH 07/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ca00f1531..2495bd9b6 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1473,7 +1473,7 @@ void komodo_passport_iteration() else if ( (fp= fopen(fname,"rb")) != 0 && sp != 0 ) { fseek(fp,0,SEEK_END); - printf("couldnt OS_fileptr(%s), freading %ldKB\n",fname,ftell(fp)/1024) + printf("couldnt OS_fileptr(%s), freading %ldKB\n",fname,ftell(fp)/1024); if ( ftell(fp) > lastpos[baseid] ) { if ( ASSETCHAINS_SYMBOL[0] != 0 ) From 13b0e935d8a5a4b55de7d975af27147ddedce7b5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:14:59 +0200 Subject: [PATCH 08/58] Test --- src/komodo_gateway.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 2495bd9b6..dc427eaff 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1442,7 +1442,6 @@ void komodo_passport_iteration() return; } lasttime = starttime; - //printf("PASSPORT %s refid.%d\n",ASSETCHAINS_SYMBOL,refid); for (baseid=32; baseid>=0; baseid--) { if ( time(NULL) >= starttime+maxseconds ) @@ -1450,6 +1449,7 @@ void komodo_passport_iteration() sp = 0; isrealtime = 0; base = (char *)CURRENCIES[baseid]; + printf("PASSPORT %s baseid+1 %d refid.%d\n",ASSETCHAINS_SYMBOL,baseid+1,refid); if ( baseid+1 != refid ) { if ( baseid == 32 || strcmp(ASSETCHAINS_SYMBOL,base) == 0 ) @@ -1462,10 +1462,10 @@ void komodo_passport_iteration() if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) { fpos = 0; - printf("processing %s %ldKB\n",fname,datalen/1024); + fprintf(stderr,"processing %s %ldKB\n",fname,datalen/1024); while ( komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest) >= 0 ) ; - printf("took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); + fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); lastpos[baseid] = fpos; free(filedata), filedata = 0; datalen = 0; @@ -1473,7 +1473,7 @@ void komodo_passport_iteration() else if ( (fp= fopen(fname,"rb")) != 0 && sp != 0 ) { fseek(fp,0,SEEK_END); - printf("couldnt OS_fileptr(%s), freading %ldKB\n",fname,ftell(fp)/1024); + fprintf(stderr,"couldnt OS_fileptr(%s), freading %ldKB\n",fname,ftell(fp)/1024); if ( ftell(fp) > lastpos[baseid] ) { if ( ASSETCHAINS_SYMBOL[0] != 0 ) @@ -1498,7 +1498,7 @@ void komodo_passport_iteration() printf("from.(%s) lastpos[%s] %ld isrt.%d\n",ASSETCHAINS_SYMBOL,CURRENCIES[baseid],lastpos[baseid],komodo_isrealtime(&ht)); } //else fprintf(stderr,"%s.%ld ",CURRENCIES[baseid],ftell(fp)); fclose(fp); - } //else printf("error.(%s) %p\n",fname,sp); + } else fprintf(stderr,"load error.(%s) %p\n",fname,sp); komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"realtime"); if ( (fp= fopen(fname,"rb")) != 0 ) { From 08775bc1faacce1aa0a5c7b44041fa17482b90f3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:20:45 +0200 Subject: [PATCH 09/58] Test --- src/komodo.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 1bcc477ac..bb4735f49 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -345,10 +345,23 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); if ( (fp= fopen(fname,"rb+")) != 0 ) { - while ( komodo_parsestatefile(sp,fp,symbol,dest) >= 0 ) - ; + uint8_t *filedata; long datalen,fpos; + if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) + { + fpos = 0; + fprintf(stderr,"processing %s %ldKB\n",fname,datalen/1024); + while ( komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest) >= 0 ) + ; + fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); + free(filedata); + fseek(fp,fpos,SEEK_SET); + } + else + { + while ( komodo_parsestatefile(sp,fp,symbol,dest) >= 0 ) + ; + } } else fp = fopen(fname,"wb+"); - printf("fname.(%s) fpos.%ld\n",fname,ftell(fp)); KOMODO_INITDONE = (uint32_t)time(NULL); } if ( height <= 0 ) From 0cd5ab88aa74f32bb0f092c375e151519763ca3f Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:25:59 +0200 Subject: [PATCH 10/58] Test --- src/komodo_gateway.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index dc427eaff..5d7716259 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1449,23 +1449,23 @@ void komodo_passport_iteration() sp = 0; isrealtime = 0; base = (char *)CURRENCIES[baseid]; - printf("PASSPORT %s baseid+1 %d refid.%d\n",ASSETCHAINS_SYMBOL,baseid+1,refid); - if ( baseid+1 != refid ) + //printf("PASSPORT %s baseid+1 %d refid.%d\n",ASSETCHAINS_SYMBOL,baseid+1,refid); + if ( baseid+1 != refid ) // only need to import state from a different coin { - if ( baseid == 32 || strcmp(ASSETCHAINS_SYMBOL,base) == 0 ) + if ( baseid == 32 ) // only care about KMD's state { refsp->RTmask &= ~(1LL << baseid); komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"komodostate"); komodo_nameset(symbol,dest,base); sp = komodo_stateptrget(symbol); n = 0; - if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) + if ( lastpos[baseid] == 0 && (filedata= OS_fileptr(&datalen,fname)) != 0 ) { fpos = 0; - fprintf(stderr,"processing %s %ldKB\n",fname,datalen/1024); + fprintf(stderr,"%s processing %s %ldKB\n",ASSETCHAINS_SYMBOL,fname,datalen/1024); while ( komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest) >= 0 ) ; - fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); + fprintf(stderr,"%s took %d seconds to process %s %ldKB\n",ASSETCHAINS_SYMBOL,(int32_t)(time(NULL)-starttime),fname,datalen/1024); lastpos[baseid] = fpos; free(filedata), filedata = 0; datalen = 0; @@ -1494,7 +1494,7 @@ void komodo_passport_iteration() n++; } lastpos[baseid] = ftell(fp); - if ( lastpos[baseid] == 0 && strcmp(symbol,"KMD") == 0 ) + if ( 0 && lastpos[baseid] == 0 && strcmp(symbol,"KMD") == 0 ) printf("from.(%s) lastpos[%s] %ld isrt.%d\n",ASSETCHAINS_SYMBOL,CURRENCIES[baseid],lastpos[baseid],komodo_isrealtime(&ht)); } //else fprintf(stderr,"%s.%ld ",CURRENCIES[baseid],ftell(fp)); fclose(fp); From 9ddeeba22691915fb0377aab10e45131dcc47e57 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:27:08 +0200 Subject: [PATCH 11/58] Test --- src/komodo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index bb4735f49..dd5ffa869 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -345,7 +345,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); if ( (fp= fopen(fname,"rb+")) != 0 ) { - uint8_t *filedata; long datalen,fpos; + uint8_t *filedata; long datalen,fpos; uint32_t starttime = (uint32_t)time(NULL); if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) { fpos = 0; From 58f293eb9882106258b8b970257bd913b26204c1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:36:09 +0200 Subject: [PATCH 12/58] Test --- src/komodo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index dd5ffa869..9e332a34f 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -354,7 +354,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar ; fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); free(filedata); - fseek(fp,fpos,SEEK_SET); + fseek(fp,0,SEEK_END); } else { From cb7f1d47c1fba2409997ed305f4aaa0b2d5726a1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:39:44 +0200 Subject: [PATCH 13/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 5d7716259..3ecf453c5 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1370,7 +1370,7 @@ void *OS_loadfile(char *fname,uint8_t **bufp,long *lenp,long *allocsizep) } if ( filesize > buflen-1 ) { - *allocsizep = filesize+1; + *allocsizep = filesize; *bufp = buf = (uint8_t *)realloc(buf,(long)*allocsizep); } rewind(fp); From 211f7541264e2bb6c87ae8a719eccd18df6940ac Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Nov 2017 05:48:50 +0200 Subject: [PATCH 14/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 3ecf453c5..441544d0b 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1473,7 +1473,7 @@ void komodo_passport_iteration() else if ( (fp= fopen(fname,"rb")) != 0 && sp != 0 ) { fseek(fp,0,SEEK_END); - fprintf(stderr,"couldnt OS_fileptr(%s), freading %ldKB\n",fname,ftell(fp)/1024); + //fprintf(stderr,"couldnt OS_fileptr(%s), freading %ldKB\n",fname,ftell(fp)/1024); if ( ftell(fp) > lastpos[baseid] ) { if ( ASSETCHAINS_SYMBOL[0] != 0 ) From 3b40d63139bba4890e927369b5b1c8fce812b913 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:06:10 +0200 Subject: [PATCH 15/58] komodostate.ind --- src/komodo.h | 20 +++---- src/komodo_gateway.h | 122 ++++++++++++++++++++++++++++++++++++++++++- src/purge | 5 ++ 3 files changed, 132 insertions(+), 15 deletions(-) create mode 100755 src/purge diff --git a/src/komodo.h b/src/komodo.h index 9e332a34f..f057e1e86 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -204,10 +204,10 @@ int32_t memread(void *dest,int32_t size,uint8_t *filedata,long *fposp,long datal return(-1); } -long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest) +int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest) { static int32_t errs; - int32_t func,ht,notarized_height,num,matched=0; uint256 notarized_hash,notarized_desttxid; uint8_t pubkeys[64][33]; long fpos = *fposp; + int32_t func= -1,ht,notarized_height,num,matched=0; uint256 notarized_hash,notarized_desttxid; uint8_t pubkeys[64][33]; long fpos = *fposp; if ( fpos < datalen ) { func = filedata[fpos++]; @@ -320,8 +320,9 @@ long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *f } else printf("[%s] %s illegal func.(%d %c)\n",ASSETCHAINS_SYMBOL,symbol,func,func); *fposp = fpos; - return(fpos); - } else return(-1); + return(func); + } + return(-1); } void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint32_t KMDtimestamp,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout) @@ -345,17 +346,8 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); if ( (fp= fopen(fname,"rb+")) != 0 ) { - uint8_t *filedata; long datalen,fpos; uint32_t starttime = (uint32_t)time(NULL); - if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) - { - fpos = 0; - fprintf(stderr,"processing %s %ldKB\n",fname,datalen/1024); - while ( komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest) >= 0 ) - ; - fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); - free(filedata); + if ( komodo_faststateinit(sp,fname) == 0 ) fseek(fp,0,SEEK_END); - } else { while ( komodo_parsestatefile(sp,fp,symbol,dest) >= 0 ) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 441544d0b..ffb07918e 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1351,6 +1351,13 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 return(typestr); } +void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_t *filedata,long datalen,char *symbol,char *dest) +{ + uint8_t func; long fpos; + komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest); + // scan backwards to set all the sp-> fields to the current valid value +} + void *OS_loadfile(char *fname,uint8_t **bufp,long *lenp,long *allocsizep) { FILE *fp; @@ -1397,7 +1404,120 @@ uint8_t *OS_fileptr(long *allocsizep,char *fname) return((uint8_t *)retptr); } -long komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest); +int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest); + +long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *filedata,long datalen,uint32_t *prevpos100p,uint32_t *indcounterp,char *symbol,char *dest) +{ + FILE *fp; long fsize,fpos=-1; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; + *indcounterp = *prevpos100p = 0; + if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) + { + if ( (fsize % sizeof(uint32_t)) == 0 ) + { + n = (int32_t)(fsize / sizeof(uint32_t)); + for (i=0; i> 8); + fpos = prevpos100 + offset; + if ( fpos >= datalen || filedata[fpos] != func ) + { + printf("validate.%d error (%u %d) prev100 %u -> fpos.%ld datalen.%ld [%d]\n",i,offset,func,prevpos100,fpos,datalen,fpos < datalen ? filedata[fpos] : -1); + return(-1); + } + } + } + *indcounterp = n; + *prevpos100p = prevpos100; + printf("%s validated[%d] fpos.%ld datalen.%ld\n",indfname,i,fpos,datalen); + if ( sp != 0 ) + komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); + free(inds); + return(fpos); + } else printf("wrong filesize %s %ld\n",indfname,fsize); + } + free(inds); + return(-1); +} + +long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long newfpos,uint8_t func,uint32_t *indcounterp) +{ + uint32_t tmp; + if ( indfp != 0 ) + { + tmp = ((uint32_t)(lastfpos - *prevpos100p) << 8) | (func & 0xff); + if ( ftell(indfp)/sizeof(uint32_t) != *indcounterp ) + printf("indfp fpos %ld -> ind.%d vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); + fwrite(&tmp,1,sizeof(tmp),indfp), (*indcounterp)++; + if ( (*indcounterp % 100) == 0 ) + { + *prevpos100p = (uint32_t)newfpos; + fwrite(prevpos100p,1,sizeof(*prevpos100p),indfp), (*indcounterp)++; + } + } + return(newfpos); +} + +int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,char *dest) +{ + FILE *indfp; char indfname[1024]; uint8_t *filedata; long processed=-1,datalen,fpos,lastfpos; uint32_t tmp,prevpos100,indcounter,starttime; int32_t func,finished = 0; + stattime = (uint32_t)time(NULL); + safecopy(indfname,fname,sizeof(indfname)-4); + strcat(indfname,".ind"); + if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) + { + if ( datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (processed= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter)) < 0 ) + { + lastfpos = fpos = 0; + indcounter = prevpos100 = 0; + if ( (indfp= fopen(indfname,"wb")) != 0 ) + fwrite(&prevpos100,1,sizeof(prevpos100),indfp), indcounter++; + fprintf(stderr,"processing %s %ldKB\n",fname,datalen/1024); + while ( (func= komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest)) >= 0 ) + { + lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); + } + if ( indfp != 0 ) + { + fclose(indfp); + if ( komodo_stateind_validate(0,indfname,filedata,datalen,symbol,dest) < 0 ) + printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); + else printf("%s validated\n",indfname); + } + finished = 1; + fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); + } + else if ( processed > 0 ) + { + if ( (indfp= fopen(indfname,"rb+")) != 0 ) + { + lastfpos = fpos = processed; + fseek(indfp,indcounter * sizeof(uint32_t),SEEK_SET); + if ( ftell(indfp) == indcounter * sizeof(uint32_t) ) + { + while ( (func= komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest)) >= 0 ) + lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); + } + fclose(indfp); + if ( komodo_stateind_validate(sp,indfname,filedata,datalen,system,dest) < 0 ) + printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); + else + { + printf("%s validated updated from processed.%ld to %ld [%ld]\n",indfname,processed,fpos,fpos-processed); + finished = 1; + } + } + } else printf("komodo_faststateinit unexpected case\n"); + free(filedata); + return(finished == 1); + } + return(-1); +} void komodo_passport_iteration() { diff --git a/src/purge b/src/purge new file mode 100755 index 000000000..08928e922 --- /dev/null +++ b/src/purge @@ -0,0 +1,5 @@ +rm -rf ~/.komodo/$1/chainstate +rm -rf ~/.komodo/$1/database +rm -rf ~/.komodo/$1/blocks +rm -rf ~/.komodo/$1/komodostate + From 52129d3054a7b919d08f4e0156a9aee7a94c2179 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:07:13 +0200 Subject: [PATCH 16/58] Test --- src/komodo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index f057e1e86..e49eb7452 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -346,7 +346,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); if ( (fp= fopen(fname,"rb+")) != 0 ) { - if ( komodo_faststateinit(sp,fname) == 0 ) + if ( komodo_faststateinit(sp,fname,symbol,dest) == 0 ) fseek(fp,0,SEEK_END); else { From 3d40ead2a476510b216f21ea12d9acd227d868cd Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:08:52 +0200 Subject: [PATCH 17/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ffb07918e..3ebf22bc4 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1471,7 +1471,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch strcat(indfname,".ind"); if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) { - if ( datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (processed= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter)) < 0 ) + if ( datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (processed= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest)) < 0 ) { lastfpos = fpos = 0; indcounter = prevpos100 = 0; From af786d5de8702d100a5b71bb8ebfcc4d79c8a3a9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:10:29 +0200 Subject: [PATCH 18/58] Test --- src/komodo_gateway.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 3ebf22bc4..ec006c9ee 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1351,10 +1351,12 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 return(typestr); } +int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest); + void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_t *filedata,long datalen,char *symbol,char *dest) { uint8_t func; long fpos; - komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest); + //komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest); // scan backwards to set all the sp-> fields to the current valid value } @@ -1404,8 +1406,6 @@ uint8_t *OS_fileptr(long *allocsizep,char *fname) return((uint8_t *)retptr); } -int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long *fposp,long datalen,char *symbol,char *dest); - long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *filedata,long datalen,uint32_t *prevpos100p,uint32_t *indcounterp,char *symbol,char *dest) { FILE *fp; long fsize,fpos=-1; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; @@ -1466,7 +1466,7 @@ long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,char *dest) { FILE *indfp; char indfname[1024]; uint8_t *filedata; long processed=-1,datalen,fpos,lastfpos; uint32_t tmp,prevpos100,indcounter,starttime; int32_t func,finished = 0; - stattime = (uint32_t)time(NULL); + starttime = (uint32_t)time(NULL); safecopy(indfname,fname,sizeof(indfname)-4); strcat(indfname,".ind"); if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) From b8359369fba6746e389aaeb415ac96e4c9532614 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:12:10 +0200 Subject: [PATCH 19/58] Test --- src/komodo_gateway.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ec006c9ee..7dae417b5 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1452,7 +1452,7 @@ long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long { tmp = ((uint32_t)(lastfpos - *prevpos100p) << 8) | (func & 0xff); if ( ftell(indfp)/sizeof(uint32_t) != *indcounterp ) - printf("indfp fpos %ld -> ind.%d vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); + printf("indfp fpos %ld -> ind.%ld vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); fwrite(&tmp,1,sizeof(tmp),indfp), (*indcounterp)++; if ( (*indcounterp % 100) == 0 ) { @@ -1485,7 +1485,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch if ( indfp != 0 ) { fclose(indfp); - if ( komodo_stateind_validate(0,indfname,filedata,datalen,symbol,dest) < 0 ) + if ( komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else printf("%s validated\n",indfname); } @@ -1504,7 +1504,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); } fclose(indfp); - if ( komodo_stateind_validate(sp,indfname,filedata,datalen,system,dest) < 0 ) + if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcountersystem,dest) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else { From 79a6f2aee26b7681d0fa49132a31c76d8144b325 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:13:18 +0200 Subject: [PATCH 20/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 7dae417b5..a7228f2aa 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1504,7 +1504,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); } fclose(indfp); - if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcountersystem,dest) < 0 ) + if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcounter,system,dest) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else { From 4c87a8df446b54ab703b4340c638ebff99ef08cb Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:16:19 +0200 Subject: [PATCH 21/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a7228f2aa..c0b3a5845 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1504,7 +1504,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); } fclose(indfp); - if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcounter,system,dest) < 0 ) + if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else { From 6cc0f9de1289468903d2e61219ed0aa5598f3928 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:21:05 +0200 Subject: [PATCH 22/58] Test --- src/komodo_gateway.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index c0b3a5845..b82f96714 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1442,6 +1442,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi } else printf("wrong filesize %s %ld\n",indfname,fsize); } free(inds); + fprintf(stderr,"indvalidate return -1\n"); return(-1); } @@ -1471,6 +1472,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch strcat(indfname,".ind"); if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) { + fprintf(stderr,"faststateinit %s datalen.%ld\n",indfname,datalen); if ( datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (processed= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest)) < 0 ) { lastfpos = fpos = 0; @@ -1516,6 +1518,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch free(filedata); return(finished == 1); } + fprintf(stderr,"faststateinit return -1\n"); return(-1); } From 1ff645e6f5e33dc2750595b2e9fc5512fbf44fbd Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:29:26 +0200 Subject: [PATCH 23/58] Test --- src/komodo_gateway.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index b82f96714..e93d0836c 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1466,20 +1466,19 @@ long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,char *dest) { - FILE *indfp; char indfname[1024]; uint8_t *filedata; long processed=-1,datalen,fpos,lastfpos; uint32_t tmp,prevpos100,indcounter,starttime; int32_t func,finished = 0; + FILE *indfp; char indfname[1024]; uint8_t *filedata; long validated=-1,datalen,fpos,lastfpos; uint32_t tmp,prevpos100,indcounter,starttime; int32_t func,finished = 0; starttime = (uint32_t)time(NULL); safecopy(indfname,fname,sizeof(indfname)-4); strcat(indfname,".ind"); if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) { - fprintf(stderr,"faststateinit %s datalen.%ld\n",indfname,datalen); - if ( datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (processed= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest)) < 0 ) + if ( datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (validated= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest)) < 0 ) { lastfpos = fpos = 0; indcounter = prevpos100 = 0; if ( (indfp= fopen(indfname,"wb")) != 0 ) fwrite(&prevpos100,1,sizeof(prevpos100),indfp), indcounter++; - fprintf(stderr,"processing %s %ldKB\n",fname,datalen/1024); + fprintf(stderr,"processing %s %ldKB, validated.%ld\n",fname,datalen/1024,validated); while ( (func= komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest)) >= 0 ) { lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); @@ -1494,11 +1493,12 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch finished = 1; fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); } - else if ( processed > 0 ) + else if ( validated > 0 ) { if ( (indfp= fopen(indfname,"rb+")) != 0 ) { - lastfpos = fpos = processed; + lastfpos = fpos = validated; + fprintf(stderr,"validated %ld -> %ld vs indcounter %u, prevpos100 %u offset.%ld\n",validated,validated/sizeof(uint32_t),indcounter,prevpos100,indcounter * sizeof(uint32_t)); fseek(indfp,indcounter * sizeof(uint32_t),SEEK_SET); if ( ftell(indfp) == indcounter * sizeof(uint32_t) ) { @@ -1510,7 +1510,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else { - printf("%s validated updated from processed.%ld to %ld [%ld]\n",indfname,processed,fpos,fpos-processed); + printf("%s validated updated from validated.%ld to %ld [%ld]\n",indfname,validated,fpos,fpos-validated); finished = 1; } } @@ -1518,7 +1518,6 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch free(filedata); return(finished == 1); } - fprintf(stderr,"faststateinit return -1\n"); return(-1); } From e75dc69d019f79fafbd60a787e020650a3363ae5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:37:14 +0200 Subject: [PATCH 24/58] Test --- src/komodo_gateway.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index e93d0836c..673f37a7c 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -274,7 +274,7 @@ int32_t komodo_paxcmp(char *symbol,int32_t kmdheight,uint64_t value,uint64_t che return(0); else { - if ( kmdheight >= 238000 ) + if ( ASSETCHAINS_SYMBOL[0] != 0 ) printf("ht.%d ignore mismatched %s value %lld vs checkvalue %lld -> ratio.%d\n",kmdheight,symbol,(long long)value,(long long)checkvalue,ratio); return(-1); } @@ -1418,6 +1418,8 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi for (i=0; i n-10 ) + printf("%d: tmp.%08x prevpos100.%u\n",i,tmp,prevpos100); if ( (i % 100) == 0 ) prevpos100 = tmp; else @@ -1498,7 +1500,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch if ( (indfp= fopen(indfname,"rb+")) != 0 ) { lastfpos = fpos = validated; - fprintf(stderr,"validated %ld -> %ld vs indcounter %u, prevpos100 %u offset.%ld\n",validated,validated/sizeof(uint32_t),indcounter,prevpos100,indcounter * sizeof(uint32_t)); + fprintf(stderr,"validated %ld -> indcounter %u, prevpos100 %u offset.%ld\n",validated,indcounter,prevpos100,indcounter * sizeof(uint32_t)); fseek(indfp,indcounter * sizeof(uint32_t),SEEK_SET); if ( ftell(indfp) == indcounter * sizeof(uint32_t) ) { @@ -1510,7 +1512,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else { - printf("%s validated updated from validated.%ld to %ld [%ld]\n",indfname,validated,fpos,fpos-validated); + printf("%s validated updated from validated.%ld to %ld new.[%ld] -> indcounter %u, prevpos100 %u offset.%ld\n",indfname,validated,fpos,fpos-validated,indcounter,prevpos100,indcounter * sizeof(uint32_t)); finished = 1; } } From 8c18d226b342b9d5fba6ffd7a6fe1a556e148132 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:39:07 +0200 Subject: [PATCH 25/58] Test --- src/komodo.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index e49eb7452..77f7dc04b 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -328,7 +328,7 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint32_t KMDtimestamp,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout) { static FILE *fp; static int32_t errs,didinit; - struct komodo_state *sp; char fname[512],symbol[16],dest[16]; int32_t ht,func; uint8_t num,pubkeys[64][33]; + struct komodo_state *sp; char fname[512],symbol[16],dest[16]; int32_t retval,ht,func; uint8_t num,pubkeys[64][33]; if ( didinit == 0 ) { portable_mutex_init(&KOMODO_KV_mutex); @@ -346,10 +346,11 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); if ( (fp= fopen(fname,"rb+")) != 0 ) { - if ( komodo_faststateinit(sp,fname,symbol,dest) == 0 ) + if ( (retval= komodo_faststateinit(sp,fname,symbol,dest)) == 0 ) fseek(fp,0,SEEK_END); else { + fprintf(stderr,"komodo_faststateinit retval.%d\n",retval);) while ( komodo_parsestatefile(sp,fp,symbol,dest) >= 0 ) ; } From a3a7ec859293365158a4b7fe035ce4fd9375ce76 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:40:11 +0200 Subject: [PATCH 26/58] Test --- src/komodo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo.h b/src/komodo.h index 77f7dc04b..f3d21d634 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -350,7 +350,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar fseek(fp,0,SEEK_END); else { - fprintf(stderr,"komodo_faststateinit retval.%d\n",retval);) + fprintf(stderr,"komodo_faststateinit retval.%d\n",retval); while ( komodo_parsestatefile(sp,fp,symbol,dest) >= 0 ) ; } From f7f9608782eacfd9d803e220edd81bf352fd94de Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 12:48:02 +0200 Subject: [PATCH 27/58] Test --- src/komodo.h | 2 +- src/komodo_gateway.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index f3d21d634..02253950e 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -346,7 +346,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"komodostate"); if ( (fp= fopen(fname,"rb+")) != 0 ) { - if ( (retval= komodo_faststateinit(sp,fname,symbol,dest)) == 0 ) + if ( (retval= komodo_faststateinit(sp,fname,symbol,dest)) > 0 ) fseek(fp,0,SEEK_END); else { diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 673f37a7c..e4d368a34 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1412,6 +1412,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi *indcounterp = *prevpos100p = 0; if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) { + fprintf(stderr,"validate %s fsize.%ld datalen.%ld n.%ld\n",indfname,fsize,datalen,fsize / sizeof(uint32_t)); if ( (fsize % sizeof(uint32_t)) == 0 ) { n = (int32_t)(fsize / sizeof(uint32_t)); @@ -1419,7 +1420,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi { memcpy(&tmp,&inds[i * sizeof(uint32_t)],sizeof(uint32_t)); if ( i > n-10 ) - printf("%d: tmp.%08x prevpos100.%u\n",i,tmp,prevpos100); + printf("%d: tmp.%08x [%c] prevpos100.%u\n",i,tmp,tmp&0xff,prevpos100); if ( (i % 100) == 0 ) prevpos100 = tmp; else From 1f14a5164a418d6752922d749b80bfd5a35e744a Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 13:00:24 +0200 Subject: [PATCH 28/58] Test --- src/komodo_gateway.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index e4d368a34..abba20564 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1457,7 +1457,8 @@ long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long tmp = ((uint32_t)(lastfpos - *prevpos100p) << 8) | (func & 0xff); if ( ftell(indfp)/sizeof(uint32_t) != *indcounterp ) printf("indfp fpos %ld -> ind.%ld vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); - fwrite(&tmp,1,sizeof(tmp),indfp), (*indcounterp)++; + fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); + fwrite(&tmp,1,sizeof(tmp),indfp), (*indcounterp)++; if ( (*indcounterp % 100) == 0 ) { *prevpos100p = (uint32_t)newfpos; @@ -1506,7 +1507,11 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch if ( ftell(indfp) == indcounter * sizeof(uint32_t) ) { while ( (func= komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest)) >= 0 ) + { lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); + if ( lastfpos != fpos ) + fprintf(stderr,"unexpected lastfpos.%ld != %ld\n",lastfpos,fpos); + } } fclose(indfp); if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest) < 0 ) @@ -1528,7 +1533,7 @@ void komodo_passport_iteration() { static long lastpos[34]; static char userpass[33][1024]; static uint32_t lasttime,callcounter; int32_t maxseconds = 10; - FILE *fp; uint8_t *filedata; long fpos,datalen; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0; + FILE *fp; uint8_t *filedata; long fpos,datalen,lastfpos; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0; //printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); expired = 0; while ( KOMODO_INITDONE == 0 ) @@ -1589,9 +1594,9 @@ void komodo_passport_iteration() fpos = 0; fprintf(stderr,"%s processing %s %ldKB\n",ASSETCHAINS_SYMBOL,fname,datalen/1024); while ( komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest) >= 0 ) - ; + lastfpos = fpos; fprintf(stderr,"%s took %d seconds to process %s %ldKB\n",ASSETCHAINS_SYMBOL,(int32_t)(time(NULL)-starttime),fname,datalen/1024); - lastpos[baseid] = fpos; + lastpos[baseid] = lastfpos; free(filedata), filedata = 0; datalen = 0; } From 01c8221f8dcfee9bd3e5d7a5edc114f635f9c636 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 13:21:35 +0200 Subject: [PATCH 29/58] Test --- src/komodo_gateway.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index abba20564..78b9c0908 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1441,7 +1441,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi if ( sp != 0 ) komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); free(inds); - return(fpos); + return(datalen); } else printf("wrong filesize %s %ld\n",indfname,fsize); } free(inds); @@ -1490,9 +1490,9 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch if ( indfp != 0 ) { fclose(indfp); - if ( komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest) < 0 ) + if ( (fpos= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest)) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); - else printf("%s validated\n",indfname); + else printf("%s validated fpos.%ld\n",indfname,fpos); } finished = 1; fprintf(stderr,"took %d seconds to process %s %ldKB\n",(int32_t)(time(NULL)-starttime),fname,datalen/1024); From 052562c1a2e1875b2a742c54370a04cd6d698eb5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 13:27:22 +0200 Subject: [PATCH 30/58] Test --- src/komodo_gateway.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 78b9c0908..57b3a0163 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1534,7 +1534,7 @@ void komodo_passport_iteration() static long lastpos[34]; static char userpass[33][1024]; static uint32_t lasttime,callcounter; int32_t maxseconds = 10; FILE *fp; uint8_t *filedata; long fpos,datalen,lastfpos; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0; - //printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); + printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); expired = 0; while ( KOMODO_INITDONE == 0 ) { @@ -1566,11 +1566,6 @@ void komodo_passport_iteration() starttime = (uint32_t)time(NULL); if ( callcounter++ < 1 ) limit = 10000; - if ( 0 && starttime == lasttime ) - { - usleep(1000); - return; - } lasttime = starttime; for (baseid=32; baseid>=0; baseid--) { From 5b5c0bf3eb3d03d28174c2f4879eacdca78f36e0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 13:51:17 +0200 Subject: [PATCH 31/58] test --- src/komodo_gateway.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 57b3a0163..9d29a2441 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1408,10 +1408,11 @@ uint8_t *OS_fileptr(long *allocsizep,char *fname) long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *filedata,long datalen,uint32_t *prevpos100p,uint32_t *indcounterp,char *symbol,char *dest) { - FILE *fp; long fsize,fpos=-1; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; + FILE *fp; long fsize,lastfpos,fpos=-1; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; *indcounterp = *prevpos100p = 0; if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) { + lastfpos = 0; fprintf(stderr,"validate %s fsize.%ld datalen.%ld n.%ld\n",indfname,fsize,datalen,fsize / sizeof(uint32_t)); if ( (fsize % sizeof(uint32_t)) == 0 ) { @@ -1428,12 +1429,13 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi func = (tmp & 0xff); offset = (tmp >> 8); fpos = prevpos100 + offset; - if ( fpos >= datalen || filedata[fpos] != func ) + if ( fpos >= datalen || filedata[lastfpos] != func ) { printf("validate.%d error (%u %d) prev100 %u -> fpos.%ld datalen.%ld [%d]\n",i,offset,func,prevpos100,fpos,datalen,fpos < datalen ? filedata[fpos] : -1); return(-1); } } + lastfpos = fpos; } *indcounterp = n; *prevpos100p = prevpos100; @@ -1441,7 +1443,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi if ( sp != 0 ) komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); free(inds); - return(datalen); + return(fpos); } else printf("wrong filesize %s %ld\n",indfname,fsize); } free(inds); @@ -1454,7 +1456,7 @@ long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long uint32_t tmp; if ( indfp != 0 ) { - tmp = ((uint32_t)(lastfpos - *prevpos100p) << 8) | (func & 0xff); + tmp = ((uint32_t)(newfpos - *prevpos100p) << 8) | (func & 0xff); if ( ftell(indfp)/sizeof(uint32_t) != *indcounterp ) printf("indfp fpos %ld -> ind.%ld vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); @@ -1534,7 +1536,6 @@ void komodo_passport_iteration() static long lastpos[34]; static char userpass[33][1024]; static uint32_t lasttime,callcounter; int32_t maxseconds = 10; FILE *fp; uint8_t *filedata; long fpos,datalen,lastfpos; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0; - printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); expired = 0; while ( KOMODO_INITDONE == 0 ) { From 5d5c720dbf2b9c6554bc09bb33ef7ef4fbba09e4 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 14:23:38 +0200 Subject: [PATCH 32/58] Test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 9d29a2441..edacc2664 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1429,9 +1429,9 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi func = (tmp & 0xff); offset = (tmp >> 8); fpos = prevpos100 + offset; - if ( fpos >= datalen || filedata[lastfpos] != func ) + if ( lastfpos >= datalen || filedata[lastfpos] != func ) { - printf("validate.%d error (%u %d) prev100 %u -> fpos.%ld datalen.%ld [%d]\n",i,offset,func,prevpos100,fpos,datalen,fpos < datalen ? filedata[fpos] : -1); + printf("validate.%d error (%u %d) prev100 %u -> fpos.%ld datalen.%ld [%d] (%c) vs (%c)\n",i,offset,func,prevpos100,fpos,datalen,lastfpos < datalen ? filedata[lastfpos] : -1,func,filedata[lastfpos]); return(-1); } } From 75f0def0129b31fe31ba17431d170be2e712f14f Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 14:33:18 +0200 Subject: [PATCH 33/58] Test --- src/komodo_gateway.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index edacc2664..1116b639d 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1413,7 +1413,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) { lastfpos = 0; - fprintf(stderr,"validate %s fsize.%ld datalen.%ld n.%ld\n",indfname,fsize,datalen,fsize / sizeof(uint32_t)); + fprintf(stderr,"validate %s fsize.%ld datalen.%ld n.%ld lastfpos.%ld\n",indfname,fsize,datalen,fsize / sizeof(uint32_t),lastfpos); if ( (fsize % sizeof(uint32_t)) == 0 ) { n = (int32_t)(fsize / sizeof(uint32_t)); @@ -1431,7 +1431,8 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi fpos = prevpos100 + offset; if ( lastfpos >= datalen || filedata[lastfpos] != func ) { - printf("validate.%d error (%u %d) prev100 %u -> fpos.%ld datalen.%ld [%d] (%c) vs (%c)\n",i,offset,func,prevpos100,fpos,datalen,lastfpos < datalen ? filedata[lastfpos] : -1,func,filedata[lastfpos]); + printf("validate.%d error (%u %d) prev100 %u -> fpos.%ld datalen.%ld [%d] (%c) vs (%c) lastfpos.%ld\n",i,offset,func,prevpos100,fpos,datalen,lastfpos < datalen ? filedata[lastfpos] : -1,func,filedata[lastfpos],lastfpos); + exit(-1); return(-1); } } From ac7d572b6904ee5093de89889c60cda916b5fb97 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 14:37:48 +0200 Subject: [PATCH 34/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 1116b639d..fe48c9718 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1408,7 +1408,7 @@ uint8_t *OS_fileptr(long *allocsizep,char *fname) long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *filedata,long datalen,uint32_t *prevpos100p,uint32_t *indcounterp,char *symbol,char *dest) { - FILE *fp; long fsize,lastfpos,fpos=-1; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; + FILE *fp; long fsize,lastfpos=0,fpos=-1; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; *indcounterp = *prevpos100p = 0; if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) { From d60660744902fadc0fdeae31163feee54d1d2355 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 14:40:16 +0200 Subject: [PATCH 35/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index fe48c9718..9a2a9e840 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1408,7 +1408,7 @@ uint8_t *OS_fileptr(long *allocsizep,char *fname) long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *filedata,long datalen,uint32_t *prevpos100p,uint32_t *indcounterp,char *symbol,char *dest) { - FILE *fp; long fsize,lastfpos=0,fpos=-1; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; + FILE *fp; long fsize,lastfpos=0,fpos=0; uint8_t *inds,func; int32_t i,n; uint32_t offset,tmp,prevpos100 = 0; *indcounterp = *prevpos100p = 0; if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) { From 651ce5743f530ef5ac11af6bec0c22a35c589711 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 14:54:47 +0200 Subject: [PATCH 36/58] Test --- src/komodo_gateway.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 9a2a9e840..49dc005d1 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1413,7 +1413,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) { lastfpos = 0; - fprintf(stderr,"validate %s fsize.%ld datalen.%ld n.%ld lastfpos.%ld\n",indfname,fsize,datalen,fsize / sizeof(uint32_t),lastfpos); + //fprintf(stderr,"validate %s fsize.%ld datalen.%ld n.%ld lastfpos.%ld\n",indfname,fsize,datalen,fsize / sizeof(uint32_t),lastfpos); if ( (fsize % sizeof(uint32_t)) == 0 ) { n = (int32_t)(fsize / sizeof(uint32_t)); @@ -1432,7 +1432,6 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi if ( lastfpos >= datalen || filedata[lastfpos] != func ) { printf("validate.%d error (%u %d) prev100 %u -> fpos.%ld datalen.%ld [%d] (%c) vs (%c) lastfpos.%ld\n",i,offset,func,prevpos100,fpos,datalen,lastfpos < datalen ? filedata[lastfpos] : -1,func,filedata[lastfpos],lastfpos); - exit(-1); return(-1); } } @@ -1460,7 +1459,7 @@ long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long tmp = ((uint32_t)(newfpos - *prevpos100p) << 8) | (func & 0xff); if ( ftell(indfp)/sizeof(uint32_t) != *indcounterp ) printf("indfp fpos %ld -> ind.%ld vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); - fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); + //fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); fwrite(&tmp,1,sizeof(tmp),indfp), (*indcounterp)++; if ( (*indcounterp % 100) == 0 ) { From 95880660c64cc6289955968ad672ff40aa83a7c9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:02:23 +0200 Subject: [PATCH 37/58] Test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 49dc005d1..68367718e 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1420,7 +1420,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi for (i=0; i n-10 ) + if ( 0 && i > n-10 ) printf("%d: tmp.%08x [%c] prevpos100.%u\n",i,tmp,tmp&0xff,prevpos100); if ( (i % 100) == 0 ) prevpos100 = tmp; @@ -1439,7 +1439,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi } *indcounterp = n; *prevpos100p = prevpos100; - printf("%s validated[%d] fpos.%ld datalen.%ld\n",indfname,i,fpos,datalen); + printf("%s validated[%d] fpos.%ld datalen.%ld, offset %ld vs fsize.%ld\n",indfname,i,fpos,datalen,i * sizeof(uint32_t),fsize); if ( sp != 0 ) komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); free(inds); From e3c63db23b06ddd35c0ef000851aad517f4c906f Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:06:37 +0200 Subject: [PATCH 38/58] Test --- src/komodo_gateway.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 68367718e..766df3995 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1459,7 +1459,7 @@ long komodo_indfile_update(FILE *indfp,uint32_t *prevpos100p,long lastfpos,long tmp = ((uint32_t)(newfpos - *prevpos100p) << 8) | (func & 0xff); if ( ftell(indfp)/sizeof(uint32_t) != *indcounterp ) printf("indfp fpos %ld -> ind.%ld vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); - //fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); + fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); fwrite(&tmp,1,sizeof(tmp),indfp), (*indcounterp)++; if ( (*indcounterp % 100) == 0 ) { @@ -1504,18 +1504,21 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch if ( (indfp= fopen(indfname,"rb+")) != 0 ) { lastfpos = fpos = validated; - fprintf(stderr,"validated %ld -> indcounter %u, prevpos100 %u offset.%ld\n",validated,indcounter,prevpos100,indcounter * sizeof(uint32_t)); - fseek(indfp,indcounter * sizeof(uint32_t),SEEK_SET); - if ( ftell(indfp) == indcounter * sizeof(uint32_t) ) + fprintf(stderr,"datalen.%ld validated %ld -> indcounter %u, prevpos100 %u offset.%ld\n",datalen,validated,indcounter,prevpos100,indcounter * sizeof(uint32_t)); + if ( fpos < datalen ) { - while ( (func= komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest)) >= 0 ) + fseek(indfp,indcounter * sizeof(uint32_t),SEEK_SET); + if ( ftell(indfp) == indcounter * sizeof(uint32_t) ) { - lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); - if ( lastfpos != fpos ) - fprintf(stderr,"unexpected lastfpos.%ld != %ld\n",lastfpos,fpos); + while ( (func= komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest)) >= 0 ) + { + lastfpos = komodo_indfile_update(indfp,&prevpos100,lastfpos,fpos,func,&indcounter); + if ( lastfpos != fpos ) + fprintf(stderr,"unexpected lastfpos.%ld != %ld\n",lastfpos,fpos); + } } + fclose(indfp); } - fclose(indfp); if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else From b883389a8207fa9e5ac74024df6faa40d0f67804 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:12:47 +0200 Subject: [PATCH 39/58] Test --- src/komodo_gateway.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 766df3995..ca43d184d 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1413,7 +1413,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi if ( (inds= OS_fileptr(&fsize,indfname)) != 0 ) { lastfpos = 0; - //fprintf(stderr,"validate %s fsize.%ld datalen.%ld n.%ld lastfpos.%ld\n",indfname,fsize,datalen,fsize / sizeof(uint32_t),lastfpos); + fprintf(stderr,"inds.%p validate %s fsize.%ld datalen.%ld n.%ld lastfpos.%ld\n",inds,indfname,fsize,datalen,fsize / sizeof(uint32_t),lastfpos); if ( (fsize % sizeof(uint32_t)) == 0 ) { n = (int32_t)(fsize / sizeof(uint32_t)); @@ -1439,9 +1439,9 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi } *indcounterp = n; *prevpos100p = prevpos100; - printf("%s validated[%d] fpos.%ld datalen.%ld, offset %ld vs fsize.%ld\n",indfname,i,fpos,datalen,i * sizeof(uint32_t),fsize); if ( sp != 0 ) komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); + printf("free inds.%p %s validated[%d] fpos.%ld datalen.%ld, offset %ld vs fsize.%ld\n",inds,indfname,i,fpos,datalen,i * sizeof(uint32_t),fsize); free(inds); return(fpos); } else printf("wrong filesize %s %ld\n",indfname,fsize); @@ -1519,6 +1519,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch } fclose(indfp); } + printf("call validate datalen.%ld\n",datalen); if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else @@ -1528,6 +1529,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch } } } else printf("komodo_faststateinit unexpected case\n"); + printf("free filedata.%p\n",filedata); free(filedata); return(finished == 1); } From 3e394a57e006a922b7df173a2fef6de1526dfbfb Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:16:04 +0200 Subject: [PATCH 40/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ca43d184d..4e2bbcabf 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1418,7 +1418,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi { n = (int32_t)(fsize / sizeof(uint32_t)); for (i=0; i n-10 ) printf("%d: tmp.%08x [%c] prevpos100.%u\n",i,tmp,tmp&0xff,prevpos100); From 05d9b22010c98eca43beeb29aa20e7f17f1a3f90 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:18:10 +0200 Subject: [PATCH 41/58] Test --- src/komodo_gateway.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 4e2bbcabf..62957da3b 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1437,6 +1437,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi } lastfpos = fpos; } +fpos=datalen; *indcounterp = n; *prevpos100p = prevpos100; if ( sp != 0 ) From 37c74e15e16baa35eef934c9d84a920a4d230cfd Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:20:09 +0200 Subject: [PATCH 42/58] Test --- src/komodo_gateway.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 62957da3b..53e31317f 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1418,7 +1418,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi { n = (int32_t)(fsize / sizeof(uint32_t)); for (i=0; i n-10 ) printf("%d: tmp.%08x [%c] prevpos100.%u\n",i,tmp,tmp&0xff,prevpos100); @@ -1437,13 +1437,12 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi } lastfpos = fpos; } -fpos=datalen; *indcounterp = n; *prevpos100p = prevpos100; if ( sp != 0 ) komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); + else free(inds); printf("free inds.%p %s validated[%d] fpos.%ld datalen.%ld, offset %ld vs fsize.%ld\n",inds,indfname,i,fpos,datalen,i * sizeof(uint32_t),fsize); - free(inds); return(fpos); } else printf("wrong filesize %s %ld\n",indfname,fsize); } From 2baa86a396ca67826f05269b18857f82b2f2b29e Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:22:53 +0200 Subject: [PATCH 43/58] Test --- src/komodo_gateway.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 53e31317f..4f5abb2fc 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1377,10 +1377,10 @@ void *OS_loadfile(char *fname,uint8_t **bufp,long *lenp,long *allocsizep) printf("OS_loadfile null size.(%s)\n",fname); return(0); } - if ( filesize > buflen-1 ) + if ( filesize > buflen ) { *allocsizep = filesize; - *bufp = buf = (uint8_t *)realloc(buf,(long)*allocsizep); + *bufp = buf = (uint8_t *)realloc(buf,(long)*allocsizep+64); } rewind(fp); if ( buf == 0 ) @@ -1441,8 +1441,8 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi *prevpos100p = prevpos100; if ( sp != 0 ) komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); - else free(inds); printf("free inds.%p %s validated[%d] fpos.%ld datalen.%ld, offset %ld vs fsize.%ld\n",inds,indfname,i,fpos,datalen,i * sizeof(uint32_t),fsize); + free(inds); return(fpos); } else printf("wrong filesize %s %ld\n",indfname,fsize); } From dbd0722f1c2806a004a9e3f6407bcb3d71259ebc Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 15:25:59 +0200 Subject: [PATCH 44/58] Test --- src/komodo_gateway.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 4f5abb2fc..c795f5b74 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1441,7 +1441,7 @@ long komodo_stateind_validate(struct komodo_state *sp,char *indfname,uint8_t *fi *prevpos100p = prevpos100; if ( sp != 0 ) komodo_stateind_set(sp,(uint32_t *)inds,n,filedata,fpos,symbol,dest); - printf("free inds.%p %s validated[%d] fpos.%ld datalen.%ld, offset %ld vs fsize.%ld\n",inds,indfname,i,fpos,datalen,i * sizeof(uint32_t),fsize); + //printf("free inds.%p %s validated[%d] fpos.%ld datalen.%ld, offset %ld vs fsize.%ld\n",inds,indfname,i,fpos,datalen,i * sizeof(uint32_t),fsize); free(inds); return(fpos); } else printf("wrong filesize %s %ld\n",indfname,fsize); @@ -1519,17 +1519,15 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch } fclose(indfp); } - printf("call validate datalen.%ld\n",datalen); if ( komodo_stateind_validate(sp,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest) < 0 ) printf("unexpected komodostate.ind validate failure %s datalen.%ld\n",indfname,datalen); else { - printf("%s validated updated from validated.%ld to %ld new.[%ld] -> indcounter %u, prevpos100 %u offset.%ld\n",indfname,validated,fpos,fpos-validated,indcounter,prevpos100,indcounter * sizeof(uint32_t)); + printf("%s validated updated from validated.%ld to %ld new.[%ld] -> indcounter %u, prevpos100 %u offset.%ld | elapsed %d seconds\n",indfname,validated,fpos,fpos-validated,indcounter,prevpos100,indcounter * sizeof(uint32_t),(int32_t)(time(NULL) - starttime)); finished = 1; } } } else printf("komodo_faststateinit unexpected case\n"); - printf("free filedata.%p\n",filedata); free(filedata); return(finished == 1); } From 43430608217eddac9cc2745f1aa51b216c6a36be Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:22:06 +0200 Subject: [PATCH 45/58] Test --- src/komodo_gateway.h | 129 ++++++++++++++++++++++++++++++++++++--- src/wallet/rpcwallet.cpp | 2 + 2 files changed, 124 insertions(+), 7 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index c795f5b74..fe0e13b7e 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1036,8 +1036,6 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 //printf("komodo_opreturn skip %s\n",ASSETCHAINS_SYMBOL); return("assetchain"); } - //else if ( KOMODO_PAX == 0 ) - // return("nopax"); memset(baseids,0xff,sizeof(baseids)); memset(values,0,sizeof(values)); memset(srcvalues,0,sizeof(srcvalues)); @@ -1048,8 +1046,11 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( opretbuf[0] == 'K' && opretlen != 40 ) { komodo_kvupdate(opretbuf,opretlen,value); + return("kv"); } - else if ( opretbuf[0] == 'D' ) + else if ( KOMODO_PAX == 0 ) + return("nopax"); + if ( opretbuf[0] == 'D' ) { tokomodo = 0; if ( opretlen == 38 ) // any KMD tx @@ -1355,9 +1356,123 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_t *filedata,long datalen,char *symbol,char *dest) { - uint8_t func; long fpos; - //komodo_parsestatefiledata(sp,filedata,&fpos,datalen,symbol,dest); - // scan backwards to set all the sp-> fields to the current valid value + uint8_t func; long lastK,lastT,lastN,lastV,fpos=0,lastfpos=0; int32_t i,count,doissue,iter,numn,numv,numN,numV; uint32_t tmp,prevpos100; + count = numN = numV = numn = numv = 0; + lastK = lastT = lastN = lastV; + for (iter=0; iter<2; iter++) + { + for (prevpos100=i=0; i> 8); + fpos = prevpos100 + offset; + if ( lastfpos >= datalen || filedata[lastfpos] != func ) + printf("lastfpos.%ld >= datalen.%ld or [%d] != fund.%d\n",lastfpos,datalen,filedata[lastfpos],func); + else if ( iter == 0 ) + { + switch ( func ) + { + default: case 'P': case 'U': case 'D': + inds[i] &= 0xffffff00; + break; + case 'K': + lastK = lastfpos; + inds[i] &= 0xffffff00; + break; + case 'T': + lastT = lastfpos; + inds[i] &= 0xffffff00; + break; + case 'N': + lastN = lastfpos; + numN++; + break; + case 'V': + lastV = lastfpos; + numV++; + break; + case 'R': break; + } + } + else + { + doissue = 0; + if ( func == 'K' ) + { + if ( lastK == lastfpos ) + doissue = 1, printf("trigger lastK\n"); + } + else if ( func == 'T' ) + { + if ( lastT == lastfpos ) + doissue = 1, printf("trigger lastT\n"); + } + else if ( func == 'N' ) + { + if ( numn > numN-128 ) + doissue = 1; + numn++; + } + else if ( func == 'V' ) + { + if ( numv > numV-1440 ) + doissue = 1; + numv++; + } + else if ( func == 'R' ) + doissue = 1; + if ( doissue != 0 ) + { + printf("issue %c total.%d lastfpos.%ld\n",func,count,lastfpos); + komodo_parsestatefiledata(sp,filedata,&lastfpos,datalen,symbol,dest); + count++; + } + } + } + lastfpos = fpos; + } + } + + else if ( func == 'K' ) // KMD height: stop after 1st + else if ( func == 'T' ) // KMD height+timestamp: stop after 1st + + else if ( func == 'N' ) // notarization, scan backwards 1440+ blocks; + else if ( func == 'V' ) // price feed: can stop after 1440+ + else if ( func == 'R' ) // opreturn: + { + uint16_t olen,v; uint64_t ovalue; uint256 txid; uint8_t opret[16384]; + if ( memread(&txid,sizeof(txid),filedata,&fpos,datalen) != sizeof(txid) ) + errs++; + if ( memread(&v,sizeof(v),filedata,&fpos,datalen) != sizeof(v) ) + errs++; + if ( memread(&ovalue,sizeof(ovalue),filedata,&fpos,datalen) != sizeof(ovalue) ) + errs++; + if ( memread(&olen,sizeof(olen),filedata,&fpos,datalen) != sizeof(olen) ) + errs++; + if ( olen < sizeof(opret) ) + { + if ( memread(opret,olen,filedata,&fpos,datalen) != olen ) + errs++; + if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 && matched != 0 ) + { + int32_t i; for (i=0; i global PAX + } else + { + int32_t i; + for (i=0; i ind.%ld vs counter.%u\n",ftell(indfp),ftell(indfp)/sizeof(uint32_t),*indcounterp); - fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); + //fprintf(stderr,"ftell.%ld indcounter.%u lastfpos.%ld newfpos.%ld func.%02x\n",ftell(indfp),*indcounterp,lastfpos,newfpos,func); fwrite(&tmp,1,sizeof(tmp),indfp), (*indcounterp)++; if ( (*indcounterp % 100) == 0 ) { diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 21ee626f6..269b306cc 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -612,6 +612,8 @@ UniValue paxdeposit(const UniValue& params, bool fHelp) { uint64_t available,deposited,issued,withdrawn,approved,redeemed,seed,komodoshis = 0; int32_t height; char destaddr[64]; uint8_t i,pubkey37[33]; bool fSubtractFeeFromAmount = false; + if ( KOMODO_PAX == 0 ) + throw JSONRPCError(RPC_TYPE_ERROR, "paxdeposit disabled, since pax not enabled with komodod -pax"); if ( komodo_is_issuer() != 0 ) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "paxdeposit only from KMD"); if (!EnsureWalletIsAvailable(fHelp)) From bf9c62be24aa97eb83487c9bed2c16ecc6620277 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:24:33 +0200 Subject: [PATCH 46/58] Test --- src/komodo_gateway.h | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index fe0e13b7e..1fb2e3b23 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1356,7 +1356,7 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_t *filedata,long datalen,char *symbol,char *dest) { - uint8_t func; long lastK,lastT,lastN,lastV,fpos=0,lastfpos=0; int32_t i,count,doissue,iter,numn,numv,numN,numV; uint32_t tmp,prevpos100; + uint8_t func; long lastK,lastT,lastN,lastV,fpos=0,lastfpos=0; int32_t i,count,doissue,iter,numn,numv,numN,numV; uint32_t tmp,prevpos100,offset; count = numN = numV = numn = numv = 0; lastK = lastT = lastN = lastV; for (iter=0; iter<2; iter++) @@ -1437,42 +1437,12 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_ lastfpos = fpos; } } - - else if ( func == 'K' ) // KMD height: stop after 1st + /*else if ( func == 'K' ) // KMD height: stop after 1st else if ( func == 'T' ) // KMD height+timestamp: stop after 1st else if ( func == 'N' ) // notarization, scan backwards 1440+ blocks; else if ( func == 'V' ) // price feed: can stop after 1440+ - else if ( func == 'R' ) // opreturn: - { - uint16_t olen,v; uint64_t ovalue; uint256 txid; uint8_t opret[16384]; - if ( memread(&txid,sizeof(txid),filedata,&fpos,datalen) != sizeof(txid) ) - errs++; - if ( memread(&v,sizeof(v),filedata,&fpos,datalen) != sizeof(v) ) - errs++; - if ( memread(&ovalue,sizeof(ovalue),filedata,&fpos,datalen) != sizeof(ovalue) ) - errs++; - if ( memread(&olen,sizeof(olen),filedata,&fpos,datalen) != sizeof(olen) ) - errs++; - if ( olen < sizeof(opret) ) - { - if ( memread(opret,olen,filedata,&fpos,datalen) != olen ) - errs++; - if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 && matched != 0 ) - { - int32_t i; for (i=0; i global PAX - } else - { - int32_t i; - for (i=0; i Date: Sun, 5 Nov 2017 16:26:53 +0200 Subject: [PATCH 47/58] Test --- src/wallet/rpcwallet.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 269b306cc..ee9fb71bb 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -480,6 +480,7 @@ uint64_t PAX_fiatdest(uint64_t *seedp,int32_t tokomodo,char *destaddr,uint8_t pu int32_t komodo_opreturnscript(uint8_t *script,uint8_t type,uint8_t *opret,int32_t opretlen); #define CRYPTO777_KMDADDR "RXL3YXG2ceaB6C5hfJcN4fvmLH2C34knhA" extern char ASSETCHAINS_SYMBOL[16]; +extern int32_t KOMODO_PAX; int32_t komodo_is_issuer(); int32_t iguana_rwnum(int32_t rwflag,uint8_t *serialized,int32_t len,void *endianedp); int32_t komodo_isrealtime(int32_t *kmdheightp); From 4978e8cfda68f3dd1514f3572683aa2631f2f8cc Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:31:02 +0200 Subject: [PATCH 48/58] Test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 1fb2e3b23..a757624fd 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1371,8 +1371,8 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_ func = (tmp & 0xff); offset = (tmp >> 8); fpos = prevpos100 + offset; - if ( lastfpos >= datalen || filedata[lastfpos] != func ) - printf("lastfpos.%ld >= datalen.%ld or [%d] != fund.%d\n",lastfpos,datalen,filedata[lastfpos],func); + if ( lastfpos >= datalen || (filedata[lastfpos] != func && func != 0) ) + printf("lastfpos.%ld >= datalen.%ld or [%d] != func.%d\n",lastfpos,datalen,filedata[lastfpos],func); else if ( iter == 0 ) { switch ( func ) From 40537f140ba1d27caca9f3c10e13f3bcb2309f52 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:32:59 +0200 Subject: [PATCH 49/58] Test --- src/komodo_gateway.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a757624fd..5969fb4c0 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1357,8 +1357,8 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_t *filedata,long datalen,char *symbol,char *dest) { uint8_t func; long lastK,lastT,lastN,lastV,fpos=0,lastfpos=0; int32_t i,count,doissue,iter,numn,numv,numN,numV; uint32_t tmp,prevpos100,offset; - count = numN = numV = numn = numv = 0; - lastK = lastT = lastN = lastV; + count = numR = numN = numV = numn = numv = 0; + lastK = lastT = lastN = lastV = -1; for (iter=0; iter<2; iter++) { for (prevpos100=i=0; i Date: Sun, 5 Nov 2017 16:34:01 +0200 Subject: [PATCH 50/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 5969fb4c0..aecb9fbf5 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1356,7 +1356,7 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_t *filedata,long datalen,char *symbol,char *dest) { - uint8_t func; long lastK,lastT,lastN,lastV,fpos=0,lastfpos=0; int32_t i,count,doissue,iter,numn,numv,numN,numV; uint32_t tmp,prevpos100,offset; + uint8_t func; long lastK,lastT,lastN,lastV,fpos=0,lastfpos=0; int32_t i,count,doissue,iter,numn,numv,numN,numV,numR; uint32_t tmp,prevpos100,offset; count = numR = numN = numV = numn = numv = 0; lastK = lastT = lastN = lastV = -1; for (iter=0; iter<2; iter++) From 0c6f830182cc68845b7e221f5b8dfa3b877e8009 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:43:51 +0200 Subject: [PATCH 51/58] Test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index aecb9fbf5..20cdbc05f 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1372,7 +1372,7 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_ offset = (tmp >> 8); fpos = prevpos100 + offset; if ( lastfpos >= datalen || (filedata[lastfpos] != func && func != 0) ) - printf("lastfpos.%ld >= datalen.%ld or [%d] != func.%d\n",lastfpos,datalen,filedata[lastfpos],func); + printf("i.%d/n.%d lastfpos.%ld >= datalen.%ld or [%d] != func.%d\n",i,n,lastfpos,datalen,filedata[lastfpos],func); else if ( iter == 0 ) { switch ( func ) @@ -1422,7 +1422,7 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_ } else if ( func == 'V' ) { - if ( numv > numV-1440 ) + if ( KOMODO_PAX != 0 || numv > numV-1440 ) doissue = 1; numv++; } From 7730b5c45ab863e7abe90f8030de73b843e255fa Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:46:02 +0200 Subject: [PATCH 52/58] Test --- src/komodo_gateway.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 20cdbc05f..a7ee5eaa2 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1149,7 +1149,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( baseids[i] < 0 ) { static uint32_t counter; - if ( counter++ < 3 ) + if ( ++counter < 1 ) printf("%d of %d illegal baseid.%d, this can be ignored\n",i,n,baseids[i]); continue; } @@ -1356,12 +1356,12 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_t *filedata,long datalen,char *symbol,char *dest) { - uint8_t func; long lastK,lastT,lastN,lastV,fpos=0,lastfpos=0; int32_t i,count,doissue,iter,numn,numv,numN,numV,numR; uint32_t tmp,prevpos100,offset; + uint8_t func; long lastK,lastT,lastN,lastV,fpos,lastfpos; int32_t i,count,doissue,iter,numn,numv,numN,numV,numR; uint32_t tmp,prevpos100,offset; count = numR = numN = numV = numn = numv = 0; lastK = lastT = lastN = lastV = -1; for (iter=0; iter<2; iter++) { - for (prevpos100=i=0; i Date: Sun, 5 Nov 2017 16:46:45 +0200 Subject: [PATCH 53/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index a7ee5eaa2..8a9baee45 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1361,7 +1361,7 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_ lastK = lastT = lastN = lastV = -1; for (iter=0; iter<2; iter++) { - for (latfpos=fpos=prevpos100=i=0; i Date: Sun, 5 Nov 2017 16:50:37 +0200 Subject: [PATCH 54/58] Test --- src/komodo_gateway.h | 9 +++++---- src/komodo_kv.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 8a9baee45..5655db040 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1048,8 +1048,9 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 komodo_kvupdate(opretbuf,opretlen,value); return("kv"); } - else if ( KOMODO_PAX == 0 ) - return("nopax"); + //else if ( KOMODO_PAX == 0 ) + // return("nopax"); + printf("OPRET.%c\n",opretbuf[0]); if ( opretbuf[0] == 'D' ) { tokomodo = 0; @@ -1149,7 +1150,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 if ( baseids[i] < 0 ) { static uint32_t counter; - if ( ++counter < 1 ) + if ( counter++ < 0 ) printf("%d of %d illegal baseid.%d, this can be ignored\n",i,n,baseids[i]); continue; } @@ -1361,7 +1362,7 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_ lastK = lastT = lastN = lastV = -1; for (iter=0; iter<2; iter++) { - for (lastfpos=fpos=prevpos100=i=0; i opretlen ) { static uint32_t counter; - if ( counter++ < 3 ) + if ( ++counter < 1 ) printf("komodo_kvupdate: keylen.%d + 13 > opretlen.%d, this can be ignored\n",keylen,opretlen); return; } From ddef24809caee31a594aa60a50446f7ff606ff91 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:51:54 +0200 Subject: [PATCH 55/58] Test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 5655db040..c8004a23d 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1362,7 +1362,7 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_ lastK = lastT = lastN = lastV = -1; for (iter=0; iter<2; iter++) { - for (latfpos=fpos=prevpos100=i=0; i Date: Sun, 5 Nov 2017 16:54:41 +0200 Subject: [PATCH 56/58] Test --- src/komodo_gateway.h | 1 - src/komodo_utils.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index c8004a23d..ca54983bc 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1050,7 +1050,6 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 } //else if ( KOMODO_PAX == 0 ) // return("nopax"); - printf("OPRET.%c\n",opretbuf[0]); if ( opretbuf[0] == 'D' ) { tokomodo = 0; diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 92577dae0..7db4f6fff 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1512,7 +1512,7 @@ void komodo_args(char *argv0) { USE_EXTERNAL_PUBKEY = 1; KOMODO_PAX = 1; - } else KOMODO_PAX = GetArg("-pax",0); + } else KOMODO_PAX = GetArg("-pax",1); name = GetArg("-ac_name",""); if ( argv0 != 0 ) { From 02b20e4022ff130a619d1596065bdaa1f3edd488 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:56:47 +0200 Subject: [PATCH 57/58] Test --- src/komodo_gateway.h | 4 ++-- src/komodo_utils.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index ca54983bc..07187c41c 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1048,8 +1048,8 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 komodo_kvupdate(opretbuf,opretlen,value); return("kv"); } - //else if ( KOMODO_PAX == 0 ) - // return("nopax"); + else if ( KOMODO_PAX == 0 ) + return("nopax"); if ( opretbuf[0] == 'D' ) { tokomodo = 0; diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 7db4f6fff..92577dae0 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1512,7 +1512,7 @@ void komodo_args(char *argv0) { USE_EXTERNAL_PUBKEY = 1; KOMODO_PAX = 1; - } else KOMODO_PAX = GetArg("-pax",1); + } else KOMODO_PAX = GetArg("-pax",0); name = GetArg("-ac_name",""); if ( argv0 != 0 ) { From 3a48f81a308dece1c8c3d8c7a05a7a4830a4f25b Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 5 Nov 2017 16:58:04 +0200 Subject: [PATCH 58/58] Test --- src/komodo_gateway.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 07187c41c..b69857141 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -1048,7 +1048,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 komodo_kvupdate(opretbuf,opretlen,value); return("kv"); } - else if ( KOMODO_PAX == 0 ) + else if ( ASSETCHAINS_SYMBOL[0] == 0 && KOMODO_PAX == 0 ) return("nopax"); if ( opretbuf[0] == 'D' ) { @@ -1566,7 +1566,7 @@ int32_t komodo_faststateinit(struct komodo_state *sp,char *fname,char *symbol,ch strcat(indfname,".ind"); if ( (filedata= OS_fileptr(&datalen,fname)) != 0 ) { - if ( datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (validated= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest)) < 0 ) + if ( 1 )//datalen >= (1LL << 32) || GetArg("-genind",0) != 0 || (validated= komodo_stateind_validate(0,indfname,filedata,datalen,&prevpos100,&indcounter,symbol,dest)) < 0 ) { lastfpos = fpos = 0; indcounter = prevpos100 = 0;