From 78ece6631f9eb93694fc8e67f37a32040cac370a Mon Sep 17 00:00:00 2001
From: Peter van Mourik <tyrion70@users.noreply.github.com>
Date: Wed, 2 May 2018 16:33:22 +0200
Subject: [PATCH] Wanchain support (#313)

---
 firmware/ethereum.c | 52 +++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/firmware/ethereum.c b/firmware/ethereum.c
index d2aff49dde..a71e41a88d 100644
--- a/firmware/ethereum.c
+++ b/firmware/ethereum.c
@@ -43,6 +43,7 @@ static uint32_t data_total, data_left;
 static EthereumTxRequest msg_tx_request;
 static CONFIDENTIAL uint8_t privkey[32];
 static uint32_t chain_id;
+static uint32_t tx_type;
 struct SHA3_CTX keccak_ctx;
 
 static inline void hash_data(const uint8_t *buf, size_t size)
@@ -180,7 +181,7 @@ static void send_signature(void)
 	layoutProgress(_("Signing"), 1000);
 
 	/* eip-155 replay protection */
-	if (chain_id != 0) {
+	if (chain_id) {
 		/* hash v=chain_id, r=0, s=0 */
 		hash_rlp_number(chain_id);
 		hash_rlp_length(0, 0);
@@ -240,19 +241,23 @@ static void ethereumFormatAmount(const bignum256 *amnt, const TokenType *token,
 		suffix = " Wei";
 		decimals = 0;
 	} else {
-		switch (chain_id) {
-			case  1: suffix = " ETH";  break;  // Ethereum Mainnet
-			case 61: suffix = " ETC";  break;  // Ethereum Classic Mainnet
-			case 62: suffix = " tETC"; break;  // Ethereum Classic Testnet
-			case 30: suffix = " RSK";  break;  // Rootstock Mainnet
-			case 31: suffix = " tRSK"; break;  // Rootstock Testnet
-			case  3: suffix = " tETH"; break;  // Ethereum Testnet: Ropsten
-			case  4: suffix = " tETH"; break;  // Ethereum Testnet: Rinkeby
-			case 42: suffix = " tETH"; break;  // Ethereum Testnet: Kovan
-			case  2: suffix = " EXP";  break;  // Expanse
-			case  8: suffix = " UBQ";  break;  // UBIQ
-			default: suffix = " UNKN"; break;  // unknown chain
-		}
+	    if (tx_type == 1 || tx_type == 6) {
+	        suffix = " WAN";
+	    } else {
+            switch (chain_id) {
+                case  1: suffix = " ETH";  break;  // Ethereum Mainnet
+                case 61: suffix = " ETC";  break;  // Ethereum Classic Mainnet
+                case 62: suffix = " tETC"; break;  // Ethereum Classic Testnet
+                case 30: suffix = " RSK";  break;  // Rootstock Mainnet
+                case 31: suffix = " tRSK"; break;  // Rootstock Testnet
+                case  3: suffix = " tETH"; break;  // Ethereum Testnet: Ropsten
+                case  4: suffix = " tETH"; break;  // Ethereum Testnet: Rinkeby
+                case 42: suffix = " tETH"; break;  // Ethereum Testnet: Kovan
+                case  2: suffix = " EXP";  break;  // Expanse
+                case  8: suffix = " UBQ";  break;  // UBIQ
+                default: suffix = " UNKN"; break;  // unknown chain
+            }
+	    }
 	}
 	bn_format(amnt, NULL, suffix, decimals, 0, false, buf, buflen);
 }
@@ -450,6 +455,19 @@ void ethereum_signing_init(EthereumSignTx *msg, const HDNode *node)
 		chain_id = 0;
 	}
 
+    /* Wanchain txtype */
+	if (msg->has_tx_type) {
+		if (msg->tx_type == 1 || msg->tx_type == 6) {
+    		tx_type = msg->tx_type;
+		} else {
+			fsm_sendFailure(FailureType_Failure_DataError, _("Txtype out of bounds"));
+			ethereum_signing_abort();
+			return;
+		}
+	} else {
+		tx_type = 0;
+	}
+
 	if (msg->has_data_length && msg->data_length > 0) {
 		if (!msg->has_data_initial_chunk || msg->data_initial_chunk.size == 0) {
 			fsm_sendFailure(FailureType_Failure_DataError, _("Data length provided, but no initial chunk"));
@@ -530,6 +548,9 @@ void ethereum_signing_init(EthereumSignTx *msg, const HDNode *node)
 	rlp_length += rlp_calculate_length(msg->to.size, msg->to.bytes[0]);
 	rlp_length += rlp_calculate_length(msg->value.size, msg->value.bytes[0]);
 	rlp_length += rlp_calculate_length(data_total, msg->data_initial_chunk.bytes[0]);
+    if (tx_type) {
+        rlp_length += rlp_calculate_length(1, tx_type);
+    }
 	if (chain_id) {
 		rlp_length += rlp_calculate_length(1, chain_id);
 		rlp_length += rlp_calculate_length(0, 0);
@@ -541,6 +562,9 @@ void ethereum_signing_init(EthereumSignTx *msg, const HDNode *node)
 
 	layoutProgress(_("Signing"), 100);
 
+    if (tx_type) {
+        hash_rlp_number(tx_type);
+    }
 	hash_rlp_field(msg->nonce.bytes, msg->nonce.size);
 	hash_rlp_field(msg->gas_price.bytes, msg->gas_price.size);
 	hash_rlp_field(msg->gas_limit.bytes, msg->gas_limit.size);