From 529cb3602cfdee710ff42a5e582f9d0bb8068901 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 15 Jun 2018 20:21:29 +0200 Subject: [PATCH] fix ledger signing. fix dbb 2fa. follow-up partial txn ser change (#4405) --- plugins/digitalbitbox/digitalbitbox.py | 2 +- plugins/ledger/ledger.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/digitalbitbox/digitalbitbox.py b/plugins/digitalbitbox/digitalbitbox.py index c22c2d7e6..4b238e7c1 100644 --- a/plugins/digitalbitbox/digitalbitbox.py +++ b/plugins/digitalbitbox/digitalbitbox.py @@ -559,7 +559,7 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore): # expected serialization though, so we leave it here until we activate it. return '00' + push_script(Transaction.get_preimage_script(txin)) raise Exception("unsupported type %s" % txin['type']) - tx_dbb_serialized = CustomTXSerialization(tx.serialize()).serialize() + tx_dbb_serialized = CustomTXSerialization(tx.serialize()).serialize_to_network() else: # We only need this for the signing echo / verification. tx_dbb_serialized = None diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py index 466378196..0dee089d3 100644 --- a/plugins/ledger/ledger.py +++ b/plugins/ledger/ledger.py @@ -429,7 +429,7 @@ class Ledger_KeyStore(Hardware_KeyStore): # Sign all inputs firstTransaction = True inputIndex = 0 - rawTx = tx.serialize() + rawTx = tx.serialize_to_network() self.get_client().enableAlternate2fa(False) if segwitTransaction: self.get_client().startUntrustedTransaction(True, inputIndex,