GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 5ec19df687 into merged_master (Bitcoin PR #19277)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:19 +00:00
commit 7fabb1de9a
14 changed files with 46 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/validation.cpp
View file

@ -41,6 +41,7 @@
#include <txmempool.h>
#include <uint256.h>
#include <undo.h>
#include <util/check.h> // For NDEBUG compile time check
#include <util/moneystr.h>
#include <util/rbf.h>
#include <util/strencodings.h>
@ -57,10 +58,6 @@
#include <boost/algorithm/string/replace.hpp>
#if defined(NDEBUG)
# error "Bitcoin cannot be compiled without assertions."
#endif
#define MICRO 0.000001
#define MILLI 0.001