diff --git a/src/trezor/messages/DebugMoneroDiagAck.py b/src/trezor/messages/DebugMoneroDiagAck.py
index 9db1333df..8c1168dc6 100644
--- a/src/trezor/messages/DebugMoneroDiagAck.py
+++ b/src/trezor/messages/DebugMoneroDiagAck.py
@@ -10,7 +10,7 @@
 
 
 class DebugMoneroDiagAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 537
+    MESSAGE_WIRE_TYPE = 547
     FIELDS = {
         1: ('ins', p.UVarintType, 0),
         2: ('p1', p.UVarintType, 0),
diff --git a/src/trezor/messages/DebugMoneroDiagRequest.py b/src/trezor/messages/DebugMoneroDiagRequest.py
index 6f2c1ccee..0b9191766 100644
--- a/src/trezor/messages/DebugMoneroDiagRequest.py
+++ b/src/trezor/messages/DebugMoneroDiagRequest.py
@@ -10,7 +10,7 @@
 
 
 class DebugMoneroDiagRequest(p.MessageType):
-    MESSAGE_WIRE_TYPE = 536
+    MESSAGE_WIRE_TYPE = 546
     FIELDS = {
         1: ('ins', p.UVarintType, 0),
         2: ('p1', p.UVarintType, 0),
diff --git a/src/trezor/messages/MessageType.py b/src/trezor/messages/MessageType.py
index c0d71952b..2355b955d 100644
--- a/src/trezor/messages/MessageType.py
+++ b/src/trezor/messages/MessageType.py
@@ -137,25 +137,35 @@
 RippleAddress = 401
 RippleSignTx = 402
 RippleSignedTx = 403
-MoneroTransactionSignRequest = 501
+MoneroTransactionInitRequest = 501
 MoneroTransactionInitAck = 502
-MoneroTransactionSetInputAck = 503
-MoneroTransactionInputsPermutationAck = 504
-MoneroTransactionInputViniAck = 505
-MoneroTransactionAllInputsSetAck = 513
-MoneroTransactionSetOutputAck = 506
-MoneroTransactionRangeSigAck = 514
-MoneroTransactionAllOutSetAck = 507
-MoneroTransactionMlsagDoneAck = 508
-MoneroTransactionSignInputAck = 509
-MoneroTransactionFinalAck = 510
-MoneroKeyImageSyncRequest = 511
-MoneroKeyImageExportInitAck = 520
-MoneroKeyImageSyncStepAck = 521
-MoneroKeyImageSyncFinalAck = 522
-MoneroGetAddress = 530
-MoneroAddress = 531
-MoneroGetWatchKey = 532
-MoneroWatchKey = 533
-DebugMoneroDiagRequest = 536
-DebugMoneroDiagAck = 537
+MoneroTransactionSetInputRequest = 503
+MoneroTransactionSetInputAck = 504
+MoneroTransactionInputsPermutationRequest = 505
+MoneroTransactionInputsPermutationAck = 506
+MoneroTransactionInputViniRequest = 507
+MoneroTransactionInputViniAck = 508
+MoneroTransactionAllInputsSetRequest = 509
+MoneroTransactionAllInputsSetAck = 510
+MoneroTransactionSetOutputRequest = 511
+MoneroTransactionSetOutputAck = 512
+MoneroTransactionAllOutSetRequest = 513
+MoneroTransactionAllOutSetAck = 514
+MoneroTransactionMlsagDoneRequest = 515
+MoneroTransactionMlsagDoneAck = 516
+MoneroTransactionSignInputRequest = 517
+MoneroTransactionSignInputAck = 518
+MoneroTransactionFinalRequest = 519
+MoneroTransactionFinalAck = 520
+MoneroKeyImageExportInitRequest = 530
+MoneroKeyImageExportInitAck = 531
+MoneroKeyImageSyncStepRequest = 532
+MoneroKeyImageSyncStepAck = 533
+MoneroKeyImageSyncFinalRequest = 534
+MoneroKeyImageSyncFinalAck = 535
+MoneroGetAddress = 540
+MoneroAddress = 541
+MoneroGetWatchKey = 542
+MoneroWatchKey = 543
+DebugMoneroDiagRequest = 546
+DebugMoneroDiagAck = 547
diff --git a/src/trezor/messages/MoneroAddress.py b/src/trezor/messages/MoneroAddress.py
index a05235272..3485e2a15 100644
--- a/src/trezor/messages/MoneroAddress.py
+++ b/src/trezor/messages/MoneroAddress.py
@@ -4,7 +4,7 @@
 
 
 class MoneroAddress(p.MessageType):
-    MESSAGE_WIRE_TYPE = 531
+    MESSAGE_WIRE_TYPE = 541
     FIELDS = {
         1: ('address', p.BytesType, 0),
     }
diff --git a/src/trezor/messages/MoneroGetAddress.py b/src/trezor/messages/MoneroGetAddress.py
index 005df2d70..8530ee939 100644
--- a/src/trezor/messages/MoneroGetAddress.py
+++ b/src/trezor/messages/MoneroGetAddress.py
@@ -10,7 +10,7 @@
 
 
 class MoneroGetAddress(p.MessageType):
-    MESSAGE_WIRE_TYPE = 530
+    MESSAGE_WIRE_TYPE = 540
     FIELDS = {
         1: ('address_n', p.UVarintType, p.FLAG_REPEATED),
         2: ('show_display', p.BoolType, 0),
diff --git a/src/trezor/messages/MoneroGetWatchKey.py b/src/trezor/messages/MoneroGetWatchKey.py
index abe53e514..71b5ef525 100644
--- a/src/trezor/messages/MoneroGetWatchKey.py
+++ b/src/trezor/messages/MoneroGetWatchKey.py
@@ -10,7 +10,7 @@
 
 
 class MoneroGetWatchKey(p.MessageType):
-    MESSAGE_WIRE_TYPE = 532
+    MESSAGE_WIRE_TYPE = 542
     FIELDS = {
         1: ('address_n', p.UVarintType, p.FLAG_REPEATED),
         2: ('network_type', p.UVarintType, 0),
diff --git a/src/trezor/messages/MoneroKeyImageExportInitAck.py b/src/trezor/messages/MoneroKeyImageExportInitAck.py
index cdea420b9..026200758 100644
--- a/src/trezor/messages/MoneroKeyImageExportInitAck.py
+++ b/src/trezor/messages/MoneroKeyImageExportInitAck.py
@@ -4,4 +4,4 @@
 
 
 class MoneroKeyImageExportInitAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 520
+    MESSAGE_WIRE_TYPE = 531
diff --git a/src/trezor/messages/MoneroKeyImageExportInitRequest.py b/src/trezor/messages/MoneroKeyImageExportInitRequest.py
index 3bc46e38d..a456edb94 100644
--- a/src/trezor/messages/MoneroKeyImageExportInitRequest.py
+++ b/src/trezor/messages/MoneroKeyImageExportInitRequest.py
@@ -12,6 +12,7 @@
 
 
 class MoneroKeyImageExportInitRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 530
     FIELDS = {
         1: ('num', p.UVarintType, 0),
         2: ('hash', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroKeyImageSyncFinalAck.py b/src/trezor/messages/MoneroKeyImageSyncFinalAck.py
index 4c1291e64..f221b614a 100644
--- a/src/trezor/messages/MoneroKeyImageSyncFinalAck.py
+++ b/src/trezor/messages/MoneroKeyImageSyncFinalAck.py
@@ -4,7 +4,7 @@
 
 
 class MoneroKeyImageSyncFinalAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 522
+    MESSAGE_WIRE_TYPE = 535
     FIELDS = {
         1: ('enc_key', p.BytesType, 0),
     }
diff --git a/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py b/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py
index 12dfff3f2..0ef899556 100644
--- a/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py
+++ b/src/trezor/messages/MoneroKeyImageSyncFinalRequest.py
@@ -4,4 +4,4 @@
 
 
 class MoneroKeyImageSyncFinalRequest(p.MessageType):
-    pass
+    MESSAGE_WIRE_TYPE = 534
diff --git a/src/trezor/messages/MoneroKeyImageSyncRequest.py b/src/trezor/messages/MoneroKeyImageSyncRequest.py
deleted file mode 100644
index 3823f5642..000000000
--- a/src/trezor/messages/MoneroKeyImageSyncRequest.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Automatically generated by pb2py
-# fmt: off
-import protobuf as p
-
-from .MoneroKeyImageExportInitRequest import MoneroKeyImageExportInitRequest
-from .MoneroKeyImageSyncFinalRequest import MoneroKeyImageSyncFinalRequest
-from .MoneroKeyImageSyncStepRequest import MoneroKeyImageSyncStepRequest
-
-
-class MoneroKeyImageSyncRequest(p.MessageType):
-    MESSAGE_WIRE_TYPE = 511
-    FIELDS = {
-        1: ('init', MoneroKeyImageExportInitRequest, 0),
-        2: ('step', MoneroKeyImageSyncStepRequest, 0),
-        3: ('final_msg', MoneroKeyImageSyncFinalRequest, 0),
-    }
-
-    def __init__(
-        self,
-        init: MoneroKeyImageExportInitRequest = None,
-        step: MoneroKeyImageSyncStepRequest = None,
-        final_msg: MoneroKeyImageSyncFinalRequest = None,
-    ) -> None:
-        self.init = init
-        self.step = step
-        self.final_msg = final_msg
diff --git a/src/trezor/messages/MoneroKeyImageSyncStepAck.py b/src/trezor/messages/MoneroKeyImageSyncStepAck.py
index 0e7768c94..fd8e06566 100644
--- a/src/trezor/messages/MoneroKeyImageSyncStepAck.py
+++ b/src/trezor/messages/MoneroKeyImageSyncStepAck.py
@@ -12,7 +12,7 @@
 
 
 class MoneroKeyImageSyncStepAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 521
+    MESSAGE_WIRE_TYPE = 533
     FIELDS = {
         1: ('kis', MoneroExportedKeyImage, p.FLAG_REPEATED),
     }
diff --git a/src/trezor/messages/MoneroKeyImageSyncStepRequest.py b/src/trezor/messages/MoneroKeyImageSyncStepRequest.py
index 5a1c66686..9f07f31ce 100644
--- a/src/trezor/messages/MoneroKeyImageSyncStepRequest.py
+++ b/src/trezor/messages/MoneroKeyImageSyncStepRequest.py
@@ -12,6 +12,7 @@
 
 
 class MoneroKeyImageSyncStepRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 532
     FIELDS = {
         1: ('tdis', MoneroTransferDetails, p.FLAG_REPEATED),
     }
diff --git a/src/trezor/messages/MoneroTransactionAllInputsSetAck.py b/src/trezor/messages/MoneroTransactionAllInputsSetAck.py
index 4dd935a11..2d8d5e9fb 100644
--- a/src/trezor/messages/MoneroTransactionAllInputsSetAck.py
+++ b/src/trezor/messages/MoneroTransactionAllInputsSetAck.py
@@ -6,7 +6,7 @@
 
 
 class MoneroTransactionAllInputsSetAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 513
+    MESSAGE_WIRE_TYPE = 510
     FIELDS = {
         1: ('rsig_data', MoneroTransactionRsigData, 0),
     }
diff --git a/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py b/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py
index f17cb2a94..4ba55ba3d 100644
--- a/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py
+++ b/src/trezor/messages/MoneroTransactionAllInputsSetRequest.py
@@ -6,6 +6,7 @@
 
 
 class MoneroTransactionAllInputsSetRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 509
     FIELDS = {
         1: ('rsig_data', MoneroTransactionRsigData, 0),
     }
diff --git a/src/trezor/messages/MoneroTransactionAllOutSetAck.py b/src/trezor/messages/MoneroTransactionAllOutSetAck.py
index 8382adaa7..48a345760 100644
--- a/src/trezor/messages/MoneroTransactionAllOutSetAck.py
+++ b/src/trezor/messages/MoneroTransactionAllOutSetAck.py
@@ -7,7 +7,7 @@
 
 
 class MoneroTransactionAllOutSetAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 507
+    MESSAGE_WIRE_TYPE = 514
     FIELDS = {
         1: ('extra', p.BytesType, 0),
         2: ('tx_prefix_hash', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionAllOutSetRequest.py b/src/trezor/messages/MoneroTransactionAllOutSetRequest.py
index 077abb04d..bcd929175 100644
--- a/src/trezor/messages/MoneroTransactionAllOutSetRequest.py
+++ b/src/trezor/messages/MoneroTransactionAllOutSetRequest.py
@@ -6,6 +6,7 @@
 
 
 class MoneroTransactionAllOutSetRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 513
     FIELDS = {
         1: ('rsig_data', MoneroTransactionRsigData, 0),
     }
diff --git a/src/trezor/messages/MoneroTransactionFinalAck.py b/src/trezor/messages/MoneroTransactionFinalAck.py
index 437fc0253..2abef74cc 100644
--- a/src/trezor/messages/MoneroTransactionFinalAck.py
+++ b/src/trezor/messages/MoneroTransactionFinalAck.py
@@ -4,7 +4,7 @@
 
 
 class MoneroTransactionFinalAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 510
+    MESSAGE_WIRE_TYPE = 520
     FIELDS = {
         1: ('cout_key', p.BytesType, 0),
         2: ('salt', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionFinalRequest.py b/src/trezor/messages/MoneroTransactionFinalRequest.py
index ae1e3dacf..43a81035d 100644
--- a/src/trezor/messages/MoneroTransactionFinalRequest.py
+++ b/src/trezor/messages/MoneroTransactionFinalRequest.py
@@ -4,4 +4,4 @@
 
 
 class MoneroTransactionFinalRequest(p.MessageType):
-    pass
+    MESSAGE_WIRE_TYPE = 519
diff --git a/src/trezor/messages/MoneroTransactionInitRequest.py b/src/trezor/messages/MoneroTransactionInitRequest.py
index 944c56389..8d7978dd2 100644
--- a/src/trezor/messages/MoneroTransactionInitRequest.py
+++ b/src/trezor/messages/MoneroTransactionInitRequest.py
@@ -12,6 +12,7 @@
 
 
 class MoneroTransactionInitRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 501
     FIELDS = {
         1: ('version', p.UVarintType, 0),
         2: ('address_n', p.UVarintType, p.FLAG_REPEATED),
diff --git a/src/trezor/messages/MoneroTransactionInputViniAck.py b/src/trezor/messages/MoneroTransactionInputViniAck.py
index 90902a9bd..dd013628e 100644
--- a/src/trezor/messages/MoneroTransactionInputViniAck.py
+++ b/src/trezor/messages/MoneroTransactionInputViniAck.py
@@ -4,4 +4,4 @@
 
 
 class MoneroTransactionInputViniAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 505
+    MESSAGE_WIRE_TYPE = 508
diff --git a/src/trezor/messages/MoneroTransactionInputViniRequest.py b/src/trezor/messages/MoneroTransactionInputViniRequest.py
index 0ed950e82..a1e01de82 100644
--- a/src/trezor/messages/MoneroTransactionInputViniRequest.py
+++ b/src/trezor/messages/MoneroTransactionInputViniRequest.py
@@ -6,6 +6,7 @@
 
 
 class MoneroTransactionInputViniRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 507
     FIELDS = {
         1: ('src_entr', MoneroTransactionSourceEntry, 0),
         2: ('vini', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionInputsPermutationAck.py b/src/trezor/messages/MoneroTransactionInputsPermutationAck.py
index 211daa2cd..55925a2d9 100644
--- a/src/trezor/messages/MoneroTransactionInputsPermutationAck.py
+++ b/src/trezor/messages/MoneroTransactionInputsPermutationAck.py
@@ -4,4 +4,4 @@
 
 
 class MoneroTransactionInputsPermutationAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 504
+    MESSAGE_WIRE_TYPE = 506
diff --git a/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py b/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py
index b6f049586..8bd1771bc 100644
--- a/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py
+++ b/src/trezor/messages/MoneroTransactionInputsPermutationRequest.py
@@ -10,6 +10,7 @@
 
 
 class MoneroTransactionInputsPermutationRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 505
     FIELDS = {
         1: ('perm', p.UVarintType, p.FLAG_REPEATED),
     }
diff --git a/src/trezor/messages/MoneroTransactionMlsagDoneAck.py b/src/trezor/messages/MoneroTransactionMlsagDoneAck.py
index 249c5213f..d797c4861 100644
--- a/src/trezor/messages/MoneroTransactionMlsagDoneAck.py
+++ b/src/trezor/messages/MoneroTransactionMlsagDoneAck.py
@@ -4,7 +4,7 @@
 
 
 class MoneroTransactionMlsagDoneAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 508
+    MESSAGE_WIRE_TYPE = 516
     FIELDS = {
         1: ('full_message_hash', p.BytesType, 0),
     }
diff --git a/src/trezor/messages/MoneroTransactionMlsagDoneRequest.py b/src/trezor/messages/MoneroTransactionMlsagDoneRequest.py
index ce376a180..04fb493c0 100644
--- a/src/trezor/messages/MoneroTransactionMlsagDoneRequest.py
+++ b/src/trezor/messages/MoneroTransactionMlsagDoneRequest.py
@@ -4,4 +4,4 @@
 
 
 class MoneroTransactionMlsagDoneRequest(p.MessageType):
-    pass
+    MESSAGE_WIRE_TYPE = 515
diff --git a/src/trezor/messages/MoneroTransactionRangeSigAck.py b/src/trezor/messages/MoneroTransactionRangeSigAck.py
deleted file mode 100644
index d683ccb94..000000000
--- a/src/trezor/messages/MoneroTransactionRangeSigAck.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Automatically generated by pb2py
-# fmt: off
-import protobuf as p
-
-from .MoneroTransactionRsigData import MoneroTransactionRsigData
-
-
-class MoneroTransactionRangeSigAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 514
-    FIELDS = {
-        1: ('rsig_data', MoneroTransactionRsigData, 0),
-    }
-
-    def __init__(
-        self,
-        rsig_data: MoneroTransactionRsigData = None,
-    ) -> None:
-        self.rsig_data = rsig_data
diff --git a/src/trezor/messages/MoneroTransactionRangeSigRequest.py b/src/trezor/messages/MoneroTransactionRangeSigRequest.py
deleted file mode 100644
index 96e88b6b9..000000000
--- a/src/trezor/messages/MoneroTransactionRangeSigRequest.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Automatically generated by pb2py
-# fmt: off
-import protobuf as p
-
-from .MoneroTransactionRsigData import MoneroTransactionRsigData
-
-
-class MoneroTransactionRangeSigRequest(p.MessageType):
-    FIELDS = {
-        1: ('rsig_data', MoneroTransactionRsigData, 0),
-    }
-
-    def __init__(
-        self,
-        rsig_data: MoneroTransactionRsigData = None,
-    ) -> None:
-        self.rsig_data = rsig_data
diff --git a/src/trezor/messages/MoneroTransactionSetInputAck.py b/src/trezor/messages/MoneroTransactionSetInputAck.py
index e99d2fbbf..55055f83b 100644
--- a/src/trezor/messages/MoneroTransactionSetInputAck.py
+++ b/src/trezor/messages/MoneroTransactionSetInputAck.py
@@ -4,7 +4,7 @@
 
 
 class MoneroTransactionSetInputAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 503
+    MESSAGE_WIRE_TYPE = 504
     FIELDS = {
         1: ('vini', p.BytesType, 0),
         2: ('vini_hmac', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionSetInputRequest.py b/src/trezor/messages/MoneroTransactionSetInputRequest.py
index e424b1e7a..417aac0b4 100644
--- a/src/trezor/messages/MoneroTransactionSetInputRequest.py
+++ b/src/trezor/messages/MoneroTransactionSetInputRequest.py
@@ -6,6 +6,7 @@
 
 
 class MoneroTransactionSetInputRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 503
     FIELDS = {
         1: ('version', p.UVarintType, 0),
         2: ('src_entr', MoneroTransactionSourceEntry, 0),
diff --git a/src/trezor/messages/MoneroTransactionSetOutputAck.py b/src/trezor/messages/MoneroTransactionSetOutputAck.py
index ed1d8990d..1ec80f78d 100644
--- a/src/trezor/messages/MoneroTransactionSetOutputAck.py
+++ b/src/trezor/messages/MoneroTransactionSetOutputAck.py
@@ -6,7 +6,7 @@
 
 
 class MoneroTransactionSetOutputAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 506
+    MESSAGE_WIRE_TYPE = 512
     FIELDS = {
         1: ('tx_out', p.BytesType, 0),
         2: ('vouti_hmac', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionSetOutputRequest.py b/src/trezor/messages/MoneroTransactionSetOutputRequest.py
index 577c87bee..83b3d4528 100644
--- a/src/trezor/messages/MoneroTransactionSetOutputRequest.py
+++ b/src/trezor/messages/MoneroTransactionSetOutputRequest.py
@@ -7,6 +7,7 @@
 
 
 class MoneroTransactionSetOutputRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 511
     FIELDS = {
         1: ('dst_entr', MoneroTransactionDestinationEntry, 0),
         2: ('dst_entr_hmac', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionSignInputAck.py b/src/trezor/messages/MoneroTransactionSignInputAck.py
index 0dc44336b..be1a3882b 100644
--- a/src/trezor/messages/MoneroTransactionSignInputAck.py
+++ b/src/trezor/messages/MoneroTransactionSignInputAck.py
@@ -4,7 +4,7 @@
 
 
 class MoneroTransactionSignInputAck(p.MessageType):
-    MESSAGE_WIRE_TYPE = 509
+    MESSAGE_WIRE_TYPE = 518
     FIELDS = {
         1: ('signature', p.BytesType, 0),
         2: ('cout', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionSignInputRequest.py b/src/trezor/messages/MoneroTransactionSignInputRequest.py
index 9866d5b0f..376a28917 100644
--- a/src/trezor/messages/MoneroTransactionSignInputRequest.py
+++ b/src/trezor/messages/MoneroTransactionSignInputRequest.py
@@ -6,6 +6,7 @@
 
 
 class MoneroTransactionSignInputRequest(p.MessageType):
+    MESSAGE_WIRE_TYPE = 517
     FIELDS = {
         1: ('src_entr', MoneroTransactionSourceEntry, 0),
         2: ('vini', p.BytesType, 0),
diff --git a/src/trezor/messages/MoneroTransactionSignRequest.py b/src/trezor/messages/MoneroTransactionSignRequest.py
deleted file mode 100644
index ab5dab624..000000000
--- a/src/trezor/messages/MoneroTransactionSignRequest.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Automatically generated by pb2py
-# fmt: off
-import protobuf as p
-
-from .MoneroTransactionAllInputsSetRequest import MoneroTransactionAllInputsSetRequest
-from .MoneroTransactionAllOutSetRequest import MoneroTransactionAllOutSetRequest
-from .MoneroTransactionFinalRequest import MoneroTransactionFinalRequest
-from .MoneroTransactionInitRequest import MoneroTransactionInitRequest
-from .MoneroTransactionInputViniRequest import MoneroTransactionInputViniRequest
-from .MoneroTransactionInputsPermutationRequest import MoneroTransactionInputsPermutationRequest
-from .MoneroTransactionMlsagDoneRequest import MoneroTransactionMlsagDoneRequest
-from .MoneroTransactionRangeSigRequest import MoneroTransactionRangeSigRequest
-from .MoneroTransactionSetInputRequest import MoneroTransactionSetInputRequest
-from .MoneroTransactionSetOutputRequest import MoneroTransactionSetOutputRequest
-from .MoneroTransactionSignInputRequest import MoneroTransactionSignInputRequest
-
-
-class MoneroTransactionSignRequest(p.MessageType):
-    MESSAGE_WIRE_TYPE = 501
-    FIELDS = {
-        1: ('init', MoneroTransactionInitRequest, 0),
-        2: ('set_input', MoneroTransactionSetInputRequest, 0),
-        3: ('input_permutation', MoneroTransactionInputsPermutationRequest, 0),
-        4: ('input_vini', MoneroTransactionInputViniRequest, 0),
-        5: ('all_in_set', MoneroTransactionAllInputsSetRequest, 0),
-        6: ('set_output', MoneroTransactionSetOutputRequest, 0),
-        7: ('rsig', MoneroTransactionRangeSigRequest, 0),
-        8: ('all_out_set', MoneroTransactionAllOutSetRequest, 0),
-        9: ('mlsag_done', MoneroTransactionMlsagDoneRequest, 0),
-        10: ('sign_input', MoneroTransactionSignInputRequest, 0),
-        11: ('final_msg', MoneroTransactionFinalRequest, 0),
-    }
-
-    def __init__(
-        self,
-        init: MoneroTransactionInitRequest = None,
-        set_input: MoneroTransactionSetInputRequest = None,
-        input_permutation: MoneroTransactionInputsPermutationRequest = None,
-        input_vini: MoneroTransactionInputViniRequest = None,
-        all_in_set: MoneroTransactionAllInputsSetRequest = None,
-        set_output: MoneroTransactionSetOutputRequest = None,
-        rsig: MoneroTransactionRangeSigRequest = None,
-        all_out_set: MoneroTransactionAllOutSetRequest = None,
-        mlsag_done: MoneroTransactionMlsagDoneRequest = None,
-        sign_input: MoneroTransactionSignInputRequest = None,
-        final_msg: MoneroTransactionFinalRequest = None,
-    ) -> None:
-        self.init = init
-        self.set_input = set_input
-        self.input_permutation = input_permutation
-        self.input_vini = input_vini
-        self.all_in_set = all_in_set
-        self.set_output = set_output
-        self.rsig = rsig
-        self.all_out_set = all_out_set
-        self.mlsag_done = mlsag_done
-        self.sign_input = sign_input
-        self.final_msg = final_msg
diff --git a/src/trezor/messages/MoneroWatchKey.py b/src/trezor/messages/MoneroWatchKey.py
index 8579e6bfa..4a64fbdea 100644
--- a/src/trezor/messages/MoneroWatchKey.py
+++ b/src/trezor/messages/MoneroWatchKey.py
@@ -4,7 +4,7 @@
 
 
 class MoneroWatchKey(p.MessageType):
-    MESSAGE_WIRE_TYPE = 533
+    MESSAGE_WIRE_TYPE = 543
     FIELDS = {
         1: ('watch_key', p.BytesType, 0),
         2: ('address', p.BytesType, 0),
diff --git a/vendor/trezor-common b/vendor/trezor-common
index 0c39ac7fc..08e89cabd 160000
--- a/vendor/trezor-common
+++ b/vendor/trezor-common
@@ -1 +1 @@
-Subproject commit 0c39ac7fc2b1d0a68785d4618059efdc8b2d156a
+Subproject commit 08e89cabd234d169a1439dbf64d1bbeb94cdf891