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

Raise bitcoin version.

Browse Source
This commit is contained in:
tecnovert 2019-11-28 23:51:47 +02:00
parent 9953a934a5
commit 388ada154e
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

3
basicswap/script.py
View File

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

4
bin/basicswap_prepare.py
View File

@ -42,7 +42,7 @@ else:
known_coins = { known_coins = {
'particl': '0.18.1.6', 'particl': '0.18.1.6',
'litecoin': '0.17.1', 'litecoin': '0.17.1',
'bitcoin': '0.18.1', 'bitcoin': '0.19.0.1',
'namecoin': '0.18.0', 'namecoin': '0.18.0',
} }
@ -109,7 +109,7 @@ def prepareCore(coin, version, settings, data_dir):
elif coin == 'bitcoin': elif coin == 'bitcoin':
signing_key_name = 'laanwj' signing_key_name = 'laanwj'
release_url = 'https://bitcoincore.org/bin/bitcoin-core-{}/{}'.format(version, release_filename) 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) 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': elif coin == 'namecoin':
signing_key_name = 'JeremyRand' signing_key_name = 'JeremyRand'

2
tests/basicswap/test_reload.py
View File

@ -10,7 +10,7 @@
export TEST_RELOAD_PATH=/tmp/test_basicswap export TEST_RELOAD_PATH=/tmp/test_basicswap
mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,bitcoin} 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/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) export PYTHONPATH=$(pwd)
python tests/basicswap/test_reload.py python tests/basicswap/test_reload.py

15
tests/basicswap/test_run.py
View File

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