From 949b1c06729009784e275f38562c9a64e16ac07f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 26 Nov 2013 04:34:48 +0100
Subject: [PATCH] update protofiles

---
 protob/trezor.proto | 60 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/protob/trezor.proto b/protob/trezor.proto
index 57e81f706b..082f7f5299 100644
--- a/protob/trezor.proto
+++ b/protob/trezor.proto
@@ -55,10 +55,17 @@ enum MessageType {
 	MessageType_SettingsType = 31;
 	MessageType_HDNodeType = 32; // BIP32 structure, what a funny coincidence :-)
 	MessageType_CoinType = 33;
-//	MessageType_ = 34;
+	MessageType_TxOutputBin = 34;
 	MessageType_EntropyRequest = 35 [(wire_out) = true];
 	MessageType_EntropyAck = 36 [(wire_in) = true];
 	MessageType_TransactionType = 37;
+	MessageType_SignMessage = 38 [(wire_in) = true];
+	MessageType_VerifyMessage = 39 [(wire_in) = true];
+	MessageType_MessageSignature = 40 [(wire_out) = true];
+	MessageType_PassphraseRequest = 41 [(wire_out) = true];
+	MessageType_PassphraseAck = 42 [(wire_in) = true];
+	MessageType_PassphraseCancel = 43 [(wire_in) = true];
+
 	MessageType_DebugLinkDecision = 100 [(wire_debug_in) = true];
 	MessageType_DebugLinkGetState = 101 [(wire_debug_in) = true];
 	MessageType_DebugLinkState = 102 [(wire_debug_out) = true];
@@ -78,6 +85,7 @@ enum FailureType {
 	Failure_PinExpected = 5;
 	Failure_PinCancelled = 6;
 	Failure_PinInvalid = 7;
+	Failure_InvalidSignature = 8;
 	Failure_FirmwareError = 99;
 }
 
@@ -103,6 +111,7 @@ message HDNodeType {
 	required bytes chain_code = 5 [(binary) = true];
 	optional bytes private_key = 6 [(binary) = true];
 	optional bytes public_key = 7 [(binary) = true];
+	optional bytes address = 8;
 }
 
 message CoinType {
@@ -138,8 +147,8 @@ message Features {
 	optional bool bootloader_mode = 5;
 	optional SettingsType settings = 6;			// User-level settings of the device
 	optional bytes device_id = 7 [(binary) = true];		// Device's unique identifier
-	optional bytes mpk_hash = 8 [(binary) = true];		// Hash of master node (sha256(HDNodeType.public_key).digest())
-	optional bool pin_protection = 9;			// True if Trezor is covered by PIN
+	optional bool pin_protection = 8;			// True if Trezor is covered by PIN
+	optional bool passphrase_protection = 9;                // True if Trezor seed is covered by passphrase
 }
 
 // Overwrites only filled fields of the structure
@@ -206,6 +215,19 @@ message PinMatrixAck {
 message PinMatrixCancel {
 }
 
+// Device request encryption passphrase
+message PassphraseRequest {
+}
+
+// Computer sends passphrase to device.
+message PassphraseAck {
+	required bytes passphrase = 1 [(binary) = true];
+}
+
+// Computer want to cancel current action
+message PassphraseCancel {
+}
+
 // Request a sample of random data generated by hardware RNG. May be used
 // for tests of internal RNG.
 //
@@ -229,7 +251,7 @@ message GetPublicKey {
 
 // Contains public key derived from device's seed.
 message PublicKey {
-	required HDNodeType mpk = 1;	// BIP32 node public key + chaincode
+	required HDNodeType node = 1;	// BIP32 node public key + chaincode
 }
 
 message GetAddress {
@@ -284,6 +306,22 @@ message EntropyAck {
 // Messages related to transaction signing
 //
 
+message SignMessage {
+	repeated uint32 address_n = 1;
+	required bytes message = 2 [(binary) = true];
+}
+
+message VerifyMessage {
+	optional bytes address = 1;
+	optional bytes signature = 2;
+	optional bytes message = 3 [(binary) = true];
+}
+
+message MessageSignature {
+	optional bytes address = 1;
+	optional bytes signature = 2;
+}
+
 // Request the device to sign the transaction
 //
 // Response: TxRequest, PinMatrixRequest, Failure
@@ -345,13 +383,15 @@ message TxOutput {
 	repeated bytes script_args = 5 [(binary) = true];	// Provide additional parameters for the script (its script-depended)
 }
 
+// Transaction output with script pubkey in binary form.
+// This is used for obtaining hashes of existing transactions
+// and for compiling TxOutput for signing.
+message TxOutputBin {
+	required uint64 amount = 1;
+	required bytes script_pubkey = 2 [(binary) = true];
+}
+
 message TransactionType {
-	// Raw (binary) structure describing transaction output.
-	// This is used only for obtaining hashes of existing transactions.
-	message TxOutputBin {
-		required uint64 amount = 1;
-		required bytes script_pubkey = 2 [(binary) = true];
-	}
 	optional uint32 version = 1 [default=1];
 	repeated TxInput inputs = 2;
 	repeated TxOutputBin outputs = 3;