test

iguana/iguana_bundles.c

@@ -211,9 +211,18 @@ int32_t iguana_bundlehash2add(struct iguana_info *coin,struct iguana_block **blo
         if ( bp->blocks[bundlei] != 0 && bp->blocks[bundlei] != block )
         {
             printf("bp.[%d]->blocks[%d] mismatch %p != %p\n",bp->hdrsi,bundlei,bp->blocks[bundlei],block);
-            iguana_blockunmark(coin,block,bp,bundlei,1);
-            bp->blocks[bundlei] = 0;
-            return(-1);
+            if ( block->mainchain != 0 && (block->height % coin->chain->bundlesize) == bundlei && (block->height / coin->chain->bundlesize) == bp->hdrsi )
+            {
+                printf("bundle block override [%d:%d]\n",bp->hdrsi,bundlei);
+                bp->blocks[bundlei] = block;
+                bp->hashes[bundlei] = block->RO.hash2;
+            }
+            else
+            {
+                iguana_blockunmark(coin,block,bp,bundlei,1);
+                bp->blocks[bundlei] = 0;
+                return(-1);
+            }
         }
         if ( bits256_nonz(bp->hashes[bundlei]) != 0 && bits256_cmp(bp->hashes[bundlei],block->RO.hash2) != 0 )
         {

iguana/iguana_ramchain.c

@@ -2492,7 +2492,7 @@ int32_t iguana_bundlesaveHT(struct supernet_info *myinfo,struct iguana_info *coi
         {
             iguana_bundlemapfree(coin,0,0,ipbits,ptrs,filesizes,num,R,starti,endi);
             iguana_blockunmark(coin,bp->blocks[bundlei],bp,bundlei,1);
-            printf("error mapping hdrsi.%d bundlei.%d\n",bp->hdrsi,bundlei);
+            printf("saveHT error mapping hdrsi.%d bundlei.%d\n",bp->hdrsi,bundlei);
             return(-1);
         }
         //printf("done mapchain.[%d:%d]\n",bp->hdrsi,bundlei);
@@ -2519,7 +2519,7 @@ int32_t iguana_bundlesaveHT(struct supernet_info *myinfo,struct iguana_info *coi
     {
         iguana_bundlemapfree(coin,0,0,ipbits,ptrs,filesizes,num,R,starti,endi);
         iguana_blockunmark(coin,bp->blocks[bundlei],bp,bundlei,1);
-        printf("error mapping hdrsi.%d bundlei.%d\n",bp->hdrsi,bundlei);
+        printf("B error mapping hdrsi.%d bundlei.%d\n",bp->hdrsi,bundlei);
         return(-1);
     }
     dest = &bp->ramchain;