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
88ca57bd90
commit
9d08cab114
5 changed files with 36 additions and 13 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. 5
      iguana/iguana_accept.c
  2. 14
      iguana/iguana_bundles.c
  3. 2
      iguana/iguana_msg.c
  4. 4
      iguana/iguana_peers.c
  5. 24
      iguana/iguana_unspents.c

5
iguana/iguana_accept.c
View File

@ -77,7 +77,7 @@ void iguana_acceptloop(void *args)
if ( poll(&pfd,1,100) <= 0 ) if ( poll(&pfd,1,100) <= 0 )
continue; continue;
clilen = sizeof(cli_addr); clilen = sizeof(cli_addr);
printf("ACCEPT (%s:%d) on sock.%d\n","127.0.0.1",coin->chain->portp2p,coin->bindsock); //printf("ACCEPT (%s:%d) on sock.%d\n","127.0.0.1",coin->chain->portp2p,coin->bindsock);
sock = accept(coin->bindsock,(struct sockaddr *)&cli_addr,&clilen); sock = accept(coin->bindsock,(struct sockaddr *)&cli_addr,&clilen);
if ( sock < 0 ) if ( sock < 0 )
{ {
@ -86,7 +86,6 @@ void iguana_acceptloop(void *args)
} }
memcpy(&ipbits,&cli_addr.sin_addr.s_addr,sizeof(ipbits)); memcpy(&ipbits,&cli_addr.sin_addr.s_addr,sizeof(ipbits));
expand_ipbits(ipaddr,ipbits); expand_ipbits(ipaddr,ipbits);
printf("NEWSOCK.%d for %x (%s)\n",sock,ipbits,ipaddr);
for (i=0; i<IGUANA_MAXPEERS; i++) for (i=0; i<IGUANA_MAXPEERS; i++)
{ {
if ( coin->peers.active[i].ipbits == (uint32_t)ipbits && coin->peers.active[i].usock >= 0 ) if ( coin->peers.active[i].ipbits == (uint32_t)ipbits && coin->peers.active[i].usock >= 0 )
@ -101,6 +100,7 @@ void iguana_acceptloop(void *args)
} }
if ( sock < 0 ) if ( sock < 0 )
continue; continue;
printf("NEWSOCK.%d for %x (%s)\n",sock,ipbits,ipaddr);
/*if ( (uint32_t)ipbits == myinfo->myaddr.myipbits ) /*if ( (uint32_t)ipbits == myinfo->myaddr.myipbits )
{ {
@ -119,6 +119,7 @@ void iguana_acceptloop(void *args)
{ {
printf("LAUNCH DEDICATED THREAD for %s\n",ipaddr); printf("LAUNCH DEDICATED THREAD for %s\n",ipaddr);
addr->usock = sock; addr->usock = sock;
addr->dead = 0;
strcpy(addr->symbol,coin->symbol); strcpy(addr->symbol,coin->symbol);
iguana_launch(coin,"accept",iguana_dedicatedglue,addr,IGUANA_CONNTHREAD); iguana_launch(coin,"accept",iguana_dedicatedglue,addr,IGUANA_CONNTHREAD);
//iguana_dedicatedloop(coin,addr); //iguana_dedicatedloop(coin,addr);

14
iguana/iguana_bundles.c
View File

@ -403,8 +403,10 @@ int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int
else starti = 0; else starti = 0;
priority = (bp->hdrsi < starti + coin->peers.numranked); priority = (bp->hdrsi < starti + coin->peers.numranked);
if ( strcmp("BTC",coin->symbol) == 0 ) if ( strcmp("BTC",coin->symbol) == 0 )
lag = 30 + (bp->hdrsi - starti); lag = 10 + (bp->hdrsi - starti);
else lag = 3 + (bp->hdrsi - starti)/10; else lag = 3 + (bp->hdrsi - starti)/10;
if ( coin->current != bp )
lag *= 3;
if ( (numpeers= coin->peers.numranked) > 3 )//&& bp->currentflag < bp->n ) if ( (numpeers= coin->peers.numranked) > 3 )//&& bp->currentflag < bp->n )
{ {
if ( numpeers > 0xff ) if ( numpeers > 0xff )
@ -988,6 +990,16 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
} // else break; } // else break;
} }
} }
else if ( bp == coin->current )
{
for (j=0; j<bp->n; j++)
if ( (block= bp->blocks[j]) != 0 && block->fpipbits == 0 && time(NULL) > block->issued+10 )
{
printf("current stop [%d:%d]\n",bp->hdrsi,j);
iguana_blockQ("currentstop",coin,0,-1,block->RO.hash2,1);
block->issued = (uint32_t)time(NULL);
}
}
//bp->rank = 0; //bp->rank = 0;
estsize += bp->estsize;//iguana_bundlecalcs(coin,bp,done); estsize += bp->estsize;//iguana_bundlecalcs(coin,bp,done);
//bp->metric = bp->numhashes; //bp->metric = bp->numhashes;

2
iguana/iguana_msg.c
View File

@ -172,7 +172,7 @@ void iguana_gotversion(struct iguana_info *coin,struct iguana_peer *addr,struct
addr->supernet = 1; addr->supernet = 1;
//else printf("nServices.%lld nonce.%llu %srelay node.(%s) supernet.%d\n",(long long)vers->nServices,(long long)vers->nonce,addr->relayflag==0?"non-":"",addr->ipaddr,addr->supernet); //else printf("nServices.%lld nonce.%llu %srelay node.(%s) supernet.%d\n",(long long)vers->nServices,(long long)vers->nonce,addr->relayflag==0?"non-":"",addr->ipaddr,addr->supernet);
if ( vers->nStartingHeight > coin->longestchain ) if ( vers->nStartingHeight > coin->longestchain )
coin->longestchain = vers->nStartingHeight; coin->longestchain = (vers->nStartingHeight + coin->longestchain + 1) >> 1;
iguana_queue_send(coin,addr,0,serialized,"getaddr",0,0,0); iguana_queue_send(coin,addr,0,serialized,"getaddr",0,0,0);
} }

4
iguana/iguana_peers.c
View File

@ -576,8 +576,8 @@ void iguana_gotdata(struct iguana_info *coin,struct iguana_peer *addr,int32_t he
//iguana_set_iAddrheight(coin,addr->ipbits,height); //iguana_set_iAddrheight(coin,addr->ipbits,height);
addr->height = height; addr->height = height;
} }
if ( height > coin->longestchain ) if ( height > 0 && height > coin->longestchain )
coin->longestchain = height; coin->longestchain = (height + coin->longestchain + 1) >> 1;
} }
int32_t iguana_iAddrheight(struct iguana_info *coin,uint64_t ipbits) int32_t iguana_iAddrheight(struct iguana_info *coin,uint64_t ipbits)

24
iguana/iguana_unspents.c
View File

@ -886,7 +886,7 @@ void iguana_RTramchainalloc(struct iguana_info *coin,struct iguana_bundle *bp)
} }
if ( coin->RTramchain.H.data == 0 ) if ( coin->RTramchain.H.data == 0 )
{ {
printf("ALLOC RTramchain\n"); //printf("ALLOC RTramchain\n");
iguana_ramchainopen(coin,dest,&coin->RTmem,&coin->RThashmem,bp->bundleheight,bp->hashes[0]); iguana_ramchainopen(coin,dest,&coin->RTmem,&coin->RThashmem,bp->bundleheight,bp->hashes[0]);
dest->H.txidind = dest->H.unspentind = dest->H.spendind = dest->pkind = dest->H.data->firsti; dest->H.txidind = dest->H.unspentind = dest->H.spendind = dest->pkind = dest->H.data->firsti;
dest->externalind = dest->H.stacksize = 0; dest->externalind = dest->H.stacksize = 0;
@ -941,13 +941,23 @@ int32_t iguana_realtime_update(struct iguana_info *coin)
coin->RTheight++; coin->RTheight++;
printf(">>>> RT.%d hwm.%d L.%d T.%d U.%d S.%d P.%d X.%d -> size.%ld\n",coin->RTheight,coin->blocks.hwmchain.height,coin->longestchain,dest->H.txidind,dest->H.unspentind,dest->H.spendind,dest->pkind,dest->externalind,(long)dest->H.data->allocsize); printf(">>>> RT.%d hwm.%d L.%d T.%d U.%d S.%d P.%d X.%d -> size.%ld\n",coin->RTheight,coin->blocks.hwmchain.height,coin->longestchain,dest->H.txidind,dest->H.unspentind,dest->H.spendind,dest->pkind,dest->externalind,(long)dest->H.data->allocsize);
coin->RTramchain.H.data->numblocks = bundlei + 1; coin->RTramchain.H.data->numblocks = bundlei + 1;
} else printf("error mapchaininit\n"); }
iguana_ramchain_free(coin,&blockR,1); else
} //else printf("no ptr for RTheight.%d\n",coin->RTheight); {
printf("error mapchaininit\n");
iguana_ramchain_free(coin,&blockR,1);
return(-1);
}
}
else
{
printf("no ptr for RTheight.%d\n",coin->RTheight);
return(-1);
}
} }
else else
{ {
//printf("no blockptr for RTheight.%d\n",coin->RTheight); printf("no blockptr for RTheight.%d\n",coin->RTheight);
return(-1); return(-1);
} }
} }
@ -1131,8 +1141,8 @@ int32_t iguana_balancecalc(struct iguana_info *coin,struct iguana_bundle *bp,int
} }
} }
} }
//printf("B [%d] j.%d u.%u b.%u\n",bp->hdrsi,j,bp->utxofinish,bp->balancefinish); // printf("B [%d] j.%d u.%u b.%u\n",bp->hdrsi,j,bp->utxofinish,bp->balancefinish);
if ( bp->bundleheight+bp->n >= coin->blocks.hwmchain.height && bp->utxofinish > 1 && bp->balancefinish <= 1 && bp->hdrsi == j ) if ( bp->bundleheight+bp->n < coin->blocks.hwmchain.height && bp->utxofinish > 1 && bp->balancefinish <= 1 && (bp->hdrsi == 0 || bp->hdrsi == j) )
{ {
starttime = (uint32_t)time(NULL); starttime = (uint32_t)time(NULL);
for (j=0; j<=bp->hdrsi; j++) for (j=0; j<=bp->hdrsi; j++)

Write Preview
Loading…
Cancel
Save