Make tari_hashing no-std and move domain hashes

tari-project · May 17, 2024 · d42c801 · d42c801
1 parent 7968580
commit d42c801
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.toml b/applications/minotari_ledger_wallet/wallet/Cargo.toml
@@ -6,14 +6,16 @@ license = "BSD-3-Clause"
 edition = "2021"
 
 [dependencies]
+tari_crypto = { version = "0.20.1", default-features = false, features = ["borsh"]}
+tari_hashing = { path = "../../../hashing", version = "1.0.0-pre.13" }
+
 blake2 = { version = "0.10", default-features = false  }
 borsh = { version = "1.2", default-features = false }
 critical-section = { version = "1.1.1" }
 digest = { version = "0.10", default-features = false }
 embedded-alloc = "0.5.0"
 include_gif = "1.0.1"
 ledger_device_sdk = "1.7.1"
-tari_crypto = { version = "0.20.1", default-features = false, features = ["borsh"]}
 zeroize = { version = "1" , default-features = false }
 
 # once_cell defined here just to lock the version. Other dependencies may try to go to 1.19 which is incompatabile with

diff --git a/applications/minotari_ledger_wallet/wallet/src/handlers/get_metadata_signature.rs b/applications/minotari_ledger_wallet/wallet/src/handlers/get_metadata_signature.rs
@@ -15,10 +15,11 @@ use tari_crypto::{
         RistrettoSecretKey,
     },
 };
+use tari_hashing::TransactionHashDomain;
 
 use crate::{
     alloc::string::ToString,
-    hashing::{DomainSeparatedConsensusHasher, TransactionHashDomain},
+    hashing::DomainSeparatedConsensusHasher,
     utils::{derive_from_bip32_key, get_key_from_canonical_bytes},
     AppSW,
     KeyType,

diff --git a/applications/minotari_ledger_wallet/wallet/src/handlers/get_script_signature.rs b/applications/minotari_ledger_wallet/wallet/src/handlers/get_script_signature.rs
@@ -16,11 +16,12 @@ use tari_crypto::{
         RistrettoSecretKey,
     },
 };
+use tari_hashing::TransactionHashDomain;
 use zeroize::Zeroizing;
 
 use crate::{
     alloc::string::ToString,
-    hashing::{DomainSeparatedConsensusHasher, TransactionHashDomain},
+    hashing::DomainSeparatedConsensusHasher,
     utils::{alpha_hasher, derive_from_bip32_key, get_key_from_canonical_bytes},
     AppSW,
     KeyType,

diff --git a/applications/minotari_ledger_wallet/wallet/src/hashing.rs b/applications/minotari_ledger_wallet/wallet/src/hashing.rs
@@ -6,15 +6,7 @@ use core::marker::PhantomData;
 
 use borsh::{io, io::Write, BorshSerialize};
 use digest::Digest;
-use tari_crypto::{hash_domain, hashing::DomainSeparation};
-
-hash_domain!(LedgerHashDomain, "com.tari.minotari_ledger_wallet", 0);
-hash_domain!(
-    KeyManagerTransactionsHashDomain,
-    "com.tari.base_layer.core.transactions.key_manager",
-    1
-);
-hash_domain!(TransactionHashDomain, "com.tari.base_layer.core.transactions", 0);
+use tari_crypto::hashing::DomainSeparation;
 
 pub struct DomainSeparatedConsensusHasher<M, D> {
     hasher: DomainSeparatedBorshHasher<M, D>,

diff --git a/applications/minotari_ledger_wallet/wallet/src/utils.rs b/applications/minotari_ledger_wallet/wallet/src/utils.rs
@@ -17,11 +17,11 @@ use tari_crypto::{
     ristretto::RistrettoSecretKey,
     tari_utilities::ByteArray,
 };
+use tari_hashing::{KeyManagerTransactionsHashDomain, LedgerHashDomain};
 use zeroize::Zeroizing;
 
 use crate::{
     alloc::string::{String, ToString},
-    hashing::{KeyManagerTransactionsHashDomain, LedgerHashDomain},
     AppSW,
     KeyType,
     BIP32_COIN_TYPE,

diff --git a/base_layer/core/src/transactions/key_manager/inner.rs b/base_layer/core/src/transactions/key_manager/inner.rs
@@ -39,7 +39,6 @@ use tari_comms::types::CommsDHKE;
 use tari_crypto::{
     commitment::{ExtensionDegree, HomomorphicCommitmentFactory},
     extended_range_proof::ExtendedRangeProofService,
-    hash_domain,
     hashing::{DomainSeparatedHash, DomainSeparatedHasher},
     keys::{PublicKey as PublicKeyTrait, SecretKey},
     range_proof::RangeProofService as RPService,
@@ -48,6 +47,7 @@ use tari_crypto::{
         RistrettoComSig,
     },
 };
+use tari_hashing::KeyManagerTransactionsHashDomain;
 #[cfg(feature = "ledger")]
 use tari_key_manager::error::KeyManagerError;
 use tari_key_manager::{
@@ -92,12 +92,6 @@ use crate::{
     },
 };
 
-hash_domain!(
-    KeyManagerTransactionsHashDomain,
-    "com.tari.base_layer.core.transactions.key_manager",
-    1
-);
-
 pub struct TransactionKeyManagerInner<TBackend> {
     key_managers: HashMap<String, RwLock<KeyManager<PublicKey, KeyDigest>>>,
     db: KeyManagerDatabase<TBackend, PublicKey>,

diff --git a/hashing/Cargo.toml b/hashing/Cargo.toml
@@ -12,9 +12,9 @@ license = "BSD-3-Clause"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tari_crypto = "0.20.0"
-digest = "0.10"
-borsh = "1.2"
+tari_crypto = { version = "0.20.1", default-features = false, features = ["borsh"]}
+borsh = { version = "1.2", default-features = false }
+digest = { version = "0.10", default-features = false }
 
 [dev-dependencies]
 blake2 = "0.10"
diff --git a/hashing/src/borsh_hasher.rs b/hashing/src/borsh_hasher.rs
@@ -23,9 +23,9 @@
 //  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use std::{io, io::Write, marker::PhantomData};
+use core::marker::PhantomData;
 
-use borsh::BorshSerialize;
+use borsh::{io, io::Write, BorshSerialize};
 use digest::Digest;
 use tari_crypto::hashing::DomainSeparation;
 

diff --git a/hashing/src/domains.rs b/hashing/src/domains.rs
@@ -28,3 +28,11 @@ hash_domain!(
 // Hash domain for all transaction-related hashes, including the script signature challenge, transaction hash and kernel
 // signature challenge
 hash_domain!(TransactionHashDomain, "com.tari.base_layer.core.transactions", 0);
+
+hash_domain!(LedgerHashDomain, "com.tari.minotari_ledger_wallet", 0);
+
+hash_domain!(
+    KeyManagerTransactionsHashDomain,
+    "com.tari.base_layer.core.transactions.key_manager",
+    1
+);
diff --git a/hashing/src/lib.rs b/hashing/src/lib.rs
@@ -20,6 +20,8 @@
 //   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#![no_std]
+
 mod domains;
 pub use domains::*;