Raise bitcoin version.

.travis.yml

@@ -8,7 +8,7 @@ stages:
 env:
   global:
     - PART_VERSION=0.18.1.6
-    - BTC_VERSION=0.18.1
+    - BTC_VERSION=0.19.0.1
     - LTC_VERSION=0.17.1
     - TEST_DIR=~/test_basicswap2/
     - TEST_RELOAD_PATH=~/test_basicswap1/

basicswap/script.py

@@ -4,7 +4,8 @@
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE.txt or http://www.opensource.org/licenses/mit-license.php.
 
-from enum import IntEnum, auto
+from enum import IntEnum
+
 
 class OpCodes(IntEnum):
     OP_0 = 0x00,

bin/basicswap_prepare.py

@@ -42,7 +42,7 @@ else:
 known_coins = {
     'particl': '0.18.1.6',
     'litecoin': '0.17.1',
-    'bitcoin': '0.18.1',
+    'bitcoin': '0.19.0.1',
     'namecoin': '0.18.0',
 }
 
@@ -109,7 +109,7 @@ def prepareCore(coin, version, settings, data_dir):
     elif coin == 'bitcoin':
         signing_key_name = 'laanwj'
         release_url = 'https://bitcoincore.org/bin/bitcoin-core-{}/{}'.format(version, release_filename)
-        assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
+        assert_filename = '{}-core-{}-{}-build.assert'.format(coin, os_name, '.'.join(version.split('.')[:2]))
         assert_url = 'https://raw.githubusercontent.com/bitcoin-core/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
     elif coin == 'namecoin':
         signing_key_name = 'JeremyRand'

tests/basicswap/test_reload.py

@@ -10,7 +10,7 @@
 export TEST_RELOAD_PATH=/tmp/test_basicswap
 mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,bitcoin}
 cp ~/tmp/particl-0.18.1.6-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
-cp ~/tmp/bitcoin-0.18.1-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/bitcoin
+cp ~/tmp/bitcoin-0.19.0.1-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/bitcoin
 export PYTHONPATH=$(pwd)
 python tests/basicswap/test_reload.py
 

tests/basicswap/test_run.py

@@ -222,6 +222,15 @@ def waitForRPC(rpc_func, wallet=None):
     raise ValueError('waitForRPC failed')
 
 
+def checkForks(ro):
+    if 'bip9_softforks' in ro:
+        assert(ro['bip9_softforks']['csv']['status'] == 'active')
+        assert(ro['bip9_softforks']['segwit']['status'] == 'active')
+    else:
+        assert(ro['softforks']['csv']['active'])
+        assert(ro['softforks']['segwit']['active'])
+
+
 class Test(unittest.TestCase):
 
     @classmethod
@@ -278,8 +287,7 @@ class Test(unittest.TestCase):
         ltcRpc('generatetoaddress {} {}'.format(num_blocks, cls.ltc_addr))
 
         ro = ltcRpc('getblockchaininfo')
-        assert(ro['bip9_softforks']['csv']['status'] == 'active')
-        assert(ro['bip9_softforks']['segwit']['status'] == 'active')
+        checkForks(ro)
 
         waitForRPC(btcRpc)
         cls.btc_addr = btcRpc('getnewaddress mining_addr bech32')
@@ -287,8 +295,7 @@ class Test(unittest.TestCase):
         btcRpc('generatetoaddress {} {}'.format(num_blocks, cls.btc_addr))
 
         ro = btcRpc('getblockchaininfo')
-        assert(ro['bip9_softforks']['csv']['status'] == 'active')
-        assert(ro['bip9_softforks']['segwit']['status'] == 'active')
+        checkForks(ro)
 
         ro = ltcRpc('getwalletinfo')
         print('ltcRpc', ro)