AaronFiore/electrum
1
0
Fork 0
Code Activity

submarine_swaps: move http calls to method

Browse Source
This commit is contained in:
ThomasV
2024-05-06 14:18:38 +02:00
committed by SomberNight
parent 6793efd0af
commit 14311318db
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
electrum/submarine_swaps.py
View File

@@ -580,6 +580,14 @@ class SwapManager(Logger):
assert swap.spending_txid is None assert swap.spending_txid is None
self.invoices_to_pay[key] = 0 self.invoices_to_pay[key] = 0
async def send_request_to_server(self, method, request_data):
response = await self.network.async_send_http_on_proxy(
'post' if request_data else 'get',
self.api_url + '/' + method,
json=request_data,
timeout=30)
return json.loads(response)
async def normal_swap( async def normal_swap(
self, self,
*, *,
@@ -633,12 +641,7 @@ class SwapManager(Logger):
"invoiceAmount": lightning_amount_sat, "invoiceAmount": lightning_amount_sat,
"refundPublicKey": refund_pubkey.hex() "refundPublicKey": refund_pubkey.hex()
} }
response = await self.network.async_send_http_on_proxy( data = await self.send_request_to_server('createnormalswap', request_data)
'post',
self.api_url + '/createnormalswap',
json=request_data,
timeout=30)
data = json.loads(response)
payment_hash = bytes.fromhex(data["preimageHash"]) payment_hash = bytes.fromhex(data["preimageHash"])
zeroconf = data["acceptZeroConf"] zeroconf = data["acceptZeroConf"]
@@ -702,12 +705,7 @@ class SwapManager(Logger):
"invoice": invoice, "invoice": invoice,
"refundPublicKey": refund_pubkey.hex(), "refundPublicKey": refund_pubkey.hex(),
} }
response = await self.network.async_send_http_on_proxy( data = await self.send_request_to_server('addswapinvoice', request_data)
'post',
self.api_url + '/addswapinvoice',
json=request_data,
timeout=30)
data = json.loads(response)
# wait for funding tx # wait for funding tx
lnaddr = lndecode(invoice) lnaddr = lndecode(invoice)
while swap.funding_txid is None and not lnaddr.is_expired(): while swap.funding_txid is None and not lnaddr.is_expired():
@@ -796,12 +794,7 @@ class SwapManager(Logger):
"preimageHash": payment_hash.hex(), "preimageHash": payment_hash.hex(),
"claimPublicKey": our_pubkey.hex() "claimPublicKey": our_pubkey.hex()
} }
response = await self.network.async_send_http_on_proxy( data = await self.send_request_to_server('createswap', request_data)
'post',
self.api_url + '/createswap',
json=request_data,
timeout=30)
data = json.loads(response)
invoice = data['invoice'] invoice = data['invoice']
fee_invoice = data.get('minerFeeInvoice') fee_invoice = data.get('minerFeeInvoice')
lockup_address = data['lockupAddress'] lockup_address = data['lockupAddress']
@@ -882,15 +875,10 @@ class SwapManager(Logger):
"""Might raise SwapServerError.""" """Might raise SwapServerError."""
from .network import Network from .network import Network
try: try:
response = await Network.async_send_http_on_proxy( pairs = await self.send_request_to_server('getpairs', None)
'get',
self.api_url + '/getpairs',
timeout=30)
except aiohttp.ClientError as e: except aiohttp.ClientError as e:
self.logger.error(f"Swap server errored: {e!r}") self.logger.error(f"Swap server errored: {e!r}")
raise SwapServerError() from e raise SwapServerError() from e
# we assume server response is well-formed; otherwise let an exception propagate to the crash reporter
pairs = json.loads(response)
# cache data to disk # cache data to disk
with open(self.pairs_filename(), 'w', encoding='utf-8') as f: with open(self.pairs_filename(), 'w', encoding='utf-8') as f:
f.write(json.dumps(pairs)) f.write(json.dumps(pairs))