Disable EIP 7702 features when not activated

Author: btchip

src/network.c

@@ -179,7 +179,9 @@ uint64_t get_tx_chain_id(void) {
             break;
         case EIP2930:
         case EIP1559:
+#ifdef HAVE_EIP7702
         case EIP7702:
+#endif  // HAVE_EIP7702
             chain_id = u64_from_BE(tmpContent.txContent.chainID.value,
                                    tmpContent.txContent.chainID.length);
             break;

src/shared_context.h

@@ -94,17 +94,23 @@ typedef struct messageSigningContext712_t {
     uint8_t messageHash[32];
 } messageSigningContext712_t;
 
+#ifdef HAVE_EIP7702
+
 typedef struct authSigningContext7702_t {
     bip32_path_t bip32;
     uint8_t authHash[INT256_LENGTH];
 } authSigningContext7702_t;
 
+#endif  // HAVE_EIP7702
+
 typedef union {
     publicKeyContext_t publicKeyContext;
     transactionContext_t transactionContext;
     messageSigningContext_t messageSigningContext;
     messageSigningContext712_t messageSigningContext712;
+#ifdef HAVE_EIP7702
     authSigningContext7702_t authSigningContext7702;
+#endif  // HAVE_EIP7702
 } tmpCtx_t;
 
 typedef union {

src_features/signTx/cmd_signTx.c

@@ -51,7 +51,9 @@ static uint16_t handle_first_sign_chunk(const uint8_t *payload,
         switch (tx_type) {
             case EIP1559:
             case EIP2930:
+#ifdef HAVE_EIP7702
             case EIP7702:
+#endif  // HAVE_EIP7702
                 break;
             default:
                 PRINTF("Transaction type %d not supported\n", tx_type);

src_features/signTx/ethUstream.c

@@ -149,6 +149,8 @@ static bool processAccessList(txContext_t *context) {
     return true;
 }
 
+#ifdef HAVE_EIP7702
+
 static bool processAuthList(txContext_t *context) {
     if (check_empty_list(context, "RLP_AUTH_LIST") == false) {
         return false;
@@ -168,6 +170,8 @@ static bool processAuthList(txContext_t *context) {
     return true;
 }
 
+#endif  // HAVE_EIP7702
+
 static bool processChainID(txContext_t *context) {
     if (check_fields(context, "RLP_CHAINID", INT256_LENGTH) == false) {
         return false;
@@ -378,6 +382,8 @@ static bool processV(txContext_t *context) {
     return true;
 }
 
+#ifdef HAVE_EIP7702
+
 static bool processEIP7702Tx(txContext_t *context) {
     bool ret = false;
     switch (context->currentField) {
@@ -430,6 +436,8 @@ static bool processEIP7702Tx(txContext_t *context) {
     return ret;
 }
 
+#endif  // HAVE_EIP7702
+
 static bool processEIP1559Tx(txContext_t *context) {
     bool ret = false;
     switch (context->currentField) {
@@ -654,11 +662,13 @@ static parserStatus_e processTxInternal(txContext_t *context) {
                         return USTREAM_FAULT;
                     }
                     break;
+#ifdef HAVE_EIP7702
                 case EIP7702:
                     if (processEIP7702Tx(context) == false) {
                         return USTREAM_FAULT;
                     }
                     break;
+#endif  // HAVE_EIP7702
                 default:
                     PRINTF("Transaction type %d is not supported\n", context->txType);
                     return USTREAM_FAULT;

src_features/signTx/ethUstream.h

@@ -35,12 +35,23 @@ typedef enum customStatus_e {
 // First variant of every Tx enum.
 #define RLP_NONE 0
 
+#ifdef HAVE_EIP7702
+
 #define PARSING_IS_DONE(ctx)                                              \
     ((ctx->txType == LEGACY && ctx->currentField == LEGACY_RLP_DONE) ||   \
      (ctx->txType == EIP2930 && ctx->currentField == EIP2930_RLP_DONE) || \
      (ctx->txType == EIP1559 && ctx->currentField == EIP1559_RLP_DONE) || \
      (ctx->txType == EIP7702 && ctx->currentField == EIP7702_RLP_DONE))
 
+#else
+
+#define PARSING_IS_DONE(ctx)                                              \
+    ((ctx->txType == LEGACY && ctx->currentField == LEGACY_RLP_DONE) ||   \
+     (ctx->txType == EIP2930 && ctx->currentField == EIP2930_RLP_DONE) || \
+     (ctx->txType == EIP1559 && ctx->currentField == EIP1559_RLP_DONE))
+
+#endif  // HAVE_EIP7702
+
 typedef enum rlpLegacyTxField_e {
     LEGACY_RLP_NONE = RLP_NONE,
     LEGACY_RLP_CONTENT,
@@ -85,6 +96,8 @@ typedef enum rlpEIP1559TxField_e {
     EIP1559_RLP_DONE
 } rlpEIP1559TxField_e;
 
+#ifdef HAVE_EIP7702
+
 typedef enum rlpEIP7702TxField_e {
     EIP7702_RLP_NONE = RLP_NONE,
     EIP7702_RLP_CONTENT,
@@ -101,6 +114,8 @@ typedef enum rlpEIP7702TxField_e {
     EIP7702_RLP_DONE
 } rlpEIP7702TxField_e;
 
+#endif  // HAVE_EIP7702
+
 #define MIN_TX_TYPE 0x00
 #define MAX_TX_TYPE 0x7f
 
@@ -109,7 +124,9 @@ typedef enum rlpEIP7702TxField_e {
 typedef enum txType_e {
     EIP2930 = 0x01,
     EIP1559 = 0x02,
+#ifdef HAVE_EIP7702
     EIP7702 = 0x04,
+#endif             // HAVE_EIP7702
     LEGACY = 0xc0  // Legacy tx are greater than or equal to 0xc0.
 } txType_e;
 

src_features/signTx/logic_signTx.c

@@ -39,8 +39,11 @@ static uint32_t splitBinaryParameterPart(char *result, size_t result_size, uint8
 customStatus_e customProcessor(txContext_t *context) {
     if (((context->txType == LEGACY && context->currentField == LEGACY_RLP_DATA) ||
          (context->txType == EIP2930 && context->currentField == EIP2930_RLP_DATA) ||
-         (context->txType == EIP1559 && context->currentField == EIP1559_RLP_DATA) ||
-         (context->txType == EIP7702 && context->currentField == EIP7702_RLP_DATA)) &&
+         (context->txType == EIP1559 && context->currentField == EIP1559_RLP_DATA)
+#ifdef HAVE_EIP7702
+         || (context->txType == EIP7702 && context->currentField == EIP7702_RLP_DATA)
+#endif  // HAVE_EIP7702
+             ) &&
         (context->currentFieldLength != 0)) {
         context->content->dataPresent = true;
         // If handling a new contract rather than a function call, abort immediately

src_features/signTx/ui_common_signTx.c

@@ -19,7 +19,11 @@ uint32_t io_seproxyhal_touch_tx_ok(void) {
                                                   G_io_apdu_buffer + 1 + 32,
                                                   &info));
 
-    if (txContext.txType == EIP1559 || txContext.txType == EIP2930 || txContext.txType == EIP7702) {
+    if (txContext.txType == EIP1559 || txContext.txType == EIP2930
+#ifdef HAVE_EIP7702
+        || txContext.txType == EIP7702
+#endif  // HAVE_EIP7702
+    ) {
         if (info & CX_ECCINFO_PARITY_ODD) {
             G_io_apdu_buffer[0] = 1;
         } else {