Browse Source

Documentation updates - doc/wiki/install-linux/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md - doc/wiki/install-linux/Install-Bitcoind.md - doc/wiki/install-linux/Install-MMGen-on-Debian-or-Ubuntu-Linux.md - doc/wiki/install-mswin/Install-Bitcoind.md - doc/wiki/install-mswin/Install-MMGen-on-Microsoft-Windows.md - doc/wiki/using-mmgen/Altcoin-and-Forkcoin-Support.md - doc/wiki/using-mmgen/Getting-Started-with-MMGen.md - doc/wiki/using-mmgen/MMGen-Quick-Start-with-Regtest-Mode.md - doc/wiki/using-mmgen/Subwallets.md

The MMGen Project 3 years ago
parent
commit
63065f7151

+ 8 - 11
doc/wiki/install-linux/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md

@@ -43,17 +43,13 @@ binaries are available for Bitcoin Core, Bitcoin ABC and Litecoin.  See the
 	$ cd src
 	$ sudo install -sv bitcoind bitcoin-cli /usr/local/bin
 
-### Compile and install Bitcoin ABC (optional):
+### Compile and install Bitcoin Cash Node (optional):
 
-> *Consider Bitcoin ABC to be experimental software.  The author of the MMGen
-> project has only partially reviewed its codebase and makes no guarantees
-> regarding its safety or reliability.*
+> If you want to transact BCH, also known as “Bitcoin Cash Node”, then first
+> clone the Bitcoin Cash Node repository:
 
-> If you want to transact BCH, also known as “Bitcoin Cash” or “Bcash”, then
-> first clone the Bitcoin ABC repository:
-
-	$ git clone https://github.com/Bitcoin-ABC/bitcoin-abc
-	$ cd bitcoin-abc
+	$ git clone https://github.com/bitcoin-cash-node/bitcoin-cash-node
+	$ cd bitcoin-cash-node
 
 > Then configure and build using the same configure and build steps as with
 > Bitcoin Core above.
@@ -62,9 +58,9 @@ binaries are available for Bitcoin Core, Bitcoin ABC and Litecoin.  See the
 > under a different name to avoid overwriting your Core daemon:
 
 	$ cd src
-	$ sudo install -sv bitcoind /usr/local/bin/bitcoind-abc
+	$ sudo install -sv bitcoind /usr/local/bin/bitcoind-bchn
 
-> From now on, you’ll invoke the daemon as 'bitcoind-abc' instead of 'bitcoind'.
+> From now on, you’ll invoke the daemon as 'bitcoind-bchn' instead of 'bitcoind'.
 
 ### Compile and install Litecoin Core (optional):
 
@@ -92,3 +88,4 @@ same machine:
 [01]: Install-Bitcoind
 [02]: Install-Bitcoind#a_r
 [bu]: https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md
+[bcha]: https://github.com/Bitcoin-ABC/bitcoin-abc

+ 27 - 28
doc/wiki/install-linux/Install-Bitcoind.md

@@ -25,13 +25,11 @@ more low-powered computer as your online machine.
 >> 32-bit or 64-bit versions appropriate for your online and offline computers.
 >> Windows users should choose the executable installer.
 
-> **Bitcoin ABC (optional):**
+> **Bitcoin Cash Node (optional):**
 
->> If you wish to transact BCH (Bcash), then download the appropriate [Bitcoin
->> ABC binary][abc] for your system as well.  Windows users should choose the
->> executable installer.
->> *Consider the Bitcoin ABC binaries untrusted software.  The author of the
->> MMGen project makes no guarantees regarding their safety or reliability.*
+>> If you wish to transact BCH (Bitcoin Cash Node), then download the
+>> appropriate [Bitcoin Cash Node binary][bch] for your system.
+>> Windows users should choose the executable installer.
 
 > **Litecoin (optional):**
 
@@ -46,19 +44,20 @@ more low-powered computer as your online machine.
 >> **Windows:** Run the Windows installer with the default settings.
 >> At the end of the installation process, uncheck the Run box to prevent the
 >> client from starting.
