diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-07-14 17:37:54 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-07-14 17:49:48 -0700 |
| commit | f90603ac6d24f5263649675d51233f1fce8b2ecd (patch) | |
| tree | e2e2b4f29859a255db00b479d2dae30b70139d0c /src/core_write.cpp | |
| parent | b7d6623c76e1468f2a93db5a3120580e2784d74a (diff) | |
| parent | 3babbcb48786372d4b22171674c4cc5a6220c294 (diff) | |
Merge #10618: Remove confusing MAX_BLOCK_BASE_SIZE.
3babbcb48 Remove confusing MAX_BLOCK_BASE_SIZE. (Gregory Maxwell)
Tree-SHA512: 361293fc4e1e379cd5a0908ed0866a00e1c7a771bdf02fded158fca21b492a29c7a67fea0d13dc40b2a04204c89823bf1836fe5b63a17c9747751b9c845a3527
Diffstat (limited to 'src/core_write.cpp')
| -rw-r--r-- | src/core_write.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core_write.cpp b/src/core_write.cpp index 7f38e9e565..a366ef933c 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -5,7 +5,8 @@ #include "core_io.h" #include "base58.h" -#include "primitives/transaction.h" +#include "consensus/consensus.h" +#include "consensus/validation.h" #include "script/script.h" #include "script/standard.h" #include "serialize.h" @@ -15,7 +16,6 @@ #include "utilmoneystr.h" #include "utilstrencodings.h" - std::string FormatScript(const CScript& script) { std::string ret; |