Merge branch 'saleemrashid-pb2py-refactor' into upstream

tools/build_protobuf

@@ -1,32 +1,32 @@
 #!/bin/bash
-CURDIR=$(pwd)
+set -e
-PB2DIR=$CURDIR/pb2
-OUTDIR=../trezorlib/messages
-INDEX=$OUTDIR/__init__.py
 
-rm -f $OUTDIR/[A-Z]*.py
+cd "$(dirname "$0")"
-mkdir -p $OUTDIR
-mkdir -p $PB2DIR
-touch $PB2DIR/__init__.py
 
-rm -f $INDEX
+GENPATH="../trezorlib/messages"
-echo '# Automatically generated by pb2py' >> $INDEX
+INDEX="$GENPATH/__init__.py"
-echo 'from __future__ import absolute_import' >> $INDEX
+PROTO_PATH="../../trezor-common/protob"
-echo '' >> $INDEX
+PROTO_FILES="types messages"
+PB2_OUT="pb2"
 
-for i in types messages ; do
+rm -f "$GENPATH/[A-Z]*.py"
+mkdir -p "$GENPATH"
+
+cat > "$INDEX" << EOF
+# Automatically generated by pb2py
+
+EOF
+
+mkdir -p "$PB2_OUT"
+
+for file in $PROTO_FILES; do
     # Compile .proto files to python2 modules using google protobuf library
-    cd $CURDIR/../../trezor-common/protob
+    protoc --python_out="$PB2_OUT" -I/usr/include -I"$PROTO_PATH" "$PROTO_PATH/$file.proto"
-    protoc --python_out=$PB2DIR -I/usr/include -I. $i.proto
 done
 
-# hack to make output python 3 compatible
+for file in $PROTO_FILES; do
-sed -i 's/^import types_pb2/from . import types_pb2/g' $CURDIR/pb2/messages_pb2.py
-
-for i in types messages ; do
     # Convert google protobuf library to trezor's internal format
-    cd $CURDIR
+    ./pb2py -P "trezorlib.protobuf" -p "$PB2_OUT" -l "$INDEX" "$file" "$GENPATH"
-    ./pb2py -p $CURDIR -l $INDEX $i $OUTDIR
 done
 
-rm -rf $PB2DIR
+rm -rf "$PB2_OUT"

tools/pb2py

@@ -3,72 +3,78 @@
 # to plain-python objects as used in TREZOR Core and python-trezor
 
 import sys
+import importlib
 import os
 import argparse
 
-from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
+
+def import_pb2(name):
+    return importlib.import_module("%s_pb2" % name)
 
 
-def process_type(t, cls, msg_id, indexfile, is_upy):
+def create_message_import(name):
-    print("  * type %s" % t)
+    return "from .%s import %s" % (name, name)
+
+
+def create_const(name, value, is_upy):
+    if is_upy:
+        return "%s = const(%s)" % (name, value)
+    else:
+        return "%s = %s" % (name, value)
+
+
+def remove_from_start(s, prefix):
+    if s.startswith(prefix):
+        return s[len(prefix):]
+    else:
+        return s
+
+
+def process_message(descriptor, protobuf_module, msg_id, indexfile, is_upy):
+    print("  * type %s" % descriptor.name)
 
     imports = []
-    out = ["", "", "class %s(p.MessageType):" % t, ]
+    out = ["", "", "class %s(p.MessageType):" % descriptor.name, ]
 
-    if cls.DESCRIPTOR.fields_by_name:
+    if descriptor.fields_by_number:
         out.append("    FIELDS = {")
     elif msg_id is None:
         out.append("    pass")
 
-    for v in sorted(cls.DESCRIPTOR.fields_by_name.values(), key=lambda x: x.number):
+    for number, field in descriptor.fields_by_number.items():
-        number = v.number
+        field_name = field.name
-        fieldname = v.name
+        field_type = None
-        type = None
+        repeated = (field.label == field.LABEL_REPEATED)
-        repeated = v.label == 3
+        required = (field.label == field.LABEL_REQUIRED)
-        required = v.label == 2
 