->> Add `C:\Program Files\Bitcoin\daemon` to your [path][05].  
+>>
 >> **Linux:** Unpack the archive and copy the `bitcoind` and `bitcoin-cli`
 >> binaries to `/usr/local/bin`.
 
-> **Bitcoin ABC (optional):**
+> **Bitcoin Cash Node (optional):**
 
 >> **Windows:** Run the Windows installer with the default settings.
 >> At the end of the installation process, uncheck the Run box to prevent the
 >> client from starting.
->> Add `C:\Program Files\Bitcoin-abc\daemon` to your [path][05].
->> Rename the file `bitcoind` in that folder to `bitcoind-abc` and
->> `bitcoin-cli` to `bitcoin-cli-abc`.  
->> **Linux:** Unpack the archive, rename `bitcoind` to `bitcoind-abc` and
+>>
+>> Navigate to `C:\Program Files\Bitcoin-Cash-Node\daemon` and rename the file
+>> `bitcoind` to `bitcoind-bchn` and `bitcoin-cli` to `bitcoin-cli-bchn`.
+>>
+>> **Linux:** Unpack the archive, rename `bitcoind` to `bitcoind-bchn` and
 >> copy it to `/usr/local/bin`.
 
 > **Litecoin (optional):**
@@ -66,7 +65,7 @@ more low-powered computer as your online machine.
 >> **Windows:** Run the Windows installer with the default settings.
 >> At the end of the installation process, uncheck the Run box to prevent the
 >> client from starting.
->> Add `C:\Program Files\Litecoin\daemon` to your [path][05].  
+>>
 >> **Linux:** Unpack the archive and copy the `litecoind` and
 >> `litecoin-cli` binaries to `/usr/local/bin`.
 
@@ -81,14 +80,15 @@ more low-powered computer as your online machine.
 	# Bitcoin Core:
 	$ bitcoind
 
-	# ABC:
-	$ mkdir $APPDATA/Bitcoin_ABC
-	$ bitcoind-abc --listen=0 --rpcport=8442 --datadir=$APPDATA/Bitcoin_ABC --usecashaddr=0
+	# Bitcoin Cash Node:
+	$ mkdir $APPDATA/Bitcoin-Cash-Node
+	$ bitcoind-bchn --listen=0 --rpcport=8442 --datadir=$APPDATA/Bitcoin-Cash-Node --usecashaddr=0
 
 	# Litecoin
 	$ litecoind
 
->> Note that the `--listen=0` argument is required only when running Core and ABC simultaneously.
+>> Note that the `--listen=0` argument is required only when running Bitcoin
+>> Core and Bitcoin Cash Node simultaneously.
 
 > **Linux:**
 
@@ -97,9 +97,9 @@ more low-powered computer as your online machine.
 	# Bitcoin Core:
 	$ bitcoind --daemon
 
-	# ABC:
-	$ mkdir ~/.bitcoin-abc
-	$ bitcoind-abc --daemon --listen=0 --rpcport=8442 --datadir=$HOME/.bitcoin-abc --usecashaddr=0
+	# Bitcoin Cash Node:
+	$ mkdir ~/.bitcoin-bchn
+	$ bitcoind-bchn --daemon --listen=0 --rpcport=8442 --datadir=$HOME/.bitcoin-bchn --usecashaddr=0
 
 	# Litecoin:
 	$ litecoind --daemon
@@ -109,8 +109,8 @@ more low-powered computer as your online machine.
 	# Core:
 	$ bitcoin-cli help
 
-	# ABC:
-	$ bitcoin-cli-abc --rpcport=8442 help
+	# Bitcoin Cash Node:
+	$ bitcoin-cli-bchn --rpcport=8442 help
 
 	# Litecoin:
 	$ litecoin-cli help
@@ -132,9 +132,8 @@ more low-powered computer as your online machine.
 > have a blockchain consisting of one block, and use practically no CPU power
 > once running.
 
-[00]: https://bitcoin.org/bin/
-[01]: https://bitcoincore.org/bin/
-[bd]: https://bitcoin.org/bin/blockchain/
-[05]: Editing-the-user-path-in-Windows
-[abc]: https://download.bitcoinabc.org/
-[lc]: https://download.litecoin.org/litecoin-0.17.1/
+[00]:  https://bitcoin.org/bin/
+[01]:  https://bitcoincore.org/bin/
+[bd]:  https://bitcoin.org/bin/blockchain/
+[lc]:  https://litecoin.org
+[bch]: https://bitcoincashnode.org/en/download.html

