Remove migrated-to-tenderbake as its redundant.

trilitech · Apr 5, 2024 · aab6b79 · aab6b79
1 parent 6302254
commit aab6b79
Show file tree

Hide file tree

Showing 181 changed files with 73 additions and 92 deletions.
diff --git a/src/apdu_query.c b/src/apdu_query.c
@@ -40,21 +40,14 @@ int handle_query_all_hwm(void) {
     write_u32_be(resp, offset, N_data.hwm.main.highest_level);
     offset += sizeof(uint32_t);
 
-    bool has_a_chain_migrated =
-        N_data.hwm.main.migrated_to_tenderbake || N_data.hwm.test.migrated_to_tenderbake;
-
-    if (has_a_chain_migrated) {
-        write_u32_be(resp, offset, N_data.hwm.main.highest_round);
-        offset += sizeof(uint32_t);
-    }
+    write_u32_be(resp, offset, N_data.hwm.main.highest_round);
+    offset += sizeof(uint32_t);
 
     write_u32_be(resp, offset, N_data.hwm.test.highest_level);
     offset += sizeof(uint32_t);
 
-    if (has_a_chain_migrated) {
-        write_u32_be(resp, offset, N_data.hwm.test.highest_round);
-        offset += sizeof(uint32_t);
-    }
+    write_u32_be(resp, offset, N_data.hwm.test.highest_round);
+    offset += sizeof(uint32_t);
 
     write_u32_be(resp, offset, N_data.main_chain_id.v);
     offset += sizeof(uint32_t);
@@ -69,10 +62,8 @@ int handle_query_main_hwm(void) {
     write_u32_be(resp, offset, N_data.hwm.main.highest_level);
     offset += sizeof(uint32_t);
 
-    if (N_data.hwm.main.migrated_to_tenderbake) {
-        write_u32_be(resp, offset, N_data.hwm.main.highest_round);
-        offset += sizeof(uint32_t);
-    }
+    write_u32_be(resp, offset, N_data.hwm.main.highest_round);
+    offset += sizeof(uint32_t);
 
     return io_send_response_pointer(resp, offset, SW_OK);
 }

diff --git a/src/apdu_setup.c b/src/apdu_setup.c
@@ -49,12 +49,10 @@ static bool ok(void) {
         ram->hwm.main.highest_round = 0;
         ram->hwm.main.had_attestation = false;
         ram->hwm.main.had_preattestation = false;
-        ram->hwm.main.migrated_to_tenderbake = false;
         ram->hwm.test.highest_level = G.hwm.test;
         ram->hwm.test.highest_round = 0;
         ram->hwm.test.had_attestation = false;
         ram->hwm.test.had_preattestation = false;
-        ram->hwm.test.migrated_to_tenderbake = false;
     });
 
     provide_pubkey(&global.path_with_curve);

diff --git a/src/baking_auth.c b/src/baking_auth.c
@@ -57,7 +57,6 @@ tz_exc write_high_water_mark(parsed_baking_data_t const *const in) {
         dest->highest_round = in->round;
         dest->had_attestation |= in->type == BAKING_TYPE_ATTESTATION;
         dest->had_preattestation |= in->type == BAKING_TYPE_PREATTESTATION;
-        dest->migrated_to_tenderbake |= in->is_tenderbake;
     });
 
 end:

