diff --git a/src/trezor/messages/Address.py b/src/trezor/messages/Address.py
index 447607108..48566bb1a 100644
--- a/src/trezor/messages/Address.py
+++ b/src/trezor/messages/Address.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 30
 t.add_field(1, 'address', p.UnicodeType, flags=p.FLAG_REQUIRED)
-Address = t
-TYPE = const(30)
\ No newline at end of file
+Address = t
\ No newline at end of file
diff --git a/src/trezor/messages/ApplySettings.py b/src/trezor/messages/ApplySettings.py
index b4e858f7e..c54332c28 100644
--- a/src/trezor/messages/ApplySettings.py
+++ b/src/trezor/messages/ApplySettings.py
@@ -1,9 +1,9 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 25
 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
-TYPE = const(25)
\ No newline at end of file
+ApplySettings = t
\ No newline at end of file
diff --git a/src/trezor/messages/ButtonAck.py b/src/trezor/messages/ButtonAck.py
index 96a8168e2..aba4d745e 100644
--- a/src/trezor/messages/ButtonAck.py
+++ b/src/trezor/messages/ButtonAck.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-ButtonAck = t
-TYPE = const(27)
\ No newline at end of file
+t.wire_type = 27
+ButtonAck = t
\ No newline at end of file
diff --git a/src/trezor/messages/ButtonRequest.py b/src/trezor/messages/ButtonRequest.py
index c197a7e03..99fc74105 100644
--- a/src/trezor/messages/ButtonRequest.py
+++ b/src/trezor/messages/ButtonRequest.py
@@ -1,7 +1,7 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 26
 t.add_field(1, 'code', p.UVarintType)
 t.add_field(2, 'data', p.UnicodeType)
-ButtonRequest = t
-TYPE = const(26)
\ No newline at end of file
+ButtonRequest = t
\ No newline at end of file
diff --git a/src/trezor/messages/Cancel.py b/src/trezor/messages/Cancel.py
index 24e780e83..2acf3925d 100644
--- a/src/trezor/messages/Cancel.py
+++ b/src/trezor/messages/Cancel.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-Cancel = t
-TYPE = const(20)
\ No newline at end of file
+t.wire_type = 20
+Cancel = t
\ No newline at end of file
diff --git a/src/trezor/messages/ChangePin.py b/src/trezor/messages/ChangePin.py
index da986e103..731b9a9af 100644
--- a/src/trezor/messages/ChangePin.py
+++ b/src/trezor/messages/ChangePin.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 4
 t.add_field(1, 'remove', p.BoolType)
-ChangePin = t
-TYPE = const(4)
\ No newline at end of file
+ChangePin = t
\ No newline at end of file
diff --git a/src/trezor/messages/CipherKeyValue.py b/src/trezor/messages/CipherKeyValue.py
index f049eed61..92672b67c 100644
--- a/src/trezor/messages/CipherKeyValue.py
+++ b/src/trezor/messages/CipherKeyValue.py
@@ -1,6 +1,7 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 23
 t.add_field(1, 'address_n', p.UVarintType, flags=p.FLAG_REPEATED)
 t.add_field(2, 'key', p.UnicodeType)
 t.add_field(3, 'value', p.BytesType)
@@ -8,5 +9,4 @@ 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
-TYPE = const(23)
\ No newline at end of file
+CipherKeyValue = t
\ No newline at end of file
diff --git a/src/trezor/messages/CipheredKeyValue.py b/src/trezor/messages/CipheredKeyValue.py
index e3c28951a..07aa33ceb 100644
--- a/src/trezor/messages/CipheredKeyValue.py
+++ b/src/trezor/messages/CipheredKeyValue.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 48
 t.add_field(1, 'value', p.BytesType)
