diff --git a/iguana/iguana777.h b/iguana/iguana777.h index e5fa51010..ca0d5215e 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -341,7 +341,7 @@ struct iguana_ledger // ramchain temp file structures struct iguana_unspent20 { uint64_t value; uint32_t scriptpos,txidind:28,type:4; uint16_t scriptlen,fileid; uint8_t rmd160[20]; } __attribute__((packed)); -struct iguana_spend256 { bits256 prevhash2; uint32_t sequenceid,scriptpos; int16_t prevout; uint16_t vinscriptlen,spendind,fileid; } __attribute__((packed)); +struct iguana_spend256 { bits256 prevhash2; uint64_t scriptpos:48,vinscriptlen:16; uint32_t sequenceid; int16_t prevout; uint16_t spendind,fileid; } __attribute__((packed)); // permanent readonly structs struct iguana_txid { bits256 txid; uint32_t txidind:29,firstvout:28,firstvin:28,bundlei:11,locktime,version,timestamp,extraoffset; uint16_t numvouts,numvins; } __attribute__((packed)); diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index fe337d60a..ca9aa82da 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -315,7 +315,7 @@ uint32_t iguana_ramchain_addunspent20(struct iguana_info *coin,struct iguana_pee if ( (u->scriptpos= (uint32_t)scriptpos) == 0 ) fputc(0,addr->voutsfp), u->scriptpos++; if ( u->scriptpos != scriptpos || fwrite(script,1,scriptlen,addr->voutsfp) != scriptlen ) - printf("error writing vout scriptlen.%d errno.%d or scriptpos.%ld != %u\n",scriptlen,errno,scriptpos,u->scriptpos); + printf("error writing vout scriptlen.%d errno.%d or scriptpos.%lld != %u\n",scriptlen,errno,(long long)scriptpos,u->scriptpos); else addr->dirty[0]++; } else printf("addr.%p unspent error fp.%p\n",addr,addr!=0?addr->voutsfp:0); } @@ -531,7 +531,7 @@ uint32_t iguana_ramchain_addspend256(struct iguana_info *coin,struct iguana_peer { if ( vinscriptlen != s->vinscriptlen || s->sequenceid != sequence || memcmp(s->prevhash2.bytes,prev_hash.bytes,sizeof(bits256)) != 0 || s->prevout != prev_vout ) //|| s->hdrsi != hdrsi { - char str[65],str2[65]; printf("check offset %d (%d %d) addspend.%d v %d RO value mismatch sequenceid.%x seq.%x prev_vout(%d vs %d) %s vs %s\n",s->scriptpos,vinscriptlen,s->vinscriptlen,spendind,s->spendind,s->sequenceid,sequence,s->prevout,prev_vout,bits256_str(str,s->prevhash2),bits256_str(str2,prev_hash)); + char str[65],str2[65]; printf("check offset %llu (%d %d) addspend.%d v %d RO value mismatch sequenceid.%x seq.%x prev_vout(%d vs %d) %s vs %s\n",(long long)s->scriptpos,vinscriptlen,s->vinscriptlen,spendind,s->spendind,s->sequenceid,sequence,s->prevout,prev_vout,bits256_str(str,s->prevhash2),bits256_str(str2,prev_hash)); //printf("check addspend.%d vs %d RO value mismatch (%d %d:%d) vs (%d %d:%d)\n",spendind,s->spendind,s->prevout,s->hdrsi,s->bundlei,prev_vout,hdrsi,bundlei); //exit(-1); return(0); diff --git a/iguana/iguana_tx.c b/iguana/iguana_tx.c index c86491365..f5109ab47 100755 --- a/iguana/iguana_tx.c +++ b/iguana/iguana_tx.c @@ -39,7 +39,7 @@ int32_t iguana_scriptdata(struct iguana_info *coin,uint8_t *scriptspace,long fil { retval = -1; printf("%s script[%d] offset.%llu err.%ld\n",fname,scriptlen,(long long)scriptpos,err); - } else printf("%s script[%d] offset.%llu read.%ld\n",fname,scriptlen,(long long)scriptpos,err); + } //else printf("%s script[%d] offset.%llu read.%ld\n",fname,scriptlen,(long long)scriptpos,err); fclose(fp); } else retval = -1; return(retval);