Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
d6c85d60c6
  1. 6
      iguana/iguana_msg.c
  2. 2
      iguana/iguana_peers.c
  3. 22
      iguana/iguana_ramchain.c

6
iguana/iguana_msg.c

@ -71,7 +71,7 @@ int32_t iguana_rwversion(int32_t rwflag,uint8_t *serialized,struct iguana_msgver
else if ( msg->nVersion > 70000 )
len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->relayflag),&msg->relayflag);
//if ( rwflag == 0 )
printf("readsize.%d %-15s v.%llu srv.%llx %u ht.%llu [%s].R%d nonce.%llx\n",readsize,ipaddr,(long long)msg->nVersion,(long long)msg->nServices,(uint32_t)msg->nTime,(long long)msg->nStartingHeight,msg->strSubVer,msg->relayflag,(long long)msg->nonce);
//printf("readsize.%d %-15s v.%llu srv.%llx %u ht.%llu [%s].R%d nonce.%llx\n",readsize,ipaddr,(long long)msg->nVersion,(long long)msg->nServices,(uint32_t)msg->nTime,(long long)msg->nStartingHeight,msg->strSubVer,msg->relayflag,(long long)msg->nonce);
// 6e ea 00 00 01 00 00 00 00 00 00 00 86 5f a8 56 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff ff b5 2f b7 bc c6 83 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff ff 67 e5 7e c2 07 80 00 00 00 00 00 00 00 00 10 2f 42 69 74 4e 65 74 3a 31 2e 31 2e 33 2e 32 2f 92 d0 09 00 6c 04 00 00 01 00 00 00 80 07 01 9a 03 9b 03 01
return(len);
}
@ -155,7 +155,7 @@ int32_t iguana_rwblockhash(int32_t rwflag,uint8_t *serialized,uint32_t *nVersion
void iguana_gotversion(struct iguana_info *coin,struct iguana_peer *addr,struct iguana_msgversion *vers)
{
uint8_t serialized[sizeof(struct iguana_msghdr)];
printf("gotversion from %s: starting height.%d services.%llx proto.%d\n",addr->ipaddr,vers->nStartingHeight,(long long)vers->nServices,vers->nVersion);
//printf("gotversion from %s: starting height.%d services.%llx proto.%d\n",addr->ipaddr,vers->nStartingHeight,(long long)vers->nServices,vers->nVersion);
if ( (vers->nServices & NODE_NETWORK) != 0 )//&& vers->nonce != coin->instance_nonce )
{
addr->protover = (vers->nVersion < PROTOCOL_VERSION) ? vers->nVersion : PROTOCOL_VERSION;
@ -210,7 +210,7 @@ void iguana_gotverack(struct iguana_info *coin,struct iguana_peer *addr)
uint8_t serialized[sizeof(struct iguana_msghdr)];
if ( addr != 0 )
{
printf("gotverack from %s\n",addr->ipaddr);
//printf("gotverack from %s\n",addr->ipaddr);
addr->A.nTime = (uint32_t)time(NULL);
iguana_queue_send(coin,addr,0,serialized,"getaddr",0,0,0);
if ( addr->supernet != 0 )

2
iguana/iguana_peers.c

@ -371,7 +371,7 @@ int32_t iguana_send(struct iguana_info *coin,struct iguana_peer *addr,uint8_t *s
}
else if ( addr->msgcounts.verack == 0 && (strcmp((char *)&serialized[4],"version") != 0 && strcmp((char *)&serialized[4],"ConnectTo") != 0 && strcmp((char *)&serialized[4],"verack") != 0) != 0 )
{
printf("skip.(%s) since no verack yet\n",(char *)&serialized[4]);
//printf("skip.(%s) since no verack yet\n",(char *)&serialized[4]);
return(-1);
}
if ( strcmp((char *)&serialized[4],"ping") == 0 )

22
iguana/iguana_ramchain.c

@ -1036,7 +1036,7 @@ uint32_t iguana_ramchain_addspend(struct iguana_info *coin,RAMCHAIN_FUNC,bits256
}
bad += vinscriptlen;
} else good += vinscriptlen;
if ( (rand() % 100000) == 0 )
if ( 0 && (rand() % 100000) == 0 )
printf("good.%llu bad.%llu vinstats\n",(long long)good,(long long)bad);
//s->hdrsi = hdrsi;
//s->bundlei = bundlei;
@ -1428,7 +1428,9 @@ long iguana_ramchain_save(struct iguana_info *coin,RAMCHAIN_FUNC,uint32_t ipbits
coin->peers.numfiles++;
}
else if ( ipbits != 0 )
fseek(fp,0,SEEK_END);
{
//fseek(fp,0,SEEK_END);
}
else
{
fclose(fp);
@ -2082,7 +2084,8 @@ int32_t iguana_ramchain_scriptspace(struct iguana_info *coin,int32_t *sigspacep,
printf("iguana_ramchain_scriptspace cant iterate without data and requires simple ramchain\n");
return(-1);
}
sigspace = pubkeyspace = scriptspace = p2shspace = 0;
sigspace = pubkeyspace = p2shspace = 0;
scriptspace = 1;
for (ramchain->H.txidind=rdata->firsti; ramchain->H.txidind<rdata->numtxids; ramchain->H.txidind++)
{
tx = &T[ramchain->H.txidind];
@ -2093,7 +2096,7 @@ int32_t iguana_ramchain_scriptspace(struct iguana_info *coin,int32_t *sigspacep,
scriptspace += U[unspentind].scriptlen + 3;
}
for (j=0; j<tx->numvins; j++)
{
{break;
if ( (spendind= ramchain->H.spendind++) < rdata->numspends )
{
sequence = S[spendind].sequenceid;
@ -2114,8 +2117,8 @@ int32_t iguana_ramchain_scriptspace(struct iguana_info *coin,int32_t *sigspacep,
}
}
}
altspace += tx->numvins * 16 + 128; // for metascripts
scriptspace += tx->numvins * 16 + 128; // for metascripts
//altspace += tx->numvins * 16 + 128; // for metascripts
//scriptspace += tx->numvins * 16 + 128; // for metascripts
//fprintf(stderr,"scriptspace.%u altspace.%u, ",scriptspace,altspace);
}
*sigspacep = sigspace, *pubkeyspacep = pubkeyspace;
@ -2704,6 +2707,13 @@ int32_t iguana_bundlesaveHT(struct iguana_info *coin,struct OS_memspace *mem,str
//fprintf(stderr,"(%d %d).%d ",R[bundlei].H.data->numtxids,dest->H.txidind,bundlei);
if ( (err= iguana_ramchain_iterate(coin,dest,&R[bundlei],bp)) != 0 )
{
if ( (block= bp->blocks[bundlei]) != 0 )
{
block->queued = 0;
block->fpipbits = 0;
bp->issued[bundlei] = 0;
block->issued = 0;
}
printf("error ramchain_iterate hdrs.%d bundlei.%d\n",bp->hdrsi,bundlei);
break;
}

Loading…
Cancel
Save