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

Prepare script extracts monero binaries.

Browse Source
2024-05-20_merge
tecnovert 4 years ago
parent 7f4be161d7
commit 0823e79e4d
4 changed files with 103 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      basicswap/basicswap.py
  2. 1
      basicswap/network.py
  3. 154
      bin/basicswap_prepare.py
  4. 1
      tests/basicswap/test_xmr.py

10
basicswap/basicswap.py
Unescape View File

@ -398,7 +398,7 @@ class BasicSwap(BaseApp):
self.network_pubkey = self.settings['network_pubkey'] self.network_pubkey = self.settings['network_pubkey']
self.network_addr = pubkeyToAddress(chainparams[Coins.PART][self.chain]['pubkey_address'], bytes.fromhex(self.network_pubkey)) self.network_addr = pubkeyToAddress(chainparams[Coins.PART][self.chain]['pubkey_address'], bytes.fromhex(self.network_pubkey))
#self.wallet = self.settings.get('wallet', None) # TODO: Move to coin_clients # self.wallet = self.settings.get('wallet', None) # TODO: Move to coin_clients
self.sqlite_file = os.path.join(self.data_dir, 'db{}.sqlite'.format('' if self.chain == 'mainnet' else ('_' + self.chain))) self.sqlite_file = os.path.join(self.data_dir, 'db{}.sqlite'.format('' if self.chain == 'mainnet' else ('_' + self.chain)))
db_exists = os.path.exists(self.sqlite_file) db_exists = os.path.exists(self.sqlite_file)
@ -1167,7 +1167,7 @@ class BasicSwap(BaseApp):
session.add(event) session.add(event)
def createEvent(self, delay, event_type, linked_id): def createEvent(self, delay, event_type, linked_id):
#self.log.debug('createEvent %d %s', event_type, linked_id.hex()) # self.log.debug('createEvent %d %s', event_type, linked_id.hex())
self.mxDB.acquire() self.mxDB.acquire()
try: try:
session = scoped_session(self.session_factory) session = scoped_session(self.session_factory)
@ -1683,7 +1683,6 @@ class BasicSwap(BaseApp):
session.close() session.close()
session.remove() session.remove()
#self.swaps_in_progress[bid_id] = (bid, offer)
# Add to swaps_in_progress only when waiting on txns # Add to swaps_in_progress only when waiting on txns
self.log.info('Sent XMR_BID_ACCEPT_LF %s', bid_id.hex()) self.log.info('Sent XMR_BID_ACCEPT_LF %s', bid_id.hex())
return bid_id return bid_id
@ -2319,7 +2318,6 @@ class BasicSwap(BaseApp):
return rv return rv
state = BidStates(bid.state) state = BidStates(bid.state)
#rv = True # Remove from swaps_in_progress
if state == BidStates.SWAP_COMPLETED: if state == BidStates.SWAP_COMPLETED:
rv = True # Remove from swaps_in_progress rv = True # Remove from swaps_in_progress
elif state == BidStates.XMR_SWAP_FAILED_REFUNDED: elif state == BidStates.XMR_SWAP_FAILED_REFUNDED:
@ -2370,7 +2368,6 @@ class BasicSwap(BaseApp):
txid=b_lock_tx_id, txid=b_lock_tx_id,
) )
#bid.txns[TxTypes.XMR_SWAP_B_LOCK].setState(TxStates.TX_CONFIRMED)
bid.xmr_b_lock_tx.setState(TxStates.TX_CONFIRMED) bid.xmr_b_lock_tx.setState(TxStates.TX_CONFIRMED)
bid.setState(BidStates.XMR_SWAP_NOSCRIPT_COIN_LOCKED) bid.setState(BidStates.XMR_SWAP_NOSCRIPT_COIN_LOCKED)
@ -2382,9 +2379,6 @@ class BasicSwap(BaseApp):
self.createEventInSession(delay, EventTypes.SEND_XMR_SECRET, bid_id, session) self.createEventInSession(delay, EventTypes.SEND_XMR_SECRET, bid_id, session)
session.commit() session.commit()
# Waiting for initiate txn to be confirmed in 'from' chain
#initiate_txnid_hex = bid.initiate_tx.txid.hex()
#p2sh = self.getScriptAddress(coin_from, bid.initiate_tx.script)
elif state == BidStates.XMR_SWAP_SECRET_SHARED: elif state == BidStates.XMR_SWAP_SECRET_SHARED:
# Wait for script spend tx to confirm # Wait for script spend tx to confirm
# TODO: Use explorer to get tx / block hash for getrawtransaction # TODO: Use explorer to get tx / block hash for getrawtransaction

1
basicswap/network.py
Unescape View File

@ -9,5 +9,6 @@
TODO: TODO:
''' '''
class Peer: class Peer:
pass pass

