lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

test

release/v0.1
jl777 9 years ago
parent
d43a25feb3
commit
50bd9e41fb
4 changed files with 28 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      iguana/iguana777.c
  2. 33
      iguana/iguana_ramchain.c
  3. 4
      iguana/iguana_recv.c
  4. 4
      iguana/main.c

4
iguana/iguana777.c
View File

@ -446,7 +446,7 @@ int32_t iguana_utxogen(struct iguana_info *coin,int32_t helperid,int32_t convert
if ( iguana_bundlevalidate(coin,bp,0) != bp->n ) if ( iguana_bundlevalidate(coin,bp,0) != bp->n )
{ {
printf("validate.[%d] error. just refresh page or restart iguana\n",bp->hdrsi); printf("validate.[%d] error. just refresh page or restart iguana\n",bp->hdrsi);
exit(-1); //exit(-1);
} }
} }
while ( coin->spendvectorsaved == 1 ) while ( coin->spendvectorsaved == 1 )
@ -724,7 +724,7 @@ struct iguana_info *iguana_setcoin(char *symbol,void *launched,int32_t maxpeers,
else if ( coin->endPEND < 2 ) else if ( coin->endPEND < 2 )
coin->endPEND = 2; coin->endPEND = 2;
#ifdef __PNACL__ #ifdef __PNACL__
coin->startPEND = coin->endPEND = 1; //coin->startPEND = coin->endPEND = 1;
#endif #endif
coin->enableCACHE = (strcmp("BTC",coin->symbol) != 0); coin->enableCACHE = (strcmp("BTC",coin->symbol) != 0);
if ( jobj(json,"cache") != 0 ) if ( jobj(json,"cache") != 0 )

33
iguana/iguana_ramchain.c
View File

@ -644,21 +644,23 @@ void *iguana_ramchain_offset(char *fname,void *dest,uint8_t *lhash,FILE *fp,uint
{ {
startfpos = ftell(fp); startfpos = ftell(fp);
#ifdef __PNACL__ #ifdef __PNACL__
int32_t i,j,numretries = 5; int32_t i,numretries = 5;
for (i=0; i<numretries; i++) for (i=0; i<numretries; i++)
{ {
fseek(fp,startfpos,SEEK_SET); fseek(fp,startfpos,SEEK_SET);
err = len; err = fwrite(srcptr,1,len,fp);
/*err = len;
for (j=0; j<len; j++) for (j=0; j<len; j++)
if ( fputc(((uint8_t *)srcptr)[j],fp) < 0 ) if ( fputc(((uint8_t *)srcptr)[j],fp) < 0 )
{ {
err = -1; err = -1;
break; break;
} }*/
if ( err == len ) if ( err == len )
{ {
if ( i > 2 ) fflush(fp);
printf("write.%d of %d worked!\n",i+1,numretries+1); //if ( i > 2 )
//printf("write.%d of %d worked!\n",i+1,numretries+1);
break; break;
} }
} }
@ -1055,7 +1057,7 @@ long iguana_ramchain_save(struct iguana_info *coin,RAMCHAIN_FUNC,uint32_t ipbits
static portable_mutex_t mutex; static portable_mutex_t mutex;
portable_mutex_lock(&mutex); portable_mutex_lock(&mutex);
#endif #endif
if ( (fp= fopen(fname,"wb+")) == 0 ) if ( (fp= fopen(fname,"wb")) == 0 )
printf("iguana_ramchain_save: couldnt create.(%s) errno.%d\n",fname,errno); printf("iguana_ramchain_save: couldnt create.(%s) errno.%d\n",fname,errno);
else coin->peers.numfiles++; else coin->peers.numfiles++;
if ( fp != 0 ) if ( fp != 0 )
@ -1798,12 +1800,16 @@ int32_t iguana_ramchain_iterate(struct iguana_info *coin,struct iguana_ramchain
long iguana_ramchain_data(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_txblock *origtxdata,struct iguana_msgtx *txarray,int32_t txn_count,uint8_t *data,int32_t recvlen) long iguana_ramchain_data(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_txblock *origtxdata,struct iguana_msgtx *txarray,int32_t txn_count,uint8_t *data,int32_t recvlen)
{ {
int32_t verifyflag = 0; static uint64_t totalrecv; static uint64_t totalrecv;
int32_t verifyflag = 0;
RAMCHAIN_DECLARE; uint32_t addr_ipbits; struct iguana_ramchain R,*mapchain,*ramchain = &addr->ramchain; RAMCHAIN_DECLARE; uint32_t addr_ipbits; struct iguana_ramchain R,*mapchain,*ramchain = &addr->ramchain;
struct iguana_msgtx *tx; char fname[1024]; uint8_t rmd160[20]; long fsize; void *ptr; struct iguana_msgtx *tx; char fname[1024]; uint8_t rmd160[20]; // long fsize; void *ptr;
int32_t i,j,fpos,pubkeysize,msize,sigsize,firsti=1,err,flag,bundlei = -2; bits256 merkle_root; int32_t i,j,fpos,pubkeysize,msize,sigsize,firsti=1,err,flag,bundlei = -2; bits256 merkle_root;
struct iguana_bundle *bp = 0; struct iguana_block *block; uint32_t scriptspace,stackspace; struct iguana_bundle *bp = 0; struct iguana_block *block; uint32_t scriptspace,stackspace;
totalrecv += recvlen; totalrecv += recvlen;
#ifdef __PNACL__
//verifyflag = 1;
#endif
if ( (addr_ipbits= (uint32_t)addr->ipbits) == 0 ) if ( (addr_ipbits= (uint32_t)addr->ipbits) == 0 )
addr_ipbits = 1; addr_ipbits = 1;
if ( bits256_nonz(origtxdata->block.RO.merkle_root) == 0 ) if ( bits256_nonz(origtxdata->block.RO.merkle_root) == 0 )
@ -1944,10 +1950,13 @@ long iguana_ramchain_data(struct iguana_info *coin,struct iguana_peer *addr,stru
if ( addr->dirty[1] != 0 && addr->vinsfp != 0 ) if ( addr->dirty[1] != 0 && addr->vinsfp != 0 )
fflush(addr->vinsfp); fflush(addr->vinsfp);
memset(&R,0,sizeof(R)); memset(&R,0,sizeof(R));
if ( verifyflag != 0 && (mapchain= iguana_ramchain_map(coin,fname,0,1,&R,0,addr_ipbits,block->RO.hash2,block->RO.prev_block,bundlei,fpos,1,0)) != 0 ) if ( verifyflag != 0 && (mapchain= iguana_ramchain_map(coin,fname,0,1,&R,0,addr_ipbits,block->RO.hash2,block->RO.prev_block,bundlei,fpos,1,0)) == 0 )
{ {
printf("delete unverified [%d:%d]\n",bp->hdrsi,bundlei);
iguana_ramchain_free(coin,&R,1);
fpos = -1;
//printf("mapped Soffset.%ld\n",(long)mapchain->data->Soffset); //printf("mapped Soffset.%ld\n",(long)mapchain->data->Soffset);
iguana_ramchain_link(&R,block->RO.hash2,bp->hdrsi,bp->bundleheight+bundlei,bundlei,1,firsti,1); /*iguana_ramchain_link(&R,block->RO.hash2,bp->hdrsi,bp->bundleheight+bundlei,bundlei,1,firsti,1);
if ( 1 ) // unix issues? if ( 1 ) // unix issues?
{ {
if ( (err= iguana_ramchain_cmp(ramchain,mapchain,0)) != 0 ) if ( (err= iguana_ramchain_cmp(ramchain,mapchain,0)) != 0 )
@ -1981,6 +1990,8 @@ long iguana_ramchain_data(struct iguana_info *coin,struct iguana_peer *addr,stru
//bp->rawscriptspace += ramchain->H.data->scriptspace; //bp->rawscriptspace += ramchain->H.data->scriptspace;
} }
iguana_ramchain_free(coin,&R,1); iguana_ramchain_free(coin,&R,1);
if ( err != 0 )
iguana_blockunmark(coin,block,bp,bundlei,1);*/
} }
else else
{ {
@ -2401,7 +2412,7 @@ int32_t iguana_mapchaininit(char *fname,struct iguana_info *coin,struct iguana_r
if ( block->fpos+mapchain->H.data->allocsize > filesize || iguana_ramchain_size(fname,MAPCHAIN_ARG,1,mapchain->H.data->scriptspace) != mapchain->H.data->allocsize ) if ( block->fpos+mapchain->H.data->allocsize > filesize || iguana_ramchain_size(fname,MAPCHAIN_ARG,1,mapchain->H.data->scriptspace) != mapchain->H.data->allocsize )
{ {
printf("iguana_mapchaininit.%d ipbits.%x size mismatch %ld vs %ld vs filesize.%ld fpos.%ld bundlei.%d expanded.%d soff.%d\n",bp->bundleheight,block->fpipbits,(long)iguana_ramchain_size(fname,MAPCHAIN_ARG,1,mapchain->H.data->scriptspace),(long)mapchain->H.data->allocsize,(long)filesize,(long)block->fpos,bundlei,mapchain->expanded,mapchain->H.data->scriptspace); printf("iguana_mapchaininit.%d ipbits.%x size mismatch %ld vs %ld vs filesize.%ld fpos.%ld bundlei.%d expanded.%d soff.%d\n",bp->bundleheight,block->fpipbits,(long)iguana_ramchain_size(fname,MAPCHAIN_ARG,1,mapchain->H.data->scriptspace),(long)mapchain->H.data->allocsize,(long)filesize,(long)block->fpos,bundlei,mapchain->expanded,mapchain->H.data->scriptspace);
getchar(); //getchar();
return(-1); return(-1);
} }
else if ( memcmp(bp->hashes[bundlei].bytes,mapchain->H.data->firsthash2.bytes,sizeof(bits256)) != 0 ) else if ( memcmp(bp->hashes[bundlei].bytes,mapchain->H.data->firsthash2.bytes,sizeof(bits256)) != 0 )

4
iguana/iguana_recv.c
View File

@ -189,7 +189,7 @@ struct iguana_txblock *iguana_peertxdata(struct iguana_info *coin,int32_t *bundl
if ( txdata->datalen != datalen || txdata->block.bundlei != bundlei ) if ( txdata->datalen != datalen || txdata->block.bundlei != bundlei )
{ {
printf("%s peertxdata txdata->datalen.%d != %d bundlei.%d vs %d\n",bits256_str(str,txdata->block.RO.hash2),txdata->datalen,datalen,txdata->block.bundlei,bundlei); printf("%s peertxdata txdata->datalen.%d != %d bundlei.%d vs %d\n",bits256_str(str,txdata->block.RO.hash2),txdata->datalen,datalen,txdata->block.bundlei,bundlei);
getchar(); //getchar();
txdata = 0; txdata = 0;
iguana_memreset(mem); iguana_memreset(mem);
} //else printf("SUCCESS txdata.%s bundlei.%d fpos.%d T.%d U.%d S.%d P.%d\n",bits256_str(str,txdata->block.hash2),bundlei,fpos,txdata->numtxids,txdata->numunspents,txdata->numspends,txdata->numpkinds); } //else printf("SUCCESS txdata.%s bundlei.%d fpos.%d T.%d U.%d S.%d P.%d\n",bits256_str(str,txdata->block.hash2),bundlei,fpos,txdata->numtxids,txdata->numunspents,txdata->numspends,txdata->numpkinds);
@ -1286,7 +1286,7 @@ int32_t iguana_processrecvQ(struct iguana_info *coin,int32_t *newhwmp) // single
if ( (req= iguana_recvtxids(coin,req,req->hashes,req->n)) != 0 ) if ( (req= iguana_recvtxids(coin,req,req->hashes,req->n)) != 0 )
myfree(req->hashes,(req->n+1) * sizeof(*req->hashes)), req->hashes = 0; myfree(req->hashes,(req->n+1) * sizeof(*req->hashes)), req->hashes = 0;
} }
else printf("iguana_updatebundles unknown type.%c\n",req->type), getchar(); else printf("iguana_updatebundles unknown type.%c\n",req->type);//, getchar();
//fprintf(stderr,"finished coin->recvQ\n"); //fprintf(stderr,"finished coin->recvQ\n");
if ( req != 0 ) if ( req != 0 )
myfree(req,req->allocsize), req = 0; myfree(req,req->allocsize), req = 0;

4
iguana/main.c
View File

@ -1139,7 +1139,7 @@ void iguana_appletests(struct supernet_info *myinfo)
exit(-1); exit(-1);
} }
sleep(1);*/ sleep(1);*/
if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"prefetchlag\":13,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":500,\"endpend\":500,\"services\":128,\"maxpeers\":64,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":4,\"poll\":1}"),0,myinfo->rpcport)) != 0 ) if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"prefetchlag\":13,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":500,\"endpend\":500,\"services\":129,\"maxpeers\":64,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":4,\"poll\":1}"),0,myinfo->rpcport)) != 0 )
{ {
free(str); free(str);
if ( 0 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":1024,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1}"),0,myinfo->rpcport)) != 0 ) if ( 0 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":1024,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1}"),0,myinfo->rpcport)) != 0 )
@ -1327,7 +1327,7 @@ void iguana_main(void *arg)
iguana_helpinit(myinfo); iguana_helpinit(myinfo);
iguana_commandline(myinfo,arg); iguana_commandline(myinfo,arg);
#ifdef __APPLE__ #ifdef __APPLE__
iguana_appletests(myinfo); //iguana_appletests(myinfo);
#endif #endif
iguana_launchdaemons(myinfo); iguana_launchdaemons(myinfo);
} }

Write Preview
Loading…
Cancel
Save