Upgrade the app to work with Namada v0.36.1.

app/src/parser_impl.c

@@ -70,8 +70,7 @@ parser_error_t getNumItems(const parser_context_t *ctx, uint8_t *numItems) {
             break;
         }
         case VoteProposal: {
-            const uint32_t delegations = ctx->tx_obj->voteProposal.number_of_delegations;
-            *numItems = (uint8_t) ((app_mode_expert() ? VOTE_PROPOSAL_EXPERT_PARAMS : VOTE_PROPOSAL_NORMAL_PARAMS) + delegations);
+            *numItems = (uint8_t) (app_mode_expert() ? VOTE_PROPOSAL_EXPERT_PARAMS : VOTE_PROPOSAL_NORMAL_PARAMS);
             break;
         }
         case RevealPubkey:

app/src/parser_impl_common.h

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

app/src/parser_impl_txn.c

@@ -28,9 +28,8 @@
 #define DISCRIMINANT_EXTRA_DATA 0x01
 #define DISCRIMINANT_CODE 0x02
 #define DISCRIMINANT_SIGNATURE 0x03
-#define DISCRIMINANT_CIPHERTEXT 0x04
-#define DISCRIMINANT_MASP_TX 0x05
-#define DISCRIMINANT_MASP_BUILDER 0x06
+#define DISCRIMINANT_MASP_TX 0x04
+#define DISCRIMINANT_MASP_BUILDER 0x05
 
 // Update VP types
 static const vp_types_t vp_user = { "vp_user.wasm", "User"};
