Skip to content

Commit

Permalink
fix: hot for removing breaking change in wallet, new release for nexn…
Browse files Browse the repository at this point in the history
…et v1.0.0-rc.8 (#6305)

Description
---
Removed breaking change of wallet db type
Release new nextnet version

Motivation and Context
--
Release v1.0.0-rc.7 accidentally included an unmarked breaking change.
This change is for future ledger support in with saving the wallet type
as software or ledger in the wallet db. This is a breaking change. This
forces a wallet to be software as ledger is currently in dev and not yet
functioning.

How Has This Been Tested?
---
Manual
  • Loading branch information
SWvheerden committed Apr 23, 2024
1 parent 3ea8c17 commit 07131ad
Show file tree
Hide file tree
Showing 36 changed files with 149 additions and 143 deletions.
62 changes: 31 additions & 31 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 applications/minotari_app_grpc/Cargo.toml
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.0.0-rc.7"
version = "1.0.0-rc.8"
edition = "2018"

[dependencies]
Expand All @@ -31,7 +31,7 @@ tonic = { version = "0.8.3", features = ["tls"]}
zeroize = "1"

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" }
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.8" }
tonic-build = "0.8.4"

[package.metadata.cargo-machete]
Expand Down
4 changes: 2 additions & 2 deletions applications/minotari_app_utilities/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "minotari_app_utilities"
version = "1.0.0-rc.7"
version = "1.0.0-rc.8"
authors = ["The Tari Development Community"]
edition = "2018"
license = "BSD-3-Clause"
Expand All @@ -26,7 +26,7 @@ tonic = "0.8.3"

[build-dependencies]
tari_common = { path = "../../common", features = ["build", "static-application-info"] }
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" }
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.8" }

[features]
miner_input = ["minotari_app_grpc"]
4 changes: 2 additions & 2 deletions applications/minotari_console_wallet/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "minotari_console_wallet"
version = "1.0.0-rc.7"
version = "1.0.0-rc.8"
authors = ["The Tari Development Community"]
edition = "2018"
license = "BSD-3-Clause"
Expand Down Expand Up @@ -83,7 +83,7 @@ default-features = false
features = ["crossterm"]

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7" }
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.8" }

[features]
default = ["libtor"]
Expand Down
4 changes: 2 additions & 2 deletions applications/minotari_console_wallet/src/init/mod.rs
Expand Up @@ -419,7 +419,7 @@ pub async fn init_wallet(
};

let master_seed = read_or_create_master_seed(recovery_seed.clone(), &wallet_db)?;
let wallet_type = read_or_create_wallet_type(wallet_type, &wallet_db);
let wallet_type = WalletType::Software;

let node_identity = match config.wallet.identity_file.as_ref() {
Some(identity_file) => {
Expand Down Expand Up @@ -465,7 +465,7 @@ pub async fn init_wallet(
key_manager_backend,
shutdown_signal,
master_seed,
wallet_type.unwrap(),
wallet_type,
)
.await
.map_err(|e| match e {
Expand Down
4 changes: 2 additions & 2 deletions applications/minotari_merge_mining_proxy/Cargo.toml
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 = "1.0.0-rc.7"
version = "1.0.0-rc.8"
edition = "2018"

[features]
Expand Down Expand Up @@ -47,7 +47,7 @@ url = "2.1.1"
scraper = "0.19.0"

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7"}
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.8"}

[dev-dependencies]
markup5ever = "0.11.0"
2 changes: 1 addition & 1 deletion applications/minotari_miner/Cargo.toml
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 = "1.0.0-rc.7"
version = "1.0.0-rc.8"
edition = "2018"

[dependencies]
Expand Down
6 changes: 3 additions & 3 deletions applications/minotari_node/Cargo.toml
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 = "1.0.0-rc.7"
version = "1.0.0-rc.8"
edition = "2018"

[dependencies]
Expand All @@ -24,7 +24,7 @@ tari_shutdown = { path = "../../infrastructure/shutdown" }
tari_utilities = { version = "0.7" }
tari_key_manager = { path = "../../base_layer/key_manager", features = [
"key_manager_service",
], version = "1.0.0-rc.7" }
], version = "1.0.0-rc.8" }

anyhow = "1.0.53"
async-trait = "0.1.52"
Expand Down Expand Up @@ -61,7 +61,7 @@ safe = []
libtor = ["tari_libtor"]

[build-dependencies]
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.7"}
tari_features = { path = "../../common/tari_features", version = "1.0.0-rc.8"}

[package.metadata.cargo-machete]
ignored = [
Expand Down

0 comments on commit 07131ad

Please sign in to comment.