From 482ec9b48537507020cd6a19ce94a6e44330192c Mon Sep 17 00:00:00 2001 From: Stan Bondi Date: Wed, 8 Mar 2023 09:48:31 +0400 Subject: [PATCH] lock to tari v0.47.0-pre.0 and fix cucumbers --- Cargo.lock | 204 +++++++++++------- applications/tari_dan_app_grpc/Cargo.toml | 6 +- .../src/conversions/transaction.rs | 4 +- .../tari_dan_app_utilities/Cargo.toml | 12 +- applications/tari_dan_wallet_cli/Cargo.toml | 2 +- .../src/command/transaction.rs | 6 +- .../tari_dan_wallet_daemon/Cargo.toml | 6 +- applications/tari_indexer/Cargo.toml | 22 +- applications/tari_validator_node/Cargo.toml | 36 ++-- .../tari_validator_node/tests/cucumber.rs | 5 +- .../tests/steps/validator_node.rs | 6 +- .../tari_validator_node/tests/steps/wallet.rs | 15 +- .../tests/templates/basic_nft/Cargo.lock | 8 +- .../tests/templates/counter/Cargo.lock | 44 ++-- .../tests/templates/fees/Cargo.toml | 14 +- .../tari_validator_node_cli/Cargo.toml | 2 +- clients/tari_indexer_client/Cargo.toml | 2 +- clients/validator_node_client/Cargo.toml | 2 +- clients/wallet_daemon_client/Cargo.toml | 2 +- dan_layer/common_types/Cargo.toml | 6 +- dan_layer/core/Cargo.toml | 18 +- dan_layer/engine/Cargo.toml | 4 +- dan_layer/engine/src/transaction/processor.rs | 2 +- dan_layer/engine_types/Cargo.toml | 2 +- dan_layer/engine_types/src/instruction.rs | 2 +- dan_layer/integration_tests/Cargo.toml | 8 +- dan_layer/storage/Cargo.toml | 2 +- dan_layer/storage_lmdb/Cargo.toml | 2 +- dan_layer/storage_sqlite/Cargo.toml | 2 +- dan_layer/transaction/Cargo.toml | 2 +- dan_layer/wallet/sdk/Cargo.toml | 4 +- dan_layer/wallet/storage_sqlite/Cargo.toml | 2 +- 32 files changed, 250 insertions(+), 204 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93a8c4c17e..8e33c042a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5737,8 +5737,8 @@ checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" [[package]] name = "tari_app_grpc" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "argon2", "base64 0.13.1", @@ -5748,7 +5748,7 @@ dependencies = [ "prost", "prost-types", "rand 0.8.5", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_core", "tari_crypto", @@ -5762,8 +5762,8 @@ dependencies = [ [[package]] name = "tari_app_utilities" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "clap 3.2.23", "futures 0.3.26", @@ -5771,8 +5771,8 @@ dependencies = [ "log", "rand 0.7.3", "serde", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_utilities", "thiserror", @@ -5781,8 +5781,8 @@ dependencies = [ [[package]] name = "tari_base_node" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "anyhow", "async-trait", @@ -5805,8 +5805,8 @@ dependencies = [ "strum", "tari_app_grpc", "tari_app_utilities", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_comms_dht", "tari_core", @@ -5825,7 +5825,7 @@ dependencies = [ [[package]] name = "tari_base_node_grpc_client" version = "0.1.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "tari_app_grpc", ] @@ -5882,6 +5882,28 @@ dependencies = [ name = "tari_common" version = "0.46.0" source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +dependencies = [ + "anyhow", + "blake2 0.9.2", + "config", + "dirs-next 1.0.2", + "log", + "log4rs", + "multiaddr 0.14.0", + "path-clean", + "serde", + "serde_json", + "sha2 0.9.9", + "structopt", + "tari_crypto", + "tempfile", + "thiserror", +] + +[[package]] +name = "tari_common" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "anyhow", "blake2 0.9.2", @@ -5905,8 +5927,8 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "diesel", "log", @@ -5924,7 +5946,25 @@ dependencies = [ "newtype-ops", "rand 0.7.3", "serde", - "tari_common", + "tari_common 0.46.0", + "tari_crypto", + "tari_utilities", + "thiserror", + "tokio", +] + +[[package]] +name = "tari_common_types" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" +dependencies = [ + "borsh", + "digest 0.9.0", + "lazy_static", + "newtype-ops", + "rand 0.7.3", + "serde", + "tari_common 0.47.0-pre.0", "tari_crypto", "tari_utilities", "thiserror", @@ -5933,8 +5973,8 @@ dependencies = [ [[package]] name = "tari_comms" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "anyhow", "async-trait", @@ -5960,7 +6000,7 @@ dependencies = [ "serde", "serde_derive", "snow", - "tari_common", + "tari_common 0.47.0-pre.0", "tari_crypto", "tari_metrics", "tari_shutdown", @@ -5978,8 +6018,8 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -5997,7 +6037,7 @@ dependencies = [ "prost-types", "rand 0.7.3", "serde", - "tari_common", + "tari_common 0.47.0-pre.0", "tari_common_sqlite", "tari_comms", "tari_comms_rpc_macros", @@ -6025,8 +6065,8 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "proc-macro2", "quote", @@ -6035,8 +6075,8 @@ dependencies = [ [[package]] name = "tari_console_wallet" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "bitflags 1.3.2", "chrono", @@ -6058,8 +6098,8 @@ dependencies = [ "strum_macros", "tari_app_grpc", "tari_app_utilities", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_comms_dht", "tari_core", @@ -6082,8 +6122,8 @@ dependencies = [ [[package]] name = "tari_core" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "bincode", "bitflags 1.3.2", @@ -6118,8 +6158,8 @@ dependencies = [ "serde_repr", "sha3", "strum_macros", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_comms_dht", "tari_comms_rpc_macros", @@ -6175,8 +6215,8 @@ dependencies = [ "anyhow", "chrono", "prost", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_crypto", "tari_dan_common_types", @@ -6196,7 +6236,7 @@ dependencies = [ "log", "tari_app_grpc", "tari_base_node_grpc_client", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_core", "tari_crypto", @@ -6229,8 +6269,8 @@ dependencies = [ "rand 0.7.3", "serde", "tari_bor", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_engine_types", "tari_mmr", @@ -6252,8 +6292,8 @@ dependencies = [ "prost", "rand 0.8.5", "serde", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_comms_dht", "tari_core", @@ -6285,7 +6325,7 @@ dependencies = [ "serde", "serde_json", "tari_bor", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_dan_common_types", "tari_engine_types", @@ -6307,7 +6347,7 @@ name = "tari_dan_storage" version = "0.50.0-pre.0" dependencies = [ "serde", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_dan_common_types", "thiserror", "time 0.3.19", @@ -6337,7 +6377,7 @@ dependencies = [ "log", "serde", "serde_json", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_dan_common_types", "tari_dan_core", "tari_dan_engine", @@ -6358,7 +6398,7 @@ dependencies = [ "lazy_static", "log", "rand 0.7.3", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_core", "tari_crypto", @@ -6388,7 +6428,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_dan_common_types", "tari_dan_engine", @@ -6421,8 +6461,8 @@ dependencies = [ "multiaddr 0.17.0", "serde", "serde_json", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_dan_common_types", "tari_dan_wallet_sdk", @@ -6452,7 +6492,7 @@ dependencies = [ "rand 0.7.3", "serde", "tari_bor", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_dan_common_types", "tari_dan_wallet_storage_sqlite", @@ -6480,7 +6520,7 @@ dependencies = [ "log", "serde", "serde_json", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_dan_common_types", "tari_dan_wallet_sdk", "tari_engine_types", @@ -6497,7 +6537,7 @@ dependencies = [ "rand 0.7.3", "serde", "tari_bor", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_template_abi", "tari_template_lib", @@ -6529,8 +6569,8 @@ dependencies = [ "tari_app_grpc", "tari_app_utilities", "tari_base_node_grpc_client", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_comms_logging", "tari_comms_rpc_macros", @@ -6568,7 +6608,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_comms_logging", "tari_dan_common_types", "tari_engine_types", @@ -6576,8 +6616,8 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "argon2", "blake2 0.9.2", @@ -6599,7 +6639,7 @@ dependencies = [ [[package]] name = "tari_metrics" version = "0.1.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "anyhow", "futures 0.3.26", @@ -6614,14 +6654,14 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "croaring", "digest 0.9.0", "log", "serde", - "tari_common", + "tari_common 0.47.0-pre.0", "tari_crypto", "tari_utilities", "thiserror", @@ -6629,8 +6669,8 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "anyhow", "fs2", @@ -6644,7 +6684,7 @@ dependencies = [ "rustls", "semver", "serde", - "tari_common", + "tari_common 0.47.0-pre.0", "tari_comms", "tari_comms_dht", "tari_crypto", @@ -6663,7 +6703,7 @@ dependencies = [ [[package]] name = "tari_script" version = "0.12.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "blake2 0.9.2", "borsh", @@ -6679,8 +6719,8 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "anyhow", "async-trait", @@ -6694,16 +6734,16 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "futures 0.3.26", ] [[package]] name = "tari_storage" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "bincode", "lmdb-zero", @@ -6756,7 +6796,7 @@ version = "0.50.0-pre.0" dependencies = [ "anyhow", "borsh", - "tari_common_types", + "tari_common_types 0.46.0", "tari_crypto", "tari_dan_common_types", "tari_dan_engine", @@ -6770,8 +6810,8 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "futures 0.3.26", "rand 0.7.3", @@ -6786,7 +6826,7 @@ version = "0.50.0-pre.0" dependencies = [ "rand 0.7.3", "serde", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_dan_common_types", "tari_engine_types", @@ -6856,8 +6896,8 @@ dependencies = [ "tari_app_utilities", "tari_base_node", "tari_base_node_grpc_client", - "tari_common", - "tari_common_types", + "tari_common 0.47.0-pre.0", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_comms_dht", "tari_comms_logging", @@ -6912,7 +6952,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_crypto", "tari_dan_common_types", "tari_dan_engine", @@ -6937,7 +6977,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_comms_logging", "tari_dan_common_types", "tari_dan_core", @@ -6947,8 +6987,8 @@ dependencies = [ [[package]] name = "tari_wallet" -version = "0.46.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +version = "0.47.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "argon2", "async-trait", @@ -6973,9 +7013,9 @@ dependencies = [ "sha2 0.9.9", "strum", "strum_macros", - "tari_common", + "tari_common 0.47.0-pre.0", "tari_common_sqlite", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_comms", "tari_comms_dht", "tari_core", @@ -7000,7 +7040,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "tari_comms_logging", "tari_dan_common_types", "tari_dan_wallet_sdk", @@ -7013,10 +7053,10 @@ dependencies = [ [[package]] name = "tari_wallet_grpc_client" version = "0.1.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#ee55e843d0fd31b25163e118a3454ef666088c6c" +source = "git+https://github.com/tari-project/tari.git?tag=v0.47.0-pre.0#61ea74723b96c797be8737142437c2fe947069e3" dependencies = [ "tari_app_grpc", - "tari_common_types", + "tari_common_types 0.47.0-pre.0", "thiserror", "tonic", ] diff --git a/applications/tari_dan_app_grpc/Cargo.toml b/applications/tari_dan_app_grpc/Cargo.toml index 247c91a7a8..0bc1f43b50 100644 --- a/applications/tari_dan_app_grpc/Cargo.toml +++ b/applications/tari_dan_app_grpc/Cargo.toml @@ -8,8 +8,8 @@ version = "0.50.0-pre.0" edition = "2018" [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } -tari_comms = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } +tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } tari_dan_common_types = { path = "../../dan_layer/common_types" } @@ -24,4 +24,4 @@ prost = "0.9" tonic = "0.6.2" [build-dependencies] -tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common", features = ["build"] } +tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common", features = ["build"] } diff --git a/applications/tari_dan_app_grpc/src/conversions/transaction.rs b/applications/tari_dan_app_grpc/src/conversions/transaction.rs index d5e0ee9766..376be14815 100644 --- a/applications/tari_dan_app_grpc/src/conversions/transaction.rs +++ b/applications/tari_dan_app_grpc/src/conversions/transaction.rs @@ -121,14 +121,14 @@ impl TryFrom for tari_engine_types::instruction message: request.log_message, }, 4 => Instruction::ClaimBurn { - claim: ConfidentialClaim { + claim: Box::new(ConfidentialClaim { commitment_address: request.claim_burn_commitment_address.try_into()?, range_proof: request.claim_burn_range_proof, proof_of_knowledge: request .claim_burn_proof_of_knowledge .ok_or_else(|| anyhow!("claim_burn_proof_of_knowledge not provided"))? .try_into()?, - }, + }), }, _ => return Err(anyhow!("invalid instruction_type")), }; diff --git a/applications/tari_dan_app_utilities/Cargo.toml b/applications/tari_dan_app_utilities/Cargo.toml index fc35e78f21..3848937e18 100644 --- a/applications/tari_dan_app_utilities/Cargo.toml +++ b/applications/tari_dan_app_utilities/Cargo.toml @@ -6,13 +6,13 @@ edition = "2018" license = "BSD-3-Clause" [dependencies] -tari_app_grpc = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_app_grpc" } -tari_base_node_grpc_client = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_base_node_grpc_client" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } -tari_comms = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms" } -tari_core = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_core", default-features = false, features = ["transactions"] } +tari_app_grpc = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_app_grpc" } +tari_base_node_grpc_client = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_base_node_grpc_client" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } +tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms" } +tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_core", default-features = false, features = ["transactions"] } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } -tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_shutdown" } +tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_shutdown" } tari_dan_common_types = { path = "../../dan_layer/common_types" } tari_dan_core = { path = "../../dan_layer/core" } diff --git a/applications/tari_dan_wallet_cli/Cargo.toml b/applications/tari_dan_wallet_cli/Cargo.toml index 123e23e15e..86373db44d 100644 --- a/applications/tari_dan_wallet_cli/Cargo.toml +++ b/applications/tari_dan_wallet_cli/Cargo.toml @@ -8,7 +8,7 @@ version = "0.50.0-pre.0" edition = "2018" [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } tari_dan_common_types = { path = "../../dan_layer/common_types" } tari_dan_engine = { path = "../../dan_layer/engine" } diff --git a/applications/tari_dan_wallet_cli/src/command/transaction.rs b/applications/tari_dan_wallet_cli/src/command/transaction.rs index 37f375eee7..721fd4c1ba 100644 --- a/applications/tari_dan_wallet_cli/src/command/transaction.rs +++ b/applications/tari_dan_wallet_cli/src/command/transaction.rs @@ -68,7 +68,7 @@ use tari_wallet_daemon_client::{ WalletDaemonClient, }; -use crate::from_hex::FromHex; +use crate::{from_base64::FromBase64, from_hex::FromHex}; #[derive(Debug, Subcommand, Clone)] pub enum TransactionSubcommand { @@ -401,11 +401,11 @@ pub async fn handle_claim_burn( let instructions = vec![ Instruction::ClaimBurn { - claim: ConfidentialClaim { + claim: Box::new(ConfidentialClaim { commitment_address, range_proof, proof_of_knowledge, - }, + }), }, Instruction::PutLastInstructionOutputOnWorkspace { key: b"burn".to_vec() }, Instruction::CallMethod { diff --git a/applications/tari_dan_wallet_daemon/Cargo.toml b/applications/tari_dan_wallet_daemon/Cargo.toml index 2d6f4fa2f7..0506fce4b1 100644 --- a/applications/tari_dan_wallet_daemon/Cargo.toml +++ b/applications/tari_dan_wallet_daemon/Cargo.toml @@ -8,10 +8,10 @@ version = "0.50.0-pre.0" edition = "2018" [dependencies] -tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } -tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } +tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_dan_wallet_sdk = { path = "../../dan_layer/wallet/sdk" } tari_dan_wallet_storage_sqlite = { path = "../../dan_layer/wallet/storage_sqlite" } tari_transaction = { path = "../../dan_layer/transaction" } diff --git a/applications/tari_indexer/Cargo.toml b/applications/tari_indexer/Cargo.toml index 3b0da08811..3b8197a192 100644 --- a/applications/tari_indexer/Cargo.toml +++ b/applications/tari_indexer/Cargo.toml @@ -8,19 +8,19 @@ version = "0.50.0-pre.0" edition = "2018" [dependencies] -tari_app_grpc = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_app_grpc" } -tari_app_utilities = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_app_utilities" } -tari_base_node_grpc_client = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_base_node_grpc_client" } -tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } -tari_comms = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms" } +tari_app_grpc = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_app_grpc" } +tari_app_utilities = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_app_utilities" } +tari_base_node_grpc_client = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_base_node_grpc_client" } +tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } +tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms" } tari_comms_logging = { path = "../../comms/tari_comms_logging" } -tari_comms_rpc_macros = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms_rpc_macros" } -tari_core = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_core", default-features = false, features = ["transactions"] } +tari_comms_rpc_macros = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms_rpc_macros" } +tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_core", default-features = false, features = ["transactions"] } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } -tari_p2p = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_p2p" } -tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_shutdown" } -tari_storage = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_storage" } +tari_p2p = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_p2p" } +tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_shutdown" } +tari_storage = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_storage" } tari_dan_app_grpc = { path = "../tari_dan_app_grpc" } tari_dan_app_utilities = { path = "../tari_dan_app_utilities" } diff --git a/applications/tari_validator_node/Cargo.toml b/applications/tari_validator_node/Cargo.toml index abd0238f6d..764752735e 100644 --- a/applications/tari_validator_node/Cargo.toml +++ b/applications/tari_validator_node/Cargo.toml @@ -8,28 +8,28 @@ version = "0.50.0-pre.0" edition = "2018" [dependencies] -tari_app_utilities = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_app_utilities" } -tari_app_grpc = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_app_grpc" } -tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common" } -tari_comms = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms" } -tari_comms_rpc_macros = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms_rpc_macros" } +tari_app_utilities = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_app_utilities" } +tari_app_grpc = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_app_grpc" } +tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common" } +tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms" } +tari_comms_rpc_macros = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms_rpc_macros" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } -tari_p2p = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_p2p" } -tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_shutdown" } -tari_storage = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_storage" } -tari_core = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_core", default-features = false, features = ["transactions"] } +tari_p2p = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_p2p" } +tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_shutdown" } +tari_storage = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_storage" } +tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_core", default-features = false, features = ["transactions"] } tari_dan_app_grpc = { path = "../tari_dan_app_grpc" } tari_dan_app_utilities = { path = "../tari_dan_app_utilities" } tari_dan_core = { path = "../../dan_layer/core" } tari_dan_storage = { path = "../../dan_layer/storage" } tari_dan_storage_sqlite = { path = "../../dan_layer/storage_sqlite" } tari_dan_common_types = { path = "../../dan_layer/common_types" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } tari_dan_engine = { path = "../../dan_layer/engine" } tari_template_builtin = { path = "../../dan_layer/template_builtin" } tari_template_lib = { path = "../../dan_layer/template_lib" } -tari_base_node_grpc_client = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_base_node_grpc_client" } -tari_wallet_grpc_client = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_wallet_grpc_client" } +tari_base_node_grpc_client = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_base_node_grpc_client" } +tari_wallet_grpc_client = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_wallet_grpc_client" } tari_engine_types = { path = "../../dan_layer/engine_types" } tari_validator_node_client = { path = "../../clients/validator_node_client" } tari_comms_logging = { path = "../../comms/tari_comms_logging" } @@ -66,17 +66,17 @@ tower-http = { version = "0.3.0", features = ["cors"] } tower-layer = "0.3" [build-dependencies] -tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common", features = ["build"] } +tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common", features = ["build"] } [dev-dependencies] # FIXME: the newest version failed compilation due to a missing "bool_to_option" unstable feature cucumber = { version = "0.13.0" } tempfile = "3.3.0" -tari_test_utils = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_test_utils" } -tari_base_node = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_base_node" } -tari_console_wallet = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_console_wallet" } -tari_comms_dht = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms_dht" } -tari_wallet = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_wallet" } +tari_test_utils = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_test_utils" } +tari_base_node = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_base_node" } +tari_console_wallet = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_console_wallet" } +tari_comms_dht = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms_dht" } +tari_wallet = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_wallet" } tari_validator_node_cli = { path = "../tari_validator_node_cli" } tari_transaction_manifest = { path = "../../dan_layer/transaction_manifest" } tari_indexer = { path = "../tari_indexer" } diff --git a/applications/tari_validator_node/tests/cucumber.rs b/applications/tari_validator_node/tests/cucumber.rs index 7e434418fd..45ebd15e27 100644 --- a/applications/tari_validator_node/tests/cucumber.rs +++ b/applications/tari_validator_node/tests/cucumber.rs @@ -45,10 +45,9 @@ use tari_common::initialize_logging; use tari_common_types::types::{FixedHash, PublicKey}; use tari_comms::multiaddr::Multiaddr; use tari_crypto::{ - ristretto::{RistrettoPublicKey, RistrettoSecretKey}, + ristretto::{RistrettoComSig, RistrettoPublicKey, RistrettoSecretKey}, tari_utilities::hex::Hex, }; -use tari_dan_app_grpc::proto; use tari_dan_app_utilities::base_node_client::GrpcBaseNodeClient; use tari_dan_common_types::QuorumDecision; use tari_dan_core::services::BaseNodeClient; @@ -96,7 +95,7 @@ pub struct TariWorld { cli_data_dir: Option, current_scenario_name: Option, commitments: IndexMap>, - commitment_ownership_proofs: IndexMap, + commitment_ownership_proofs: IndexMap, rangeproofs: IndexMap>, addresses: IndexMap, num_databases_saved: usize, diff --git a/applications/tari_validator_node/tests/steps/validator_node.rs b/applications/tari_validator_node/tests/steps/validator_node.rs index 94eda0495a..4cdc9e6f90 100644 --- a/applications/tari_validator_node/tests/steps/validator_node.rs +++ b/applications/tari_validator_node/tests/steps/validator_node.rs @@ -71,11 +71,11 @@ async fn when_i_claim_burn( let instructions = [ Instruction::ClaimBurn { - claim: ConfidentialClaim { + claim: Box::new(ConfidentialClaim { commitment_address: commitment.to_vec().try_into()?, range_proof: rangeproof.clone(), - proof_of_knowledge: proof.clone().try_into()?, - }, + proof_of_knowledge: proof.clone(), + }), }, Instruction::PutLastInstructionOutputOnWorkspace { key: b"burn".to_vec() }, Instruction::CallMethod { diff --git a/applications/tari_validator_node/tests/steps/wallet.rs b/applications/tari_validator_node/tests/steps/wallet.rs index 450f1b6a28..51cd23eb78 100644 --- a/applications/tari_validator_node/tests/steps/wallet.rs +++ b/applications/tari_validator_node/tests/steps/wallet.rs @@ -5,7 +5,8 @@ use std::time::Duration; use cucumber::{given, when}; use tari_app_grpc::tari_rpc::GetBalanceRequest; -use tari_crypto::tari_utilities::ByteArray; +use tari_common_types::types::{Commitment, PrivateKey, PublicKey}; +use tari_crypto::{ristretto::RistrettoComSig, tari_utilities::ByteArray}; use tokio::time::sleep; use crate::{spawn_wallet, TariWorld}; @@ -51,9 +52,15 @@ async fn when_i_burn_on_wallet( assert!(resp.is_success); world.commitments.insert(commitment, resp.commitment); - world - .commitment_ownership_proofs - .insert(proof, resp.ownership_proof.unwrap()); + // TODO: use proto::transaction::CommitmentSignature to deserialize once we update tari to include https://github.com/tari-project/tari/pull/5200 + world.commitment_ownership_proofs.insert( + proof, + RistrettoComSig::new( + Commitment::from_public_key(&PublicKey::from_bytes(&resp.ownership_proof[0..32]).unwrap()), + PrivateKey::from_bytes(&resp.ownership_proof[32..64]).unwrap(), + PrivateKey::from_bytes(&resp.ownership_proof[64..]).unwrap(), + ), + ); world.rangeproofs.insert(range_proof, resp.rangeproof); } diff --git a/applications/tari_validator_node/tests/templates/basic_nft/Cargo.lock b/applications/tari_validator_node/tests/templates/basic_nft/Cargo.lock index 0a528f4ef5..f40bafbbd8 100644 --- a/applications/tari_validator_node/tests/templates/basic_nft/Cargo.lock +++ b/applications/tari_validator_node/tests/templates/basic_nft/Cargo.lock @@ -156,21 +156,21 @@ dependencies = [ [[package]] name = "tari_bor" -version = "0.1.0" +version = "0.50.0-pre.0" dependencies = [ "borsh", ] [[package]] name = "tari_template_abi" -version = "0.35.1" +version = "0.50.0-pre.0" dependencies = [ "tari_bor", ] [[package]] name = "tari_template_lib" -version = "0.35.1" +version = "0.50.0-pre.0" dependencies = [ "newtype-ops", "tari_bor", @@ -180,7 +180,7 @@ dependencies = [ [[package]] name = "tari_template_macros" -version = "0.35.1" +version = "0.50.0-pre.0" dependencies = [ "proc-macro2", "quote", diff --git a/applications/tari_validator_node/tests/templates/counter/Cargo.lock b/applications/tari_validator_node/tests/templates/counter/Cargo.lock index dd114d310e..9c89b2541f 100644 --- a/applications/tari_validator_node/tests/templates/counter/Cargo.lock +++ b/applications/tari_validator_node/tests/templates/counter/Cargo.lock @@ -376,8 +376,8 @@ dependencies = [ "tari_crypto", "tari_dan_common_types", "tari_dan_engine", - "tari_template_abi 0.35.1", - "tari_template_lib 0.35.1", + "tari_template_abi 0.50.0-pre.0", + "tari_template_lib 0.50.0-pre.0", "tari_template_macros", ] @@ -1759,14 +1759,14 @@ checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" [[package]] name = "tari_bor" version = "0.1.0" +source = "git+https://github.com/tari-project/tari-dan.git?branch=development#31935241f10abfdc312e11447ee3a37240a65766" dependencies = [ "borsh", ] [[package]] name = "tari_bor" -version = "0.1.0" -source = "git+https://github.com/tari-project/tari-dan.git?branch=development#31935241f10abfdc312e11447ee3a37240a65766" +version = "0.50.0-pre.0" dependencies = [ "borsh", ] @@ -1896,7 +1896,7 @@ dependencies = [ "prost", "prost-types", "serde", - "tari_bor 0.1.0 (git+https://github.com/tari-project/tari-dan.git?branch=development)", + "tari_bor 0.1.0", "tari_common", "tari_common_types", "tari_crypto", @@ -1917,15 +1917,15 @@ dependencies = [ "rand", "serde", "serde_json", - "tari_bor 0.1.0 (git+https://github.com/tari-project/tari-dan.git?branch=development)", + "tari_bor 0.1.0", "tari_common", "tari_common_types", "tari_crypto", "tari_dan_common_types", "tari_engine_types", "tari_mmr", - "tari_template_abi 0.35.1 (git+https://github.com/tari-project/tari-dan.git?branch=development)", - "tari_template_lib 0.35.1 (git+https://github.com/tari-project/tari-dan.git?branch=development)", + "tari_template_abi 0.35.1", + "tari_template_lib 0.35.1", "tari_utilities", "tempfile", "thiserror", @@ -1940,11 +1940,11 @@ source = "git+https://github.com/tari-project/tari-dan.git?branch=development#31 dependencies = [ "digest", "serde", - "tari_bor 0.1.0 (git+https://github.com/tari-project/tari-dan.git?branch=development)", + "tari_bor 0.1.0", "tari_common_types", "tari_crypto", - "tari_template_abi 0.35.1 (git+https://github.com/tari-project/tari-dan.git?branch=development)", - "tari_template_lib 0.35.1 (git+https://github.com/tari-project/tari-dan.git?branch=development)", + "tari_template_abi 0.35.1", + "tari_template_lib 0.35.1", "tari_utilities", "thiserror", ] @@ -1966,43 +1966,43 @@ dependencies = [ [[package]] name = "tari_template_abi" version = "0.35.1" +source = "git+https://github.com/tari-project/tari-dan.git?branch=development#31935241f10abfdc312e11447ee3a37240a65766" dependencies = [ "tari_bor 0.1.0", ] [[package]] name = "tari_template_abi" -version = "0.35.1" -source = "git+https://github.com/tari-project/tari-dan.git?branch=development#31935241f10abfdc312e11447ee3a37240a65766" +version = "0.50.0-pre.0" dependencies = [ - "tari_bor 0.1.0 (git+https://github.com/tari-project/tari-dan.git?branch=development)", + "tari_bor 0.50.0-pre.0", ] [[package]] name = "tari_template_lib" version = "0.35.1" +source = "git+https://github.com/tari-project/tari-dan.git?branch=development#31935241f10abfdc312e11447ee3a37240a65766" dependencies = [ + "hex", "newtype-ops", + "serde", "tari_bor 0.1.0", "tari_template_abi 0.35.1", - "tari_template_macros", ] [[package]] name = "tari_template_lib" -version = "0.35.1" -source = "git+https://github.com/tari-project/tari-dan.git?branch=development#31935241f10abfdc312e11447ee3a37240a65766" +version = "0.50.0-pre.0" dependencies = [ - "hex", "newtype-ops", - "serde", - "tari_bor 0.1.0 (git+https://github.com/tari-project/tari-dan.git?branch=development)", - "tari_template_abi 0.35.1 (git+https://github.com/tari-project/tari-dan.git?branch=development)", + "tari_bor 0.50.0-pre.0", + "tari_template_abi 0.50.0-pre.0", + "tari_template_macros", ] [[package]] name = "tari_template_macros" -version = "0.35.1" +version = "0.50.0-pre.0" dependencies = [ "proc-macro2", "quote", diff --git a/applications/tari_validator_node/tests/templates/fees/Cargo.toml b/applications/tari_validator_node/tests/templates/fees/Cargo.toml index 4b29419cc3..57fa5f6de5 100644 --- a/applications/tari_validator_node/tests/templates/fees/Cargo.toml +++ b/applications/tari_validator_node/tests/templates/fees/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_template_abi = { path="../../../../../dan_layer/template_abi" } -tari_template_lib = {path="../../../../../dan_layer/template_lib"} -tari_template_macros = {path="../../../../../dan_layer/template_macros"} +tari_template_abi = { path = "../../../../../dan_layer/template_abi" } +tari_template_lib = { path = "../../../../../dan_layer/template_lib" } +tari_template_macros = { path = "../../../../../dan_layer/template_macros" } [profile.release] opt-level = 's' # Optimize for size. @@ -22,7 +22,7 @@ strip = "debuginfo" # Strip debug info. crate-type = ["cdylib", "lib"] [dev-dependencies] -tari_dan_engine = {git = "https://github.com/tari-project/tari-dan.git", branch="development", package="tari_dan_engine" } -tari_crypto = {git = "https://github.com/tari-project/tari-crypto.git", tag="v0.16.6" } -tari_dan_common_types = {git = "https://github.com/tari-project/tari-dan.git", branch="development", package="tari_dan_common_types" } -tari_common_types = {git = "https://github.com/tari-project/tari.git", branch="development", package="tari_common_types" } +tari_dan_engine = { git = "https://github.com/tari-project/tari-dan.git", branch = "development", package = "tari_dan_engine" } +tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } +tari_dan_common_types = { git = "https://github.com/tari-project/tari-dan.git", branch = "development", package = "tari_dan_common_types" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } diff --git a/applications/tari_validator_node_cli/Cargo.toml b/applications/tari_validator_node_cli/Cargo.toml index d24db7b345..7b25b85686 100644 --- a/applications/tari_validator_node_cli/Cargo.toml +++ b/applications/tari_validator_node_cli/Cargo.toml @@ -8,7 +8,7 @@ version = "0.50.0-pre.0" edition = "2018" [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } tari_dan_common_types = { path = "../../dan_layer/common_types" } tari_dan_engine = { path = "../../dan_layer/engine" } diff --git a/clients/tari_indexer_client/Cargo.toml b/clients/tari_indexer_client/Cargo.toml index 9c8f0d55d5..199043ee81 100644 --- a/clients/tari_indexer_client/Cargo.toml +++ b/clients/tari_indexer_client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] tari_dan_common_types = { path = "../../dan_layer/common_types" } tari_engine_types = { path = "../../dan_layer/engine_types" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_comms_logging = { path = "../../comms/tari_comms_logging" } anyhow = "1.0.65" diff --git a/clients/validator_node_client/Cargo.toml b/clients/validator_node_client/Cargo.toml index 9488d5209a..bcb38310c3 100644 --- a/clients/validator_node_client/Cargo.toml +++ b/clients/validator_node_client/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" tari_dan_core = { path = "../../dan_layer/core" } tari_dan_common_types = { path = "../../dan_layer/common_types" } tari_engine_types = { path = "../../dan_layer/engine_types" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_comms_logging = { path = "../../comms/tari_comms_logging" } tari_transaction = { path = "../../dan_layer/transaction" } diff --git a/clients/wallet_daemon_client/Cargo.toml b/clients/wallet_daemon_client/Cargo.toml index 7b6fd88855..d93470aca8 100644 --- a/clients/wallet_daemon_client/Cargo.toml +++ b/clients/wallet_daemon_client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] tari_dan_common_types = { path = "../../dan_layer/common_types" } tari_engine_types = { path = "../../dan_layer/engine_types" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_comms_logging = { path = "../../comms/tari_comms_logging" } tari_transaction = { path = "../../dan_layer/transaction" } tari_dan_wallet_sdk = { path = "../../dan_layer/wallet/sdk" } diff --git a/dan_layer/common_types/Cargo.toml b/dan_layer/common_types/Cargo.toml index 1f4f11c2d4..b0aefbdb7c 100644 --- a/dan_layer/common_types/Cargo.toml +++ b/dan_layer/common_types/Cargo.toml @@ -7,12 +7,12 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } 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.6", features = ["borsh"] } tari_engine_types = { path = "../engine_types"} tari_bor = { path = "../tari_bor" } -tari_mmr = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_mmr" } +tari_mmr = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_mmr" } anyhow = "1.0" # TODO: remove once we use borsh for all serialization @@ -27,7 +27,7 @@ prost-types = "0.9" serde = "1.0.126" [build-dependencies] -tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common", features = ["build"] } +tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common", features = ["build"] } [package.metadata.cargo-machete] ignored = ["prost", "prost-types"] # false positive, used in OUT_DIR structs \ No newline at end of file diff --git a/dan_layer/core/Cargo.toml b/dan_layer/core/Cargo.toml index 4f793730ed..abcf1cba3c 100644 --- a/dan_layer/core/Cargo.toml +++ b/dan_layer/core/Cargo.toml @@ -7,15 +7,15 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_comms = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms" } -tari_comms_dht = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms_dht" } +tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms" } +tari_comms_dht = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms_dht" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } -tari_mmr = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_mmr" } -tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_shutdown" } -tari_storage = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_storage" } -tari_core = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_core" } +tari_mmr = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_mmr" } +tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_shutdown" } +tari_storage = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_storage" } +tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_core" } tari_dan_common_types = { path = "../common_types" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.10" } tari_dan_engine = { path = "../engine" } tari_dan_storage = { path = "../storage" } @@ -38,7 +38,7 @@ tokio = { version = "1.10", features = ["macros", "time"] } tonic = "0.6.2" [dev-dependencies] -tari_test_utils = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_test_utils" } +tari_test_utils = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_test_utils" } [build-dependencies] -tari_common = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common", features = ["build"] } +tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common", features = ["build"] } diff --git a/dan_layer/engine/Cargo.toml b/dan_layer/engine/Cargo.toml index 85cac4671c..170ccd170c 100644 --- a/dan_layer/engine/Cargo.toml +++ b/dan_layer/engine/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] tari_bor = { path = "../tari_bor" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } tari_dan_common_types = { path = "../common_types" } tari_engine_types = { path = "../engine_types" } -tari_mmr = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_mmr" } +tari_mmr = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_mmr" } tari_template_abi = { path = "../template_abi", features = ["std"] } tari_template_lib = { path = "../template_lib", default-features = false, features = ["serde"] } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.10" } diff --git a/dan_layer/engine/src/transaction/processor.rs b/dan_layer/engine/src/transaction/processor.rs index 24ada6bc39..42c60b1d17 100644 --- a/dan_layer/engine/src/transaction/processor.rs +++ b/dan_layer/engine/src/transaction/processor.rs @@ -177,7 +177,7 @@ impl TransactionProcessor { }, Instruction::ClaimBurn { claim } => { // Need to call it on the runtime so that a bucket is created. - runtime.interface().claim_burn(claim)?; + runtime.interface().claim_burn(*claim)?; Ok(ExecutionResult::empty()) }, } diff --git a/dan_layer/engine_types/Cargo.toml b/dan_layer/engine_types/Cargo.toml index a5fa3cd2f9..3ea30ea31c 100644 --- a/dan_layer/engine_types/Cargo.toml +++ b/dan_layer/engine_types/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] tari_bor = { path = "../tari_bor" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6", features = ["borsh"] } tari_template_abi = { path = "../template_abi", features = ["std"] } tari_template_lib = { path = "../template_lib", default-features = false, features = ["serde"] } diff --git a/dan_layer/engine_types/src/instruction.rs b/dan_layer/engine_types/src/instruction.rs index 3ffc401c5e..29348262d3 100644 --- a/dan_layer/engine_types/src/instruction.rs +++ b/dan_layer/engine_types/src/instruction.rs @@ -33,7 +33,7 @@ pub enum Instruction { message: String, }, ClaimBurn { - claim: ConfidentialClaim, + claim: Box, }, } diff --git a/dan_layer/integration_tests/Cargo.toml b/dan_layer/integration_tests/Cargo.toml index ecfd72a633..1ed0b56e50 100644 --- a/dan_layer/integration_tests/Cargo.toml +++ b/dan_layer/integration_tests/Cargo.toml @@ -5,18 +5,18 @@ edition = "2018" license = "BSD-3-Clause" [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } -tari_comms = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_comms" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } +tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_comms" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6" } tari_dan_common_types = { path = "../common_types" } tari_dan_core = { path = "../core" } tari_dan_engine = { path = "../engine" } tari_dan_storage_sqlite = { path = "../storage_sqlite" } tari_engine_types = { path = "../engine_types" } -tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_shutdown" } +tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_shutdown" } tari_template_lib = { path = "../template_lib" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.10" } -tari_core = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_core" } +tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_core" } tari_transaction = { path = "../transaction" } anyhow = "1.0" diff --git a/dan_layer/storage/Cargo.toml b/dan_layer/storage/Cargo.toml index 32e9d6a321..339fe54d39 100644 --- a/dan_layer/storage/Cargo.toml +++ b/dan_layer/storage/Cargo.toml @@ -7,7 +7,7 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } tari_dan_common_types = { path = "../common_types" } thiserror = "1" diff --git a/dan_layer/storage_lmdb/Cargo.toml b/dan_layer/storage_lmdb/Cargo.toml index 2fbea88c6c..3abe9df39d 100644 --- a/dan_layer/storage_lmdb/Cargo.toml +++ b/dan_layer/storage_lmdb/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] tari_dan_engine = { path = "../engine" } tari_dan_common_types = { path = "../common_types" } -tari_storage = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_storage" } +tari_storage = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_storage" } borsh = "0.9.3" lmdb-zero = "0.4.4" diff --git a/dan_layer/storage_sqlite/Cargo.toml b/dan_layer/storage_sqlite/Cargo.toml index 165b72fc4a..fc75574ce5 100644 --- a/dan_layer/storage_sqlite/Cargo.toml +++ b/dan_layer/storage_sqlite/Cargo.toml @@ -6,7 +6,7 @@ license = "BSD-3-Clause" [dependencies] tari_dan_core = { path = "../core" } -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development", package = "tari_common_types" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0", package = "tari_common_types" } tari_dan_common_types = { path = "../common_types" } tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag = "v0.4.10" } tari_dan_engine = { path = "../engine" } diff --git a/dan_layer/transaction/Cargo.toml b/dan_layer/transaction/Cargo.toml index 7eb117edb4..bef12588df 100644 --- a/dan_layer/transaction/Cargo.toml +++ b/dan_layer/transaction/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_engine_types = { path = "../engine_types" } tari_dan_common_types = { path = "../common_types" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6", features = ["borsh"] } diff --git a/dan_layer/wallet/sdk/Cargo.toml b/dan_layer/wallet/sdk/Cargo.toml index 630841c4db..3ffcd4b743 100644 --- a/dan_layer/wallet/sdk/Cargo.toml +++ b/dan_layer/wallet/sdk/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" license = "BSD-3-Clause" [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.6", features = ["borsh"] } tari_engine_types = { path = "../../engine_types" } tari_dan_common_types = { path = "../../common_types" } -tari_key_manager = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_key_manager = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_transaction = { path = "../../transaction" } tari_validator_node_client = { path = "../../../clients/validator_node_client" } tari_template_lib = { path = "../../template_lib", features = ["serde"] } diff --git a/dan_layer/wallet/storage_sqlite/Cargo.toml b/dan_layer/wallet/storage_sqlite/Cargo.toml index 1dda08bbaa..a564ddcb7a 100644 --- a/dan_layer/wallet/storage_sqlite/Cargo.toml +++ b/dan_layer/wallet/storage_sqlite/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" license = "BSD-3-Clause" [dependencies] -tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = "development" } +tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.47.0-pre.0" } tari_dan_common_types = { path = "../../common_types" } tari_dan_wallet_sdk = { path = "../sdk" } tari_engine_types = { path = "../../engine_types" }