Merge branch 'rc-2024.12.1' into sk_wallet_file-create

maidsafe · Dec 16, 2024 · 5a6f3e6 · 5a6f3e6
2 parents ff2e860 + 87f2f70
commit 5a6f3e6
Show file tree

Hide file tree

Showing 30 changed files with 212 additions and 146 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ant-bootstrap/Cargo.toml b/ant-bootstrap/Cargo.toml
@@ -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.3"
 
 [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.3" }
+ant-protocol = { path = "../ant-protocol", version = "0.3.0-rc.3" }
 atomic-write-file = "0.2.2"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.2.1", features = ["derive", "env"] }
@@ -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"
diff --git a/ant-build-info/Cargo.toml b/ant-build-info/Cargo.toml
@@ -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.3"
 build = "build.rs"
 include = ["Cargo.toml", "src/**/*", "build.rs"]
 

diff --git a/ant-build-info/src/release_info.rs b/ant-build-info/src/release_info.rs
@@ -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 = "3";
diff --git a/ant-cli/Cargo.toml b/ant-cli/Cargo.toml
@@ -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.3"
 edition = "2021"
 homepage = "https://maidsafe.net"
 readme = "README.md"
@@ -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.3" }
+ant-build-info = { path = "../ant-build-info", version = "0.1.20-rc.3" }
+ant-logging = { path = "../ant-logging", version = "0.2.41-rc.3" }
+ant-protocol = { path = "../ant-protocol", version = "0.3.0-rc.3" }
+autonomi = { path = "../autonomi", version = "0.3.0-rc.3", features = [
     "fs",
     "vault",
     "registers",
@@ -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.3", features = ["fs"]}
 criterion = "0.5.1"
 eyre = "0.6.8"
 rand = { version = "~0.8.5", features = ["small_rng"] }

diff --git a/ant-cli/src/commands.rs b/ant-cli/src/commands.rs
@@ -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,
 }
@@ -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,
         },
     }
 }