diff --git a/src/to_string.c b/src/to_string.c
@@ -305,25 +305,21 @@ int hwm_to_string(char *dest, size_t dest_size, high_watermark_t const *const hw
     if (dest == NULL) {
         return -1;
     }
-    if (hwm->migrated_to_tenderbake) {
-        int result = number_to_string(dest, dest_size, hwm->highest_level);
-        if (result < 0) {
-            return result;
-        }
-        size_t offset = (size_t) result;
-
-        dest[offset] = ' ';
-        offset++;
+    int result = number_to_string(dest, dest_size, hwm->highest_level);
+    if (result < 0) {
+        return result;
+    }
+    size_t offset = (size_t) result;
 
-        result = number_to_string(dest + offset, dest_size - offset, hwm->highest_round);
-        if (result < 0) {
-            return result;
-        }
+    dest[offset] = ' ';
+    offset++;
 
-        return offset + (size_t) result;
-    } else {
-        return number_to_string(dest, dest_size, hwm->highest_level);
+    result = number_to_string(dest + offset, dest_size - offset, hwm->highest_round);
+    if (result < 0) {
+        return result;
     }
+
+    return offset + (size_t) result;
 }
 
 int hwm_status_to_string(char *dest, size_t dest_size, volatile bool const *hwm_disabled) {

diff --git a/src/types.h b/src/types.h
@@ -179,11 +179,10 @@ static inline bool bip32_path_with_curve_eq(bip32_path_with_curve_t volatile con
  *
  */
 typedef struct {
-    level_t highest_level;        ///< highest level seen
-    round_t highest_round;        ///< highest round seen
-    bool had_attestation;         ///< if an attestation has been seen at current level/round
-    bool had_preattestation;      ///< if a pre-attestation has been seen at current level/round
-    bool migrated_to_tenderbake;  ///< if chain has migrated to tenderbake
+    level_t highest_level;    ///< highest level seen
+    round_t highest_round;    ///< highest round seen
+    bool had_attestation;     ///< if an attestation has been seen at current level/round
+    bool had_preattestation;  ///< if a pre-attestation has been seen at current level/round
 } high_watermark_t;
 
 /**

diff --git a/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
diff --git a/...ing/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/...ing/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
diff --git a/...ing/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/...ing/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
diff --git a/...g/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/...g/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
diff --git a/...g/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/...g/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
diff --git a/test/snapshots/nanos/test_deauthorize/app_context/high_watermark.png b/test/snapshots/nanos/test_deauthorize/app_context/high_watermark.png
diff --git a/test/snapshots/nanos/test_reset_app_context/app_context/high_watermark.png b/test/snapshots/nanos/test_reset_app_context/app_context/high_watermark.png
diff --git a/...view_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png b/...view_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png
diff --git a/...est_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png b/...est_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png
diff --git a/...est_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png b/...est_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png
diff --git a/...t_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png b/...t_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png
diff --git a/...t_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png b/...t_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png
diff --git a/test/snapshots/nanos/test_review_home/high_watermark.png b/test/snapshots/nanos/test_review_home/high_watermark.png
diff --git a/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
diff --git a/...ext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/...ext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
diff --git a/...ext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/...ext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
diff --git a/...t/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/...t/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
diff --git a/...t/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/...t/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
diff --git a/...ing/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/...ing/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
diff --git a/...ing/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/...ing/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
diff --git a/...g/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/...g/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
diff --git a/...g/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/...g/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
diff --git a/test/snapshots/nanosp/test_deauthorize/app_context/high_watermark.png b/test/snapshots/nanosp/test_deauthorize/app_context/high_watermark.png
diff --git a/test/snapshots/nanosp/test_reset_app_context/app_context/high_watermark.png b/test/snapshots/nanosp/test_reset_app_context/app_context/high_watermark.png
diff --git a/...view_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png b/...view_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png
diff --git a/...est_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png b/...est_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png
diff --git a/...est_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png b/...est_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png
diff --git a/...t_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png b/...t_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png
diff --git a/...t_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png b/...t_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png
diff --git a/test/snapshots/nanosp/test_review_home/high_watermark.png b/test/snapshots/nanosp/test_review_home/high_watermark.png
diff --git a/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
diff --git a/...ext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/...ext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
diff --git a/...ext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/...ext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
diff --git a/...t/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/...t/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
diff --git a/...t/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/...t/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
diff --git a/...ing/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/...ing/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
diff --git a/...ing/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/...ing/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
diff --git a/...g/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/...g/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
diff --git a/...g/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/...g/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
diff --git a/test/snapshots/nanox/test_deauthorize/app_context/high_watermark.png b/test/snapshots/nanox/test_deauthorize/app_context/high_watermark.png
diff --git a/test/snapshots/nanox/test_reset_app_context/app_context/high_watermark.png b/test/snapshots/nanox/test_reset_app_context/app_context/high_watermark.png
diff --git a/...view_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png b/...view_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/high_watermark.png
diff --git a/...est_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png b/...est_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/high_watermark.png
diff --git a/...est_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png b/...est_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/high_watermark.png
diff --git a/...t_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png b/...t_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/high_watermark.png
diff --git a/...t_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png b/...t_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/high_watermark.png
diff --git a/test/snapshots/nanox/test_review_home/high_watermark.png b/test/snapshots/nanox/test_review_home/high_watermark.png
diff --git a/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png b/...P32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/high_watermark.png
diff --git a/...ext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png b/...ext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/high_watermark.png
diff --git a/...ext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png b/...ext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/high_watermark.png
diff --git a/...t/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png b/...t/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/high_watermark.png
diff --git a/...t/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png b/...t/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/high_watermark.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/.../BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png b/.../BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png
diff --git a/...baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png b/...baking/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png
diff --git a/...baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png b/...baking/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png
diff --git a/...king/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png b/...king/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png
diff --git a/...king/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png b/...king/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png
diff --git a/test/snapshots/stax/test_deauthorize/app_context/app_context.png b/test/snapshots/stax/test_deauthorize/app_context/app_context.png
diff --git a/test/snapshots/stax/test_deauthorize/authorized_key_after_authorize.png b/test/snapshots/stax/test_deauthorize/authorized_key_after_authorize.png
diff --git a/test/snapshots/stax/test_deauthorize/authorized_key_before_authorize.png b/test/snapshots/stax/test_deauthorize/authorized_key_before_authorize.png
diff --git a/test/snapshots/stax/test_reset_app_context/app_context/app_context.png b/test/snapshots/stax/test_reset_app_context/app_context/app_context.png
diff --git a/..._review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png b/..._review_home/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context.png
diff --git a/...x/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png b/...x/test_review_home/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context.png
diff --git a/...x/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png b/...x/test_review_home/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context.png
diff --git a/...test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png b/...test_review_home/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context.png
diff --git a/...test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png b/...test_review_home/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context.png
diff --git a/test/snapshots/stax/test_review_home/app_context.png b/test/snapshots/stax/test_review_home/app_context.png
diff --git a/.../BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png b/.../BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/app_context/app_context.png
diff --git a/...ontext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png b/...ontext/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/app_context/app_context.png
diff --git a/...ontext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png b/...ontext/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/app_context/app_context.png
diff --git a/...text/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png b/...text/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/app_context/app_context.png
diff --git a/...text/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png b/...text/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/app_context/app_context.png
diff --git a/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...ign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/...ign_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...gn_attestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...ign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/...ign_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...gn_attestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...n_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...n_attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/..._attestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...n_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...n_attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/..._attestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...ation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...ation_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...tion_dal/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/...attestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/...attestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...ttestation_dal/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...testation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...testation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...estation_dal/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...testation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...testation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...estation_dal/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...ign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...ign_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...gn_block/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/...test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/...test_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...est_sign_block/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/...test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/...test_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...est_sign_block/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...st_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...st_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...t_sign_block/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...st_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...st_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...t_sign_block/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png b/...testation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_after_sign.png
diff --git a/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png b/...estation/BIP32_ED25519_tz1VKyZ3RFDwTkrz5LKcTc6fcYqZj6pvsyA7/hwm_before_sign.png
diff --git a/..._preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png b/..._preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_after_sign.png
diff --git a/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png b/...preattestation/ED25519_tz1dyX3B1CFYa2DfdFLyPtiJCfQRUgPVME6E/hwm_before_sign.png
diff --git a/..._preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png b/..._preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_after_sign.png
diff --git a/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png b/...preattestation/ED25519_tz1ez9eEyAxuDZACjHdCXym43UQDdMNa3LEL/hwm_before_sign.png
diff --git a/...reattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png b/...reattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_after_sign.png
diff --git a/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png b/...eattestation/SECP256K1_tz2GB5YHqF4UzQ8GP5yUqdhY9oVWRXCY2hPU/hwm_before_sign.png
diff --git a/...reattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png b/...reattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_after_sign.png
diff --git a/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png b/...eattestation/SECP256R1_tz3UMNyvQeMj6mQSftW2aV2XaWd3afTAM1d5/hwm_before_sign.png
diff --git a/test/test_instructions.py b/test/test_instructions.py
@@ -64,8 +64,8 @@ def test_review_home(account: Optional[Account],
 
     if account is not None:
         main_chain_id = "NetXH12AexHqTQa" # Chain = 1
-        main_hwm = Hwm(1)
-        test_hwm = Hwm(2)
+        main_hwm = Hwm(1,0)
+        test_hwm = Hwm(2,0)
 
         tezos_navigator.setup_app_context(
             account,
@@ -230,8 +230,8 @@ def test_ledger_screensaver(client: TezosClient, tezos_navigator: TezosNavigator
 
     lvl = 0
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(lvl)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(lvl, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -259,8 +259,8 @@ def test_benchmark_attestation_time(account: Account, client: TezosClient, tezos
 
     lvl = 0
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(lvl)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(lvl, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -295,8 +295,8 @@ def test_authorize_baking(account: Account, tezos_navigator: TezosNavigator) ->
     tezos_navigator.check_app_context(
         account,
         chain_id=DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0),
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0),
         snap_path=snap_path
     )
 
@@ -327,8 +327,8 @@ def test_deauthorize(firmware: Firmware,
     tezos_navigator.check_app_context(
         None,
         chain_id=DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
 @pytest.mark.parametrize("account", ACCOUNTS)
@@ -401,8 +401,8 @@ def test_reset_app_context(tezos_navigator: TezosNavigator) -> None:
     tezos_navigator.check_app_context(
         None,
         chain_id=DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(reset_level),
-        test_hwm=Hwm(reset_level)
+        main_hwm=Hwm(reset_level, 0),
+        test_hwm=Hwm(reset_level, 0)
     )
 
 
@@ -412,8 +412,8 @@ def test_setup_app_context(account: Account, tezos_navigator: TezosNavigator) ->
     snap_path = Path(f"{account}")
 
     main_chain_id = "NetXH12AexHqTQa" # Chain = 1
-    main_hwm = Hwm(1)
-    test_hwm = Hwm(2)
+    main_hwm = Hwm(1, 0)
+    test_hwm = Hwm(2, 0)
 
     public_key = tezos_navigator.setup_app_context(
         account,
@@ -442,8 +442,8 @@ def test_get_main_hwm(
     """Test the QUERY_MAIN_HWM instruction."""
 
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(0)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(0, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -466,8 +466,8 @@ def test_get_all_hwm(
     """Test the QUERY_ALL_HWM instruction."""
 
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(0)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(0, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -532,8 +532,8 @@ def test_sign_preattestation(
     snap_path = Path(f"{account}")
 
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(0)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(0, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -590,8 +590,8 @@ def test_sign_attestation(
     snap_path = Path(f"{account}")
 
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(0)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(0, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -647,8 +647,8 @@ def test_sign_attestation_dal(
     snap_path = Path(f"{account}")
 
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(0)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(0, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -704,8 +704,8 @@ def test_sign_block(
     snap_path = Path(f"{account}")
 
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(0)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(0, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -756,8 +756,8 @@ def test_sign_block_at_reset_level(client: TezosClient, tezos_navigator: TezosNa
     reset_level: int = 1
 
     main_chain_id = DEFAULT_CHAIN_ID
-    main_hwm = Hwm(reset_level)
-    test_hwm = Hwm(0)
+    main_hwm = Hwm(reset_level, 0)
+    test_hwm = Hwm(0, 0)
 
     tezos_navigator.setup_app_context(
         account,
@@ -823,8 +823,8 @@ def test_sign_level_authorized(
     tezos_navigator.setup_app_context(
         account,
         main_chain_id,
-        main_hwm=Hwm(main_level),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(main_level, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     level_1, round_1 = level_round_1
@@ -861,8 +861,8 @@ def test_sign_delegation(
     tezos_navigator.setup_app_context(
         account,
         DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     delegation = Delegation(
@@ -932,8 +932,8 @@ def test_sign_delegation_constraints(
     tezos_navigator.setup_app_context(
         setup_account,
         DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     delegation = Delegation(
@@ -960,8 +960,8 @@ def test_sign_reveal(
     tezos_navigator.setup_app_context(
         account,
         DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     reveal = Reveal(
@@ -1027,8 +1027,8 @@ def test_sign_reveal_constraints(
     tezos_navigator.setup_app_context(
         setup_account,
         DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     reveal = Reveal(
@@ -1056,8 +1056,8 @@ def test_sign_not_authorized_key(
     tezos_navigator.setup_app_context(
         account_1,
         main_chain_id,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     attestation = build_attestation(0, 0, main_chain_id)
@@ -1079,8 +1079,8 @@ def test_sign_transaction(
     tezos_navigator.setup_app_context(
         account_1,
         main_chain_id,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     ctxt = pytezos.using()
@@ -1196,8 +1196,8 @@ def test_sign_multiple_operation(
     tezos_navigator.setup_app_context(
         account,
         DEFAULT_CHAIN_ID,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     operation = operation_builder_1(account)
@@ -1238,8 +1238,8 @@ def test_sign_when_no_chain_setup(
     tezos_navigator.setup_app_context(
         account,
         DEFAULT_CHAIN_ID, # Chain = 0
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     attestation = build_attestation(
@@ -1298,8 +1298,8 @@ def test_sign_when_chain_is_setup(
     tezos_navigator.setup_app_context(
         account,
         main_chain_id,
-        main_hwm=Hwm(0),
-        test_hwm=Hwm(0)
+        main_hwm=Hwm(0, 0),
+        test_hwm=Hwm(0, 0)
     )
 
     attestation = build_attestation(