From e6c7c4d9bb07bd9b3efbb21c6635d1ad701cb23a Mon Sep 17 00:00:00 2001 From: tecnovert Date: Sat, 25 Nov 2023 00:55:41 +0200 Subject: [PATCH] Revert to Firo binary. The .dmg file only contains Firo-qt --- bin/basicswap_prepare.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/bin/basicswap_prepare.py b/bin/basicswap_prepare.py index 3d9ae58..64234ed 100755 --- a/bin/basicswap_prepare.py +++ b/bin/basicswap_prepare.py @@ -58,7 +58,7 @@ PIVX_VERSION_TAG = os.getenv('PIVX_VERSION_TAG', '') DASH_VERSION = os.getenv('DASH_VERSION', '19.3.0') DASH_VERSION_TAG = os.getenv('DASH_VERSION_TAG', '') -FIRO_VERSION = os.getenv('FIRO_VERSION', '0.14.99.1') +FIRO_VERSION = os.getenv('FIRO_VERSION', '0.14.12.1') FIRO_VERSION_TAG = os.getenv('FIRO_VERSION_TAG', '') NAV_VERSION = os.getenv('NAV_VERSION', '7.0.3') @@ -78,8 +78,7 @@ known_coins = { 'monero': (MONERO_VERSION, MONERO_VERSION_TAG, ('binaryfate',)), 'pivx': (PIVX_VERSION, PIVX_VERSION_TAG, ('fuzzbawls',)), 'dash': (DASH_VERSION, DASH_VERSION_TAG, ('pasta',)), - # 'firo': (FIRO_VERSION, FIRO_VERSION_TAG, ('reuben',)), - 'firo': (FIRO_VERSION, FIRO_VERSION_TAG, ('tecnovert',)), + 'firo': (FIRO_VERSION, FIRO_VERSION_TAG, ('reuben',)), 'navcoin': (NAV_VERSION, NAV_VERSION_TAG, ('nav_builder',)), } @@ -614,28 +613,18 @@ def prepareCore(coin, version_data, settings, data_dir, extra_opts={}): assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, major_version) assert_url = 'https://raw.githubusercontent.com/dashpay/gitian.sigs/master/%s-%s/%s/%s' % (version + version_tag, os_dir_name, signing_key_name, assert_filename) elif coin == 'firo': - ''' + if BIN_ARCH == 'x86_64-linux-gnu': arch_name = 'linux64' file_ext = 'tar.gz' - elif BIN_ARCH == 'osx64': - arch_name = 'macos' - file_ext = 'dmg' - raise ValueError('TODO: Firo - Extract .dmg') + elif BIN_ARCH == 'win64': + arch_name = 'win64' + file_ext = 'zip' else: raise ValueError('Firo: Unknown architecture') release_filename = '{}-{}-{}{}.{}'.format('firo', version + version_tag, arch_name, filename_extra, file_ext) - # release_url = 'https://github.com/firoorg/firo/releases/download/v{}/{}'.format(version + version_tag, release_filename) - # assert_url = 'https://github.com/firoorg/firo/releases/download/v%s/SHA256SUMS' % (version + version_tag) - ''' - if BIN_ARCH == 'x86_64-linux-gnu': - release_filename = 'firo-0.14.99.1-x86_64-linux-gnu.tar.gz' - elif BIN_ARCH == 'osx64': - release_filename = 'firo-0.14.99.1-x86_64-apple-darwin18.tar.gz' - else: - raise ValueError('Firo: Unknown architecture') - release_url = 'https://github.com/tecnovert/particl-core/releases/download/{}/{}'.format(version + version_tag, release_filename) - assert_url = 'https://github.com/tecnovert/particl-core/releases/download/v%s/SHA256SUMS.asc' % (version + version_tag) + release_url = 'https://github.com/firoorg/firo/releases/download/v{}/{}'.format(version + version_tag, release_filename) + assert_url = 'https://github.com/firoorg/firo/releases/download/v%s/SHA256SUMS' % (version + version_tag) elif coin == 'navcoin': release_filename = '{}-{}-{}.{}'.format(coin, version, BIN_ARCH, FILE_EXT) release_url = 'https://github.com/navcoin/navcoin-core/releases/download/{}/{}'.format(version + version_tag, release_filename)