Skip to content

Commit 07131ad

Browse files
authored
fix: hot for removing breaking change in wallet, new release for nexnet 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
1 parent 3ea8c17 commit 07131ad

File tree

36 files changed

+149
-143
lines changed

36 files changed

+149
-143
lines changed

Cargo.lock

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

applications/minotari_app_grpc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
44
description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core"
55
repository = "https://github.com/tari-project/tari"
66
license = "BSD-3-Clause"
7-
version = "1.0.0-rc.7"
7+
version = "1.0.0-rc.8"
88
edition = "2018"
99

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

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

3737
[package.metadata.cargo-machete]

applications/minotari_app_utilities/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "minotari_app_utilities"
3-
version = "1.0.0-rc.7"
3+
version = "1.0.0-rc.8"
44
authors = ["The Tari Development Community"]
55
edition = "2018"
66
license = "BSD-3-Clause"
@@ -26,7 +26,7 @@ tonic = "0.8.3"
2626

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

3131
[features]
3232
miner_input = ["minotari_app_grpc"]

applications/minotari_console_wallet/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "minotari_console_wallet"
3-
version = "1.0.0-rc.7"
3+
version = "1.0.0-rc.8"
44
authors = ["The Tari Development Community"]
55
edition = "2018"
66
license = "BSD-3-Clause"
@@ -83,7 +83,7 @@ default-features = false
8383
features = ["crossterm"]
8484

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

8888
[features]
8989
default = ["libtor"]

applications/minotari_console_wallet/src/init/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ pub async fn init_wallet(
419419
};
420420

421421
let master_seed = read_or_create_master_seed(recovery_seed.clone(), &wallet_db)?;
422-
let wallet_type = read_or_create_wallet_type(wallet_type, &wallet_db);
422+
let wallet_type = WalletType::Software;
423423

424424
let node_identity = match config.wallet.identity_file.as_ref() {
425425
Some(identity_file) => {
@@ -465,7 +465,7 @@ pub async fn init_wallet(
465465
key_manager_backend,
466466
shutdown_signal,
467467
master_seed,
468-
wallet_type.unwrap(),
468+
wallet_type,
469469
)
470470
.await
471471
.map_err(|e| match e {

applications/minotari_merge_mining_proxy/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
44
description = "The Tari merge mining proxy for xmrig"
55
repository = "https://github.com/tari-project/tari"
66
license = "BSD-3-Clause"
7-
version = "1.0.0-rc.7"
7+
version = "1.0.0-rc.8"
88
edition = "2018"
99

1010
[features]
@@ -47,7 +47,7 @@ url = "2.1.1"
4747
scraper = "0.19.0"
4848

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

5252
[dev-dependencies]
5353
markup5ever = "0.11.0"

applications/minotari_miner/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
44
description = "The tari miner implementation"
55
repository = "https://github.com/tari-project/tari"
66
license = "BSD-3-Clause"
7-
version = "1.0.0-rc.7"
7+
version = "1.0.0-rc.8"
88
edition = "2018"
99

1010
[dependencies]

applications/minotari_node/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
44
description = "The tari full base node implementation"
55
repository = "https://github.com/tari-project/tari"
66
license = "BSD-3-Clause"
7-
version = "1.0.0-rc.7"
7+
version = "1.0.0-rc.8"
88
edition = "2018"
99

1010
[dependencies]
@@ -24,7 +24,7 @@ tari_shutdown = { path = "../../infrastructure/shutdown" }
2424
tari_utilities = { version = "0.7" }
2525
tari_key_manager = { path = "../../base_layer/key_manager", features = [
2626
"key_manager_service",
27-
], version = "1.0.0-rc.7" }
27+
], version = "1.0.0-rc.8" }
2828

2929
anyhow = "1.0.53"
3030
async-trait = "0.1.52"
@@ -61,7 +61,7 @@ safe = []
6161
libtor = ["tari_libtor"]
6262

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

6666
[package.metadata.cargo-machete]
6767
ignored = [

0 commit comments

Comments
 (0)