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

Merge branch 'FSM' of https://github.com/jl777/komodo into mastertest

Browse Source
This commit is contained in:
blackjok3r
2019-01-23 16:57:05 +08:00
parent c2ce7ca9ce 3cc3cb20da
commit 292edfb284
61 changed files with 7223 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet.cpp
View File

@@ -59,13 +59,7 @@ bool fSendFreeTransactions = false;
bool fPayAtLeastCustomFee = true;
#include "komodo_defs.h"
extern int32_t USE_EXTERNAL_PUBKEY;
extern std::string NOTARY_PUBKEY;
extern int32_t KOMODO_EXCHANGEWALLET;
extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
extern int32_t VERUS_MIN_STAKEAGE;
CBlockIndex *komodo_chainactive(int32_t height);
extern std::string DONATION_PUBKEY;
/**
* Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)
@@ -1180,7 +1174,7 @@ bool DecrementNoteWitnesses(NoteDataMap& noteDataMap, int indexHeight, int64_t n
assert((nWitnessCacheSize - 1) >= nd->witnesses.size());
}
}
assert(KOMODO_REWIND != 0 || nWitnessCacheSize > 0);
assert(KOMODO_REWIND != 0 || nWitnessCacheSize > 0 || WITNESS_CACHE_SIZE != _COINBASE_MATURITY+10);
return true;
}