From 6ab2b5d6ee80de81d938d6c2b515c4bc7a6627a5 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 28 Jun 2018 14:00:53 +0200
Subject: [PATCH] vendor: update trezor-common

---
 src/trezor/messages/TxInputType.py  | 8 +++++++-
 src/trezor/messages/TxOutputType.py | 8 +++++++-
 vendor/trezor-common                | 2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/trezor/messages/TxInputType.py b/src/trezor/messages/TxInputType.py
index b97a15a160..8aa9f3d8f8 100644
--- a/src/trezor/messages/TxInputType.py
+++ b/src/trezor/messages/TxInputType.py
@@ -20,6 +20,8 @@ class TxInputType(p.MessageType):
         8: ('amount', p.UVarintType, 0),
         9: ('decred_tree', p.UVarintType, 0),
         10: ('decred_script_version', p.UVarintType, 0),
+        11: ('prev_block_hash_bip115', p.BytesType, 0),
+        12: ('prev_block_height_bip115', p.BytesType, 0),
     }
 
     def __init__(
@@ -33,7 +35,9 @@ class TxInputType(p.MessageType):
         multisig: MultisigRedeemScriptType = None,
         amount: int = None,
         decred_tree: int = None,
-        decred_script_version: int = None
+        decred_script_version: int = None,
+        prev_block_hash_bip115: bytes = None,
+        prev_block_height_bip115: bytes = None
     ) -> None:
         self.address_n = address_n if address_n is not None else []
         self.prev_hash = prev_hash
@@ -45,3 +49,5 @@ class TxInputType(p.MessageType):
         self.amount = amount
         self.decred_tree = decred_tree
         self.decred_script_version = decred_script_version
+        self.prev_block_hash_bip115 = prev_block_hash_bip115
+        self.prev_block_height_bip115 = prev_block_height_bip115
diff --git a/src/trezor/messages/TxOutputType.py b/src/trezor/messages/TxOutputType.py
index 3735d5dad6..7bf351b7b4 100644
--- a/src/trezor/messages/TxOutputType.py
+++ b/src/trezor/messages/TxOutputType.py
@@ -17,6 +17,8 @@ class TxOutputType(p.MessageType):
         5: ('multisig', MultisigRedeemScriptType, 0),
         6: ('op_return_data', p.BytesType, 0),
         7: ('decred_script_version', p.UVarintType, 0),
+        8: ('block_hash_bip115', p.BytesType, 0),
+        9: ('block_height_bip115', p.BytesType, 0),
     }
 
     def __init__(
@@ -27,7 +29,9 @@ class TxOutputType(p.MessageType):
         script_type: int = None,
         multisig: MultisigRedeemScriptType = None,
         op_return_data: bytes = None,
-        decred_script_version: int = None
+        decred_script_version: int = None,
+        block_hash_bip115: bytes = None,
+        block_height_bip115: bytes = None
     ) -> None:
         self.address = address
         self.address_n = address_n if address_n is not None else []
@@ -36,3 +40,5 @@ class TxOutputType(p.MessageType):
         self.multisig = multisig
         self.op_return_data = op_return_data
         self.decred_script_version = decred_script_version
+        self.block_hash_bip115 = block_hash_bip115
+        self.block_height_bip115 = block_height_bip115
diff --git a/vendor/trezor-common b/vendor/trezor-common
index 2dad4dcd51..5d61471108 160000
--- a/vendor/trezor-common
+++ b/vendor/trezor-common
@@ -1 +1 @@
-Subproject commit 2dad4dcd519662b9d69e276e737ac1bba655555d
+Subproject commit 5d61471108300a86deff300a482fd0d96f238070