Browse Source

test

release/v0.1
jl777 8 years ago
parent
commit
3d6979fbae
  1. 2
      basilisk/basilisk_CMD.c
  2. 1
      gecko/gecko_blocks.c
  3. 15
      gecko/gecko_miner.c

2
basilisk/basilisk_CMD.c

@ -113,7 +113,7 @@ char *basilisk_respond_relays(struct supernet_info *myinfo,char *CMD,void *_addr
int32_t basilisk_relays_send(struct supernet_info *myinfo,struct iguana_peer *addr)
{
int32_t i,siglen,len = 0; char strbuf[512]; bits256 txhash2; uint8_t sig[128],serialized[sizeof(myinfo->relaybits)]; cJSON *vals; bits256 hash; char *retstr,hexstr[sizeof(myinfo->relaybits)*2 + 1];
printf("skip sending relays\n");
//printf("skip sending relays\n");
if ( 0 && myinfo != 0 )
{
vals = cJSON_CreateObject();

1
gecko/gecko_blocks.c

@ -240,6 +240,7 @@ char *gecko_blockarrived(struct supernet_info *myinfo,struct iguana_info *virt,c
{
if ( block->height > virt->longestchain )
virt->longestchain = block->height;
virt->backstoptime = (uint32_t)time(NULL);
return(clonestr("{\"result\":\"gecko block created\"}"));
}
else return(clonestr("{\"error\":\"gecko error creating hwmblock\"}"));

15
gecko/gecko_miner.c

@ -329,9 +329,20 @@ void gecko_blocksubmit(struct supernet_info *myinfo,struct iguana_info *btcd,str
void gecko_miner(struct supernet_info *myinfo,struct iguana_info *btcd,struct iguana_info *virt,int32_t maxmillis,uint8_t *minerpubkey33)
{
struct iguana_zblock newblock; uint32_t prevtimestamp,nBits; int64_t reward = 0; int32_t txn_count; char *blockstr,*space[256]; struct gecko_memtx **txptrs; void *ptr; //struct iguana_bundle *bp;
if ( virt->virtualchain == 0 || myinfo->RELAYID < 0 || myinfo->numrelays < 1 || (virt->blocks.hwmchain.height % myinfo->numrelays) != myinfo->RELAYID )
struct iguana_zblock newblock; uint32_t prevtimestamp,nBits; int64_t reward = 0; int32_t i,gap,txn_count; char *blockstr,*space[256]; struct gecko_memtx **txptrs; void *ptr; //struct iguana_bundle *bp;
if ( virt->virtualchain == 0 || myinfo->RELAYID < 0 || myinfo->numrelays < 1 )
return;
if ( (virt->blocks.hwmchain.height % myinfo->numrelays) != myinfo->RELAYID )
{
gap = (int32_t)(time(NULL) - virt->backstoptime) / virt->chain->estblocktime;
for (i=0; i<gap; i++)
{
if ( ((virt->blocks.hwmchain.height+i) % myinfo->numrelays) == myinfo->RELAYID )
break;
}
if ( i == gap )
return;
}
memset(&newblock,0,sizeof(newblock));
newblock.height = virt->blocks.hwmchain.height + 1;
newblock.RO.prev_block = virt->blocks.hwmchain.RO.hash2;

Loading…
Cancel
Save