vrs now stored as integers

Author: apaillier-ledger

client/src/ledger_app_clients/ethereum/response_parser.py

@@ -1,11 +1,11 @@
-def signature(data: bytes) -> tuple[bytes, bytes, bytes]:
+def signature(data: bytes) -> tuple[int, int, int]:
     assert len(data) == (1 + 32 + 32)
 
-    v = data[0:1]
+    v = int.from_bytes(data[0:1], "big")
     data = data[1:]
-    r = data[0:32]
+    r = int.from_bytes(data[0:32], "big")
     data = data[32:]
-    s = data[0:32]
+    s = int.from_bytes(data[0:32], "big")
 
     return v, r, s
 

client/src/ledger_app_clients/ethereum/utils.py

@@ -4,14 +4,6 @@
 import rlp
 
 
-# eth_account requires it for some reason
-def normalize_vrs(vrs: tuple) -> tuple:
-    vrs_l = []
-    for elem in vrs:
-        vrs_l.append(elem.lstrip(b'\x00'))
-    return tuple(vrs_l)
-
-
 def get_selector_from_data(data: str) -> bytes:
     raw_data = bytes.fromhex(data[2:])
     return raw_data[:4]
@@ -22,7 +14,7 @@ def recover_message(msg, vrs: tuple) -> bytes:
         smsg = encode_typed_data(full_message=msg)
     else:  # EIP-191
         smsg = encode_defunct(primitive=msg)
-    addr = Account.recover_message(smsg, normalize_vrs(vrs))
+    addr = Account.recover_message(smsg, vrs)
     return bytes.fromhex(addr[2:])
 
 
