Merge branch 'rust-1.80'

Author: benma

.ci/run-container-ci

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2019 Shift Cryptosecurity AG
-# Copyright 2020 Shift Crypto AG
+# Copyright 2020-2024 Shift Crypto AG
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:39
+CONTAINER=shiftcrypto/firmware_v2:40
 
 if [ "$1" == "pull" ] ; then
 	docker pull "$CONTAINER"

src/rust/Cargo.lock

@@ -57,9 +57,9 @@ bitcoin_hashes = { version = "0.14.0", default-features = false, features = ["sm
 
 [dependencies.prost]
 # keep version in sync with tools/prost-build/Cargo.toml.
-version = "0.12.1"
+version = "0.13.1"
 default-features = false
-features = ["prost-derive"]
+features = ["derive"]
 
 [features]
 ed25519 = [

src/rust/bitbox02-rust/Cargo.toml

@@ -92,7 +92,7 @@ fn compute_checksum(
     if data.seed.len() != 32 {
         return Err(());
     }
-    hasher.update(&padded_seed(&data.seed));
+    hasher.update(padded_seed(&data.seed));
     hasher.update(data.birthdate.to_le_bytes());
     let padded_generator: [u8; 20] = {
         let mut result = [0u8; 20];

src/rust/bitbox02-rust/src/backup.rs

@@ -48,7 +48,7 @@ pub fn sighash(args: &Args) -> [u8; 32] {
     ctx.update(args.outpoint_hash);
     ctx.update(args.outpoint_index.to_le_bytes());
     // 5.
-    ctx.update(&serialize_varint(args.sighash_script.len() as u64));
+    ctx.update(serialize_varint(args.sighash_script.len() as u64));
     ctx.update(args.sighash_script);
     // 6.
     ctx.update(args.prevout_value.to_le_bytes());

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

@@ -249,8 +249,8 @@ pub async fn confirm_extended(
 /// - our designated xpub is actually ours (corresponds to the xpub of the currenty unlocked
 ///   keystore).
 /// - no two xpubs are the same.
+///
 /// keypath: account-level keypath, e.g. m/48'/0'/10'/2'
-/// expected:_coin expected bip44 coin in the keypath.
 pub fn validate(multisig: &Multisig, keypath: &[u32]) -> Result<(), Error> {
     if multisig.xpubs.len() < 2 || multisig.xpubs.len() > MAX_SIGNERS {
         return Err(Error::InvalidInput);

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

@@ -125,7 +125,7 @@ fn compute_sighash(
     // recipientName
     hash_data_lenprefixed(&mut sighash, payment_request.recipient_name.as_bytes());
     // memos
-    sighash.update(&serialize_varint(payment_request.memos.len() as u64));
+    sighash.update(serialize_varint(payment_request.memos.len() as u64));
     for memo in payment_request.memos.iter() {
         match memo {
             Memo {

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

@@ -1,4 +1,4 @@
-// Copyright 2020 Shift Crypto AG
+// Copyright 2020-2024 Shift Crypto AG
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -113,8 +113,8 @@ impl core::convert::From<UnlockError> for Error {
     }
 }
 
-impl core::convert::From<prost::DecodeError> for Error {
-    fn from(_error: prost::DecodeError) -> Self {
+impl core::convert::From<prost::UnknownEnumValue> for Error {
+    fn from(_error: prost::UnknownEnumValue) -> Self {
         Error::InvalidInput
     }
 }

src/rust/bitbox02-rust/src/hww/api/error.rs

@@ -41,7 +41,7 @@ pub fn set_result<R>(result_cell: &ResultCell<R>, result: R) {
 /// * `title` - title to show in the cancel confirm prompt.
 /// * `component` - component to process
 /// * `result_cell` - result var to synchronize the result on. Pass the same to `cancel` and
-/// `set_result`.
+///   `set_result`.
 pub async fn with_cancel<R>(
     title: &str,
     component: &mut bitbox02::ui::Component<'_>,

src/rust/bitbox02-rust/src/workflow/cancel.rs

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.79.0"
+channel = "1.80.0"