+ 1 - 1
doc/wiki/install-linux/Install-MMGen-on-Debian-or-Ubuntu-Linux.md

@@ -3,7 +3,7 @@
 Install required Debian/Ubuntu packages:
 
 	$ sudo apt-get install autoconf git libgmp-dev libssl-dev libpcre3-dev libtool wipe curl
-	$ sudo apt-get install python3-dev python3-ecdsa python3-pexpect python3-setuptools python3-cryptography python3-nacl python3-pip python3-gmpy2 python3-sha3 python3-requests python3-aiohttp
+	$ sudo apt-get install python3-dev python3-ecdsa python3-pexpect python3-setuptools python3-cryptography python3-nacl python3-pip python3-gmpy2 python3-sha3 python3-requests python3-aiohttp python3-socks
 
 Using the [pip3][P] installer, install the scrypt Python package:
 

+ 27 - 28
doc/wiki/install-mswin/Install-Bitcoind.md

@@ -25,13 +25,11 @@ more low-powered computer as your online machine.
 >> 32-bit or 64-bit versions appropriate for your online and offline computers.
 >> Windows users should choose the executable installer.
 
-> **Bitcoin ABC (optional):**
+> **Bitcoin Cash Node (optional):**
 
->> If you wish to transact BCH (Bcash), then download the appropriate [Bitcoin
->> ABC binary][abc] for your system as well.  Windows users should choose the
->> executable installer.
->> *Consider the Bitcoin ABC binaries untrusted software.  The author of the
->> MMGen project makes no guarantees regarding their safety or reliability.*
+>> If you wish to transact BCH (Bitcoin Cash Node), then download the
+>> appropriate [Bitcoin Cash Node binary][bch] for your system.
+>> Windows users should choose the executable installer.
 
 > **Litecoin (optional):**
 
@@ -46,19 +44,20 @@ more low-powered computer as your online machine.
 >> **Windows:** Run the Windows installer with the default settings.
 >> At the end of the installation process, uncheck the Run box to prevent the
 >> client from starting.
->> Add `C:\Program Files\Bitcoin\daemon` to your [path][05].  
+>>
 >> **Linux:** Unpack the archive and copy the `bitcoind` and `bitcoin-cli`
 >> binaries to `/usr/local/bin`.
 
-> **Bitcoin ABC (optional):**
+> **Bitcoin Cash Node (optional):**
 
 >> **Windows:** Run the Windows installer with the default settings.
 >> At the end of the installation process, uncheck the Run box to prevent the
 >> client from starting.
->> Add `C:\Program Files\Bitcoin-abc\daemon` to your [path][05].
->> Rename the file `bitcoind` in that folder to `bitcoind-abc` and
->> `bitcoin-cli` to `bitcoin-cli-abc`.  
->> **Linux:** Unpack the archive, rename `bitcoind` to `bitcoind-abc` and
+>>
+>> Navigate to `C:\Program Files\Bitcoin-Cash-Node\daemon` and rename the file
+>> `bitcoind` to `bitcoind-bchn` and `bitcoin-cli` to `bitcoin-cli-bchn`.
+>>
+>> **Linux:** Unpack the archive, rename `bitcoind` to `bitcoind-bchn` and
 >> copy it to `/usr/local/bin`.
 
 > **Litecoin (optional):**
@@ -66,7 +65,7 @@ more low-powered computer as your online machine.
 >> **Windows:** Run the Windows installer with the default settings.
 >> At the end of the installation process, uncheck the Run box to prevent the
 >> client from starting.
->> Add `C:\Program Files\Litecoin\daemon` to your [path][05].  
+>>
 >> **Linux:** Unpack the archive and copy the `litecoind` and
 >> `litecoin-cli` binaries to `/usr/local/bin`.
 
@@ -81,14 +80,15 @@ more low-powered computer as your online machine.
 	# Bitcoin Core:
 	$ bitcoind
 
