AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker: separate add_peer from _open_channel_coroutine

Browse Source
This commit is contained in:
ThomasV
2023-09-17 13:21:41 +02:00
parent 4d68025cca
commit d7beb109b8
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/commands.py
View File

@@ -1140,19 +1140,8 @@ class Commands:
async def open_channel(self, connection_string, amount, push_amount=0, password=None, wallet: Abstract_Wallet = None): async def open_channel(self, connection_string, amount, push_amount=0, password=None, wallet: Abstract_Wallet = None):
funding_sat = satoshis(amount) funding_sat = satoshis(amount)
push_sat = satoshis(push_amount) push_sat = satoshis(push_amount)
coins = wallet.get_spendable_coins(None) peer = await wallet.lnworker.add_peer(connection_string)
node_id, rest = extract_nodeid(connection_string) chan = await wallet.lnworker.open_channel_with_peer(peer, funding_sat, push_sat, password)
funding_tx = wallet.lnworker.mktx_for_open_channel(
coins=coins,
funding_sat=funding_sat,
node_id=node_id,
fee_est=None)
chan, funding_tx = await wallet.lnworker._open_channel_coroutine(
connect_str=connection_string,
funding_tx=funding_tx,
funding_sat=funding_sat,
push_sat=push_sat,
password=password)
return chan.funding_outpoint.to_str() return chan.funding_outpoint.to_str()
@command('') @command('')

28
electrum/lnworker.py
View File

@@ -1215,16 +1215,32 @@ class LNWallet(LNWorker):
self.logger.info('REBROADCASTING CLOSING TX') self.logger.info('REBROADCASTING CLOSING TX')
await self.network.try_broadcasting(force_close_tx, 'force-close') await self.network.try_broadcasting(force_close_tx, 'force-close')
@log_exceptions
async def open_channel_with_peer(self, peer, funding_sat, push_sat, password):
coins = self.wallet.get_spendable_coins(None)
node_id = peer.pubkey
funding_tx = self.mktx_for_open_channel(
coins=coins,
funding_sat=funding_sat,
node_id=node_id,
fee_est=None)
chan, funding_tx = await self._open_channel_coroutine(
peer=peer,
funding_tx=funding_tx,
funding_sat=funding_sat,
push_sat=push_sat,
password=password)
return chan
@log_exceptions @log_exceptions
async def _open_channel_coroutine( async def _open_channel_coroutine(
self, *, self, *,
connect_str: str, peer: Peer,
funding_tx: PartialTransaction, funding_tx: PartialTransaction,
funding_sat: int, funding_sat: int,
push_sat: int, push_sat: int,
password: Optional[str]) -> Tuple[Channel, PartialTransaction]: password: Optional[str]) -> Tuple[Channel, PartialTransaction]:
peer = await self.add_peer(connect_str)
coro = peer.channel_establishment_flow( coro = peer.channel_establishment_flow(
funding_tx=funding_tx, funding_tx=funding_tx,
funding_sat=funding_sat, funding_sat=funding_sat,
@@ -1315,8 +1331,14 @@ class LNWallet(LNWorker):
funding_sat: int, push_amt_sat: int, password: str = None) -> Tuple[Channel, PartialTransaction]: funding_sat: int, push_amt_sat: int, password: str = None) -> Tuple[Channel, PartialTransaction]:
if funding_sat > self.config.LIGHTNING_MAX_FUNDING_SAT: if funding_sat > self.config.LIGHTNING_MAX_FUNDING_SAT:
raise Exception(_("Requested channel capacity is over maximum.")) raise Exception(_("Requested channel capacity is over maximum."))
fut = asyncio.run_coroutine_threadsafe(self.add_peer(connect_str), self.network.asyncio_loop)
try:
peer = fut.result()
except concurrent.futures.TimeoutError:
raise Exception(_("add peer timed out"))
coro = self._open_channel_coroutine( coro = self._open_channel_coroutine(
connect_str=connect_str, funding_tx=funding_tx, funding_sat=funding_sat, peer=peer, funding_tx=funding_tx, funding_sat=funding_sat,
push_sat=push_amt_sat, password=password) push_sat=push_amt_sat, password=password)
fut = asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop) fut = asyncio.run_coroutine_threadsafe(coro, self.network.asyncio_loop)
try: try: