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
1861b2b118
commit
37ea9eeaa3
5 changed files with 62 additions and 30 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. 77
      basilisk/basilisk_bitcoin.c
  2. 4
      crypto777/bitcoind_RPC.c
  3. 9
      iguana/iguana_bundles.c
  4. 2
      iguana/iguana_recv.c
  5. 2
      iguana/iguana_tx.c

77
basilisk/basilisk_bitcoin.c
View File

@ -79,14 +79,23 @@ char *bitcoin_balance(struct iguana_info *coin,char *coinaddr,int32_t lastheight
char *basilisk_bitcoinblockhashstr(char *coinstr,char *serverport,char *userpass,int32_t height) char *basilisk_bitcoinblockhashstr(char *coinstr,char *serverport,char *userpass,int32_t height)
{ {
char numstr[128],*blockhashstr=0; char numstr[128],*blockhashstr=0; bits256 hash2; struct iguana_info *coin;
sprintf(numstr,"%d",height); sprintf(numstr,"%d",height);
blockhashstr = bitcoind_passthru(coinstr,serverport,userpass,"getblockhash",numstr); blockhashstr = bitcoind_passthru(coinstr,serverport,userpass,"getblockhash",numstr);
if ( blockhashstr == 0 || blockhashstr[0] == 0 ) hash2 = bits256_conv(blockhashstr);
if ( blockhashstr == 0 || blockhashstr[0] == 0 || bits256_nonz(hash2) == 0 )
{ {
printf("couldnt get blockhash for %u\n",height); printf("couldnt get blockhash for %u, probably curl is disabled\n",height);
if ( blockhashstr != 0 ) if ( blockhashstr != 0 )
free(blockhashstr); free(blockhashstr);
if ( height == 0 )
{
if ( (coin= iguana_coinfind(coinstr)) != 0 )
{
bits256_str(numstr,*(bits256 *)coin->chain->genesis_hashdata);
return(clonestr(numstr));
}
}
return(0); return(0);
} }
return(blockhashstr); return(blockhashstr);
@ -94,28 +103,28 @@ char *basilisk_bitcoinblockhashstr(char *coinstr,char *serverport,char *userpass
int32_t basilisk_blockhashes(struct iguana_info *coin,int32_t height,int32_t n) int32_t basilisk_blockhashes(struct iguana_info *coin,int32_t height,int32_t n)
{ {
char *blockhashstr; struct iguana_block *block,*checkblock; struct iguana_bundle *bp; int32_t bundlei,checki,h,i,num = 0; bits256 zero,hash2; char *blockhashstr; struct iguana_block *block,*checkblock; struct iguana_bundle *bp=0; int32_t bundlei,checki,h,i,num = 0; bits256 zero,hash2;
h = height; h = height;
for (i=0; i<n; i++,h++) for (i=0; i<n; i++,h++)
{ {
hash2 = iguana_blockhash(coin,h); hash2 = iguana_blockhash(coin,h);
if ( (block= iguana_blockfind("basilisk",coin,hash2)) != 0 && block->height == h && block->mainchain != 0 ) if ( 0 && (block= iguana_blockfind("basilisk",coin,hash2)) != 0 && block->height == h && block->mainchain != 0 )
continue; continue;
if ( (blockhashstr= basilisk_bitcoinblockhashstr(coin->symbol,coin->chain->serverport,coin->chain->userpass,h)) != 0 ) if ( (blockhashstr= basilisk_bitcoinblockhashstr(coin->symbol,coin->chain->serverport,coin->chain->userpass,h)) != 0 && bits256_nonz(hash2) != 0 )
{ {
hash2 = bits256_conv(blockhashstr); hash2 = bits256_conv(blockhashstr);
memset(zero.bytes,0,sizeof(zero)); memset(zero.bytes,0,sizeof(zero));
if ( (bundlei= (h % coin->chain->bundlesize)) == 0 )
bp = iguana_bundlecreate(coin,&checki,0,hash2,zero,1);
block = iguana_blockhashset("remote",coin,h,hash2,1); block = iguana_blockhashset("remote",coin,h,hash2,1);
if ( (bundlei= (h % coin->chain->bundlesize)) == 0 )
bp = iguana_bundlecreate(coin,&checki,h,hash2,zero,1);
iguana_bundlehash2add(coin,&checkblock,bp,bundlei,hash2); iguana_bundlehash2add(coin,&checkblock,bp,bundlei,hash2);
if ( block != checkblock || checki != bundlei ) if ( block != checkblock )
printf("block mismatch %p %p at ht.%d\n",block,checkblock,h); printf("bp.%p block mismatch %p %p at ht.%d bundlei.%d\n",bp,block,checkblock,h,bundlei);
else else
{ {
block->mainchain = 1; block->mainchain = 1;
char str[65]; printf("%s ht.%d\n",bits256_str(str,hash2),h);
num++; num++;
printf("ht.%d\n",h);
} }
free(blockhashstr); free(blockhashstr);
} }
@ -179,7 +188,7 @@ cJSON *bitcoin_blockjson(int32_t *heightp,char *coinstr,char *serverport,char *u
int32_t basilisk_bitcoinscan(struct iguana_info *coin,uint8_t origblockspace[IGUANA_MAXPACKETSIZE],struct OS_memspace *rawmem) int32_t basilisk_bitcoinscan(struct iguana_info *coin,uint8_t origblockspace[IGUANA_MAXPACKETSIZE],struct OS_memspace *rawmem)
{ {
struct iguana_txblock txdata; int32_t len,starti,h,num=0,loadheight,hexlen,datalen,n,i,numtxids,flag=0,j,height=-1; cJSON *curljson,*blockjson,*txids; char *bitstr,*curlstr,params[128],str[65]; struct iguana_msghdr H; struct iguana_msgblock *msg; uint8_t *blockspace,revbits[4],bitsbuf[4]; struct iguana_txblock txdata; struct iguana_block B; int32_t len,starti,h,num=0,loadheight,hexlen,datalen,n,i,numtxids,flag=0,j,height=-1; cJSON *curljson,*blockjson,*txids; char *bitstr,*curlstr,params[128],str[65]; struct iguana_msghdr H; struct iguana_msgblock *msg; uint8_t *blockspace,revbits[4],bitsbuf[4]; bits256 hash2,checkhash2;
strcpy(params,"[]"); strcpy(params,"[]");
if ( (curlstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"getinfo",params)) != 0 ) if ( (curlstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"getinfo",params)) != 0 )
{ {
@ -191,29 +200,45 @@ int32_t basilisk_bitcoinscan(struct iguana_info *coin,uint8_t origblockspace[IGU
free(curlstr); free(curlstr);
} }
loadheight = coin->blocks.hwmchain.height; loadheight = coin->blocks.hwmchain.height;
if ( loadheight == 0 ) basilisk_blockhashes(coin,loadheight,coin->chain->bundlesize);
loadheight = 1;
basilisk_blockhashes(coin,loadheight,100000);
for (j=0; j<coin->chain->bundlesize; j++) for (j=0; j<coin->chain->bundlesize; j++)
{ {
if ( loadheight == 0 )
{
loadheight++;
continue;
}
basilisk_blockhashes(coin,loadheight,1);
flag = 0; flag = 0;
if ( (blockjson= bitcoin_blockjson(&h,coin->symbol,coin->chain->serverport,coin->chain->userpass,0,loadheight)) != 0 ) if ( (blockjson= bitcoin_blockjson(&h,coin->symbol,coin->chain->serverport,coin->chain->userpass,0,loadheight)) != 0 )
{ {
blockspace = origblockspace; blockspace = origblockspace;
msg = (void *)blockspace; memset(&B,0,sizeof(B));
memset(msg,0,sizeof(*msg)); B.RO.version = juint(blockjson,"version");
msg->H.version = juint(blockjson,"version"); B.RO.prev_block = jbits256(blockjson,"previousblockhash");
msg->H.prev_block = jbits256(blockjson,"previousblockhash"); B.RO.merkle_root = jbits256(blockjson,"merkleroot");
msg->H.merkle_root = jbits256(blockjson,"merkleroot"); B.RO.timestamp = juint(blockjson,"time");
msg->H.timestamp = juint(blockjson,"timestamp");
if ( (bitstr= jstr(blockjson,"bits")) != 0 ) if ( (bitstr= jstr(blockjson,"bits")) != 0 )
{ {
decode_hex(revbits,sizeof(revbits),bitstr); decode_hex(revbits,sizeof(uint32_t),bitstr);
for (i=0; i<4; i++) for (i=0; i<4; i++)
bitsbuf[i] = revbits[3 - i]; bitsbuf[i] = revbits[3 - i];
memcpy(&msg->H.bits,bitsbuf,sizeof(msg->H.bits)); memcpy(&B.RO.bits,bitsbuf,sizeof(B.RO.bits));
} }
msg->H.nonce = juint(blockjson,"nonce"); B.RO.nonce = juint(blockjson,"nonce");
//char str[65],str2[65];
//printf("v.%d t.%u bits.%08x nonce.%x %s %s\n",B.RO.version,B.RO.timestamp,B.RO.bits,B.RO.nonce,bits256_str(str,B.RO.prev_block),bits256_str(str2,B.RO.merkle_root));
iguana_serialize_block(coin->chain,&checkhash2,blockspace,&B);
//for (i=0; i<80; i++)
// printf("%02x",blockspace[i]);
//printf(" B.%s\n",bits256_str(str,checkhash2));
msg = (void *)blockspace;
//printf("(%s)\n",jprint(blockjson,0));
checkhash2 = iguana_calcblockhash(coin->chain->hashalgo,blockspace,sizeof(*msg)-4);
if ( jstr(blockjson,"hash") != 0 )
hash2 = bits256_conv(jstr(blockjson,"hash"));
else memset(hash2.bytes,0,sizeof(hash2));
//printf("%s vs %s %ld\n",bits256_str(str,hash2),bits256_str(str2,checkhash2),sizeof(*msg)-4);
datalen = 80; datalen = 80;
if ( (txids= jarray(&numtxids,blockjson,"tx")) != 0 ) if ( (txids= jarray(&numtxids,blockjson,"tx")) != 0 )
{ {
@ -255,7 +280,7 @@ int32_t basilisk_bitcoinscan(struct iguana_info *coin,uint8_t origblockspace[IGU
iguana_gotblockM(coin,0,&txdata,rawmem->ptr,&H,blockspace,datalen); iguana_gotblockM(coin,0,&txdata,rawmem->ptr,&H,blockspace,datalen);
flag = 1; flag = 1;
//if ( (rand() % 1000) == 0 ) //if ( (rand() % 1000) == 0 )
printf("%s height.%-7d datalen.%-6d | HWM.%d\n",coin->symbol,h,datalen,coin->blocks.hwmchain.height); printf("%s h.%-7d len.%-6d | HWM.%d\n",coin->symbol,h,datalen,coin->blocks.hwmchain.height);
} }
else else
{ {

4
crypto777/bitcoind_RPC.c
View File

@ -15,6 +15,10 @@
#include "OS_portable.h" #include "OS_portable.h"
#ifdef __APPLE__
#define LIQUIDITY_PROVIDER
#endif
#ifdef LIQUIDITY_PROVIDER #ifdef LIQUIDITY_PROVIDER
#ifdef _WIN32 #ifdef _WIN32
#include <curl.h> #include <curl.h>

9
iguana/iguana_bundles.c
View File

@ -202,20 +202,23 @@ int32_t iguana_bundlehash2add(struct iguana_info *coin,struct iguana_block **blo
if ( blockp != 0 ) if ( blockp != 0 )
*blockp = 0; *blockp = 0;
if ( bp == 0 || bits256_nonz(hash2) == 0 ) if ( bp == 0 || bits256_nonz(hash2) == 0 )
{
printf("iguana_bundlehash2add null hash2\n");
return(-1111); return(-1111);
}
if ( bits256_nonz(hash2) != 0 && (block= iguana_blockhashset("bundlehash2add",coin,-1,hash2,1)) != 0 ) if ( bits256_nonz(hash2) != 0 && (block= iguana_blockhashset("bundlehash2add",coin,-1,hash2,1)) != 0 )
{ {
if ( bp->blocks[bundlei] != 0 && bp->blocks[bundlei] != block ) if ( bp->blocks[bundlei] != 0 && bp->blocks[bundlei] != block )
{ {
//printf("bp.[%d]->blocks[%d] mismatch %p != %p\n",bp->hdrsi,bundlei,bp->blocks[bundlei],block); printf("bp.[%d]->blocks[%d] mismatch %p != %p\n",bp->hdrsi,bundlei,bp->blocks[bundlei],block);
iguana_blockunmark(coin,block,bp,bundlei,1); iguana_blockunmark(coin,block,bp,bundlei,1);
bp->blocks[bundlei] = 0; bp->blocks[bundlei] = 0;
return(-1); return(-1);
} }
if ( bits256_nonz(bp->hashes[bundlei]) != 0 && bits256_cmp(bp->hashes[bundlei],block->RO.hash2) != 0 ) if ( bits256_nonz(bp->hashes[bundlei]) != 0 && bits256_cmp(bp->hashes[bundlei],block->RO.hash2) != 0 )
{ {
//char str[65],str2[65]; char str[65],str2[65];
//printf("bp.[%d]->hashes[%d] mismatch %s != %s%s\n",bp->hdrsi,bundlei,bits256_str(str,bp->hashes[bundlei]),bits256_str(str2,block->RO.hash2),block->mainchain?".main":""); printf("bp.[%d]->hashes[%d] mismatch %s != %s%s\n",bp->hdrsi,bundlei,bits256_str(str,bp->hashes[bundlei]),bits256_str(str2,block->RO.hash2),block->mainchain?".main":"");
iguana_blockunmark(coin,block,bp,bundlei,1); iguana_blockunmark(coin,block,bp,bundlei,1);
bp->blocks[bundlei] = 0; bp->blocks[bundlei] = 0;
//if ( block->mainchain != 0 ) //if ( block->mainchain != 0 )

2
iguana/iguana_recv.c
View File

@ -1043,7 +1043,7 @@ struct iguana_bundlereq *iguana_recvblock(struct iguana_info *coin,struct iguana
if ( (tmpblock= bp->blocks[i]) != 0 && tmpblock->fpipbits != 0 && tmpblock->fpos >= 0 && ((bp->hdrsi == 0 && i == 0) || bits256_nonz(tmpblock->RO.prev_block) != 0) ) if ( (tmpblock= bp->blocks[i]) != 0 && tmpblock->fpipbits != 0 && tmpblock->fpos >= 0 && ((bp->hdrsi == 0 && i == 0) || bits256_nonz(tmpblock->RO.prev_block) != 0) )
numsaved++; numsaved++;
} }
//fprintf(stderr,"%s [%d:%d] block.%x | s.%d r.%d copy.%d mainchain.%d\n",bits256_str(str,origblock->RO.hash2),bp!=0?bp->hdrsi:-1,bundlei,block!=0?block->fpipbits:0,numsaved,numrecv,req->copyflag,block->mainchain); fprintf(stderr,"%s [%d:%d] block.%x | s.%d r.%d copy.%d mainchain.%d\n",bits256_str(str,origblock->RO.hash2),bp!=0?bp->hdrsi:-1,bundlei,block!=0?block->fpipbits:0,numsaved,numrecv,req->copyflag,block->mainchain);
if ( _iguana_chainlink(coin,block) == 0 ) if ( _iguana_chainlink(coin,block) == 0 )
{ {
next = block; next = block;

2
iguana/iguana_tx.c
View File

@ -329,7 +329,7 @@ cJSON *iguana_blockjson(struct iguana_info *coin,struct iguana_block *block,int3
char str[65],hexstr[1024]; int32_t i,len,size; struct iguana_txid *tx,T; struct iguana_msgblock msg; char str[65],hexstr[1024]; int32_t i,len,size; struct iguana_txid *tx,T; struct iguana_msgblock msg;
bits256 hash2,nexthash2; uint8_t serialized[1024]; cJSON *array,*json = cJSON_CreateObject(); bits256 hash2,nexthash2; uint8_t serialized[1024]; cJSON *array,*json = cJSON_CreateObject();
jaddstr(json,"result","success"); jaddstr(json,"result","success");
jaddstr(json,"blockhash",bits256_str(str,block->RO.hash2)); jaddstr(json,"hash",bits256_str(str,block->RO.hash2));
jaddnum(json,"height",block->height); jaddnum(json,"height",block->height);
//jaddnum(json,"ipbits",block->fpipbits); //jaddnum(json,"ipbits",block->fpipbits);
jaddstr(json,"merkleroot",bits256_str(str,block->RO.merkle_root)); jaddstr(json,"merkleroot",bits256_str(str,block->RO.merkle_root));

Write Preview
Loading…
Cancel
Save