Merge branch 'rust-1.84'

.containerversion

@@ -1 +1 @@
-43
+44

Dockerfile

@@ -150,15 +150,15 @@ RUN rustup target add thumbv7em-none-eabi
 RUN rustup component add rustfmt
 RUN rustup component add clippy
 RUN rustup component add rust-src
-RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.26.0 --locked
-RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.69.4 --locked
+RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.27.0 --locked
+RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.71.1 --locked
 
 # Until cargo vendor supports vendoring dependencies of the rust std libs we
 # need a copy of this file next to the toml file. It also has to be world
 # writable so that invocations of `cargo vendor` can update it. Below is the
 # tracking issue for `cargo vendor` to support rust std libs.
 # https://github.com/rust-lang/wg-cargo-std-aware/issues/23
-RUN cp "$(rustc --print=sysroot)/lib/rustlib/src/rust/Cargo.lock" "$(rustc --print=sysroot)/lib/rustlib/src/rust/library/test/"
+RUN cp "$(rustc --print=sysroot)/lib/rustlib/src/rust/library/Cargo.lock" "$(rustc --print=sysroot)/lib/rustlib/src/rust/library/test/"
 RUN chmod 777 $(rustc --print=sysroot)/lib/rustlib/src/rust/library/test/Cargo.lock
 
 COPY tools/prost-build-proto prost-build-proto

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

@@ -16,6 +16,10 @@
 //! usb message proessing is not ported to Rust. If that happens, the `async_usb` module can be
 //! used and this can be deleted.
 
+// TODO: figure out how to deal with the static muts below.
+// https://doc.rust-lang.org/nightly/edition-guide/rust-2024/static-mut-references.html
+#![allow(static_mut_refs)]
+
 extern crate alloc;
 
 use alloc::boxed::Box;

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

