diff --git a/Cargo.lock b/Cargo.lock index d313c82e32..f1b9026b27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2881,31 +2881,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" -[[package]] -name = "log4rs" -version = "1.2.0" -source = "git+https://github.com/tari-project/log4rs.git#e1051fd3a1bec9c55d055f60176a96cf11e58505" -dependencies = [ - "anyhow", - "arc-swap", - "chrono", - "derivative", - "fnv", - "humantime 2.1.0", - "libc", - "log", - "log-mdc", - "parking_lot 0.12.1", - "serde", - "serde-value", - "serde_json", - "serde_yaml 0.8.26", - "thiserror", - "thread-id", - "typemap-ors", - "winapi", -] - [[package]] name = "matchers" version = "0.1.0" @@ -3027,7 +3002,7 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "argon2", "base64 0.13.1", @@ -3054,7 +3029,7 @@ dependencies = [ [[package]] name = "minotari_app_utilities" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "clap 3.2.25", "dialoguer", @@ -3076,17 +3051,17 @@ dependencies = [ [[package]] name = "minotari_chat_ffi" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "cbindgen", "chrono", "libc", "libsqlite3-sys", "log", - "log4rs", "minotari_app_utilities", "openssl", "rand", + "tari-log4rs", "tari_chat_client", "tari_common", "tari_common_types", @@ -3101,7 +3076,7 @@ dependencies = [ [[package]] name = "minotari_console_wallet" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "blake2", "chrono", @@ -3112,7 +3087,6 @@ dependencies = [ "digest 0.10.7", "futures 0.3.29", "log", - "log4rs", "minotari_app_grpc", "minotari_app_utilities", "minotari_wallet", @@ -3127,6 +3101,7 @@ dependencies = [ "sha2 0.10.8", "strum", "strum_macros", + "tari-log4rs", "tari_common", "tari_common_types", "tari_comms", @@ -3155,7 +3130,7 @@ dependencies = [ [[package]] name = "minotari_merge_mining_proxy" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "bincode", @@ -3194,7 +3169,7 @@ dependencies = [ [[package]] name = "minotari_miner" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "base64 0.13.1", "borsh", @@ -3208,7 +3183,6 @@ dependencies = [ "futures 0.3.29", "hex", "log", - "log4rs", "minotari_app_grpc", "minotari_app_utilities", "native-tls", @@ -3217,6 +3191,7 @@ dependencies = [ "rand", "serde", "serde_json", + "tari-log4rs", "tari_common", "tari_common_types", "tari_comms", @@ -3230,7 +3205,7 @@ dependencies = [ [[package]] name = "minotari_mining_helper_ffi" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "borsh", "hex", @@ -3246,7 +3221,7 @@ dependencies = [ [[package]] name = "minotari_node" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "async-trait", @@ -3262,7 +3237,6 @@ dependencies = [ "futures 0.3.29", "log", "log-mdc", - "log4rs", "minotari_app_grpc", "minotari_app_utilities", "nom", @@ -3271,6 +3245,7 @@ dependencies = [ "rustyline-derive", "serde", "strum", + "tari-log4rs", "tari_common", "tari_common_types", "tari_comms", @@ -3301,7 +3276,7 @@ dependencies = [ [[package]] name = "minotari_wallet" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "argon2", "async-trait", @@ -3351,7 +3326,7 @@ dependencies = [ [[package]] name = "minotari_wallet_ffi" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "borsh", "cbindgen", @@ -3361,13 +3336,13 @@ dependencies = [ "itertools 0.10.5", "libc", "log", - "log4rs", "minotari_wallet", "num-traits", "once_cell", "openssl", "rand", "serde_json", + "tari-log4rs", "tari_common", "tari_common_types", "tari_comms", @@ -3447,7 +3422,7 @@ dependencies = [ "sealed", "serde", "thiserror", - "tiny-keccak 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tiny-keccak", ] [[package]] @@ -5536,6 +5511,42 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tari-log4rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f387ee6565d938a07b5d217637adfb6d359f79e04b54e5e6a508513271d45f" +dependencies = [ + "anyhow", + "arc-swap", + "chrono", + "derivative", + "fnv", + "humantime 2.1.0", + "libc", + "log", + "log-mdc", + "parking_lot 0.12.1", + "serde", + "serde-value", + "serde_json", + "serde_yaml 0.8.26", + "thiserror", + "thread-id", + "typemap-ors", + "winapi", +] + +[[package]] +name = "tari-tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa5d0f04bac67c31c1e0c2ffbc7f0e3aee2707405804ec5e022b4d550be259c" +dependencies = [ + "borsh", + "crunchy", +] + [[package]] name = "tari_bulletproofs_plus" version = "0.3.2" @@ -5561,7 +5572,7 @@ dependencies = [ [[package]] name = "tari_chat_client" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "async-trait", @@ -5587,7 +5598,7 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "blake2", @@ -5595,7 +5606,6 @@ dependencies = [ "dirs-next 1.0.2", "git2", "log", - "log4rs", "multiaddr", "path-clean", "prost-build", @@ -5604,6 +5614,7 @@ dependencies = [ "serde_yaml 0.9.27", "sha2 0.10.8", "structopt", + "tari-log4rs", "tari_crypto", "tari_features", "tari_test_utils", @@ -5614,7 +5625,7 @@ dependencies = [ [[package]] name = "tari_common_sqlite" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "diesel", "diesel_migrations", @@ -5628,7 +5639,7 @@ dependencies = [ [[package]] name = "tari_common_types" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "base64 0.21.5", "blake2", @@ -5649,7 +5660,7 @@ dependencies = [ [[package]] name = "tari_comms" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "async-trait", @@ -5698,7 +5709,7 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -5742,7 +5753,7 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "futures 0.3.29", "proc-macro2", @@ -5757,7 +5768,7 @@ dependencies = [ [[package]] name = "tari_contacts" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "chrono", "diesel", @@ -5790,7 +5801,7 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "async-trait", "bincode", @@ -5833,6 +5844,7 @@ dependencies = [ "strum", "strum_macros", "tari-curve25519-dalek", + "tari-tiny-keccak", "tari_common", "tari_common_sqlite", "tari_common_types", @@ -5853,7 +5865,6 @@ dependencies = [ "tari_utilities", "tempfile", "thiserror", - "tiny-keccak 2.0.2 (git+https://github.com/tari-project/tiny-keccak?rev=bcddc65530d8646de7282cd8d18d891dc434b643)", "tokio", "toml 0.5.11", "tracing", @@ -5884,11 +5895,11 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" [[package]] name = "tari_hash_domains" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "tari_crypto", ] @@ -5943,7 +5954,7 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "argon2", "async-trait", @@ -5978,7 +5989,7 @@ dependencies = [ [[package]] name = "tari_libtor" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "derivative", "libtor", @@ -5993,7 +6004,7 @@ dependencies = [ [[package]] name = "tari_metrics" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "futures 0.3.29", @@ -6008,7 +6019,7 @@ dependencies = [ [[package]] name = "tari_mmr" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "bincode", "blake2", @@ -6027,7 +6038,7 @@ dependencies = [ [[package]] name = "tari_p2p" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a.a" dependencies = [ "anyhow", "clap 3.2.25", @@ -6063,7 +6074,7 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "blake2", "borsh", @@ -6080,7 +6091,7 @@ dependencies = [ [[package]] name = "tari_service_framework" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "anyhow", "async-trait", @@ -6097,7 +6108,7 @@ dependencies = [ [[package]] name = "tari_shutdown" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "futures 0.3.29", "tokio", @@ -6105,7 +6116,7 @@ dependencies = [ [[package]] name = "tari_storage" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "bincode", "lmdb-zero", @@ -6118,7 +6129,7 @@ dependencies = [ [[package]] name = "tari_test_utils" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" dependencies = [ "futures 0.3.29", "futures-test", @@ -6278,15 +6289,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "git+https://github.com/tari-project/tiny-keccak?rev=bcddc65530d8646de7282cd8d18d891dc434b643#bcddc65530d8646de7282cd8d18d891dc434b643" -dependencies = [ - "borsh", - "crunchy", -] - [[package]] name = "tinytemplate" version = "1.2.1" diff --git a/README.md b/README.md index 2be0f65b07..10e297c1c3 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The recommended running versions of each network are: | Network | Version | |-----------|-------------| | Stagenet | --- | -| Nextnet | 1.0.0-rc.5 | +| Nextnet | 1.0.0-rc.5a | | Esmeralda | 1.0.0-pre.8 | For more detail about versioning, see [Release Ideology](https://github.com/tari-project/tari/blob/development/docs/src/branching_releases.md). diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_app_grpc/Cargo.toml index f4dd40595d..91b3a165f3 100644 --- a/applications/minotari_app_grpc/Cargo.toml +++ b/applications/minotari_app_grpc/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml index 91ad9b9fc8..e3349c1ba4 100644 --- a/applications/minotari_app_utilities/Cargo.toml +++ b/applications/minotari_app_utilities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_app_utilities" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml index 70589d2727..6ffd40e474 100644 --- a/applications/minotari_console_wallet/Cargo.toml +++ b/applications/minotari_console_wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "minotari_console_wallet" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -39,7 +39,7 @@ digest = "0.10" futures = { version = "^0.3.16", default-features = false, features = [ "alloc", ] } -log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = [ +log4rs = { package = "tari-log4rs", version = "1.2.0", default_features = false, features = [ "config_parsing", "threshold_filter", "yaml_format", diff --git a/applications/minotari_merge_mining_proxy/Cargo.toml b/applications/minotari_merge_mining_proxy/Cargo.toml index 2667d45355..f054821941 100644 --- a/applications/minotari_merge_mining_proxy/Cargo.toml +++ b/applications/minotari_merge_mining_proxy/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The Tari merge mining proxy for xmrig" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [features] diff --git a/applications/minotari_miner/Cargo.toml b/applications/minotari_miner/Cargo.toml index db2fde2ffb..98089a1e16 100644 --- a/applications/minotari_miner/Cargo.toml +++ b/applications/minotari_miner/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The tari miner implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] @@ -28,7 +28,7 @@ derivative = "2.2.0" futures = "0.3" hex = "0.4.2" log = { version = "0.4", features = ["std"] } -log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] } +log4rs = { package = "tari-log4rs", version = "1.2.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] } native-tls = "0.2" num_cpus = "1.13" rand = "0.8" diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml index e9270b2390..967a6cbe33 100644 --- a/applications/minotari_node/Cargo.toml +++ b/applications/minotari_node/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "The tari full base node implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] @@ -38,7 +38,7 @@ futures = { version = "^0.3.16", default-features = false, features = ["alloc"] qrcode = { version = "0.12" } log = { version = "0.4.8", features = ["std"] } log-mdc = "0.1.0" -log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] } +log4rs = { package = "tari-log4rs", version = "1.2.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] } nom = "7.1" rustyline = "9.0" rustyline-derive = "0.5" diff --git a/base_layer/chat_ffi/Cargo.toml b/base_layer/chat_ffi/Cargo.toml index f687ffb45c..25fb74639d 100644 --- a/base_layer/chat_ffi/Cargo.toml +++ b/base_layer/chat_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_chat_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency chat C FFI bindings" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] @@ -19,7 +19,7 @@ tari_utilities = { version = "0.7" } libc = "0.2.65" libsqlite3-sys = { version = "0.25.1", features = ["bundled"], optional = true } log = "0.4.6" -log4rs = { git = "https://github.com/tari-project/log4rs.git", features = ["console_appender", "file_appender", "yaml_format"] } +log4rs = { package = "tari-log4rs", version = "1.2.0", features = ["console_appender", "file_appender", "yaml_format"] } thiserror = "1.0.26" tokio = "1.23" diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml index deb35fcbf2..c71ce19a2d 100644 --- a/base_layer/common_types/Cargo.toml +++ b/base_layer/common_types/Cargo.toml @@ -3,13 +3,13 @@ name = "tari_common_types" authors = ["The Tari Development Community"] description = "Tari cryptocurrency common types" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_common = { path = "../../common" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } chacha20poly1305 = "0.10.1" diff --git a/base_layer/common_types/README.md b/base_layer/common_types/README.md new file mode 100644 index 0000000000..fad3f416c8 --- /dev/null +++ b/base_layer/common_types/README.md @@ -0,0 +1,5 @@ +# tari_common_types + +Implementation of common types throughout the Tari code base + +This crate is part of the [Tari Cryptocurrency](https://tari.com) project. diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml index f4716800c4..bc82528d50 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -3,19 +3,19 @@ name = "tari_contacts" authors = ["The Tari Development Community"] description = "Tari contacts library" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] -tari_common = { path = "../../common" } -tari_common_sqlite = { path = "../../common_sqlite" } -tari_common_types = { path = "../../base_layer/common_types" } -tari_comms = { path = "../../comms/core" } -tari_comms_dht = { path = "../../comms/dht" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.5a" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.5a" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.5a" } tari_crypto = { version = "0.20" } -tari_p2p = { path = "../p2p", features = ["auto-update"] } -tari_service_framework = { path = "../service_framework" } -tari_shutdown = { path = "../../infrastructure/shutdown" } +tari_p2p = { path = "../p2p", features = ["auto-update"], version = "1.0.0-rc.5a" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.5a" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" } tari_utilities = { version = "0.7" } chrono = { version = "0.4.19", default-features = false, features = ["serde"] } @@ -40,7 +40,7 @@ tari_test_utils = { path = "../../infrastructure/test_utils" } tempfile = "3.1.0" [build-dependencies] -tari_common = { path = "../../common" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } [package.metadata.cargo-machete] ignored = ["prost"] # this is so we can run cargo machete without getting false positive about macro dependancies diff --git a/base_layer/contacts/src/chat_client/Cargo.toml b/base_layer/contacts/src/chat_client/Cargo.toml index 2b4ffe3dc0..7cb66021db 100644 --- a/base_layer/contacts/src/chat_client/Cargo.toml +++ b/base_layer/contacts/src/chat_client/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_chat_client" authors = ["The Tari Development Community"] description = "Tari cucumber chat client" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml index 55386d88fe..c3a22918e0 100644 --- a/base_layer/core/Cargo.toml +++ b/base_layer/core/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [features] @@ -26,26 +26,26 @@ benches = ["base_node"] metrics = ["tari_metrics"] [dependencies] -tari_common = { path = "../../common" } -tari_common_types = { path = "../../base_layer/common_types" } -tari_comms = { path = "../../comms/core" } -tari_comms_dht = { path = "../../comms/dht" } -tari_comms_rpc_macros = { path = "../../comms/rpc_macros" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.5a" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.5a" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.5a" } +tari_comms_rpc_macros = { path = "../../comms/rpc_macros", version = "1.0.0-rc.5a" } tari_crypto = { version = "0.20", features = ["borsh"] } -tari_metrics = { path = "../../infrastructure/metrics", optional = true } -tari_mmr = { path = "../../base_layer/mmr", optional = true } -tari_p2p = { path = "../../base_layer/p2p" } -tari_script = { path = "../../infrastructure/tari_script" } -tari_service_framework = { path = "../service_framework" } -tari_shutdown = { path = "../../infrastructure/shutdown" } -tari_storage = { path = "../../infrastructure/storage" } -tari_test_utils = { path = "../../infrastructure/test_utils" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-rc.5a" } +tari_mmr = { path = "../../base_layer/mmr", optional = true , version = "1.0.0-rc.5a"} +tari_p2p = { path = "../../base_layer/p2p", version = "1.0.0-rc.5a" } +tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-rc.5a" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.5a" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.5a" } +tari_test_utils = { path = "../../infrastructure/test_utils", version = "1.0.0-rc.5a" } tari_utilities = { version = "0.7", features = ["borsh"] } tari_key_manager = { path = "../key_manager", features = [ "key_manager_service", -] } -tari_common_sqlite = { path = "../../common_sqlite" } -tari_hash_domains = { path = "../../hash_domains" } +], version = "1.0.0-rc.5a" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" } +tari_hash_domains = { path = "../../hash_domains", version = "1.0.0-rc.5a" } async-trait = { version = "0.1.50" } bincode = "1.1.4" @@ -86,7 +86,7 @@ tokio = { version = "1.23", features = ["time", "sync", "macros"] } tracing = "0.1.26" zeroize = "1" primitive-types = { version = "0.12", features = ["serde"] } -tiny-keccak = { git = "https://github.com/tari-project/tiny-keccak", rev = "bcddc65530d8646de7282cd8d18d891dc434b643", features = [ +tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [ "keccak", ] } @@ -104,7 +104,7 @@ toml = { version = "0.5" } quickcheck = "1.0" [build-dependencies] -tari_common = { path = "../../common", features = ["build"] } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-rc.5a" } [[bench]] name = "mempool" diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index edc4a1390a..223997cc75 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet key management" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2021" [lib] @@ -13,9 +13,9 @@ crate-type = ["lib", "cdylib"] [dependencies] tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_common_sqlite = { path = "../../common_sqlite" } -tari_common_types = { path = "../../base_layer/common_types"} -tari_service_framework = { path = "../service_framework" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.5a"} +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.5a" } async-trait = {version = "0.1.50"} chrono = { version = "0.4.19", default-features = false, features = ["serde"] } diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml index dc248e72eb..7b747fbcf3 100644 --- a/base_layer/mmr/Cargo.toml +++ b/base_layer/mmr/Cargo.toml @@ -4,7 +4,7 @@ authors = ["The Tari Development Community"] description = "A Merkle Mountain Range implementation" repository = "https://github.com/tari-project/tari" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [features] @@ -13,7 +13,7 @@ default = [] [dependencies] tari_utilities = { version = "0.7" } tari_crypto = { version = "0.20" } -tari_common = { path = "../../common" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } thiserror = "1.0" borsh = "1.2" digest = "0.10" diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml index ccbb395386..7a2d4987f7 100644 --- a/base_layer/p2p/Cargo.toml +++ b/base_layer/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_p2p" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a.a" authors = ["The Tari Development community"] description = "Tari base layer-specific peer-to-peer communication features" repository = "https://github.com/tari-project/tari" @@ -10,13 +10,13 @@ license = "BSD-3-Clause" edition = "2018" [dependencies] -tari_comms = { path = "../../comms/core" } -tari_comms_dht = { path = "../../comms/dht" } -tari_common = { path = "../../common" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.5a" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.5a" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } tari_crypto = { version = "0.20" } -tari_service_framework = { path = "../service_framework" } -tari_shutdown = { path = "../../infrastructure/shutdown" } -tari_storage = { path = "../../infrastructure/storage" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.5a" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.5a" } tari_utilities = { version = "0.7" } anyhow = "1.0.53" @@ -46,7 +46,7 @@ clap = "3.2" tempfile = "3.1.0" [build-dependencies] -tari_common = { path = "../../common", features = ["build"] } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-rc.5a" } [features] test-mocks = [] diff --git a/base_layer/p2p/src/auto_update/gpg_keys/CjS77.asc b/base_layer/p2p/src/auto_update/gpg_keys/CjS77.asc new file mode 100644 index 0000000000..814cb638db --- /dev/null +++ b/base_layer/p2p/src/auto_update/gpg_keys/CjS77.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +j9ja6ui3CzaqjE8AjAvjInf7HWkqcEE= +=p1f+ +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/base_layer/p2p/src/auto_update/gpg_keys/README.md b/base_layer/p2p/src/auto_update/gpg_keys/README.md new file mode 100644 index 0000000000..dfbec2d64b --- /dev/null +++ b/base_layer/p2p/src/auto_update/gpg_keys/README.md @@ -0,0 +1,42 @@ +# Tari developer public keys + +This folder contains the public keys for Tari developers + +## Why use public keys + +Here's a +[long, but interesting read](https://mikegerwitz.com/2012/05/a-git-horror-story-repository-integrity-with-signed-commits). + +## Creating a public key + +If you don't already have a GPG key, follow the steps +[described here](https://help.github.com/articles/generating-a-new-gpg-key/) to create one. + +## Importing keys into your keyring + +Lot of detail on how to import keys into your keyring is given in the +[Redhat docs](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/4/html/Step_by_Step_Guide/s1-gnupg-import.html), +but here is a tl;dr: + + gpg --import key.asc + +The output looks similar to the following: + +```text +gpg: key F78FFE84: public key imported +gpg: Total number processed: 1 +gpg: imported: 1 +``` + +## Signing commits with your key + +https://help.github.com/articles/signing-commits/ + +## Submitting your public key + +To add your GPG key to the list, export your **public** key with + + gpg --armor --export + +then, create a pull request with your GPG public key in a single file in this folder with the name +`.asc` diff --git a/base_layer/p2p/src/auto_update/gpg_keys/hansieodendaal.asc b/base_layer/p2p/src/auto_update/gpg_keys/hansieodendaal.asc new file mode 100644 index 0000000000..baad1345f6 --- /dev/null +++ b/base_layer/p2p/src/auto_update/gpg_keys/hansieodendaal.asc @@ -0,0 +1,13 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEXFAOHRYJKwYBBAHaRw8BAQdA5Pr1oWCXuk4KOLww8nzozn1R/TvL5AvIdScU +9R7W2D+0JEhhbnNpZSBPZGVuZGFhbCBFQ0MgPHBsdXRvQHRhcmkuY29tPoiWBBMW +CAA+FiEEiTBA/hklxU/poczD00Haf8YJhicFAlxQDh0CGyMFCQlnaQMFCwkIBwIG +FQoJCAsCBBYCAwECHgECF4AACgkQ00Haf8YJhid3AQD/elT+/dn+IdfEGf4Veu4L +VdE0uAmg+3JKcxSFAzuJD1sA/23QkxDAqDnBVxX1vqLzMx4WmB30w8Qqjd6NSuqF +WD0AuDgEXFAOHRIKKwYBBAGXVQEFAQEHQJDBWycKABkLFhl+/3wq9jXFQNKu2fhl +bG8o6qkFgdIHAwEIB4h+BBgWCAAmFiEEiTBA/hklxU/poczD00Haf8YJhicFAlxQ +Dh0CGwwFCQlnaQMACgkQ00Haf8YJhifHDQEA8wC6rEJ0q3hzi7gPhwv/J1waspjd +ic5qhFtth9VSH64A/3nwUCTxOfSN4O2BJbEyIbTvNKrqfU0xfIPb5fjLz40H +=mR5Q +-----END PGP PUBLIC KEY BLOCK----- diff --git a/base_layer/p2p/src/auto_update/gpg_keys/sdbondi.asc b/base_layer/p2p/src/auto_update/gpg_keys/sdbondi.asc new file mode 100644 index 0000000000..6ce6bfced2 --- /dev/null +++ b/base_layer/p2p/src/auto_update/gpg_keys/sdbondi.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +tQrYpH9CNXgX9dC9 +=7S7i +-----END PGP PUBLIC KEY BLOCK----- diff --git a/base_layer/p2p/src/auto_update/gpg_keys/stringhandler.asc b/base_layer/p2p/src/auto_update/gpg_keys/stringhandler.asc new file mode 100644 index 0000000000..5e6f1d65c3 --- /dev/null +++ b/base_layer/p2p/src/auto_update/gpg_keys/stringhandler.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +V0f2fATBiu2NWfgql40ixuzveL0= +=uH/a +-----END PGP PUBLIC KEY BLOCK----- diff --git a/base_layer/p2p/src/auto_update/gpg_keys/swvheerden.asc b/base_layer/p2p/src/auto_update/gpg_keys/swvheerden.asc new file mode 100644 index 0000000000..42eef171bb --- /dev/null +++ b/base_layer/p2p/src/auto_update/gpg_keys/swvheerden.asc @@ -0,0 +1,53 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +xDOnOQ== +=VupM +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/base_layer/p2p/src/auto_update/mod.rs b/base_layer/p2p/src/auto_update/mod.rs index 27b1c6cd88..312db55264 100644 --- a/base_layer/p2p/src/auto_update/mod.rs +++ b/base_layer/p2p/src/auto_update/mod.rs @@ -203,10 +203,11 @@ async fn http_download(url: T) -> Result impl Iterator { diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml index 84689297fb..7b7c4af6a8 100644 --- a/base_layer/service_framework/Cargo.toml +++ b/base_layer/service_framework/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_service_framework" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" authors = ["The Tari Development Community"] description = "The Tari communication stack service framework" repository = "https://github.com/tari-project/tari" @@ -10,14 +10,14 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_shutdown = { path = "../../infrastructure/shutdown" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" } anyhow = "1.0.53" async-trait = "0.1.50" futures = { version = "^0.3.16", features = ["async-await"] } log = "0.4.8" thiserror = "1.0.26" -tokio = { version = "1.23", features = ["rt"] } +tokio = { version = "1.23", features = ["rt", "sync"] } tower-service = { version = "0.3" } [dev-dependencies] diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml index 5bfb054c95..961ad30dd4 100644 --- a/base_layer/tari_mining_helper_ffi/Cargo.toml +++ b/base_layer/tari_mining_helper_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_mining_helper_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency miningcore C FFI bindings" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index 2410b0d1ee..d4b87b76d2 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -3,24 +3,24 @@ name = "minotari_wallet" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] -tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"] } -tari_common = { path = "../../common" } -tari_common_types = { path = "../../base_layer/common_types" } -tari_comms = { path = "../../comms/core" } -tari_comms_dht = { path = "../../comms/dht" } +tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"], version = "1.0.0-rc.5a" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } +tari_common_types = { path = "../../base_layer/common_types", version = "1.0.0-rc.5a" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.5a" } +tari_comms_dht = { path = "../../comms/dht", version = "1.0.0-rc.5a" } tari_crypto = { version = "0.20" } -tari_key_manager = { path = "../key_manager", features = ["key_manager_service"] } -tari_p2p = { path = "../p2p", features = ["auto-update"] } -tari_script = { path = "../../infrastructure/tari_script" } -tari_service_framework = { path = "../service_framework" } -tari_shutdown = { path = "../../infrastructure/shutdown" } -tari_common_sqlite = { path = "../../common_sqlite" } +tari_key_manager = { path = "../key_manager", features = ["key_manager_service"], version = "1.0.0-rc.5a" } +tari_p2p = { path = "../p2p", features = ["auto-update"] , version = "1.0.0-rc.5a"} +tari_script = { path = "../../infrastructure/tari_script", version = "1.0.0-rc.5a" } +tari_service_framework = { path = "../service_framework", version = "1.0.0-rc.5a" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" } tari_utilities = { version = "0.7" } -tari_contacts = { path = "../../base_layer/contacts" } +tari_contacts = { path = "../../base_layer/contacts", version = "1.0.0-rc.5a" } # Uncomment for tokio tracing via tokio-console (needs "tracing" features) #console-subscriber = "0.1.3" @@ -57,7 +57,7 @@ chacha20poly1305 = "0.10.1" zeroize = "1" [build-dependencies] -tari_common = { path = "../../common", features = ["build", "static-application-info"] } +tari_common = { path = "../../common", features = ["build", "static-application-info"], version = "1.0.0-rc.5a" } [dev-dependencies] tari_p2p = { path = "../p2p", features = ["test-mocks"] } diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml index 14529a0f5d..4a692373cd 100644 --- a/base_layer/wallet_ffi/Cargo.toml +++ b/base_layer/wallet_ffi/Cargo.toml @@ -3,7 +3,7 @@ name = "minotari_wallet_ffi" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet C FFI bindings" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] @@ -26,7 +26,7 @@ chrono = { version = "0.4.19", default-features = false, features = ["serde"] } futures = { version = "^0.3.1", features =["compat", "std"]} libc = "0.2.65" log = "0.4.6" -log4rs = { git = "https://github.com/tari-project/log4rs.git", features = ["console_appender", "file_appender", "yaml_format"] } +log4rs = { package = "tari-log4rs", version = "1.2.0", features = ["console_appender", "file_appender", "yaml_format"] } rand = "0.8" thiserror = "1.0.26" tokio = "1.23" diff --git a/common/Cargo.toml b/common/Cargo.toml index 9fe66744fa..807c5495e2 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [features] @@ -22,7 +22,7 @@ config = { version = "0.13.0", default_features = false, features = ["toml"] } dirs-next = "1.0.2" git2 = { version = "0.18", default_features = false, optional = true } log = "0.4.8" -log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] } +log4rs = { package = "tari-log4rs", version = "1.2", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] } multiaddr = { version = "0.14.0" } path-clean = "0.1.0" prost-build = { version = "0.11.9", optional = true } @@ -40,4 +40,4 @@ tari_test_utils = { path = "../infrastructure/test_utils"} toml = "0.5.8" [build-dependencies] -tari_features = { path = "./tari_features"} +tari_features = { path = "./tari_features", version = "1.0.0-rc.5a"} diff --git a/common/tari_features/Cargo.toml b/common/tari_features/Cargo.toml index 193a021893..2f7637f57c 100644 --- a/common/tari_features/Cargo.toml +++ b/common/tari_features/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/tari_features/README.md b/common/tari_features/README.md new file mode 100644 index 0000000000..e670b4ee93 --- /dev/null +++ b/common/tari_features/README.md @@ -0,0 +1,5 @@ +# tari_features + +Implementation of `tari features` for Tari. + +This crate is part of the [Tari Cryptocurrency](https://tari.com) project. diff --git a/common_sqlite/Cargo.toml b/common_sqlite/Cargo.toml index ab9336c4a3..5f1c157dca 100644 --- a/common_sqlite/Cargo.toml +++ b/common_sqlite/Cargo.toml @@ -3,7 +3,7 @@ name = "tari_common_sqlite" authors = ["The Tari Development Community"] description = "Tari cryptocurrency wallet library" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,7 +16,7 @@ diesel_migrations = "2.0.0" log = "0.4.6" serde = "1.0.90" thiserror = "1.0.26" -tokio = { version = "1.23", features = ["sync", "macros"] } +tokio = { version = "1.23", features = ["sync", "macros", "rt"] } [dev-dependencies] tari_test_utils = { path = "../infrastructure/test_utils" } diff --git a/common_sqlite/README.md b/common_sqlite/README.md new file mode 100644 index 0000000000..878acbacb7 --- /dev/null +++ b/common_sqlite/README.md @@ -0,0 +1,5 @@ +# tari_common_sqlite + +Implementation of Tari's sqlite wrapper + +This crate is part of the [Tari Cryptocurrency](https://tari.com) project. diff --git a/comms/core/Cargo.toml b/comms/core/Cargo.toml index 2251f9222f..dd8e5623c5 100644 --- a/comms/core/Cargo.toml +++ b/comms/core/Cargo.toml @@ -6,14 +6,14 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] tari_crypto = { version = "0.20" } -tari_metrics = { path = "../../infrastructure/metrics", optional = true } -tari_storage = { path = "../../infrastructure/storage" } -tari_shutdown = { path = "../../infrastructure/shutdown" } +tari_metrics = { path = "../../infrastructure/metrics", optional = true, version = "1.0.0-rc.5a" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.5a" } +tari_shutdown = { path = "../../infrastructure/shutdown" , version = "1.0.0-rc.5a"} tari_utilities = { version = "0.7" } anyhow = "1.0.53" @@ -58,7 +58,7 @@ serde_json = "1.0.39" tempfile = "3.1.0" [build-dependencies] -tari_common = { path = "../../common", features = ["build"] } +tari_common = { path = "../../common", features = ["build"], version = "1.0.0-rc.5a" } [features] c_integration = [] diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index 003716ba64..5f74dc7b3c 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_comms_dht" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" authors = ["The Tari Development Community"] description = "Tari comms DHT module" repository = "https://github.com/tari-project/tari" @@ -10,14 +10,14 @@ license = "BSD-3-Clause" edition = "2018" [dependencies] -tari_comms = { path = "../core", features = ["rpc"] } -tari_common = { path = "../../common" } -tari_comms_rpc_macros = { path = "../rpc_macros" } +tari_comms = { path = "../core", features = ["rpc"], version = "1.0.0-rc.5a" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } +tari_comms_rpc_macros = { path = "../rpc_macros" , version = "1.0.0-rc.5a"} tari_crypto = { version = "0.20" } tari_utilities = { version = "0.7" } -tari_shutdown = { path = "../../infrastructure/shutdown" } -tari_storage = { path = "../../infrastructure/storage" } -tari_common_sqlite = { path = "../../common_sqlite" } +tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.0.0-rc.5a" } +tari_storage = { path = "../../infrastructure/storage", version = "1.0.0-rc.5a" } +tari_common_sqlite = { path = "../../common_sqlite", version = "1.0.0-rc.5a" } anyhow = "1.0.53" bitflags = { version = "2.4", features = ["serde"] } @@ -62,7 +62,7 @@ clap = "3.2" [build-dependencies] -tari_common = { path = "../../common" } +tari_common = { path = "../../common", version = "1.0.0-rc.5a" } [features] test-mocks = [] diff --git a/comms/rpc_macros/Cargo.toml b/comms/rpc_macros/Cargo.toml index fb5005cfd3..2ea8c918ac 100644 --- a/comms/rpc_macros/Cargo.toml +++ b/comms/rpc_macros/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [lib] @@ -16,7 +16,7 @@ proc-macro = true proc-macro2 = "1.0.24" quote = "1.0.7" -syn = { version = "1.0.38", features = ["fold"] } +syn = { version = "1.0.38", features = ["fold", "full", "extra-traits"] } [dev-dependencies] tari_comms = { path = "../core", features = ["rpc"] } diff --git a/comms/rpc_macros/README.md b/comms/rpc_macros/README.md new file mode 100644 index 0000000000..f2454fe245 --- /dev/null +++ b/comms/rpc_macros/README.md @@ -0,0 +1,5 @@ +# tari_comms_rpc_macros + +Implementation of `tari_comms_rpc_macros` macros for Tari. + +This crate is part of the [Tari Cryptocurrency](https://tari.com) project. diff --git a/hash_domains/Cargo.toml b/hash_domains/Cargo.toml index 5651c8dcbd..c8445e2187 100644 --- a/hash_domains/Cargo.toml +++ b/hash_domains/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "tari_hash_domains" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2021" +description = "Tari hash domains" +authors = ["The Tari Development Community"] +repository = "https://github.com/tari-project/tari" +homepage = "https://tari.com" +readme = "README.md" +license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/hash_domains/README.md b/hash_domains/README.md new file mode 100644 index 0000000000..9c95841b9f --- /dev/null +++ b/hash_domains/README.md @@ -0,0 +1,5 @@ +# tari_hash_domains + +Implementation of `tari hash domain` macros for Tari. + +This crate is part of the [Tari Cryptocurrency](https://tari.com) project. diff --git a/infrastructure/derive/Cargo.toml b/infrastructure/derive/Cargo.toml index 2f8c6f67d3..a739166fc0 100644 --- a/infrastructure/derive/Cargo.toml +++ b/infrastructure/derive/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [lib] diff --git a/infrastructure/libtor/Cargo.toml b/infrastructure/libtor/Cargo.toml index 7e855285a1..2d5f3ab6f6 100644 --- a/infrastructure/libtor/Cargo.toml +++ b/infrastructure/libtor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_libtor" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2021" license = "BSD-3-Clause" diff --git a/infrastructure/metrics/Cargo.toml b/infrastructure/metrics/Cargo.toml index 77b3186a5a..a85ba8a4a0 100644 --- a/infrastructure/metrics/Cargo.toml +++ b/infrastructure/metrics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_metrics" description = "Tari metrics" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2021" authors = ["The Tari Development Community"] repository = "https://github.com/tari-project/tari" diff --git a/infrastructure/metrics/README.md b/infrastructure/metrics/README.md new file mode 100644 index 0000000000..4505d37fe9 --- /dev/null +++ b/infrastructure/metrics/README.md @@ -0,0 +1,4 @@ +# Tari metrics +Implementation of `Tari metrics` for Tari. + +This crate is part of the [Tari Cryptocurrency](https://tari.com) project. diff --git a/infrastructure/shutdown/Cargo.toml b/infrastructure/shutdown/Cargo.toml index 1a68634c7a..5a0cc36d9e 100644 --- a/infrastructure/shutdown/Cargo.toml +++ b/infrastructure/shutdown/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/infrastructure/storage/Cargo.toml b/infrastructure/storage/Cargo.toml index bb9fbb5d7f..fb87e90f44 100644 --- a/infrastructure/storage/Cargo.toml +++ b/infrastructure/storage/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari" homepage = "https://tari.com" readme = "README.md" license = "BSD-3-Clause" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2018" [dependencies] @@ -14,7 +14,7 @@ bincode = "1.1" log = "0.4.0" lmdb-zero = "0.4.4" thiserror = "1.0.26" -serde = "1.0.80" +serde = { version = "1.0.80", features = ["derive"] } [dev-dependencies] rand = "0.8" diff --git a/infrastructure/tari_script/Cargo.toml b/infrastructure/tari_script/Cargo.toml index 34a7d980a1..ca27c30720 100644 --- a/infrastructure/tari_script/Cargo.toml +++ b/infrastructure/tari_script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tari_script" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" edition = "2021" description = "Tari script library" authors = ["The Tari Development Community"] diff --git a/infrastructure/tari_script/README.md b/infrastructure/tari_script/README.md new file mode 100644 index 0000000000..e73a0f547e --- /dev/null +++ b/infrastructure/tari_script/README.md @@ -0,0 +1,14 @@ +# Tari Script +Implementation of `Tari Script` for Tari. + +This crate is part of the [Tari Cryptocurrency](https://tari.com) project. + +For more details see: + +[TariScript for dummies](https://tlu.tarilabs.com/tari/TariScript_for_dummies) explain how Tari script works. + +[Tari script RFC](https://rfc.tari.com/RFC-0201_TariScript.html) + +[Tari Script Opcodes](https://rfc.tari.com/RFC-0202_TariScriptOpcodes.html) + + diff --git a/infrastructure/test_utils/Cargo.toml b/infrastructure/test_utils/Cargo.toml index 6ebd7d9506..b9b2d35e38 100644 --- a/infrastructure/test_utils/Cargo.toml +++ b/infrastructure/test_utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tari_test_utils" description = "Utility functions used in Tari test functions" -version = "1.0.0-rc.5" +version = "1.0.0-rc.5a" authors = ["The Tari Development Community"] edition = "2018" license = "BSD-3-Clause" @@ -9,8 +9,8 @@ license = "BSD-3-Clause" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tari_shutdown = { path = "../shutdown" } -tari_comms = { path = "../../comms/core" } +tari_shutdown = { path = "../shutdown", version = "1.0.0-rc.5a" } +tari_comms = { path = "../../comms/core", version = "1.0.0-rc.5a" } futures = { version = "^0.3.1" } rand = "0.8" diff --git a/package-lock.json b/package-lock.json index 0c4d698855..11164d5390 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tari", - "version": "1.0.0-rc.5", + "version": "1.0.0-rc.5a", "lockfileVersion": 2, "requires": true, "packages": {}