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

Test

Browse Source
This commit is contained in:
jl777
2017-03-30 05:18:17 +03:00
parent 7edaed9bc7
commit f8402b5dd9
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rpcblockchain.cpp
View File

@@ -325,10 +325,7 @@ uint256 _komodo_getblockhash(int32_t nHeight)
return(hash); return(hash);
} }
//Value getblock(const Array& params, bool fHelp)
//=======
UniValue getblockheader(const UniValue& params, bool fHelp) UniValue getblockheader(const UniValue& params, bool fHelp)
//>>>>>>> zcash/master
{ {
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
@@ -529,7 +526,7 @@ char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,
int32_t komodo_minerids(uint8_t *minerids,int32_t height,int32_t width); int32_t komodo_minerids(uint8_t *minerids,int32_t height,int32_t width);
int32_t komodo_kvsearch(uint256 *refpubkeyp,int32_t current_height,uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen); int32_t komodo_kvsearch(uint256 *refpubkeyp,int32_t current_height,uint32_t *flagsp,int32_t *heightp,uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen);
Value kvsearch(const Array& params, bool fHelp) UniValue kvsearch(const Array& params, bool fHelp)
{ {
Object ret; uint32_t flags; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t duration,j,height,valuesize,keylen; uint256 refpubkey; static uint256 zeroes; Object ret; uint32_t flags; uint8_t value[IGUANA_MAXSCRIPTSIZE],key[IGUANA_MAXSCRIPTSIZE]; int32_t duration,j,height,valuesize,keylen; uint256 refpubkey; static uint256 zeroes;
if (fHelp || params.size() != 1 ) if (fHelp || params.size() != 1 )
@@ -564,7 +561,7 @@ Value kvsearch(const Array& params, bool fHelp)
return ret; return ret;
} }
Value minerids(const Array& params, bool fHelp) UniValue minerids(const Array& params, bool fHelp)
{ {
Object ret; Array a; uint8_t minerids[2000],pubkeys[65][33]; int32_t i,j,n,numnotaries,tally[129]; Object ret; Array a; uint8_t minerids[2000],pubkeys[65][33]; int32_t i,j,n,numnotaries,tally[129];
if ( fHelp || params.size() != 1 ) if ( fHelp || params.size() != 1 )
@@ -615,7 +612,7 @@ Value minerids(const Array& params, bool fHelp)
return ret; return ret;
} }
Value notaries(const Array& params, bool fHelp) UniValue notaries(const Array& params, bool fHelp)
{ {
Array a; Object ret; int32_t i,j,n,m; char *hexstr; uint8_t pubkeys[64][33]; char btcaddr[64],kmdaddr[64],*ptr; Array a; Object ret; int32_t i,j,n,m; char *hexstr; uint8_t pubkeys[64][33]; char btcaddr[64],kmdaddr[64],*ptr;
if ( fHelp || params.size() != 1 ) if ( fHelp || params.size() != 1 )
@@ -667,7 +664,7 @@ int32_t komodo_pending_withdraws(char *opretstr);
int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base); int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base);
extern char CURRENCIES[][8]; extern char CURRENCIES[][8];
Value paxpending(const Array& params, bool fHelp) UniValue paxpending(const Array& params, bool fHelp)
{ {
Object ret; Array a; char opretbuf[10000*2]; int32_t opretlen,baseid; uint64_t available,deposited,issued,withdrawn,approved,redeemed; Object ret; Array a; char opretbuf[10000*2]; int32_t opretlen,baseid; uint64_t available,deposited,issued,withdrawn,approved,redeemed;
if ( fHelp || params.size() != 0 ) if ( fHelp || params.size() != 0 )
@@ -698,7 +695,7 @@ Value paxpending(const Array& params, bool fHelp)
return ret; return ret;
} }
Value paxprice(const Array& params, bool fHelp) UniValue paxprice(const Array& params, bool fHelp)
{ {
if ( fHelp || params.size() > 4 || params.size() < 2 ) if ( fHelp || params.size() > 4 || params.size() < 2 )
throw runtime_error("paxprice \"base\" \"rel\" height\n"); throw runtime_error("paxprice \"base\" \"rel\" height\n");
@@ -737,7 +734,7 @@ Value paxprice(const Array& params, bool fHelp)
return ret; return ret;
} }
Value paxprices(const Array& params, bool fHelp) UniValue paxprices(const Array& params, bool fHelp)
{ {
if ( fHelp || params.size() != 3 ) if ( fHelp || params.size() != 3 )
throw runtime_error("paxprices \"base\" \"rel\" maxsamples\n"); throw runtime_error("paxprices \"base\" \"rel\" maxsamples\n");
@@ -774,10 +771,7 @@ Value paxprices(const Array& params, bool fHelp)
uint64_t komodo_accrued_interest(int32_t *txheightp,uint32_t *locktimep,uint256 hash,int32_t n,int32_t checkheight,uint64_t checkvalue); uint64_t komodo_accrued_interest(int32_t *txheightp,uint32_t *locktimep,uint256 hash,int32_t n,int32_t checkheight,uint64_t checkvalue);
//Value gettxout(const Array& params, bool fHelp)
//=======
UniValue gettxout(const UniValue& params, bool fHelp) UniValue gettxout(const UniValue& params, bool fHelp)
//>>>>>>> zcash/master
{ {
if (fHelp || params.size() < 2 || params.size() > 3) if (fHelp || params.size() < 2 || params.size() > 3)
throw runtime_error( throw runtime_error(

6
src/wallet/rpcwallet.cpp
View File

@@ -492,7 +492,7 @@ int32_t komodo_kvduration(uint32_t flags);
uint256 komodo_kvprivkey(uint256 *pubkeyp,char *passphrase); uint256 komodo_kvprivkey(uint256 *pubkeyp,char *passphrase);
int32_t komodo_kvsigverify(uint8_t *buf,int32_t len,uint256 _pubkey,uint256 sig); int32_t komodo_kvsigverify(uint8_t *buf,int32_t len,uint256 _pubkey,uint256 sig);
Value kvupdate(const Array& params, bool fHelp) UniValue kvupdate(const Array& params, bool fHelp)
{ {
static uint256 zeroes; static uint256 zeroes;
CWalletTx wtx; Object ret; CWalletTx wtx; Object ret;
@@ -608,7 +608,7 @@ Value kvupdate(const Array& params, bool fHelp)
return ret; return ret;
} }
Value paxdeposit(const Array& params, bool fHelp) UniValue paxdeposit(const Array& params, bool fHelp)
{ {
uint64_t available,deposited,issued,withdrawn,approved,redeemed,seed,komodoshis = 0; int32_t height; char destaddr[64]; uint8_t i,pubkey37[33]; uint64_t available,deposited,issued,withdrawn,approved,redeemed,seed,komodoshis = 0; int32_t height; char destaddr[64]; uint8_t i,pubkey37[33];
bool fSubtractFeeFromAmount = false; bool fSubtractFeeFromAmount = false;
@@ -650,7 +650,7 @@ Value paxdeposit(const Array& params, bool fHelp)
return wtx.GetHash().GetHex(); return wtx.GetHash().GetHex();
} }
Value paxwithdraw(const Array& params, bool fHelp) UniValue paxwithdraw(const Array& params, bool fHelp)
{ {
CWalletTx wtx; std::string dest; int32_t kmdheight; uint64_t seed,komodoshis = 0; char destaddr[64]; uint8_t i,pubkey37[37]; bool fSubtractFeeFromAmount = false; CWalletTx wtx; std::string dest; int32_t kmdheight; uint64_t seed,komodoshis = 0; char destaddr[64]; uint8_t i,pubkey37[37]; bool fSubtractFeeFromAmount = false;
if ( ASSETCHAINS_SYMBOL[0] == 0 ) if ( ASSETCHAINS_SYMBOL[0] == 0 )