diff --git a/src/trezor/messages/Address.py b/src/trezor/messages/Address.py
index 34287f68b8..447607108d 100644
--- a/src/trezor/messages/Address.py
+++ b/src/trezor/messages/Address.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'address', p.UnicodeType, flags=p.FLAG_REQUIRED)
-Address = t
\ No newline at end of file
+Address = t
+TYPE = const(30)
\ No newline at end of file
diff --git a/src/trezor/messages/ApplySettings.py b/src/trezor/messages/ApplySettings.py
index 75f736eee1..b4e858f7e5 100644
--- a/src/trezor/messages/ApplySettings.py
+++ b/src/trezor/messages/ApplySettings.py
@@ -5,4 +5,5 @@ t.add_field(1, 'language', p.UnicodeType)
 t.add_field(2, 'label', p.UnicodeType)
 t.add_field(3, 'use_passphrase', p.BoolType)
 t.add_field(4, 'homescreen', p.BytesType)
-ApplySettings = t
\ No newline at end of file
+ApplySettings = t
+TYPE = const(25)
\ No newline at end of file
diff --git a/src/trezor/messages/ButtonAck.py b/src/trezor/messages/ButtonAck.py
index b906147acc..96a8168e26 100644
--- a/src/trezor/messages/ButtonAck.py
+++ b/src/trezor/messages/ButtonAck.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-ButtonAck = t
\ No newline at end of file
+ButtonAck = t
+TYPE = const(27)
\ No newline at end of file
diff --git a/src/trezor/messages/ButtonRequest.py b/src/trezor/messages/ButtonRequest.py
index 844f5345fe..c197a7e032 100644
--- a/src/trezor/messages/ButtonRequest.py
+++ b/src/trezor/messages/ButtonRequest.py
@@ -3,4 +3,5 @@ from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'code', p.UVarintType)
 t.add_field(2, 'data', p.UnicodeType)
-ButtonRequest = t
\ No newline at end of file
+ButtonRequest = t
+TYPE = const(26)
\ No newline at end of file
diff --git a/src/trezor/messages/Cancel.py b/src/trezor/messages/Cancel.py
index cd479563a0..24e780e83a 100644
--- a/src/trezor/messages/Cancel.py
+++ b/src/trezor/messages/Cancel.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-Cancel = t
\ No newline at end of file
+Cancel = t
+TYPE = const(20)
\ No newline at end of file
diff --git a/src/trezor/messages/ChangePin.py b/src/trezor/messages/ChangePin.py
index 7df45346eb..da986e1035 100644
--- a/src/trezor/messages/ChangePin.py
+++ b/src/trezor/messages/ChangePin.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'remove', p.BoolType)
-ChangePin = t
\ No newline at end of file
+ChangePin = t
+TYPE = const(4)
\ No newline at end of file
diff --git a/src/trezor/messages/CipherKeyValue.py b/src/trezor/messages/CipherKeyValue.py
index dfbfd31e01..f049eed617 100644
--- a/src/trezor/messages/CipherKeyValue.py
+++ b/src/trezor/messages/CipherKeyValue.py
@@ -8,4 +8,5 @@ t.add_field(4, 'encrypt', p.BoolType)
 t.add_field(5, 'ask_on_encrypt', p.BoolType)
 t.add_field(6, 'ask_on_decrypt', p.BoolType)
 t.add_field(7, 'iv', p.BytesType)
