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

Merge pull request #173 from jl777/dev 

Dev
win-cross
jl777 8 years ago
committed by GitHub
parent
990c8da8da 264c3f0273
commit
7aabfba597
6 changed files with 67 additions and 19 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. 2
      iguana/dpow/dpow_network.c
  2. 22
      iguana/iguana_notary.c
  3. 12
      iguana/iguana_unspents.c
  4. 34
      iguana/tests/fundfiats
  5. 2
      iguana/tests/fundnotaries
  6. 2
      includes/iguana_apideclares.h

2
iguana/dpow/dpow_network.c
View File

@ -700,7 +700,7 @@ void dpow_bestconsensus(struct dpow_block *bp)
for (i=0; i<numdiff; i++)
{
//printf("(%d %llx).%d ",bestks[i],(long long)masks[i],counts[i]);
if ( counts[i] > best )
if ( counts[i] > best && bitweight(masks[i]) >= bp->minsigs )
{
best = counts[i];
besti = i;

22
iguana/iguana_notary.c
View File

@ -425,29 +425,33 @@ STRING_ARG(iguana,addnotary,ipaddr)
return(clonestr("{\"result\":\"notary node added\"}"));
}
STRING_ARG(dpow,active,maskhex)
STRING_ARG(dpow,fundnotaries,symbol)
{
uint8_t data[8],revdata[8]; int32_t i,len; uint64_t mask; cJSON *retjson,*array = cJSON_CreateArray();
//return(clonestr("{\"error\":\"dpow active is deprecated for now\"}"));
if ( 0 )
{
int32_t komodo_notaries(char *symbol,uint8_t pubkeys[64][33],int32_t height);
char CURRENCIES[][16] = { "USD", "EUR", "JPY", "GBP", "AUD", "CAD", "CHF", "NZD", // major currencies
"CNY", "RUB", "MXN", "BRL", "INR", "HKD", "TRY", "ZAR", "PLN", "NOK", "SEK", "DKK", "CZK", "HUF", "ILS", "KRW", "MYR", "PHP", "RON", "SGD", "THB", "BGN", "IDR", "HRK",
"REVS", "SUPERNET", "DEX", "PANGEA", "JUMBLR", "BET", "CRYPTO", "HODL", "SHARK", "BOTS", "MGW" };
uint8_t pubkeys[64][33]; char coinaddr[64]; int32_t i,j; double val = 0.01;
uint8_t pubkeys[64][33]; char coinaddr[64],cmd[1024]; int32_t i,j; double val = 0.01;
int32_t n = komodo_notaries("KMD",pubkeys,114000);
//#include "notaries.h"
for (i=0; i<sizeof(CURRENCIES)/sizeof(*CURRENCIES); i++)
{
if ( symbol == 0 || symbol[0] == 0 || strcmp(symbol,CURRENCIES[i]) == 0 )
{
for (j=0; j<n; j++)
{
//decode_hex(pubkeys[j],33,Notaries[j][1]);
bitcoin_address(coinaddr,60,pubkeys[j],33);
printf("./komodo-cli -ac_name=%s sendtoaddress %s %f\n",CURRENCIES[i],coinaddr,val);
sprintf(cmd,"./komodo-cli -ac_name=%s sendtoaddress %s %f\n",CURRENCIES[i],coinaddr,val);
if ( system(cmd) != 0 )
printf("ERROR with (%s)\n",cmd);
}
}
}
return(clonestr("{\"result\":\"success\"}"));
}
STRING_ARG(dpow,active,maskhex)
{
uint8_t data[8],revdata[8]; int32_t i,len; uint64_t mask; cJSON *retjson,*array = cJSON_CreateArray();
if ( maskhex == 0 || maskhex[0] == 0 )
{
mask = myinfo->DPOWS[0].lastrecvmask;

12
iguana/iguana_unspents.c
View File

@ -1169,7 +1169,7 @@ int32_t iguana_RTunspentslists(struct supernet_info *myinfo,struct iguana_info *
}
memset(pubkey,0,sizeof(pubkey));
//remains = required * 1.1 + coin->txfee;
if ( coin->FULLNODE > 0 || coin->VALIDATENODE > 0 || coin->notarychain >= 0 )
if ( coin->FULLNODE > 0 || coin->VALIDATENODE > 0 || (coin->FULLNODE == 0 && coin->notarychain >= 0) )
{
for (i=numunspents=0; i<numaddrs; i++)
{
@ -1220,9 +1220,12 @@ int32_t iguana_RTunspentslists(struct supernet_info *myinfo,struct iguana_info *
{
for (i=0; i<n; i++)
{
item = jitem(array,i);
if ( is_cJSON_False(jobj(item,"spendable")) != 0 )
{
printf("skip unspendable.(%s)\n",jprint(item,0));
continue;
item = jitem(array,i);
}
if ( (spendscriptstr= jstr(item,"scriptPubKey")) == 0 )
{
printf("no spendscriptstr.(%s)\n",jprint(item,0));
@ -1237,13 +1240,16 @@ int32_t iguana_RTunspentslists(struct supernet_info *myinfo,struct iguana_info *
break;
}
}
if ( numunspents == 0 )
printf("no unspents.(%s)\n",jprint(array,0));
free_json(array);
}
}
}
}
*totalp = sum;
printf("numunspents.%d max.%d sum %.8f required %.8f\n",numunspents,max,dstr(sum),dstr(required));
coinaddr = addresses != 0 ? jstri(addresses,i) : "";
printf("numunspents.%d max.%d sum %.8f required %.8f (%s)\n",numunspents,max,dstr(sum),dstr(required),coinaddr);
return(numunspents);
}

34
iguana/tests/fundfiats
View File

@ -0,0 +1,34 @@
#!/bin/bash
set -x
~/komodo/src/komodo-cli paxdeposit $1 1 aud
~/komodo/src/komodo-cli paxdeposit $1 1 bgn
~/komodo/src/komodo-cli paxdeposit $1 1 cad
~/komodo/src/komodo-cli paxdeposit $1 1 chf
~/komodo/src/komodo-cli paxdeposit $1 1 cny
~/komodo/src/komodo-cli paxdeposit $1 1 czk
~/komodo/src/komodo-cli paxdeposit $1 1 dkk
~/komodo/src/komodo-cli paxdeposit $1 1 eur
~/komodo/src/komodo-cli paxdeposit $1 1 gbp
~/komodo/src/komodo-cli paxdeposit $1 1 hkd
~/komodo/src/komodo-cli paxdeposit $1 1 hrk
~/komodo/src/komodo-cli paxdeposit $1 1 huf
~/komodo/src/komodo-cli paxdeposit $1 1 idr
~/komodo/src/komodo-cli paxdeposit $1 1 ils
~/komodo/src/komodo-cli paxdeposit $1 1 inr
~/komodo/src/komodo-cli paxdeposit $1 1 jpy
~/komodo/src/komodo-cli paxdeposit $1 1 krw
~/komodo/src/komodo-cli paxdeposit $1 1 mxn
~/komodo/src/komodo-cli paxdeposit $1 1 myr
~/komodo/src/komodo-cli paxdeposit $1 1 nok
~/komodo/src/komodo-cli paxdeposit $1 1 nzd
~/komodo/src/komodo-cli paxdeposit $1 1 php
~/komodo/src/komodo-cli paxdeposit $1 1 pln
~/komodo/src/komodo-cli paxdeposit $1 1 brl
~/komodo/src/komodo-cli paxdeposit $1 1 ron
~/komodo/src/komodo-cli paxdeposit $1 1 rub
~/komodo/src/komodo-cli paxdeposit $1 1 sek
~/komodo/src/komodo-cli paxdeposit $1 1 sgd
~/komodo/src/komodo-cli paxdeposit $1 1 thb
~/komodo/src/komodo-cli paxdeposit $1 1 try
~/komodo/src/komodo-cli paxdeposit $1 1 usd
~/komodo/src/komodo-cli paxdeposit $1 1 zar

2
iguana/tests/fundnotaries
View File

@ -0,0 +1,2 @@
#!/bin/bash
curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dpow\",\"method\":\"fundnotaries\",\"symbol\":\"$1\"}"

2
includes/iguana_apideclares.h
View File

@ -20,6 +20,8 @@ TWOINTS_AND_ARRAY(dpow,ratify,minsigs,timestamp,ratified);
ZERO_ARGS(dpow,cancelratify);
THREE_STRINGS(iguana,passthru,asset,function,hex);
STRING_ARG(dpow,bindaddr,ipaddr);
STRING_ARG(dpow,fundnotaries,symbol);
TWO_STRINGS(dex,send,hex,handler);
HASH_AND_STRING(dex,gettransaction,txid,symbol);
STRING_ARG(dex,getinfo,symbol);

Write Preview
Loading…
Cancel
Save