diff --git a/.cirrus.yml b/.cirrus.yml index 8667a06..07a82a9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -15,7 +15,7 @@ test_task: - PART_VERSION: 0.19.1.2 - BTC_VERSION: 0.20.1 - LTC_VERSION: 0.18.1 - - XMR_VERSION: 0.17.1.5 + - XMR_VERSION: 0.17.1.8 - TEST_RELOAD_PATH: $HOME/test_basicswap1/ - TEST_DIR: $HOME/test_basicswap2/ - BIN_DIRS: $HOME/binaries diff --git a/.travis.yml b/.travis.yml index 5410f7d..2780126 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: - PART_VERSION=0.19.1.2 - BTC_VERSION=0.20.1 - LTC_VERSION=0.18.1 - - XMR_VERSION=0.17.1.5 + - XMR_VERSION=0.17.1.8 - TEST_DIR=~/test_basicswap2/ - TEST_RELOAD_PATH=~/test_basicswap1/ - BIN_DIRS=~/binaries diff --git a/bin/basicswap_prepare.py b/bin/basicswap_prepare.py index 1ac8af3..a8495df 100755 --- a/bin/basicswap_prepare.py +++ b/bin/basicswap_prepare.py @@ -42,7 +42,7 @@ known_coins = { 'litecoin': '0.18.1', 'bitcoin': '0.20.1', 'namecoin': '0.18.0', - 'monero': '0.17.1.7', + 'monero': '0.17.1.8', } logger = logging.getLogger() @@ -57,7 +57,7 @@ BASE_XMR_WALLET_PORT = int(os.getenv('BASE_XMR_WALLET_PORT', 29998)) XMR_WALLET_RPC_HOST = os.getenv('XMR_WALLET_RPC_HOST', 'localhost') XMR_WALLET_RPC_USER = os.getenv('XMR_WALLET_RPC_USER', 'xmr_wallet_user') XMR_WALLET_RPC_PWD = os.getenv('XMR_WALLET_RPC_PWD', 'xmr_wallet_pwd') -XMR_SITE_COMMIT = 'db495b958f1fc6abfdfdb0a6756d902d59d9d21e' # Lock hashes.txt to monero version +XMR_SITE_COMMIT = '9a34b4f554de8717f72b45c46469964630b3d15f' # Lock hashes.txt to monero version DEFAULT_XMR_RESTORE_HEIGHT = 2245107 @@ -241,7 +241,7 @@ def prepareCore(coin, version, settings, data_dir): rv = gpg.import_keys(urllib.request.urlopen(pubkeyurl).read()) print('import_keys', rv) assert('F0AF4D462A0BDF92' in rv.fingerprints[0]) - gpg.trust_keys('F0AF4D462A0BDF92', 'TRUST_FULLY') + gpg.trust_keys(rv.fingerprints[0], 'TRUST_FULLY') with open(assert_path, 'rb') as fp: verified = gpg.verify_file(fp) else: diff --git a/doc/upgrade.md b/doc/upgrade.md index 235841a..3acf390 100644 --- a/doc/upgrade.md +++ b/doc/upgrade.md @@ -20,14 +20,24 @@ If the dependencies and db format have changed the container must be built with $ mv --backup=numbered $COINDATA_PATH/db.sqlite $COINDATA_PATH/db_bkp.sqlite $ docker-compose up +#### Update core versions -### If installed through pip: +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 + + docker rm swap_prepare + + +## If installed through pip: cd basicswap git pull pip3 install . -## Update core versions +#### Update core versions basicswap-prepare -preparebinonly diff --git a/tests/basicswap/test_reload_xmr.py b/tests/basicswap/test_reload_xmr.py index b1f3410..4796d1d 100644 --- a/tests/basicswap/test_reload_xmr.py +++ b/tests/basicswap/test_reload_xmr.py @@ -9,7 +9,7 @@ export TEST_RELOAD_PATH=/tmp/test_basicswap mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,monero} cp ~/tmp/particl-0.19.1.2-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl -cp ~/tmp/monero-0.17.1.5-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/monero +cp ~/tmp/monero-0.17.1.8-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/monero export PYTHONPATH=$(pwd) python tests/basicswap/test_reload_xmr.py diff --git a/tests/basicswap/test_wallet_init.py b/tests/basicswap/test_wallet_init.py index ddee2e0..9e893ab 100644 --- a/tests/basicswap/test_wallet_init.py +++ b/tests/basicswap/test_wallet_init.py @@ -9,7 +9,7 @@ export TEST_PATH=/tmp/test_basicswap_wallet_init mkdir -p ${TEST_PATH}/bin/{particl,monero,bitcoin} cp ~/tmp/particl-0.19.1.2-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/particl -cp ~/tmp/monero-0.17.1.5-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/monero +cp ~/tmp/monero-0.17.1.8-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/monero cp ~/tmp/bitcoin-0.20.1-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/bitcoin export PYTHONPATH=$(pwd) python tests/basicswap/test_wallet_init.py