-CipheredKeyValue = t
-TYPE = const(48)
\ No newline at end of file
+CipheredKeyValue = t
\ No newline at end of file
diff --git a/src/trezor/messages/ClearSession.py b/src/trezor/messages/ClearSession.py
index 8cd300f63..bda1158d9 100644
--- a/src/trezor/messages/ClearSession.py
+++ b/src/trezor/messages/ClearSession.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-ClearSession = t
-TYPE = const(24)
\ No newline at end of file
+t.wire_type = 24
+ClearSession = t
\ No newline at end of file
diff --git a/src/trezor/messages/CoinType.py b/src/trezor/messages/CoinType.py
index 415d530c4..cf948381b 100644
--- a/src/trezor/messages/CoinType.py
+++ b/src/trezor/messages/CoinType.py
@@ -6,4 +6,7 @@ t.add_field(2, 'coin_shortcut', p.UnicodeType)
 t.add_field(3, 'address_type', p.UVarintType, default=0)
 t.add_field(4, 'maxfee_kb', p.UVarintType)
 t.add_field(5, 'address_type_p2sh', p.UVarintType, default=5)
+t.add_field(6, 'address_type_p2wpkh', p.UVarintType, default=6)
+t.add_field(7, 'address_type_p2wsh', p.UVarintType, default=10)
+t.add_field(8, 'signed_message_header', p.UnicodeType)
 CoinType = t
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkDecision.py b/src/trezor/messages/DebugLinkDecision.py
index a8ba67e98..e0625eb67 100644
--- a/src/trezor/messages/DebugLinkDecision.py
+++ b/src/trezor/messages/DebugLinkDecision.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 100
 t.add_field(1, 'yes_no', p.BoolType, flags=p.FLAG_REQUIRED)
-DebugLinkDecision = t
-TYPE = const(100)
\ No newline at end of file
+DebugLinkDecision = t
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkGetState.py b/src/trezor/messages/DebugLinkGetState.py
index 1727793d9..79d07eb47 100644
--- a/src/trezor/messages/DebugLinkGetState.py
+++ b/src/trezor/messages/DebugLinkGetState.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-DebugLinkGetState = t
-TYPE = const(101)
\ No newline at end of file
+t.wire_type = 101
+DebugLinkGetState = t
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkLog.py b/src/trezor/messages/DebugLinkLog.py
index 78e692633..1533d9b3a 100644
--- a/src/trezor/messages/DebugLinkLog.py
+++ b/src/trezor/messages/DebugLinkLog.py
@@ -1,8 +1,8 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 104
 t.add_field(1, 'level', p.UVarintType)
 t.add_field(2, 'bucket', p.UnicodeType)
 t.add_field(3, 'text', p.UnicodeType)
-DebugLinkLog = t
-TYPE = const(104)
\ No newline at end of file
+DebugLinkLog = t
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkState.py b/src/trezor/messages/DebugLinkState.py
index c4a05e064..311de0657 100644
--- a/src/trezor/messages/DebugLinkState.py
+++ b/src/trezor/messages/DebugLinkState.py
@@ -2,6 +2,7 @@
 from protobuf import protobuf as p
 from .HDNodeType import HDNodeType
 t = p.MessageType()
+t.wire_type = 102
 t.add_field(1, 'layout', p.BytesType)
 t.add_field(2, 'pin', p.UnicodeType)
 t.add_field(3, 'matrix', p.UnicodeType)
@@ -12,5 +13,4 @@ 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
-TYPE = const(102)
\ No newline at end of file
+DebugLinkState = t
\ No newline at end of file
diff --git a/src/trezor/messages/DebugLinkStop.py b/src/trezor/messages/DebugLinkStop.py
index 0a59abc1b..3d3a59c64 100644
--- a/src/trezor/messages/DebugLinkStop.py
+++ b/src/trezor/messages/DebugLinkStop.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-DebugLinkStop = t
-TYPE = const(103)
\ No newline at end of file
+t.wire_type = 103
+DebugLinkStop = t
\ No newline at end of file
diff --git a/src/trezor/messages/DecryptMessage.py b/src/trezor/messages/DecryptMessage.py
index dac3baf04..f5b2504c5 100644
--- a/src/trezor/messages/DecryptMessage.py
+++ b/src/trezor/messages/DecryptMessage.py
@@ -1,9 +1,9 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 51
 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
-TYPE = const(51)
\ No newline at end of file
+DecryptMessage = t
\ No newline at end of file
diff --git a/src/trezor/messages/DecryptedMessage.py b/src/trezor/messages/DecryptedMessage.py
index bc6bf5859..52b786fcb 100644
--- a/src/trezor/messages/DecryptedMessage.py
+++ b/src/trezor/messages/DecryptedMessage.py
@@ -1,7 +1,7 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 52
 t.add_field(1, 'message', p.BytesType)
 t.add_field(2, 'address', p.UnicodeType)
