Merge branch 'rust-2021'

benma · benma · commit f8679eeb9f7b · 2024-05-16T09:11:52.000+02:00
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
@@ -23,6 +23,17 @@ members = [
     "bitbox02-sys",
 ]
 
+resolver = "2"
+
+[workspace.dependencies]
+bitcoin = { version = "0.31.0", default-features = false, features = ["no-std"] }
+hex = { version = "0.4", default-features = false, features = ["alloc"] }
+lazy_static = { version = "1.4.0" }
+num-bigint = { version = "0.4.3", default-features = false }
+sha2 = { version = "0.10.8", default-features = false }
+sha3 = { version = "0.10.8", default-features = false }
+zeroize = "1.6.0"
+
 [profile.release]
 # This only affects the .elf output. Debug info is stripped from the final .bin.
 # Paths to source code can still appear in the final bin, as they are part of the panic!() output.
diff --git a/src/rust/bitbox02-noise/Cargo.toml b/src/rust/bitbox02-noise/Cargo.toml
@@ -1,4 +1,5 @@
 # Copyright 2020 Shift Cryptosecurity AG
+# Copyright 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.
@@ -15,8 +16,8 @@
 [package]
 name = "bitbox02-noise"
 version = "0.1.0"
-authors = ["Shift Crypto AG <support@shiftcrypto.ch>"]
-edition = "2018"
+authors = ["Shift Crypto AG <support@bitbox.swiss>"]
+edition = "2021"
 description = "BitBox02 noise protocol primitives"
 license = "Apache-2.0"
 
diff --git a/src/rust/bitbox02-rust-c/Cargo.toml b/src/rust/bitbox02-rust-c/Cargo.toml
@@ -1,4 +1,5 @@
 # Copyright 2020 Shift Cryptosecurity AG
+# Copyright 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.
@@ -15,8 +16,8 @@
 [package]
 name = "bitbox02-rust-c"
 version = "0.1.0"
-authors = ["Shift Crypto AG <support@shiftcrypto.ch>"]
-edition = "2018"
+authors = ["Shift Crypto AG <support@bitbox.swiss>"]
+edition = "2021"
 license = "Apache-2.0"
 
 [lib]
@@ -27,10 +28,10 @@ bitbox02-rust = { path = "../bitbox02-rust", optional = true }
 bitbox02 = { path = "../bitbox02", optional = true }
 bitbox02-noise = { path = "../bitbox02-noise", optional = true }
 util = { path = "../util" }
-hex = { version = "0.4", default-features = false }
-sha2 = { version = "0.10.8", default-features = false, optional = true }
-sha3 = { version = "0.10.8", default-features = false, optional = true }
-bitcoin = { version = "0.31.0", default-features = false, features = ["no-std"], optional = true }
+hex = { workspace = true }
+sha2 = { workspace = true, optional = true }
+sha3 = { workspace = true, optional = true }
+bitcoin = { workspace = true, optional = true }
 
 [features]
 # Only one of the "target-" should be activated, which in turn defines/activates the dependent features.
diff --git a/src/rust/bitbox02-rust/Cargo.toml b/src/rust/bitbox02-rust/Cargo.toml
@@ -1,4 +1,5 @@
 # Copyright 2020 Shift Cryptosecurity AG
+# Copyright 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.
@@ -15,8 +16,8 @@
 [package]
 name = "bitbox02-rust"
 version = "0.1.0"
-authors = ["Shift Crypto AG <support@shiftcrypto.ch>"]
-edition = "2018"
+authors = ["Shift Crypto AG <support@bitbox.swiss>"]
+edition = "2021"
 description = "BitBox02 functionality implemented in rust"
 license = "Apache-2.0"
 
@@ -30,12 +31,12 @@ bitbox02 = {path = "../bitbox02"}
 util = {path = "../util"}
 binascii = { version = "0.1.4", default-features = false, features = ["encode"] }
 bitbox02-noise = {path = "../bitbox02-noise"}
-hex = { version = "0.4", default-features = false, features = ["alloc"] }
-sha2 = { version = "0.10.8", default-features = false }
-sha3 = { version = "0.10.8", default-features = false, optional = true }
+hex = { workspace = true }
+sha2 = { workspace = true }
+sha3 = { workspace = true, optional = true }
 digest = "0.10.6"
-zeroize = "1.6.0"
-num-bigint = { version = "0.4.3", default-features = false, optional = true }
+zeroize = { workspace = true }
+num-bigint = { workspace = true, optional = true }
 num-traits = { version = "0.2", default-features = false, optional = true }
 # If you change this, also change src/rust/.cargo/config.toml.
 bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.2", optional = true }
