diff --git a/Getting-Started-with-MMGen.md b/Getting-Started-with-MMGen.md index b3443ce..ba14971 100644 --- a/Getting-Started-with-MMGen.md +++ b/Getting-Started-with-MMGen.md @@ -29,7 +29,7 @@ the entire set of MMGen operations without risking real funds (free testnet coins may be obtained at [https://tpfaucet.appspot.com/][2]). To use this feature, start bitcoind with the -testnet option and sync the testnet blockchain (about 9GB at this time of writing). To make MMGen use testnet instead of -mainnet, supply the `--testnet` option as the first argument to all MMGen +mainnet, supply the `--testnet=1` option as the first argument to all MMGen commands you run. To save typing, the option may also be set in the MMGen configuration file.* diff --git a/Required-MSYS-Archives.md b/Required-MSYS-Archives.md index 611f38d..87da913 100644 --- a/Required-MSYS-Archives.md +++ b/Required-MSYS-Archives.md @@ -12,32 +12,34 @@ > * [sed-bin][] > * [grep-bin][] > * [gzip-bin][] +> * [zip-bin][] +> * [unzip-bin][] > * [termcap-bin][] > * [gawk-bin][] > * [perl-bin][] > * [m4-bin][] > * [libcrypt-dll][] > * [libintl-dll][] -> * [tar-1.23-1-bin][] -[msysCORE-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma -[msysCORE-doc]: http://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-doc.tar.lzma -[msysCORE-ext]: http://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-ext.tar.lzma -[libtermcap-dll]: http://sourceforge.net/projects/mingw/files/MSYS/Base/termcap/termcap-0.20050421_1-2/libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma -[bash-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/bash/bash-3.1.17-4/bash-3.1.17-4-msys-1.0.16-bin.tar.lzma -[libiconv-dll]: http://sourceforge.net/projects/mingw/files/MSYS/Base/libiconv/libiconv-1.14-1/libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma -[less-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/less/less-436-2/less-436-2-msys-1.0.13-bin.tar.lzma -[make-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/make/make-3.81-3/make-3.81-3-msys-1.0.13-bin.tar.lzma -[tar-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma -[libregex-dll]: http://sourceforge.net/projects/mingw/files/MSYS/Base/regex/regex-1.20090805-2/libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma -[coreutils-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys-1.0.13-bin.tar.lzma -[sed-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/sed/sed-4.2.1-2/sed-4.2.1-2-msys-1.0.13-bin.tar.lzma -[grep-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/grep/grep-2.5.4-2/grep-2.5.4-2-msys-1.0.13-bin.tar.lzma -[gzip-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/gzip/gzip-1.3.12-2/gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma -[termcap-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/termcap/termcap-0.20050421_1-2/termcap-0.20050421_1-2-msys-1.0.13-bin.tar.lzma -[gawk-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Base/gawk/gawk-3.1.7-2/gawk-3.1.7-2-msys-1.0.13-bin.tar.lzma -[perl-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Extension/perl/perl-5.8.8-1/perl-5.8.8-1-msys-1.0.17-bin.tar.lzma -[m4-bin]: http://sourceforge.net/projects/mingw/files/MSYS/Extension/m4/m4-1.4.16-2/m4-1.4.16-2-msys-1.0.17-bin.tar.lzma -[libcrypt-dll]: http://sourceforge.net/projects/mingw/files/MSYS/Extension/crypt/crypt-1.1_1-3/libcrypt-1.1_1-3-msys-1.0.13-dll-0.tar.lzma -[libintl-dll]: http://sourceforge.net/projects/mingw/files/MSYS/Base/gettext/gettext-0.18.1.1-1/libintl-0.18.1.1-1-msys-1.0.17-dll-8.tar.lzma -[tar-1.23-1-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma +[msysCORE-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-bin.tar.lzma +[msysCORE-doc]: https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-doc.tar.lzma +[msysCORE-ext]: https://sourceforge.net/projects/mingw/files/MSYS/Base/msys-core/msys-1.0.18-1/msysCORE-1.0.18-1-msys-1.0.18-ext.tar.lzma +[libtermcap-dll]: https://sourceforge.net/projects/mingw/files/MSYS/Base/termcap/termcap-0.20050421_1-2/libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma +[bash-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/bash/bash-3.1.17-4/bash-3.1.17-4-msys-1.0.16-bin.tar.lzma +[libiconv-dll]: https://sourceforge.net/projects/mingw/files/MSYS/Base/libiconv/libiconv-1.14-1/libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma +[less-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/less/less-436-2/less-436-2-msys-1.0.13-bin.tar.lzma +[make-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/make/make-3.81-3/make-3.81-3-msys-1.0.13-bin.tar.lzma +[libregex-dll]: https://sourceforge.net/projects/mingw/files/MSYS/Base/regex/regex-1.20090805-2/libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma +[coreutils-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/coreutils/coreutils-5.97-3/coreutils-5.97-3-msys-1.0.13-bin.tar.lzma +[sed-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/sed/sed-4.2.1-2/sed-4.2.1-2-msys-1.0.13-bin.tar.lzma +[grep-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/grep/grep-2.5.4-2/grep-2.5.4-2-msys-1.0.13-bin.tar.lzma +[gzip-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/gzip/gzip-1.3.12-2/gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma +[zip-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Extension/zip/zip-3.0-1/zip-3.0-1-msys-1.0.14-bin.tar.lzma +[termcap-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/termcap/termcap-0.20050421_1-2/termcap-0.20050421_1-2-msys-1.0.13-bin.tar.lzma +[gawk-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/gawk/gawk-3.1.7-2/gawk-3.1.7-2-msys-1.0.13-bin.tar.lzma +[perl-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Extension/perl/perl-5.8.8-1/perl-5.8.8-1-msys-1.0.17-bin.tar.lzma +[m4-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Extension/m4/m4-1.4.16-2/m4-1.4.16-2-msys-1.0.17-bin.tar.lzma +[libcrypt-dll]: https://sourceforge.net/projects/mingw/files/MSYS/Extension/crypt/crypt-1.1_1-3/libcrypt-1.1_1-3-msys-1.0.13-dll-0.tar.lzma +[libintl-dll]: https://sourceforge.net/projects/mingw/files/MSYS/Base/gettext/gettext-0.18.1.1-1/libintl-0.18.1.1-1-msys-1.0.17-dll-8.tar.lzma +[tar-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Base/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma +[unzip-bin]: https://sourceforge.net/projects/mingw/files/MSYS/Extension/unzip/unzip-6.0-1/unzip-6.0-1-msys-1.0.13-bin.tar.lzma diff --git a/Required-MinGW-Archives.md b/Required-MinGW-Archives.md index 242883c..7609163 100644 --- a/Required-MinGW-Archives.md +++ b/Required-MinGW-Archives.md @@ -30,34 +30,34 @@ > * [automake1.11-bin][] > * [libtool-2.4-1-bin][] -[bsdtar]: http://sourceforge.net/projects/mingw/files/MinGW/Extension/bsdtar/basic-bsdtar-2.8.3-1/basic-bsdtar-2.8.3-1-mingw32-bin.zip -[gcc-core-bin]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma -[gcc-core-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dev.tar.lzma -[gcc-core-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma -[gcc-c++-bin]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-bin.tar.lzma -[gcc-c++-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dev.tar.lzma -[gcc-c++-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dll.tar.lzma -[binutils-bin]: http://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/binutils-2.24/binutils-2.24-1-mingw32-bin.tar.xz -[binutils-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/binutils-2.24/binutils-2.24-1-mingw32-dev.tar.xz -[gettext-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dev.tar.lzma -[gettext-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma -[libintl-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.1.1-2/libintl-0.18.1.1-2-mingw32-dll-8.tar.lzma -[gmp-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dev.tar.lzma -[gmp-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma -[libiconv-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dev.tar.lzma -[libiconv-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma -[mingwrt-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/mingwrt-4.0.3/mingwrt-4.0.3-1-mingw32-dev.tar.lzma -[mingwrt-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/mingwrt-4.0.3/mingwrt-4.0.3-1-mingw32-dll.tar.lzma -[mpc-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dev.tar.lzma -[mpc-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma -[mpfr-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dev.tar.lzma -[mpfr-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma -[pthreads-w32-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dev.tar.lzma -[pthreads-w32-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dll.tar.lzma -[w32api-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/w32api-4.0.3/w32api-4.0.3-1-mingw32-dev.tar.lzma -[zlib-dev]: http://sourceforge.net/projects/mingw/files/MinGW/Base/zlib/zlib-1.2.8/zlib-1.2.8-1-mingw32-dev.tar.lzma -[zlib-dll]: http://sourceforge.net/projects/mingw/files/MinGW/Base/zlib/zlib-1.2.8/zlib-1.2.8-1-mingw32-dll.tar.lzma -[gettext-bin]: http://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-bin.tar.lzma -[autoconf2.5-bin]: http://sourceforge.net/projects/mingw/files/MinGW/Extension/autoconf/autoconf2.5/autoconf2.5-2.68-1/autoconf2.5-2.68-1-mingw32-bin.tar.lzma -[automake1.11-bin]: http://sourceforge.net/projects/mingw/files/MinGW/Extension/automake/automake1.11/automake1.11-1.11.1-1/automake1.11-1.11.1-1-mingw32-bin.tar.lzma +[bsdtar]: https://sourceforge.net/projects/mingw/files/MinGW/Extension/bsdtar/basic-bsdtar-2.8.3-1/basic-bsdtar-2.8.3-1-mingw32-bin.zip +[gcc-core-bin]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma +[gcc-core-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dev.tar.lzma +[gcc-core-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma +[gcc-c++-bin]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-bin.tar.lzma +[gcc-c++-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dev.tar.lzma +[gcc-c++-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-c++-4.8.1-4-mingw32-dll.tar.lzma +[binutils-bin]: https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/binutils-2.24/binutils-2.24-1-mingw32-bin.tar.xz +[binutils-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/binutils-2.24/binutils-2.24-1-mingw32-dev.tar.xz +[gettext-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dev.tar.lzma +[gettext-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-dll.tar.lzma +[libintl-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.1.1-2/libintl-0.18.1.1-2-mingw32-dll-8.tar.lzma +[gmp-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dev.tar.lzma +[gmp-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gmp/gmp-5.1.2/gmp-5.1.2-1-mingw32-dll.tar.lzma +[libiconv-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dev.tar.lzma +[libiconv-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/libiconv/libiconv-1.14-3/libiconv-1.14-3-mingw32-dll.tar.lzma +[mingwrt-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/mingwrt-4.0.3/mingwrt-4.0.3-1-mingw32-dev.tar.lzma +[mingwrt-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/mingw-rt/mingwrt-4.0.3/mingwrt-4.0.3-1-mingw32-dll.tar.lzma +[mpc-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dev.tar.lzma +[mpc-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/mpc/mpc-1.0.1-2/mpc-1.0.1-2-mingw32-dll.tar.lzma +[mpfr-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dev.tar.lzma +[mpfr-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/mpfr/mpfr-3.1.2-2/mpfr-3.1.2-2-mingw32-dll.tar.lzma +[pthreads-w32-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dev.tar.lzma +[pthreads-w32-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/pthreads-w32/pthreads-w32-2.9.1/pthreads-w32-2.9.1-1-mingw32-dll.tar.lzma +[w32api-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/w32api/w32api-4.0.3/w32api-4.0.3-1-mingw32-dev.tar.lzma +[zlib-dev]: https://sourceforge.net/projects/mingw/files/MinGW/Base/zlib/zlib-1.2.8/zlib-1.2.8-1-mingw32-dev.tar.lzma +[zlib-dll]: https://sourceforge.net/projects/mingw/files/MinGW/Base/zlib/zlib-1.2.8/zlib-1.2.8-1-mingw32-dll.tar.lzma +[gettext-bin]: https://sourceforge.net/projects/mingw/files/MinGW/Base/gettext/gettext-0.18.3.1-1/gettext-0.18.3.1-1-mingw32-bin.tar.lzma +[autoconf2.5-bin]: https://sourceforge.net/projects/mingw/files/MinGW/Extension/autoconf/autoconf2.5/autoconf2.5-2.68-1/autoconf2.5-2.68-1-mingw32-bin.tar.lzma +[automake1.11-bin]: https://sourceforge.net/projects/mingw/files/MinGW/Extension/automake/automake1.11/automake1.11-1.11.1-1/automake1.11-1.11.1-1-mingw32-bin.tar.lzma [libtool-2.4-1-bin]: https://sourceforge.net/projects/mingw/files/MinGW/Extension/libtool/libtool-2.4-1/libtool-2.4-1-mingw32-bin.tar.lzma diff --git a/man-addrgen.md b/man-addrgen.md index f351422..9d303a2 100644 --- a/man-addrgen.md +++ b/man-addrgen.md @@ -1,6 +1,6 @@ MMGEN-ADDRGEN: Generate a range or list of addresses from an MMGen wallet, mnemonic, seed or password - USAGE: mmgen-addrgen [opts] [infile]
+ USAGE: mmgen-addrgen [opts] [infile] OPTIONS: -h, --help Print this help message --longhelp Print help message for long options (common options) @@ -26,8 +26,7 @@ -S, --stdout Print addresses to stdout -v, --verbose Produce more verbose output - Addresses are given in a comma-separated list. Hyphen-separated ranges are - also allowed. + Address indexes are given in a comma-separated list and/or hyphen-separated ranges. If available, the external 'keyconv' program will be used for address generation. @@ -53,4 +52,4 @@ SeedFile .mmseed mmseed,seed,s Wallet .mmdat wallet,w - MMGEN v0.8.7a November 2016 MMGEN-ADDRGEN(1) + MMGEN v0.8.8 November 2016 MMGEN-ADDRGEN(1) diff --git a/man-addrimport.md b/man-addrimport.md index 4cea360..7d769b3 100644 --- a/man-addrimport.md +++ b/man-addrimport.md @@ -15,6 +15,6 @@ This command can also be used to update the comment fields of addresses already in the tracking wallet. - The --batch option cannot be used with the --rescan option. + The --batch and --rescan options cannot be used together. - MMGEN v0.8.7a November 2016 MMGEN-ADDRIMPORT(1) + MMGEN v0.8.8 November 2016 MMGEN-ADDRIMPORT(1) diff --git a/man-keygen.md b/man-keygen.md index a0c6833..e97eee8 100644 --- a/man-keygen.md +++ b/man-keygen.md @@ -1,6 +1,6 @@ MMGEN-KEYGEN: Generate a range or list of keys from an MMGen wallet, mnemonic, seed or password - USAGE: mmgen-keygen [opts] [infile]
+ USAGE: mmgen-keygen [opts] [infile] OPTIONS: -h, --help Print this help message --longhelp Print help message for long options (common options) @@ -28,8 +28,7 @@ -v, --verbose Produce more verbose output -x, --b16 Print secret keys in hexadecimal too - Addresses are given in a comma-separated list. Hyphen-separated ranges are - also allowed. + Address indexes are given in a comma-separated list and/or hyphen-separated ranges. By default, both addresses and secret keys are generated. @@ -54,4 +53,4 @@ SeedFile .mmseed mmseed,seed,s Wallet .mmdat wallet,w - MMGEN v0.8.7a November 2016 MMGEN-KEYGEN(1) + MMGEN v0.8.8 November 2016 MMGEN-KEYGEN(1) diff --git a/man-passchg.md b/man-passchg.md index 6b86dd2..e19bc35 100644 --- a/man-passchg.md +++ b/man-passchg.md @@ -1,10 +1,11 @@ - MMGEN-PASSCHG: Change the password, hash preset or label of an MMGen wallet + MMGEN-PASSCHG: Change the passphrase, hash preset or label of an MMGen wallet USAGE: mmgen-passchg [opts] [infile] OPTIONS: -h, --help Print this help message --longhelp Print help message for long options (common options) -d, --outdir d Output files to directory 'd' instead of working dir -e, --echo-passphrase Echo passphrases and other user input to screen + -f, --force-update Force update of wallet even if nothing has changed -i, --in-fmt f Input from wallet format 'f' (see FMT CODES below) -H, --hidden-incog-input-params f,o Read hidden incognito data from file 'f' at offset 'o' (comma-separated) @@ -41,4 +42,4 @@ SeedFile .mmseed mmseed,seed,s Wallet .mmdat wallet,w - MMGEN v0.8.7a November 2016 MMGEN-PASSCHG(1) + MMGEN v0.8.8 November 2016 MMGEN-PASSCHG(1) diff --git a/man-tool.md b/man-tool.md index d54aea7..d5b77e9 100644 --- a/man-tool.md +++ b/man-tool.md @@ -80,4 +80,4 @@ Type 'mmgen-tool help for help on a particular command - MMGEN v0.8.7a November 2016 MMGEN-TOOL(1) + MMGEN v0.8.8 November 2016 MMGEN-TOOL(1) diff --git a/man-txcreate.md b/man-txcreate.md index 3851b23..74d7d80 100644 --- a/man-txcreate.md +++ b/man-txcreate.md @@ -14,8 +14,8 @@ -q, --quiet Suppress warnings; overwrite files without prompting -v, --verbose Produce more verbose output - Transaction inputs are chosen from a list of the user's unpent outputs - via an interactive menu. + The transaction's outputs are specified on the command line, while its inputs + are chosen from a list of the user's unpent outputs via an interactive menu. If the transaction fee is not specified by the user, it will be calculated using bitcoind's "estimatefee" function for the default (or user-specified) @@ -33,4 +33,4 @@ To send the value of all inputs (minus TX fee) to a single output, specify one address with no amount on the command line. - MMGEN v0.8.7a November 2016 MMGEN-TXCREATE(1) + MMGEN v0.8.8 November 2016 MMGEN-TXCREATE(1) diff --git a/man-txsend.md b/man-txsend.md index 4b79986..aec6797 100644 --- a/man-txsend.md +++ b/man-txsend.md @@ -6,4 +6,4 @@ -d, --outdir d Specify an alternate directory 'd' for output -q, --quiet Suppress warnings; overwrite files without prompting - MMGEN v0.8.7a November 2016 MMGEN-TXSEND(1) + MMGEN v0.8.8 November 2016 MMGEN-TXSEND(1) diff --git a/man-txsign.md b/man-txsign.md index d5751c9..e7db443 100644 --- a/man-txsign.md +++ b/man-txsign.md @@ -32,32 +32,29 @@ -t, --terse-info Like '--info', but produce more concise output -v, --verbose Produce more verbose output - Transactions with either MMGen or non-MMGen input addresses may be signed. - For non-MMGen inputs, the bitcoind wallet.dat is used as the key source. - For MMGen inputs, key data is generated from your seed as with the - mmgen-addrgen and mmgen-keygen utilities. + Transactions may contain both MMGen or non-MMGen input addresses. - Data for the --from- options will be taken from a file if a second - file is specified on the command line. Otherwise, the user will be - prompted to enter the data. + To sign non-MMGen inputs, a bitcoind wallet dump or flat key list is used + as the key source ('--keys-from-file' option). - In cases of transactions with mixed MMGen and non-MMGen inputs, non-MMGen - keys must be supplied in a separate file (WIF format, one key per line) - using the '--keys-from-file' option. Alternatively, one may get keys from - a running bitcoind using the '--force-wallet-dat' option. First import the - required MMGen keys using 'bitcoind importprivkey'. + To sign MMGen inputs, key data is generated from a seed as with the + mmgen-addrgen and mmgen-keygen commands. Alternatively, a key-address file + may be used (--mmgen-keys-from-file option). - For transaction outputs that are MMGen addresses, MMGen-to-Bitcoin address - mappings are verified. Therefore, seed material or a key-address file for - these addresses must be supplied on the command line. + Multiple wallets or other seed files can be listed on the command line in + any order. If the seeds required to sign the transaction's inputs are not + found in these files (or in the default wallet), the user will be prompted + for seed data interactively. - Seed data supplied in files must have the following extensions: - wallet: '.mmdat' - seed: '.mmseed' - mnemonic: '.mmwords' - brainwallet: '.mmbrain' + To prevent an attacker from crafting transactions with bogus MMGen-to-Bitcoin + address mappings, all outputs to MMGen addresses are verified with a seed + source. Therefore, seed files or a key-address file for all MMGen outputs + must also be supplied on the command line if the data can't be found in the + default wallet. + + Seed source files must have the canonical extensions listed in the 'FileExt' + column below: - FMT CODES: Format FileExt Valid codes ------ ------- ----------- Brainwallet .mmbrain mmbrain,brainwallet,brain,bw,b @@ -68,4 +65,4 @@ SeedFile .mmseed mmseed,seed,s Wallet .mmdat wallet,w - MMGEN v0.8.7a November 2016 MMGEN-TXSIGN(1) + MMGEN v0.8.8 November 2016 MMGEN-TXSIGN(1) diff --git a/man-walletchk.md b/man-walletchk.md index 12c1fee..f3b0159 100644 --- a/man-walletchk.md +++ b/man-walletchk.md @@ -41,4 +41,4 @@ SeedFile .mmseed mmseed,seed,s Wallet .mmdat wallet,w - MMGEN v0.8.7a November 2016 MMGEN-WALLETCHK(1) + MMGEN v0.8.8 November 2016 MMGEN-WALLETCHK(1) diff --git a/man-walletconv.md b/man-walletconv.md index 5e9176b..1712b75 100644 --- a/man-walletconv.md +++ b/man-walletconv.md @@ -51,4 +51,4 @@ SeedFile .mmseed mmseed,seed,s Wallet .mmdat wallet,w - MMGEN v0.8.7a November 2016 MMGEN-WALLETCONV(1) + MMGEN v0.8.8 November 2016 MMGEN-WALLETCONV(1) diff --git a/man-walletgen.md b/man-walletgen.md index 3bd41cf..98241ff 100644 --- a/man-walletgen.md +++ b/man-walletgen.md @@ -44,4 +44,4 @@ SeedFile .mmseed mmseed,seed,s Wallet .mmdat wallet,w - MMGEN v0.8.7a November 2016 MMGEN-WALLETGEN(1) + MMGEN v0.8.8 November 2016 MMGEN-WALLETGEN(1)