From aa2415125eae4acdaf23ed6ed43819c1b0e66132 Mon Sep 17 00:00:00 2001
From: pscott <scott.piriou@ledger.fr>
Date: Sat, 31 Jul 2021 13:03:56 +0200
Subject: [PATCH] Remove parsing of sender_r, sender_s and y_parity

---
 examples/signTx.py      | 35 ++++++++++++++++++++++-------------
 src_common/ethUstream.c | 13 -------------
 src_common/ethUstream.h |  6 ------
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/examples/signTx.py b/examples/signTx.py
index 9f0c4a0..5bb7c34 100755
--- a/examples/signTx.py
+++ b/examples/signTx.py
@@ -37,6 +37,7 @@ except:
     # Python3 hack import for pyethereum
     from ethereum.utils import decode_hex, encode_hex, str_to_bytes
 
+
 def parse_bip32_path(path):
     if len(path) == 0:
         return b""
@@ -52,13 +53,18 @@ def parse_bip32_path(path):
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--nonce', help="Nonce associated to the account", type=int, required=True)
-parser.add_argument('--gasprice', help="Network gas price", type=int, required=True)
+parser.add_argument(
+    '--nonce', help="Nonce associated to the account", type=int, required=True)
+parser.add_argument('--gasprice', help="Network gas price",
+                    type=int, required=True)
 parser.add_argument('--startgas', help="startgas", default='21000', type=int)
 parser.add_argument('--amount', help="Amount to send in ether", required=True)
-parser.add_argument('--to', help="Destination address", type=str, required=True)
+parser.add_argument('--to', help="Destination address",
+                    type=str, required=True)
 parser.add_argument('--path', help="BIP 32 path to sign with")
 parser.add_argument('--data', help="Data to add, hex encoded")
+parser.add_argument(
+    '--chainid', help="Chain ID (1 for Ethereum mainnet, 137 for Polygon, etc)", type=int)
 parser.add_argument('--descriptor', help="Optional descriptor")
 args = parser.parse_args()
 
@@ -83,12 +89,15 @@ tx = UnsignedTransaction(
 )
 
 encodedTx = encode(tx, UnsignedTransaction)
+encodedTx = bytearray.fromhex(
+    "02ef0306843b9aca008504a817c80082520894b2bb2b958afa2e96dab3f3ce7162b87daea39017872386f26fc1000080c0")
 
 dongle = getDongle(True)
 
 if args.descriptor != None:
     descriptor = binascii.unhexlify(args.descriptor)
-    apdu = struct.pack(">BBBBB", 0xE0, 0x0A, 0x00, 0x00, len(descriptor)) + descriptor
+    apdu = struct.pack(">BBBBB", 0xE0, 0x0A, 0x00, 0x00,
+                       len(descriptor)) + descriptor
     dongle.exchange(bytes(apdu))
 
 donglePath = parse_bip32_path(args.path)
@@ -100,16 +109,16 @@ apdu += donglePath + encodedTx
 result = dongle.exchange(bytes(apdu))
 
 # Needs to recover (main.c:1121)
-if (CHAIN_ID*2 + 35) + 1 > 255:
-    ecc_parity = result[0] - ((CHAIN_ID*2 + 35) % 256)
-    v = (CHAIN_ID*2 + 35) + ecc_parity
-else:
-    v = result[0]
+# if (CHAIN_ID*2 + 35) + 1 > 255:
+#     ecc_parity = result[0] - ((CHAIN_ID*2 + 35) % 256)
+#     v = (CHAIN_ID*2 + 35) + ecc_parity
+# else:
+#     v = result[0]
 
-r = int(binascii.hexlify(result[1:1 + 32]), 16)
-s = int(binascii.hexlify(result[1 + 32: 1 + 32 + 32]), 16)
+# r = int(binascii.hexlify(result[1:1 + 32]), 16)
+# s = int(binascii.hexlify(result[1 + 32: 1 + 32 + 32]), 16)
 
-tx = Transaction(tx.nonce, tx.gasprice, tx.startgas,
-                 tx.to, tx.value, tx.data, v, r, s)
+# tx = Transaction(tx.nonce, tx.gasprice, tx.startgas,
+#                  tx.to, tx.value, tx.data, v, r, s)
 
 print("Signed transaction", encode_hex(encode(tx)))
diff --git a/src_common/ethUstream.c b/src_common/ethUstream.c
index 4225f51..8d5c979 100644
--- a/src_common/ethUstream.c
+++ b/src_common/ethUstream.c
@@ -360,13 +360,7 @@ static bool processEIP1559Tx(txContext_t *context) {
             processAccessList(context);
             break;
         }
-        case EIP1559_RLP_YPARITY: {
-            processV(context);
-            break;
-        }
         case EIP1559_RLP_MAX_PRIORITY_FEE_PER_GAS:
-        case EIP1559_RLP_SENDER_R:
-        case EIP1559_RLP_SENDER_S:
             processAndDiscard(context);
             break;
         default:
@@ -406,19 +400,12 @@ static bool processEIP2930Tx(txContext_t *context) {
         case EIP2930_RLP_VALUE:
             processValue(context);
             break;
-        case EIP2930_RLP_YPARITY:
-            processV(context);
-            break;
         case EIP2930_RLP_DATA:
             processData(context);
             break;
         case EIP2930_RLP_ACCESS_LIST:
             processAccessList(context);
             break;
-        case EIP2930_RLP_SENDER_R:
-        case EIP2930_RLP_SENDER_S:
-            processAndDiscard(context);
-            break;
         default:
             PRINTF("Invalid RLP decoder context\n");
             return true;
diff --git a/src_common/ethUstream.h b/src_common/ethUstream.h
index fb05800..01b9f37 100644
--- a/src_common/ethUstream.h
+++ b/src_common/ethUstream.h
@@ -75,9 +75,6 @@ typedef enum rlpEIP2930TxField_e {
     EIP2930_RLP_VALUE,
     EIP2930_RLP_DATA,
     EIP2930_RLP_ACCESS_LIST,
-    EIP2930_RLP_YPARITY,
-    EIP2930_RLP_SENDER_R,
-    EIP2930_RLP_SENDER_S,
     EIP2930_RLP_DONE
 } rlpEIP2930TxField_e;
 
@@ -94,9 +91,6 @@ typedef enum rlpEIP1559TxField_e {
     EIP1559_RLP_VALUE,
     EIP1559_RLP_DATA,
     EIP1559_RLP_ACCESS_LIST,
-    EIP1559_RLP_YPARITY,
-    EIP1559_RLP_SENDER_R,
-    EIP1559_RLP_SENDER_S,
     EIP1559_RLP_DONE
 } rlpEIP1559TxField_e;