-	# ABC:
-	$ mkdir $APPDATA/Bitcoin_ABC
-	$ bitcoind-abc --listen=0 --rpcport=8442 --datadir=$APPDATA/Bitcoin_ABC --usecashaddr=0
+	# Bitcoin Cash Node:
+	$ mkdir $APPDATA/Bitcoin-Cash-Node
+	$ bitcoind-bchn --listen=0 --rpcport=8442 --datadir=$APPDATA/Bitcoin-Cash-Node --usecashaddr=0
 
 	# Litecoin
 	$ litecoind
 
->> Note that the `--listen=0` argument is required only when running Core and ABC simultaneously.
+>> Note that the `--listen=0` argument is required only when running Bitcoin
+>> Core and Bitcoin Cash Node simultaneously.
 
 > **Linux:**
 
@@ -97,9 +97,9 @@ more low-powered computer as your online machine.
 	# Bitcoin Core:
 	$ bitcoind --daemon
 
-	# ABC:
-	$ mkdir ~/.bitcoin-abc
-	$ bitcoind-abc --daemon --listen=0 --rpcport=8442 --datadir=$HOME/.bitcoin-abc --usecashaddr=0
+	# Bitcoin Cash Node:
+	$ mkdir ~/.bitcoin-bchn
+	$ bitcoind-bchn --daemon --listen=0 --rpcport=8442 --datadir=$HOME/.bitcoin-bchn --usecashaddr=0
 
 	# Litecoin:
 	$ litecoind --daemon
@@ -109,8 +109,8 @@ more low-powered computer as your online machine.
 	# Core:
 	$ bitcoin-cli help
 
-	# ABC:
-	$ bitcoin-cli-abc --rpcport=8442 help
+	# Bitcoin Cash Node:
+	$ bitcoin-cli-bchn --rpcport=8442 help
 
 	# Litecoin:
 	$ litecoin-cli help
@@ -132,9 +132,8 @@ more low-powered computer as your online machine.
 > have a blockchain consisting of one block, and use practically no CPU power
 > once running.
 
-[00]: https://bitcoin.org/bin/
-[01]: https://bitcoincore.org/bin/
-[bd]: https://bitcoin.org/bin/blockchain/
-[05]: Editing-the-user-path-in-Windows
-[abc]: https://download.bitcoinabc.org/
-[lc]: https://download.litecoin.org/litecoin-0.17.1/
+[00]:  https://bitcoin.org/bin/
+[01]:  https://bitcoincore.org/bin/
+[bd]:  https://bitcoin.org/bin/blockchain/
+[lc]:  https://litecoin.org
+[bch]: https://bitcoincashnode.org/en/download.html

+ 69 - 70
doc/wiki/install-mswin/Install-MMGen-on-Microsoft-Windows.md

@@ -82,29 +82,15 @@ will produce a listing of the same directory.
 > Internet on your online computer and copy them to your offline box.  A USB
 > flash drive works ideally for this.
 
-> It’s highly recommended to update the mirror list files located in the
-> directory `/etc/pacman.d`, as these lists allow you to specify the servers
-> you’ll be downloading from.  To view the contents of these files, issue the
-> following commands in your terminal:
-
-		$ cat /etc/pacman.d/mirrorlist.msys
-		$ cat /etc/pacman.d/mirrorlist.mingw64
-		$ cat /etc/pacman.d/mirrorlist.mingw32
-
-> Note that the first-listed server is the one used by default.  On your online
-> computer, download more recent versions of these files from the MSYS2 Github
-> repository:
-
->> <https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman-mirrors/mirrorlist.msys>  
->> <https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman-mirrors/mirrorlist.mingw64>  
->> <https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman-mirrors/mirrorlist.mingw32>
-
-> Optionally edit the files using a text editor such as Notepad, placing the
-> server you wish to use first in the list.  Security-conscious users will
-> prefer the HTTPS servers.  The yandex mirror seems to be the fastest as of
-> this writing.  Now transfer the mirror files to your offline computer,
-> replacing the old ones at `C:\\msys64\etc\pacman.d`.  You can check that the
-> files have indeed been replaced by reissuing the `cat` commands above.
+> The mirror list files located in the directory `/etc/pacman.d` specify the
+> servers to download packages from.
+
+> The server that’s listed first in these files is the one that will used by
+> default, so you may wish to edit them and place the server you wish to use
+> first in the list.  For this you may use a text editor such as Notepad:
+
+		$ notepad /etc/pacman.d/mirrorlist.msys
+		... repeat for remaining mirrorlist files ...
 
 > You need to update your database files as well.  The database files and their
 > associated signature files can be listed by issuing the following command:
