From 81d89030dfb3214a1d598c07c834047bb74dfb40 Mon Sep 17 00:00:00 2001
From: slush0 <slush@satoshilabs.com>
Date: Mon, 15 Dec 2014 14:30:44 +0100
Subject: [PATCH] Renamed HDPubkeyType to HDNodePathType Added
 MultisigRedeemScriptType to TXOutputType for defining multisig output
 addresses

---
 protob/types.proto | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/protob/types.proto b/protob/types.proto
index f8d201230..7afae5277 100644
--- a/protob/types.proto
+++ b/protob/types.proto
@@ -113,7 +113,7 @@ message HDNodeType {
 	optional bytes public_key = 6;
 }
 
-message HDPubkeyType {
+message HDNodePathType {
 	required HDNodeType node = 1;						// BIP-32 node in deserialized form
 	repeated uint32 address_n = 2;						// BIP-32 path to derive the key from node
 }
@@ -134,7 +134,7 @@ message CoinType {
  * @used_in TxInputType
  */
 message MultisigRedeemScriptType {
-	repeated HDPubkeyType pubkeys = 1;						// pubkeys from multisig address (sorted lexicographically)
+	repeated HDNodePathType pubkeys = 1;						// pubkeys from multisig address (sorted lexicographically)
 	repeated bytes signatures = 2;						// existing signatures for partially signed input
 	optional uint32 m = 3;							// "m" from n, how many valid signatures is necessary for spending
 }
@@ -164,6 +164,7 @@ message TxOutputType {
 	repeated uint32 address_n = 2;			// BIP-32 path to derive the key from master node; has higher priority than "address"
 	required uint64 amount = 3;			// amount to spend in satoshis
 	required OutputScriptType script_type = 4;	// output script type
+	repeated MultisigRedeemScriptType multisig = 5; // Defines multisig address; when filled, it has priority over address/address_n
 }
 
 /**