-CipherKeyValue = t
\ No newline at end of file
+CipherKeyValue = t
+TYPE = const(23)
\ No newline at end of file
diff --git a/src/trezor/messages/CipheredKeyValue.py b/src/trezor/messages/CipheredKeyValue.py
index ec861262b5..e3c28951a0 100644
--- a/src/trezor/messages/CipheredKeyValue.py
+++ b/src/trezor/messages/CipheredKeyValue.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'value', p.BytesType)
-CipheredKeyValue = t
\ No newline at end of file
+CipheredKeyValue = t
+TYPE = const(48)
\ No newline at end of file
diff --git a/src/trezor/messages/ClearSession.py b/src/trezor/messages/ClearSession.py
index e369fcd992..8cd300f632 100644
--- a/src/trezor/messages/ClearSession.py
+++ b/src/trezor/messages/ClearSession.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-ClearSession = t
\ No newline at end of file
+ClearSession = t
+TYPE = const(24)
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkDecision.py b/src/trezor/messages/DebugLinkDecision.py
index 5698fb133a..a8ba67e98c 100644
--- a/src/trezor/messages/DebugLinkDecision.py
+++ b/src/trezor/messages/DebugLinkDecision.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'yes_no', p.BoolType, flags=p.FLAG_REQUIRED)
-DebugLinkDecision = t
\ No newline at end of file
+DebugLinkDecision = t
+TYPE = const(100)
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkGetState.py b/src/trezor/messages/DebugLinkGetState.py
index 4962435f34..1727793d90 100644
--- a/src/trezor/messages/DebugLinkGetState.py
+++ b/src/trezor/messages/DebugLinkGetState.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-DebugLinkGetState = t
\ No newline at end of file
+DebugLinkGetState = t
+TYPE = const(101)
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkLog.py b/src/trezor/messages/DebugLinkLog.py
index 0d8e31aedb..78e692633b 100644
--- a/src/trezor/messages/DebugLinkLog.py
+++ b/src/trezor/messages/DebugLinkLog.py
@@ -4,4 +4,5 @@ t = p.MessageType()
 t.add_field(1, 'level', p.UVarintType)
 t.add_field(2, 'bucket', p.UnicodeType)
 t.add_field(3, 'text', p.UnicodeType)
-DebugLinkLog = t
\ No newline at end of file
+DebugLinkLog = t
+TYPE = const(104)
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkState.py b/src/trezor/messages/DebugLinkState.py
index 9caab72cc8..c4a05e0640 100644
--- a/src/trezor/messages/DebugLinkState.py
+++ b/src/trezor/messages/DebugLinkState.py
@@ -12,4 +12,5 @@ t.add_field(7, 'reset_word', p.UnicodeType)
 t.add_field(8, 'reset_entropy', p.BytesType)
 t.add_field(9, 'recovery_fake_word', p.UnicodeType)
 t.add_field(10, 'recovery_word_pos', p.UVarintType)
-DebugLinkState = t
\ No newline at end of file
+DebugLinkState = t
+TYPE = const(102)
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkStop.py b/src/trezor/messages/DebugLinkStop.py
index 344e873a36..0a59abc1b3 100644
--- a/src/trezor/messages/DebugLinkStop.py
+++ b/src/trezor/messages/DebugLinkStop.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-DebugLinkStop = t
\ No newline at end of file
+DebugLinkStop = t
+TYPE = const(103)
\ No newline at end of file
diff --git a/src/trezor/messages/DecryptMessage.py b/src/trezor/messages/DecryptMessage.py
index 4086b47cda..dac3baf04c 100644
--- a/src/trezor/messages/DecryptMessage.py
+++ b/src/trezor/messages/DecryptMessage.py
@@ -5,4 +5,5 @@ t.add_field(1, 'address_n', p.UVarintType, flags=p.FLAG_REPEATED)
 t.add_field(2, 'nonce', p.BytesType)
 t.add_field(3, 'message', p.BytesType)
 t.add_field(4, 'hmac', p.BytesType)
-DecryptMessage = t
\ No newline at end of file
+DecryptMessage = t
+TYPE = const(51)
\ No newline at end of file
diff --git a/src/trezor/messages/DecryptedMessage.py b/src/trezor/messages/DecryptedMessage.py
index af781892f6..bc6bf5859f 100644
--- a/src/trezor/messages/DecryptedMessage.py
+++ b/src/trezor/messages/DecryptedMessage.py
@@ -3,4 +3,5 @@ from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'message', p.BytesType)
 t.add_field(2, 'address', p.UnicodeType)
-DecryptedMessage = t
\ No newline at end of file
+DecryptedMessage = t
+TYPE = const(52)
\ No newline at end of file
diff --git a/src/trezor/messages/EncryptMessage.py b/src/trezor/messages/EncryptMessage.py
index ab50c293b0..11db2ab93f 100644
--- a/src/trezor/messages/EncryptMessage.py
+++ b/src/trezor/messages/EncryptMessage.py
@@ -6,4 +6,5 @@ t.add_field(2, 'message', p.BytesType)
 t.add_field(3, 'display_only', p.BoolType)
 t.add_field(4, 'address_n', p.UVarintType, flags=p.FLAG_REPEATED)
 t.add_field(5, 'coin_name', p.UnicodeType, default=u'Bitcoin')
