Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only prune bootstrap once #2530

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions ant-bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ license = "GPL-3.0"
name = "ant-bootstrap"
readme = "README.md"
repository = "https://github.com/maidsafe/autonomi"
version = "0.1.0"
version = "0.1.0-rc.2"

[features]
local = []

[dependencies]
ant-logging = { path = "../ant-logging", version = "0.2.40" }
ant-protocol = { version = "0.17.15", path = "../ant-protocol" }
ant-logging = { path = "../ant-logging", version = "0.2.41-rc.2" }
ant-protocol = { path = "../ant-protocol", version = "0.3.0-rc.2" }
atomic-write-file = "0.2.2"
chrono = { version = "0.4", features = ["serde"] }
clap = { version = "4.2.1", features = ["derive", "env"] }
Expand All @@ -38,4 +38,4 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tempfile = "3.8.1"

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasmtimer = "0.2.0"
wasmtimer = "0.2.0"
2 changes: 1 addition & 1 deletion ant-build-info/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "GPL-3.0"
name = "ant-build-info"
readme = "README.md"
repository = "https://github.com/maidsafe/autonomi"
version = "0.1.19"
version = "0.1.20-rc.2"
build = "build.rs"
include = ["Cargo.toml", "src/**/*", "build.rs"]

Expand Down
4 changes: 2 additions & 2 deletions ant-build-info/src/release_info.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pub const RELEASE_YEAR: &str = "2024";
pub const RELEASE_MONTH: &str = "11";
pub const RELEASE_MONTH: &str = "12";
pub const RELEASE_CYCLE: &str = "1";
pub const RELEASE_CYCLE_COUNTER: &str = "6";
pub const RELEASE_CYCLE_COUNTER: &str = "2";
14 changes: 7 additions & 7 deletions ant-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["MaidSafe Developers <[email protected]>"]
name = "ant-cli"
description = "CLI client for the Autonomi network"
license = "GPL-3.0"
version = "0.1.5"
version = "0.3.0-rc.2"
edition = "2021"
homepage = "https://maidsafe.net"
readme = "README.md"
Expand All @@ -23,11 +23,11 @@ name = "files"
harness = false

[dependencies]
ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.0" }
ant-build-info = { path = "../ant-build-info", version = "0.1.19" }
ant-logging = { path = "../ant-logging", version = "0.2.40" }
ant-protocol = { path = "../ant-protocol", version = "0.17.15" }
autonomi = { path = "../autonomi", version = "0.2.4", features = [
ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.0-rc.2" }
ant-build-info = { path = "../ant-build-info", version = "0.1.20-rc.2" }
ant-logging = { path = "../ant-logging", version = "0.2.41-rc.2" }
ant-protocol = { path = "../ant-protocol", version = "0.3.0-rc.2" }
autonomi = { path = "../autonomi", version = "0.3.0-rc.2", features = [
"fs",
"vault",
"registers",
Expand Down Expand Up @@ -59,7 +59,7 @@ tracing = { version = "~0.1.26" }
walkdir = "2.5.0"

[dev-dependencies]
autonomi = { path = "../autonomi", version = "0.2.4", features = ["fs"]}
autonomi = { path = "../autonomi", version = "0.3.0-rc.2", features = ["fs"]}
criterion = "0.5.1"
eyre = "0.6.8"
rand = { version = "~0.8.5", features = ["small_rng"] }
Expand Down
27 changes: 22 additions & 5 deletions ant-cli/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,26 @@ pub enum WalletCmd {
/// Optional flag to not add a password.
#[clap(long, action)]
no_password: bool,
/// Optional hex-encoded private key.
#[clap(long)]
private_key: Option<String>,
/// Optional password to encrypt the wallet with.
#[clap(long, short)]
password: Option<String>,
},

/// Import an existing wallet.
Import {
/// Hex-encoded private key.
private_key: String,
/// Optional flag to not add a password.
#[clap(long, action)]
no_password: bool,
/// Optional password to encrypt the wallet with.
#[clap(long, short)]
password: Option<String>,
},

/// Print the private key of a wallet.
Export,

/// Check the balance of the wallet.
Balance,
}
Expand Down Expand Up @@ -208,10 +220,15 @@ pub async fn handle_subcommand(opt: Opt) -> Result<()> {
SubCmd::Wallet { command } => match command {
WalletCmd::Create {
no_password,
password,
} => wallet::create(no_password, password),
WalletCmd::Import {
private_key,
no_password,
password,
} => wallet::create(no_password, private_key, password),
WalletCmd::Balance => Ok(wallet::balance().await?),
} => wallet::import(private_key, no_password, password),
WalletCmd::Export => wallet::export(),
WalletCmd::Balance => wallet::balance().await,
},
}
}
Loading
Loading