AaronFiore/electrum
1
0
Fork 0
Code Activity

transaction.py: shortcut witness/scriptSig serialisation

Browse Source
This commit is contained in:
SomberNight
2018-04-18 19:00:14 +02:00
parent b3110b3b46
commit 1d6f000868
4 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/digitalbitbox/digitalbitbox.py
View File

@@ -643,7 +643,8 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore):
sig_r = int(signed['sig'][:64], 16)
sig_s = int(signed['sig'][64:], 16)
sig = sigencode_der(sig_r, sig_s, generator_secp256k1.order())
txin['signatures'][ii] = to_hexstr(sig) + '01'
sig = to_hexstr(sig) + '01'
Transaction.add_signature_to_txin(txin, ii, sig)
tx._inputs[i] = txin
except UserCancelled:
raise

2
plugins/ledger/ledger.py
View File

@@ -498,7 +498,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
for i, txin in enumerate(tx.inputs()):
signingPos = inputs[i][4]
txin['signatures'][signingPos] = bh2u(signatures[i])
Transaction.add_signature_to_txin(txin, signingPos, bh2u(signatures[i]))
tx.raw = tx.serialize()
@test_pin_unlocked