-        # print v.has_default_value, v.default_value
+        types = {
-
+            field.TYPE_UINT64:  'p.UVarintType',
-        if v.type in (4, 13, 14):
+            field.TYPE_UINT32:  'p.UVarintType',
-            # TYPE_UINT64 = 4
+            field.TYPE_ENUM:    'p.UVarintType',
-            # TYPE_UINT32 = 13
+            field.TYPE_SINT32:  'p.Sint32Type',
-            # TYPE_ENUM = 14
+            field.TYPE_SINT64:  'p.Sint64Type',
-            type = 'p.UVarintType'
+            field.TYPE_STRING:  'p.UnicodeType',
-
+            field.TYPE_BOOL:    'p.BoolType',
-        elif v.type in (17,):
+            field.TYPE_BYTES:   'p.BytesType'
-            # TYPE_SINT32 = 17
+        }
-            type = 'p.Sint32Type'
-
-        elif v.type in (18,):
-            # TYPE_SINT64 = 18
-            type = 'p.Sint64Type'
-
-        elif v.type == 9:
-            # TYPE_STRING = 9
-            type = 'p.UnicodeType'
-
-        elif v.type == 8:
-            # TYPE_BOOL = 8
-            type = 'p.BoolType'
-
-        elif v.type == 12:
-            # TYPE_BYTES = 12
-            type = 'p.BytesType'
-
-        elif v.type == 11:
-            # TYPE_MESSAGE = 1
-            type = v.message_type.name
-            imports.append("from .%s import %s" %
-                           (v.message_type.name, v.message_type.name))
 
+        if field.type == field.TYPE_MESSAGE:
+            field_type = field.message_type.name
+            imports.append(create_message_import(field_type))
         else:
-            raise Exception("Unknown field type %s for field %s" %
+            try:
-                            (v.type, fieldname))
+                field_type = types[field.type]
+            except KeyError:
+                raise ValueError("Unknown field type %d for field %s" % (field.type, field_name))
 
+        comments = []
         if required:
-            comment = '  # required'
+            comments.append('required')
-        elif v.has_default_value:
+        if field.has_default_value:
-            comment = '  # default=%s' % repr(v.default_value)
+            comments.append("default=%s" % repr(field.default_value))
+
+        if comments:
+            comment = "  # %s" % ' '.join(comments)
         else:
             comment = ''
 
@@ -78,27 +84,15 @@ def process_type(t, cls, msg_id, indexfile, is_upy):
             flags = '0'
 
         out.append("        %d: ('%s', %s, %s),%s" %
-                   (number, fieldname, type, flags, comment))
+                   (number, field_name, field_type, flags, comment))
 
-        # print fieldname, number, type, repeated, comment
+    if descriptor.fields_by_name:
-        # print v.__dict__
-        # print v.CPPTYPE_STRING
-        # print v.LABEL_REPEATED
-        # print v.enum_type
-        # v.has_default_value, v.default_value
-        # v.label == 3 # repeated
-        # print v.number
-
-    if cls.DESCRIPTOR.fields_by_name:
         out.append("    }")
 
     if msg_id is not None:
         out.append("    MESSAGE_WIRE_TYPE = %d" % msg_id)
         if indexfile is not None:
-            if is_upy:
+            indexfile.write(create_const(t, msg_id, is_upy))
-                indexfile.write("%s = const(%d)\n" % (t, msg_id))
-            else:
-                indexfile.write("%s = %d\n" % (t, msg_id))
 
     # Remove duplicate imports
     imports = sorted(list(set(imports)))
@@ -106,73 +100,60 @@ def process_type(t, cls, msg_id, indexfile, is_upy):
     if is_upy:
         imports = ['import protobuf as p'] + imports
     else:
-        imports = ['from __future__ import absolute_import',
+        imports = ['from .. import protobuf as p'] + imports
-                   'from .. import protobuf as p'] + imports
 
     return imports + out
 
 
-def process_enum(t, cls, is_upy):
+def process_enum(descriptor, is_upy):
     out = []
 
     if is_upy:
         out += ("from micropython import const", "")
 
-    print("  * enum %s" % t)
+    print("  * enum %s" % descriptor.name)
 
-    for k, v in cls.items():
+    for name, value in descriptor.values_by_name.items():
         # Remove type name from the beginning of the constant
         # For example "PinMatrixRequestType_Current" -> "Current"
-        if k.startswith("%s_" % t):
+        enum_prefix = descriptor.name
-            k = k.replace("%s_" % t, '')
+        name = remove_from_start(name, "%s_" % enum_prefix)
 
         # If type ends with *Type, but constant use type name without *Type, remove it too :)
         # For example "ButtonRequestType & ButtonRequest_Other" => "Other"
