Raise Particl and Monero versions.
This commit is contained in:
		
							parent
							
								
									146c9b784c
								
							
						
					
					
						commit
						d392193d7e
					
				@ -42,11 +42,11 @@ else:
 | 
			
		||||
    FILE_EXT = 'tar.gz'
 | 
			
		||||
 | 
			
		||||
known_coins = {
 | 
			
		||||
    'particl': ('0.21.1.2', ''),
 | 
			
		||||
    'particl': ('0.21.2.3', ''),
 | 
			
		||||
    'litecoin': ('0.18.1', ''),
 | 
			
		||||
    'bitcoin': ('0.21.1', ''),
 | 
			
		||||
    'namecoin': ('0.18.0', ''),
 | 
			
		||||
    'monero': ('0.17.2.0', ''),
 | 
			
		||||
    'monero': ('0.17.2.3', ''),
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
logger = logging.getLogger()
 | 
			
		||||
@ -61,7 +61,7 @@ BASE_XMR_WALLET_PORT = int(os.getenv('BASE_XMR_WALLET_PORT', 29998))
 | 
			
		||||
XMR_WALLET_RPC_HOST = os.getenv('XMR_WALLET_RPC_HOST', '127.0.0.1')
 | 
			
		||||
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 = 'b86dac8b74e3e8663f8f468c19c2fea6ec523b62'  # Lock hashes.txt to monero version
 | 
			
		||||
XMR_SITE_COMMIT = 'ba7fcd947349416bedc0eb2e864416c3779af820'  # Lock hashes.txt to monero version
 | 
			
		||||
 | 
			
		||||
DEFAULT_XMR_RESTORE_HEIGHT = 2245107
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -8,9 +8,9 @@
 | 
			
		||||
"""
 | 
			
		||||
export TEST_PATH=/tmp/test_basicswap_wallet_init
 | 
			
		||||
mkdir -p ${TEST_PATH}/bin/{particl,monero,bitcoin}
 | 
			
		||||
cp ~/tmp/particl-0.21.0.1-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.1.9.tar.bz2 ${TEST_PATH}/bin/monero/monero-0.17.1.9-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
cp ~/tmp/bitcoin-0.21.0-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/bitcoin
 | 
			
		||||
cp ~/tmp/particl-0.21.2.3-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.2.3.tar.bz2 ${TEST_PATH}/bin/monero/monero-0.17.2.3-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
cp ~/tmp/bitcoin-0.21.1-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/bitcoin
 | 
			
		||||
export PYTHONPATH=$(pwd)
 | 
			
		||||
python tests/basicswap/extended/test_wallet_init.py
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -9,9 +9,9 @@
 | 
			
		||||
export RESET_TEST=true
 | 
			
		||||
export TEST_PATH=/tmp/test_persistent
 | 
			
		||||
mkdir -p ${TEST_PATH}/bin/{particl,monero,bitcoin}
 | 
			
		||||
cp ~/tmp/particl-0.21.0.1-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/bitcoin-0.21.0-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/bitcoin
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.1.9.tar.bz2 ${TEST_PATH}/bin/monero/monero-0.17.1.9-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
cp ~/tmp/particl-0.21.2.3-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/bitcoin-0.21.1-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/bitcoin
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.2.3.tar.bz2 ${TEST_PATH}/bin/monero/monero-0.17.2.3-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
export PYTHONPATH=$(pwd)
 | 
			
		||||
python tests/basicswap/extended/test_xmr_persistent.py
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -8,8 +8,8 @@
 | 
			
		||||
"""
 | 
			
		||||
export TEST_RELOAD_PATH=/tmp/test_basicswap
 | 
			
		||||
mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,bitcoin}
 | 
			
		||||
cp ~/tmp/particl-0.21.0.1-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/bitcoin-0.21.0-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/bitcoin
 | 
			
		||||
cp ~/tmp/particl-0.21.2.3-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/bitcoin-0.21.1-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/bitcoin
 | 
			
		||||
export PYTHONPATH=$(pwd)
 | 
			
		||||
python tests/basicswap/test_reload.py
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -8,8 +8,8 @@
 | 
			
		||||
"""
 | 
			
		||||
export TEST_RELOAD_PATH=/tmp/test_basicswap
 | 
			
		||||
mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,monero}
 | 
			
		||||
cp ~/tmp/particl-0.21.0.1-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.1.9.tar.bz2 ${TEST_RELOAD_PATH}/bin/monero/monero-0.17.1.9-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
cp ~/tmp/particl-0.21.2.3-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.2.3.tar.bz2 ${TEST_RELOAD_PATH}/bin/monero/monero-0.17.2.3-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
export PYTHONPATH=$(pwd)
 | 
			
		||||
python tests/basicswap/test_xmr_bids_offline.py
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -8,8 +8,8 @@
 | 
			
		||||
"""
 | 
			
		||||
export TEST_RELOAD_PATH=/tmp/test_basicswap
 | 
			
		||||
mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,monero}
 | 
			
		||||
cp ~/tmp/particl-0.21.0.1-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.1.9.tar.bz2 ${TEST_RELOAD_PATH}/bin/monero/monero-0.17.1.9-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
cp ~/tmp/particl-0.21.2.3-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
 | 
			
		||||
cp ~/tmp/monero-linux-x64-v0.17.2.3.tar.bz2 ${TEST_RELOAD_PATH}/bin/monero/monero-0.17.2.3-x86_64-linux-gnu.tar.bz2
 | 
			
		||||
export PYTHONPATH=$(pwd)
 | 
			
		||||
python tests/basicswap/test_xmr_reload.py
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user