Skip to content

Commit

Permalink
chore(release): nextnet hotfix default network selection (#5327)
Browse files Browse the repository at this point in the history
Description
---
Features is now a frequently used build dep in most our crates. Common
actually also needs to be feature aware during build time. This means
tari-features should have little to no dependencies, and especially none
from our own crates.

Motivation and Context
---
Related to #5326 
Development fix: #5333 

How Has This Been Tested?
---
Manually

What process can a PR reviewer use to test or verify this change?
---
Run cargo build with the desired network type (nextnet):
`TARI_NETWORK=nextnet cargo build --bin tari_base_node`

Run the bin directly without using cargo. It's important not to use
cargo during the testing as the bin will likely rebuild when using `run`
and change the previous `TARI_NETWORK` compilation settings:
`./target/tari_base_node` 

See that the default network is NextNet.

<!-- Checklist -->
<!-- 1. Is the title of your PR in the form that would make nice release
notes? The title, excluding the conventional commit
tag, will be included exactly as is in the CHANGELOG, so please think
about it carefully. -->


Breaking Changes
---

- [x] None
- [ ] Requires data directory on base node to be deleted
- [ ] Requires hard fork
- [ ] Other - Please specify
  • Loading branch information
brianp authored Apr 18, 2023
1 parent b0d2032 commit 12503cc
Show file tree
Hide file tree
Showing 32 changed files with 97 additions and 77 deletions.
54 changes: 26 additions & 28 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The recommended running versions of each network are:
| Network | Version |
|----------|--------------|
| Stagenet | 0.45.0 |
| Nextnet | 0.48.0-rc.2 |
| Nextnet | 0.49.0-rc.1 |
| Development | 0.50.0-pre.0 |

For more detail about versioning see [Release Ideology](https://github.com/tari-project/tari/blob/development/docs/src/branching_releases.md)
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_app_grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2018"

[dependencies]
Expand Down
6 changes: 3 additions & 3 deletions applications/tari_app_utilities/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tari_app_utilities"
version = "0.49.0-rc.0"
version = "0.49.0-rc.1"
authors = ["The Tari Development Community"]
edition = "2018"
license = "BSD-3-Clause"
Expand All @@ -9,7 +9,7 @@ license = "BSD-3-Clause"
tari_common = { path = "../../common" }
tari_common_types = { path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
tari_features = { version = "0.50.0-pre.0", path = "../../common/tari_features"}
tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"}
tari_utilities = { version = "0.4.10"}

clap = { version = "3.2.0", features = ["derive", "env"] }
Expand All @@ -23,4 +23,4 @@ thiserror = "^1.0.26"

[build-dependencies]
tari_common = { path = "../../common", features = ["build", "static-application-info"] }
tari_features = { version = "0.50.0-pre.0", path = "../../common/tari_features"}
tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"}
4 changes: 2 additions & 2 deletions applications/tari_base_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2018"

[dependencies]
Expand Down Expand Up @@ -58,4 +58,4 @@ safe = []
libtor = ["tari_libtor"]

[build-dependencies]
tari_features = { version = "0.50.0-pre.0", path = "../../common/tari_features"}
tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"}
6 changes: 3 additions & 3 deletions applications/tari_console_wallet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tari_console_wallet"
version = "0.49.0-rc.0"
version = "0.49.0-rc.1"
authors = ["The Tari Development Community"]
edition = "2018"
license = "BSD-3-Clause"
Expand All @@ -14,7 +14,7 @@ tari_comms = { path = "../../comms/core" }
tari_comms_dht = { path = "../../comms/dht" }
tari_contacts = { path = "../../base_layer/contacts" }
tari_crypto = { version = "0.16.11"}
tari_features = { version = "0.50.0-pre.0", path = "../../common/tari_features"}
tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"}
tari_key_manager = { path = "../../base_layer/key_manager" }
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
Expand Down Expand Up @@ -65,7 +65,7 @@ default-features = false
features = ["crossterm"]

[build-dependencies]
tari_features = { version = "0.50.0-pre.0", path = "../../common/tari_features"}
tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"}

[features]
avx2 = ["tari_core/avx2", "tari_crypto/simd_backend", "tari_wallet/avx2", "tari_comms/avx2", "tari_comms_dht/avx2", "tari_p2p/avx2", "tari_key_manager/avx2"]
Expand Down
4 changes: 2 additions & 2 deletions applications/tari_merge_mining_proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2018"

[features]
Expand Down Expand Up @@ -42,4 +42,4 @@ tracing = "0.1"
url = "2.1.1"

[build-dependencies]
tari_features = { version = "0.50.0-pre.0", path = "../../common/tari_features"}
tari_features = { version = "0.49.0-rc.1", path = "../../common/tari_features"}
2 changes: 1 addition & 1 deletion applications/tari_miner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2018"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/common_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "tari_common_types"
authors = ["The Tari Development Community"]
description = "Tari cryptocurrency common types"
license = "BSD-3-Clause"
version = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2018"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/contacts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "tari_contacts"
authors = ["The Tari Development Community"]
description = "Tari contacts library"
license = "BSD-3-Clause"
version = "0.50.0-pre.0"
version = "0.49.0-rc.1"
edition = "2018"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari"
homepage = "https://tari.com"
readme = "README.md"
license = "BSD-3-Clause"
version = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2018"

[features]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/key_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2021"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/mmr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0.49.0-rc.0"
version = "0.49.0-rc.1"
edition = "2018"

[features]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/p2p/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tari_p2p"
version = "0.49.0-rc.0"
version = "0.49.0-rc.1"
authors = ["The Tari Development community"]
description = "Tari base layer-specific peer-to-peer communication features"
repository = "https://github.com/tari-project/tari"
Expand Down
Loading

0 comments on commit 12503cc

Please sign in to comment.