test

iguana/iguana777.h

@@ -378,6 +378,7 @@ struct iguana_ramchain
     struct iguana_kvitem *txids,*pkhashes;
     struct OS_memspace *hashmem; long filesize,sigsfilesize,debitsfilesize,lastspendsfilesize;
     void *fileptr,*sigsfileptr,*Xspendptr,*debitsfileptr,*lastspendsfileptr;
+    char from_ro,from_roX,from_roA,from_roU;
     struct iguana_account *A,*creditsA; struct iguana_spendvector *Xspendinds;
     struct iguana_utxo *Uextras;
 //struct iguana_Uextra *U2,*roU2; struct iguana_pkextra *P2,*roP2;

iguana/iguana_init.c

@@ -214,7 +214,7 @@ void iguana_truncatebalances(struct iguana_info *coin)
 
 void iguana_parseline(struct iguana_info *coin,int32_t iter,FILE *fp)
 {
-    int32_t i,j,k,m,c,height,flag,bundlei; char checkstr[1024],line[1024];
+    int32_t i,j,k,m,c,height,flag,bundlei,from_ro; char checkstr[1024],line[1024];
     struct iguana_peer *addr; struct iguana_bundle *bp; bits256 allhash,hash2,zero,lastbundle;
     struct iguana_block *block;
     memset(&zero,0,sizeof(zero));
@@ -330,9 +330,14 @@ void iguana_parseline(struct iguana_info *coin,int32_t iter,FILE *fp)
     {
         if ( coin->balanceswritten > 0 )
         {
+            from_ro = 1;
             for (i=0; i<coin->balanceswritten; i++)
+            {
                 if ( (bp= coin->bundles[i]) == 0 || bp->emitfinish <= 1 || bp->utxofinish <= 1 )
                     break;
+                if ( bp->ramchain.from_ro == 0 || bp->ramchain.from_roX == 0 || bp->ramchain.from_roA == 0 || bp->ramchain.from_roU == 0 )
+                    from_ro = 0;
+            }
             if ( i != coin->balanceswritten )
             {
                 printf("TRUNCATE balances written.%d -> %d\n",coin->balanceswritten,i);
@@ -356,6 +361,8 @@ void iguana_parseline(struct iguana_info *coin,int32_t iter,FILE *fp)
                 }
                 if ( filecrc != 0 )
                     printf("have filecrc.%08x for %s milli.%.0f\n",filecrc,bits256_str(str,balancehash),OS_milliseconds());
+                if ( from_ro == 0 )
+                {
                     if ( filecrc == 0 )
                         vupdate_sha256(balancehash.bytes,&vstate,0,0);
                     for (i=crc=0; i<coin->balanceswritten; i++)
@@ -373,7 +380,8 @@ void iguana_parseline(struct iguana_info *coin,int32_t iter,FILE *fp)
                             crc = calc_crc32(crc,(void *)Uptr,(int32_t)(sizeof(*Uptr) * numunspents));
                         } else printf("missing hdrs.[%d] data.%p num.(%u %d) %p %p\n",i,bp->ramchain.H.data,numpkinds,numunspents,Aptr,Uptr);
                     }
-                printf("millis %.0f written.%d crc.%08x/%08x balancehash.(%s) vs (%s)\n",OS_milliseconds(),coin->balanceswritten,crc,filecrc,bits256_str(str,balancehash),bits256_str(str2,coin->balancehash));
+                } else crc = filecrc;
+                printf("millis %.0f from_ro.%d written.%d crc.%08x/%08x balancehash.(%s) vs (%s)\n",OS_milliseconds(),from_ro,coin->balanceswritten,crc,filecrc,bits256_str(str,balancehash),bits256_str(str2,coin->balancehash));
                 if ( (filecrc != 0 && filecrc != crc) || memcmp(balancehash.bytes,coin->balancehash.bytes,sizeof(balancehash)) != 0 )
                 {
                     printf("balancehash or crc mismatch\n");

iguana/iguana_ramchain.c

@@ -1365,6 +1365,7 @@ int32_t iguana_ramchain_extras(struct iguana_info *coin,struct iguana_ramchain *
                 sprintf(fname,"DB/%s%s/accounts/debits.%d",iter==0?"ro":"",coin->symbol,ramchain->H.data->height);
                 if ( (ramchain->debitsfileptr= OS_mapfile(fname,&ramchain->debitsfilesize,0)) != 0 && ramchain->debitsfilesize == sizeof(int32_t) + sizeof(bits256) + sizeof(*ramchain->A) * ramchain->H.data->numpkinds )
                 {
+                    ramchain->from_roA = (iter == 0);
                     numhdrsi = *(int32_t *)ramchain->debitsfileptr;
                     memcpy(balancehash.bytes,(void *)((long)ramchain->debitsfileptr + sizeof(numhdrsi)),sizeof(balancehash));
                     if ( coin->balanceswritten == 0 )
@@ -1383,6 +1384,7 @@ int32_t iguana_ramchain_extras(struct iguana_info *coin,struct iguana_ramchain *
                             if ( numhdrsi == coin->balanceswritten || memcmp(balancehash.bytes,coin->balancehash.bytes,sizeof(balancehash)) == 0 )
                             {
                                 ramchain->Uextras = (void *)((long)ramchain->lastspendsfileptr + sizeof(numhdrsi) + sizeof(bits256));
+                                ramchain->from_roU = (iter == 0);
                                 err = 0;
                             } else printf("ramchain map error2 balanceswritten %d vs %d hashes %x %x\n",coin->balanceswritten,numhdrsi,coin->balancehash.uints[0],balancehash.uints[0]);
                         } else printf("ramchain map error3 %s\n",fname);
@@ -1430,6 +1432,7 @@ int32_t iguana_Xspendmap(struct iguana_info *coin,struct iguana_ramchain *ramcha
                     bp->startutxo = bp->utxofinish = (uint32_t)time(NULL);
                     ramchain->Xspendptr = ptr;
                     ramchain->numXspends = (int32_t)((filesize - sizeof(sha256)) / sizeof(*ramchain->Xspendinds));
+                    ramchain->from_roX = (iter == 0);
                     return(ramchain->numXspends);
                     //int32_t i; for (i=0; i<ramchain->numXspends; i++)
                     //    printf("(%d u%d) ",ramchain->Xspendinds[i].hdrsi,ramchain->Xspendinds[i].ind);
@@ -1474,6 +1477,7 @@ struct iguana_ramchain *iguana_ramchain_map(struct iguana_info *coin,char *fname
             memset(ramchain,0,sizeof(*ramchain));
             if ( (ptr= OS_mapfile(fname,&filesize,0)) == 0 )
                 continue;
+            ramchain->from_ro = (iter == 0);
             ramchain->fileptr = ptr;
             ramchain->filesize = (long)filesize;
             if ( (ramchain->hashmem= hashmem) != 0 )
@@ -1543,7 +1547,7 @@ struct iguana_ramchain *iguana_ramchain_map(struct iguana_info *coin,char *fname
                 if ( iguana_ramchain_extras(coin,ramchain,ramchain->hashmem,allocextras) == 0 && bp != 0 )
                 {
                     bp->balancefinish = (uint32_t)time(NULL);
-                    printf("found balances for %d\n",bp->hdrsi);
+                    //printf("found balances for %d\n",bp->hdrsi);
                 } else printf("error with extras\n");
             }
         }