Merge pull request #652 from pmienk/bip157

Add compact filter client-server protcol requests, address #648
libbitcoin · Nov 1, 2019 · 3797a31 · 3797a31
2 parents 5a56c78 + cd26ee7
commit 3797a31
Show file tree

Hide file tree

Showing 51 changed files with 1,669 additions and 527 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -56,6 +56,7 @@ src_libbitcoin_explorer_la_SOURCES = \
     src/commands/base64-encode.cpp \
     src/commands/bitcoin160.cpp \
     src/commands/bitcoin256.cpp \
+    src/commands/broadcast-tx.cpp \
     src/commands/btc-to-satoshi.cpp \
     src/commands/cert-new.cpp \
     src/commands/cert-public.cpp \
@@ -83,9 +84,9 @@ src_libbitcoin_explorer_la_SOURCES = \
     src/commands/fetch-block-hashes.cpp \
     src/commands/fetch-block-height.cpp \
     src/commands/fetch-block.cpp \
-    src/commands/fetch-compact-filter-checkpoint-node.cpp \
-    src/commands/fetch-compact-filter-headers-node.cpp \
-    src/commands/fetch-compact-filters-node.cpp \
+    src/commands/fetch-filter-checkpoint.cpp \
+    src/commands/fetch-filter-headers.cpp \
+    src/commands/fetch-filter.cpp \
     src/commands/fetch-header.cpp \
     src/commands/fetch-height.cpp \
     src/commands/fetch-history.cpp \
@@ -94,6 +95,9 @@ src_libbitcoin_explorer_la_SOURCES = \
     src/commands/fetch-tx-index.cpp \
     src/commands/fetch-tx.cpp \
     src/commands/fetch-utxo.cpp \
+    src/commands/get-filter-checkpoint.cpp \
+    src/commands/get-filter-headers.cpp \
+    src/commands/get-filters.cpp \
     src/commands/hd-new.cpp \
     src/commands/hd-private.cpp \
     src/commands/hd-public.cpp \
@@ -105,14 +109,15 @@ src_libbitcoin_explorer_la_SOURCES = \
     src/commands/input-set.cpp \
     src/commands/input-sign.cpp \
     src/commands/input-validate.cpp \
-    src/commands/match-neutrino-filter-address.cpp \
-    src/commands/match-neutrino-filter-script.cpp \
+    src/commands/match-neutrino-address.cpp \
+    src/commands/match-neutrino-script.cpp \
     src/commands/message-sign.cpp \
     src/commands/message-validate.cpp \
     src/commands/mnemonic-decode.cpp \
     src/commands/mnemonic-encode.cpp \
     src/commands/mnemonic-new.cpp \
     src/commands/mnemonic-to-seed.cpp \
+    src/commands/put-tx.cpp \
     src/commands/qrcode.cpp \
     src/commands/ripemd160.cpp \
     src/commands/satoshi-to-btc.cpp \
@@ -121,8 +126,6 @@ src_libbitcoin_explorer_la_SOURCES = \
     src/commands/script-to-address.cpp \
     src/commands/script-to-key.cpp \
     src/commands/seed.cpp \
-    src/commands/send-tx-node.cpp \
-    src/commands/send-tx-p2p.cpp \
     src/commands/send-tx.cpp \
     src/commands/settings.cpp \
     src/commands/sha160.cpp \
@@ -209,6 +212,7 @@ test_libbitcoin_explorer_test_SOURCES = \
     test/commands/base64-encode.cpp \
     test/commands/bitcoin160.cpp \
     test/commands/bitcoin256.cpp \
+    test/commands/broadcast-tx.cpp \
     test/commands/btc-to-satoshi.cpp \
     test/commands/cert-new.cpp \
     test/commands/cert-public.cpp \
@@ -235,9 +239,6 @@ test_libbitcoin_explorer_test_SOURCES = \
     test/commands/electrum-to-seed.cpp \
     test/commands/fetch-balance.cpp \
     test/commands/fetch-block.cpp \
