Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-01-05 18:29:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use special Firo release: 0.14.13.0-firod-only, new env var: SKIP_GPG_VALIDATION

Browse source
This commit is contained in:
tecnovert 2023-11-27 19:01:33 +02:00
parent fd0bf9ed73
commit 3b55d17a26
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
basicswap/db_upgrades.py
View file

@ -294,6 +294,7 @@ def upgradeDatabase(self, db_version):
PRIMARY KEY (record_id))''') PRIMARY KEY (record_id))''')
session.execute('ALTER TABLE offers ADD COLUMN bid_reversed INTEGER') session.execute('ALTER TABLE offers ADD COLUMN bid_reversed INTEGER')
elif current_version == 21: elif current_version == 21:
db_version += 1
session.execute('ALTER TABLE offers ADD COLUMN proof_utxos BLOB') session.execute('ALTER TABLE offers ADD COLUMN proof_utxos BLOB')
session.execute('ALTER TABLE bids ADD COLUMN proof_utxos BLOB') session.execute('ALTER TABLE bids ADD COLUMN proof_utxos BLOB')

37
bin/basicswap_prepare.py
View file

@ -58,17 +58,20 @@ PIVX_VERSION_TAG = os.getenv('PIVX_VERSION_TAG', '')
DASH_VERSION = os.getenv('DASH_VERSION', '19.3.0') DASH_VERSION = os.getenv('DASH_VERSION', '19.3.0')
DASH_VERSION_TAG = os.getenv('DASH_VERSION_TAG', '') DASH_VERSION_TAG = os.getenv('DASH_VERSION_TAG', '')
FIRO_VERSION = os.getenv('FIRO_VERSION', '0.14.12.1') FIRO_VERSION = os.getenv('FIRO_VERSION', '0.14.13.0')
FIRO_VERSION_TAG = os.getenv('FIRO_VERSION_TAG', '') FIRO_VERSION_TAG = os.getenv('FIRO_VERSION_TAG', '-firod-only')
NAV_VERSION = os.getenv('NAV_VERSION', '7.0.3') NAV_VERSION = os.getenv('NAV_VERSION', '7.0.3')
NAV_VERSION_TAG = os.getenv('NAV_VERSION', '') NAV_VERSION_TAG = os.getenv('NAV_VERSION_TAG', '')
GUIX_SSL_CERT_DIR = None GUIX_SSL_CERT_DIR = None
ADD_PUBKEY_URL = os.getenv('ADD_PUBKEY_URL', '') ADD_PUBKEY_URL = os.getenv('ADD_PUBKEY_URL', '')
OVERRIDE_DISABLED_COINS = toBool(os.getenv('OVERRIDE_DISABLED_COINS', 'false')) OVERRIDE_DISABLED_COINS = toBool(os.getenv('OVERRIDE_DISABLED_COINS', 'false'))
# If SKIP_GPG_VALIDATION is set to true the script will check hashes but not signatures
SKIP_GPG_VALIDATION = toBool(os.getenv('SKIP_GPG_VALIDATION', 'false'))
known_coins = { known_coins = {
'particl': (PARTICL_VERSION, PARTICL_VERSION_TAG, ('tecnovert',)), 'particl': (PARTICL_VERSION, PARTICL_VERSION_TAG, ('tecnovert',)),
@ -110,6 +113,10 @@ else:
BIN_ARCH = 'x86_64-linux-gnu' BIN_ARCH = 'x86_64-linux-gnu'
FILE_EXT = 'tar.gz' FILE_EXT = 'tar.gz'
# Allow manually overriding the arch tag
BIN_ARCH = os.getenv('BIN_ARCH', BIN_ARCH)
FILE_EXT = os.getenv('FILE_EXT', FILE_EXT)
logger = logging.getLogger() logger = logging.getLogger()
logger.level = logging.INFO logger.level = logging.INFO
if not len(logger.handlers): if not len(logger.handlers):
@ -613,16 +620,15 @@ def prepareCore(coin, version_data, settings, data_dir, extra_opts={}):
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, major_version) 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) 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': elif coin == 'firo':
arch_name = BIN_ARCH
'''
# Usual release naming
if BIN_ARCH == 'x86_64-linux-gnu': if BIN_ARCH == 'x86_64-linux-gnu':
arch_name = 'linux64' arch_name = 'linux64'
file_ext = 'tar.gz' release_filename = '{}-{}-{}{}.{}'.format('firo', version + version_tag, arch_name, filename_extra, FILE_EXT)
elif BIN_ARCH == 'win64': release_url = 'https://github.com/firoorg/firo/releases/download/v{}/{}'.format(version + version_tag, release_filename)
arch_name = 'win64' '''
file_ext = 'zip' release_filename = '{}-{}-{}{}.{}'.format('firo', '39c41e5e7ec6', arch_name, filename_extra, FILE_EXT)
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) 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) assert_url = 'https://github.com/firoorg/firo/releases/download/v%s/SHA256SUMS' % (version + version_tag)
elif coin == 'navcoin': elif coin == 'navcoin':
@ -664,6 +670,11 @@ def prepareCore(coin, version_data, settings, data_dir, extra_opts={}):
else: else:
logger.info('Found release hash in assert file.') logger.info('Found release hash in assert file.')
if SKIP_GPG_VALIDATION:
logger.warning('Skipping binary signature check as SKIP_GPG_VALIDATION env var is set.')
extractCore(coin, version_data, settings, bin_dir, release_path, extra_opts)
return
""" """
gnupghome = os.path.join(data_dir, 'gpg') gnupghome = os.path.join(data_dir, 'gpg')
if not os.path.exists(gnupghome): if not os.path.exists(gnupghome):
@ -681,9 +692,7 @@ def prepareCore(coin, version_data, settings, data_dir, extra_opts={}):
for key in rv.fingerprints: for key in rv.fingerprints:
gpg.trust_keys(rv.fingerprints[0], 'TRUST_FULLY') gpg.trust_keys(rv.fingerprints[0], 'TRUST_FULLY')
if coin in ('firo', ): if coin in ('navcoin', ):
pubkey_filename = '{}_{}.pgp'.format('particl', signing_key_name)
elif coin in ('navcoin', ):
pubkey_filename = '{}_builder.pgp'.format(coin) pubkey_filename = '{}_builder.pgp'.format(coin)
else: else:
pubkey_filename = '{}_{}.pgp'.format(coin, signing_key_name) pubkey_filename = '{}_{}.pgp'.format(coin, signing_key_name)