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
9dad3f34c5
commit
c1104e4bc9
2 changed files with 12 additions and 10 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. 20
      basilisk/basilisk_bitcoin.c
  2. 2
      iguana/tests/rawtx

20
basilisk/basilisk_bitcoin.c
View File

@ -39,7 +39,7 @@ int64_t bitcoin_value(struct iguana_info *coin,bits256 txid,int16_t vout,char *c
{ {
if ( strcmp(jstri(addrs,j),coinaddr) == 0 ) if ( strcmp(jstri(addrs,j),coinaddr) == 0 )
{ {
value = SATOSHIDEN * jdouble(item,"amount"); value = SATOSHIDEN * jdouble(item,"satoshis");
break; break;
} }
} }
@ -74,7 +74,7 @@ char *bitcoin_balance(struct iguana_info *coin,char *coinaddr,int32_t lastheight
if ( (n= cJSON_GetArraySize(array)) > 0 ) if ( (n= cJSON_GetArraySize(array)) > 0 )
{ {
for (i=0; i<n; i++) for (i=0; i<n; i++)
balance += SATOSHIDEN * jdouble(jitem(array,i),"amount"); balance += SATOSHIDEN * jdouble(jitem(array,i),"satoshis");
} }
free_json(array); free_json(array);
} }
@ -373,7 +373,7 @@ char *basilisk_valuestr(struct iguana_info *coin,char *coinaddr,uint64_t value,i
cJSON *retjson = cJSON_CreateObject(); cJSON *retjson = cJSON_CreateObject();
jaddnum(retjson,"result",dstr(value)); jaddnum(retjson,"result",dstr(value));
jaddstr(retjson,"address",coinaddr); jaddstr(retjson,"address",coinaddr);
jadd64bits(retjson,"value",value); jadd64bits(retjson,"satoshis",value);
jaddnum(retjson,"height",height); jaddnum(retjson,"height",height);
jaddbits256(retjson,"txid",txid); jaddbits256(retjson,"txid",txid);
jaddnum(retjson,"vout",vout); jaddnum(retjson,"vout",vout);
@ -390,7 +390,7 @@ double basilisk_bitcoin_valuemetric(struct supernet_info *myinfo,struct basilisk
if ( (resultarg= cJSON_Parse(resultstr)) != 0 ) if ( (resultarg= cJSON_Parse(resultstr)) != 0 )
{ {
safecopy(v->coinaddr,jstr(resultarg,"address"),sizeof(v->coinaddr)); safecopy(v->coinaddr,jstr(resultarg,"address"),sizeof(v->coinaddr));
v->value = j64bits(resultarg,"value"); v->value = j64bits(resultarg,"satoshis");
v->txid = jbits256(resultarg,"txid"); v->txid = jbits256(resultarg,"txid");
v->vout = jint(resultarg,"vout"); v->vout = jint(resultarg,"vout");
v->height = jint(resultarg,"height"); v->height = jint(resultarg,"height");
@ -432,7 +432,7 @@ void *basilisk_bitcoinvalue(struct basilisk_item *Lptr,struct supernet_info *myi
} }
} }
//printf("bitcoinvalue issue remote\n"); //printf("bitcoinvalue issue remote\n");
return(basilisk_issueremote(myinfo,"value",coin->symbol,valsobj,timeoutmillis,juint(valsobj,"fanout"),juint(valsobj,"minresults"),basilisktag,coin->basilisk_valuemetric)); return(basilisk_issueremote(myinfo,"satoshis",coin->symbol,valsobj,timeoutmillis,juint(valsobj,"fanout"),juint(valsobj,"minresults"),basilisktag,coin->basilisk_valuemetric));
} }
double basilisk_bitcoin_rawtxmetric_dependents(struct supernet_info *myinfo,struct iguana_info *coin,struct basilisk_item *ptr,struct bitcoin_rawtxdependents *dependents) double basilisk_bitcoin_rawtxmetric_dependents(struct supernet_info *myinfo,struct iguana_info *coin,struct basilisk_item *ptr,struct bitcoin_rawtxdependents *dependents)
@ -470,11 +470,13 @@ double basilisk_bitcoin_rawtxmetric_dependents(struct supernet_info *myinfo,stru
addresses = jarray(&numaddrs,ptr->vals,"addresses"); addresses = jarray(&numaddrs,ptr->vals,"addresses");
for (inputsum=i=0; i<dependents->numptrs; i++) for (inputsum=i=0; i<dependents->numptrs; i++)
{ {
if ( (child= dependents->ptrs[i]) != 0 && (childstr= child->retstr) != 0 && (coinaddr= &dependents->coinaddrs[64*i]) != 0 ) if ( (child= dependents->ptrs[i]) != 0 && (childstr= child->retstr) != 0 )
{ {
printf("child.(%s)\n",childstr);
coinaddr = &dependents->coinaddrs[64*i];
if ( (childjson= cJSON_Parse(childstr)) != 0 ) if ( (childjson= cJSON_Parse(childstr)) != 0 )
{ {
if ( (value= j64bits(childjson,"value")) != 0 ) if ( (value= j64bits(childjson,"satoshis")) != 0 )
{ {
inputsum += value; inputsum += value;
for (j=0; j<numaddrs; j++) for (j=0; j<numaddrs; j++)
@ -532,7 +534,7 @@ double basilisk_bitcoin_rawtxmetric(struct supernet_info *myinfo,struct basilisk
} }
changeaddr = jstr(ptr->vals,"changeaddr"); changeaddr = jstr(ptr->vals,"changeaddr");
locktime = juint(ptr->vals,"locktime"); locktime = juint(ptr->vals,"locktime");
amount = j64bits(ptr->vals,"amount"); amount = j64bits(ptr->vals,"satoshis");
addresses = jarray(&numaddrs,ptr->vals,"addresses"); addresses = jarray(&numaddrs,ptr->vals,"addresses");
if ( (txobj= bitcoin_hex2json(coin,&txid,&msgtx,rawtx,extraspace,sizeof(extraspace),serialized)) != 0 ) if ( (txobj= bitcoin_hex2json(coin,&txid,&msgtx,rawtx,extraspace,sizeof(extraspace),serialized)) != 0 )
{ {
@ -637,7 +639,7 @@ void *basilisk_bitcoinrawtx(struct basilisk_item *Lptr,struct supernet_info *myi
vins = 0; vins = 0;
changeaddr = jstr(valsobj,"changeaddr"); changeaddr = jstr(valsobj,"changeaddr");
spendscriptstr = jstr(valsobj,"spendscript"); spendscriptstr = jstr(valsobj,"spendscript");
amount = j64bits(valsobj,"amount"); amount = j64bits(valsobj,"satoshis");
if ( (txfee= j64bits(valsobj,"txfee")) == 0 ) if ( (txfee= j64bits(valsobj,"txfee")) == 0 )
txfee = coin->chain->txfee; txfee = coin->chain->txfee;
if ( txfee == 0 ) if ( txfee == 0 )

2
iguana/tests/rawtx
View File

@ -1 +1 @@
curl --url "http://127.0.0.1:7778" --data "{\"activecoin\":\"BTC\",\"agent\":\"basilisk\",\"method\":\"rawtx\",\"vals\":{\"changeaddr\":\"1FNhoaBYzf7safMBjoCsJYgxtah3K95sep\",\"addresses\":[\"1Hgzt5xsnbfc8UTWqWKSTLRm5bEYHYBoCE\"],\"timeout\":15000,\"amount\":\"20000\",\"spendscript\":\"76a914b7128d2ee837cf03e30a2c0e3e0181f7b9669bb688ac\"}}" curl --url "http://127.0.0.1:7778" --data "{\"activecoin\":\"BTC\",\"agent\":\"basilisk\",\"method\":\"rawtx\",\"vals\":{\"changeaddr\":\"1FNhoaBYzf7safMBjoCsJYgxtah3K95sep\",\"addresses\":[\"1Hgzt5xsnbfc8UTWqWKSTLRm5bEYHYBoCE\"],\"timeout\":15000,\"satoshis\":\"20000\",\"spendscript\":\"76a914b7128d2ee837cf03e30a2c0e3e0181f7b9669bb688ac\"}}"

Write Preview
Loading…
Cancel
Save