-EncryptMessage = t
\ No newline at end of file
+EncryptMessage = t
+TYPE = const(49)
\ No newline at end of file
diff --git a/src/trezor/messages/EncryptedMessage.py b/src/trezor/messages/EncryptedMessage.py
index b61b4fb5c6..69d9b71cbf 100644
--- a/src/trezor/messages/EncryptedMessage.py
+++ b/src/trezor/messages/EncryptedMessage.py
@@ -4,4 +4,5 @@ t = p.MessageType()
 t.add_field(1, 'nonce', p.BytesType)
 t.add_field(2, 'message', p.BytesType)
 t.add_field(3, 'hmac', p.BytesType)
-EncryptedMessage = t
\ No newline at end of file
+EncryptedMessage = t
+TYPE = const(50)
\ No newline at end of file
diff --git a/src/trezor/messages/Entropy.py b/src/trezor/messages/Entropy.py
index 9b2bd82e10..0bb76a3e8d 100644
--- a/src/trezor/messages/Entropy.py
+++ b/src/trezor/messages/Entropy.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'entropy', p.BytesType, flags=p.FLAG_REQUIRED)
-Entropy = t
\ No newline at end of file
+Entropy = t
+TYPE = const(10)
\ No newline at end of file
diff --git a/src/trezor/messages/EntropyAck.py b/src/trezor/messages/EntropyAck.py
index 09c89828bd..f0830a0ac7 100644
--- a/src/trezor/messages/EntropyAck.py
+++ b/src/trezor/messages/EntropyAck.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'entropy', p.BytesType)
-EntropyAck = t
\ No newline at end of file
+EntropyAck = t
+TYPE = const(36)
\ No newline at end of file
diff --git a/src/trezor/messages/EntropyRequest.py b/src/trezor/messages/EntropyRequest.py
index fbcf32a126..d413b9c57a 100644
--- a/src/trezor/messages/EntropyRequest.py
+++ b/src/trezor/messages/EntropyRequest.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-EntropyRequest = t
\ No newline at end of file
+EntropyRequest = t
+TYPE = const(35)
\ No newline at end of file
diff --git a/src/trezor/messages/EstimateTxSize.py b/src/trezor/messages/EstimateTxSize.py
index 81d16d58ed..a0bd90d4af 100644
--- a/src/trezor/messages/EstimateTxSize.py
+++ b/src/trezor/messages/EstimateTxSize.py
@@ -4,4 +4,5 @@ t = p.MessageType()
 t.add_field(1, 'outputs_count', p.UVarintType, flags=p.FLAG_REQUIRED)
 t.add_field(2, 'inputs_count', p.UVarintType, flags=p.FLAG_REQUIRED)
 t.add_field(3, 'coin_name', p.UnicodeType, default=u'Bitcoin')
-EstimateTxSize = t
\ No newline at end of file
+EstimateTxSize = t
+TYPE = const(43)
\ No newline at end of file
diff --git a/src/trezor/messages/Failure.py b/src/trezor/messages/Failure.py
index d7802fb251..187545d067 100644
--- a/src/trezor/messages/Failure.py
+++ b/src/trezor/messages/Failure.py
@@ -3,4 +3,5 @@ from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'code', p.UVarintType)
 t.add_field(2, 'message', p.UnicodeType)
-Failure = t
\ No newline at end of file
+Failure = t
+TYPE = const(3)
\ No newline at end of file
diff --git a/src/trezor/messages/Features.py b/src/trezor/messages/Features.py
index 6f1e77a781..176328dcf1 100644
--- a/src/trezor/messages/Features.py
+++ b/src/trezor/messages/Features.py
@@ -19,4 +19,5 @@ t.add_field(14, 'bootloader_hash', p.BytesType)
 t.add_field(15, 'imported', p.BoolType)
 t.add_field(16, 'pin_cached', p.BoolType)
 t.add_field(17, 'passphrase_cached', p.BoolType)
