Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Jul 27, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d04a34
solve breaking changes introduced by new tari-crypto tag
jorgeantonio21 Jul 27, 2022
7983552
Update base_layer/wallet/src/transaction_service/service.rs
jorgeantonio21 Jul 27, 2022
ba8cdad
run cargo fmt
jorgeantonio21 Jul 27, 2022
d332842
refactor additional code
jorgeantonio21 Jul 27, 2022
9722780
refactor additional logic
jorgeantonio21 Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion applications/tari_app_grpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
2 changes: 1 addition & 1 deletion applications/tari_app_utilities/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_base_node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_collectibles/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_console_wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_merge_mining_proxy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_validator_node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion applications/test_faucet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion base_layer/common_types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base_layer/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
3 changes: 2 additions & 1 deletion base_layer/core/src/transactions/transaction_components/encrypted_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion base_layer/key_manager/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion base_layer/mmr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/p2p/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion base_layer/tari_mining_helper_ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
13 changes: 10 additions & 3 deletions base_layer/wallet/src/transaction_service/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet_ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
28 changes: 7 additions & 21 deletions common/src/hashing_domain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
}

Expand All @@ -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)
}
}

Expand All @@ -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 {
Expand All @@ -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]
Expand Down Expand Up @@ -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"
);
}
Expand All @@ -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"
);
}
}
2 changes: 1 addition & 1 deletion comms/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion comms/dht/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
1 change: 1 addition & 0 deletions comms/dht/src/origin_mac.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dan_layer/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion dan_layer/engine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dan_layer/engine/src/crypto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion infrastructure/tari_script/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down