From b296d627fad23ea864c264a7af2ef0a5fc8f9ba0 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Wed, 5 Sep 2018 17:00:39 +0200
Subject: [PATCH] vendor: update trezor-common

---
 src/trezor/messages/MoneroTransactionData.py |  3 +++
 src/trezor/messages/TezosCurveType.py        |  5 -----
 src/trezor/messages/TezosGetAddress.py       |  5 +----
 src/trezor/messages/TezosGetPublicKey.py     |  5 +----
 src/trezor/messages/TezosSignTx.py           | 13 +++++--------
 vendor/trezor-common                         |  2 +-
 6 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 src/trezor/messages/TezosCurveType.py

diff --git a/src/trezor/messages/MoneroTransactionData.py b/src/trezor/messages/MoneroTransactionData.py
index 3f046b0eb8..7dd598baf1 100644
--- a/src/trezor/messages/MoneroTransactionData.py
+++ b/src/trezor/messages/MoneroTransactionData.py
@@ -28,6 +28,7 @@ class MoneroTransactionData(p.MessageType):
         12: ('exp_tx_prefix_hash', p.BytesType, 0),
         13: ('use_tx_keys', p.BytesType, p.FLAG_REPEATED),
         14: ('rsig_data', MoneroTransactionRsigData, 0),
+        15: ('integrated_indices', p.UVarintType, p.FLAG_REPEATED),
     }
 
     def __init__(
@@ -46,6 +47,7 @@ class MoneroTransactionData(p.MessageType):
         exp_tx_prefix_hash: bytes = None,
         use_tx_keys: List[bytes] = None,
         rsig_data: MoneroTransactionRsigData = None,
+        integrated_indices: List[int] = None,
     ) -> None:
         self.version = version
         self.payment_id = payment_id
@@ -61,3 +63,4 @@ class MoneroTransactionData(p.MessageType):
         self.exp_tx_prefix_hash = exp_tx_prefix_hash
         self.use_tx_keys = use_tx_keys if use_tx_keys is not None else []
         self.rsig_data = rsig_data
+        self.integrated_indices = integrated_indices if integrated_indices is not None else []
diff --git a/src/trezor/messages/TezosCurveType.py b/src/trezor/messages/TezosCurveType.py
deleted file mode 100644
index 3c1415d303..0000000000
--- a/src/trezor/messages/TezosCurveType.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically generated by pb2py
-# fmt: off
-Ed25519 = 0
-Secp256k1 = 1
-P256 = 2
diff --git a/src/trezor/messages/TezosGetAddress.py b/src/trezor/messages/TezosGetAddress.py
index 06569c8356..fa57b39b27 100644
--- a/src/trezor/messages/TezosGetAddress.py
+++ b/src/trezor/messages/TezosGetAddress.py
@@ -13,16 +13,13 @@ class TezosGetAddress(p.MessageType):
     MESSAGE_WIRE_TYPE = 150
     FIELDS = {
         1: ('address_n', p.UVarintType, p.FLAG_REPEATED),
-        2: ('curve', p.UVarintType, 0),  # default=Ed25519
-        3: ('show_display', p.BoolType, 0),
+        2: ('show_display', p.BoolType, 0),
     }
 
     def __init__(
         self,
         address_n: List[int] = None,
-        curve: int = None,
         show_display: bool = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
-        self.curve = curve
         self.show_display = show_display
diff --git a/src/trezor/messages/TezosGetPublicKey.py b/src/trezor/messages/TezosGetPublicKey.py
index 2daa9c56a6..548b49f13f 100644
--- a/src/trezor/messages/TezosGetPublicKey.py
+++ b/src/trezor/messages/TezosGetPublicKey.py
@@ -13,16 +13,13 @@ class TezosGetPublicKey(p.MessageType):
     MESSAGE_WIRE_TYPE = 154
     FIELDS = {
         1: ('address_n', p.UVarintType, p.FLAG_REPEATED),
-        2: ('curve', p.UVarintType, 0),  # default=Ed25519
-        3: ('show_display', p.BoolType, 0),
+        2: ('show_display', p.BoolType, 0),
     }
 
     def __init__(
         self,
         address_n: List[int] = None,
-        curve: int = None,
         show_display: bool = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
-        self.curve = curve
         self.show_display = show_display
diff --git a/src/trezor/messages/TezosSignTx.py b/src/trezor/messages/TezosSignTx.py
index b7c9634560..bb9603deb2 100644
--- a/src/trezor/messages/TezosSignTx.py
+++ b/src/trezor/messages/TezosSignTx.py
@@ -18,18 +18,16 @@ class TezosSignTx(p.MessageType):
     MESSAGE_WIRE_TYPE = 152
     FIELDS = {
         1: ('address_n', p.UVarintType, p.FLAG_REPEATED),
-        2: ('curve', p.UVarintType, 0),  # default=Ed25519
-        3: ('branch', p.BytesType, 0),
-        4: ('reveal', TezosRevealOp, 0),
-        5: ('transaction', TezosTransactionOp, 0),
-        6: ('origination', TezosOriginationOp, 0),
-        7: ('delegation', TezosDelegationOp, 0),
+        2: ('branch', p.BytesType, 0),
+        3: ('reveal', TezosRevealOp, 0),
+        4: ('transaction', TezosTransactionOp, 0),
+        5: ('origination', TezosOriginationOp, 0),
+        6: ('delegation', TezosDelegationOp, 0),
     }
 
     def __init__(
         self,
         address_n: List[int] = None,
-        curve: int = None,
         branch: bytes = None,
         reveal: TezosRevealOp = None,
         transaction: TezosTransactionOp = None,
@@ -37,7 +35,6 @@ class TezosSignTx(p.MessageType):
         delegation: TezosDelegationOp = None,
     ) -> None:
         self.address_n = address_n if address_n is not None else []
-        self.curve = curve
         self.branch = branch
         self.reveal = reveal
         self.transaction = transaction
diff --git a/vendor/trezor-common b/vendor/trezor-common
index 625f9663e1..b6f59d351a 160000
--- a/vendor/trezor-common
+++ b/vendor/trezor-common
@@ -1 +1 @@
-Subproject commit 625f9663e1ab7a600db7f14455b8a4435ef4560b
+Subproject commit b6f59d351a2007a9bc80a7cdef64669a87c17739