@@ -44,7 +36,7 @@ def recover_transaction(tx_params, vrs: tuple, raw_tx_param: Optional[bytes] = N
                 trunc_chain_id >>= 8
 
             trunc_target = trunc_chain_id * 2 + 35
-            trunc_v = int.from_bytes(vrs[0], "big")
+            trunc_v = vrs[0]
 
             if (trunc_target & 0xff) == trunc_v:
                 parity = 0
@@ -56,15 +48,14 @@ def recover_transaction(tx_params, vrs: tuple, raw_tx_param: Optional[bytes] = N
 
             # https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md
             full_v = parity + tx_params["chainId"] * 2 + 35
-            # 9 bytes would be big enough even for the biggest chain ID
-            vrs = (int(full_v).to_bytes(9, "big"), vrs[1], vrs[2])
+            vrs = (full_v, vrs[1], vrs[2])
         else:
             # Pre EIP-155 TX
             assert False
     decoded = rlp.decode(raw_tx)
     if raw_tx_param is None:
-        reencoded = rlp.encode(decoded[:-3] + list(normalize_vrs(vrs)))
+        reencoded = rlp.encode(decoded[:-3] + list(vrs))
     else:
-        reencoded = rlp.encode(decoded + list(normalize_vrs(vrs)))
+        reencoded = rlp.encode(decoded + list(vrs))
     addr = Account.recover_transaction(prefix + reencoded)
     return bytes.fromhex(addr[2:])

tests/ragger/test_eip7702.py

@@ -36,9 +36,9 @@ def common(firmware: Firmware,
            delegate: bytes,
            nonce: int,
            chain_id: int,
-           v: bytes = None,
-           r: bytes = None,
-           s: bytes = None):
+           v: int = None,
+           r: int = None,
+           s: int = None):
 
     app_client = EthAppClient(backend)
 
@@ -96,9 +96,9 @@ def test_eip7702_in_whitelist(firmware: Firmware,
            TEST_ADDRESS_1,
            NONCE,
            CHAIN_ID_1,
-           bytes.fromhex("00"),
-           bytes.fromhex("f82e 50a7 55fa 989f 4bb9 b36b 15af b442 4ce9 cda6 9752 fd17 a7eb 1473 7d96 3e62"),
-           bytes.fromhex("07c9 c91d 6140 b45e a52f 29de 7a5e ffb9 dd34 0607 a26e 225c 4027 8e91 c405 4492"))
+           0x00,
+           0xf82e50a755fa989f4bb9b36b15afb4424ce9cda69752fd17a7eb14737d963e62,
+           0x07c9c91d6140b45ea52f29de7a5effb9dd340607a26e225c40278e91c4054492)
 
 
 def test_eip7702_in_whitelist_all_chain_whitelisted(firmware: Firmware,
@@ -115,9 +115,9 @@ def test_eip7702_in_whitelist_all_chain_whitelisted(firmware: Firmware,
            TEST_ADDRESS_0,
            NONCE,
            CHAIN_ID_2,
-           bytes.fromhex("00"),
-           bytes.fromhex("0378 f7ac 482e c728 b65d 19d0 3943 bbb3 fe73 07c7 2c64 6e7d 2d0c 11be e81e b2b9"),
-           bytes.fromhex("3322 66ec 3ef9 96bf 835c 50a8 3300 6b4c 8039 8d59 7d0e 6846 19db 4d51 a384 a38d"))
+           0x00,
+           0x0378f7ac482ec728b65d19d03943bbb3fe7307c72c646e7d2d0c11bee81eb2b9,
+           0x332266ec3ef996bf835c50a833006b4c80398d597d0e684619db4d51a384a38d)
 
 
 def test_eip7702_in_whitelist_all_chain_param(firmware: Firmware,
@@ -134,9 +134,9 @@ def test_eip7702_in_whitelist_all_chain_param(firmware: Firmware,
            TEST_ADDRESS_2,
            NONCE,
            CHAIN_ID_0,
-           bytes.fromhex("01"),
-           bytes.fromhex("a24f 35ca fc6b 408c e325 39d4 bd89 a67e dd4d 6303 fc67 6dfd df93 b984 05b7 ee5e"),
-           bytes.fromhex("1594 56ba be65 6692 959c a3d8 29ca 269e 8f82 387c 91e4 0a33 633d 190d da7a 3c5c"))
+           0x01,
+           0xa24f35cafc6b408ce32539d4bd89a67edd4d6303fc676dfddf93b98405b7ee5e,
+           0x159456babe656692959ca3d829ca269e8f82387c91e40a33633d190dda7a3c5c)
 
 
 def test_eip7702_in_whitelist_max(firmware: Firmware,
@@ -153,9 +153,9 @@ def test_eip7702_in_whitelist_max(firmware: Firmware,
            TEST_ADDRESS_MAX,
            NONCE_MAX,
            CHAIN_ID_MAX,
-           bytes.fromhex("00"),
-           bytes.fromhex("a07c 6808 9449 8c21 e80f ebb0 11ae 5d62 ede6 645d 77d7 c902 db06 5d5a 082d d220"),
-           bytes.fromhex("6b5c 6222 5cf6 5a62 40c2 583d acc1 641c 8d69 2ed3 bd00 473c c3e2 8fe1 a4f5 2294"))
+           0x00,
+           0xa07c680894498c21e80febb011ae5d62ede6645d77d7c902db065d5a082dd220,
+           0x6b5c62225cf65a6240c2583dacc1641c8d692ed3bd00473cc3e28fe1a4f52294)
 
 
 def test_eip7702_in_whitelist_wrong_chain(firmware: Firmware,

tests/ragger/test_sign.py

@@ -389,6 +389,6 @@ def test_sign_eip_7702(firmware: Firmware,
            test_name=test_name,
            path=BIP32_PATH,
            with_simu=False,
-           v=bytes.fromhex("01"),
-           r=bytes.fromhex("9800ce04ecb46aebde0fea80c66392255eb13c3b3597aeec222447f6e1bfcfaf"),
-           s=bytes.fromhex("787eb82581e1a51d8956f21a0ccd0b96d8de14b04c11de0b7dcb5e400219902b"))
+           v=0x01,
+           r=0x9800ce04ecb46aebde0fea80c66392255eb13c3b3597aeec222447f6e1bfcfaf,
+           s=0x787eb82581e1a51d8956f21a0ccd0b96d8de14b04c11de0b7dcb5e400219902b)