154
bin/basicswap_prepare.py
Unescape View File

@ -46,7 +46,7 @@ known_coins = {
'litecoin': '0.18.1', 'litecoin': '0.18.1',
'bitcoin': '0.20.1', 'bitcoin': '0.20.1',
'namecoin': '0.18.0', 'namecoin': '0.18.0',
'monero': '0.17.0.1', 'monero': '0.17.1.5',
} }
logger = logging.getLogger() logger = logging.getLogger()
@ -86,6 +86,22 @@ def extractCore(coin, version, settings, bin_dir, release_path):
bins = [coin + 'd', coin + '-cli', coin + '-tx'] bins = [coin + 'd', coin + '-cli', coin + '-tx']
if coin == 'monero':
with tarfile.open(release_path) as ft:
for member in ft.getmembers():
if member.isdir():
continue
out_path = os.path.join(bin_dir, os.path.basename(member.name))
fi = ft.extractfile(member)
with open(out_path, 'wb') as fout:
fout.write(fi.read())
fi.close()
os.chmod(out_path, stat.S_IRWXU | stat.S_IXGRP | stat.S_IXOTH)
print('member', member)
return
bins = [coin + 'd', coin + '-cli', coin + '-tx']
versions = version.split('.') versions = version.split('.')
if coin == 'particl' and int(versions[1]) >= 19: if coin == 'particl' and int(versions[1]) >= 19:
bins.append(coin + '-wallet') bins.append(coin + '-wallet')
@ -125,58 +141,62 @@ def prepareCore(coin, version, settings, data_dir):
os_dir_name = 'linux' os_dir_name = 'linux'
os_name = 'linux' os_name = 'linux'
release_filename = '{}-{}-{}'.format(coin, version, BIN_ARCH)
if coin == 'monero': if coin == 'monero':
url = 'https://downloads.getmonero.org/cli/monero-linux-x64-v${}.tar.bz2'.format(version) release_url = 'https://downloads.getmonero.org/cli/monero-linux-x64-v{}.tar.bz2'.format(version)
# TODO
release_path = os.path.join(bin_dir, release_filename) release_path = os.path.join(bin_dir, release_filename)
if not os.path.exists(release_path): if not os.path.exists(release_path):
downloadFile(release_url, release_path) downloadFile(release_url, release_path)
raise ValueError('TODO') # TODO: How to get version specific hashes
assert_filename = 'monero-{}-hashes.txt'.format(version)
release_filename = '{}-{}-{}'.format(coin, version, BIN_ARCH) assert_url = 'https://www.getmonero.org/downloads/hashes.txt'
if coin == 'particl': assert_path = os.path.join(bin_dir, assert_filename)
signing_key_name = 'tecnovert' if not os.path.exists(assert_path):
release_url = 'https://github.com/tecnovert/particl-core/releases/download/v{}/{}'.format(version, release_filename) downloadFile(assert_url, assert_path)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version)
assert_url = 'https://raw.githubusercontent.com/tecnovert/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
elif coin == 'litecoin':
signing_key_name = 'thrasher'
release_url = 'https://download.litecoin.org/litecoin-{}/{}/{}'.format(version, os_name, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/litecoin-project/gitian.sigs.ltc/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
elif coin == 'bitcoin':
signing_key_name = 'laanwj'
release_url = 'https://bitcoincore.org/bin/bitcoin-core-{}/{}'.format(version, release_filename)
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'
release_url = 'https://beta.namecoin.org/files/namecoin-core/namecoin-core-{}/{}'.format(version, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/namecoin/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
else: else:
raise ValueError('Unknown coin') release_filename = '{}-{}-{}'.format(coin, version, BIN_ARCH)
if coin == 'particl':
signing_key_name = 'tecnovert'
release_url = 'https://github.com/tecnovert/particl-core/releases/download/v{}/{}'.format(version, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version)
assert_url = 'https://raw.githubusercontent.com/tecnovert/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
elif coin == 'litecoin':
signing_key_name = 'thrasher'
release_url = 'https://download.litecoin.org/litecoin-{}/{}/{}'.format(version, os_name, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/litecoin-project/gitian.sigs.ltc/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
elif coin == 'bitcoin':
signing_key_name = 'laanwj'
release_url = 'https://bitcoincore.org/bin/bitcoin-core-{}/{}'.format(version, release_filename)
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'
release_url = 'https://beta.namecoin.org/files/namecoin-core/namecoin-core-{}/{}'.format(version, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/namecoin/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
else:
raise ValueError('Unknown coin')
assert_sig_filename = assert_filename + '.sig' assert_sig_filename = assert_filename + '.sig'
assert_sig_url = assert_url + '.sig' assert_sig_url = assert_url + '.sig'
release_path = os.path.join(bin_dir, release_filename) release_path = os.path.join(bin_dir, release_filename)
if not os.path.exists(release_path): if not os.path.exists(release_path):
downloadFile(release_url, release_path) downloadFile(release_url, release_path)
# Rename assert files with full version # Rename assert files with full version
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version) assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version)
assert_path = os.path.join(bin_dir, assert_filename) assert_path = os.path.join(bin_dir, assert_filename)
if not os.path.exists(assert_path): if not os.path.exists(assert_path):
downloadFile(assert_url, assert_path) downloadFile(assert_url, assert_path)
assert_sig_filename = '{}-{}-{}-build.assert.sig'.format(coin, os_name, version) assert_sig_filename = '{}-{}-{}-build.assert.sig'.format(coin, os_name, version)
assert_sig_path = os.path.join(bin_dir, assert_sig_filename) assert_sig_path = os.path.join(bin_dir, assert_sig_filename)
if not os.path.exists(assert_sig_path): if not os.path.exists(assert_sig_path):
downloadFile(assert_sig_url, assert_sig_path) downloadFile(assert_sig_url, assert_sig_path)
hasher = hashlib.sha256() hasher = hashlib.sha256()
with open(release_path, 'rb') as fp: with open(release_path, 'rb') as fp:
@ -197,22 +217,37 @@ def prepareCore(coin, version, settings, data_dir):
""" """
gpg = gnupg.GPG() gpg = gnupg.GPG()
with open(assert_sig_path, 'rb') as fp: if coin == 'monero':
verified = gpg.verify_file(fp, assert_path) with open(assert_path, 'rb') as fp:
verified = gpg.verify_file(fp)
if verified.username is None:
logger.warning('Signature not verified.')
pubkeyurl = 'https://raw.githubusercontent.com/monero-project/monero/master/utils/gpg_keys/binaryfate.asc'
logger.info('Importing public key from url: ' + pubkeyurl)
rv = gpg.import_keys(urllib.request.urlopen(pubkeyurl).read())
assert('F0AF4D462A0BDF92' in rv)
print('import_keys', rv)
with open(assert_path, 'rb') as fp:
verified = gpg.verify_file(fp)
else:
with open(assert_sig_path, 'rb') as fp:
verified = gpg.verify_file(fp, assert_path)
if verified.username is None: if verified.username is None:
logger.warning('Signature not verified.') logger.warning('Signature not verified.')
pubkeyurl = 'https://raw.githubusercontent.com/tecnovert/basicswap/master/gitianpubkeys/{}_{}.pgp'.format(coin, signing_key_name) pubkeyurl = 'https://raw.githubusercontent.com/tecnovert/basicswap/master/gitianpubkeys/{}_{}.pgp'.format(coin, signing_key_name)
logger.info('Importing public key from url: ' + pubkeyurl) logger.info('Importing public key from url: ' + pubkeyurl)
gpg.import_keys(urllib.request.urlopen(pubkeyurl).read()) gpg.import_keys(urllib.request.urlopen(pubkeyurl).read())
with open(assert_sig_path, 'rb') as fp: with open(assert_sig_path, 'rb') as fp:
verified = gpg.verify_file(fp, assert_path) verified = gpg.verify_file(fp, assert_path)
if verified.valid is False \ if verified.valid is False \
and not (verified.status == 'signature valid' and verified.key_status == 'signing key has expired'): and not (verified.status == 'signature valid' and verified.key_status == 'signing key has expired'):
raise ValueError('Signature verification failed.') raise ValueError('Signature verification failed.')
extractCore(coin, version, settings, bin_dir, release_path) extractCore(coin, version, settings, bin_dir, release_path)
@ -449,6 +484,17 @@ def main():
'conf_target': 2, 'conf_target': 2,
'core_version_group': 18, 'core_version_group': 18,
'chain_lookups': 'local', 'chain_lookups': 'local',
},
'monero': {
'connection_type': 'rpc' if 'monero' in with_coins else 'none',
'manage_daemon': True if 'monero' in with_coins else False,
'rpcport': 29798 + port_offset,
'walletrpcport': 29799 + port_offset,
#'walletrpcuser': 'test' + str(node_id),
#'walletrpcpassword': 'test_pass' + str(node_id),
'walletfile': 'basicswap',
'datadir': os.path.join(data_dir, 'monero'),
'bindir': os.path.join(bin_dir, 'monero'),
} }
} }

1
tests/basicswap/test_xmr.py
Unescape View File

@ -701,6 +701,5 @@ class Test(unittest.TestCase):
self.wait_for_bid(swap_clients[1], bid2_id, BidStates.SWAP_COMPLETED, sent=True) self.wait_for_bid(swap_clients[1], bid2_id, BidStates.SWAP_COMPLETED, sent=True)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

Write Preview
Loading…
Cancel
Save