-DecryptedMessage = t
-TYPE = const(52)
\ No newline at end of file
+DecryptedMessage = t
\ No newline at end of file
diff --git a/src/trezor/messages/EncryptMessage.py b/src/trezor/messages/EncryptMessage.py
index 11db2ab93..01a56c739 100644
--- a/src/trezor/messages/EncryptMessage.py
+++ b/src/trezor/messages/EncryptMessage.py
@@ -1,10 +1,10 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 49
 t.add_field(1, 'pubkey', p.BytesType)
 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
-TYPE = const(49)
\ No newline at end of file
+EncryptMessage = t
\ No newline at end of file
diff --git a/src/trezor/messages/EncryptedMessage.py b/src/trezor/messages/EncryptedMessage.py
index 69d9b71cb..5b3b73b58 100644
--- a/src/trezor/messages/EncryptedMessage.py
+++ b/src/trezor/messages/EncryptedMessage.py
@@ -1,8 +1,8 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 50
 t.add_field(1, 'nonce', p.BytesType)
 t.add_field(2, 'message', p.BytesType)
 t.add_field(3, 'hmac', p.BytesType)
-EncryptedMessage = t
-TYPE = const(50)
\ No newline at end of file
+EncryptedMessage = t
\ No newline at end of file
diff --git a/src/trezor/messages/Entropy.py b/src/trezor/messages/Entropy.py
index 0bb76a3e8..65b0f10e1 100644
--- a/src/trezor/messages/Entropy.py
+++ b/src/trezor/messages/Entropy.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 10
 t.add_field(1, 'entropy', p.BytesType, flags=p.FLAG_REQUIRED)
-Entropy = t
-TYPE = const(10)
\ No newline at end of file
+Entropy = t
\ No newline at end of file
diff --git a/src/trezor/messages/EntropyAck.py b/src/trezor/messages/EntropyAck.py
index f0830a0ac..89bea8da9 100644
--- a/src/trezor/messages/EntropyAck.py
+++ b/src/trezor/messages/EntropyAck.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 36
 t.add_field(1, 'entropy', p.BytesType)
-EntropyAck = t
-TYPE = const(36)
\ No newline at end of file
+EntropyAck = t
\ No newline at end of file
diff --git a/src/trezor/messages/EntropyRequest.py b/src/trezor/messages/EntropyRequest.py
index d413b9c57..a214673d0 100644
--- a/src/trezor/messages/EntropyRequest.py
+++ b/src/trezor/messages/EntropyRequest.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-EntropyRequest = t
-TYPE = const(35)
\ No newline at end of file
+t.wire_type = 35
+EntropyRequest = t
\ No newline at end of file
diff --git a/src/trezor/messages/EstimateTxSize.py b/src/trezor/messages/EstimateTxSize.py
index a0bd90d4a..1075c653a 100644
--- a/src/trezor/messages/EstimateTxSize.py
+++ b/src/trezor/messages/EstimateTxSize.py
@@ -1,8 +1,8 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 43
 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
-TYPE = const(43)
\ No newline at end of file
+EstimateTxSize = t
\ No newline at end of file
diff --git a/src/trezor/messages/Failure.py b/src/trezor/messages/Failure.py
index 187545d06..9da3d6ae7 100644
--- a/src/trezor/messages/Failure.py
+++ b/src/trezor/messages/Failure.py
@@ -1,7 +1,7 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 3
 t.add_field(1, 'code', p.UVarintType)
 t.add_field(2, 'message', p.UnicodeType)
-Failure = t
-TYPE = const(3)
\ No newline at end of file
+Failure = t
\ No newline at end of file
diff --git a/src/trezor/messages/Features.py b/src/trezor/messages/Features.py
index 176328dcf..b529670a9 100644
--- a/src/trezor/messages/Features.py
+++ b/src/trezor/messages/Features.py
@@ -2,6 +2,7 @@
 from protobuf import protobuf as p
 from .CoinType import CoinType
 t = p.MessageType()
