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

Merge pull request #317 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2017-03-18 17:01:06 +02:00
committed by GitHub
parent a5f3ea4da3 70bf862b23
commit 86774a6c33
4 changed files with 102 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/assetchains
View File

@@ -3,84 +3,84 @@ set -x
source pubkey.txt source pubkey.txt
echo $pubkey echo $pubkey
./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=78.47.196.146 $1 -gen & ./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 -gen & ./komodod -pubkey=$pubkey -ac_name=SUPERNET -ac_supply=816061 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=JUMBLR -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=JUMBLR -ac_supply=999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=9999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=9999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=SHARK -ac_supply=1401 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=SHARK -ac_supply=1401 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MGW -ac_supply=999999 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=MGW -ac_supply=999999 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MVP -ac_supply=1000000 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=MVP -ac_supply=1000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=WIRELESS -ac_supply=21000000 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=WIRELESS -ac_supply=21000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=KV -ac_supply=1000000 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=KV -ac_supply=1000000 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=CEAL -ac_supply=366666666 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=CEAL -ac_supply=366666666 -addnode=78.47.196.146 $1 &
./komodod -pubkey=$pubkey -ac_name=MESH -ac_supply=1000000 -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=MESH -ac_supply=1000000 -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1 &
sleep 10 sleep 10
./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1 -gen & ./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1 &

15
src/komodo_gateway.h
View File

@@ -839,7 +839,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
bitcoin_address(coinaddr,addrtype,rmd160,20); bitcoin_address(coinaddr,addrtype,rmd160,20);
checktoshis = PAX_fiatdest(&seed,tokomodo,destaddr,pubkey33,coinaddr,kmdheight,base,fiatoshis); checktoshis = PAX_fiatdest(&seed,tokomodo,destaddr,pubkey33,coinaddr,kmdheight,base,fiatoshis);
typestr = "deposit"; typestr = "deposit";
if ( kmdheight > 195000 || kmdheight <= height ) if ( strcmp(base,ASSETCHAINS_SYMBOL) == 0 && (kmdheight > 195000 || kmdheight <= height) )
{ {
didstats = 0; didstats = 0;
if ( 0 && kmdheight > 214700 && strcmp(base,ASSETCHAINS_SYMBOL) == 0 ) if ( 0 && kmdheight > 214700 && strcmp(base,ASSETCHAINS_SYMBOL) == 0 )
@@ -915,7 +915,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
else if ( opretbuf[0] == 'I' ) else if ( opretbuf[0] == 'I' )
{ {
tokomodo = 0; tokomodo = 0;
if ( strncmp((char *)"KMD",(char *)&opretbuf[opretlen-4],3) != 0 ) if ( strncmp((char *)"KMD",(char *)&opretbuf[opretlen-4],3) != 0 && strncmp(ASSETCHAINS_SYMBOL,(char *)&opretbuf[opretlen-4],3) == 0 )
{ {
if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,0)) > 0 ) if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,0)) > 0 )
{ {
@@ -961,7 +961,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
} //else printf("opreturn none issued?\n"); } //else printf("opreturn none issued?\n");
} }
} }
else if ( height < 236000 && opretbuf[0] == 'W' )//&& opretlen >= 38 ) else if ( height < 236000 && opretbuf[0] == 'W' && strncmp(ASSETCHAINS_SYMBOL,(char *)&opretbuf[opretlen-4],3) == 0 )//&& opretlen >= 38 )
{ {
if ( komodo_baseid((char *)&opretbuf[opretlen-4]) >= 0 && strcmp(ASSETCHAINS_SYMBOL,(char *)&opretbuf[opretlen-4]) == 0 ) if ( komodo_baseid((char *)&opretbuf[opretlen-4]) >= 0 && strcmp(ASSETCHAINS_SYMBOL,(char *)&opretbuf[opretlen-4]) == 0 )
{ {
@@ -1006,7 +1006,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
} // else printf("withdraw %s paxcmp ht.%d %d error value %.8f -> %.8f vs %.8f\n",base,kmdheight,height,dstr(value),dstr(komodoshis),dstr(checktoshis)); } // else printf("withdraw %s paxcmp ht.%d %d error value %.8f -> %.8f vs %.8f\n",base,kmdheight,height,dstr(value),dstr(komodoshis),dstr(checktoshis));
// need to allocate pax // need to allocate pax
} }
else if ( height < 236000 && tokomodo != 0 && opretbuf[0] == 'A' ) else if ( height < 236000 && tokomodo != 0 && opretbuf[0] == 'A' && ASSETCHAINS_SYMBOL[0] == 0 )
{ {
tokomodo = 1; tokomodo = 1;
if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 ) if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 )
@@ -1085,7 +1085,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
} //else printf("n.%d from opreturns\n",n); } //else printf("n.%d from opreturns\n",n);
//printf("extra.[%d] after %.8f\n",n,dstr(komodo_paxtotal())); //printf("extra.[%d] after %.8f\n",n,dstr(komodo_paxtotal()));
} }
else if ( height < 236000 && opretbuf[0] == 'X' ) else if ( height < 236000 && opretbuf[0] == 'X' && ASSETCHAINS_SYMBOL[0] == 0 )
{ {
tokomodo = 1; tokomodo = 1;
if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,1)) > 0 ) if ( (n= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,opretbuf,opretlen,1)) > 0 )
@@ -1127,7 +1127,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
void komodo_passport_iteration() void komodo_passport_iteration()
{ {
static long lastpos[34]; static char userpass[33][1024]; int32_t maxseconds = 1; static long lastpos[34]; static char userpass[33][1024]; int32_t maxseconds = 10;
FILE *fp; int32_t baseid,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0; FILE *fp; int32_t baseid,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0;
//printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL); //printf("PASSPORT.(%s)\n",ASSETCHAINS_SYMBOL);
expired = 0; expired = 0;
@@ -1163,6 +1163,8 @@ void komodo_passport_iteration()
isrealtime = 0; isrealtime = 0;
base = (char *)CURRENCIES[baseid]; base = (char *)CURRENCIES[baseid];
if ( baseid+1 != refid ) if ( baseid+1 != refid )
{
if ( baseid == 32 || ASSETCHAINS_SYMBOL[0] == 0 )
{ {
komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"komodostate"); komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"komodostate");
komodo_nameset(symbol,dest,base); komodo_nameset(symbol,dest,base);
@@ -1213,6 +1215,7 @@ void komodo_passport_iteration()
fclose(fp); fclose(fp);
} //else fprintf(stderr,"%s open error RT\n",base); } //else fprintf(stderr,"%s open error RT\n",base);
} }
}
else else
{ {
komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"realtime"); komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"realtime");

