fix: solve breaking changes introduced by new tari-crypto tag (#4347)

Description --- The new release of `tari-crypto` introduces some conflicts with our tari repo. This PR attempts to solve these issues. Motivation and Context --- The new release of `tari-crypto` introduces some conflicts with our tari repo. This PR attempts to solve these issues. How Has This Been Tested? --- Solving compile errors.
tari-project · Jul 27, 2022 · 3c74064 · 3c74064
1 parent 32569da
commit 3c74064
Show file tree

Hide file tree

Showing 29 changed files with 46 additions and 51 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 tari_common_types = { version = "^0.34", path = "../../base_layer/common_types"}
 tari_comms = { path = "../../comms/core"}
 tari_core = {  path = "../../base_layer/core"}
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_script = { path = "../../infrastructure/tari_script" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 

diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml
@@ -7,7 +7,7 @@ license = "BSD-3-Clause"
 
 [dependencies]
 tari_comms = { path = "../../comms/core" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }

diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml
@@ -15,7 +15,7 @@ tari_comms = { path = "../../comms/core", features = ["rpc"] }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_libtor = { path = "../../infrastructure/libtor" }
 tari_mmr = { path = "../../base_layer/mmr", features = ["native_bitmap"] }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }

diff --git a/applications/tari_collectibles/src-tauri/Cargo.toml b/applications/tari_collectibles/src-tauri/Cargo.toml
@@ -19,7 +19,7 @@ tari_app_grpc = { path = "../../tari_app_grpc" }
 tari_app_utilities = { path = "../../tari_app_utilities" }
 tari_common = { path = "../../../common" }
 tari_common_types = { path = "../../../base_layer/common_types" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_key_manager = { path = "../../../base_layer/key_manager" }
 tari_mmr = { path = "../../../base_layer/mmr" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }

diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml
@@ -7,7 +7,7 @@ license = "BSD-3-Clause"
 
 [dependencies]
 tari_wallet = { path = "../../base_layer/wallet", features = ["bundled_sqlite"] }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_common = { path = "../../common" }
 tari_app_utilities = { path = "../tari_app_utilities" }
 tari_comms = { path = "../../comms/core" }

diff --git a/applications/tari_merge_mining_proxy/Cargo.toml b/applications/tari_merge_mining_proxy/Cargo.toml
@@ -17,7 +17,7 @@ tari_common = { path = "../../common" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
 tari_app_utilities = { path = "../tari_app_utilities" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 
 anyhow = "1.0.53"

diff --git a/applications/tari_miner/Cargo.toml b/applications/tari_miner/Cargo.toml
@@ -13,7 +13,7 @@ tari_common = {  path = "../../common" }
 tari_comms = {  path = "../../comms/core" }
 tari_app_utilities = { path = "../tari_app_utilities"}
 tari_app_grpc = {  path = "../tari_app_grpc" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 
 crossterm = { version = "0.17" }

diff --git a/applications/tari_validator_node/Cargo.toml b/applications/tari_validator_node/Cargo.toml
@@ -14,7 +14,7 @@ tari_common = { path = "../../common" }
 tari_comms = { path = "../../comms/core" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_comms_rpc_macros = { path = "../../comms/rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_mmr = { path = "../../base_layer/mmr" }
 tari_p2p = { path = "../../base_layer/p2p" }
 tari_service_framework = { path = "../../base_layer/service_framework" }

diff --git a/applications/test_faucet/Cargo.toml b/applications/test_faucet/Cargo.toml
@@ -10,7 +10,7 @@ simd = ["tari_crypto/simd_backend"]
 avx2 = ["simd"]
 
 [dependencies]
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_script = { path = "../../infrastructure/tari_script" }

diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.34.0"
 edition = "2018"
 
 [dependencies]
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 
 digest = "0.9.0"

diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -24,7 +24,7 @@ tari_common_types = { version = "^0.34", path = "../../base_layer/common_types"
 tari_comms = { version = "^0.34", path = "../../comms/core" }
 tari_comms_dht = { version = "^0.34", path = "../../comms/dht" }
 tari_comms_rpc_macros = { version = "^0.34", path = "../../comms/rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_metrics = { path = "../../infrastructure/metrics" }
 tari_mmr = { version = "^0.34", path = "../../base_layer/mmr", optional = true, features = ["native_bitmap"] }
 tari_p2p = { version = "^0.34", path = "../../base_layer/p2p" }

diff --git a/base_layer/core/src/transactions/transaction_components/encrypted_value.rs b/base_layer/core/src/transactions/transaction_components/encrypted_value.rs
@@ -120,7 +120,8 @@ impl EncryptedValue {
 // Generate a ChaCha20-Poly1305 key from an ECDH shared secret and commitment using Blake2b
 fn kdf_aead(shared_secret: &PrivateKey, commitment: &Commitment) -> Key {
     const AEAD_KEY_LENGTH: usize = 32; // The length in bytes of a ChaCha20-Poly1305 AEAD key
-    let mut hasher = Blake256::with_params(&[], b"SCAN_AEAD".as_ref(), b"TARI_KDF".as_ref());
+    let mut hasher = Blake256::with_params(&[], b"SCAN_AEAD".as_ref(), b"TARI_KDF".as_ref())
+        .expect("Given Blake256 params should not produce failure");
     hasher.update(shared_secret.as_bytes());
     hasher.update(commitment.as_bytes());
     let output = hasher.finalize();

diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["lib", "cdylib"]
 
 [dependencies]
 tari_common_types = { version = "^0.34", path = "../../base_layer/common_types" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 
 arrayvec = "0.7.1"

diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml
@@ -25,7 +25,7 @@ criterion = { version="0.2", optional = true }
 [dev-dependencies]
 rand="0.8.0"
 blake2 = "0.9.0"
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 serde_json = "1.0"
 bincode = "1.1"
 [lib]

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 tari_comms = { version = "^0.34", path = "../../comms/core" }
 tari_comms_dht = { version = "^0.34", path = "../../comms/dht" }
 tari_common = { version = "^0.34", path = "../../common" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_service_framework = { version = "^0.34", path = "../service_framework" }
 tari_shutdown = { version = "^0.34", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.34", path = "../../infrastructure/storage" }

diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 tari_comms = { version = "^0.34", path = "../../comms/core" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_common = {  path = "../../common" }
 tari_core = {  path = "../core", default-features = false, features = ["transactions"]}
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }

diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
@@ -11,7 +11,7 @@ tari_common = { path = "../../common" }
 tari_common_types = { version = "^0.34", path = "../../base_layer/common_types" }
 tari_comms = { version = "^0.34", path = "../../comms/core" }
 tari_comms_dht = { version = "^0.34", path = "../../comms/dht" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_key_manager = { version = "^0.34", path = "../key_manager" }
 tari_p2p = { version = "^0.34", path = "../p2p", features = ["auto-update"] }
 tari_script = { path = "../../infrastructure/tari_script" }

diff --git a/base_layer/wallet/src/transaction_service/service.rs b/base_layer/wallet/src/transaction_service/service.rs
@@ -66,7 +66,8 @@ use tari_core::{
 use tari_crypto::{
     commitment::HomomorphicCommitmentFactory,
     hash::blake2::Blake256,
-    hashing::{DomainSeparatedHasher, GenericHashDomain},
+    hash_domain,
+    hashing::DomainSeparatedHasher,
     keys::{DiffieHellmanSharedSecret, PublicKey as PKtrait, SecretKey},
     tari_utilities::ByteArray,
 };
@@ -1345,11 +1346,17 @@ where
             ));
         }
         let (nonce_private_key, nonce_public_key) = PublicKey::random_keypair(&mut OsRng);
-        let c = DomainSeparatedHasher::<Blake256, GenericHashDomain>::new("com.tari.stealth_address")
+
+        hash_domain!(
+            WalletServiceHashDomain,
+            "com.tari.base_layer.wallet.transaction_service"
+        );
+
+        let c = DomainSeparatedHasher::<Blake256, WalletServiceHashDomain>::new("stealth_address")
             .chain((dest_pubkey.clone() * nonce_private_key).as_bytes())
             .finalize();
         let script_spending_key =
-            PublicKey::from_secret_key(&PrivateKey::from_bytes(c.into_vec().as_bytes()).unwrap()) + dest_pubkey.clone();
+            PublicKey::from_secret_key(&PrivateKey::from_bytes(c.as_ref()).unwrap()) + dest_pubkey.clone();
         self.send_one_sided_or_stealth(
             dest_pubkey,
             amount,

diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml
@@ -12,7 +12,7 @@ tari_common = {path="../../common"}
 tari_common_types = {path="../common_types"}
 tari_comms = { version = "^0.34", path = "../../comms/core", features = ["c_integration"]}
 tari_comms_dht = { version = "^0.34", path = "../../comms/dht", default-features = false }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_key_manager = { version = "^0.34", path = "../key_manager" }
 tari_p2p = { version = "^0.34", path = "../p2p" }
 tari_script = { path = "../../infrastructure/tari_script" }

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -14,7 +14,7 @@ build = ["toml", "prost-build"]
 static-application-info = ["git2"]
 
 [dependencies]
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_common_types = { path = "../base_layer/common_types" }
 anyhow = "1.0.53"
 config = { version = "0.13.0", default_features = false, features = ["toml"] }

diff --git a/common/src/hashing_domain.rs b/common/src/hashing_domain.rs
@@ -20,7 +20,7 @@
 // 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 sha2::Digest;
+use sha2::{digest::Update, Digest};
 use tari_common_types::types::{DefaultDomainHasher, MacDomainHasher};
 use tari_crypto::hashing::{DomainSeparatedHash, LengthExtensionAttackResistant, Mac};
 use thiserror::Error;
@@ -48,7 +48,7 @@ impl HashingDomain {
     }
 
     /// Convenience function to compute hash of the data. It will handle hasher creation, data feeding and finalization.
-    pub fn digest<D: Digest>(&self, data: &[u8]) -> DomainSeparatedHash {
+    pub fn digest<D: Digest>(&self, data: &[u8]) -> DomainSeparatedHash<D> {
         self.hasher::<D>().chain(data).finalize()
     }
 
@@ -58,13 +58,13 @@ impl HashingDomain {
     }
 
     /// Convenience function to compute hash of the data. It will handle hasher creation, data feeding and finalization.
-    pub fn mac_digest<D: Digest + LengthExtensionAttackResistant>(&self, data: &[u8]) -> DomainSeparatedHash {
+    pub fn mac_digest<D: Digest + LengthExtensionAttackResistant>(&self, data: &[u8]) -> DomainSeparatedHash<D> {
         self.mac_hasher::<D>().chain(data).finalize()
     }
 
     /// Generate a finalized domain separated Hash-based Message Authentication Code (HMAC) for the key and message
-    pub fn generate_hmac<D: Digest + LengthExtensionAttackResistant>(&self, key: &[u8], msg: &[u8]) -> Mac {
-        Mac::generate::<D, _, _>(key, msg, self.domain_label)
+    pub fn generate_hmac<D: Digest + LengthExtensionAttackResistant + Update>(&self, key: &[u8], msg: &[u8]) -> Mac<D> {
+        Mac::generate::<_, _>(key, msg, self.domain_label)
     }
 }
 
@@ -80,7 +80,7 @@ pub trait HashToBytes<const I: usize>: AsRef<[u8]> {
     }
 }
 
-impl<const I: usize> HashToBytes<I> for DomainSeparatedHash {}
+impl<const I: usize, D: Digest> HashToBytes<I> for DomainSeparatedHash<D> {}
 
 #[cfg(test)]
 mod test {
@@ -107,8 +107,6 @@ mod test {
         let hash_1 = hasher.finalize();
         let hash_2 = common_hash_domain().digest::<Blake256>(b"my 3rd secret");
         assert_eq!(hash_1.as_ref(), hash_2.as_ref());
-        assert_eq!(hash_1.domain_separation_tag(), hash_2.domain_separation_tag());
-        assert_eq!(hash_1.domain_separation_tag(), hash.domain_separation_tag());
     }
 
     #[test]
@@ -146,13 +144,10 @@ mod test {
         let hash_1 = hasher.finalize();
         let hash_2 = common_hash_domain().mac_digest::<Blake256>(b"my 3rd secret");
         assert_eq!(hash_1.as_ref(), hash_2.as_ref());
-        assert_eq!(hash_1.domain_separation_tag(), hash_2.domain_separation_tag());
-        assert_eq!(hash_1.domain_separation_tag(), hash.domain_separation_tag());
 
         let hmac = common_hash_domain().generate_hmac::<Blake256>(b"my secret key", b"my message");
-        assert_ne!(hmac.domain_separation_tag(), hash_1.domain_separation_tag());
         assert_eq!(
-            hmac.into_vec().to_hex(),
+            hmac.as_ref().to_vec().to_hex(),
             "412767200f4b3bcfbf02bdd556d6fad33be176b06bdcbb00963bd3cb51b5dc79"
         );
     }
@@ -163,14 +158,5 @@ mod test {
         let hash_generic = common_hash_domain().digest::<Blake256>(secret);
         let hash_mac = common_hash_domain().mac_digest::<Blake256>(secret);
         assert_ne!(hash_generic.as_ref(), hash_mac.as_ref());
-        assert_ne!(hash_generic.domain_separation_tag(), hash_mac.domain_separation_tag());
-        assert_eq!(
-            hash_generic.domain_separation_tag(),
-            "com.tari.tari_project.hash_domain.v1.common"
-        );
-        assert_eq!(
-            hash_mac.domain_separation_tag(),
-            "com.tari.tari_project.mac_domain.v1.common"
-        );
     }
 }
diff --git a/comms/core/Cargo.toml b/comms/core/Cargo.toml
@@ -10,7 +10,7 @@ version = "0.34.0"
 edition = "2018"
 
 [dependencies]
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_common = {path = "../../common"}
 tari_metrics = { path = "../../infrastructure/metrics" }
 tari_storage = { version = "^0.34", path = "../../infrastructure/storage" }

diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 tari_comms = { version = "^0.34", path = "../core", features = ["rpc"] }
 tari_common = { path = "../../common" }
 tari_comms_rpc_macros = { version = "^0.34", path = "../rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 tari_shutdown = { version = "^0.34", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.34", path = "../../infrastructure/storage" }

diff --git a/comms/dht/src/origin_mac.rs b/comms/dht/src/origin_mac.rs
@@ -41,6 +41,7 @@ fn construct_origin_mac_hash(
 ) -> [u8; 32] {
     // e = H_mac(P||R||m)
     Challenge::with_params(&[], &[], b"TARIDHTORIGINMAC")
+        .expect("params for Challenge should not produce failure")
         .chain(signer_public_key.as_bytes())
         .chain(public_nonce.as_bytes())
         .chain(message)

diff --git a/dan_layer/core/Cargo.toml b/dan_layer/core/Cargo.toml
@@ -11,7 +11,7 @@ tari_common = { path = "../../common" }
 tari_comms = { path = "../../comms/core" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_comms_rpc_macros = { path = "../../comms/rpc_macros" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_mmr = { path = "../../base_layer/mmr" }
 tari_p2p = { path = "../../base_layer/p2p" }
 tari_service_framework = { path = "../../base_layer/service_framework" }

diff --git a/dan_layer/engine/Cargo.toml b/dan_layer/engine/Cargo.toml
@@ -11,7 +11,7 @@ tari_common = { path = "../../common" }
 tari_dan_common_types = { path = "../common_types" }
 tari_mmr = { path = "../../base_layer/mmr" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_template_abi = { path = "../template_abi" }
 
 anyhow = "1.0.53"

diff --git a/dan_layer/engine/src/crypto.rs b/dan_layer/engine/src/crypto.rs
@@ -44,6 +44,6 @@ impl DomainSeparation for TariEngineDomainSeparation {
     }
 }
 
-pub fn domain_separated_hasher(label: &str) -> DomainSeparatedHasher<Blake256, TariEngineDomainSeparation> {
+pub fn domain_separated_hasher(label: &'static str) -> DomainSeparatedHasher<Blake256, TariEngineDomainSeparation> {
     DomainSeparatedHasher::new(label)
 }
diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml
@@ -13,7 +13,7 @@ license = "BSD-3-Clause"
 [dependencies]
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_common = {path = "../../common"}
-tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.0" }
+tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.15.1" }
 tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.4" }
 
 blake2 = "0.9"