+t.wire_type = 17
 t.add_field(1, 'vendor', p.UnicodeType)
 t.add_field(2, 'major_version', p.UVarintType)
 t.add_field(3, 'minor_version', p.UVarintType)
@@ -19,5 +20,4 @@ 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
-TYPE = const(17)
\ No newline at end of file
+Features = t
\ No newline at end of file
diff --git a/src/trezor/messages/FirmwareErase.py b/src/trezor/messages/FirmwareErase.py
index b25b61de2..460484458 100644
--- a/src/trezor/messages/FirmwareErase.py
+++ b/src/trezor/messages/FirmwareErase.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-FirmwareErase = t
-TYPE = const(6)
\ No newline at end of file
+t.wire_type = 6
+FirmwareErase = t
\ No newline at end of file
diff --git a/src/trezor/messages/FirmwareUpload.py b/src/trezor/messages/FirmwareUpload.py
index c58192d6e..2f7855494 100644
--- a/src/trezor/messages/FirmwareUpload.py
+++ b/src/trezor/messages/FirmwareUpload.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 7
 t.add_field(1, 'payload', p.BytesType, flags=p.FLAG_REQUIRED)
-FirmwareUpload = t
-TYPE = const(7)
\ No newline at end of file
+FirmwareUpload = t
\ No newline at end of file
diff --git a/src/trezor/messages/GetAddress.py b/src/trezor/messages/GetAddress.py
index 2dd03733f..b0a81785f 100644
--- a/src/trezor/messages/GetAddress.py
+++ b/src/trezor/messages/GetAddress.py
@@ -2,9 +2,9 @@
 from protobuf import protobuf as p
 from .MultisigRedeemScriptType import MultisigRedeemScriptType
 t = p.MessageType()
+t.wire_type = 29
 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
-TYPE = const(29)
\ No newline at end of file
+GetAddress = t
\ No newline at end of file
diff --git a/src/trezor/messages/GetEntropy.py b/src/trezor/messages/GetEntropy.py
index 82680a4f3..d63c1d273 100644
--- a/src/trezor/messages/GetEntropy.py
+++ b/src/trezor/messages/GetEntropy.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 9
 t.add_field(1, 'size', p.UVarintType, flags=p.FLAG_REQUIRED)
-GetEntropy = t
-TYPE = const(9)
\ No newline at end of file
+GetEntropy = t
\ No newline at end of file
diff --git a/src/trezor/messages/GetFeatures.py b/src/trezor/messages/GetFeatures.py
index 1a34417fc..baf70c990 100644
--- a/src/trezor/messages/GetFeatures.py
+++ b/src/trezor/messages/GetFeatures.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-GetFeatures = t
-TYPE = const(55)
\ No newline at end of file
+t.wire_type = 55
+GetFeatures = t
\ No newline at end of file
diff --git a/src/trezor/messages/GetPublicKey.py b/src/trezor/messages/GetPublicKey.py
index 460e9ac39..f146e8b3c 100644
--- a/src/trezor/messages/GetPublicKey.py
+++ b/src/trezor/messages/GetPublicKey.py
@@ -1,8 +1,8 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 11
 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
-TYPE = const(11)
\ No newline at end of file
+GetPublicKey = t
\ No newline at end of file
diff --git a/src/trezor/messages/Initialize.py b/src/trezor/messages/Initialize.py
index abb16993c..7a220ead4 100644
--- a/src/trezor/messages/Initialize.py
+++ b/src/trezor/messages/Initialize.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-Initialize = t
-TYPE = const(0)
\ No newline at end of file
+t.wire_type = 0
+Initialize = t
\ No newline at end of file
diff --git a/src/trezor/messages/LoadDevice.py b/src/trezor/messages/LoadDevice.py
index 4c24d9068..f0e79a5fa 100644
--- a/src/trezor/messages/LoadDevice.py
+++ b/src/trezor/messages/LoadDevice.py
@@ -2,6 +2,7 @@
 from protobuf import protobuf as p
 from .HDNodeType import HDNodeType
 t = p.MessageType()
