Merge pull request #475 from evoskuil/version3

Backport master/v4 commits for version3/v3.1 release.

Author: evoskuil

include/bitcoin/explorer/commands/fetch-stealth.hpp

@@ -158,7 +158,7 @@ class BCX_API fetch_stealth
         (
             "FILTER",
             value<bc::config::base2>(&argument_.filter),
-            "The Base2 stealth prefix filter used to locate transactions. Defaults to all stealth transactions."
+            "The Base2 stealth prefix filter used to locate transactions. Must be at least 8 bits in length."
         );
 
         return options;

include/bitcoin/explorer/commands/watch-stealth.hpp

@@ -157,7 +157,7 @@ class BCX_API watch_stealth
         (
             "PREFIX",
             value<bc::config::base2>(&argument_.prefix),
-            "The Base2 stealth prefix to watch. If not specified the prefix is read from STDIN."
+            "The Base2 stealth prefix to watch. Must be at least 8 bits in length. If not specified the prefix is read from STDIN."
         );
 
         return options;

include/bitcoin/explorer/utility.hpp

@@ -199,13 +199,6 @@ BCX_API data_chunk new_seed(size_t bit_length=minimum_seed_bits);
  */
 BCX_API string_list numbers_to_strings(const chain::point::indexes& indexes);
 
