diff --git a/src/apps/monero/protocol/signing/step_04_input_vini.py b/src/apps/monero/protocol/signing/step_04_input_vini.py index f999f2bdd..d13d3a839 100644 --- a/src/apps/monero/protocol/signing/step_04_input_vini.py +++ b/src/apps/monero/protocol/signing/step_04_input_vini.py @@ -8,7 +8,7 @@ from apps.monero.layout import confirms from apps.monero.protocol import hmac_encryption_keys -from apps.monero.xmr import common, crypto, monero +from apps.monero.xmr import common, crypto async def input_vini( diff --git a/src/apps/monero/protocol/signing/step_07_all_out1_set.py b/src/apps/monero/protocol/signing/step_07_all_out1_set.py index 718c1c885..dd31f7e7c 100644 --- a/src/apps/monero/protocol/signing/step_07_all_out1_set.py +++ b/src/apps/monero/protocol/signing/step_07_all_out1_set.py @@ -80,9 +80,7 @@ async def all_out1_set(state: State): # Initializes RCTsig structure (fee, tx prefix hash, type) rv_pb = MoneroRingCtSig( - txn_fee=state.fee, - message=state.tx_prefix_hash, - rv_type=state.get_rct_type(), + txn_fee=state.fee, message=state.tx_prefix_hash, rv_type=state.get_rct_type() ) return MoneroTransactionAllOutSetAck( diff --git a/src/apps/monero/protocol/signing/step_10_sign_final.py b/src/apps/monero/protocol/signing/step_10_sign_final.py index 695f07581..f570de57e 100644 --- a/src/apps/monero/protocol/signing/step_10_sign_final.py +++ b/src/apps/monero/protocol/signing/step_10_sign_final.py @@ -5,15 +5,15 @@ import gc +from trezor.messages.MoneroTransactionFinalAck import MoneroTransactionFinalAck + from .state import State from apps.monero.controller import misc +from apps.monero.layout import confirms +from apps.monero.protocol import hmac_encryption_keys from apps.monero.xmr import crypto from apps.monero.xmr.enc import chacha_poly -from apps.monero.protocol import hmac_encryption_keys -from trezor.messages.MoneroTransactionFinalAck import MoneroTransactionFinalAck - -from apps.monero.layout import confirms async def final_msg(state: State): diff --git a/src/apps/monero/protocol_lite/lite.py b/src/apps/monero/protocol_lite/lite.py index 0fa8049a8..75dc4f028 100644 --- a/src/apps/monero/protocol_lite/lite.py +++ b/src/apps/monero/protocol_lite/lite.py @@ -6,7 +6,6 @@ from .consts import * -from apps.monero.controller import misc from apps.monero.layout import confirms from apps.monero.xmr import common, crypto, monero from apps.monero.xmr.enc import aescbc @@ -568,11 +567,17 @@ async def mlsag_prehash_update(self): return SW_OK async def _req_dst(self, Aout, Bout, amount, is_sub=False): - from trezor.messages.MoneroAccountPublicAddress import MoneroAccountPublicAddress - from trezor.messages.MoneroTransactionDestinationEntry import MoneroTransactionDestinationEntry + from trezor.messages.MoneroAccountPublicAddress import ( + MoneroAccountPublicAddress + ) + from trezor.messages.MoneroTransactionDestinationEntry import ( + MoneroTransactionDestinationEntry + ) addr = MoneroAccountPublicAddress(view_public_key=Aout, spend_public_key=Bout) - out = MoneroTransactionDestinationEntry(addr=addr, amount=amount, is_subaddress=is_sub) + out = MoneroTransactionDestinationEntry( + addr=addr, amount=amount, is_subaddress=is_sub + ) await self.iface.confirm_out(out, False, self.creds, self.ctx) async def mlsag_prehash_finalize(self): diff --git a/src/apps/monero/sign_tx.py b/src/apps/monero/sign_tx.py index 1128f8c93..6d0158b8a 100644 --- a/src/apps/monero/sign_tx.py +++ b/src/apps/monero/sign_tx.py @@ -2,6 +2,7 @@ from trezor import log, utils from trezor.messages import MessageType + from apps.monero.protocol.signing.state import State