-    test/commands/fetch-compact-filter-checkpoint-node.cpp \
-    test/commands/fetch-compact-filter-headers-node.cpp \
-    test/commands/fetch-compact-filters-node.cpp \
     test/commands/fetch-header.cpp \
     test/commands/fetch-height.cpp \
     test/commands/fetch-history.cpp \
@@ -246,6 +247,9 @@ test_libbitcoin_explorer_test_SOURCES = \
     test/commands/fetch-tx-index.cpp \
     test/commands/fetch-tx.cpp \
     test/commands/fetch-utxo.cpp \
+    test/commands/get-filter-checkpoint.cpp \
+    test/commands/get-filter-headers.cpp \
+    test/commands/get-filters.cpp \
     test/commands/hd-new.cpp \
     test/commands/hd-private.cpp \
     test/commands/hd-public.cpp \
@@ -257,14 +261,15 @@ test_libbitcoin_explorer_test_SOURCES = \
     test/commands/input-set.cpp \
     test/commands/input-sign.cpp \
     test/commands/input-validate.cpp \
-    test/commands/match-neutrino-filter-address.cpp \
-    test/commands/match-neutrino-filter-script.cpp \
+    test/commands/match-neutrino-address.cpp \
+    test/commands/match-neutrino-script.cpp \
     test/commands/message-sign.cpp \
     test/commands/message-validate.cpp \
     test/commands/mnemonic-decode.cpp \
     test/commands/mnemonic-encode.cpp \
     test/commands/mnemonic-new.cpp \
     test/commands/mnemonic-to-seed.cpp \
+    test/commands/put-tx.cpp \
     test/commands/qrcode.cpp \
     test/commands/ripemd160.cpp \
     test/commands/satoshi-to-btc.cpp \
@@ -273,8 +278,6 @@ test_libbitcoin_explorer_test_SOURCES = \
     test/commands/script-to-address.cpp \
     test/commands/script-to-key.cpp \
     test/commands/seed.cpp \
-    test/commands/send-tx-node.cpp \
-    test/commands/send-tx-p2p.cpp \
     test/commands/send-tx.cpp \
     test/commands/settings.cpp \
     test/commands/sha160.cpp \
@@ -341,6 +344,7 @@ include_bitcoin_explorer_commands_HEADERS = \
     include/bitcoin/explorer/commands/base64-encode.hpp \
     include/bitcoin/explorer/commands/bitcoin160.hpp \
     include/bitcoin/explorer/commands/bitcoin256.hpp \
+    include/bitcoin/explorer/commands/broadcast-tx.hpp \
     include/bitcoin/explorer/commands/btc-to-satoshi.hpp \
     include/bitcoin/explorer/commands/cert-new.hpp \
     include/bitcoin/explorer/commands/cert-public.hpp \
@@ -368,9 +372,9 @@ include_bitcoin_explorer_commands_HEADERS = \
     include/bitcoin/explorer/commands/fetch-block-hashes.hpp \
     include/bitcoin/explorer/commands/fetch-block-height.hpp \
     include/bitcoin/explorer/commands/fetch-block.hpp \
-    include/bitcoin/explorer/commands/fetch-compact-filter-checkpoint-node.hpp \
-    include/bitcoin/explorer/commands/fetch-compact-filter-headers-node.hpp \
-    include/bitcoin/explorer/commands/fetch-compact-filters-node.hpp \
+    include/bitcoin/explorer/commands/fetch-filter-checkpoint.hpp \
+    include/bitcoin/explorer/commands/fetch-filter-headers.hpp \
+    include/bitcoin/explorer/commands/fetch-filter.hpp \
     include/bitcoin/explorer/commands/fetch-header.hpp \
     include/bitcoin/explorer/commands/fetch-height.hpp \
     include/bitcoin/explorer/commands/fetch-history.hpp \
