chore: move domain hash names to separate crate

tari-project · Nov 22, 2023 · d3fddbe · d3fddbe
1 parent 6d48db4
commit d3fddbe
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dan_layer/common_types/Cargo.toml b/dan_layer/common_types/Cargo.toml
@@ -12,6 +12,7 @@ tari_crypto = { version = "0.19", features = ["borsh"] }
 tari_engine_types = { path = "../engine_types" }
 tari_bor = { path = "../tari_bor" }
 tari_mmr = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
+tari_hash_domains = { git = "https://github.com/tari-project/tari_hash_domains.git" }
 
 blake2 = "0.10.6"
 newtype-ops = "0.1.4"

diff --git a/dan_layer/common_types/src/hashing.rs b/dan_layer/common_types/src/hashing.rs
@@ -25,6 +25,7 @@
 
 use blake2::{digest::consts::U32, Blake2b};
 use tari_crypto::{hash_domain, hashing::DomainSeparatedHasher};
+use tari_hash_domains::ValidatorNodeBmtHashDomain;
 use tari_mmr::{BalancedBinaryMerkleProof, BalancedBinaryMerkleTree, MergedBalancedBinaryMerkleProof};
 
 use crate::hasher::{tari_hasher, TariHasher};
@@ -55,12 +56,6 @@ fn dan_hasher(label: &'static str) -> TariHasher {
     tari_hasher::<TariDanConsensusHashDomain>(label)
 }
 
-// From tari_core
-hash_domain!(
-    ValidatorNodeBmtHashDomain,
-    "com.tari.base_layer.core.validator_node_mmr",
-    1
-);
 pub type ValidatorNodeBmtHasherBlake2b = DomainSeparatedHasher<Blake2b<U32>, ValidatorNodeBmtHashDomain>;
 pub type ValidatorNodeBalancedMerkleTree = BalancedBinaryMerkleTree<ValidatorNodeBmtHasherBlake2b>;
 pub type ValidatorNodeMerkleProof = BalancedBinaryMerkleProof<ValidatorNodeBmtHasherBlake2b>;

diff --git a/dan_layer/engine_types/Cargo.toml b/dan_layer/engine_types/Cargo.toml
@@ -14,6 +14,7 @@ tari_crypto = { version = "0.19", features = ["borsh"] }
 tari_template_abi = { path = "../template_abi", features = ["std"] }
 tari_template_lib = { path = "../template_lib" }
 tari_utilities = "0.6"
+tari_hash_domains = { git = "https://github.com/tari-project/tari_hash_domains.git" }
 
 borsh = "0.10"
 base64 = "0.21.0"

diff --git a/dan_layer/engine_types/src/base_layer_hashing.rs b/dan_layer/engine_types/src/base_layer_hashing.rs
@@ -28,20 +28,10 @@ use digest::{
     consts::{U32, U64},
     Digest,
 };
-use tari_crypto::{
-    hash_domain,
-    hashing::{DomainSeparatedHasher, DomainSeparation},
-};
+use tari_crypto::hashing::{DomainSeparatedHasher, DomainSeparation};
+use tari_hash_domains::{ConfidentialOutputHashDomain, WalletOutputEncryptionKeysDomain};
 use tari_template_lib::Hash;
 
-hash_domain!(ConfidentialOutputHashDomain, "com.tari.dan.confidential_output", 1);
-
-hash_domain!(
-    WalletOutputEncryptionKeysDomain,
-    "com.tari.base_layer.wallet.output_encryption_keys",
-    1
-);
-
 fn confidential_hasher32(label: &'static str) -> TariBaseLayerHasher32 {
     TariBaseLayerHasher32::new_with_label::<ConfidentialOutputHashDomain>(label)
 }

diff --git a/dan_layer/engine_types/src/hashing.rs b/dan_layer/engine_types/src/hashing.rs
@@ -29,11 +29,10 @@ use blake2::{
 use digest::Digest;
 use serde::Serialize;
 use tari_bor::encode_into;
-use tari_crypto::{hash_domain, hashing::DomainSeparation};
+use tari_crypto::hashing::DomainSeparation;
+use tari_hash_domains::TariEngineHashDomain;
 use tari_template_lib::Hash;
 
-hash_domain!(TariEngineHashDomain, "com.tari.dan.engine", 0);
-
 pub fn hasher64(label: EngineHashDomainLabel) -> TariHasher64 {
     TariHasher64::new_with_label::<TariEngineHashDomain>(label.as_label())
 }
@@ -50,8 +49,6 @@ pub fn template_hasher32() -> TariHasher32 {
     hasher32(EngineHashDomainLabel::Template)
 }
 
-hash_domain!(ConfidentialOutputHashDomain, "com.tari.dan.confidential_output", 1);
-
 #[derive(Debug, Clone)]
 pub struct TariHasher32 {
     hasher: Blake2b<U32>,

diff --git a/dan_layer/wallet/sdk/Cargo.toml b/dan_layer/wallet/sdk/Cargo.toml
@@ -18,6 +18,7 @@ tari_key_manager = { git = "https://github.com/tari-project/tari.git", branch =
 tari_transaction = { path = "../../transaction" }
 tari_template_lib = { path = "../../template_lib" }
 tari_utilities = "0.6"
+tari_hash_domains = { git = "https://github.com/tari-project/tari_hash_domains.git" }
 
 anyhow = "1.0"
 async-trait = "0.1"

diff --git a/dan_layer/wallet/sdk/src/confidential/proof.rs b/dan_layer/wallet/sdk/src/confidential/proof.rs
@@ -22,12 +22,12 @@ use tari_crypto::{
     commitment::{ExtensionDegree, HomomorphicCommitmentFactory},
     errors::RangeProofError,
     extended_range_proof::ExtendedRangeProofService,
-    hash_domain,
     hashing::DomainSeparatedHasher,
     keys::SecretKey,
     ristretto::bulletproofs_plus::{BulletproofsPlusService, RistrettoExtendedMask, RistrettoExtendedWitness},
     tari_utilities::ByteArray,
 };
+use tari_hash_domains::TransactionSecureNonceKdfDomain;
 use tari_template_lib::{
     crypto::RistrettoPublicKeyBytes,
     models::{Amount, ConfidentialOutputProof, ConfidentialStatement, EncryptedData},
@@ -119,12 +119,6 @@ pub fn generate_confidential_proof(
 
 fn inner_encrypted_data_kdf_aead(encryption_key: &PrivateKey, commitment: &Commitment) -> EncryptedDataKey32 {
     let mut aead_key = EncryptedDataKey32::from(SafeArray::default());
-    // This has to be the same as the base layer so that burn claims are spendable
-    hash_domain!(
-        TransactionSecureNonceKdfDomain,
-        "com.tari.base_layer.core.transactions.secure_nonce_kdf",
-        0
-    );
     DomainSeparatedHasher::<Blake2b<U32>, TransactionSecureNonceKdfDomain>::new_with_label("encrypted_value_and_mask")
         .chain(encryption_key.as_bytes())
         .chain(commitment.as_bytes())