Merge pull request #5159

b649e03 Create new BlockPolicyEstimator for fee estimates (Alex Morcos)
2015-05-13 16:54:13 +02:00
parent 484821870b b649e03954
commit 2cc1372190
10 changed files with 1267 additions and 424 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,6 +106,7 @@ BITCOIN_CORE_H = \
  netbase.h \
  net.h \
  noui.h \
+  policy/fees.h \
  pow.h \
  primitives/block.h \
  primitives/transaction.h \
@@ -182,6 +183,7 @@ libbitcoin_server_a_SOURCES = \
  miner.cpp \
  net.cpp \
  noui.cpp \
+  policy/fees.cpp \
  pow.cpp \
  rest.cpp \
  rpcblockchain.cpp \