Merge branch 'main' into remove_feat_flags

maidsafe · Jan 7, 2025 · b496492 · b496492
2 parents 2fff515 + 7e7c066
commit b496492
Show file tree

Hide file tree

Showing 40 changed files with 210 additions and 166 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -3,16 +3,14 @@ on:
   push:
     branches:
       - main
-      - data_further_refactor
-  pull_request:
-    branches:
-      - main
 
 permissions:
   contents: write
 
 jobs:
   deploy:
+    env:
+      GH_TOKEN: ${{ secrets.AUTONOMI_PAT }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -33,4 +31,4 @@ jobs:
         run: |
           git config --global user.name "github-actions"
           git config --global user.email "[email protected]"
-          mkdocs gh-deploy --force 
+          mkdocs gh-deploy --force 
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.1"
+version = "0.1.2"
 
 [features]
 local = []
 
 [dependencies]
-ant-logging = { path = "../ant-logging", version = "0.2.42" }
-ant-protocol = { path = "../ant-protocol", version = "0.3.1" }
+ant-logging = { path = "../ant-logging", version = "0.2.43" }
+ant-protocol = { path = "../ant-protocol", version = "0.3.2" }
 atomic-write-file = "0.2.2"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.2.1", features = ["derive", "env"] }

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.21"
+version = "0.1.22"
 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 = "12";
 pub const RELEASE_CYCLE: &str = "1";
-pub const RELEASE_CYCLE_COUNTER: &str = "6";
+pub const RELEASE_CYCLE_COUNTER: &str = "7";
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.3.1"
+version = "0.3.2"
 edition = "2021"
 homepage = "https://maidsafe.net"
 readme = "README.md"
@@ -24,11 +24,11 @@ name = "files"
 harness = false
 
 [dependencies]
-ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.1" }
-ant-build-info = { path = "../ant-build-info", version = "0.1.21" }
-ant-logging = { path = "../ant-logging", version = "0.2.42" }
-ant-protocol = { path = "../ant-protocol", version = "0.3.1" }
-autonomi = { path = "../autonomi", version = "0.3.1", features = [
+ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.2" }
+ant-build-info = { path = "../ant-build-info", version = "0.1.22" }
+ant-logging = { path = "../ant-logging", version = "0.2.43" }
+ant-protocol = { path = "../ant-protocol", version = "0.3.2" }
+autonomi = { path = "../autonomi", version = "0.3.2", features = [
     "loud",
 ] }
 clap = { version = "4.2.1", features = ["derive"] }
@@ -57,7 +57,7 @@ tracing = { version = "~0.1.26" }
 walkdir = "2.5.0"
 
 [dev-dependencies]
-autonomi = { path = "../autonomi", version = "0.3.1"}
+autonomi = { path = "../autonomi", version = "0.3.2" }
 criterion = "0.5.1"
 eyre = "0.6.8"
 rand = { version = "~0.8.5", features = ["small_rng"] }

diff --git a/ant-cli/src/actions/connect.rs b/ant-cli/src/actions/connect.rs
@@ -6,8 +6,8 @@
 // KIND, either express or implied. Please review the Licences for the specific language governing
 // permissions and limitations relating to use of the SAFE Network Software.
 
-use autonomi::Client;
 use autonomi::Multiaddr;
+use autonomi::{get_evm_network_from_env, Client};
 use color_eyre::eyre::bail;
 use color_eyre::eyre::Result;
 use indicatif::ProgressBar;
@@ -23,7 +23,9 @@ pub async fn connect_to_network(peers: Vec<Multiaddr>) -> Result<Client> {
     progress_bar.set_message("Connecting to The Autonomi Network...");
 
     match Client::init_with_peers(peers).await {
-        Ok(client) => {
+        Ok(mut client) => {
+            let evm_network = get_evm_network_from_env()?;
+            client.set_evm_network(evm_network);
             info!("Connected to the Network");
             progress_bar.finish_with_message("Connected to the Network");
             Ok(client)

diff --git a/ant-cli/src/commands.rs b/ant-cli/src/commands.rs
@@ -12,7 +12,7 @@ mod vault;
 mod wallet;
 
 use crate::opt::Opt;
-use clap::Subcommand;
+use clap::{error::ErrorKind, CommandFactory as _, Subcommand};
 use color_eyre::Result;
 
 #[derive(Subcommand, Debug)]
@@ -230,6 +230,11 @@ pub async fn handle_subcommand(opt: Opt) -> Result<()> {
             WalletCmd::Export => wallet::export(),
             WalletCmd::Balance => wallet::balance().await,
         },
-        None => Ok(()),
+        None => {
+            // If no subcommand is given, default to clap's error behaviour.
+            Opt::command()
+                .error(ErrorKind::MissingSubcommand, "Please provide a subcommand")
+                .exit();
+        }
     }
 }
diff --git a/ant-cli/src/opt.rs b/ant-cli/src/opt.rs
@@ -19,7 +19,7 @@ use std::time::Duration;
 #[command(disable_version_flag = true)]
 #[command(author, version, about, long_about = None)]
 pub(crate) struct Opt {
-    /// Available sub commands.
+    // Available subcommands. This is optional to allow `--version` to work without a subcommand.
     #[clap(subcommand)]
     pub command: Option<SubCmd>,
 

diff --git a/ant-evm/Cargo.toml b/ant-evm/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 name = "ant-evm"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.1.6"
+version = "0.1.7"
 
 [features]
 local = ["evmlib/local"]
@@ -16,7 +16,7 @@ test-utils = []
 
 [dependencies]
 custom_debug = "~0.6.1"
-evmlib = { path = "../evmlib", version = "0.1.6" }
+evmlib = { path = "../evmlib", version = "0.1.7" }
 hex = "~0.4.3"
 lazy_static = "1.4.0"
 libp2p = { version = "0.54.1", features = ["identify", "kad"] }

diff --git a/ant-logging/Cargo.toml b/ant-logging/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 name = "ant-logging"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.2.42"
+version = "0.2.43"
 
 [dependencies]
 chrono = "~0.4.19"

diff --git a/ant-metrics/Cargo.toml b/ant-metrics/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 name = "ant-metrics"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.1.22"
+version = "0.1.23"
 
 [[bin]]
 path = "src/main.rs"

diff --git a/ant-networking/Cargo.toml b/ant-networking/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 name = "ant-networking"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.3.1"
+version = "0.3.2"
 
 [features]
 default = []
@@ -18,11 +18,11 @@ upnp = ["libp2p/upnp"]
 
 [dependencies]
 aes-gcm-siv = "0.11.1"
-ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.1" }
-ant-build-info = { path = "../ant-build-info", version = "0.1.21" }
-ant-evm = { path = "../ant-evm", version = "0.1.6" }
-ant-protocol = { path = "../ant-protocol", version = "0.3.1" }
-ant-registers = { path = "../ant-registers", version = "0.4.5" }
+ant-bootstrap = { path = "../ant-bootstrap", version = "0.1.2" }
+ant-build-info = { path = "../ant-build-info", version = "0.1.22" }
+ant-evm = { path = "../ant-evm", version = "0.1.7" }
+ant-protocol = { path = "../ant-protocol", version = "0.3.2" }
+ant-registers = { path = "../ant-registers", version = "0.4.6" }
 async-trait = "0.1"
 bls = { package = "blsttc", version = "8.0.2" }
 bytes = { version = "1.0.1", features = ["serde"] }