@@ -185,23 +185,23 @@ mod tests {
         };
         if verification_required {
             // Verify pairing code.
-            static mut EXPECTED_PAIRING_CODE: Option<String> = None;
+            static EXPECTED_PAIRING_CODE: bitbox02::testing::UnsafeSyncRefCell<Option<String>> =
+                bitbox02::testing::UnsafeSyncRefCell::new(None);
 
             // Handshake hash as computed by the host. Should be the same as computed on the device. The
             // pairing code is derived from that.
             let handshake_hash: bitbox02_noise::HandshakeHash =
                 host_noise.get_hash().try_into().unwrap();
-            unsafe {
-                EXPECTED_PAIRING_CODE =
-                    Some(crate::workflow::pairing::format_hash(&handshake_hash));
-            }
+            *EXPECTED_PAIRING_CODE.borrow_mut() =
+                Some(crate::workflow::pairing::format_hash(&handshake_hash));
             static mut PAIRING_CONFIRMED: bool = false;
             mock(Data {
                 ui_confirm_create: Some(Box::new(|params| {
                     assert_eq!(params.title, "Pairing code");
-                    assert_eq!(params.body, unsafe {
-                        EXPECTED_PAIRING_CODE.as_ref().unwrap().as_str()
-                    });
+                    assert_eq!(
+                        params.body,
+                        EXPECTED_PAIRING_CODE.borrow().as_ref().unwrap().as_str()
+                    );
                     unsafe {
                         PAIRING_CONFIRMED = true;
                     }

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

@@ -149,9 +149,7 @@ struct WalletPolicyPkTranslator<'a> {
     address_index: u32,
 }
 
-impl<'a> miniscript::Translator<String, bitcoin::PublicKey, Error>
-    for WalletPolicyPkTranslator<'a>
-{
+impl miniscript::Translator<String, bitcoin::PublicKey, Error> for WalletPolicyPkTranslator<'_> {
     fn pk(&mut self, pk: &String) -> Result<bitcoin::PublicKey, Error> {
         let (key_index, multipath_index_left, multipath_index_right) =
             parse_wallet_policy_pk(pk).or(Err(Error::InvalidInput))?;
@@ -273,7 +271,7 @@ pub struct ParsedPolicy<'a> {
     pub descriptor: Descriptor<String>,
 }
 
-impl<'a> ParsedPolicy<'a> {
+impl ParsedPolicy<'_> {
     /// Iterates over the placeholder keys in this descriptor. For tr() descriptors, this covers the
     /// internal key and every key in every leaf script.
     /// This iterates the keys "left-to-right" in the descriptor.

src/rust/bitbox02-rust/src/hww/api/cardano/sign_transaction/cbor.rs

@@ -35,7 +35,7 @@ impl<'a, U: Update> HashedWriter<'a, U> {
     }
 }
 
-impl<'a, U: Update> Write for HashedWriter<'a, U> {
+impl<U: Update> Write for HashedWriter<'_, U> {
     type Error = ();
     fn write_all(&mut self, buf: &[u8]) -> Result<(), Self::Error> {
         self.0.update(buf);

src/rust/bitbox02-rust/src/hww/api/ethereum/amount.rs

@@ -22,7 +22,7 @@ pub struct Amount<'a> {
     pub value: BigUint,
 }
 
-impl<'a> Amount<'a> {
+impl Amount<'_> {
     /// Formats the amount with the right number of decimal places, suffixed with the unit. If the
     /// value (without the unit suffix) is too long to fit on the screen, it will be truncated and
     /// ellipsis ('...')  are appended.

src/rust/bitbox02-rust/src/hww/api/ethereum/sign.rs

@@ -35,7 +35,7 @@ pub enum Transaction<'a> {
     Eip1559(&'a pb::EthSignEip1559Request),
 }
 
-impl<'a> Transaction<'a> {
+impl Transaction<'_> {
     fn nonce(&self) -> &[u8] {
         match self {
             Transaction::Legacy(legacy) => &legacy.nonce,

src/rust/bitbox02-rust/src/hww/api/ethereum/sign_typed_msg.rs

@@ -639,7 +639,7 @@ mod tests {
         Struct(Vec<Object<'a>>),
     }
 
-    impl<'a> Object<'a> {
+    impl Object<'_> {
         fn encode(&self) -> Vec<u8> {
             match self {
                 Object::String(s) => s.as_bytes().to_vec(),
@@ -680,7 +680,7 @@ mod tests {
         message: Object<'a>,
     }
 
-    impl<'a> TypedMessage<'a> {
+    impl TypedMessage<'_> {
         /// The host is asked for a value at a member of an object. This handles this request and
         /// responds with value.
         fn handle_host_response(

src/rust/bitbox02-rust/src/xpubcache.rs

@@ -127,24 +127,22 @@ mod tests {
         #[derive(Clone)]
         struct MockXpub(Vec<u32>);
 
-        static mut CHILD_DERIVATIONS: u32 = 0;
-        static mut ROOT_DERIVATIONS: u32 = 0;
+        static CHILD_DERIVATIONS: bitbox02::testing::UnsafeSyncRefCell<u32> =
+            bitbox02::testing::UnsafeSyncRefCell::new(0);
+        static ROOT_DERIVATIONS: bitbox02::testing::UnsafeSyncRefCell<u32> =
+            bitbox02::testing::UnsafeSyncRefCell::new(0);
 
         impl Xpub for MockXpub {
             fn derive(&self, keypath: &[u32]) -> Result<Self, ()> {
                 let mut kp = Vec::new();
                 kp.extend_from_slice(&self.0);
                 kp.extend_from_slice(keypath);
-                unsafe {
-                    CHILD_DERIVATIONS += keypath.len() as u32;
-                }
+                *CHILD_DERIVATIONS.borrow_mut() += keypath.len() as u32;
                 Ok(MockXpub(kp))
             }
 
             fn from_keypath(keypath: &[u32]) -> Result<Self, ()> {
-                unsafe {
-                    ROOT_DERIVATIONS += 1;
-                }
+                *ROOT_DERIVATIONS.borrow_mut() += 1;
                 Ok(MockXpub(keypath.to_vec()))
             }
         }
@@ -154,18 +152,14 @@ mod tests {
         let mut cache = MockCache::new();
 
         assert_eq!(cache.get_xpub(&[]).unwrap().0.as_slice(), &[]);
-        unsafe {
-            assert_eq!(CHILD_DERIVATIONS, 0u32);
-            assert_eq!(ROOT_DERIVATIONS, 1u32);
-            ROOT_DERIVATIONS = 0;
-        }
+        assert_eq!(*CHILD_DERIVATIONS.borrow(), 0u32);
+        assert_eq!(*ROOT_DERIVATIONS.borrow(), 1u32);
+        *ROOT_DERIVATIONS.borrow_mut() = 0;
 
         assert_eq!(cache.get_xpub(&[1, 2, 3]).unwrap().0.as_slice(), &[1, 2, 3]);
-        unsafe {
-            assert_eq!(CHILD_DERIVATIONS, 0u32);
-            assert_eq!(ROOT_DERIVATIONS, 1u32);
-            ROOT_DERIVATIONS = 0;
-        }
+        assert_eq!(*CHILD_DERIVATIONS.borrow(), 0u32);
+        assert_eq!(*ROOT_DERIVATIONS.borrow(), 1u32);
+        *ROOT_DERIVATIONS.borrow_mut() = 0;
 
         // Cache some keypaths.
         cache.add_keypath(&[84 + HARDENED, 0 + HARDENED, 0 + HARDENED]);
@@ -179,15 +173,13 @@ mod tests {
                 .as_slice(),
             &[84 + HARDENED, 0 + HARDENED, 0 + HARDENED, 1, 2]
         );
-        unsafe {
-            // Two child derivations:
-            // 1: m/84'/0'/0' -> m/84'/0'/0'/1
-            // 2: m/84'/0'/0'/1 -> m/84'/0'/0'/1/2
-            assert_eq!(CHILD_DERIVATIONS, 2u32);
-            assert_eq!(ROOT_DERIVATIONS, 1u32);
-            CHILD_DERIVATIONS = 0;
-            ROOT_DERIVATIONS = 0;
-        }
+        // Two child derivations:
+        // 1: m/84'/0'/0' -> m/84'/0'/0'/1
+        // 2: m/84'/0'/0'/1 -> m/84'/0'/0'/1/2
+        assert_eq!(*CHILD_DERIVATIONS.borrow(), 2u32);
+        *CHILD_DERIVATIONS.borrow_mut() = 0;
+        assert_eq!(*ROOT_DERIVATIONS.borrow(), 1u32);
+        *ROOT_DERIVATIONS.borrow_mut() = 0;
 
         // Same keypath again is a cache hit at m/84'/0'/0'/1 with one child derivation.
         assert_eq!(
@@ -198,11 +190,9 @@ mod tests {
                 .as_slice(),
             &[84 + HARDENED, 0 + HARDENED, 0 + HARDENED, 1, 2]
         );
-        unsafe {
-            assert_eq!(CHILD_DERIVATIONS, 1u32);
-            assert_eq!(ROOT_DERIVATIONS, 0u32);
-            CHILD_DERIVATIONS = 0;
-        }
+        assert_eq!(*CHILD_DERIVATIONS.borrow(), 1u32);
+        *CHILD_DERIVATIONS.borrow_mut() = 0;
+        assert_eq!(*ROOT_DERIVATIONS.borrow(), 0u32);
 
         // m/84'/0'/0'/0/0 is a cache hit at m/84'/0'/0', which was cached because of the above we
         // call using m/84'/0'/0'/1/2.
@@ -214,10 +204,8 @@ mod tests {
                 .as_slice(),
             &[84 + HARDENED, 0 + HARDENED, 0 + HARDENED, 0, 0]
         );
-        unsafe {
-            assert_eq!(CHILD_DERIVATIONS, 2u32);
-            assert_eq!(ROOT_DERIVATIONS, 0u32);
-        }
+        assert_eq!(*CHILD_DERIVATIONS.borrow(), 2u32);
+        assert_eq!(*ROOT_DERIVATIONS.borrow(), 0u32);
     }
 
     #[test]

src/rust/bitbox02/src/testing.rs

@@ -99,3 +99,22 @@ pub fn mock_memory() {
         bitbox02_sys::bitbox02_smarteeprom_init();
     }
 }
+
+/// A wrapper that adds the Sync trait to RefCell. We can use this in testing as our unit tests run
+/// single-threaded.
+pub struct UnsafeSyncRefCell<T>(core::cell::RefCell<T>);
+impl<T> UnsafeSyncRefCell<T> {
+    pub const fn new(value: T) -> Self {
+        Self(core::cell::RefCell::new(value))
+    }
+}
+
+unsafe impl<T> Sync for UnsafeSyncRefCell<T> {}
+
+impl<T> core::ops::Deref for UnsafeSyncRefCell<T> {
+    type Target = core::cell::RefCell<T>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}

src/rust/bitbox02/src/ui/ui.rs

@@ -36,7 +36,7 @@ pub struct Component<'a> {
     _p: PhantomData<&'a ()>,
 }
 
-impl<'a> Component<'a> {
+impl Component<'_> {
     pub fn screen_stack_push(&mut self) {
         if self.is_pushed {
             panic!("component pushed twice");
@@ -48,7 +48,7 @@ impl<'a> Component<'a> {
     }
 }
 
-impl<'a> Drop for Component<'a> {
+impl Drop for Component<'_> {
     fn drop(&mut self) {
         if !self.is_pushed {
             panic!("component not pushed");

src/rust/bitbox02/src/ui/ui_stub.rs

@@ -30,7 +30,7 @@ pub struct Component<'a> {
     _p: PhantomData<&'a ()>,
 }
 
-impl<'a> Component<'a> {
+impl Component<'_> {
     pub fn screen_stack_push(&mut self) {
         if self.is_pushed {
             panic!("component pushed twice");
@@ -39,7 +39,7 @@ impl<'a> Component<'a> {
     }
 }
 
-impl<'a> Drop for Component<'a> {
+impl Drop for Component<'_> {
     fn drop(&mut self) {
         if !self.is_pushed {
             panic!("component not pushed");

src/rust/bitbox02/src/util.rs

@@ -86,6 +86,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::manual_c_str_literals)]
     fn test_str_from_null_terminated_ptr() {
         assert_eq!(
             unsafe { str_from_null_terminated_ptr(b"\0".as_ptr()) },

src/rust/rust-toolchain.toml

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

src/rust/util/src/lib.rs

@@ -41,7 +41,7 @@ pub struct Survive<'a, T: 'a> {
     phantom: core::marker::PhantomData<&'a T>,
 }
 
-impl<'a, T> Survive<'a, T> {
+impl<T> Survive<'_, T> {
     pub fn new(data: T) -> Self {
         Survive {
             data,