From a9891ad298036342d620d42e368b7fe320e9dcd0 Mon Sep 17 00:00:00 2001 From: MMGen Date: Mon, 1 Oct 2018 08:11:16 +0000 Subject: [PATCH] Minor changes --- Install-MMGen-on-Debian-or-Ubuntu-Linux.md | 2 +- ...ng-Your-Keys-Without-the-MMGen-Software.md | 3 +++ man-txbump.md | 7 ++++--- man-txcreate.md | 17 ++++++++-------- man-txdo.md | 20 +++++++++---------- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Install-MMGen-on-Debian-or-Ubuntu-Linux.md b/Install-MMGen-on-Debian-or-Ubuntu-Linux.md index 09dd563..aa8e99b 100644 --- a/Install-MMGen-on-Debian-or-Ubuntu-Linux.md +++ b/Install-MMGen-on-Debian-or-Ubuntu-Linux.md @@ -23,7 +23,7 @@ $ git clone https://github.com/mmgen/mmgen.git $ cd mmgen - $ git checkout -b stable stable_linux + $ git checkout stable_linux $ sudo ./setup.py install $ cd .. diff --git a/Recovering-Your-Keys-Without-the-MMGen-Software.md b/Recovering-Your-Keys-Without-the-MMGen-Software.md index b417779..a3d68f9 100644 --- a/Recovering-Your-Keys-Without-the-MMGen-Software.md +++ b/Recovering-Your-Keys-Without-the-MMGen-Software.md @@ -201,6 +201,9 @@ one: And so on and so forth, until we've generated all the keys we need: three, in our case. +If we're generating keys for Ethereum and Monero, our work is done: the raw +hexadecimal keys are all we need. Otherwise, read on. + #### Converting the hex value to a password (password example) If it's passwords we're generating, we must now convert our hex key to the diff --git a/man-txbump.md b/man-txbump.md index 73b4b7f..4190a57 100644 --- a/man-txbump.md +++ b/man-txbump.md @@ -8,8 +8,9 @@ -c, --comment-file f Source the transaction's comment from file 'f' -d, --outdir d Specify an alternate directory 'd' for output -e, --echo-passphrase Print passphrase to screen when typing it - -f, --tx-fee f Transaction fee, as a decimal BTC amount or in - satoshis per byte (an integer followed by 's') + -f, --tx-fee f Transaction fee, as a decimal BTC amount or as + satoshis per byte (an integer followed by s). + See FEE SPECIFICATION below. -H, --hidden-incog-input-params f,o Read hidden incognito data from file 'f' at offset 'o' (comma-separated) -i, --in-fmt f Input is from wallet format 'f' (see FMT CODES below) @@ -42,7 +43,7 @@ FEE SPECIFICATION: Transaction fees, both on the command line and at the interactive prompt, may be specified as either absolute BTC amounts, using a plain decimal number, or as satoshis per byte, using an integer followed by - the letter 's'. + 's', for satoshi. Transactions may contain both MMGen or non-MMGen input addresses. diff --git a/man-txcreate.md b/man-txcreate.md index ccef9f4..7a55f8c 100644 --- a/man-txcreate.md +++ b/man-txcreate.md @@ -8,9 +8,10 @@ -c, --comment-file f Source the transaction's comment from file 'f' -C, --tx-confs c Desired number of confirmations (default: 3) -d, --outdir d Specify an alternate directory 'd' for output - -f, --tx-fee f Transaction fee, as a decimal BTC amount or in satoshis - per byte (an integer followed by 's'). If omitted, fee - will be calculated using bitcoind's 'estimatefee' call + -f, --tx-fee f Transaction fee, as a decimal BTC amount or as + satoshis per byte (an integer followed by s). + See FEE SPECIFICATION below. If omitted, fee will be + calculated using network fee estimation. -i, --info Display unspent outputs and exit -L, --locktime t Lock time (block height or unix seconds) (default: 0) -m, --minconf n Minimum number of confirmations required to spend @@ -26,11 +27,11 @@ are chosen from a list of the user's unpent outputs via an interactive menu. If the transaction fee is not specified on the command line (see FEE - SPECIFICATION below), it will be calculated dynamically using bitcoind's - "estimatefee" function for the default (or user-specified) number of - confirmations. If "estimatefee" fails, the user will be prompted for a fee. + SPECIFICATION below), it will be calculated dynamically using network fee + estimation for the default (or user-specified) number of confirmations. + If network fee estimation fails, the user will be prompted for a fee. - Dynamic ("estimatefee") fees will be multiplied by the value of '--tx-fee-adj', + Network-estimated fees will be multiplied by the value of '--tx-fee-adj', if specified. Ages of transactions are approximate based on an average block discovery @@ -45,6 +46,6 @@ FEE SPECIFICATION: Transaction fees, both on the command line and at the interactive prompt, may be specified as either absolute BTC amounts, using a plain decimal number, or as satoshis per byte, using an integer followed by - the letter 's'. + 's', for satoshi. MMGEN v0.9.8 May 2018 MMGEN-TXCREATE(1) diff --git a/man-txdo.md b/man-txdo.md index d880be3..5762fa7 100644 --- a/man-txdo.md +++ b/man-txdo.md @@ -11,10 +11,10 @@ -C, --tx-confs c Desired number of confirmations (default: 3) -d, --outdir d Specify an alternate directory 'd' for output -e, --echo-passphrase Print passphrase to screen when typing it - -f, --tx-fee f Transaction fee, as a decimal BTC amount or in - satoshis per byte (an integer followed by 's'). - If omitted, bitcoind's 'estimatefee' will be used - to calculate the fee. + -f, --tx-fee f Transaction fee, as a decimal BTC amount or as + satoshis per byte (an integer followed by s). + See FEE SPECIFICATION below. If omitted, fee will be + calculated using network fee estimation. -H, --hidden-incog-input-params f,o Read hidden incognito data from file 'f' at offset 'o' (comma-separated) -i, --in-fmt f Input is from wallet format 'f' (see FMT CODES below) @@ -41,7 +41,7 @@ -q, --quiet Suppress warnings; overwrite files without prompting -v, --verbose Produce more verbose output -V, --vsize-adj f Adjust transaction's estimated vsize by factor 'f' - -y, --yes Answer 'yes' to prompts, suppress non-essential output + -y, --yes Answer 'yes' to prompts, suppress non-essential output -z, --show-hash-presets Show information on available hash presets @@ -49,11 +49,11 @@ are chosen from a list of the user's unpent outputs via an interactive menu. If the transaction fee is not specified on the command line (see FEE - SPECIFICATION below), it will be calculated dynamically using bitcoind's - "estimatefee" function for the default (or user-specified) number of - confirmations. If "estimatefee" fails, the user will be prompted for a fee. + SPECIFICATION below), it will be calculated dynamically using network fee + estimation for the default (or user-specified) number of confirmations. + If network fee estimation fails, the user will be prompted for a fee. - Dynamic ("estimatefee") fees will be multiplied by the value of '--tx-fee-adj', + Network-estimated fees will be multiplied by the value of '--tx-fee-adj', if specified. Ages of transactions are approximate based on an average block discovery @@ -68,7 +68,7 @@ FEE SPECIFICATION: Transaction fees, both on the command line and at the interactive prompt, may be specified as either absolute BTC amounts, using a plain decimal number, or as satoshis per byte, using an integer followed by - the letter 's'. + 's', for satoshi. Transactions may contain both MMGen or non-MMGen input addresses.