Merge branch 'main' into dependabot/github_actions/actions/cache-4.0.0

.github/workflows/merge.yml

@@ -129,7 +129,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -158,7 +158,7 @@ jobs:
           - { os: macos-latest, elevated: sudo }
           - { os: windows-latest }
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal

.github/workflows/release.yml

@@ -128,20 +128,20 @@ jobs:
           release-plz release --git-token ${{ secrets.VERSION_BUMP_COMMIT_PAT }}
           just package-release-assets "safe"
           just package-release-assets "safenode"
-          just package-release-assets "testnet"
           just package-release-assets "faucet"
           just package-release-assets "safenode_rpc_client"
+          just package-release-assets "safenode-manager"
           # The versioned assets are uploaded to both the release and S3 in this target.
           just upload-release-assets
           # Now repackage and upload the artifacts to S3 using 'latest' for the version.
           just package-release-assets "safe" "latest"
           just package-release-assets "safenode" "latest"
-          just package-release-assets "testnet" "latest"
           just package-release-assets "faucet" "latest"
           just package-release-assets "safenode_rpc_client" "latest"
+          just package-release-assets "safenode-manager" "latest"
           just upload-release-assets-to-s3 "safe"
           just upload-release-assets-to-s3 "safenode"
-          just upload-release-assets-to-s3 "testnet"
+          just upload-release-assets-to-s3 "safenode-manager"
           just upload-release-assets-to-s3 "faucet"
           just upload-release-assets-to-s3 "safenode_rpc_client"
       - name: post notification to slack on failure

Justfile

@@ -108,13 +108,13 @@ build-release-artifacts arch:
     cargo install cross
     cross build --release --features=network-contacts --target $arch --bin safe
     cross build --release --features=network-contacts --target $arch --bin safenode
-    cross build --release --target $arch --bin testnet
+    cross build --release --target $arch --bin safenode-manager
     cross build --release --target $arch --bin faucet
     cross build --release --target $arch --bin safenode_rpc_client
   else
     cargo build --release --features=network-contacts --target $arch --bin safe
     cargo build --release --features=network-contacts --target $arch --bin safenode
-    cargo build --release --target $arch --bin testnet
+    cargo build --release --target $arch --bin safenode-manager
     cargo build --release --target $arch --bin faucet
     cargo build --release --target $arch --bin safenode_rpc_client
   fi
@@ -158,6 +158,10 @@ package-release-assets bin version="":
     "aarch64-unknown-linux-musl"
   )
 
+  bin="{{bin}}"
+  supported_bins=("safe" "safenode" "safenode-manager" "faucet" "safenode_rpc_client")
+  crate=""
+
   bin="{{bin}}"
   case "$bin" in
     safe)
@@ -166,8 +170,8 @@ package-release-assets bin version="":
     safenode)
       crate="sn_node"
       ;;
-    testnet)
-      crate="sn_testnet"
+    safenode-manager)
+      crate="sn_node_manager"
       ;;
     faucet)
       crate="sn_faucet"
@@ -176,7 +180,7 @@ package-release-assets bin version="":
       crate="sn_node_rpc_client"
       ;;
     *)
-      echo "The only supported binaries are safe, safenode, testnet, faucet, safenode_rpc_client"
+      echo "The $bin binary is not supported"
       exit 1
       ;;
   esac
@@ -207,7 +211,7 @@ upload-release-assets:
   binary_crates=(
     "sn_cli"
     "sn_node"
-    "sn_testnet"
+    "sn-node-manager"
     "sn_faucet"
     "sn_node_rpc_client"
   )
@@ -234,9 +238,9 @@ upload-release-assets:
             bin_name="safenode"
             bucket="sn-node"
             ;;
-          sn_testnet)
-            bin_name="testnet"
-            bucket="sn-testnet"
+          sn-node-manager)
+            bin_name="safenode-manager"
+            bucket="sn-node-manager"
             ;;
           sn_faucet)
             bin_name="faucet"
@@ -247,7 +251,7 @@ upload-release-assets:
             bucket="sn-node-rpc-client"
             ;;
           *)
-            echo "The only supported binaries are safe, safenode, testnet, faucet, safenode_rpc_client"
+            echo "The $crate is not supported"
             exit 1
             ;;
         esac
@@ -257,13 +261,16 @@ upload-release-assets:
         for crate_with_version in "${crates_with_versions[@]}"; do
           if [[ $crate_with_version == $crate-v* ]]; then
             (
-              echo "Uploading $bin_name assets to $crate_with_version release..."
               cd deploy/$bin_name
-              ls | xargs gh release upload $crate_with_version --repo {{release_repo}}
               echo "Uploading $bin_name assets to S3 bucket..."
               for file in *.zip *.tar.gz; do
                 aws s3 cp "$file" "s3://$bucket/$file" --acl public-read
               done
+
+              if [[ "$crate" == "sn_cli" || "$crate" == "sn_node" || "$crate" == "sn-node-manager" ]]; then
+                echo "Uploading $bin_name assets to $crate_with_version release..."
+                ls | xargs gh release upload $crate_with_version --repo {{release_repo}}
+              fi
             )
           fi
         done
