Merge branch 'paymentreq'

Author: benma

CHANGELOG.md

@@ -7,6 +7,7 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 ## Firmware
 
 ### [Unreleased]
+- Bitcoin: add support for payment requests
 - Ethereum: allow signing EIP-712 messages containing multi-line strings
 
 ### 9.18.0

CMakeLists.txt

@@ -96,8 +96,8 @@ endif()
 #
 # Versions MUST contain three parts and start with lowercase 'v'.
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
-set(FIRMWARE_VERSION "v9.18.0")
-set(FIRMWARE_BTC_ONLY_VERSION "v9.18.0")
+set(FIRMWARE_VERSION "v9.19.0")
+set(FIRMWARE_BTC_ONLY_VERSION "v9.19.0")
 set(BOOTLOADER_VERSION "v1.0.6")
 
 find_package(PythonInterp 3.6 REQUIRED)

src/rust/bitbox02-rust/src/hww/api/bitcoin/signtx.rs

@@ -792,7 +792,7 @@ async fn _process(request: &pb::BtcSignInitRequest) -> Result<Response, Error> {
                     return Err(Error::InvalidInput);
                 }
                 let payment_request: pb::BtcPaymentRequestRequest =
-                    get_payment_request(output_index, &mut next_response).await?;
+                    get_payment_request(output_payment_request_index, &mut next_response).await?;
                 payment_request::user_verify(coin_params, &payment_request, format_unit).await?;
                 if payment_request::validate(
                     coin_params,