seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare only Particl core by default.

Browse Source
This commit is contained in:
tecnovert 2021-01-05 20:10:33 +02:00
parent e41a6e34c0
commit 088e1f4411
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/basicswap_prepare.py
View File

@ -400,7 +400,7 @@ def main():
particl_wallet_mnemonic = None particl_wallet_mnemonic = None
prepare_bin_only = False prepare_bin_only = False
no_cores = False no_cores = False
with_coins = {'particl', 'litecoin'} with_coins = {'particl'}
add_coin = '' add_coin = ''
disable_coin = '' disable_coin = ''
htmlhost = 'localhost' htmlhost = 'localhost'

8
doc/install.md
View File

@ -21,11 +21,11 @@ Create the images:
Prepare the datadir: 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 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. 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 $ 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 \ $ 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. Record the mnemonic from the output of the above command.
@ -104,10 +104,10 @@ Dependencies:
Prepare the datadir: 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: 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. Record the mnemonic from the output of the above command.

2
doc/upgrade.md
View File

@ -26,7 +26,7 @@ After updating the code and rebuilding the container:
basicswap/docker]$ docker run \ basicswap/docker]$ docker run \
-t --name swap_prepare -v $COINDATA_PATH:/coindata i_swapclient \ -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 docker rm swap_prepare

2
docker/production/bitcoin/Dockerfile
View File

@ -2,7 +2,7 @@
FROM i_swapclient as install_stage 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 FROM debian:buster-slim
COPY --from=install_stage /coin_bin . COPY --from=install_stage /coin_bin .

2
docker/production/monero_daemon/Dockerfile
View File

@ -1,6 +1,6 @@
FROM i_swapclient as install_stage 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 FROM debian:buster-slim

2
docker/production/particl/Dockerfile
View File

@ -1,6 +1,6 @@
FROM i_swapclient as install_stage 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 FROM debian:buster-slim
COPY --from=install_stage /coin_bin . COPY --from=install_stage /coin_bin .

4
tests/basicswap/test_prepare.py
View File

@ -35,7 +35,7 @@ class Test(unittest.TestCase):
super(Test, self).tearDownClass() super(Test, self).tearDownClass()
def test(self): def test(self):
testargs = ['basicswap-prepare', '-datadir=' + test_path] testargs = ['basicswap-prepare', '-datadir=' + test_path, '-withcoin=litecoin']
with patch.object(sys, 'argv', testargs): with patch.object(sys, 'argv', testargs):
prepareSystem.main() prepareSystem.main()
@ -43,7 +43,7 @@ class Test(unittest.TestCase):
self.assertTrue(os.path.exists(config_path)) self.assertTrue(os.path.exists(config_path))
logger.info('Test no overwrite') 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('sys.stderr', new=StringIO()) as fake_stderr:
with patch.object(sys, 'argv', testargs): with patch.object(sys, 'argv', testargs):
with self.assertRaises(SystemExit) as cm: with self.assertRaises(SystemExit) as cm:

2
tests/basicswap/test_reload_xmr.py
View File

@ -115,7 +115,7 @@ class Test(unittest.TestCase):
'-bindir="{}"'.format(os.path.join(test_path, 'bin')), '-bindir="{}"'.format(os.path.join(test_path, 'bin')),
'-portoffset={}'.format(i), '-portoffset={}'.format(i),
'-particl_mnemonic="{}"'.format(mnemonics[i]), '-particl_mnemonic="{}"'.format(mnemonics[i]),
'-regtest', '-withoutcoin=litecoin', '-withcoin=monero'] '-regtest', '-withcoin=monero']
with patch.object(sys, 'argv', testargs): with patch.object(sys, 'argv', testargs):
prepareSystem.main() prepareSystem.main()

2
tests/basicswap/test_wallet_init.py
View File

@ -106,7 +106,7 @@ class Test(unittest.TestCase):
'-bindir="{}"'.format(os.path.join(test_path, 'bin')), '-bindir="{}"'.format(os.path.join(test_path, 'bin')),
'-portoffset={}'.format(i), '-portoffset={}'.format(i),
'-particl_mnemonic="{}"'.format(mnemonics[0]), '-particl_mnemonic="{}"'.format(mnemonics[0]),
'-regtest', '-withoutcoin=litecoin', '-withcoin=monero,bitcoin'] '-regtest', '-withcoin=monero,bitcoin']
with patch.object(sys, 'argv', testargs): with patch.object(sys, 'argv', testargs):
prepareSystem.main() prepareSystem.main()