DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #68 from jl777/acspeed

Browse Source 
Acspeed
This commit is contained in:
jl777
2016-11-29 15:27:32 -03:00
committed by GitHub
parent 8b6b62bb21 b6191882b2
commit 620b39359d
16 changed files with 102 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/assetchains
View File

@@ -3,8 +3,63 @@ set -x
source pubkey.txt
echo $pubkey
./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=SUPERNET -ac_supply=816061 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=1000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=1000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=JUMBLR -ac_supply=1000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=1000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=1000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=10000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=SHARK -ac_supply=1400 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=10000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MGW -ac_supply=10000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1 &
curl --url "http://127.0.0.1:7776" --data "{\"timeout\":60000,\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"REVS\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"SUPERNET\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"DEX\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"PANGEA\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"JUMBLR\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BET\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CRYPTO\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"HODL\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"SHARK\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BOTS\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MGW\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"USD\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"EUR\",\"pubkey\":\"$pubkey\"}"
@@ -39,37 +94,3 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dp
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"IDR\",\"pubkey\":\"$pubkey\"}"
curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"HRK\",\"pubkey\":\"$pubkey\"}"
./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1 &

10
src/fiat-cli
View File

@@ -33,3 +33,13 @@ echo try; fiat/try $1 $2 $3 $4
echo usd; fiat/usd $1 $2 $3 $4
echo zar; fiat/zar $1 $2 $3 $4
echo revs; fiat/revs $1 $2 $3 $4
echo revs; fiat/supernet $1 $2 $3 $4
echo revs; fiat/dex $1 $2 $3 $4
echo revs; fiat/pangea $1 $2 $3 $4
echo revs; fiat/jumblr $1 $2 $3 $4
echo revs; fiat/bet $1 $2 $3 $4
echo revs; fiat/crypto $1 $2 $3 $4
echo revs; fiat/hodl $1 $2 $3 $4
echo revs; fiat/shark $1 $2 $3 $4
echo revs; fiat/bots $1 $2 $3 $4
echo revs; fiat/mgw $1 $2 $3 $4

3
src/fiat/_usd
View File

@@ -1,3 +0,0 @@
#!/bin/bash
./komodo-cli -ac_name=-USD $1 $2 $3 $4

2
src/fiat/bet Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=BET $1 $2 $3 $4

2
src/fiat/bots Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=BOTS $1 $2 $3 $4

2
src/fiat/crypto Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=CRYPTO $1 $2 $3 $4

2
src/fiat/dex Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=DEX $1 $2 $3 $4

2
src/fiat/hodl Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=HODL $1 $2 $3 $4

2
src/fiat/jumblr Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=JUMBLR $1 $2 $3 $4

2
src/fiat/mgw Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=MGW $1 $2 $3 $4

2
src/fiat/pangea Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=PANGEA $1 $2 $3 $4

2
src/fiat/shark Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=SHARK $1 $2 $3 $4

2
src/fiat/supernet Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
./komodo-cli -ac_name=SUPERNET $1 $2 $3 $4

2
src/komodo.h
View File

