AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up descriptor.py: small clean-up

Browse Source
This commit is contained in:
SomberNight
2023-03-01 18:46:34 +00:00
parent e457bb50e9
commit a80bef8421
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/bitcoin.py
View File

@@ -442,7 +442,7 @@ def redeem_script_to_address(txin_type: str, scriptcode: str, *, net=None) -> st
raise NotImplementedError(txin_type) raise NotImplementedError(txin_type)
def script_to_address(script: str, *, net=None) -> str: def script_to_address(script: str, *, net=None) -> Optional[str]:
from .transaction import get_address_from_output_script from .transaction import get_address_from_output_script
return get_address_from_output_script(bfh(script), net=net) return get_address_from_output_script(bfh(script), net=net)

5
electrum/descriptor.py
View File

@@ -54,7 +54,7 @@ class ExpandedScripts:
def __init__( def __init__(
self, self,
*, *,
output_script: Optional[bytes] = None, output_script: bytes, # "scriptPubKey"
redeem_script: Optional[bytes] = None, redeem_script: Optional[bytes] = None,
witness_script: Optional[bytes] = None, witness_script: Optional[bytes] = None,
scriptcode_for_sighash: Optional[bytes] = None scriptcode_for_sighash: Optional[bytes] = None
@@ -75,8 +75,7 @@ class ExpandedScripts:
self._scriptcode_for_sighash = value self._scriptcode_for_sighash = value
def address(self, *, net=None) -> Optional[str]: def address(self, *, net=None) -> Optional[str]:
if spk := self.output_script: return bitcoin.script_to_address(self.output_script.hex(), net=net)
return bitcoin.script_to_address(spk.hex(), net=net)
class ScriptSolutionInner(NamedTuple): class ScriptSolutionInner(NamedTuple):

4
electrum/wallet.py
View File

@@ -107,8 +107,6 @@ async def _append_utxos_to_inputs(
inputs: List[PartialTxInput], inputs: List[PartialTxInput],
network: 'Network', network: 'Network',
script_descriptor: 'descriptor.Descriptor', script_descriptor: 'descriptor.Descriptor',
pubkey: str,
txin_type: str,
imax: int, imax: int,
) -> None: ) -> None:
script = script_descriptor.expand().output_script.hex() script = script_descriptor.expand().output_script.hex()
@@ -145,8 +143,6 @@ async def sweep_preparations(privkeys, network: 'Network', imax=100):
inputs=inputs, inputs=inputs,
network=network, network=network,
script_descriptor=desc, script_descriptor=desc,
pubkey=pubkey,
txin_type=txin_type,
imax=imax) imax=imax)
keypairs[pubkey] = privkey, compressed keypairs[pubkey] = privkey, compressed