@@ -118,35 +104,48 @@ will produce a listing of the same directory.
 >> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/x86_64/mingw64.db>  
 >> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/x86_64/mingw64.db.sig>  
 >> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/i686/mingw32.db>  
->> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/i686/mingw32.db.sig>
+>> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/i686/mingw32.db.sig> 
+>> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/clang64/clang64.db> 
+>> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/clang64/clang64.db.sig> 
+>> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/ucrt64/ucrt64.db> 
+>> <https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/ucrt64/ucrt64.db.sig>
 
 > Copy the files to your offline machine as you did with the mirror files, replacing
 > the originals at `C:\msys64\var\lib\pacman\sync`.
 
 > Now issue the following command:
 
-		$ pacman -Sup
+		$ pacman -Sup > urls.txt
+
+> This command may cause your MSYS terminal window to close.  If so, simply
+> reopen another one.
 
-> This will produce a list of download URLs.  If you add `> urls.txt` to the end
-> of this command, its output will be saved in the file `urls.txt`, which you
-> can then copy to your online machine.  (This redirection trick works for most
-> shell commands, by the way.)  On your online machine, download the files
-> listed in `urls.txt`.  Transfer the downloaded files to your offline machine,
-> copying them to the package cache directory `C:\msys64\var\cache\pacman\pkg`.
+> The command's output is now saved in the file `urls.txt` (this redirection
+> trick using '>' works for most shell commands, by the way).  Copy `urls.txt`
+> to your online machine and download the URLs listed in it.  Transfer the
+> downloaded files to your offline machine, copying them to the package cache
+> directory `C:\msys64\var\cache\pacman\pkg`.
 
 > Now issue the following command to perform the initial upgrade:
 
 		$ pacman -Su
 
 > When the process is finished, close your terminal window as requested and
-> reopen another one.  Your mirror lists may have been overwritten by the
-> upgrade operation, in which case you should restore them from your modified
-> versions.
+> reopen another one.  If any mirror lists have have been added by the upgrade
+> operation, you may wish to edit them as you did above.
 
 > Now reissue the `pacman -Sup` command, which will generate a much longer list
-> of URLs this time.  Download and copy the listed files to the package cache
-> directory just as you did with the previous list.  Invoke `pacman -Su` once
-> again to complete your system upgrade. 
+> of URLs this time.  Download the listed files on your online machine.  Create
+> a new folder on your offline machine:
+
+		$ mkdir packages1
+
+> Copy the downloaded package files to this folder and execute the following
+> command to install them:
+
+		$ (cd packages1; pacman -U *)
+
+> Your system upgrade is now complete.
 
 ### 4. Install MSYS2 MMGen dependencies
 
@@ -159,13 +158,13 @@ specifically required by MMGen.
 > while `pacman -Sp <pgknames>` prints a list of download URLs for the packages
 > and their dependencies.  So before running the command shown below, you’ll
 > first need to issue it with `-Sp` instead of `-S` to produce a URL list.
-> Download these URLs on your online machine and copy the downloaded files to
-> the package cache directory of your offline machine just as you did with the
-> system upgrade.
+> Download these URLs on your online machine and copy and install the
+> downloaded files to the your offline machine just as you did in the previous
+> step, substituting `packages2` for `packages1` in both commands.
 
 Install the packages and their dependencies:
 
-	$ pacman -S tar git nano vim autoconf automake-wrapper autogen \
+	$ pacman -S tar git vim autoconf automake-wrapper autogen \
 		mingw64/mingw-w64-x86_64-libtool \
 		mingw64/mingw-w64-x86_64-pcre \
 		mingw64/mingw-w64-x86_64-make \