@@ -379,6 +383,9 @@ include_bitcoin_explorer_commands_HEADERS = \
     include/bitcoin/explorer/commands/fetch-tx-index.hpp \
     include/bitcoin/explorer/commands/fetch-tx.hpp \
     include/bitcoin/explorer/commands/fetch-utxo.hpp \
+    include/bitcoin/explorer/commands/get-filter-checkpoint.hpp \
+    include/bitcoin/explorer/commands/get-filter-headers.hpp \
+    include/bitcoin/explorer/commands/get-filters.hpp \
     include/bitcoin/explorer/commands/hd-new.hpp \
     include/bitcoin/explorer/commands/hd-private.hpp \
     include/bitcoin/explorer/commands/hd-public.hpp \
@@ -390,14 +397,15 @@ include_bitcoin_explorer_commands_HEADERS = \
     include/bitcoin/explorer/commands/input-set.hpp \
     include/bitcoin/explorer/commands/input-sign.hpp \
     include/bitcoin/explorer/commands/input-validate.hpp \
-    include/bitcoin/explorer/commands/match-neutrino-filter-address.hpp \
-    include/bitcoin/explorer/commands/match-neutrino-filter-script.hpp \
+    include/bitcoin/explorer/commands/match-neutrino-address.hpp \
+    include/bitcoin/explorer/commands/match-neutrino-script.hpp \
     include/bitcoin/explorer/commands/message-sign.hpp \
     include/bitcoin/explorer/commands/message-validate.hpp \
     include/bitcoin/explorer/commands/mnemonic-decode.hpp \
     include/bitcoin/explorer/commands/mnemonic-encode.hpp \
     include/bitcoin/explorer/commands/mnemonic-new.hpp \
     include/bitcoin/explorer/commands/mnemonic-to-seed.hpp \
+    include/bitcoin/explorer/commands/put-tx.hpp \
     include/bitcoin/explorer/commands/qrcode.hpp \
     include/bitcoin/explorer/commands/ripemd160.hpp \
     include/bitcoin/explorer/commands/satoshi-to-btc.hpp \
@@ -406,8 +414,6 @@ include_bitcoin_explorer_commands_HEADERS = \
     include/bitcoin/explorer/commands/script-to-address.hpp \
     include/bitcoin/explorer/commands/script-to-key.hpp \
     include/bitcoin/explorer/commands/seed.hpp \
-    include/bitcoin/explorer/commands/send-tx-node.hpp \
-    include/bitcoin/explorer/commands/send-tx-p2p.hpp \
     include/bitcoin/explorer/commands/send-tx.hpp \
     include/bitcoin/explorer/commands/settings.hpp \
     include/bitcoin/explorer/commands/sha160.hpp \

diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt
@@ -207,6 +207,7 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/commands/base64-encode.cpp"
     "../../src/commands/bitcoin160.cpp"
     "../../src/commands/bitcoin256.cpp"
+    "../../src/commands/broadcast-tx.cpp"
     "../../src/commands/btc-to-satoshi.cpp"
     "../../src/commands/cert-new.cpp"
     "../../src/commands/cert-public.cpp"
@@ -234,9 +235,9 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/commands/fetch-block-hashes.cpp"
     "../../src/commands/fetch-block-height.cpp"
     "../../src/commands/fetch-block.cpp"
-    "../../src/commands/fetch-compact-filter-checkpoint-node.cpp"
-    "../../src/commands/fetch-compact-filter-headers-node.cpp"
-    "../../src/commands/fetch-compact-filters-node.cpp"
+    "../../src/commands/fetch-filter-checkpoint.cpp"
+    "../../src/commands/fetch-filter-headers.cpp"
+    "../../src/commands/fetch-filter.cpp"
     "../../src/commands/fetch-header.cpp"
     "../../src/commands/fetch-height.cpp"
     "../../src/commands/fetch-history.cpp"
@@ -245,6 +246,9 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/commands/fetch-tx-index.cpp"
     "../../src/commands/fetch-tx.cpp"
     "../../src/commands/fetch-utxo.cpp"