-        if t.endswith("Type") and k.startswith("%s_" % t.replace("Type", '')):
+        if enum_prefix.endswith("Type"):
-            k = k.replace("%s_" % t.replace("Type", ''), '')
+            enum_prefix, _ = enum_prefix.rsplit("Type", 1)
+            name = remove_from_start(name, "%s_" % enum_prefix)
 
-        if is_upy:
+        out.append(create_const(name, value.number, is_upy))
-            out.append("%s = const(%s)" % (k, v))
-        else:
-            out.append("%s = %s" % (k, v))
 
     return out
 
 
-def find_msg_type(msg_types, t):
+def process_file(descriptor, protobuf_module, genpath, indexfile, modlist, is_upy):
-    for k, v in msg_types:
-        msg_name = k.replace('MessageType_', '')
-        if msg_name == t:
-            return v
 
+    print("Processing module %s" % descriptor.name)
 
-def process_module(mod, genpath, indexfile, modlist, is_upy):
+    msg_types = import_pb2('messages').MessageType
 
-    print("Processing module %s" % mod.__name__)
+    for name, message_descriptor in sorted(descriptor.message_types_by_name.items()):
-    types = dict([(name, cls)
-                  for name, cls in mod.__dict__.items() if isinstance(cls, type)])
-
-    msg_types = __import__('pb2', globals(), locals(), [
-                           'messages_pb2', ]).messages_pb2.MessageType.items()
-
-    for t, cls in sorted(types.items()):
         # Find message type for given class
-        msg_id = find_msg_type(msg_types, t)
+        try:
+            msg_id = msg_types.Value("MessageType_%s" % name)
+        except ValueError:
+            msg_id = None
 
-        out = process_type(t, cls, msg_id, indexfile, is_upy)
+        out = process_message(message_descriptor, protobuf_module, msg_id, indexfile, is_upy)
 
-        write_to_file(genpath, t, out)
+        write_to_file(genpath, name, out)
         if modlist:
-            modlist.write("from .%s import *\n" % t)
+            modlist.write(create_message_import(name) + "\n")
 
-    enums = dict([(name, cls) for name, cls in mod.__dict__.items()
+    for name, enum_descriptor in descriptor.enum_types_by_name.items():
-                  if isinstance(cls, EnumTypeWrapper)])
+        out = process_enum(enum_descriptor, is_upy)
-
+        write_to_file(genpath, name, out)
-    for t, cls in enums.items():
-        out = process_enum(t, cls, is_upy)
-        write_to_file(genpath, t, out)
         if modlist:
-            modlist.write("from . import %s\n" % t)
+            modlist.write("from . import %s\n" % name)
 
 
 def write_to_file(genpath, t, out):
@@ -188,29 +169,19 @@ def write_to_file(genpath, t, out):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument('modulename', type=str, help="Name of module to generate")
+    parser.add_argument('module', help="Name of module to generate")
-    parser.add_argument('genpath', type=str, help="Directory for generated source code")
+    parser.add_argument('genpath', help="Directory for generated source code")
-    parser.add_argument('-i', '--indexfile', type=str, help="[optional] Generate index file of wire types")
+    parser.add_argument('-P', '--protobuf-module', default="protobuf", help="Name of protobuf module")
-    parser.add_argument('-l', '--modlist', type=str, help="[optional] Generate list of modules")
+    parser.add_argument('-i', '--indexfile', type=argparse.FileType('a'), help="Generate index file of wire types")
-    parser.add_argument('-p', '--protopath', type=str, help="[optional] Path to search for pregenerated Google's python sources")
+    parser.add_argument('-l', '--modlist', type=argparse.FileType('a'), help="Generate list of modules")
+    parser.add_argument('-p', '--protopath', type=str, help="Path to search for pregenerated Google's python sources")
     parser.add_argument('-m', '--micropython', action='store_true', help="Use micropython-favoured source code")
     args = parser.parse_args()
 
-    if args.indexfile:
-        indexfile = open(args.indexfile, 'a')
-    else:
-        indexfile = None
-
-    if args.modlist:
-        modlist = open(args.modlist, 'a')
-    else:
-        modlist = None
-
     if args.protopath:
         sys.path.append(args.protopath)
 
-    # Dynamically load module from argv[1]
+    # This must be done after sys.path.append
-    tmp = __import__('pb2', globals(), locals(), ['%s_pb2' % args.modulename])
+    module = import_pb2(args.module)
-    mod = getattr(tmp, "%s_pb2" % args.modulename)
 
-    process_module(mod, args.genpath, indexfile, modlist, args.micropython)
+    process_file(module.DESCRIPTOR, args.protobuf_module, args.genpath, args.indexfile, args.modlist, args.micropython)