-Features = t
\ No newline at end of file
+Features = t
+TYPE = const(17)
\ No newline at end of file
diff --git a/src/trezor/messages/FirmwareErase.py b/src/trezor/messages/FirmwareErase.py
index 9ff24f7525..b25b61de28 100644
--- a/src/trezor/messages/FirmwareErase.py
+++ b/src/trezor/messages/FirmwareErase.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-FirmwareErase = t
\ No newline at end of file
+FirmwareErase = t
+TYPE = const(6)
\ No newline at end of file
diff --git a/src/trezor/messages/FirmwareUpload.py b/src/trezor/messages/FirmwareUpload.py
index 4590bbec39..c58192d6ef 100644
--- a/src/trezor/messages/FirmwareUpload.py
+++ b/src/trezor/messages/FirmwareUpload.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'payload', p.BytesType, flags=p.FLAG_REQUIRED)
-FirmwareUpload = t
\ No newline at end of file
+FirmwareUpload = t
+TYPE = const(7)
\ No newline at end of file
diff --git a/src/trezor/messages/GetAddress.py b/src/trezor/messages/GetAddress.py
index ae34c1f546..2dd03733f2 100644
--- a/src/trezor/messages/GetAddress.py
+++ b/src/trezor/messages/GetAddress.py
@@ -6,4 +6,5 @@ t.add_field(1, 'address_n', p.UVarintType, flags=p.FLAG_REPEATED)
 t.add_field(2, 'coin_name', p.UnicodeType, default=u'Bitcoin')
 t.add_field(3, 'show_display', p.BoolType)
 t.add_field(4, 'multisig', p.EmbeddedMessage(MultisigRedeemScriptType))
-GetAddress = t
\ No newline at end of file
+GetAddress = t
+TYPE = const(29)
\ No newline at end of file
diff --git a/src/trezor/messages/GetEntropy.py b/src/trezor/messages/GetEntropy.py
index 8ad6f77931..82680a4f3b 100644
--- a/src/trezor/messages/GetEntropy.py
+++ b/src/trezor/messages/GetEntropy.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'size', p.UVarintType, flags=p.FLAG_REQUIRED)
-GetEntropy = t
\ No newline at end of file
+GetEntropy = t
+TYPE = const(9)
\ No newline at end of file
diff --git a/src/trezor/messages/GetFeatures.py b/src/trezor/messages/GetFeatures.py
index 832f6ae96e..1a34417fcc 100644
--- a/src/trezor/messages/GetFeatures.py
+++ b/src/trezor/messages/GetFeatures.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-GetFeatures = t
\ No newline at end of file
+GetFeatures = t
+TYPE = const(55)
\ No newline at end of file
diff --git a/src/trezor/messages/GetPublicKey.py b/src/trezor/messages/GetPublicKey.py
index d53ff83217..460e9ac391 100644
--- a/src/trezor/messages/GetPublicKey.py
+++ b/src/trezor/messages/GetPublicKey.py
@@ -4,4 +4,5 @@ t = p.MessageType()
 t.add_field(1, 'address_n', p.UVarintType, flags=p.FLAG_REPEATED)
 t.add_field(2, 'ecdsa_curve_name', p.UnicodeType)
 t.add_field(3, 'show_display', p.BoolType)
-GetPublicKey = t
\ No newline at end of file
+GetPublicKey = t
+TYPE = const(11)
\ No newline at end of file
diff --git a/src/trezor/messages/Initialize.py b/src/trezor/messages/Initialize.py
index b16c7bf2ca..abb16993cb 100644
--- a/src/trezor/messages/Initialize.py
+++ b/src/trezor/messages/Initialize.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-Initialize = t
\ No newline at end of file
+Initialize = t
+TYPE = const(0)
\ No newline at end of file
diff --git a/src/trezor/messages/LoadDevice.py b/src/trezor/messages/LoadDevice.py
index 9520fdad29..4c24d90683 100644
--- a/src/trezor/messages/LoadDevice.py
+++ b/src/trezor/messages/LoadDevice.py
@@ -9,4 +9,5 @@ t.add_field(4, 'passphrase_protection', p.BoolType)
 t.add_field(5, 'language', p.UnicodeType, default=u'english')
 t.add_field(6, 'label', p.UnicodeType)
 t.add_field(7, 'skip_checksum', p.BoolType)
