aboutsummaryrefslogtreecommitdiff
path: root/src/bitcoin-tx.cpp
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2014-10-30 15:50:15 -0700
committerMatt Corallo <git@bluematt.me>2014-12-05 01:57:40 -0800
commitafd4b94b6dabab29dee5a12966ce217700381682 (patch)
tree7bc8f939bfcc098341f8f222fe44e039fba3dd00 /src/bitcoin-tx.cpp
parenta0417b8cc840ff6f49b4fb1f8ceef54f8e3d0df1 (diff)
downloadbitcoin-afd4b94b6dabab29dee5a12966ce217700381682.tar.xz
Move CMerkleBlock and CPartialMerkleTree to their own file
Diffstat (limited to 'src/bitcoin-tx.cpp')
-rw-r--r--src/bitcoin-tx.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 1cceab3188..ce66dfbe96 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>