@@ -187,32 +186,37 @@ binaries required by MMGen:
 
 Open your shell’s runtime configuration file in a text editor:
 
-	$ nano ~/.bashrc
+	$ notepad ~/.bashrc
 
-Add the following two lines to the end of the file, save and exit:
+Add the following two lines to the end of the file (if this is a Bitcoin-only
+installation, you may omit the Litecoin and Bitcoin Cash Node components of the
+path):
 
-	export PATH="/mingw64/bin:$PATH:/c/Program Files/Bitcoin/daemon:/c/Program Files/Litecoin/daemon:/c/Program Files/Bitcoin-abc/daemon"
+	export PATH="/mingw64/bin:$PATH:/c/Program Files/Bitcoin/daemon:/c/Program Files/Litecoin/daemon:/c/Program Files/Bitcoin-Cash-Node/daemon"
 	export PYTHONUTF8=1
 
-Close and reopen the terminal window to update your working environment.
+Save and exit.  Close and reopen the terminal window to update your working
+environment.
 
 ### 6. Install MMGen dependencies not provided by MSYS2
 
-Three of MMGen’s Python dependencies, `ecdsa`, `py_ecc` and `mypy_extensions`,
-are not provided by MSYS2.  If you’re online, you can install them using the pip
-package installer as follows:
+Four of MMGen’s Python dependencies, `ecdsa`, `py_ecc`, `mypy_extensions` and
+`socks`, are not provided by MSYS2.  If you’re online, you can install them
+using the pip package installer as follows:
 
-	$ pip3 install --no-deps ecdsa==0.13 py_ecc==1.6.0 mypy_extensions==0.4.1
+	$ pip3 install --no-deps ecdsa==0.13 py_ecc==1.6.0 mypy_extensions==0.4.1 socks
 
 For an offline install, first download the packages on your online machine like
 this:
 
-	$ pip3 download --no-deps ecdsa==0.13 py_ecc==1.6.0 mypy_extensions==0.4.1
+	$ pip3 download --no-deps ecdsa==0.13 py_ecc==1.6.0 mypy_extensions==0.4.1 socks
 
-Then transfer the `*.whl` files to your offline machine, `cd` to the directory
+Then transfer the downloaded files to your offline machine, `cd` to the directory
 containing the files and install them as follows:
 
 	$ pip3 install --no-deps *.whl
+	$ tar zxvf socks-0.tar.gz
+	$ (cd socks-0; python3 setup.py install)
 
 ### 7. Install the standalone scrypt package (required for strong password hashing)
 
@@ -264,19 +268,11 @@ to your offline machine.
 Enter the directory, configure, build and install:
 
 	$ cd secp256k1
-	$ libtoolize
 	$ ./autogen.sh
-	$ ./configure
-	$ mingw32-make.exe install MAKE=mingw32-make LIBTOOL=$(which libtool) 
-
-### 9. Install the sdelete utility (required for secure wallet deletion)
-
-Grab the latest SDelete [zip archive][sd], and unzip and copy `sdelete.exe` to
-`/usr/local/bin`.  You must run the program once manually to accept the license
-agreement.  Failing to do this will cause some scripts to hang, so you should do
-it now.
+	$ ./configure --disable-dependency-tracking
+	$ mingw32-make.exe install MAKE=mingw32-make LIBTOOL=$(which libtool)
 
-### 10. Install MMGen
+### 9. Install MMGen
 
 Now you’re ready to install MMGen itself.  On your online machine, clone the
 repository:
@@ -302,7 +298,7 @@ before being pushed to the public repository, it’s not guaranteed to install o
 run on MSYS2.  Installation or runtime issues may also arise due to missing
 dependencies or installation steps not yet covered in the documentation.
 
-### 11. Install and launch your coin daemons
+### 10. Install and launch your coin daemons
 
 At this point your MMGen installation will be able to generate wallets, along
 with keys and addresses for all supported coins.  However, if you intend to do
@@ -316,10 +312,13 @@ about adding to the Windows path, since your `PATH` variable was taken care of
 in Step 5.  Note that the daemons must be installed on both your online and
 offline machines.
 