@@ -501,7 +501,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
numvouts = block.vtx[i].vout.size();
notaryid = -1;
voutmask = specialtx = notarizedheight = isratification = notarized = 0;
signedmask = 0;
signedmask = 1;
numvins = block.vtx[i].vin.size();
for (j=0; j<numvins; j++)
{

10
src/komodo_gateway.h
View File

@@ -498,7 +498,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
}
if ( matched != num )
{
printf("WOULD REJECT: ht.%d (%c) matched.%d vs num.%d\n",height,opcode,matched,num);
printf("WOULD REJECT %s: ht.%d (%c) matched.%d vs num.%d\n",symbol,height,opcode,matched,num);
// can easily happen depending on order of loading
if ( height > 100000 ) //&& opcode == 'X' )
{
@@ -512,7 +512,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
return(0);
}
int32_t komodo_paxcmp(int32_t kmdheight,uint64_t value,uint64_t checkvalue,uint64_t seed)
int32_t komodo_paxcmp(char *symbol,int32_t kmdheight,uint64_t value,uint64_t checkvalue,uint64_t seed)
{
int32_t ratio;
if ( seed == 0 && checkvalue != 0 )
@@ -523,7 +523,7 @@ int32_t komodo_paxcmp(int32_t kmdheight,uint64_t value,uint64_t checkvalue,uint6
else
{
if ( kmdheight >= 86150 )
printf("ht.%d ignore mismatched value %lld vs checkvalue %lld -> ratio.%d\n",kmdheight,(long long)value,(long long)checkvalue,ratio);
printf("ht.%d ignore mismatched %s value %lld vs checkvalue %lld -> ratio.%d\n",kmdheight,symbol,(long long)value,(long long)checkvalue,ratio);
return(-1);
}
}
@@ -561,7 +561,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
printf("%02x",pubkey33[i]);
printf(" checkpubkey check %.8f v %.8f dest.(%s) kmdheight.%d height.%d\n",dstr(checktoshis),dstr(value),destaddr,kmdheight,height);*/
didstats = 0;
if ( komodo_paxcmp(kmdheight,value,checktoshis,seed) == 0 )
if ( komodo_paxcmp(base,kmdheight,value,checktoshis,seed) == 0 )
{
if ( (pax= komodo_paxfind(txid,vout,'D')) == 0 )
{
@@ -603,7 +603,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
typestr = "withdraw";
//printf("%s.height.%d vs height.%d check %.8f/%.8f vs %.8f tokomodo.%d %d seed.%llx -> (%s)\n",ASSETCHAINS_SYMBOL,kmdheight,height,dstr(checktoshis),dstr(komodoshis),dstr(value),komodo_is_issuer(),strncmp(ASSETCHAINS_SYMBOL,base,strlen(base)) == 0,(long long)seed,coinaddr);
didstats = 0;
if ( komodo_paxcmp(kmdheight,komodoshis,checktoshis,seed) == 0 )
if ( komodo_paxcmp(base,kmdheight,komodoshis,checktoshis,seed) == 0 )
{
if ( value != 0 && ((pax= komodo_paxfind(txid,vout,'W')) == 0 || pax->didstats == 0) )
{

15
src/miner.cpp
View File

@@ -124,7 +124,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
if ( ASSETCHAINS_SYMBOL[0] != 0 && chainActive.Tip()->nHeight >= 100 )
{
isrealtime = komodo_isrealtime(&kmdheight);
fprintf(stderr,"start CreateNewBlock %s initdone.%d deposit %.8f mempool.%d RT.%u KOMODO_ON_DEMAND.%d\n",ASSETCHAINS_SYMBOL,KOMODO_INITDONE,(double)komodo_paxtotal()/COIN,(int32_t)mempool.GetTotalTxSize(),isrealtime,KOMODO_ON_DEMAND);
while ( KOMODO_ON_DEMAND == 0 )
{
deposits = komodo_paxtotal();
@@ -133,7 +132,10 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
//fprintf(stderr,"INITDONE.%d RT.%d deposits %.8f ht.%d\n",KOMODO_INITDONE,isrealtime,(double)deposits/COIN,kmdheight);
}
else if ( deposits != 0 )
{
//fprintf(stderr,"start CreateNewBlock %s initdone.%d deposit %.8f mempool.%d RT.%u KOMODO_ON_DEMAND.%d\n",ASSETCHAINS_SYMBOL,KOMODO_INITDONE,(double)komodo_paxtotal()/COIN,(int32_t)mempool.GetTotalTxSize(),isrealtime,KOMODO_ON_DEMAND);
break;
}
sleep(10);
}
KOMODO_ON_DEMAND = 0;
@@ -393,7 +395,8 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
else if ( komodo_is_issuer() != 0 )
{
komodo_gateway_deposits(&txNew,ASSETCHAINS_SYMBOL,0);
fprintf(stderr,"%s txNew numvouts.%d\n",ASSETCHAINS_SYMBOL,(int32_t)txNew.vout.size());
if ( txNew.vout.size() > 1 )
fprintf(stderr,"%s txNew numvouts.%d\n",ASSETCHAINS_SYMBOL,(int32_t)txNew.vout.size());
}
pblock->vtx[0] = txNew;
pblocktemplate->vTxFees[0] = -nFees;
@@ -609,8 +612,12 @@ void static BitcoinMiner(CWallet *pwallet)
} else Mining_start = 0;
while (true)
{
if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 )
fprintf(stderr,"%s start mining loop\n",ASSETCHAINS_SYMBOL);
if ( ASSETCHAINS_SYMBOL[0] != 0 && pblock->vtx[0].vout.size() == 1 && Mining_height >= 100 )
{
//fprintf(stderr,"skip generating %s on-demand block, no tx avail\n",ASSETCHAINS_SYMBOL);
sleep(10);
break;
}
// Hash state
KOMODO_CHOSEN_ONE = 0;
crypto_generichash_blake2b_state state;