Merge pull request #911 from LedgerHQ/feat/apa/multisig_address_book

Added a new trusted name source (multisig address book)

Author: apaillier-ledger

client/src/ledger_app_clients/ethereum/client.py

@@ -26,6 +26,8 @@ class TrustedNameType(IntEnum):
     CONTRACT = 0x02
     NFT = 0x03
     TOKEN = 0x04
+    WALLET = 0x05
+    CONTEXT_ADDRESS = 0x06
 
 
 class TrustedNameSource(IntEnum):
@@ -35,6 +37,8 @@ class TrustedNameSource(IntEnum):
     UD = 0x03
     FN = 0x04
     DNS = 0x05
+    DYN_RESOLVER = 0x06
+    MULTISIG_ADDRESS_BOOK = 0x07
 
 
 class EIP712CalldataParamPresence(IntEnum):

src/apdu_constants.h

@@ -25,8 +25,8 @@
 #define INS_EIP712_STRUCT_DEF               0x1A
 #define INS_EIP712_STRUCT_IMPL              0x1C
 #define INS_EIP712_FILTERING                0x1E
-#define INS_ENS_GET_CHALLENGE               0x20
-#define INS_ENS_PROVIDE_INFO                0x22
+#define INS_GET_CHALLENGE                   0x20
+#define INS_PROVIDE_TRUSTED_NAME            0x22
 #define INS_PROVIDE_ENUM_VALUE              0x24
 #define INS_GTP_TRANSACTION_INFO            0x26
 #define INS_GTP_FIELD                       0x28
@@ -52,8 +52,8 @@
      : x == INS_EIP712_STRUCT_DEF               ? "EIP712_STRUCT_DEF"          \
      : x == INS_EIP712_STRUCT_IMPL              ? "EIP712_STRUCT_IMPL"         \
      : x == INS_EIP712_FILTERING                ? "EIP712_FILTERING"           \
-     : x == INS_ENS_GET_CHALLENGE               ? "ENS_GET_CHALLENGE"          \
-     : x == INS_ENS_PROVIDE_INFO                ? "ENS_PROVIDE_INFO"           \
+     : x == INS_GET_CHALLENGE                   ? "GET_CHALLENGE"              \
+     : x == INS_PROVIDE_TRUSTED_NAME            ? "PROVIDE_TRUSTED_NAME"       \
      : x == INS_PROVIDE_ENUM_VALUE              ? "PROVIDE_ENUM_VALUE"         \
      : x == INS_GTP_TRANSACTION_INFO            ? "GTP_TRANSACTION_INFO"       \
      : x == INS_GTP_FIELD                       ? "GTP_FIELD"                  \

src/features/provide_trusted_name/trusted_name.c

@@ -439,6 +439,7 @@ static bool handle_trusted_name_source(const s_tlv_data *data, s_trusted_name_ct
     switch (context->trusted_name.name_source) {
         case TN_SOURCE_CAL:
         case TN_SOURCE_ENS:
+        case TN_SOURCE_MAB:
             break;
         case TN_SOURCE_LAB:
         case TN_SOURCE_UD:

src/features/provide_trusted_name/trusted_name.h

@@ -29,6 +29,7 @@ typedef enum {
     TN_SOURCE_FN,
     TN_SOURCE_DNS,
     TN_SOURCE_DYNAMIC_RESOLVER,
+    TN_SOURCE_MAB,
     TN_SOURCE_COUNT,
 } e_name_source;
 

src/features/signMessageEIP712/filtering.c

@@ -926,6 +926,7 @@ bool filtering_trusted_name(const uint8_t *payload,
             case TN_SOURCE_FN:
             case TN_SOURCE_DNS:
             case TN_SOURCE_DYNAMIC_RESOLVER:
+            case TN_SOURCE_MAB:
                 break;
             default:
                 return false;

src/main.c

@@ -229,11 +229,11 @@ static uint16_t handleApdu(command_t *cmd, uint32_t *flags, uint32_t *tx) {
             sw = handle_eip712_filtering(cmd->p1, cmd->p2, cmd->data, cmd->lc, flags);
             break;
 
-        case INS_ENS_GET_CHALLENGE:
+        case INS_GET_CHALLENGE:
             sw = handle_get_challenge(tx);
             break;
 
-        case INS_ENS_PROVIDE_INFO:
+        case INS_PROVIDE_TRUSTED_NAME:
             sw = handle_trusted_name(cmd->p1, cmd->data, cmd->lc);
             break;