diff --git a/bin/basicswap_prepare.py b/bin/basicswap_prepare.py index ad1f703..7e4effb 100755 --- a/bin/basicswap_prepare.py +++ b/bin/basicswap_prepare.py @@ -400,7 +400,7 @@ def main(): particl_wallet_mnemonic = None prepare_bin_only = False no_cores = False - with_coins = {'particl', 'litecoin'} + with_coins = {'particl'} add_coin = '' disable_coin = '' htmlhost = 'localhost' diff --git a/doc/install.md b/doc/install.md index 15f9936..388a1b9 100644 --- a/doc/install.md +++ b/doc/install.md @@ -21,11 +21,11 @@ Create the images: Prepare the datadir: Set XMR_RPC_HOST and BASE_XMR_RPC_PORT to a public XMR node or exclude to run a local node. Set xmrrestoreheight to the current xmr chain height. -Adjust `--withcoins` and `--withoutcoins` as desired, eg: `--withcoins=monero,bitcoin`. By default Particl and Litecoin are loaded. +Adjust `--withcoins` and `--withoutcoins` as desired, eg: `--withcoins=monero,bitcoin`. By default only Particl is loaded. $ export COINDATA_PATH=/var/data/coinswaps $ docker run -e XMR_RPC_HOST="node.xmr.to" -e BASE_XMR_RPC_PORT=18081 -t --name swap_prepare -v $COINDATA_PATH:/coindata i_swapclient \ - basicswap-prepare --datadir=/coindata --withcoins=monero --withoutcoins=litecoin --htmlhost="0.0.0.0" --xmrrestoreheight=2245107 + basicswap-prepare --datadir=/coindata --withcoins=monero --htmlhost="0.0.0.0" --xmrrestoreheight=2245107 Record the mnemonic from the output of the above command. @@ -104,10 +104,10 @@ Dependencies: Prepare the datadir: - XMR_RPC_HOST="node.xmr.to" BASE_XMR_RPC_PORT=18081 basicswap-prepare --datadir=$SWAP_DATADIR --withcoins=monero --withoutcoins=litecoin --xmrrestoreheight=2245107 + XMR_RPC_HOST="node.xmr.to" BASE_XMR_RPC_PORT=18081 basicswap-prepare --datadir=$SWAP_DATADIR --withcoins=monero --xmrrestoreheight=2245107 OR using a local XMR daemon: - basicswap-prepare --datadir=$SWAP_DATADIR --withcoins=monero --withoutcoins=litecoin --xmrrestoreheight=2245107 + basicswap-prepare --datadir=$SWAP_DATADIR --withcoins=monero --xmrrestoreheight=2245107 Record the mnemonic from the output of the above command. diff --git a/doc/upgrade.md b/doc/upgrade.md index 819d167..c4b4ac4 100644 --- a/doc/upgrade.md +++ b/doc/upgrade.md @@ -26,7 +26,7 @@ After updating the code and rebuilding the container: basicswap/docker]$ docker run \ -t --name swap_prepare -v $COINDATA_PATH:/coindata i_swapclient \ - basicswap-prepare --datadir=/coindata --preparebinonly --withcoins=monero --withoutcoins=litecoin + basicswap-prepare --datadir=/coindata --preparebinonly --withcoins=monero docker rm swap_prepare diff --git a/docker/production/bitcoin/Dockerfile b/docker/production/bitcoin/Dockerfile index fdafdc7..6ab7e47 100644 --- a/docker/production/bitcoin/Dockerfile +++ b/docker/production/bitcoin/Dockerfile @@ -2,7 +2,7 @@ FROM i_swapclient as install_stage -RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=bitcoin --withoutcoins=particl,litecoin +RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=bitcoin --withoutcoins=particl FROM debian:buster-slim COPY --from=install_stage /coin_bin . diff --git a/docker/production/monero_daemon/Dockerfile b/docker/production/monero_daemon/Dockerfile index 4673459..f6847fa 100644 --- a/docker/production/monero_daemon/Dockerfile +++ b/docker/production/monero_daemon/Dockerfile @@ -1,6 +1,6 @@ FROM i_swapclient as install_stage -RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=monero --withoutcoins=particl,litecoin +RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=monero --withoutcoins=particl FROM debian:buster-slim diff --git a/docker/production/particl/Dockerfile b/docker/production/particl/Dockerfile index 6387b9c..7425a7f 100644 --- a/docker/production/particl/Dockerfile +++ b/docker/production/particl/Dockerfile @@ -1,6 +1,6 @@ FROM i_swapclient as install_stage -RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=particl --withoutcoin=litecoin +RUN basicswap-prepare --preparebinonly --bindir=/coin_bin --withcoin=particl FROM debian:buster-slim COPY --from=install_stage /coin_bin . diff --git a/tests/basicswap/test_prepare.py b/tests/basicswap/test_prepare.py index 8cf7d64..0c959c5 100644 --- a/tests/basicswap/test_prepare.py +++ b/tests/basicswap/test_prepare.py @@ -35,7 +35,7 @@ class Test(unittest.TestCase): super(Test, self).tearDownClass() def test(self): - testargs = ['basicswap-prepare', '-datadir=' + test_path] + testargs = ['basicswap-prepare', '-datadir=' + test_path, '-withcoin=litecoin'] with patch.object(sys, 'argv', testargs): prepareSystem.main() @@ -43,7 +43,7 @@ class Test(unittest.TestCase): self.assertTrue(os.path.exists(config_path)) logger.info('Test no overwrite') - testargs = ['basicswap-prepare', '-datadir=' + test_path] + testargs = ['basicswap-prepare', '-datadir=' + test_path, '-withcoin=litecoin'] with patch('sys.stderr', new=StringIO()) as fake_stderr: with patch.object(sys, 'argv', testargs): with self.assertRaises(SystemExit) as cm: diff --git a/tests/basicswap/test_reload_xmr.py b/tests/basicswap/test_reload_xmr.py index 4796d1d..2ca4674 100644 --- a/tests/basicswap/test_reload_xmr.py +++ b/tests/basicswap/test_reload_xmr.py @@ -115,7 +115,7 @@ class Test(unittest.TestCase): '-bindir="{}"'.format(os.path.join(test_path, 'bin')), '-portoffset={}'.format(i), '-particl_mnemonic="{}"'.format(mnemonics[i]), - '-regtest', '-withoutcoin=litecoin', '-withcoin=monero'] + '-regtest', '-withcoin=monero'] with patch.object(sys, 'argv', testargs): prepareSystem.main() diff --git a/tests/basicswap/test_wallet_init.py b/tests/basicswap/test_wallet_init.py index 9e893ab..a5abd6b 100644 --- a/tests/basicswap/test_wallet_init.py +++ b/tests/basicswap/test_wallet_init.py @@ -106,7 +106,7 @@ class Test(unittest.TestCase): '-bindir="{}"'.format(os.path.join(test_path, 'bin')), '-portoffset={}'.format(i), '-particl_mnemonic="{}"'.format(mnemonics[0]), - '-regtest', '-withoutcoin=litecoin', '-withcoin=monero,bitcoin'] + '-regtest', '-withcoin=monero,bitcoin'] with patch.object(sys, 'argv', testargs): prepareSystem.main()