-LoadDevice = t
\ No newline at end of file
+LoadDevice = t
+TYPE = const(13)
\ No newline at end of file
diff --git a/src/trezor/messages/MessageSignature.py b/src/trezor/messages/MessageSignature.py
index 86e5b5672d..3cf63638fb 100644
--- a/src/trezor/messages/MessageSignature.py
+++ b/src/trezor/messages/MessageSignature.py
@@ -3,4 +3,5 @@ from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'address', p.UnicodeType)
 t.add_field(2, 'signature', p.BytesType)
-MessageSignature = t
\ No newline at end of file
+MessageSignature = t
+TYPE = const(40)
\ No newline at end of file
diff --git a/src/trezor/messages/PassphraseAck.py b/src/trezor/messages/PassphraseAck.py
index b7243735ae..60517976ff 100644
--- a/src/trezor/messages/PassphraseAck.py
+++ b/src/trezor/messages/PassphraseAck.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'passphrase', p.UnicodeType, flags=p.FLAG_REQUIRED)
-PassphraseAck = t
\ No newline at end of file
+PassphraseAck = t
+TYPE = const(42)
\ No newline at end of file
diff --git a/src/trezor/messages/PassphraseRequest.py b/src/trezor/messages/PassphraseRequest.py
index 31bb730223..8d3e357ba7 100644
--- a/src/trezor/messages/PassphraseRequest.py
+++ b/src/trezor/messages/PassphraseRequest.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-PassphraseRequest = t
\ No newline at end of file
+PassphraseRequest = t
+TYPE = const(41)
\ No newline at end of file
diff --git a/src/trezor/messages/PinMatrixAck.py b/src/trezor/messages/PinMatrixAck.py
index c01dfb0746..b0aef5c6d1 100644
--- a/src/trezor/messages/PinMatrixAck.py
+++ b/src/trezor/messages/PinMatrixAck.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'pin', p.UnicodeType, flags=p.FLAG_REQUIRED)
-PinMatrixAck = t
\ No newline at end of file
+PinMatrixAck = t
+TYPE = const(19)
\ No newline at end of file
diff --git a/src/trezor/messages/PinMatrixRequest.py b/src/trezor/messages/PinMatrixRequest.py
index 0036e84f92..09660957a1 100644
--- a/src/trezor/messages/PinMatrixRequest.py
+++ b/src/trezor/messages/PinMatrixRequest.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'type', p.UVarintType)
-PinMatrixRequest = t
\ No newline at end of file
+PinMatrixRequest = t
+TYPE = const(18)
\ No newline at end of file
diff --git a/src/trezor/messages/Ping.py b/src/trezor/messages/Ping.py
index 694459e05e..78c82112e1 100644
--- a/src/trezor/messages/Ping.py
+++ b/src/trezor/messages/Ping.py
@@ -5,4 +5,5 @@ t.add_field(1, 'message', p.UnicodeType)
 t.add_field(2, 'button_protection', p.BoolType)
 t.add_field(3, 'pin_protection', p.BoolType)
 t.add_field(4, 'passphrase_protection', p.BoolType)
-Ping = t
\ No newline at end of file
+Ping = t
+TYPE = const(1)
\ No newline at end of file
diff --git a/src/trezor/messages/PublicKey.py b/src/trezor/messages/PublicKey.py
index 95655e83a3..a9d6fa6baf 100644
--- a/src/trezor/messages/PublicKey.py
+++ b/src/trezor/messages/PublicKey.py
@@ -4,4 +4,5 @@ from .HDNodeType import HDNodeType
 t = p.MessageType()
 t.add_field(1, 'node', p.EmbeddedMessage(HDNodeType), flags=p.FLAG_REQUIRED)
 t.add_field(2, 'xpub', p.UnicodeType)
-PublicKey = t
\ No newline at end of file
+PublicKey = t
+TYPE = const(12)
\ No newline at end of file
diff --git a/src/trezor/messages/RecoveryDevice.py b/src/trezor/messages/RecoveryDevice.py
index 652c7956d8..c250b997a9 100644
--- a/src/trezor/messages/RecoveryDevice.py
+++ b/src/trezor/messages/RecoveryDevice.py
@@ -7,4 +7,5 @@ t.add_field(3, 'pin_protection', p.BoolType)
 t.add_field(4, 'language', p.UnicodeType, default=u'english')
 t.add_field(5, 'label', p.UnicodeType)
 t.add_field(6, 'enforce_wordlist', p.BoolType)