-/**
- * DEPRECATED in favor of libbitcoin::pseudo_random_fill.
- * Fill a buffer with randomness using the default random engine.
- * @param[in]  chunk  The buffer to fill with randomness.
- */
-BCX_API void random_fill(data_chunk& chunk);
-
 /**
  * Get a message from the specified input stream.
  * @param[in]  stream The input stream to read.

model/generate.xml

@@ -255,8 +255,7 @@
     <define name="BX_EK_TO_EC_INVALID_PASSPHRASE" value="The passphrase is incorrect." />
     <define name="BX_EK_TO_EC_REQUIRES_ICU" value="The command requires an ICU build." />
   </command>
-  
-  <!-- TODO: document no unconfirmed history for 3.0 [done] -->
+
   <command symbol="fetch-balance" output="balance_row" category="ONLINE" network="true" description="Get the balance in satoshi of a payment address. Requires a Libbitcoin server connection.">
     <option name="format" type="encoding" description="The output format. Options are 'info', 'json' and 'xml', defaults to 'info'." />
     <argument name="PAYMENT_ADDRESS" stdin="true" type="payment_address" description="The payment address. If not specified the address is read from STDIN." />
@@ -268,13 +267,11 @@
     <option name="height" shortcut="t" type="uint32_t" description="The block height."/>
   </command>
 
-  <!-- TODO: document new public-key argument for 3.1 -->
   <command symbol="fetch-height" formerly="fetch-last-height" output="uint32_t" category="ONLINE" network="true" description="Get the last block height. Requires a Libbitcoin server connection.">
     <argument name="server-url" description="The URL of the Libbitcoin server to use. If not specified the URL is obtained from configuration settings or defaults."/>
     <argument name="public-key" description="The public key of the Libbitcoin server. If not specified the key is obtained from configuration settings or defaults."/>
   </command>
-  
-  <!-- TODO: document simplified output format (3.1) and no unconfirmed history for 3.0 [done] -->
+
   <command symbol="fetch-history" output="history_row" category="ONLINE" network="true" description="Get list of output points, values, and spends for a payment address. Requires a Libbitcoin server connection.">
     <option name="format" type="encoding" description="The output format. Options are 'info', 'json' and 'xml', defaults to 'info'." />
     <argument name="PAYMENT_ADDRESS" stdin="true" type="payment_address" description="The payment address. If not specified the address is read from STDIN." />
@@ -285,13 +282,12 @@
     <define name="BX_FETCH_PUBLIC_KEY_NOT_IMPLEMENTED" value="This command is not yet implemented." />
   </command>
 
-  <!-- TODO: document new limit (8 bit filter) for 3.1 -->
   <command symbol="fetch-stealth" output="stealth_row" category="ONLINE" network="true" description="Get metadata on potential payment transactions by stealth prefix filter. Requires a Libbitcoin server connection.">
     <option name="format" type="encoding" description="The output format. Options are 'info', 'json' and 'xml', defaults to 'info'." />
     <option name="height" shortcut="t" type="uint32_t" description="The minimum block height of transactions to include."/>
     <!--<option name="scan_secret" type="ec_private" description="The Base16 EC private key to use locally in confirming stealth transactions."/>-->
     <!--<option name="scan_pubkey" shortcut="p" type="ec_public" description="The Base16 EC public key to use locally in confirming stealth transactions."/>-->
-    <argument name="FILTER" type="base2" description="The Base2 stealth prefix filter used to locate transactions. Defaults to all stealth transactions." />
+    <argument name="FILTER" type="base2" description="The Base2 stealth prefix filter used to locate transactions. Must be at least 8 bits in length." />
     <define name="BX_FETCH_STEALTH_PREFIX_TOO_LONG" value="Stealth prefix is limited to 32 bits." />
     <define name="BX_FETCH_STEALTH_FILTER_TOO_SHORT" value="Stealth prefix must be at least 8 bits." />
   </command>
@@ -407,8 +403,7 @@
   <command symbol="mnemonic-encode" formerly="mnemonic" output="string" multipleX="true" category="ELECTRUM" obsolete="true" description="Convert an Electrum mnemonic to its seed.">
     <define name="BX_MNEMONIC_ENCODE_OBSOLETE" value="Electrum style key functions are obsolete. Use mnemonic-new (BIP39) command instead." />
   </command>
-  
-  <!-- TODO: update online documentation for 3.x release additional languages ('cs', 'ru', 'uk'). -->
+
   <command symbol="mnemonic-new" output="string" multipleX="true" category="WALLET" description="Create a mnemonic seed (BIP39) from entropy. WARNING: mnemonic should be created from properly generated entropy.">
     <option name="language" type="language" description="The language identifier of the mnemonic dictionary to use. Options are 'en', 'es', 'fr', 'it', 'ja', 'cs', 'ru', 'uk', 'zh_Hans', 'zh_Hant' and 'any', defaults to 'en'." />
     <argument name="SEED" stdin="true" type="base16" description="The Base16 entropy from which the mnemonic is created. The length must be evenly divisible by 32 bits. If not specified the entropy is read from STDIN." />
@@ -586,21 +581,19 @@
     <define name="BX_VALIDATE_TX_INVALID" value="The transaction is invalid for the current state of the node: %1%." />
   </command>
 
-  <!-- TODO: document no format and no stealth for 3.1 release. -->
   <command symbol="watch-address" formerly="monitor" output="transaction" category="ONLINE" network="true" description="Watch the network for transactions in which an address participates. Requires a Libbitcoin server connection.">
     <option name="duration" type="uint32_t" default="600" description="The duration of the watch in seconds, defaults to 600." />
     <!--<option name="format" type="encoding" description="The output format. Options are 'info', 'json' and 'xml', defaults to 'info'." />-->
     <argument name="PAYMENT_ADDRESS" stdin="true" type="payment_address" description="The participating payment address. If not specified the address is read from STDIN." />
     <define name="BX_WATCH_ADDRESS_WAITING" value="Watching address: %1%..." />
   </command>
 
-  <!-- TODO: document new command and no format for 3.1 release. -->
   <command symbol="watch-stealth" output="transaction" category="ONLINE" network="true" description="Watch the network for transactions by stealth prefix. Requires a Libbitcoin server connection.">
     <option name="duration" type="uint32_t" default="600" description="The duration of the watch in seconds, defaults to 600." />
     <!--<option name="format" type="encoding" description="The output format. Options are 'info', 'json' and 'xml', defaults to 'info'." />-->
 	<!--<option name="scan_secret" type="ec_private" description="The Base16 EC private key to use locally in confirming stealth transactions."/>-->
 	<!--<option name="scan_pubkey" shortcut="p" type="ec_public" description="The Base16 EC public key to use locally in confirming stealth transactions."/>-->
-    <argument name="PREFIX" stdin="true" type="base2" description="The Base2 stealth prefix to watch. If not specified the prefix is read from STDIN." />
+    <argument name="PREFIX" stdin="true" type="base2" description="The Base2 stealth prefix to watch. Must be at least 8 bits in length. If not specified the prefix is read from STDIN." />
     <define name="BX_WATCH_STEALTH_PREFIX_WAITING" value="Watching stealth prefix: %1%..." />
     <define name="BX_WATCH_STEALTH_PREFIX_TOO_LONG" value="Stealth prefix is limited to 32 bits." />
     <define name="BX_WATCH_STEALTH_PREFIX_TOO_SHORT" value="Stealth prefix must be at least 8 bits." />

src/utility.cpp

@@ -76,7 +76,7 @@ data_chunk new_seed(size_t bit_length)
 {
     size_t fill_seed_size = bit_length / byte_bits;
     data_chunk seed(fill_seed_size);
-    random_fill(seed);
+    pseudo_random_fill(seed);
     return seed;
 }
 
@@ -90,13 +90,6 @@ string_list numbers_to_strings(const chain::point::indexes& indexes)
     return stringlist;
 }
 
-// Not testable due to lack of random engine injection.
-// DEPRECATED in favor of libbitcoin::pseudo_random_fill.
-void random_fill(data_chunk& chunk)
-{
-    pseudo_random_fill(chunk);
-}
-
 // TODO: switch to binary for raw (primitive) reads in windows.
 std::string read_stream(std::istream& stream)
 {