@@ -419,15 +418,6 @@ static parser_error_t readVoteProposalTxn(const bytes_t *data, parser_tx_t *v) {
     v->voteProposal.voter.len = ADDRESS_LEN_BYTES;
     CHECK_ERROR(readBytes(&ctx, &v->voteProposal.voter.ptr, v->voteProposal.voter.len))
 
-    // Delegators
-    v->voteProposal.number_of_delegations = 0;
-    CHECK_ERROR(readUint32(&ctx, &v->voteProposal.number_of_delegations))
-    v->voteProposal.delegations.len = 0;
-    if (v->voteProposal.number_of_delegations > 0 ){
-        v->voteProposal.delegations.len = ADDRESS_LEN_BYTES*v->voteProposal.number_of_delegations;
-        CHECK_ERROR(readBytes(&ctx, &v->voteProposal.delegations.ptr, v->voteProposal.delegations.len))
-    }
-
     if ((ctx.offset != ctx.bufferLen)) {
         return parser_unexpected_characters;
     }
@@ -574,18 +564,6 @@ static parser_error_t readTransferTxn(const bytes_t *data, parser_tx_t *v) {
     // Amount denomination
     CHECK_ERROR(readByte(&ctx, &v->transfer.amount_denom))
 
-    uint32_t tmpValue = 0;
-    // Key, check if it is there
-    CHECK_ERROR(readByte(&ctx, &v->transfer.has_key))
-    if (v->transfer.has_key){
-        CHECK_ERROR(readUint32(&ctx, &tmpValue));
-        if (tmpValue > UINT16_MAX) {
-            return parser_value_out_of_range;
-        }
-        v->transfer.key.len = (uint16_t)tmpValue;
-        // we are not displaying these bytes
-        ctx.offset += v->transfer.key.len;
-    }
     // shielded hash, check if it is there
     CHECK_ERROR(readByte(&ctx, &v->transfer.has_shielded_hash))
     if (v->transfer.has_shielded_hash){
@@ -738,6 +716,20 @@ static parser_error_t readChangeValidatorMetadata(const bytes_t *data, tx_metada
         CHECK_ERROR(readBytes(&ctx, &metadataChange->avatar.ptr, metadataChange->avatar.len))
     }
 
+    /// The validator's name
+    metadataChange->name.ptr = NULL;
+    metadataChange->name.len = 0;
+    uint8_t has_name;
+    CHECK_ERROR(readByte(&ctx, &has_name))
+    if (has_name) {
+        CHECK_ERROR(readUint32(&ctx, &tmpValue));
+        if (tmpValue > UINT16_MAX) {
+            return parser_value_out_of_range;
+        }
+        metadataChange->name.len = (uint16_t)tmpValue;
+        CHECK_ERROR(readBytes(&ctx, &metadataChange->name.ptr, metadataChange->name.len))
+    }
+
     // Commission rate
     CHECK_ERROR(readByte(&ctx, &metadataChange->has_commission_rate))
     if (metadataChange->has_commission_rate) {
@@ -932,6 +924,13 @@ parser_error_t readHeader(parser_context_t *ctx, parser_tx_t *v) {
     v->transaction.timestamp.len = (uint16_t)tmpValue;
     CHECK_ERROR(readBytes(ctx, &v->transaction.timestamp.ptr, v->transaction.timestamp.len))
 
+    // Batch length
+    CHECK_ERROR(readUint32(ctx, &v->transaction.header.batchLen))
+    // Only singleton batches are supported currently
+    if (v->transaction.header.batchLen != 1) {
+        return parser_unexpected_value;
+    }
+
     // Code hash
     v->transaction.header.codeHash.len = HASH_LEN;
     CHECK_ERROR(readBytes(ctx, &v->transaction.header.codeHash.ptr, v->transaction.header.codeHash.len))
@@ -944,6 +943,9 @@ parser_error_t readHeader(parser_context_t *ctx, parser_tx_t *v) {
     v->transaction.header.memoHash.len = HASH_LEN;
     CHECK_ERROR(readBytes(ctx, &v->transaction.header.memoHash.ptr, v->transaction.header.memoHash.len))
 
+    // Atomic
+    CHECK_ERROR(readByte(ctx, &v->transaction.header.atomic))
+
     v->transaction.header.bytes.len = ctx->offset - tmpOffset;
 
     CHECK_ERROR(checkTag(ctx, 0x01))
@@ -968,20 +970,9 @@ parser_error_t readHeader(parser_context_t *ctx, parser_tx_t *v) {
     v->transaction.header.pubkey.len = 1 + (pkType == key_ed25519 ? PK_LEN_25519 : COMPRESSED_SECP256K1_PK_LEN);
     CHECK_ERROR(readBytes(ctx, &v->transaction.header.pubkey.ptr, v->transaction.header.pubkey.len))
 
-    // Epoch
-    CHECK_ERROR(readUint64(ctx, &v->transaction.header.epoch))
     // GasLimit
     CHECK_ERROR(readUint64(ctx, &v->transaction.header.gasLimit))
 
-
-    // Unshielded section hash
-    uint8_t has_unshield_section_hash = 0;
-    CHECK_ERROR(readByte(ctx, &has_unshield_section_hash))
-    if (has_unshield_section_hash){
-        v->transaction.header.unshieldSectionHash.len = HASH_LEN;
-        CHECK_ERROR(readBytes(ctx, &v->transaction.header.unshieldSectionHash.ptr, v->transaction.header.unshieldSectionHash.len))
-    }
-
     v->transaction.header.extBytes.len = ctx->offset - tmpOffset;
 
     return parser_ok;
@@ -1269,10 +1260,6 @@ parser_error_t readSections(parser_context_t *ctx, parser_tx_t *v) {
                 break;
             }
 #if(0)
-            case DISCRIMINANT_CIPHERTEXT:
-                CHECK_ERROR(readCiphertext(ctx, &v->transaction.sections.ciphertext))
-                break;
-
             case DISCRIMINANT_MASP_TX:
                 CHECK_ERROR(readMaspTx(ctx, &v->transaction.sections.maspTx))
                 break;

app/src/parser_print_common.c

@@ -402,7 +402,7 @@ parser_error_t printExpert( const parser_context_t *ctx,
                                    char *outVal, uint16_t outValLen,
                                    uint8_t pageIdx, uint8_t *pageCount) {
 
-    if(displayIdx >= 5 && ctx->tx_obj->transaction.header.fees.symbol != NULL) {
+    if(displayIdx >= 4 && ctx->tx_obj->transaction.header.fees.symbol != NULL) {
         displayIdx++;
     }
 
@@ -418,20 +418,14 @@ parser_error_t printExpert( const parser_context_t *ctx,
             CHECK_ERROR(printPublicKey(pubkey, outVal, outValLen, pageIdx, pageCount));
             break;
         }
-        case 2:
-            snprintf(outKey, outKeyLen, "Epoch");
-            if (uint64_to_str(outVal, outValLen, ctx->tx_obj->transaction.header.epoch) != NULL) {
-                return parser_unexpected_error;
-            }
-            break;
-        case 3: {
+        case 2: {
             snprintf(outKey, outKeyLen, "Gas limit");
             if (uint64_to_str(outVal, outValLen, ctx->tx_obj->transaction.header.gasLimit) != NULL) {
                 return parser_unexpected_error;
             }
             break;
         }
-        case 4: {
+        case 3: {
             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))
@@ -441,7 +435,7 @@ parser_error_t printExpert( const parser_context_t *ctx,
             }
             break;
         }
-        case 5: {
+        case 4: {
             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;

app/src/parser_print_txn.c

@@ -394,21 +394,11 @@ static parser_error_t printVoteProposalTxn(  const parser_context_t *ctx,
                                              uint8_t pageIdx, uint8_t *pageCount) {
     tx_vote_proposal_t *voteProposal = &ctx->tx_obj->voteProposal;
 
-    const uint32_t delegations_num = voteProposal->number_of_delegations;
-    const uint8_t delegations_first_field_idx = 4;
-    uint8_t adjustedDisplayIdx = \
-        (displayIdx < delegations_first_field_idx) \
-            ? displayIdx
-            : ((displayIdx < delegations_first_field_idx + delegations_num) \
-                ? delegations_first_field_idx
-                : displayIdx - delegations_num + 1);
-    *pageCount = 1;
-
     const bool hasMemo = ctx->tx_obj->transaction.header.memoSection != NULL;
-    if (adjustedDisplayIdx >= 5 && !hasMemo) {
-        adjustedDisplayIdx++;
+    if (displayIdx >= 4 && !hasMemo) {
+        displayIdx++;
     }
-    switch (adjustedDisplayIdx) {
+    switch (displayIdx) {
         case 0:
             snprintf(outKey, outKeyLen, "Type");
             snprintf(outVal, outValLen, "Vote Proposal");
@@ -450,26 +440,14 @@ static parser_error_t printVoteProposalTxn(  const parser_context_t *ctx,
             CHECK_ERROR(printAddress(voteProposal->voter, outVal, outValLen, pageIdx, pageCount))
             break;
         case 4:
-            if (voteProposal->number_of_delegations == 0) {
-                return parser_unexpected_value;
-            }
-            snprintf(outKey, outKeyLen, "Delegation");
-            if (displayIdx - adjustedDisplayIdx >= voteProposal->number_of_delegations) {
-                return parser_value_out_of_range;
-            }
-            const uint16_t delegationOffset = (displayIdx - adjustedDisplayIdx) * ADDRESS_LEN_BYTES;
-            const bytes_t tmpProposal = {.ptr = voteProposal->delegations.ptr + delegationOffset, .len = ADDRESS_LEN_BYTES};
-            CHECK_ERROR(printAddress(tmpProposal, outVal, outValLen, pageIdx, pageCount))
-            break;
-        case 5:
             CHECK_ERROR(printMemo(ctx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount))
             break;
 
         default:
             if (!app_mode_expert()) {
                 return parser_display_idx_out_of_range;
             }
-            displayIdx -= (5 + voteProposal->number_of_delegations - (hasMemo ? 0 : 1));
+            displayIdx -= 5;
             return printExpert(ctx, displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
     }
 

app/src/parser_txdef.h

@@ -144,13 +144,13 @@ typedef struct {
     bytes_t bytes;
     fees_t fees;
     bytes_t pubkey;
-    uint64_t epoch;
     uint64_t gasLimit;
-    bytes_t unshieldSectionHash;
+    uint32_t batchLen;
     bytes_t dataHash;
     bytes_t codeHash;
     bytes_t memoHash;
     const section_t *memoSection;
+    uint8_t atomic;
 } header_t;
 typedef struct {
     uint32_t sectionLen;

app/src/parser_types.h

@@ -173,9 +173,6 @@ typedef struct {
     bytes_t eth_bridge_signature;
     // proposal author address
     bytes_t voter;
-    // Delegator addresses
-    uint32_t number_of_delegations;
-    bytes_t delegations;
 } tx_vote_proposal_t;
 
 typedef struct {
@@ -238,6 +235,7 @@ typedef struct {
     bytes_t website;
     bytes_t discord_handle;
     bytes_t avatar;
+    bytes_t name;
 } tx_become_validator_t;
 
 typedef struct {
@@ -263,8 +261,6 @@ typedef struct {
     bytes_t amount;
     uint8_t amount_denom;
     const char* symbol;
-    uint8_t has_key;
-    bytes_t key;
     uint8_t has_shielded_hash;
     bytes_t shielded_hash;
 } tx_transfer_t;
@@ -317,6 +313,7 @@ typedef struct {
     bytes_t discord_handle;
     bytes_t avatar;
     uint8_t has_commission_rate;
+    bytes_t name;
     bytes_t commission_rate;
   } tx_metadata_change_t;
 

app/src/txn_validator.c

@@ -113,6 +113,20 @@ parser_error_t readBecomeValidator(const bytes_t *data, const section_t *extra_d
         CHECK_ERROR(readBytes(&ctx, &v->becomeValidator.avatar.ptr, v->becomeValidator.avatar.len))
     }
 
+    /// The validator's name
+    v->becomeValidator.name.ptr = NULL;
+    v->becomeValidator.name.len = 0;
+    uint8_t has_name;
+    CHECK_ERROR(readByte(&ctx, &has_name))
+    if (has_name) {
+        CHECK_ERROR(readUint32(&ctx, &tmpValue));
+        if (tmpValue > UINT16_MAX) {
+            return parser_value_out_of_range;
+        }
+        v->becomeValidator.name.len = (uint16_t)tmpValue;
+        CHECK_ERROR(readBytes(&ctx, &v->becomeValidator.name.ptr, v->becomeValidator.name.len))
+    }
+
     if (ctx.offset != ctx.bufferLen) {
         return parser_unexpected_characters;
     }