-RecoveryDevice = t
\ No newline at end of file
+RecoveryDevice = t
+TYPE = const(45)
\ No newline at end of file
diff --git a/src/trezor/messages/ResetDevice.py b/src/trezor/messages/ResetDevice.py
index bd41752eb0..53d63d84fe 100644
--- a/src/trezor/messages/ResetDevice.py
+++ b/src/trezor/messages/ResetDevice.py
@@ -7,4 +7,5 @@ t.add_field(3, 'passphrase_protection', p.BoolType)
 t.add_field(4, 'pin_protection', p.BoolType)
 t.add_field(5, 'language', p.UnicodeType, default=u'english')
 t.add_field(6, 'label', p.UnicodeType)
-ResetDevice = t
\ No newline at end of file
+ResetDevice = t
+TYPE = const(14)
\ No newline at end of file
diff --git a/src/trezor/messages/SignIdentity.py b/src/trezor/messages/SignIdentity.py
index 7c1fd5a52a..ed3e1157e3 100644
--- a/src/trezor/messages/SignIdentity.py
+++ b/src/trezor/messages/SignIdentity.py
@@ -6,4 +6,5 @@ t.add_field(1, 'identity', p.EmbeddedMessage(IdentityType))
 t.add_field(2, 'challenge_hidden', p.BytesType)
 t.add_field(3, 'challenge_visual', p.UnicodeType)
 t.add_field(4, 'ecdsa_curve_name', p.UnicodeType)
-SignIdentity = t
\ No newline at end of file
+SignIdentity = t
+TYPE = const(53)
\ No newline at end of file
diff --git a/src/trezor/messages/SignMessage.py b/src/trezor/messages/SignMessage.py
index 9d76fbbc9d..361006e4d2 100644
--- a/src/trezor/messages/SignMessage.py
+++ b/src/trezor/messages/SignMessage.py
@@ -4,4 +4,5 @@ t = p.MessageType()
 t.add_field(1, 'address_n', p.UVarintType, flags=p.FLAG_REPEATED)
 t.add_field(2, 'message', p.BytesType, flags=p.FLAG_REQUIRED)
 t.add_field(3, 'coin_name', p.UnicodeType, default=u'Bitcoin')
-SignMessage = t
\ No newline at end of file
+SignMessage = t
+TYPE = const(38)
\ No newline at end of file
diff --git a/src/trezor/messages/SignTx.py b/src/trezor/messages/SignTx.py
index ac87451328..60998b86a6 100644
--- a/src/trezor/messages/SignTx.py
+++ b/src/trezor/messages/SignTx.py
@@ -6,4 +6,5 @@ t.add_field(2, 'inputs_count', p.UVarintType, flags=p.FLAG_REQUIRED)
 t.add_field(3, 'coin_name', p.UnicodeType, default=u'Bitcoin')
 t.add_field(4, 'version', p.UVarintType, default=1)
 t.add_field(5, 'lock_time', p.UVarintType, default=0)
-SignTx = t
\ No newline at end of file
+SignTx = t
+TYPE = const(15)
\ No newline at end of file
diff --git a/src/trezor/messages/SignedIdentity.py b/src/trezor/messages/SignedIdentity.py
index 0afbd4d2b9..fd3b49963b 100644
--- a/src/trezor/messages/SignedIdentity.py
+++ b/src/trezor/messages/SignedIdentity.py
@@ -4,4 +4,5 @@ t = p.MessageType()
 t.add_field(1, 'address', p.UnicodeType)
 t.add_field(2, 'public_key', p.BytesType)
 t.add_field(3, 'signature', p.BytesType)
