sharpetronics/hush3
1
0
Fork 0
mirror of https://git.hush.is/hush/hush3.git synced 2025-10-06 00:04:41 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into jl777

Browse Source
This commit is contained in:
blackjok3rtt 2019-05-14 08:47:56 +08:00 committed by GitHub
commit 4b90e548a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chain.h
View File

@ -547,7 +547,7 @@ public:
if ((s.GetType() & SER_DISK) && (nVersion >= SAPLING_VALUE_VERSION)) { if ((s.GetType() & SER_DISK) && (nVersion >= SAPLING_VALUE_VERSION)) {
READWRITE(nSaplingValue); READWRITE(nSaplingValue);
} }
if ( (s.GetType() & SER_DISK) && (is_STAKED(ASSETCHAINS_SYMBOL) != 0) && ASSETCHAINS_NOTARY_PAY[0] != 0 ) if ( (s.GetType() & SER_DISK) && (is_STAKED(ASSETCHAINS_SYMBOL) != 0) )// && ASSETCHAINS_NOTARY_PAY[0] != 0 )
{ {
READWRITE(nNotaryPay); READWRITE(nNotaryPay);
READWRITE(segid); READWRITE(segid);

7
src/komodo_nk.h
View File

@ -1,7 +1,10 @@
#ifndef KOMODO_NK_H #ifndef KOMODO_NK_H
#define KOMODO_NK_H #define KOMODO_NK_H
#define ASSETCHAINS_N 96 #define ASSETCHAINS_N 77
#define ASSETCHAINS_K 5 #define ASSETCHAINS_K 3
//#define ASSETCHAINS_N 95
//#define ASSETCHAINS_K 5
#endif #endif

2
src/rpc/misc.cpp
View File

@ -1436,7 +1436,7 @@ UniValue getsnapshot(const UniValue& params, bool fHelp)
UniValue getaddresstxids(const UniValue& params, bool fHelp) UniValue getaddresstxids(const UniValue& params, bool fHelp)
{ {
if (fHelp || params.size() > 2) if (fHelp || params.size() > 2 || params.size() < 1)
throw runtime_error( throw runtime_error(
"getaddresstxids (ccvout)\n" "getaddresstxids (ccvout)\n"
"\nReturns the txids for an address(es) (requires addressindex to be enabled).\n" "\nReturns the txids for an address(es) (requires addressindex to be enabled).\n"