@@ -282,8 +289,8 @@ upload-release-assets-to-s3 bin_name:
     safenode)
       bucket="sn-node"
       ;;
-    testnet)
-      bucket="sn-testnet"
+    safenode-manager)
+      bucket="sn-node-manager"
       ;;
     faucet)
       bucket="sn-faucet"
@@ -292,7 +299,7 @@ upload-release-assets-to-s3 bin_name:
       bucket="sn-node-rpc-client"
       ;;
     *)
-      echo "The only supported binaries are safe, safenode, testnet, faucet, safenode_rpc_client"
+      echo "The {{bin_name}} binary is not supported"
       exit 1
       ;;
   esac
@@ -301,10 +308,3 @@ upload-release-assets-to-s3 bin_name:
   for file in *.zip *.tar.gz; do
     aws s3 cp "$file" "s3://$bucket/$file" --acl public-read
   done
-
-run-local-network:
-  #!/usr/bin/env bash
-  pgrep safenode | xargs kill -9
-  pgrep faucet | xargs kill -9
-  rm -rf ~/.local/share/safe
-  cargo run --bin testnet --features local-discovery -- --build-node --build-faucet --interval 1000

README.md

@@ -1,4 +1,4 @@
-# The Safe Network
+ # The Safe Network
 
 [SafenetForum.org](https://safenetforum.org/)
 
@@ -19,16 +19,16 @@ The Data on the Safe Network is Decentralised, Autonomous, and  built atop of Ka
 
 ### For Users
 
-- [CLI](https://github.com/maidsafe/sn_cli/blob/master/README.md) The Command Line Interface, allowing users to interact with the network from their terminal.
-- [Node](https://github.com/maidsafe/sn_node/blob/master/README.md) The backbone of the safe network. Nodes can be run on comoodity hardware and provide storage space and validation of transactions to the network.
+- [CLI](https://github.com/maidsafe/safe_network/blob/main/sn_cli/README.md) The Command Line Interface, allowing users to interact with the network from their terminal.
+- [Node](https://github.com/maidsafe//safe_network/blob/main/sn_node/README.md) The backbone of the safe network. Nodes can be run on commodity hardware and provide storage space and validation of transactions to the network.
 
 ### For Developers
 
-- [Client](https://github.com/maidsafe/sn_client/blob/master/README.md) The client APIs allowing use of the SafeNetwork to users and developers.
-- [Registers](https://github.com/maidsafe/sn_registers/blob/master/README.md) The CRDT registers structures available on the network.
-- [Testnet](https://github.com/maidsafe/sn_testnet/blob/master/README.md) The testnet crate, used to set up a local network for development and testing.
-- [Faucet](https://github.com/maidsafe/sn_faucet/blob/master/README.md) The local faucet server, used to claim genesis and request tokens from the network.
-- [Node RPC](https://github.com/maidsafe/sn_node_rpc_client/blob/master/README.md) The RPC server used by the nodes to expose API calls to the outside world.
+- [Client](https://github.com/maidsafe/safe_network/blob/main/sn_client/README.md) The client APIs allowing use of the SafeNetwork to users and developers.
+- [Registers](https://github.com/maidsafe/safe_network/blob/main/sn_registers/README.md) The CRDT registers structures available on the network.
+- [Testnet](https://github.com/maidsafe/safe_network/blob/main/sn_testnet/README.md) The testnet crate, used to set up a local network for development and testing.
+- [Faucet](https://github.com/maidsafe/safe_network/blob/main/sn_faucet/README.md) The local faucet server, used to claim genesis and request tokens from the network.
+- [Node RPC](https://github.com/maidsafe/safe_network/blob/main/sn_node_rpc_client/README.md) The RPC server used by the nodes to expose API calls to the outside world.
 
 #### Transport Protocols and Architectures
 
@@ -53,13 +53,13 @@ Browser usage is highly experimental, but the wasm32 target for `sn_client` _sho
 
 ### For the Technical
 
-- [Logging](https://github.com/maidsafe/sn_logging/blob/master/README.md) The generalised logging crate used by the safe network (backed by the tracing crate).
-- [Metrics](https://github.com/maidsafe/sn_metrics/blob/master/README.md) The metrics crate used by the safe network.
-- [Networking](https://github.com/maidsafe/sn_networking/blob/master/README.md) The networking layer, built atop libp2p which allows nodes and clients to communicate.
-- [Protocol](https://github.com/maidsafe/sn_protocol/blob/master/README.md) The protocol used by the safe network.
-- [Transfers](https://github.com/maidsafe/sn_transfers/blob/master/README.md) The transfers crate, used to send and receive tokens on the network.
-- [Peers Acquisition](https://github.com/maidsafe/sn_peers_acqisition/blob/master/README.md) The peers peers acqisition crate, or: how the network layer discovers bootstrap peers.
-- [Build Info](https://github.com/maidsafe/sn_build_info/blob/master/README.md) Small helper used to get the build/commit versioning info for debug purposes.
+- [Logging](https://github.com/maidsafe/safe_network/blob/main/sn_logging/README.md) The generalised logging crate used by the safe network (backed by the tracing crate).
+- [Metrics](https://github.com/maidsafe/safe_network/blob/main/metrics/README.md) The metrics crate used by the safe network.
+- [Networking](https://github.com/maidsafe/safe_network/blob/main/sn_networking/README.md) The networking layer, built atop libp2p which allows nodes and clients to communicate.
+- [Protocol](https://github.com/maidsafe/safe_network/blob/main/sn_protocol/README.md) The protocol used by the safe network.
+- [Transfers](https://github.com/maidsafe/safe_network/blob/main/sn_transfers/README.md) The transfers crate, used to send and receive tokens on the network.
+- [Peers Acquisition](https://github.com/maidsafe/safe_network/blob/main/sn_peers_acquisition/README.md) The peers peers acqisition crate, or: how the network layer discovers bootstrap peers.
+- [Build Info](https://github.com/maidsafe/safe_network/blob/main/sn_build_info/README.md) Small helper used to get the build/commit versioning info for debug purposes.
 
 ## Run your MaidSafe Local Test Network in 4 easy Steps
 Before you start, make sure to have **[Rust installed](https://www.rust-lang.org/learn/get-started)** and the latest version with `rustup update`

release-plz.toml

@@ -53,3 +53,27 @@ name = "sn_transfers"
 changelog_update = true
 git_release_enable = false
 publish = true
+
+[[package]]
+name = "sn_testnet"
+changelog_update = true
+git_release_enable = false
+publish = true
+
+[[package]]
+name = "sn_faucet"
+changelog_update = true
+git_release_enable = false
+publish = true
+
+[[package]]
+name = "sn_node_rpc_client"
+changelog_update = true
+git_release_enable = false
+publish = true
+
+[[package]]
+name = "token_supplies"
+changelog_update = true
+git_release_enable = false
+publish = true

sn_cli/CHANGELOG.md

@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.89.21](https://github.com/maidsafe/safe_network/compare/sn_cli-v0.89.20...sn_cli-v0.89.21) - 2024-01-26
+
+### Other
+- update dependencies
+
+## [0.89.20](https://github.com/maidsafe/safe_network/compare/sn_cli-v0.89.19...sn_cli-v0.89.20) - 2024-01-25
+
+### Other
+- update dependencies
+
+## [0.89.19](https://github.com/maidsafe/safe_network/compare/sn_cli-v0.89.18...sn_cli-v0.89.19) - 2024-01-25
+
+### Other
+- update dependencies
+
 ## [0.89.18](https://github.com/maidsafe/safe_network/compare/sn_cli-v0.89.17...sn_cli-v0.89.18) - 2024-01-25
 
 ### Other

sn_cli/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0"
 name = "sn_cli"
 readme = "README.md"
 repository = "https://github.com/maidsafe/safe_network"
-version = "0.89.18"
+version = "0.89.21"
 
 [[bin]]
 path="src/main.rs"
@@ -44,7 +44,7 @@ reqwest = { version="0.11.18", default-features=false, features = ["rustls"] }
 rmp-serde = "1.1.1"
 serde = { version = "1.0.133", features = [ "derive"]}
 sn_build_info = { path="../sn_build_info", version = "0.1.4" }
-sn_client = { path = "../sn_client", version = "0.102.11" }
+sn_client = { path = "../sn_client", version = "0.102.12" }
 sn_transfers = { path = "../sn_transfers", version = "0.14.42" }
 sn_registers = { path = "../sn_registers", version = "0.3.8" }
 sn_logging = { path = "../sn_logging", version = "0.2.17" }

sn_client/CHANGELOG.md

@@ -6,6 +6,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.102.12](https://github.com/maidsafe/safe_network/compare/sn_client-v0.102.11...sn_client-v0.102.12) - 2024-01-25
+
+### Other
+- improved pay for storage
+- mut wallet description
+- revert to mut wallet
+- change to wallet result
+- cargo fmt
+- into wallet doc
+- into wallet doc
+- expand abbreviations mutable wallet
+- pay for storage clone for test pass
+- expand on abbreviation and added detail
+- pay for records example
+- pay for records and cleanup
+- pay for storage once detail
+- send unsigned detail
+- pay for storage
+- get store cost at addr unused
+
 ## [0.102.11](https://github.com/maidsafe/safe_network/compare/sn_client-v0.102.10...sn_client-v0.102.11) - 2024-01-25
 
 ### Other

sn_client/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0"
 name = "sn_client"
 readme = "README.md"
 repository = "https://github.com/maidsafe/safe_network"
-version = "0.102.11"
+version = "0.102.12"
 
 [features]
 default=[]