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

Merge branch 'dev' into FSM

Browse Source
This commit is contained in:
jl777
2019-01-09 02:18:52 -11:00
parent 5f3bb5c06b c5b3b68ace
commit 80f034644a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/komodo_utils.h
View File

@@ -1650,6 +1650,7 @@ uint64_t komodo_ac_block_subsidy(int nHeight)
} }
extern int64_t MAX_MONEY; extern int64_t MAX_MONEY;
extern unsigned int WITNESS_CACHE_SIZE;
void komodo_args(char *argv0) void komodo_args(char *argv0)
{ {
@@ -1702,6 +1703,8 @@ void komodo_args(char *argv0)
} }
KOMODO_STOPAT = GetArg("-stopat",0); KOMODO_STOPAT = GetArg("-stopat",0);
MAX_REORG_LENGTH = GetArg("-maxreorg",MAX_REORG_LENGTH); MAX_REORG_LENGTH = GetArg("-maxreorg",MAX_REORG_LENGTH);
WITNESS_CACHE_SIZE = MAX_REORG_LENGTH+10;
ASSETCHAINS_CC = GetArg("-ac_cc",0); ASSETCHAINS_CC = GetArg("-ac_cc",0);
KOMODO_CCACTIVATE = GetArg("-ac_ccactivate",0); KOMODO_CCACTIVATE = GetArg("-ac_ccactivate",0);
ASSETCHAINS_PUBLIC = GetArg("-ac_public",0); ASSETCHAINS_PUBLIC = GetArg("-ac_public",0);

2
src/wallet/wallet.h
View File

@@ -76,7 +76,7 @@ static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
// Should be large enough that we can expect not to reorg beyond our cache // Should be large enough that we can expect not to reorg beyond our cache
// unless there is some exceptional network disruption. // unless there is some exceptional network disruption.
#define _COINBASE_MATURITY 100 #define _COINBASE_MATURITY 100
static const unsigned int WITNESS_CACHE_SIZE = _COINBASE_MATURITY+10; unsigned int WITNESS_CACHE_SIZE = _COINBASE_MATURITY+10;
//! Size of HD seed in bytes //! Size of HD seed in bytes
static const size_t HD_WALLET_SEED_LENGTH = 32; static const size_t HD_WALLET_SEED_LENGTH = 32;