Skip to content

Commit e7784ad

Browse files
Remove useless flag 'HAVE_GATING_SUPPORT'
1 parent 4dafe7e commit e7784ad

9 files changed

Lines changed: 0 additions & 25 deletions

File tree

makefile_conf/features.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_STAX TARGET_FLEX TARGET_APEX
4747
DEFINES += HAVE_TRANSACTION_CHECKS
4848
endif
4949

50-
# Gating signing - TODO: Reactivate this once the feature is fully available E2E
51-
DEFINES += HAVE_GATING_SUPPORT
5250

5351
EIP7702_TEST_WHITELIST ?= 0
5452
ifneq ($(EIP7702_TEST_WHITELIST),0)

src/features/provide_gating/cmd_get_gating.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
*
1717
********************************************************************************/
1818

19-
#ifdef HAVE_GATING_SUPPORT
20-
2119
#include "cmd_get_gating.h"
2220
#include "app_mem_utils.h"
2321
#include "apdu_constants.h"
@@ -673,5 +671,3 @@ bool set_gating_warning(void) {
673671
set_gating_ui_screen();
674672
return true;
675673
}
676-
677-
#endif // HAVE_GATING_SUPPORT

src/features/provide_gating/cmd_get_gating.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@
1818

1919
#pragma once
2020

21-
#ifdef HAVE_GATING_SUPPORT
22-
2321
#include <stdint.h>
2422
#include <stdbool.h>
2523

2624
uint16_t handle_gating(uint8_t p1, uint8_t p2, const uint8_t *data, uint8_t length);
2725

2826
void clear_gating(void);
2927
bool set_gating_warning(void);
30-
31-
#endif // HAVE_GATING_SUPPORT

src/features/sign_message_eip712_common/common_712.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ uint16_t ui_712_start(e_eip712_filtering_mode filtering) {
9999
if (filtering == EIP712_FILTERING_BASIC) {
100100
// If the user has requested a filtered view, we will not show the warning
101101
warning.predefinedSet |= SET_BIT(BLIND_SIGNING_WARN);
102-
#ifdef HAVE_GATING_SUPPORT
103102
warning.predefinedSet |= SET_BIT(GATED_SIGNING_WARN);
104-
#endif
105103
}
106104
return SWO_SUCCESS;
107105
}

src/main.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,7 @@ void reset_app_context(void) {
100100
clear_safe_account();
101101
ui_all_cleanup();
102102
proxy_cleanup();
103-
#ifdef HAVE_GATING_SUPPORT
104103
clear_gating();
105-
#endif
106104
}
107105

108106
void app_quit(void) {
@@ -289,11 +287,9 @@ static uint16_t handleApdu(command_t *cmd, uint32_t *tx) {
289287
sw = handle_safe_account(cmd->p1, cmd->p2, cmd->data, cmd->lc);
290288
break;
291289

292-
#ifdef HAVE_GATING_SUPPORT
293290
case INS_PROVIDE_GATING:
294291
sw = handle_gating(cmd->p1, cmd->p2, cmd->data, cmd->lc);
295292
break;
296-
#endif
297293

298294
default:
299295
sw = SWO_INVALID_INS;

src/nbgl/ui_approve_tx.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ static void _cleanup(void) {
4040
#ifdef HAVE_TRANSACTION_CHECKS
4141
clear_tx_simulation();
4242
#endif
43-
#ifdef HAVE_GATING_SUPPORT
4443
clear_gating();
45-
#endif
4644
}
4745

4846
// Review callback function to handle user confirmation or cancellation
@@ -404,12 +402,10 @@ uint16_t ux_approve_tx(bool fromPlugin) {
404402
explicit_bzero(&warning, sizeof(nbgl_warning_t));
405403
if (tmpContent.txContent.dataPresent) {
406404
warning.predefinedSet |= SET_BIT(BLIND_SIGNING_WARN);
407-
#ifdef HAVE_GATING_SUPPORT
408405
warning.predefinedSet |= SET_BIT(GATED_SIGNING_WARN);
409406
if (set_gating_warning() == false) {
410407
return SWO_INCORRECT_DATA;
411408
}
412-
#endif
413409
}
414410
#ifdef HAVE_TRANSACTION_CHECKS
415411
set_tx_simulation_warning();

src/nbgl/ui_sign_712.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ uint16_t ui_sign_712(e_eip712_filtering_mode filtering_mode) {
7575
ui_712_push_pairs();
7676

7777
if (filtering_mode == EIP712_FILTERING_BASIC) {
78-
#ifdef HAVE_GATING_SUPPORT
7978
if (set_gating_warning() == false) {
8079
return SWO_INCORRECT_DATA;
8180
}
82-
#endif
8381
}
8482

8583
ui_712_start_review(filtering_mode, TYPE_MESSAGE, ui_typed_message_review_choice);

src/shared_context.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ typedef struct internalStorage_t {
4040
// hidden setting (not shown in the UI)
4141
bool tx_check_opt_in;
4242
#endif
43-
#ifdef HAVE_GATING_SUPPORT
4443
uint8_t gating_counter;
45-
#endif
4644
bool eip7702_enable;
4745
bool displayHash;
4846
bool initialized;

tests/fuzzing/macros/add_macros.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ HAVE_CHALLENGE_NO_CHECK
33
HAVE_ETH2
44
HAVE_TRANSACTION_CHECKS
55
HAVE_SWAP
6-
HAVE_GATING_SUPPORT
76
HAVE_BYPASS_SIGNATURES

0 commit comments

Comments
 (0)