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

Merge branch 'master' into release/v0.1

release/v0.1
jl777 8 years ago
parent
9131abd583 69b9f76760
commit
b8c17c6111
2 changed files with 28 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      basilisk/basilisk_bitcoin.c
  2. 43
      iguana/iguana_unspents.c

16
basilisk/basilisk_bitcoin.c
View File

@ -932,7 +932,7 @@ int32_t basilisk_unspentfind(struct supernet_info *myinfo,struct iguana_info *co
struct basilisk_spend *basilisk_addspend(struct supernet_info *myinfo,char *symbol,bits256 txid,uint16_t vout,int32_t addflag)
{
int32_t i; struct basilisk_spend *s;
int32_t i=0; struct basilisk_spend *s;
// mutex
if ( myinfo->numspends > 0 )
{
@ -947,9 +947,9 @@ struct basilisk_spend *basilisk_addspend(struct supernet_info *myinfo,char *symb
}
if ( addflag != 0 && i == myinfo->numspends )
{
printf("realloc spends.[%d] %p\n",myinfo->numspends,myinfo->spends);
//printf("realloc spends.[%d] %p\n",myinfo->numspends,myinfo->spends);
myinfo->spends = realloc(myinfo->spends,sizeof(*myinfo->spends) * (myinfo->numspends+1));
printf("allocated spends.[%d] %p\n",myinfo->numspends+1,myinfo->spends);
//printf("allocated spends.[%d] %p\n",myinfo->numspends+1,myinfo->spends);
s = &myinfo->spends[myinfo->numspends++];
memset(s,0,sizeof(*s));
s->txid = txid;
@ -1015,7 +1015,6 @@ void basilisk_unspent_update(struct supernet_info *myinfo,struct iguana_info *co
already_spent = spentheight;
if ( (bu.spentheight= already_spent) != 0 )
bu.status = 1;
//printf("i.%d n.%d\n",i,n);
if ( i == n )
{
if ( i >= waddr->maxunspents )
@ -1025,11 +1024,8 @@ void basilisk_unspent_update(struct supernet_info *myinfo,struct iguana_info *co
//printf("allocate max.%d for %s\n",waddr->maxunspents,waddr->coinaddr);
}
waddr->numunspents++;
//printf("new unspent.%s %d script.%p [%d]\n",waddr->coinaddr,waddr->numunspents,bu.script,bu.spendlen);
}
waddr->unspents[i] = bu;
//PREVENT DOUBLE SPENDS!!! and use p2sh
if ( i == n && bu.spentheight != 0 && (dest= jobj(item,"dest")) != 0 )
//printf("new unspent.%s %d script.%p [%d] (%s)\n",waddr->coinaddr,waddr->numunspents,bu.script,bu.spendlen,jprint(item,0));
if ( bu.spentheight != 0 && (dest= jobj(item,"dest")) != 0 )
{
struct basilisk_spend *s;
//{"txid":"cd4fb72f871d481c534f15d7f639883958936d49e965f58276f0925798e762df","vin":1,"height":<spentheight>,"unspentheight":<bu.height>,"relays":2}},
@ -1059,6 +1055,8 @@ void basilisk_unspent_update(struct supernet_info *myinfo,struct iguana_info *co
}
}
}
waddr->unspents[i] = bu;
}
} else printf("waddr.%p script.%p address.%p %s\n",waddr,script,address,address!=0?address:"");
}

43
iguana/iguana_unspents.c
View File

@ -62,48 +62,6 @@ int32_t iguana_RTunspentind2txid(struct supernet_info *myinfo,struct iguana_info
else break;
}
return(-1);
//{"txid":"e34686afc17ec37a8438f0c9a7e48f98d0c625c7917a59c2d7fa22b53d570115","vout":1,"address":"16jsjc1YvzDXqKf7PorMhTyK8ym3ra3uxm","scriptPubKey":"76a9143ef4734c1141725c095342095f6e0e7748b6c16588ac","amount":0.01000000,"timestamp":0,"height":419261,"confirmations":1729,"checkind":4497018,"account":"default","spendable":true,"spent":{"hdrsi":209,"pkind":2459804,"unspentind":4497018,"prevunspentind":0,"satoshis":"1000000","txidind":1726947,"vout":1,"type":2,"fileid":0,"scriptpos":0,"scriptlen":25},"spentheight":419713,"dest":{"spentfrom":"22651e62f248fe2e72053d650f177e4b246ee016605102a40419e603b2bbeac8","vin":0,"timestamp":0,"vouts":[{"1KRhTPvoxyJmVALwHFXZdeeWFbcJSbkFPu":0.00010000}, {"1GQHQ7vwVpGeir2kKrYATsLtrkUQSc7FGY":0.00980000}],"total":0.00990000,"ratio":1}}
/* cJSON *retarray,*item,*uitem,*sitem; char *retstr; int32_t i,n,retval = -1;
*voutp = *spentheightp = -1;
memset(txidp,0,sizeof(*txidp));
if ( (retstr= bitcoinrpc_listunspent(myinfo,coin,0,0,0,0,0)) != 0 )
{
if ( (retarray= cJSON_Parse(retstr)) != 0 )
{
if ( (n= cJSON_GetArraySize(retarray)) > 0 )
{
for (i=0; i<n; i++)
{
item = jitem(retarray,i);
if ( (uitem= jobj(item,"unspent")) != 0 )
{
if ( juint(uitem,"hdrsi") == hdrsi && juint(uitem,"unspentind") == unspentind )
{
*txidp = jbits256(item,"txid");
*voutp = jint(item,"vout");
*spentheightp = 0;
retval = 0;
break;
}
}
else if ( (sitem= jobj(item,"spent")) != 0 )
{
if ( juint(sitem,"hdrsi") == hdrsi && juint(sitem,"unspentind") == unspentind )
{
*txidp = jbits256(item,"txid");
*voutp = jint(item,"vout");
*spentheightp = jint(item,"spentheight");
retval = 1;
break;
}
}
}
}
free_json(retarray);
}
free(retstr);
}
return(retval);*/
}
int32_t iguana_unspentindfind(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,uint8_t *spendscript,int32_t *spendlenp,uint64_t *valuep,int32_t *heightp,bits256 txid,int32_t vout,int32_t lasthdrsi,int32_t mempool)
@ -213,6 +171,7 @@ cJSON *ramchain_unspentjson(struct iguana_unspent *up,uint32_t unspentind)
cJSON *ramchain_spentjson(struct iguana_info *coin,int32_t spentheight,bits256 txid,int32_t vout,int64_t uvalue)
{
char coinaddr[64]; bits256 hash2,*X; struct iguana_txid T,*tx,*spentT,*spent_tx; struct iguana_bundle *bp; int32_t j,i,ind; struct iguana_block *block; int64_t total = 0; struct iguana_unspent *U,*u; struct iguana_pkhash *P; struct iguana_spend *S,*s; struct iguana_ramchaindata *rdata; cJSON *addrs,*item,*voutobj;
//RTpath!
item = cJSON_CreateObject();
hash2 = iguana_blockhash(coin,spentheight);
if ( (block= iguana_blockfind("spent",coin,hash2)) != 0 && (bp= coin->bundles[spentheight/coin->chain->bundlesize]) != 0 && (rdata= bp->ramchain.H.data) != 0 )

Write Preview
Loading…
Cancel
Save