-SignedIdentity = t
\ No newline at end of file
+SignedIdentity = t
+TYPE = const(54)
\ No newline at end of file
diff --git a/src/trezor/messages/SimpleSignTx.py b/src/trezor/messages/SimpleSignTx.py
index b114604792..7879c9d1ff 100644
--- a/src/trezor/messages/SimpleSignTx.py
+++ b/src/trezor/messages/SimpleSignTx.py
@@ -10,4 +10,5 @@ t.add_field(3, 'transactions', p.EmbeddedMessage(TransactionType), flags=p.FLAG_
 t.add_field(4, 'coin_name', p.UnicodeType, default=u'Bitcoin')
 t.add_field(5, 'version', p.UVarintType, default=1)
 t.add_field(6, 'lock_time', p.UVarintType, default=0)
-SimpleSignTx = t
\ No newline at end of file
+SimpleSignTx = t
+TYPE = const(16)
\ No newline at end of file
diff --git a/src/trezor/messages/Success.py b/src/trezor/messages/Success.py
index 393d8a3741..a795d8c23c 100644
--- a/src/trezor/messages/Success.py
+++ b/src/trezor/messages/Success.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'message', p.UnicodeType)
-Success = t
\ No newline at end of file
+Success = t
+TYPE = const(2)
\ No newline at end of file
diff --git a/src/trezor/messages/TxAck.py b/src/trezor/messages/TxAck.py
index e5f0a28b33..2e1c883806 100644
--- a/src/trezor/messages/TxAck.py
+++ b/src/trezor/messages/TxAck.py
@@ -3,4 +3,5 @@ from protobuf import protobuf as p
 from .TransactionType import TransactionType
 t = p.MessageType()
 t.add_field(1, 'tx', p.EmbeddedMessage(TransactionType))
-TxAck = t
\ No newline at end of file
+TxAck = t
+TYPE = const(22)
\ No newline at end of file
diff --git a/src/trezor/messages/TxRequest.py b/src/trezor/messages/TxRequest.py
index 997e029945..88714842d0 100644
--- a/src/trezor/messages/TxRequest.py
+++ b/src/trezor/messages/TxRequest.py
@@ -6,4 +6,5 @@ t = p.MessageType()
 t.add_field(1, 'request_type', p.UVarintType)
 t.add_field(2, 'details', p.EmbeddedMessage(TxRequestDetailsType))
 t.add_field(3, 'serialized', p.EmbeddedMessage(TxRequestSerializedType))
-TxRequest = t
\ No newline at end of file
+TxRequest = t
+TYPE = const(21)
\ No newline at end of file
diff --git a/src/trezor/messages/TxSize.py b/src/trezor/messages/TxSize.py
index 57a5d9dba1..95e7cbaa20 100644
--- a/src/trezor/messages/TxSize.py
+++ b/src/trezor/messages/TxSize.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'tx_size', p.UVarintType)
-TxSize = t
\ No newline at end of file
+TxSize = t
+TYPE = const(44)
\ No newline at end of file
diff --git a/src/trezor/messages/VerifyMessage.py b/src/trezor/messages/VerifyMessage.py
index bb84a709ef..4722d4a3b4 100644
--- a/src/trezor/messages/VerifyMessage.py
+++ b/src/trezor/messages/VerifyMessage.py
@@ -4,4 +4,5 @@ t = p.MessageType()
 t.add_field(1, 'address', p.UnicodeType)
 t.add_field(2, 'signature', p.BytesType)
 t.add_field(3, 'message', p.BytesType)
-VerifyMessage = t
\ No newline at end of file
+VerifyMessage = t
+TYPE = const(39)
\ No newline at end of file
diff --git a/src/trezor/messages/WipeDevice.py b/src/trezor/messages/WipeDevice.py
index 0e82aa7451..3632bc1c4e 100644
--- a/src/trezor/messages/WipeDevice.py
+++ b/src/trezor/messages/WipeDevice.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-WipeDevice = t
\ No newline at end of file
+WipeDevice = t
+TYPE = const(5)
\ No newline at end of file
diff --git a/src/trezor/messages/WordAck.py b/src/trezor/messages/WordAck.py
index 10877b254e..ff4e5ff0c4 100644
--- a/src/trezor/messages/WordAck.py
+++ b/src/trezor/messages/WordAck.py
@@ -2,4 +2,5 @@
 from protobuf import protobuf as p
 t = p.MessageType()
 t.add_field(1, 'word', p.UnicodeType, flags=p.FLAG_REQUIRED)
-WordAck = t
\ No newline at end of file
+WordAck = t
+TYPE = const(47)
\ No newline at end of file
diff --git a/src/trezor/messages/WordRequest.py b/src/trezor/messages/WordRequest.py
index 59ddba25df..d741bf617e 100644
--- a/src/trezor/messages/WordRequest.py
+++ b/src/trezor/messages/WordRequest.py
@@ -1,4 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-WordRequest = t
\ No newline at end of file
+WordRequest = t
+TYPE = const(46)
\ No newline at end of file