From b25eaa1b48b038d93c3206fd9509cfe490c4db3b Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Tue, 3 May 2022 09:33:46 +0200
Subject: [PATCH] Renamed the existing EIP712 implementation folder

---
 src/apdu_constants.h                               | 12 ++++++------
 src/main.c                                         | 12 ++++++------
 .../cmd_signMessage712.c                           | 14 ++++++++------
 .../ui_common_signMessage712.c                     |  0
 .../ui_flow_signMessage712.c                       |  0
 5 files changed, 20 insertions(+), 18 deletions(-)
 rename src_features/{signMessageEIP712 => signMessageEIP712_v0}/cmd_signMessage712.c (70%)
 rename src_features/{signMessageEIP712 => signMessageEIP712_v0}/ui_common_signMessage712.c (100%)
 rename src_features/{signMessageEIP712 => signMessageEIP712_v0}/ui_flow_signMessage712.c (100%)

diff --git a/src/apdu_constants.h b/src/apdu_constants.h
index 3062674..1626178 100644
--- a/src/apdu_constants.h
+++ b/src/apdu_constants.h
@@ -94,12 +94,12 @@ void handleSignPersonalMessage(uint8_t p1,
                                uint8_t dataLength,
                                unsigned int *flags,
                                unsigned int *tx);
-void handleSignEIP712Message(uint8_t p1,
-                             uint8_t p2,
-                             const uint8_t *dataBuffer,
-                             uint16_t dataLength,
-                             unsigned int *flags,
-                             unsigned int *tx);
+void handleSignEIP712Message_v0(uint8_t p1,
+                                uint8_t p2,
+                                const uint8_t *dataBuffer,
+                                uint16_t dataLength,
+                                unsigned int *flags,
+                                unsigned int *tx);
 
 void handleSetExternalPlugin(uint8_t p1,
                              uint8_t p2,
diff --git a/src/main.c b/src/main.c
index d34d5c1..a02a08a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -663,12 +663,12 @@ void handleApdu(unsigned int *flags, unsigned int *tx) {
 
                 case INS_SIGN_EIP_712_MESSAGE:
                     memset(tmpCtx.transactionContext.tokenSet, 0, MAX_ITEMS);
-                    handleSignEIP712Message(G_io_apdu_buffer[OFFSET_P1],
-                                            G_io_apdu_buffer[OFFSET_P2],
-                                            G_io_apdu_buffer + OFFSET_CDATA,
-                                            G_io_apdu_buffer[OFFSET_LC],
-                                            flags,
-                                            tx);
+                    handleSignEIP712Message_v0(G_io_apdu_buffer[OFFSET_P1],
+                                               G_io_apdu_buffer[OFFSET_P2],
+                                               G_io_apdu_buffer + OFFSET_CDATA,
+                                               G_io_apdu_buffer[OFFSET_LC],
+                                               flags,
+                                               tx);
                     break;
 
 #ifdef HAVE_ETH2
diff --git a/src_features/signMessageEIP712/cmd_signMessage712.c b/src_features/signMessageEIP712_v0/cmd_signMessage712.c
similarity index 70%
rename from src_features/signMessageEIP712/cmd_signMessage712.c
rename to src_features/signMessageEIP712_v0/cmd_signMessage712.c
index d12356c..cd32dad 100644
--- a/src_features/signMessageEIP712/cmd_signMessage712.c
+++ b/src_features/signMessageEIP712_v0/cmd_signMessage712.c
@@ -3,12 +3,14 @@
 #include "utils.h"
 #include "ui_flow.h"
 
-void handleSignEIP712Message(uint8_t p1,
-                             uint8_t p2,
-                             const uint8_t *workBuffer,
-                             uint16_t dataLength,
-                             unsigned int *flags,
-                             unsigned int *tx) {
+void handleSignEIP712Message_v0(uint8_t p1,
+                                uint8_t p2,
+                                const uint8_t *workBuffer,
+                                uint16_t dataLength,
+                                unsigned int *flags,
+                                unsigned int *tx) {
+    uint8_t i;
+
     UNUSED(tx);
     if ((p1 != 00) || (p2 != 00)) {
         THROW(0x6B00);
diff --git a/src_features/signMessageEIP712/ui_common_signMessage712.c b/src_features/signMessageEIP712_v0/ui_common_signMessage712.c
similarity index 100%
rename from src_features/signMessageEIP712/ui_common_signMessage712.c
rename to src_features/signMessageEIP712_v0/ui_common_signMessage712.c
diff --git a/src_features/signMessageEIP712/ui_flow_signMessage712.c b/src_features/signMessageEIP712_v0/ui_flow_signMessage712.c
similarity index 100%
rename from src_features/signMessageEIP712/ui_flow_signMessage712.c
rename to src_features/signMessageEIP712_v0/ui_flow_signMessage712.c