+    "../../src/commands/get-filter-checkpoint.cpp"
+    "../../src/commands/get-filter-headers.cpp"
+    "../../src/commands/get-filters.cpp"
     "../../src/commands/hd-new.cpp"
     "../../src/commands/hd-private.cpp"
     "../../src/commands/hd-public.cpp"
@@ -256,14 +260,15 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/commands/input-set.cpp"
     "../../src/commands/input-sign.cpp"
     "../../src/commands/input-validate.cpp"
-    "../../src/commands/match-neutrino-filter-address.cpp"
-    "../../src/commands/match-neutrino-filter-script.cpp"
+    "../../src/commands/match-neutrino-address.cpp"
+    "../../src/commands/match-neutrino-script.cpp"
     "../../src/commands/message-sign.cpp"
     "../../src/commands/message-validate.cpp"
     "../../src/commands/mnemonic-decode.cpp"
     "../../src/commands/mnemonic-encode.cpp"
     "../../src/commands/mnemonic-new.cpp"
     "../../src/commands/mnemonic-to-seed.cpp"
+    "../../src/commands/put-tx.cpp"
     "../../src/commands/qrcode.cpp"
     "../../src/commands/ripemd160.cpp"
     "../../src/commands/satoshi-to-btc.cpp"
@@ -272,8 +277,6 @@ add_library( ${CANONICAL_LIB_NAME}
     "../../src/commands/script-to-address.cpp"
     "../../src/commands/script-to-key.cpp"
     "../../src/commands/seed.cpp"
-    "../../src/commands/send-tx-node.cpp"
-    "../../src/commands/send-tx-p2p.cpp"
     "../../src/commands/send-tx.cpp"
     "../../src/commands/settings.cpp"
     "../../src/commands/sha160.cpp"
@@ -394,6 +397,7 @@ if (with-tests)
         "../../test/commands/base64-encode.cpp"
         "../../test/commands/bitcoin160.cpp"
         "../../test/commands/bitcoin256.cpp"
+        "../../test/commands/broadcast-tx.cpp"
         "../../test/commands/btc-to-satoshi.cpp"
         "../../test/commands/cert-new.cpp"
         "../../test/commands/cert-public.cpp"
@@ -420,9 +424,6 @@ if (with-tests)
         "../../test/commands/electrum-to-seed.cpp"
         "../../test/commands/fetch-balance.cpp"
         "../../test/commands/fetch-block.cpp"
-        "../../test/commands/fetch-compact-filter-checkpoint-node.cpp"
-        "../../test/commands/fetch-compact-filter-headers-node.cpp"
-        "../../test/commands/fetch-compact-filters-node.cpp"
         "../../test/commands/fetch-header.cpp"
         "../../test/commands/fetch-height.cpp"
         "../../test/commands/fetch-history.cpp"
@@ -431,6 +432,9 @@ if (with-tests)
         "../../test/commands/fetch-tx-index.cpp"
         "../../test/commands/fetch-tx.cpp"
         "../../test/commands/fetch-utxo.cpp"
+        "../../test/commands/get-filter-checkpoint.cpp"
+        "../../test/commands/get-filter-headers.cpp"
+        "../../test/commands/get-filters.cpp"
         "../../test/commands/hd-new.cpp"
         "../../test/commands/hd-private.cpp"
         "../../test/commands/hd-public.cpp"
@@ -442,14 +446,15 @@ if (with-tests)
         "../../test/commands/input-set.cpp"
         "../../test/commands/input-sign.cpp"
         "../../test/commands/input-validate.cpp"
-        "../../test/commands/match-neutrino-filter-address.cpp"
-        "../../test/commands/match-neutrino-filter-script.cpp"
+        "../../test/commands/match-neutrino-address.cpp"
+        "../../test/commands/match-neutrino-script.cpp"
         "../../test/commands/message-sign.cpp"
         "../../test/commands/message-validate.cpp"
         "../../test/commands/mnemonic-decode.cpp"
         "../../test/commands/mnemonic-encode.cpp"
         "../../test/commands/mnemonic-new.cpp"
         "../../test/commands/mnemonic-to-seed.cpp"
+        "../../test/commands/put-tx.cpp"
         "../../test/commands/qrcode.cpp"
         "../../test/commands/ripemd160.cpp"
         "../../test/commands/satoshi-to-btc.cpp"
@@ -458,8 +463,6 @@ if (with-tests)
         "../../test/commands/script-to-address.cpp"
         "../../test/commands/script-to-key.cpp"
         "../../test/commands/seed.cpp"
-        "../../test/commands/send-tx-node.cpp"
-        "../../test/commands/send-tx-p2p.cpp"
         "../../test/commands/send-tx.cpp"
         "../../test/commands/settings.cpp"
         "../../test/commands/sha160.cpp"

diff --git a/builds/msvc/vs2013/libbitcoin-explorer-test/libbitcoin-explorer-test.vcxproj b/builds/msvc/vs2013/libbitcoin-explorer-test/libbitcoin-explorer-test.vcxproj
@@ -84,6 +84,7 @@
     <ClCompile Include="..\..\..\..\test\commands\base64-encode.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\bitcoin160.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\bitcoin256.cpp" />
+    <ClCompile Include="..\..\..\..\test\commands\broadcast-tx.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\btc-to-satoshi.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\cert-new.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\cert-public.cpp" />
@@ -109,9 +110,6 @@
     <ClCompile Include="..\..\..\..\test\commands\electrum-to-seed.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\fetch-balance.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\fetch-block.cpp" />
-    <ClCompile Include="..\..\..\..\test\commands\fetch-compact-filter-checkpoint-node.cpp" />
-    <ClCompile Include="..\..\..\..\test\commands\fetch-compact-filter-headers-node.cpp" />
-    <ClCompile Include="..\..\..\..\test\commands\fetch-compact-filters-node.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\fetch-header.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\fetch-height.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\fetch-history.cpp" />
@@ -120,6 +118,9 @@
     <ClCompile Include="..\..\..\..\test\commands\fetch-tx-index.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\fetch-tx.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\fetch-utxo.cpp" />
+    <ClCompile Include="..\..\..\..\test\commands\get-filter-checkpoint.cpp" />
+    <ClCompile Include="..\..\..\..\test\commands\get-filter-headers.cpp" />
+    <ClCompile Include="..\..\..\..\test\commands\get-filters.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\hd-new.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\hd-private.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\hd-public.cpp" />
@@ -131,14 +132,15 @@
     <ClCompile Include="..\..\..\..\test\commands\input-set.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\input-sign.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\input-validate.cpp" />
-    <ClCompile Include="..\..\..\..\test\commands\match-neutrino-filter-address.cpp" />
-    <ClCompile Include="..\..\..\..\test\commands\match-neutrino-filter-script.cpp" />
+    <ClCompile Include="..\..\..\..\test\commands\match-neutrino-address.cpp" />
+    <ClCompile Include="..\..\..\..\test\commands\match-neutrino-script.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\message-sign.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\message-validate.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\mnemonic-decode.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\mnemonic-encode.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\mnemonic-new.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\mnemonic-to-seed.cpp" />
+    <ClCompile Include="..\..\..\..\test\commands\put-tx.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\qrcode.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\ripemd160.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\satoshi-to-btc.cpp" />
@@ -147,8 +149,6 @@
     <ClCompile Include="..\..\..\..\test\commands\script-to-address.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\script-to-key.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\seed.cpp" />
-    <ClCompile Include="..\..\..\..\test\commands\send-tx-node.cpp" />
-    <ClCompile Include="..\..\..\..\test\commands\send-tx-p2p.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\send-tx.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\settings.cpp" />
     <ClCompile Include="..\..\..\..\test\commands\sha160.cpp" />