AaronFiore/electrum
1
0
Fork 0
Code Activity

transaction.py: move Tx.serialize_input -> TxInput.serialize_to_network

Browse Source
This commit is contained in:
SomberNight
2023-02-17 09:44:09 +00:00
parent 15d73daf8d
commit 845f4aee4d
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
electrum/transaction.py
View File

@@ -283,7 +283,18 @@ class TxInput:
d['witness'] = self.witness.hex() d['witness'] = self.witness.hex()
return d return d
def witness_elements(self)-> Sequence[bytes]: def serialize_to_network(self, *, script_sig: bytes = None) -> bytes:
if script_sig is None:
script_sig = self.script_sig
# Prev hash and index
s = self.prevout.serialize_to_network()
# Script length, script, sequence
s += bytes.fromhex(var_int(len(script_sig)))
s += script_sig
s += bytes.fromhex(int_to_hex(self.nsequence, 4))
return s
def witness_elements(self) -> Sequence[bytes]:
if not self.witness: if not self.witness:
return [] return []
vds = BCDataStream() vds = BCDataStream()
@@ -854,16 +865,6 @@ class Transaction:
else: else:
raise UnknownTxinType(f'cannot construct preimage_script for txin_type: {txin.script_type}') raise UnknownTxinType(f'cannot construct preimage_script for txin_type: {txin.script_type}')
@classmethod
def serialize_input(self, txin: TxInput, script: str) -> str:
# Prev hash and index
s = txin.prevout.serialize_to_network().hex()
# Script length, script, sequence
s += var_int(len(script)//2)
s += script
s += int_to_hex(txin.nsequence, 4)
return s
def _calc_bip143_shared_txdigest_fields(self) -> BIP143SharedTxDigestFields: def _calc_bip143_shared_txdigest_fields(self) -> BIP143SharedTxDigestFields:
inputs = self.inputs() inputs = self.inputs()
outputs = self.outputs() outputs = self.outputs()
@@ -902,11 +903,12 @@ class Transaction:
inputs = self.inputs() inputs = self.inputs()
outputs = self.outputs() outputs = self.outputs()
def create_script_sig(txin: TxInput) -> str: def create_script_sig(txin: TxInput) -> bytes:
if include_sigs: if include_sigs:
return self.input_script(txin, estimate_size=estimate_size) script_sig = self.input_script(txin, estimate_size=estimate_size)
return '' return bytes.fromhex(script_sig)
txins = var_int(len(inputs)) + ''.join(self.serialize_input(txin, create_script_sig(txin)) return b""
txins = var_int(len(inputs)) + ''.join(txin.serialize_to_network(script_sig=create_script_sig(txin)).hex()
for txin in inputs) for txin in inputs)
txouts = var_int(len(outputs)) + ''.join(o.serialize_to_network().hex() for o in outputs) txouts = var_int(len(outputs)) + ''.join(o.serialize_to_network().hex() for o in outputs)
@@ -973,10 +975,10 @@ class Transaction:
return self.virtual_size_from_weight(weight) return self.virtual_size_from_weight(weight)
@classmethod @classmethod
def estimated_input_weight(cls, txin, is_segwit_tx): def estimated_input_weight(cls, txin: TxInput, is_segwit_tx: bool):
'''Return an estimate of serialized input weight in weight units.''' '''Return an estimate of serialized input weight in weight units.'''
script = cls.input_script(txin, estimate_size=True) script_sig = cls.input_script(txin, estimate_size=True)
input_size = len(cls.serialize_input(txin, script)) // 2 input_size = len(txin.serialize_to_network(script_sig=bytes.fromhex(script_sig)))
if txin.is_segwit(guess_for_address=True): if txin.is_segwit(guess_for_address=True):
witness_size = len(cls.serialize_witness(txin, estimate_size=True)) // 2 witness_size = len(cls.serialize_witness(txin, estimate_size=True)) // 2
@@ -1964,7 +1966,7 @@ class PartialTransaction(Transaction):
nSequence = int_to_hex(txin.nsequence, 4) nSequence = int_to_hex(txin.nsequence, 4)
preimage = nVersion + hashPrevouts + hashSequence + outpoint + scriptCode + amount + nSequence + hashOutputs + nLocktime + nHashType preimage = nVersion + hashPrevouts + hashSequence + outpoint + scriptCode + amount + nSequence + hashOutputs + nLocktime + nHashType
else: else:
txins = var_int(len(inputs)) + ''.join(self.serialize_input(txin, preimage_script if txin_index==k else '') txins = var_int(len(inputs)) + ''.join(txin.serialize_to_network(script_sig=bfh(preimage_script) if txin_index==k else b"").hex()
for k, txin in enumerate(inputs)) for k, txin in enumerate(inputs))
txouts = var_int(len(outputs)) + ''.join(o.serialize_to_network().hex() for o in outputs) txouts = var_int(len(outputs)) + ''.join(o.serialize_to_network().hex() for o in outputs)
preimage = nVersion + txins + txouts + nLocktime + nHashType preimage = nVersion + txins + txouts + nLocktime + nHashType