trezorlib/messages/Address.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ApplyFlags.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ApplySettings.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/BackupDevice.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ButtonAck.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ButtonRequest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/Cancel.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ChangePin.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/CipherKeyValue.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/CipheredKeyValue.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ClearSession.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/CoinType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/CosiCommit.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/CosiCommitment.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/CosiSign.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/CosiSignature.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkDecision.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkFlashErase.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkGetState.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkLog.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkMemory.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkMemoryRead.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkMemoryWrite.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DebugLinkState.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .HDNodeType import HDNodeType
 

trezorlib/messages/DebugLinkStop.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DecryptMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/DecryptedMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ECDHSessionKey.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EncryptMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EncryptedMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/Entropy.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EntropyAck.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EntropyRequest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EstimateTxSize.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumAddress.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumGetAddress.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumMessageSignature.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumSignMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumSignTx.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumTxAck.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumTxRequest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/EthereumVerifyMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/Failure.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/Features.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .CoinType import CoinType
 

trezorlib/messages/FirmwareErase.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/FirmwareRequest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/FirmwareUpload.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/GetAddress.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .MultisigRedeemScriptType import MultisigRedeemScriptType
 

trezorlib/messages/GetECDHSessionKey.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .IdentityType import IdentityType
 

trezorlib/messages/GetEntropy.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/GetFeatures.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/GetPublicKey.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/HDNodePathType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .HDNodeType import HDNodeType
 

trezorlib/messages/HDNodeType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/IdentityType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/Initialize.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/LoadDevice.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .HDNodeType import HDNodeType
 

trezorlib/messages/MessageSignature.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/MultisigRedeemScriptType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .HDNodePathType import HDNodePathType
 

trezorlib/messages/NEMAddress.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMAggregateModification.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .NEMCosignatoryModification import NEMCosignatoryModification
 

trezorlib/messages/NEMCosignatoryModification.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMDecryptMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMDecryptedMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMGetAddress.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMImportanceTransfer.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMMosaic.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMMosaicCreation.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .NEMMosaicDefinition import NEMMosaicDefinition
 

trezorlib/messages/NEMMosaicDefinition.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMMosaicSupplyChange.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMProvisionNamespace.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMSignTx.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .NEMAggregateModification import NEMAggregateModification
 from .NEMImportanceTransfer import NEMImportanceTransfer

trezorlib/messages/NEMSignedTx.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMTransactionCommon.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/NEMTransfer.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .NEMMosaic import NEMMosaic
 

trezorlib/messages/PassphraseAck.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/PassphraseRequest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/PassphraseStateAck.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/PassphraseStateRequest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/PinMatrixAck.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/PinMatrixRequest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/Ping.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/PublicKey.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .HDNodeType import HDNodeType
 

trezorlib/messages/RecoveryDevice.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/ResetDevice.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/SelfTest.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/SetU2FCounter.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/SignIdentity.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .IdentityType import IdentityType
 

trezorlib/messages/SignMessage.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/SignTx.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/SignedIdentity.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/SimpleSignTx.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .TransactionType import TransactionType
 from .TxInputType import TxInputType

trezorlib/messages/Success.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/TransactionType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .TxInputType import TxInputType
 from .TxOutputBinType import TxOutputBinType
@@ -11,8 +10,8 @@ class TransactionType(p.MessageType):
         1: ('version', p.UVarintType, 0),
         2: ('inputs', TxInputType, p.FLAG_REPEATED),
         3: ('bin_outputs', TxOutputBinType, p.FLAG_REPEATED),
-        4: ('lock_time', p.UVarintType, 0),
         5: ('outputs', TxOutputType, p.FLAG_REPEATED),
+        4: ('lock_time', p.UVarintType, 0),
         6: ('inputs_cnt', p.UVarintType, 0),
         7: ('outputs_cnt', p.UVarintType, 0),
         8: ('extra_data', p.BytesType, 0),

trezorlib/messages/TxAck.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .TransactionType import TransactionType
 

trezorlib/messages/TxInputType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .MultisigRedeemScriptType import MultisigRedeemScriptType
 

trezorlib/messages/TxOutputBinType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 
 

trezorlib/messages/TxOutputType.py

@@ -1,5 +1,4 @@
 # Automatically generated by pb2py
-from __future__ import absolute_import
 from .. import protobuf as p
 from .MultisigRedeemScriptType import MultisigRedeemScriptType