Remove sign data cap

CMakeLists.txt

@@ -119,7 +119,6 @@ file(GLOB_RECURSE LIB_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl_eth.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_data_cap.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_client_deal.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/fil_utils.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_raw_bytes.c

app/Makefile.version

@@ -1,6 +1,6 @@
 # This is the major version of this release
-APPVERSION_M=1
+APPVERSION_M=2
 # This is the minor version of this release
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=1
+APPVERSION_P=0

app/src/apdu_handler.c

@@ -372,11 +372,6 @@ handleSign(volatile uint32_t *flags, volatile uint32_t *tx, uint32_t rx)
             tx_context_fil();
             break;
 
-        case INS_SIGN_DATACAP:
-            ZEMU_LOGF(50, "HandleSignDatacap\n")
-            tx_context_datacap();
-            break;
-
         case INS_CLIENT_DEAL:
             ZEMU_LOGF(50, "HandleSignClientDeal\n")
             tx_context_client_deal();
@@ -542,11 +537,6 @@ handleApdu(volatile uint32_t *flags, volatile uint32_t *tx, uint32_t rx)
                     handleSign(flags, tx, rx);
                     break;
                 }
-                case INS_SIGN_DATACAP: {
-                    CHECK_PIN_VALIDATED()
-                    handleSign(flags, tx, rx);
-                    break;
-                }
                 case INS_CLIENT_DEAL: {
                     CHECK_PIN_VALIDATED()
                     handleSign(flags, tx, rx);

app/src/coin.h

@@ -67,7 +67,6 @@ typedef enum {
 #define INS_GET_ADDR_SECP256K1          0x01
 #define INS_SIGN_SECP256K1              0x02
 #define INS_SIGN_ETH                    0x04
-#define INS_SIGN_DATACAP                0x05
 #define INS_CLIENT_DEAL                 0x06
 #define INS_SIGN_RAW_BYTES              0x07
 #define INS_GET_ADDR_ETH                0x02

app/src/common/parser_common.h

@@ -65,11 +65,9 @@ typedef enum {
   parser_invalid_rlp_data,
   parser_invalid_chain_id,
   parser_invalid_rs_values,
-  parser_invalid_datacap_tx,
   parser_invalid_cid,
   parser_invalid_deal_duration,
   parser_invalid_prefix,
-  parser_invalid_datacap_prefix,
   // Customs
   parser_expert_mode_required,
 } parser_error_t;
@@ -82,7 +80,6 @@ typedef enum {
 typedef enum {
   fil_tx = 0,
   eth_tx,
-  datacap_tx,
   clientdeal_tx,
   raw_bytes,
 } tx_type_t;

app/src/common/tx.c

@@ -62,10 +62,6 @@ void tx_context_eth() {
   ctx_parsed_tx.tx_type = eth_tx;
 }
 
-void tx_context_datacap() {
-  ctx_parsed_tx.tx_type = datacap_tx;
-}
-
 void tx_context_client_deal() {
   ctx_parsed_tx.tx_type = clientdeal_tx;
 }

app/src/common/tx.h

@@ -22,7 +22,6 @@
 // transaction initializer for the buffer and transaction type.
 void tx_context_fil();
 void tx_context_eth();
-void tx_context_datacap();
 void tx_context_client_deal();
 void tx_context_raw_bytes();
 

app/src/parser.c

@@ -21,7 +21,6 @@
 #include "common/parser_common.h"
 #include "fil_utils.h"
 #include "parser_client_deal.h"
-#include "parser_data_cap.h"
 #include "parser_impl.h"
 #include "parser_impl_eth.h"
 #include "parser_raw_bytes.h"
@@ -85,10 +84,6 @@ parser_error_t parser_parse(parser_context_t *ctx, const uint8_t *data,
     CHECK_PARSER_ERR(parser_init(ctx, data, dataLen))
     return _readEth(ctx, &eth_tx_obj);
   }
-  case datacap_tx: {
-    CHECK_PARSER_ERR(parser_init(ctx, data, dataLen))
-    return _readDataCap(ctx, &parser_tx_obj.rem_datacap_tx);
-  }
   case clientdeal_tx: {
     CHECK_PARSER_ERR(parser_init(ctx, data, dataLen))
     return _readClientDeal(ctx, &parser_tx_obj.client_deal_tx);
@@ -118,10 +113,6 @@ parser_error_t parser_validate(const parser_context_t *ctx) {
     CHECK_PARSER_ERR(_validateTxEth())
     break;
   }
-  case datacap_tx: {
-    CHECK_PARSER_ERR(_validateDataCap(ctx))
-    break;
-  }
   case clientdeal_tx: {
     CHECK_PARSER_ERR(_validateClientDeal(ctx))
     break;
@@ -161,10 +152,6 @@ parser_error_t parser_getNumItems(const parser_context_t *ctx,
     CHECK_PARSER_ERR(_getNumItemsEth(num_items));
     break;
   }
-  case datacap_tx: {
-    *num_items = _getNumItemsDataCap(ctx);
-    break;
-  }
   case clientdeal_tx: {
     *num_items = _getNumItemsClientDeal(ctx);
     break;
@@ -375,10 +362,6 @@ parser_error_t parser_getItem(const parser_context_t *ctx, uint8_t displayIdx,
     return _getItemEth(ctx, displayIdx, outKey, outKeyLen, outVal, outValLen,
                        pageIdx, pageCount);
   }
-  case datacap_tx: {
-    return _getItemDataCap(ctx, displayIdx, outKey, outKeyLen, outVal,
-                           outValLen, pageIdx, pageCount);
-  }
   case clientdeal_tx: {
     return _getItemClientDeal(ctx, displayIdx, outKey, outKeyLen, outVal,
                               outValLen, pageIdx, pageCount);

app/src/parser_impl.c

@@ -91,16 +91,12 @@ const char *parser_getErrorDescription(parser_error_t err) {
     return "Invalid eth chainId";
   case parser_invalid_rs_values:
     return "Invalid rs values";
-  case parser_invalid_datacap_tx:
-    return "Invalid remove allowance tx";
   case parser_invalid_cid:
     return "Invalid CID";
   case parser_invalid_deal_duration:
     return "Client deal duration must be >= 518400";
   case parser_invalid_prefix:
     return "Invalid raw-bytes prefix";
-  case parser_invalid_datacap_prefix:
-    return "Invalid datacap prefix";
   case parser_expert_mode_required:
     return "ExpertModeRequired";
   default: