Merge pull request #609 from Cypherock/fix/btc/add-witness-counter

fix(app): Add btc verify ips witness counter

Author: vrockz747

apps/btc_family/btc_inputs_validator.c

@@ -203,7 +203,8 @@ btc_validation_error_e btc_validate_inputs(byte_stream_t *stream,
   }
 
   uint64_t in_counter = decode_varint(stream, &hash_ctx);
-  while (in_counter--) {
+  uint64_t in_index = 0;
+  while (in_index < in_counter) {
     uint8_t prev_transaction_hash[SHA256_DIGEST_LENGTH] = {0};
     status = read_byte_stream(
         stream, prev_transaction_hash, sizeof(prev_transaction_hash));
@@ -245,6 +246,8 @@ btc_validation_error_e btc_validate_inputs(byte_stream_t *stream,
       return BTC_VALIDATE_ERR_READ_STREAM;
     }
     sha256_Update(&hash_ctx, sequence_no, sizeof(sequence_no));
+
+    in_index++;
   }
 
   uint64_t out_counter = decode_varint(stream, &hash_ctx);
@@ -288,21 +291,23 @@ btc_validation_error_e btc_validate_inputs(byte_stream_t *stream,
   // Optional witness data, not used in calculating hash
   // https://bitcoin.stackexchange.com/questions/113697/what-are-the-parts-of-a-bitcoin-transaction-in-segwit-format
   if (is_segwit) {
-    uint64_t witness_count = decode_varint(stream, NULL);
-    while (witness_count--) {
-      uint64_t witness_component_length = decode_varint(stream, NULL);
-      while (witness_component_length > 0) {
-        uint64_t length_to_parse = SLICE_SIZE;
-        if (witness_component_length < length_to_parse) {
-          length_to_parse = witness_component_length;
-        }
-
-        status = skip_byte_stream(stream, length_to_parse);
-        if (status != BYTE_STREAM_SUCCESS) {
-          return BTC_VALIDATE_ERR_READ_STREAM;
+    while (in_counter--) {
+      uint64_t witness_count = decode_varint(stream, NULL);
+      while (witness_count--) {
+        uint64_t witness_component_length = decode_varint(stream, NULL);
+        while (witness_component_length > 0) {
+          uint64_t length_to_parse = SLICE_SIZE;
+          if (witness_component_length < length_to_parse) {
+            length_to_parse = witness_component_length;
+          }
+
+          status = skip_byte_stream(stream, length_to_parse);
+          if (status != BYTE_STREAM_SUCCESS) {
+            return BTC_VALIDATE_ERR_READ_STREAM;
+          }
+
+          witness_component_length -= length_to_parse;
         }
-
-        witness_component_length -= length_to_parse;
       }
     }
   }
@@ -327,4 +332,4 @@ btc_validation_error_e btc_validate_inputs(byte_stream_t *stream,
   }
 
   return BTC_VALIDATE_SUCCESS;
-}
+}

apps/btc_family/btc_txn.c

@@ -424,6 +424,7 @@ static bool fetch_valid_input(btc_query_t *query) {
     // for explanation. Currently, the device can spend P2PKH or P2WPKH inputs
     const btc_script_type_e type = btc_get_script_type(
         txin->script_pub_key.bytes, txin->script_pub_key.size);
+    LOG_ERROR("btc_get_script_type: %d", type);
 
     // clone the input details into btc_txn_context
     btc_txn_input_t *input = &btc_txn_context->inputs[idx];
@@ -475,7 +476,7 @@ static bool fetch_valid_input(btc_query_t *query) {
 
     btc_validation_error_e validation_result =
         btc_validate_inputs(&stream, txin);
-
+    LOG_ERROR("btc_validate_inputs validation_result: %d", validation_result);
     btc_result_t response = init_btc_result(BTC_RESULT_SIGN_TXN_TAG);
     // Send last chunk ack to host
     response.sign_txn.which_response =