+t.wire_type = 13
 t.add_field(1, 'mnemonic', p.UnicodeType)
 t.add_field(2, 'node', p.EmbeddedMessage(HDNodeType))
 t.add_field(3, 'pin', p.UnicodeType)
@@ -9,5 +10,4 @@ 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
-TYPE = const(13)
\ No newline at end of file
+LoadDevice = t
\ No newline at end of file
diff --git a/src/trezor/messages/MessageSignature.py b/src/trezor/messages/MessageSignature.py
index 3cf63638f..92a27ebd0 100644
--- a/src/trezor/messages/MessageSignature.py
+++ b/src/trezor/messages/MessageSignature.py
@@ -1,7 +1,7 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 40
 t.add_field(1, 'address', p.UnicodeType)
 t.add_field(2, 'signature', p.BytesType)
-MessageSignature = t
-TYPE = const(40)
\ No newline at end of file
+MessageSignature = t
\ No newline at end of file
diff --git a/src/trezor/messages/PassphraseAck.py b/src/trezor/messages/PassphraseAck.py
index 60517976f..df9cbfb21 100644
--- a/src/trezor/messages/PassphraseAck.py
+++ b/src/trezor/messages/PassphraseAck.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 42
 t.add_field(1, 'passphrase', p.UnicodeType, flags=p.FLAG_REQUIRED)
-PassphraseAck = t
-TYPE = const(42)
\ No newline at end of file
+PassphraseAck = t
\ No newline at end of file
diff --git a/src/trezor/messages/PassphraseRequest.py b/src/trezor/messages/PassphraseRequest.py
index 8d3e357ba..24ac7f001 100644
--- a/src/trezor/messages/PassphraseRequest.py
+++ b/src/trezor/messages/PassphraseRequest.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-PassphraseRequest = t
-TYPE = const(41)
\ No newline at end of file
+t.wire_type = 41
+PassphraseRequest = t
\ No newline at end of file
diff --git a/src/trezor/messages/PinMatrixAck.py b/src/trezor/messages/PinMatrixAck.py
index b0aef5c6d..224651319 100644
--- a/src/trezor/messages/PinMatrixAck.py
+++ b/src/trezor/messages/PinMatrixAck.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 19
 t.add_field(1, 'pin', p.UnicodeType, flags=p.FLAG_REQUIRED)
-PinMatrixAck = t
-TYPE = const(19)
\ No newline at end of file
+PinMatrixAck = t
\ No newline at end of file
diff --git a/src/trezor/messages/PinMatrixRequest.py b/src/trezor/messages/PinMatrixRequest.py
index 09660957a..fe3213f02 100644
--- a/src/trezor/messages/PinMatrixRequest.py
+++ b/src/trezor/messages/PinMatrixRequest.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 18
 t.add_field(1, 'type', p.UVarintType)
-PinMatrixRequest = t
-TYPE = const(18)
\ No newline at end of file
+PinMatrixRequest = t
\ No newline at end of file
diff --git a/src/trezor/messages/Ping.py b/src/trezor/messages/Ping.py
index 78c82112e..25bcb8879 100644
--- a/src/trezor/messages/Ping.py
+++ b/src/trezor/messages/Ping.py
@@ -1,9 +1,9 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 1
 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
-TYPE = const(1)
\ No newline at end of file
+Ping = t
\ No newline at end of file
diff --git a/src/trezor/messages/PublicKey.py b/src/trezor/messages/PublicKey.py
index a9d6fa6ba..16271b6fc 100644
--- a/src/trezor/messages/PublicKey.py
+++ b/src/trezor/messages/PublicKey.py
@@ -2,7 +2,7 @@
 from protobuf import protobuf as p
 from .HDNodeType import HDNodeType
 t = p.MessageType()
+t.wire_type = 12
 t.add_field(1, 'node', p.EmbeddedMessage(HDNodeType), flags=p.FLAG_REQUIRED)
 t.add_field(2, 'xpub', p.UnicodeType)
-PublicKey = t
-TYPE = const(12)
\ No newline at end of file
+PublicKey = t
\ No newline at end of file
diff --git a/src/trezor/messages/RecoveryDevice.py b/src/trezor/messages/RecoveryDevice.py
index c250b997a..d7c2c2be9 100644
--- a/src/trezor/messages/RecoveryDevice.py
+++ b/src/trezor/messages/RecoveryDevice.py
@@ -1,11 +1,11 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 45
 t.add_field(1, 'word_count', p.UVarintType)
 t.add_field(2, 'passphrase_protection', p.BoolType)
 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
-TYPE = const(45)
\ No newline at end of file
+RecoveryDevice = t
\ No newline at end of file
diff --git a/src/trezor/messages/ResetDevice.py b/src/trezor/messages/ResetDevice.py
index 53d63d84f..9ec1a8ce8 100644
--- a/src/trezor/messages/ResetDevice.py
+++ b/src/trezor/messages/ResetDevice.py
@@ -1,11 +1,11 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 14
 t.add_field(1, 'display_random', p.BoolType)
 t.add_field(2, 'strength', p.UVarintType, default=256)
 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
-TYPE = const(14)
\ No newline at end of file
+ResetDevice = t
\ No newline at end of file
diff --git a/src/trezor/messages/SignIdentity.py b/src/trezor/messages/SignIdentity.py
index ed3e1157e..ed7600046 100644
--- a/src/trezor/messages/SignIdentity.py
+++ b/src/trezor/messages/SignIdentity.py
@@ -2,9 +2,9 @@
 from protobuf import protobuf as p
 from .IdentityType import IdentityType
 t = p.MessageType()
+t.wire_type = 53
 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
-TYPE = const(53)
\ No newline at end of file
+SignIdentity = t
\ No newline at end of file
diff --git a/src/trezor/messages/SignMessage.py b/src/trezor/messages/SignMessage.py
index 361006e4d..4f004a45b 100644
--- a/src/trezor/messages/SignMessage.py
+++ b/src/trezor/messages/SignMessage.py
@@ -1,8 +1,8 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 38
 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
-TYPE = const(38)
\ No newline at end of file
+SignMessage = t
\ No newline at end of file
diff --git a/src/trezor/messages/SignTx.py b/src/trezor/messages/SignTx.py
index 60998b86a..1f4e0f92d 100644
--- a/src/trezor/messages/SignTx.py
+++ b/src/trezor/messages/SignTx.py
@@ -1,10 +1,10 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 15
 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')
 t.add_field(4, 'version', p.UVarintType, default=1)
 t.add_field(5, 'lock_time', p.UVarintType, default=0)
-SignTx = t
-TYPE = const(15)
\ No newline at end of file
+SignTx = t
\ No newline at end of file
diff --git a/src/trezor/messages/SignedIdentity.py b/src/trezor/messages/SignedIdentity.py
index fd3b49963..d76c980e4 100644
--- a/src/trezor/messages/SignedIdentity.py
+++ b/src/trezor/messages/SignedIdentity.py
@@ -1,8 +1,8 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 54
 t.add_field(1, 'address', p.UnicodeType)
 t.add_field(2, 'public_key', p.BytesType)
 t.add_field(3, 'signature', p.BytesType)
-SignedIdentity = t
-TYPE = const(54)
\ No newline at end of file
+SignedIdentity = t
\ No newline at end of file
diff --git a/src/trezor/messages/SimpleSignTx.py b/src/trezor/messages/SimpleSignTx.py
index 7879c9d1f..dfd1b28dd 100644
--- a/src/trezor/messages/SimpleSignTx.py
+++ b/src/trezor/messages/SimpleSignTx.py
@@ -4,11 +4,11 @@ from .TxInputType import TxInputType
 from .TxOutputType import TxOutputType
 from .TransactionType import TransactionType
 t = p.MessageType()
+t.wire_type = 16
 t.add_field(1, 'inputs', p.EmbeddedMessage(TxInputType), flags=p.FLAG_REPEATED)
 t.add_field(2, 'outputs', p.EmbeddedMessage(TxOutputType), flags=p.FLAG_REPEATED)
 t.add_field(3, 'transactions', p.EmbeddedMessage(TransactionType), flags=p.FLAG_REPEATED)
 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
-TYPE = const(16)
\ No newline at end of file
+SimpleSignTx = t
\ No newline at end of file
diff --git a/src/trezor/messages/Success.py b/src/trezor/messages/Success.py
index a795d8c23..ffa211e88 100644
--- a/src/trezor/messages/Success.py
+++ b/src/trezor/messages/Success.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 2
 t.add_field(1, 'message', p.UnicodeType)