-To transact ETH, ETC or ERC20 tokens you’ll need the latest Windows
-`openethereum.exe` binary from the [OpenEthereum Github repository][og].
-OpenEthereum, unlike the other coin daemons, is installed on the online machine
-only.  Copy the binary to your executable path, preferably `/usr/local/bin`.
+To transact ETH, ETC or ERC20 tokens you’ll need the latest OpenEthereum binary
+build for Windows from the [OpenEthereum Github repository][og].  OpenEthereum,
+unlike the other coin daemons, is installed on the online machine only.  Copy
+the `openethereum.exe` and `ethkey.exe` binaries to `/usr/local/bin`.  Please
+note that OpenEthereum performs very poorly under Windows due to threading
+limitations.  Unless you have very fast hardware, transacting and syncing the
+blockchain could be painfully slow.
 
 Typically you’ll wish to launch OpenEthereum as follows:
 
@@ -327,7 +326,7 @@ Typically you’ll wish to launch OpenEthereum as follows:
 
 More information on OpenEthereum’s command-line options can be found [here][pl].
 
-### 12. You’re done!
+### 11. You’re done!
 
 Congratulations, your installation is now complete, and you can proceed to
 [**Getting Started with MMGen**][gs].  Note that all features supported by
@@ -337,8 +336,8 @@ Please be aware of the following, however:
 + Non-ASCII filenames cannot be used with the Monero wallet syncing tool.  This
   is an issue with the Monero wallet RPC daemon rather than MMGen.
 
-+ The Bitcoin-ABC daemon cannot handle non-ASCII pathnames.  This is an issue
-  with the Bitcoin-ABC implementation for Windows, not MMGen.
++ The Bitcoin Cash Node daemon cannot handle non-ASCII pathnames.  This is an
+  issue with the Bitcoin Cash Node implementation for Windows, not MMGen.
 
 [mh]: https://www.msys2.org
 [mp]: https://sourceforge.net/projects/msys2

+ 8 - 8
doc/wiki/using-mmgen/Altcoin-and-Forkcoin-Support.md

