fix ledger signing. fix dbb 2fa. follow-up partial txn ser change (#4405)

This commit is contained in:
SomberNight 2018-06-15 20:21:29 +02:00
parent a98e833897
commit 529cb3602c
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 2 additions and 2 deletions

View file

@ -559,7 +559,7 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore):
# expected serialization though, so we leave it here until we activate it. # expected serialization though, so we leave it here until we activate it.
return '00' + push_script(Transaction.get_preimage_script(txin)) return '00' + push_script(Transaction.get_preimage_script(txin))
raise Exception("unsupported type %s" % txin['type']) raise Exception("unsupported type %s" % txin['type'])
tx_dbb_serialized = CustomTXSerialization(tx.serialize()).serialize() tx_dbb_serialized = CustomTXSerialization(tx.serialize()).serialize_to_network()
else: else:
# We only need this for the signing echo / verification. # We only need this for the signing echo / verification.
tx_dbb_serialized = None tx_dbb_serialized = None

View file

@ -429,7 +429,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
# Sign all inputs # Sign all inputs
firstTransaction = True firstTransaction = True
inputIndex = 0 inputIndex = 0
rawTx = tx.serialize() rawTx = tx.serialize_to_network()
self.get_client().enableAlternate2fa(False) self.get_client().enableAlternate2fa(False)
if segwitTransaction: if segwitTransaction:
self.get_client().startUntrustedTransaction(True, inputIndex, self.get_client().startUntrustedTransaction(True, inputIndex,