Skip to content

Commit

Permalink
Merge branch 'development' into libp2p
Browse files Browse the repository at this point in the history
* development:
  chore: new release esmeralda v1.7.0-pre.2 (#6634)
  fix: view-only wallet scan (#6633)
  chore: new release esme ralda v1.7.0-pre.1 (#6631)
  • Loading branch information
sdbondi committed Oct 16, 2024
2 parents 261275c + 1319e24 commit 4ae4024
Show file tree
Hide file tree
Showing 46 changed files with 217 additions and 149 deletions.
64 changes: 32 additions & 32 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ The recommended running versions of each network are:
| Network | Version |
|-----------|----------------|
| Stagenet | 1.0.0-alpha.0a |
| Nextnet | 1.7.0-rc.0 |
| Esmeralda | 1.7.0-pre.0 |
| Nextnet | 1.7.0-rc.2 |
| Esmeralda | 1.7.0-pre.2 |

For more detail about versioning, see [Release Ideology](https://github.com/tari-project/tari/blob/development/docs/src/branching_releases.md).

Expand Down
4 changes: 2 additions & 2 deletions applications/minotari_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 = "1.7.0-pre.0"
version = "1.7.0-pre.2"
edition = "2021"

[dependencies]
Expand Down Expand Up @@ -32,7 +32,7 @@ tonic = { version = "0.12.3", features = ["tls"] }
zeroize = "1"

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" }
tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" }
tonic-build = "0.12.3"

[package.metadata.cargo-machete]
Expand Down
4 changes: 2 additions & 2 deletions applications/minotari_app_utilities/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "minotari_app_utilities"
version = "1.7.0-pre.0"
version = "1.7.0-pre.2"
authors = ["The Tari Development Community"]
edition = "2018"
license = "BSD-3-Clause"
Expand All @@ -26,7 +26,7 @@ tari_common = { path = "../../common", features = [
"build",
"static-application-info",
] }
tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" }
tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" }

[features]
miner_input = ["minotari_app_grpc"]
6 changes: 3 additions & 3 deletions applications/minotari_console_wallet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "minotari_console_wallet"
version = "1.7.0-pre.0"
version = "1.7.0-pre.2"
authors = ["The Tari Development Community"]
edition = "2018"
license = "BSD-3-Clause"
Expand All @@ -9,7 +9,7 @@ license = "BSD-3-Clause"
tari_network = { workspace = true }
minotari_app_grpc = { path = "../minotari_app_grpc" }
minotari_app_utilities = { path = "../minotari_app_utilities" }
minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.0", optional = true }
minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.7.0-pre.2", optional = true }
tari_common = { path = "../../common" }
tari_common_types = { path = "../../base_layer/common_types" }
tari_contacts = { path = "../../base_layer/contacts" }
Expand Down Expand Up @@ -83,7 +83,7 @@ default-features = false
features = ["crossterm"]

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.0" }
tari_features = { path = "../../common/tari_features", version = "1.7.0-pre.2" }

[features]
default = ["ledger"]
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_ledger_wallet/common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "minotari_ledger_wallet_common"
version = "1.7.0-pre.0"
version = "1.7.0-pre.2"
authors = ["The Tari Development Community"]
license = "BSD-3-Clause"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_ledger_wallet/comms/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "minotari_ledger_wallet_comms"
version = "1.7.0-pre.0"
version = "1.7.0-pre.2"
authors = ["The Tari Development Community"]
license = "BSD-3-Clause"
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions applications/minotari_ledger_wallet/wallet/Cargo.lock

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

Loading

0 comments on commit 4ae4024

Please sign in to comment.