Merge pull request #45 from Foundation-Devices/jeandudey/sft-4438-upd…

…ate-bitcoin_hashes-to-015-on-foundation-rs SFT-4438: Update bitcoin_hashes to 0.15.
Foundation-Devices · Nov 20, 2024 · 5a73653 · 5a73653
2 parents ded401b + 9d9cc0d
commit 5a73653
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ arbitrary = { version = "1", features = ["derive"] }
 bech32 = { version = "0.9", default-features = false }
 bip39 = { version = "2.1", default-features = false }
 bitcoin = { version = "0.31", default-features = false }
-bitcoin_hashes = { version = "0.14", default-features = false }
+bitcoin_hashes = { version = "0.15", default-features = false }
 bs58 = "0.5"
 clap = { version = "4", features = ["cargo"] }
 crc = "3"

diff --git a/ffi/integration/CMakeLists.txt b/ffi/integration/CMakeLists.txt
@@ -11,12 +11,12 @@ set(CMAKE_CXX_STANDARD 14)
 FetchContent_Declare(
         Corrosion
         GIT_REPOSITORY https://github.com/corrosion-rs/corrosion
-        GIT_TAG v0.4.9
+        GIT_TAG v0.5.0
 )
 FetchContent_Declare(
         googletest
         GIT_REPOSITORY https://github.com/google/googletest
-        GIT_TAG v1.13.0
+        GIT_TAG v1.15.2
 )
 
 FetchContent_MakeAvailable(Corrosion)
@@ -31,7 +31,7 @@ add_executable(integration-codecs codecs.cpp)
 target_include_directories(integration-codecs PUBLIC ../include)
 target_link_libraries(
         integration-codecs
-        PUBLIC foundation-ffi
+        PUBLIC foundation_ffi
         PRIVATE GTest::gtest_main nlohmann_json::nlohmann_json
 )
 include(GoogleTest)

diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "foundation-firmware"
-version = "0.1.2"
+version = "0.2.0"
 description = """Foundation Devices, Inc. Passport Firmware image parser.
 
 This provides a command-line tool to verify the signatures of a Passport

diff --git a/firmware/src/bin/foundation-firmware.rs b/firmware/src/bin/foundation-firmware.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 use anyhow::{anyhow, bail, Context, Result};
-use bitcoin_hashes::{sha256, sha256d, Hash, HashEngine};
+use bitcoin_hashes::{sha256, sha256d, HashEngine};
 use clap::{command, value_parser, Arg, ArgAction};
 use faster_hex::hex_string;
 use foundation_firmware::{header, Header, Information, HEADER_LEN};

diff --git a/firmware/src/lib.rs b/firmware/src/lib.rs
@@ -9,7 +9,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs)]
 
-use bitcoin_hashes::{sha256d, Hash};
+use bitcoin_hashes::sha256d;
 use heapless::{String, Vec};
 use nom::IResult;
 use secp256k1::{ecdsa, Message, PublicKey, Secp256k1, Verification};

diff --git a/stratum-v1/Cargo.toml b/stratum-v1/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 homepage.workspace = true
 license = "GPL-3.0-or-later AND GPL-3.0-only"
 name = "stratum-v1"
-version = "0.1.0"
+version = "0.2.0"
 
 [dependencies]
 bitcoin_hashes = { workspace = true }

diff --git a/stratum-v1/src/client/job.rs b/stratum-v1/src/client/job.rs
@@ -4,7 +4,7 @@
 use super::notification::Work;
 use crate::{Error, Result};
 
-use bitcoin_hashes::{sha256d::Hash as DHash, Hash};
+use bitcoin_hashes::sha256d::Hash as DHash;
 use heapless::{String, Vec};
 
 #[derive(Debug, PartialEq)]

diff --git a/ur/Cargo.toml b/ur/Cargo.toml
@@ -14,7 +14,7 @@ with static memory allocation for embedded devices while also allowing
 to use dynamic memory allocation for platforms with more resources.
 """
 homepage.workspace = true
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 

diff --git a/ur/src/xoshiro.rs b/ur/src/xoshiro.rs
@@ -2,7 +2,6 @@
 // SPDX-FileCopyrightText: © 2020 Dominik Spicher <[email protected]>
 // SPDX-License-Identifier: MIT
 
-use bitcoin_hashes::Hash;
 use rand_xoshiro::{rand_core::RngCore, rand_core::SeedableRng, Xoshiro256StarStar};
 
 #[allow(clippy::module_name_repetitions)]