diff options
| author | Matt Corallo <[email protected]> | 2014-10-30 15:50:15 -0700 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2014-12-05 01:57:40 -0800 |
| commit | afd4b94b6dabab29dee5a12966ce217700381682 (patch) | |
| tree | 7bc8f939bfcc098341f8f222fe44e039fba3dd00 /src/bitcoin-tx.cpp | |
| parent | Merge pull request #5306 (diff) | |
| download | discoin-afd4b94b6dabab29dee5a12966ce217700381682.tar.xz discoin-afd4b94b6dabab29dee5a12966ce217700381682.zip | |
Move CMerkleBlock and CPartialMerkleTree to their own file
Diffstat (limited to 'src/bitcoin-tx.cpp')
| -rw-r--r-- | src/bitcoin-tx.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 1cceab318..ce66dfbe9 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -4,15 +4,17 @@ #include "base58.h" #include "clientversion.h" +#include "primitives/block.h" // for MAX_BLOCK_SIZE #include "primitives/transaction.h" #include "core_io.h" +#include "coins.h" #include "keystore.h" -#include "main.h" // for MAX_BLOCK_SIZE #include "script/script.h" #include "script/sign.h" #include "ui_interface.h" // for _(...) #include "univalue/univalue.h" #include "util.h" +#include "utilstrencodings.h" #include "utilmoneystr.h" #include <stdio.h> |