Chain id expert (#121)

* add chain_id on expert screens * update snapshots
Zondax · Feb 7, 2025 · 2496d57 · 2496d57
1 parent 3885898
commit 2496d57
Show file tree

Hide file tree

Showing 53 changed files with 58,039 additions and 57,033 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=3
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1
diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c
@@ -70,7 +70,7 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
                 items += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_outputs; // print from outputs
                 items += 3 * ctx->tx_obj->transaction.sections.maspBuilder.builder.sapling_builder.n_spends; // print from spends
 
-                *numItems = (app_mode_expert() ? items + 4 : items + 2);
+                *numItems = (app_mode_expert() ? items + 5 : items + 2);
             } else {
                 *numItems = (app_mode_expert() ? TRANSFER_EXPERT_PARAMS : TRANSFER_NORMAL_PARAMS);
             }

diff --git a/app/src/parser_impl_common.h b/app/src/parser_impl_common.h
@@ -25,64 +25,64 @@ extern "C" {
 #endif
 
 #define BOND_NORMAL_PARAMS  5
-#define BOND_EXPERT_PARAMS  7
+#define BOND_EXPERT_PARAMS  8
 
 #define CUSTOM_NORMAL_PARAMS  3
-#define CUSTOM_EXPERT_PARAMS  7
+#define CUSTOM_EXPERT_PARAMS  8
 
 #define INIT_ACCOUNT_NORMAL_PARAMS  5
-#define INIT_ACCOUNT_EXPERT_PARAMS  7
+#define INIT_ACCOUNT_EXPERT_PARAMS  8
 
 #define INIT_PROPOSAL_NORMAL_PARAMS  9
-#define INIT_PROPOSAL_EXPERT_PARAMS  11
+#define INIT_PROPOSAL_EXPERT_PARAMS  12
 
 #define VOTE_PROPOSAL_NORMAL_PARAMS 6
-#define VOTE_PROPOSAL_EXPERT_PARAMS 8
+#define VOTE_PROPOSAL_EXPERT_PARAMS 9
 
 #define BECOME_VALIDATOR_NORMAL_PARAMS  11
-#define BECOME_VALIDATOR_EXPERT_PARAMS  13
+#define BECOME_VALIDATOR_EXPERT_PARAMS  14
 
 #define REVEAL_PUBKEY_NORMAL_PARAMS  4
-#define REVEAL_PUBKEY_EXPERT_PARAMS  6
+#define REVEAL_PUBKEY_EXPERT_PARAMS  7
 
 #define TRANSFER_NORMAL_PARAMS  3
-#define TRANSFER_EXPERT_PARAMS  5
+#define TRANSFER_EXPERT_PARAMS  6
 
 #define UPDATE_VP_NORMAL_PARAMS  4
-#define UPDATE_VP_EXPERT_PARAMS  6
+#define UPDATE_VP_EXPERT_PARAMS  7
 
 #define WITHDRAW_NORMAL_PARAMS  4
-#define WITHDRAW_EXPERT_PARAMS  6
+#define WITHDRAW_EXPERT_PARAMS  7
 
 #define COMMISSION_CHANGE_NORMAL_PARAMS  5
-#define COMMISSION_CHANGE_EXPERT_PARAMS  7
+#define COMMISSION_CHANGE_EXPERT_PARAMS  8
 
 #define UNJAIL_VALIDATOR_NORMAL_PARAMS  4
-#define UNJAIL_VALIDATOR_EXPERT_PARAMS  6
+#define UNJAIL_VALIDATOR_EXPERT_PARAMS  7
 
 #define IBC_NORMAL_PARAMS  10
-#define IBC_EXPERT_PARAMS  12
+#define IBC_EXPERT_PARAMS  13
 
 #define REDELEGATE_NORMAL_PARAMS  7
-#define REDELEGATE_EXPERT_PARAMS  9
+#define REDELEGATE_EXPERT_PARAMS  10
 
 #define CLAIM_REWARDS_NORMAL_PARAMS  4
-#define CLAIM_REWARDS_EXPERT_PARAMS  6
+#define CLAIM_REWARDS_EXPERT_PARAMS  7
 
 #define RESIGN_STEWARD_NORMAL_PARAMS  4
-#define RESIGN_STEWARD_EXPERT_PARAMS  6
+#define RESIGN_STEWARD_EXPERT_PARAMS  7
 
 #define CHANGE_CONSENSUS_KEY_NORMAL_PARAMS  5
-#define CHANGE_CONSENSUS_KEY_EXPERT_PARAMS  7
+#define CHANGE_CONSENSUS_KEY_EXPERT_PARAMS  8
 
 #define UPDATE_STEWARD_COMMISSION_NORMAL_PARAMS  4
-#define UPDATE_STEWARD_COMMISSION_EXPERT_PARAMS  6
+#define UPDATE_STEWARD_COMMISSION_EXPERT_PARAMS  7
 
 #define CHANGE_VALIDATOR_METADATA_NORMAL_PARAMS  4
-#define CHANGE_VALIDATOR_METADATA_EXPERT_PARAMS  6
+#define CHANGE_VALIDATOR_METADATA_EXPERT_PARAMS  7
 
 #define BRIDGE_POOL_TRANSFER_NORMAL_PARAMS  11
-#define BRIDGE_POOL_TRANSFER_EXPERT_PARAMS  13
+#define BRIDGE_POOL_TRANSFER_EXPERT_PARAMS  14
 
 #define CTX_CHECK_AVAIL(CTX, SIZE) \
     if ( (CTX) == NULL || ((CTX)->offset + (SIZE)) > (CTX)->bufferLen) { return parser_unexpected_buffer_end; }

diff --git a/app/src/parser_impl_txn.c b/app/src/parser_impl_txn.c
@@ -950,8 +950,9 @@ parser_error_t readHeader(parser_context_t *ctx, parser_tx_t *v) {
     // Read length of chain_id
     uint32_t chain_id_len = 0;
     CHECK_ERROR(readUint32(ctx, &chain_id_len))
+    v->transaction.header.chain_id.len = (uint16_t)chain_id_len;
 
-    ctx->offset += chain_id_len;
+    CHECK_ERROR(readBytes(ctx, &v->transaction.header.chain_id.ptr, v->transaction.header.chain_id.len))
 
     // Check if an expiration is set
     uint8_t has_expiration = 0;

diff --git a/app/src/parser_print_common.c b/app/src/parser_print_common.c
@@ -414,29 +414,33 @@ parser_error_t printExpert( const parser_context_t *ctx,
                                    char *outVal, uint16_t outValLen,
                                    uint8_t pageIdx, uint8_t *pageCount) {
 
-    if(displayIdx >= 4 && ctx->tx_obj->transaction.header.fees.symbol != NULL) {
+    if(displayIdx >= 5 && ctx->tx_obj->transaction.header.fees.symbol != NULL) {
         displayIdx++;
     }
 
     switch (displayIdx) {
         case 0:
+            snprintf(outKey, outKeyLen, "Chain ID");
+            pageStringExt(outVal, outValLen, (const char*)ctx->tx_obj->transaction.header.chain_id.ptr, ctx->tx_obj->transaction.header.chain_id.len, pageIdx, pageCount);
+            break;
+        case 1:
             snprintf(outKey, outKeyLen, "Timestamp");
             CHECK_ERROR(printTimestamp(ctx->tx_obj->transaction.timestamp,
                                        outVal, outValLen, pageIdx, pageCount))
             break;
-        case 1: {
+        case 2: {
             const bytes_t *pubkey = &ctx->tx_obj->transaction.header.pubkey;
             snprintf(outKey, outKeyLen, "Pubkey");
             CHECK_ERROR(printPublicKey(pubkey, outVal, outValLen, pageIdx, pageCount));
             break;
         }
-        case 2:
+        case 3:
             snprintf(outKey, outKeyLen, "Gas limit");
             if (uint64_to_str(outVal, outValLen, ctx->tx_obj->transaction.header.gasLimit) != NULL) {
                 return parser_unexpected_error;
             }
             break;
-        case 3: {
+        case 4: {
             if(ctx->tx_obj->transaction.header.fees.symbol != NULL) {
                 snprintf(outKey, outKeyLen, "Fees/gas unit");
                 CHECK_ERROR(printAmount(&ctx->tx_obj->transaction.header.fees.amount, true, ctx->tx_obj->transaction.header.fees.denom, "", outVal, outValLen, pageIdx, pageCount))
@@ -446,7 +450,7 @@ parser_error_t printExpert( const parser_context_t *ctx,
             }
             break;
         }
-        case 4: {
+        case 5: {
             snprintf(outKey, outKeyLen, "Fees/gas unit");
             CHECK_ERROR(printAmount(&ctx->tx_obj->transaction.header.fees.amount, true, ctx->tx_obj->transaction.header.fees.denom, "", outVal, outValLen, pageIdx, pageCount))
             break;

diff --git a/app/src/parser_txdef.h b/app/src/parser_txdef.h
@@ -263,6 +263,7 @@ typedef struct {
     bytes_t memoHash;
     const section_t *memoSection;
     uint8_t atomic;
+    bytes_t chain_id;
 } header_t;
 typedef struct {
     uint32_t sectionLen;