2
src/main.cpp
View File

@@ -3916,7 +3916,7 @@ bool LoadBlockIndex()
return false; return false;
} }
KOMODO_LOADINGBLOCKS = 0; KOMODO_LOADINGBLOCKS = 0;
fprintf(stderr,"finished loading blocks\n"); fprintf(stderr,"finished loading blocks %s\n",ASSETCHAINS_SYMBOL);
return true; return true;
} }

4
src/miner.cpp
View File

@@ -562,7 +562,7 @@ void static BitcoinMiner(CWallet *pwallet)
assert(solver == "tromp" || solver == "default"); assert(solver == "tromp" || solver == "default");
LogPrint("pow", "Using Equihash solver \"%s\" with n = %u, k = %u\n", solver, n, k); LogPrint("pow", "Using Equihash solver \"%s\" with n = %u, k = %u\n", solver, n, k);
if ( ASSETCHAINS_SYMBOL[0] != 0 ) if ( ASSETCHAINS_SYMBOL[0] != 0 )
fprintf(stderr,"notaryid.%d Mining with %s\n",notaryid,solver.c_str()); fprintf(stderr,"notaryid.%d Mining.%s with %s\n",notaryid,ASSETCHAINS_SYMBOL,solver.c_str());
std::mutex m_cs; std::mutex m_cs;
bool cancelSolver = false; bool cancelSolver = false;
boost::signals2::connection c = uiInterface.NotifyBlockTip.connect( boost::signals2::connection c = uiInterface.NotifyBlockTip.connect(
@@ -678,7 +678,9 @@ void static BitcoinMiner(CWallet *pwallet)
} }
for (j=gpucount=0; j<65; j++) for (j=gpucount=0; j<65; j++)
{ {
if ( mids[j] >= 0 )
fprintf(stderr,"%d ",mids[j]); fprintf(stderr,"%d ",mids[j]);
else fprintf(stderr,"GPU ");
if ( mids[j] == -1 ) if ( mids[j] == -1 )
gpucount++; gpucount++;
} }