-Success = t
-TYPE = const(2)
\ No newline at end of file
+Success = t
\ No newline at end of file
diff --git a/src/trezor/messages/TxAck.py b/src/trezor/messages/TxAck.py
index 2e1c88380..6ea46b8e1 100644
--- a/src/trezor/messages/TxAck.py
+++ b/src/trezor/messages/TxAck.py
@@ -2,6 +2,6 @@
 from protobuf import protobuf as p
 from .TransactionType import TransactionType
 t = p.MessageType()
+t.wire_type = 22
 t.add_field(1, 'tx', p.EmbeddedMessage(TransactionType))
-TxAck = t
-TYPE = const(22)
\ No newline at end of file
+TxAck = t
\ No newline at end of file
diff --git a/src/trezor/messages/TxRequest.py b/src/trezor/messages/TxRequest.py
index 88714842d..aa6756090 100644
--- a/src/trezor/messages/TxRequest.py
+++ b/src/trezor/messages/TxRequest.py
@@ -3,8 +3,8 @@ from protobuf import protobuf as p
 from .TxRequestDetailsType import TxRequestDetailsType
 from .TxRequestSerializedType import TxRequestSerializedType
 t = p.MessageType()
+t.wire_type = 21
 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
-TYPE = const(21)
\ No newline at end of file
+TxRequest = t
\ No newline at end of file
diff --git a/src/trezor/messages/TxSize.py b/src/trezor/messages/TxSize.py
index 95e7cbaa2..7963e6e28 100644
--- a/src/trezor/messages/TxSize.py
+++ b/src/trezor/messages/TxSize.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 44
 t.add_field(1, 'tx_size', p.UVarintType)
-TxSize = t
-TYPE = const(44)
\ No newline at end of file
+TxSize = t
\ No newline at end of file
diff --git a/src/trezor/messages/VerifyMessage.py b/src/trezor/messages/VerifyMessage.py
index 4722d4a3b..1547b94a9 100644
--- a/src/trezor/messages/VerifyMessage.py
+++ b/src/trezor/messages/VerifyMessage.py
@@ -1,8 +1,9 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 39
 t.add_field(1, 'address', p.UnicodeType)
 t.add_field(2, 'signature', p.BytesType)
 t.add_field(3, 'message', p.BytesType)
-VerifyMessage = t
-TYPE = const(39)
\ No newline at end of file
+t.add_field(4, 'coin_name', p.UnicodeType, default=u'Bitcoin')
+VerifyMessage = t
\ No newline at end of file
diff --git a/src/trezor/messages/WipeDevice.py b/src/trezor/messages/WipeDevice.py
index 3632bc1c4..f433d98a8 100644
--- a/src/trezor/messages/WipeDevice.py
+++ b/src/trezor/messages/WipeDevice.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-WipeDevice = t
-TYPE = const(5)
\ No newline at end of file
+t.wire_type = 5
+WipeDevice = t
\ No newline at end of file
diff --git a/src/trezor/messages/WordAck.py b/src/trezor/messages/WordAck.py
index ff4e5ff0c..92d84eece 100644
--- a/src/trezor/messages/WordAck.py
+++ b/src/trezor/messages/WordAck.py
@@ -1,6 +1,6 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
+t.wire_type = 47
 t.add_field(1, 'word', p.UnicodeType, flags=p.FLAG_REQUIRED)
-WordAck = t
-TYPE = const(47)
\ No newline at end of file
+WordAck = t
\ No newline at end of file
diff --git a/src/trezor/messages/WordRequest.py b/src/trezor/messages/WordRequest.py
index d741bf617..4771a9bf5 100644
--- a/src/trezor/messages/WordRequest.py
+++ b/src/trezor/messages/WordRequest.py
@@ -1,5 +1,5 @@
 # Automatically generated by pb2py
 from protobuf import protobuf as p
 t = p.MessageType()
-WordRequest = t
-TYPE = const(46)
\ No newline at end of file
+t.wire_type = 46
+WordRequest = t
\ No newline at end of file