@@ -44,11 +45,11 @@ blake2 = { version = "0.10.6", default-features = false, optional = true }
 minicbor = { version = "0.20.0", default-features = false, features = ["alloc"], optional = true }
 crc = { version = "3.0.1", optional = true }
 ed25519-dalek = { version = "2.0.0", default-features = false, features = ["hazmat"], optional = true }
-lazy_static = { version = "1.4.0", optional = true }
+lazy_static = { workspace = true, optional = true }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 
 miniscript = { version = "11.0.0", default-features = false, features = ["no-std"], optional = true }
-bitcoin = { version = "0.31.0", default-features = false, features = ["no-std"], optional = true }
+bitcoin = { workspace = true, optional = true }
 # We don't rely on this dep directly, the miniscript/bitcoin deps do. We list it here to enable the
 # small-hash feature to reduce the binary size, saving around 2784 bytes (as measured at time of
 # writing, this might fluctuate over time).
diff --git a/src/rust/bitbox02-rust/src/hww/api/bitcoin.rs b/src/rust/bitbox02-rust/src/hww/api/bitcoin.rs
@@ -46,8 +46,6 @@ use pb::BtcCoin;
 use pb::BtcScriptConfig;
 
 use alloc::string::String;
-use core::convert::TryFrom;
-use core::convert::TryInto;
 
 /// Like `hww::next_request`, but for Bitcoin requests/responses.
 pub async fn next_request(response: pb::btc_response::Response) -> Result<Request, Error> {
diff --git a/src/rust/bitbox02-rust/src/hww/api/bitcoin/common.rs b/src/rust/bitbox02-rust/src/hww/api/bitcoin/common.rs
@@ -19,7 +19,6 @@ use crate::xpubcache::Bip32XpubCache;
 
 use alloc::string::String;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 
 use pb::btc_script_config::SimpleType;
 pub use pb::btc_sign_init_request::FormatUnit;
diff --git a/src/rust/bitbox02-rust/src/hww/api/bitcoin/multisig.rs b/src/rust/bitbox02-rust/src/hww/api/bitcoin/multisig.rs
@@ -26,8 +26,6 @@ use crate::workflow::confirm;
 
 use alloc::string::String;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
-use core::convert::TryInto;
 
 use sha2::{Digest, Sha256};
 
diff --git a/src/rust/bitbox02-rust/src/hww/api/bitcoin/registration.rs b/src/rust/bitbox02-rust/src/hww/api/bitcoin/registration.rs
@@ -23,8 +23,6 @@ use pb::btc_response::Response;
 use pb::btc_script_config::Config;
 use pb::BtcCoin;
 
-use core::convert::TryFrom;
-
 use super::multisig::SortXpubs;
 
 use crate::workflow::{confirm, status, trinary_input_string};
diff --git a/src/rust/bitbox02-rust/src/hww/api/bitcoin/signmsg.rs b/src/rust/bitbox02-rust/src/hww/api/bitcoin/signmsg.rs
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 use alloc::vec::Vec;
-use core::convert::TryFrom;
-use core::convert::TryInto;
 
 use sha2::{Digest, Sha256};
 
diff --git a/src/rust/bitbox02-rust/src/hww/api/bitcoin/signtx.rs b/src/rust/bitbox02-rust/src/hww/api/bitcoin/signtx.rs
@@ -23,8 +23,6 @@ use crate::workflow::{confirm, status, transaction};
 use crate::xpubcache::Bip32XpubCache;
 
 use alloc::vec::Vec;
-use core::convert::TryFrom;
-use core::convert::TryInto;
 
 use pb::request::Request;
 use pb::response::Response;
diff --git a/src/rust/bitbox02-rust/src/hww/api/cardano/address.rs b/src/rust/bitbox02-rust/src/hww/api/cardano/address.rs
@@ -17,7 +17,6 @@ use super::Error;
 
 use alloc::string::String;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 
 use crate::workflow::confirm;
 
diff --git a/src/rust/bitbox02-rust/src/hww/api/cardano/sign_transaction.rs b/src/rust/bitbox02-rust/src/hww/api/cardano/sign_transaction.rs
@@ -20,7 +20,6 @@ use super::Error;
 
 use alloc::string::String;
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 
 use blake2::{
     digest::{Update, VariableOutput},
diff --git a/src/rust/bitbox02-rust/src/hww/api/cardano/sign_transaction/cbor.rs b/src/rust/bitbox02-rust/src/hww/api/cardano/sign_transaction/cbor.rs
@@ -17,7 +17,6 @@ use super::super::pb;
 use super::super::Error;
 
 use alloc::vec::Vec;
-use core::convert::TryFrom;
 
 use digest::Update;
 use minicbor::encode::{Encoder, Write};
diff --git a/src/rust/bitbox02-rust/src/hww/api/ethereum/pubrequest.rs b/src/rust/bitbox02-rust/src/hww/api/ethereum/pubrequest.rs
@@ -22,9 +22,6 @@ use crate::bip32;
 use crate::keystore;
 use crate::workflow::confirm;
 
-use core::convert::TryFrom;
-use core::convert::TryInto;
-
 async fn process_address(request: &pb::EthPubRequest) -> Result<Response, Error> {
     let coin = pb::EthCoin::try_from(request.coin)?;
 
diff --git a/src/rust/bitbox02-rust/src/hww/api/ethereum/sign.rs b/src/rust/bitbox02-rust/src/hww/api/ethereum/sign.rs
@@ -22,8 +22,6 @@ use bitbox02::keystore;
 use crate::workflow::{confirm, status, transaction};
 
 use alloc::vec::Vec;
-use core::convert::TryFrom;
-use core::convert::TryInto;
 use pb::eth_response::Response;
 
 use core::ops::{Add, Mul};
diff --git a/src/rust/bitbox02-rust/src/hww/api/ethereum/sign_typed_msg.rs b/src/rust/bitbox02-rust/src/hww/api/ethereum/sign_typed_msg.rs
@@ -32,9 +32,6 @@ use alloc::boxed::Box;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 
-use core::convert::TryFrom;
-use core::convert::TryInto;
-
 use sha3::digest::Digest;
 
 use num_bigint::{BigInt, BigUint};
diff --git a/src/rust/bitbox02-rust/src/hww/api/sdcard.rs b/src/rust/bitbox02-rust/src/hww/api/sdcard.rs
@@ -20,8 +20,6 @@ use pb::response::Response;
 
 use crate::workflow::sdcard;
 
-use core::convert::TryFrom;
-
 pub async fn process(
     &pb::InsertRemoveSdCardRequest { action }: &pb::InsertRemoveSdCardRequest,
 ) -> Result<Response, Error> {
diff --git a/src/rust/bitbox02-rust/src/hww/api/system.rs b/src/rust/bitbox02-rust/src/hww/api/system.rs
@@ -14,7 +14,6 @@
 
 use super::Error;
 use crate::pb;
-use core::convert::TryFrom;
 
 use pb::reboot_request::Purpose;
 use pb::response::Response;
diff --git a/src/rust/bitbox02-sys/Cargo.toml b/src/rust/bitbox02-sys/Cargo.toml
@@ -1,4 +1,5 @@
 # Copyright 2020 Shift Cryptosecurity AG
+# Copyright 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.
@@ -15,8 +16,8 @@
 [package]
 name = "bitbox02-sys"
 version = "0.1.0"
-authors = ["Shift Crypto AG <support@shiftcrypto.ch>"]
-edition = "2018"
+authors = ["Shift Crypto AG <support@bitbox.swiss>"]
+edition = "2021"
 description = "Rust bindings for C code in bitbox02-firmware"
 license = "Apache-2.0"
 
diff --git a/src/rust/bitbox02/Cargo.toml b/src/rust/bitbox02/Cargo.toml
@@ -1,4 +1,5 @@
 # Copyright 2020 Shift Cryptosecurity AG
+# Copyright 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.
@@ -15,16 +16,16 @@
 [package]
 name = "bitbox02"
 version = "0.1.0"
-authors = ["Shift Crypto AG <support@shiftcrypto.ch>"]
-edition = "2018"
+authors = ["Shift Crypto AG <support@bitbox.swiss>"]
+edition = "2021"
 description = "Idiomatic rust bindings for C code in bitbox02-firmware"
 license = "Apache-2.0"
 
 [dependencies]
 bitbox02-sys = {path="../bitbox02-sys"}
 util = {path = "../util"}
-zeroize = "1.6.0"
-lazy_static = { version = "1.4.0", optional = true }
+zeroize = { workspace = true }
+lazy_static = { workspace = true, optional = true }
 
 [features]
 # Only to be enabled in unit tests.
diff --git a/src/rust/rustfmt.toml b/src/rust/rustfmt.toml
@@ -1 +1 @@
-edition = "2018"
+edition = "2021"
diff --git a/src/rust/util/Cargo.toml b/src/rust/util/Cargo.toml
@@ -1,4 +1,5 @@
 # Copyright 2020 Shift Cryptosecurity AG
+# Copyright 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.
@@ -15,9 +16,9 @@
 [package]
 name = "util"
 version = "0.1.0"
-authors = ["Shift Crypto AG <support@shiftcrypto.ch>"]
-edition = "2018"
+authors = ["Shift Crypto AG <support@bitbox.swiss>"]
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-num-bigint = { version = "0.4.3", default-features = false }
+num-bigint = { workspace = true, default-features = false }