@@ -6,7 +6,7 @@
 * [Transacting and other basic operations](#a_tx)
 * [Creating and deploying ERC20 tokens](#a_dt)
 
-#### [Full support for Bcash (BCH) and Litecoin](#a_bch)
+#### [Full support for Bitcoin Cash Node (BCH) and Litecoin](#a_bch)
 
 #### [Key/address generation for Zcash (ZEC)](#a_zec)
 
@@ -109,8 +109,7 @@ On your offline machine, sign the TX:
 
 	$ mmgen-txsign --coin=eth --token=eos ABC123-EOS[10,50000].rawtx
 
-*You can also set up and use [autosigning][X] on the offline machine, of
-course.*
+*You can also set up and use [autosigning][X] on the offline machine.*
 
 On your online machine, send the TX:
 
@@ -197,15 +196,16 @@ View your MFT tracking wallet:
 Other token parameters can also be customized.  Type `scripts/create-token.py --help`
 for details.
 
-### <a name='a_bch'>Full support for Bcash (BCH) and Litecoin</a>
+### <a name='a_bch'>Full support for Bitcoin Cash Node (BCH) and Litecoin</a>
 
-Bcash and Litecoin are fully supported by MMGen, on the same level as Bitcoin.
+Bitcoin Cash Node (BCH) and Litecoin are fully supported by MMGen, on the same
+level as Bitcoin.
 
-To use MMGen with Bcash or Litecoin, first make sure the respective Bitcoin ABC
-and Litecoin daemons are properly installed ([source][si])([binaries][bi]),
+To use MMGen with BCH or Litecoin, first make sure the Bitcoin Cash Node or
+Litecoin daemons are properly installed ([source][si])([binaries][bi]),
 [running][p8] and synced.
 
-MMGen requires that the bitcoin-abc daemon be listening on non-standard
+MMGen requires that the bitcoin-bchn daemon be listening on non-standard
 [RPC port 8442][p8].  If your daemon version is >= 0.16.2, you must use the
 `--usecashaddr=0` option.
 

+ 22 - 5
doc/wiki/using-mmgen/Getting-Started-with-MMGen.md

@@ -43,6 +43,11 @@ place.
 The up arrow (for repeating commands) and tab key (or Ctrl-I) (for completing
 commands and filenames) will speed up your work at the command line greatly.
 
+The examples in this tutorial are geared towards Bitcoin, but with some
+modification they may be used with altcoins and forkcoins for which MMGen
+supports transaction operations (BCH, LTC, ETH and ETC as of this writing).
+See [Altcoin-and-Forkcoin-Support][09] for more details.
+
 #### <a name='a_iv'>Invocation</a>
 
 The MMGen wallet system is not a single program but a suite of lightweight
@@ -220,7 +225,7 @@ Note that for non-legacy address types the code letter is included in the
 filename.
 
 To fund your MMGen wallet, first import the addresses into your tracking wallet
-and then spend some BTC into any of them.  If you run out of addresses, generate
+and then send some BTC to any of them.  If you run out of addresses, generate
 more.  To generate a hundred addresses you’d specify an address range of
 `1-100`.
 
@@ -261,10 +266,20 @@ Save the file, copy it onto a USB stick and transfer it to your online computer.
 
 #### <a name='a_ia'>Import addresses (online computer)</a>
 
-On your online computer, go to your bitcoind data directory and move any
-existing `wallet.dat` file out of harm’s way.  Start bitcoind and let it
-generate a new `wallet.dat`; this you’ll use as your tracking wallet.  Import
-your ten addresses into the new tracking wallet with the command:
+On your online computer, go to your coin daemon’s data directory (`~/.bitcoin`
+by default for Bitcoin Core) and move any existing `wallet.dat` file out of
+harm’s way.  With more recent coin daemons, `wallet.dat` can be found in the
+`wallets` subdirectory of the daemon data directory.
+
+Start the coin daemon with the required options (see the [Install-Bitcoind][08]
+wiki page for more details on invoking the daemon for your coin and platform).
+
+Upon startup, older daemons will automatically generate a new default
+`wallet.dat`, which MMGen will use as its tracking wallet.  With newer daemons
+(e.g. Core 0.21.0 and above), the tracking wallet will be a directory named
+`mmgen-tracking-wallet` located by default in the `wallets` subdirectory.
+
+Import your ten addresses into the new tracking wallet with the command:
 
 	$ mmgen-addrimport --batch my.addrs
 
@@ -963,5 +978,7 @@ features or requirements.  Now perform the install:
 [05]: Key-address-files
 [06]: Subwallets
 [07]: autosign-[MMGen-command-help]
+[08]: Install-Bitcoind
+[09]: Altcoin-and-Forkcoin-Support
 [hc]: https://github.com/mmgen/mmgen/commits/master
 [lc]: https://gitlab.com/mmgen/mmgen/commits/master

+ 4 - 1
doc/wiki/using-mmgen/MMGen-Quick-Start-with-Regtest-Mode.md

@@ -14,7 +14,6 @@ This tutorial provides a quick, hands-on introduction.
 1. Initialize MMGen regtest mode and start the regtest daemon:
 
 		$ mmgen-regtest setup
-		$ mmgen-regtest bob
 
 2. Generate Bob’s MMGen wallet:
 
@@ -175,4 +174,8 @@ step 7 will look something like this:
 		1163DDF1:C:2   n1oszhfAyRrHi7qJupyzaWXTcpMQGsGJEf  From Alice  10
 		TOTAL: 510 BTC
 
+22. When you’re finished, stop the regtest daemon:
+
+		$ mmgen-regtest stop
+
 [G]: Getting-Started-with-MMGen#a_ct

+ 1 - 1
doc/wiki/using-mmgen/Subwallets.md

@@ -122,7 +122,7 @@ wallet’s search like this:
 
 This is basically all you need to know about subwallets.  For live versions of
 the above examples that can be run as-is, see commits [`7538a94`][c1],
-[`d1b8aef`][c2 ]and [`82086c9`][c3].
+[`d1b8aef`][c2] and [`82086c9`][c3].
 
 For more detailed usage information, see the [`mmgen-subwalletgen` help
 screen][sh].