diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-10 18:52:52 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-10 19:09:54 +0800 |
| commit | ef8f2966ac8e486f622f9803f24bd4021c6ff9ed (patch) | |
| tree | aa1838a8f89a5169099d03b0fe7c317ce0d9481f /src/Makefile.am | |
| parent | e87fbee4026b8896508dd47fbb04bb2994f52322 (diff) | |
| parent | ee862d6efb4c3c01e55f0d5d7a82cce75323cf40 (diff) | |
| download | bitcoin-ef8f2966ac8e486f622f9803f24bd4021c6ff9ed.tar.xz | |
Merge bitcoin/bitcoin#22084: package testmempoolaccept followups
ee862d6efb4c3c01e55f0d5d7a82cce75323cf40 MOVEONLY: context-free package policies (glozow)
5cac95cd15da04b83afa1d31a43be9f5b30a1827 disallow_mempool_conflicts -> allow_bip125_replacement and check earlier (glozow)
e8ecc621be6afd3252c0f8147e42c3b4918f7f46 [refactor] comment/naming improvements (glozow)
7d91442461776e2ef240d7885f768b624de341a7 [rpc] reserve space in txns (glozow)
6c5f19d9c4d267c54f4dbc4f9d65370ff1e0625b [package] static_assert max package size >= max tx size (glozow)
Pull request description:
various followups from #20833
ACKs for top commit:
jnewbery:
utACK ee862d6efb4c3c01e55f0d5d7a82cce75323cf40
ariard:
Code Review ACK ee862d6
Tree-SHA512: 96ecb41f7bbced84d4253070f5274b7267607bfe4033e2bb0d2f55ec778cc41e811130b6321131e0418b5835894e510a4be8a0f822bc9d68d9224418359ac837
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 66cb7cec2a..e2ed70556d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -351,6 +351,7 @@ libbitcoin_server_a_SOURCES = \ node/ui_interface.cpp \ noui.cpp \ policy/fees.cpp \ + policy/packages.cpp \ policy/rbf.cpp \ policy/settings.cpp \ pow.cpp \ |