diff --git a/Cargo.lock b/Cargo.lock index 100d365afa..502bc426cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1253,7 +1253,6 @@ checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" dependencies = [ "byteorder", "digest 0.9.0", - "packed_simd_2", "rand_core 0.5.1", "serde", "subtle", @@ -1273,6 +1272,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.1" +source = "git+https://github.com/tari-project/curve25519-dalek?tag=v4.0.1#380f59be1fd2eaf924c62b94d3673a660c650c74" +dependencies = [ + "byteorder", + "digest 0.9.0", + "packed_simd_2", + "rand_core 0.5.1", + "serde", + "subtle", + "zeroize", +] + [[package]] name = "cxx" version = "1.0.82" @@ -4519,7 +4532,7 @@ dependencies = [ "tari_core", "tari_crypto", "tari_script", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", "tonic", "tonic-build", @@ -4543,7 +4556,7 @@ dependencies = [ "tari_common_types", "tari_comms", "tari_crypto", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", "tokio", ] @@ -4590,7 +4603,7 @@ dependencies = [ "tari_service_framework", "tari_shutdown", "tari_storage", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", "tokio", "tonic", @@ -4607,12 +4620,12 @@ dependencies = [ [[package]] name = "tari_bulletproofs" -version = "4.3.0" -source = "git+https://github.com/tari-project/bulletproofs?tag=v4.3.0#02d5cb51d7fdaabf0e2523d45afed8b3d206c402" +version = "4.4.0" +source = "git+https://github.com/tari-project/bulletproofs?tag=v4.4.0#b2f933feaaf00264e9212be5bce10c3a7a5508cc" dependencies = [ "blake2 0.9.2", "byteorder", - "curve25519-dalek 3.2.1", + "curve25519-dalek 4.0.1", "digest 0.9.0", "merlin 2.0.1", "rand 0.7.3", @@ -4627,12 +4640,12 @@ dependencies = [ [[package]] name = "tari_bulletproofs_plus" -version = "0.0.7" -source = "git+https://github.com/tari-project/bulletproofs-plus?tag=v0.1.0#6c221ff1661b776c26217d4b1c3605d77cbf3d43" +version = "0.1.1" +source = "git+https://github.com/tari-project/bulletproofs-plus?tag=v0.1.1#7ac2860a65c6ef935911c5d14c73fffda4eae084" dependencies = [ "blake2 0.9.2", "byteorder", - "curve25519-dalek 3.2.1", + "curve25519-dalek 4.0.1", "derivative", "derive_more", "digest 0.9.0", @@ -4694,7 +4707,7 @@ dependencies = [ "serde", "tari_common", "tari_crypto", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", "tokio", "zeroize", @@ -4738,7 +4751,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_test_utils", - "tari_utilities 0.4.10", + "tari_utilities", "tempfile", "thiserror", "tokio", @@ -4787,7 +4800,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_test_utils", - "tari_utilities 0.4.10", + "tari_utilities", "tempfile", "thiserror", "tokio", @@ -4846,7 +4859,7 @@ dependencies = [ "tari_libtor", "tari_p2p", "tari_shutdown", - "tari_utilities 0.4.10", + "tari_utilities", "tari_wallet", "thiserror", "tokio", @@ -4913,7 +4926,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_test_utils", - "tari_utilities 0.4.10", + "tari_utilities", "tempfile", "thiserror", "tokio", @@ -4924,14 +4937,14 @@ dependencies = [ [[package]] name = "tari_crypto" -version = "0.16.4" -source = "git+https://github.com/tari-project/tari-crypto.git?tag=v0.16.4#f649c08528f84ed8865aba6fbeb52e969fca14a5" +version = "0.16.5" +source = "git+https://github.com/tari-project/tari-crypto.git?tag=v0.16.5#5073557b391d852d2c94a071fe3429f5161ce9e4" dependencies = [ "base64 0.10.1", "blake2 0.9.2", "borsh", "cbindgen 0.17.0", - "curve25519-dalek 3.2.1", + "curve25519-dalek 4.0.1", "digest 0.9.0", "getrandom 0.2.8", "lazy_static", @@ -4945,7 +4958,7 @@ dependencies = [ "sha3", "tari_bulletproofs", "tari_bulletproofs_plus", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", "wasm-bindgen", "zeroize", @@ -4974,7 +4987,7 @@ dependencies = [ "subtle", "tari_common_types", "tari_crypto", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", "wasm-bindgen", "wasm-bindgen-test", @@ -5026,7 +5039,7 @@ dependencies = [ "tari_common", "tari_comms", "tari_core", - "tari_utilities 0.4.10", + "tari_utilities", "tari_wallet_grpc_client", "thiserror", "tokio", @@ -5081,7 +5094,7 @@ dependencies = [ "tari_comms", "tari_core", "tari_crypto", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", "tokio", "tonic", @@ -5101,7 +5114,7 @@ dependencies = [ "tari_comms", "tari_core", "tari_crypto", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", ] @@ -5120,7 +5133,7 @@ dependencies = [ "serde_json", "tari_common", "tari_crypto", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", ] @@ -5154,7 +5167,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_test_utils", - "tari_utilities 0.4.10", + "tari_utilities", "tempfile", "thiserror", "tokio", @@ -5178,7 +5191,7 @@ dependencies = [ "sha2 0.9.9", "sha3", "tari_crypto", - "tari_utilities 0.4.10", + "tari_utilities", "thiserror", ] @@ -5217,7 +5230,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "tari_utilities 0.4.9", + "tari_utilities", "thiserror", ] @@ -5233,24 +5246,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tari_utilities" -version = "0.4.9" -source = "git+https://github.com/cifko/tari_utilities.git?branch=add-borsh#db4ea08c1d361d709d38003571da23d90d2ec9f4" -dependencies = [ - "base58-monero 0.3.2", - "base64 0.13.1", - "bincode", - "borsh", - "generic-array", - "newtype-ops", - "serde", - "serde_json", - "subtle", - "thiserror", - "zeroize", -] - [[package]] name = "tari_utilities" version = "0.4.10" @@ -5313,7 +5308,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_test_utils", - "tari_utilities 0.4.10", + "tari_utilities", "tempfile", "thiserror", "tokio", @@ -5349,7 +5344,7 @@ dependencies = [ "tari_service_framework", "tari_shutdown", "tari_test_utils", - "tari_utilities 0.4.10", + "tari_utilities", "tari_wallet", "tempfile", "thiserror", diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml index dd2acf012e..a48a6fa038 100644 --- 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.41", 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.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_script = { path = "../../infrastructure/tari_script" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } @@ -27,7 +27,7 @@ prost-types = "0.9" rand = "0.8.5" thiserror = "1" tonic = "0.6.2" -zeroize = "1.3" +zeroize = "1" [build-dependencies] tonic-build = "0.6.2" diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml index c694073304..ea9ddbb828 100644 --- 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.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_common = { path = "../../common" } tari_common_types = { path = "../../base_layer/common_types" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml index 2843382ab4..444e4eeaa6 100644 --- 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.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_libtor = { path = "../../infrastructure/libtor", optional = true } tari_mmr = { path = "../../base_layer/mmr", features = ["native_bitmap"] } tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] } diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml index ce41554c9a..99301fe157 100644 --- 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.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_common = { path = "../../common" } tari_app_utilities = { path = "../tari_app_utilities" } tari_comms = { path = "../../comms/core" } @@ -50,7 +50,7 @@ tonic = "0.6.2" tracing = "0.1.26" unicode-segmentation = "1.6.0" unicode-width = "0.1" -zeroize = "1.3.0" +zeroize = "1" [dependencies.tari_core] path = "../../base_layer/core" diff --git a/applications/tari_miner/Cargo.toml b/applications/tari_miner/Cargo.toml index 99f2994b04..9887ae4349 100644 --- a/applications/tari_miner/Cargo.toml +++ b/applications/tari_miner/Cargo.toml @@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" } 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.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } borsh = "0.9.3" diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index 52417eba2b..5dd6ead196 100644 --- a/base_layer/common_types/Cargo.toml +++ b/base_layer/common_types/Cargo.toml @@ -7,7 +7,7 @@ version = "0.41.0" edition = "2018" [dependencies] -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } tari_common = { version = "^0.41", path = "../../common" } diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 078f936f4f..0aeb46ab11 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -24,7 +24,7 @@ tari_common_types = { version = "^0.41", path = "../../base_layer/common_types" tari_comms = { version = "^0.41", path = "../../comms/core" } tari_comms_dht = { version = "^0.41", path = "../../comms/dht" } tari_comms_rpc_macros = { version = "^0.41", path = "../../comms/rpc_macros" } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4", features = ["borsh"] } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5", features = ["borsh"] } tari_metrics = { path = "../../infrastructure/metrics" } tari_mmr = { version = "^0.41", path = "../../base_layer/mmr", optional = true, features = ["native_bitmap"] } tari_p2p = { version = "^0.41", path = "../../base_layer/p2p" } diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index 08d0dfa468..94c59cdb7f 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -13,7 +13,7 @@ crate-type = ["lib", "cdylib"] # NB: All dependencies must support or be gated for the WASM target. [dependencies] tari_common_types = { version = "^0.41", path = "../../base_layer/common_types", optional = true } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } argon2 = { version = "0.4.1", features = ["std", "alloc"] } diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index 03fdb773bc..0d03ec1ebf 100644 --- a/base_layer/mmr/Cargo.toml +++ b/base_layer/mmr/Cargo.toml @@ -14,7 +14,7 @@ benches = ["criterion"] [dependencies] tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_common = {path = "../../common"} thiserror = "1.0.26" digest = "0.9.0" diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index b1005d0476..9067cc2717 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" tari_comms = { version = "^0.41", path = "../../comms/core" } tari_comms_dht = { version = "^0.41", path = "../../comms/dht" } tari_common = { version = "^0.41", path = "../../common" } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_service_framework = { version = "^0.41", path = "../service_framework" } tari_shutdown = { version = "^0.41", path = "../../infrastructure/shutdown" } tari_storage = { version = "^0.41", path = "../../infrastructure/storage" } diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml index 182ba6efe6..97c4c62a10 100644 --- 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.41", path = "../../comms/core" } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4"} +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5"} 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.10"} diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index c482b8f8ce..4f6811ac0a 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -12,7 +12,7 @@ tari_common = { path = "../../common" } tari_common_types = { version = "^0.41", path = "../../base_layer/common_types" } tari_comms = { version = "^0.41", path = "../../comms/core" } tari_comms_dht = { version = "^0.41", path = "../../comms/dht" } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_key_manager = { version = "^0.41", path = "../key_manager" } tari_p2p = { version = "^0.41", path = "../p2p", features = ["auto-update"] } tari_script = { path = "../../infrastructure/tari_script" } @@ -56,7 +56,7 @@ tower = "0.4" prost = "0.9" itertools = "0.10.3" chacha20poly1305 = "0.9.1" -zeroize = "1.3" +zeroize = "1" [dev-dependencies] tari_p2p = { version = "^0.41", path = "../p2p", features = ["test-mocks"] } diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index 8e675cef49..aa0dbfeaa2 100644 --- 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.41", path = "../../comms/core", features = ["c_integration"]} tari_comms_dht = { version = "^0.41", path = "../../comms/dht", default-features = false } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_key_manager = { version = "^0.41", path = "../key_manager" } tari_p2p = { version = "^0.41", path = "../p2p" } tari_script = { path = "../../infrastructure/tari_script" } diff --git a/common/Cargo.toml b/common/Cargo.toml index 3ae2b3830f..7bc120b634 100644 --- 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.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } anyhow = "1.0.53" config = { version = "0.13.0", default_features = false, features = ["toml"] } diff --git a/comms/core/Cargo.toml b/comms/core/Cargo.toml index 9eca4ed49f..66612d020c 100644 --- a/comms/core/Cargo.toml +++ b/comms/core/Cargo.toml @@ -10,7 +10,7 @@ version = "0.41.0" edition = "2018" [dependencies] -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_common = {path = "../../common"} tari_metrics = { path = "../../infrastructure/metrics" } tari_storage = { version = "^0.41", path = "../../infrastructure/storage" } diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 76bacf4e77..bd75f6cd50 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" tari_comms = { version = "^0.41", path = "../core", features = ["rpc"] } tari_common = { path = "../../common" } tari_comms_rpc_macros = { version = "^0.41", path = "../rpc_macros" } -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } tari_shutdown = { version = "^0.41", path = "../../infrastructure/shutdown" } tari_storage = { version = "^0.41", path = "../../infrastructure/storage" } @@ -38,7 +38,7 @@ serde = "1.0.90" serde_derive = "1.0.90" thiserror = "1.0.26" tower = { version = "0.4", features = ["full"] } -zeroize = "1.3.0" +zeroize = "1" # Uncomment for tokio tracing via tokio-console (needs "tracing" features) #console-subscriber = "0.1.3" diff --git a/infrastructure/storage/Cargo.toml b/infrastructure/storage/Cargo.toml index 0ea40e7381..1d08360580 100644 --- a/infrastructure/storage/Cargo.toml +++ b/infrastructure/storage/Cargo.toml @@ -19,5 +19,4 @@ serde_derive = "1.0.80" [dev-dependencies] rand = "0.7.3" -# tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.9" } -tari_utilities = { git = "https://github.com/cifko/tari_utilities.git", branch = "add-borsh", features = ["borsh"] } +tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.10", features = ["borsh"] } diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index fdf3e59ae4..f4e3d13a41 100644 --- a/infrastructure/tari_script/Cargo.toml +++ b/infrastructure/tari_script/Cargo.toml @@ -11,7 +11,7 @@ readme = "README.md" license = "BSD-3-Clause" [dependencies] -tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" } blake2 = "0.9"