diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-05 16:50:11 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-05 16:50:48 +0100 |
| commit | b5fa132329f0377d787a4a21c1686609c2bfaece (patch) | |
| tree | 658ad8553bef39906e91693e0ac9e90b32cbb6ae /src/bitcoin-tx.cpp | |
| parent | 4c83c0e7c8c9ecbcf69c882e2d68a306b726e67b (diff) | |
| parent | afd4b94b6dabab29dee5a12966ce217700381682 (diff) | |
| download | bitcoin-b5fa132329f0377d787a4a21c1686609c2bfaece.tar.xz | |
Merge pull request #5181
afd4b94 Move CMerkleBlock and CPartialMerkleTree to their own file (Matt Corallo)
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 23eaebed64..7308d93661 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> |