diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 503ee5212c..47e96c2084 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -1134,7 +1134,7 @@ jobs: # mv $SAFE_DATA_PATH/test_faucet/logs/faucet.log ./faucet_log.log # env: # SN_LOG: "all" - # SAFE_DATA_PATH: /home/runner/.local/share/safe + # SAFE_DATA_PATH: /home/runner/.local/share/autonomi # continue-on-error: true # if: always() # timeout-minutes: 1 @@ -1150,10 +1150,10 @@ jobs: # - name: Cleanup prior faucet and cashnotes # run: | # ls -l /home/runner/.local/share - # ls -l /home/runner/.local/share/safe - # rm -rf /home/runner/.local/share/safe/test_faucet - # rm -rf /home/runner/.local/share/safe/test_genesis - # rm -rf /home/runner/.local/share/safe/autonomi + # ls -l /home/runner/.local/share/autonomi + # rm -rf /home/runner/.local/share/autonomi/test_faucet + # rm -rf /home/runner/.local/share/autonomi/test_genesis + # rm -rf /home/runner/.local/share/autonomi/autonomi # env: # SN_LOG: "all" # timeout-minutes: 5 @@ -1191,10 +1191,10 @@ jobs: # - name: Create and fund a wallet with different keypair # run: | # ls -l /home/runner/.local/share - # ls -l /home/runner/.local/share/safe - # rm -rf /home/runner/.local/share/safe/test_faucet - # rm -rf /home/runner/.local/share/safe/test_genesis - # rm -rf /home/runner/.local/share/safe/autonomi + # ls -l /home/runner/.local/share/autonomi + # rm -rf /home/runner/.local/share/autonomi/test_faucet + # rm -rf /home/runner/.local/share/autonomi/test_genesis + # rm -rf /home/runner/.local/share/autonomi/autonomi # ~/safe --log-output-dest=data-dir wallet create --no-password # if GENESIS_PK=a9925296499299fdbf4412509d342a92e015f5b996e9acd1d2ab7f2326e3ad05934326efdc345345a95e973ac1bb6637 GENESIS_SK=40f6bbc870355c68138ac70b450b6425af02b49874df3f141b7018378ceaac66 nohup ~/faucet --log-output-dest=data-dir send 100000000 $(~/safe --log-output-dest=data-dir wallet address | tail -n 1); then # echo "Faucet with different genesis key not rejected!" @@ -1213,10 +1213,10 @@ jobs: # - name: Start up a faucet in server mode # run: | # ls -l /home/runner/.local/share - # ls -l /home/runner/.local/share/safe - # rm -rf /home/runner/.local/share/safe/test_faucet - # rm -rf /home/runner/.local/share/safe/test_genesis - # rm -rf /home/runner/.local/share/safe/autonomi + # ls -l /home/runner/.local/share/autonomi + # rm -rf /home/runner/.local/share/autonomi/test_faucet + # rm -rf /home/runner/.local/share/autonomi/test_genesis + # rm -rf /home/runner/.local/share/autonomi/autonomi # target/release/faucet server & # sleep 60 # env: @@ -1232,7 +1232,7 @@ jobs: # exit 1 # fi # env: - # NODE_DATA_PATH: /home/runner/.local/share/safe/node + # NODE_DATA_PATH: /home/runner/.local/share/autonomi/node # timeout-minutes: 1 # - name: Stop the local network and upload logs @@ -1361,7 +1361,7 @@ jobs: shell: bash timeout-minutes: 1 env: - NODE_DATA_PATH: /home/runner/.local/share/safe/node + NODE_DATA_PATH: /home/runner/.local/share/autonomi/node run: | incoming_connection_errors=$(rg "IncomingConnectionError" $NODE_DATA_PATH -c --stats | \ rg "(\d+) matches" | rg "\d+" -o) || { echo "Failed to find IncomingConnectionError error"; exit 0; } @@ -1391,7 +1391,7 @@ jobs: # name: Replication bench with heavy upload # runs-on: ubuntu-latest # env: - # CLIENT_DATA_PATH: /home/runner/.local/share/safe/autonomi + # CLIENT_DATA_PATH: /home/runner/.local/share/autonomi/client # steps: # - uses: actions/checkout@v4 @@ -1505,7 +1505,7 @@ jobs: # exit 1 # fi # env: - # CLIENT_DATA_PATH: /home/runner/.local/share/safe/client + # CLIENT_DATA_PATH: /home/runner/.local/share/autonomi/client # timeout-minutes: 10 # - name: Wait for certain period @@ -1538,7 +1538,7 @@ jobs: # exit 1 # fi # env: - # CLIENT_DATA_PATH: /home/runner/.local/share/safe/client + # CLIENT_DATA_PATH: /home/runner/.local/share/autonomi/client # timeout-minutes: 10 # - name: Wait for certain period @@ -1561,8 +1561,8 @@ jobs: # ./target/release/safe --log-output-dest=data-dir wallet receive --file transfer_hex # env: # SN_LOG: "all" - # SAFE_DATA_PATH: /home/runner/.local/share/safe - # CLIENT_DATA_PATH: /home/runner/.local/share/safe/client + # SAFE_DATA_PATH: /home/runner/.local/share/autonomi + # CLIENT_DATA_PATH: /home/runner/.local/share/autonomi/client # timeout-minutes: 25 # - name: Use second client to upload third file @@ -1592,7 +1592,7 @@ jobs: # exit 1 # fi # env: - # CLIENT_DATA_PATH: /home/runner/.local/share/safe/client + # CLIENT_DATA_PATH: /home/runner/.local/share/autonomi/client # timeout-minutes: 10 # - name: Stop the local network and upload logs diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 56ec6488d3..cddb37f259 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -434,14 +434,14 @@ jobs: matrix: include: - os: ubuntu-latest - node_data_path: /home/runner/.local/share/safe/node - autonomi_path: /home/runner/.local/share/safe + node_data_path: /home/runner/.local/share/autonomi/node + autonomi_path: /home/runner/.local/share/autonomi - os: windows-latest - node_data_path: C:\\Users\\runneradmin\\AppData\\Roaming\\safe\\node - autonomi_path: C:\\Users\\runneradmin\\AppData\\Roaming\\safe + node_data_path: C:\\Users\\runneradmin\\AppData\\Roaming\\autonomi\\node + autonomi_path: C:\\Users\\runneradmin\\AppData\\Roaming\\autonomi - os: macos-latest - node_data_path: /Users/runner/Library/Application Support/safe/node - autonomi_path: /Users/runner/Library/Application Support/safe + node_data_path: /Users/runner/Library/Application Support/autonomi/node + autonomi_path: /Users/runner/Library/Application Support/autonomi steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/nightly_wan.yml b/.github/workflows/nightly_wan.yml index eea61fd7bd..5c9c0fc4c2 100644 --- a/.github/workflows/nightly_wan.yml +++ b/.github/workflows/nightly_wan.yml @@ -74,7 +74,7 @@ jobs: set -e # read the inventory file - inventory_path=/home/runner/.local/share/safe/testnet-deploy/${{ env.NETWORK_NAME }}-inventory.json + inventory_path=/home/runner/.local/share/autonomi/testnet-deploy/${{ env.NETWORK_NAME }}-inventory.json echo "Inventory Path: $inventory_path" faucet_address=$(jq -r '.faucet_address' $inventory_path) cargo run --bin safe --release -- wallet get-faucet ${faucet_address} @@ -128,9 +128,9 @@ jobs: with: name: local_logs_NightlyE2E path: | - ~/.local/share/safe/node/*/logs/*.log* - ~/.local/share/safe/*/*/*.log* - ~/.local/share/safe/autonomi/logs/*/*.log* + ~/.local/share/autonomi/node/*/logs/*.log* + ~/.local/share/autonomi/*/*/*.log* + ~/.local/share/autonomi/autonomi/logs/*/*.log* - name: destroy network if: always() @@ -222,9 +222,9 @@ jobs: # with: # name: local_logs_NightlySpendTest # path: | - # ~/.local/share/safe/node/*/logs/*.log* - # ~/.local/share/safe/*/*/*.log* - # ~/.local/share/safe/autonomi/logs/*/*.log* + # ~/.local/share/autonomi/node/*/logs/*.log* + # ~/.local/share/autonomi/*/*/*.log* + # ~/.local/share/autonomi/autonomi/logs/*/*.log* # - name: destroy network # uses: maidsafe/sn-testnet-control-action/destroy-network@main @@ -248,13 +248,13 @@ jobs: # include: # - os: ubuntu-latest # wan_logs_path: /home/runner/sn-testnet-deploy/logs - # local_safe_path: /home/runner/.local/share/safe + # local_safe_path: /home/runner/.local/share/autonomi # # - os: windows-latest - # # node_data_path: C:\\Users\\runneradmin\\AppData\\Roaming\\safe\\node - # # safe_path: C:\\Users\\runneradmin\\AppData\\Roaming\\safe + # # node_data_path: C:\\Users\\runneradmin\\AppData\\Roaming\\autonomi\\node + # # safe_path: C:\\Users\\runneradmin\\AppData\\Roaming\\autonomi # # - os: macos-latest - # # node_data_path: /Users/runner/Library/Application Support/safe/node - # # safe_path: /Users/runner/Library/Application Support/safe + # # node_data_path: /Users/runner/Library/Application Support/autonomi/node + # # safe_path: /Users/runner/Library/Application Support/autonomi # steps: # - uses: actions/checkout@v4 # @@ -336,9 +336,9 @@ jobs: # with: # name: local_logs_NightlyChurnTest # path: | - # ~/.local/share/safe/node/*/logs/*.log* - # ~/.local/share/safe/*/*/*.log* - # ~/.local/share/safe/autonomi/logs/*/*.log* + # ~/.local/share/autonomi/node/*/logs/*.log* + # ~/.local/share/autonomi/*/*/*.log* + # ~/.local/share/autonomi/autonomi/logs/*/*.log* # # - name: Stop the WAN network # if: always() @@ -453,13 +453,13 @@ jobs: # include: # - os: ubuntu-latest # wan_logs_path: /home/runner/sn-testnet-deploy/logs - # local_safe_path: /home/runner/.local/share/safe + # local_safe_path: /home/runner/.local/share/autonomi # # - os: windows-latest # # node_data_path: C:\\Users\\runneradmin\\AppData\\Roaming\\safe\\node # # safe_path: C:\\Users\\runneradmin\\AppData\\Roaming\\safe # # - os: macos-latest - # # node_data_path: /Users/runner/Library/Application Support/safe/node - # # safe_path: /Users/runner/Library/Application Support/safe + # # node_data_path: /Users/runner/Library/Application Support/autonomi/node + # # safe_path: /Users/runner/Library/Application Support/autonomi # steps: # - uses: actions/checkout@v4 # @@ -542,9 +542,9 @@ jobs: # with: # name: local_logs_NightlyDataLocationTest # path: | - # ~/.local/share/safe/node/*/logs/*.log* - # ~/.local/share/safe/*/*/*.log* - # ~/.local/share/safe/autonomi/logs/*/*.log* + # ~/.local/share/autonomi/node/*/logs/*.log* + # ~/.local/share/autonomi/*/*/*.log* + # ~/.local/share/autonomi/autonomi/logs/*/*.log* # # - name: Stop the WAN network # if: always() diff --git a/.github/workflows/nightly_wan_churn.yml b/.github/workflows/nightly_wan_churn.yml index 2cbf72fd8c..e32cbb200b 100644 --- a/.github/workflows/nightly_wan_churn.yml +++ b/.github/workflows/nightly_wan_churn.yml @@ -65,7 +65,7 @@ jobs: - name: Obtain the funds from the faucet run: | # read the inventory file - inventory_path=/home/runner/.local/share/safe/testnet-deploy/NightlyChurnE2E-inventory.json + inventory_path=/home/runner/.local/share/autonomi/testnet-deploy/NightlyChurnE2E-inventory.json echo "Inventory Path: $inventory_path" faucet_address=$(jq -r '.faucet_address' $inventory_path) cargo run --bin safe --release -- wallet get-faucet ${faucet_address} @@ -125,9 +125,9 @@ jobs: with: name: local_logs_NightlyChurnE2E path: | - ~/.local/share/safe/node/*/logs/*.log* - ~/.local/share/safe/*/*/*.log* - ~/.local/share/safe/autonomi/logs/*/*.log* + ~/.local/share/autonomi/node/*/logs/*.log* + ~/.local/share/autonomi/*/*/*.log* + ~/.local/share/autonomi/autonomi/logs/*/*.log* - name: Stop the WAN network if: always() diff --git a/README.md b/README.md index b69d7410b5..64e147539e 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ Libp2p.
### For Users -- [CLI](https://github.com/maidsafe/safe_network/blob/main/autonomi-cli/README.md) The Command Line +- [CLI](https://github.com/maidsafe/autonomi/blob/main/autonomi-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 +- [Node](https://github.com/maidsafe/autonomi/blob/main/ant-node/README.md) The backbone of the + Autonomi network. Nodes can be run on commodity hardware and provide storage space and validation of transactions to the network. - Web App: Coming Soon! @@ -49,34 +49,30 @@ More options about EVM Network below. #### Build -You should also build `safe` with the `network-contacts` and `distribution` features enabled: - -``` -cargo build --release --features "network-contacts,distribution" --bin safe -``` - -For `antnode`, only the `network-contacts` feature should be required: +You can build `autonomi` and `antnode` with the `network-contacts` feature: ``` +cargo build --release --features network-contacts --bin autonomi cargo build --release --features network-contacts --bin antnode ``` + #### Main Crates -- [Autonomi API](https://github.com/maidsafe/safe_network/blob/main/autonomi/README.md) The client APIs +- [Autonomi API](https://github.com/maidsafe/autonomi/blob/main/autonomi/README.md) The client APIs allowing use of the Autonomi Network to users and developers. -- [Autonomi CLI](https://github.com/maidsafe/safe_network/blob/main/autonomi-cli/README.md) The Command Line +- [Autonomi CLI](https://github.com/maidsafe/autonomi/blob/main/autonomi-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 +- [Node](https://github.com/maidsafe/autonomi/blob/main/ant-node/README.md) The backbone of the autonomi network. Nodes can be run on commodity hardware and run the Network. -- [Node Manager](https://github.com/maidsafe/safe_network/blob/main/ant_node_manager/README.md) Use +- [Node Manager](https://github.com/maidsafe/autonomi/blob/main/ant-node-manager/README.md) Use to create a local network for development and testing. -- [Node RPC](https://github.com/maidsafe/safe_network/blob/main/ant-node-rpc-client/README.md) The +- [Node RPC](https://github.com/maidsafe/autonomi/blob/main/ant-node-rpc-client/README.md) The RPC server used by the nodes to expose API calls to the outside world. #### Transport Protocols and Architectures -The Safe Network uses `quic` as the default transport protocol. +The Autonomi Network uses `quic` as the default transport protocol. The `websockets` feature is available for the `ant-networking` crate, and above, and will allow for tcp over websockets. @@ -91,19 +87,19 @@ WASM support for the autonomi API is currently under active development. More do ### For the Technical -- [Logging](https://github.com/maidsafe/safe_network/blob/main/ant_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/ant-networking/README.md) The +- [Logging](https://github.com/maidsafe/autonomi/blob/main/ant-logging/README.md) The + generalised logging crate used by the autonomi network (backed by the tracing crate). +- [Metrics](https://github.com/maidsafe/autonomi/blob/main/ant-metrics/README.md) The metrics crate + used by the autonomi network. +- [Networking](https://github.com/maidsafe/autonomi/blob/main/ant-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/ant_protocol/README.md) The protocol - used by the safe network. -- [Registers](https://github.com/maidsafe/safe_network/blob/main/ant-registers/README.md) The +- [Protocol](https://github.com/maidsafe/autonomi/blob/main/ant-protocol/README.md) The protocol + used by the autonomi network. +- [Registers](https://github.com/maidsafe/autonomi/blob/main/ant-registers/README.md) The registers crate, used for the Register CRDT data type on the network. -- [Peers Acquisition](https://github.com/maidsafe/safe_network/blob/main/ant_peers_acquisition/README.md) +- [Peers Acquisition](https://github.com/maidsafe/autonomi/blob/main/ant-peers-acquisition/README.md) The peers acquisition crate, or: how the network layer discovers bootstrap peers. -- [Build Info](https://github.com/maidsafe/safe_network/blob/main/ant-build-info/README.md) Small +- [Build Info](https://github.com/maidsafe/autonomi/blob/main/ant-build-info/README.md) Small helper used to get the build/commit versioning info for debug purposes. ### Using a Local Network @@ -297,8 +293,8 @@ Port: 38835 RPC Port: 34416 Multiaddr: /ip4/127.0.0.1/udp/38835/quic-v1/p2p/12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8 PID: 62369 -Data path: /home/<>/.local/share/safe/node/12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8 -Log path: /home/<>/.local/share/safe/node/12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8/logs +Data path: /home/<>/.local/share/autonomi/node/12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8 +Log path: /home/<>/.local/share/autonomi/node/12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8/logs Bin path: target/release/antnode Connected peers: 24 ``` @@ -313,7 +309,7 @@ Node info: ========== RPC endpoint: https://127.0.0.1:34416 Peer Id: 12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8 -Logs dir: /home/<>/.local/share/safe/node/12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8/logs +Logs dir: /home/<>/.local/share/autonomi/node/12D3KooWJ4Yp8CjrbuUyeLDsAgMfCb3GAYMoBvJCRp1axjHr9cf8/logs PID: 62369 Binary version: 0.103.21 Time since last restart: 1614s diff --git a/ant-logging/src/lib.rs b/ant-logging/src/lib.rs index 96056f1724..9a8790a97f 100644 --- a/ant-logging/src/lib.rs +++ b/ant-logging/src/lib.rs @@ -246,8 +246,8 @@ impl LogBuilder { // Get the current timestamp and format it to be human readable let timestamp = chrono::Local::now().format("%Y-%m-%d_%H-%M-%S").to_string(); let path = dir - .join("safe") .join("autonomi") + .join("client") .join("logs") .join(format!("log_{timestamp}")); LogOutputDest::Path(path) diff --git a/ant-metrics/src/main.rs b/ant-metrics/src/main.rs index a7d589fd56..e5a44a660d 100644 --- a/ant-metrics/src/main.rs +++ b/ant-metrics/src/main.rs @@ -55,7 +55,7 @@ struct Labels { fn main() -> Result<()> { let default_log_dir = dirs_next::data_dir() .ok_or_else(|| eyre!("could not obtain data directory path".to_string()))? - .join("safe") + .join("autonomi") .join("node"); let matches = command!() diff --git a/ant-node-manager/README.md b/ant-node-manager/README.md index b937c99c94..e9147ac8be 100644 --- a/ant-node-manager/README.md +++ b/ant-node-manager/README.md @@ -309,7 +309,7 @@ Retrieving latest version for antnode... Downloading antnode version 0.105.3... Download completed: /tmp/f63d3ca8-2b8e-4630-9df5-a13418d5f826/antnode Launching node 1... -Logging to directory: "/home/chris/.local/share/safe/node/12D3KooWPArH2XAw2sapcthNNcJRbbSuUtC3eBZrJtxi8DfcN1Yn/logs" +Logging to directory: "/home/chris/.local/share/autonomi/node/12D3KooWPArH2XAw2sapcthNNcJRbbSuUtC3eBZrJtxi8DfcN1Yn/logs" Node started diff --git a/ant-node-manager/src/add_services/mod.rs b/ant-node-manager/src/add_services/mod.rs index 1387a37dd4..f3b77d4649 100644 --- a/ant-node-manager/src/add_services/mod.rs +++ b/ant-node-manager/src/add_services/mod.rs @@ -161,7 +161,7 @@ pub async fn add_node( let service_antnode_path = service_data_dir_path.join(antnode_file_name.clone()); // For a user mode service, if the user has *not* specified a custom directory and they are - // using the default, e.g., ~/.local/share/safe/node/, an additional "logs" + // using the default, e.g., ~/.local/share/autonomi/node/, an additional "logs" // directory needs to be appended to the path, otherwise the log files will be output at // the same directory where `secret-key` is, which is not what users expect. let default_log_dir_path = get_user_antnode_data_dir()?; diff --git a/ant-node/reactivate_examples/register_inspect.rs b/ant-node/reactivate_examples/register_inspect.rs index d4535ddf79..c24a87ebfa 100644 --- a/ant-node/reactivate_examples/register_inspect.rs +++ b/ant-node/reactivate_examples/register_inspect.rs @@ -69,7 +69,7 @@ // // TODO Follow the issue about this: https://github.com/maidsafe/safe_network/issues/1308 // let root_dir = dirs_next::data_dir() // .ok_or_else(|| eyre!("could not obtain data directory path".to_string()))? -// .join("safe") +// .join("autonomi") // .join("client"); // let wallet = load_account_wallet_or_create_with_mnemonic(&root_dir, None) diff --git a/ant-node/reactivate_examples/registers.rs b/ant-node/reactivate_examples/registers.rs index 251ce42bbc..4f9f7e5fcb 100644 --- a/ant-node/reactivate_examples/registers.rs +++ b/ant-node/reactivate_examples/registers.rs @@ -75,7 +75,7 @@ // // this example to be able to pay for the Register's storage. // let root_dir = dirs_next::data_dir() // .ok_or_else(|| eyre!("could not obtain data directory path".to_string()))? -// .join("safe") +// .join("autonomi") // .join("client"); // let wallet = load_account_wallet_or_create_with_mnemonic(&root_dir, None) diff --git a/ant-node/src/bin/antnode/main.rs b/ant-node/src/bin/antnode/main.rs index db0dd00203..cebbc0857c 100644 --- a/ant-node/src/bin/antnode/main.rs +++ b/ant-node/src/bin/antnode/main.rs @@ -96,9 +96,9 @@ struct Opt { /// `data-dir` is the default value. /// /// The data directory location is platform specific: - /// - Linux: $HOME/.local/share/safe/node//logs - /// - macOS: $HOME/Library/Application Support/safe/node//logs - /// - Windows: C:\Users\\AppData\Roaming\safe\node\\logs + /// - Linux: $HOME/.local/share/autonomi/node//logs + /// - macOS: $HOME/Library/Application Support/autonomi/node//logs + /// - Windows: C:\Users\\AppData\Roaming\autonomi\node\\logs #[expect(rustdoc::invalid_html_tags)] #[clap(long, default_value_t = LogOutputDestArg::DataDir, value_parser = parse_log_output, verbatim_doc_comment)] log_output_dest: LogOutputDestArg, @@ -144,9 +144,9 @@ struct Opt { /// Specify the node's data directory. /// /// If not provided, the default location is platform specific: - /// - Linux: $HOME/.local/share/safe/node/ - /// - macOS: $HOME/Library/Application Support/safe/node/ - /// - Windows: C:\Users\\AppData\Roaming\safe\node\ + /// - Linux: $HOME/.local/share/autonomi/node/ + /// - macOS: $HOME/Library/Application Support/autonomi/node/ + /// - Windows: C:\Users\\AppData\Roaming\autonomi\node\ #[expect(rustdoc::invalid_html_tags)] #[clap(long, verbatim_doc_comment)] root_dir: Option, diff --git a/ant-node/src/lib.rs b/ant-node/src/lib.rs index d692853429..3599e14a7a 100644 --- a/ant-node/src/lib.rs +++ b/ant-node/src/lib.rs @@ -71,9 +71,9 @@ impl RunningNode { /// /// This will either be a value defined by the user, or a default location, plus the peer ID /// appended. The default location is platform specific: - /// - Linux: $HOME/.local/share/safe/node/ - /// - macOS: $HOME/Library/Application Support/safe/node/ - /// - Windows: C:\Users\\AppData\Roaming\safe\node\ + /// - Linux: $HOME/.local/share/autonomi/node/ + /// - macOS: $HOME/Library/Application Support/autonomi/node/ + /// - Windows: C:\Users\\AppData\Roaming\autonomi\node\ #[expect(rustdoc::invalid_html_tags)] pub fn root_dir_path(&self) -> PathBuf { self.root_dir_path.clone() diff --git a/ant-node/src/python.rs b/ant-node/src/python.rs index 930f31b603..954609b830 100644 --- a/ant-node/src/python.rs +++ b/ant-node/src/python.rs @@ -412,9 +412,9 @@ impl AntNode { /// Get the default root directory path for the given peer ID /// This is platform specific: - /// - Linux: $HOME/.local/share/safe/node/ - /// - macOS: $HOME/Library/Application Support/safe/node/ - /// - Windows: C:\Users\\AppData\Roaming\safe\node\ + /// - Linux: $HOME/.local/share/autonomi/node/ + /// - macOS: $HOME/Library/Application Support/autonomi/node/ + /// - Windows: C:\Users\\AppData\Roaming\autonomi\node\ #[allow(clippy::redundant_closure)] #[staticmethod] fn get_default_root_dir(peer_id: Option) -> PyResult { diff --git a/autonomi-cli/README.md b/autonomi-cli/README.md index c51abf2020..7e490029ac 100644 --- a/autonomi-cli/README.md +++ b/autonomi-cli/README.md @@ -50,7 +50,7 @@ Example: Enter password (leave empty for none): Repeat password: Wallet address: 0xaf676aC7C821977506AC9DcE28bFe83fb06938d8 - Stored wallet in: "/Users/macuser/Library/Application Support/safe/autonomi/wallets/0xaf676aC7C821977506AC9DcE28bFe83fb06938d8.encrypted" + Stored wallet in: "/Users/macuser/Library/Application Support/autonomi/client/wallets/0xaf676aC7C821977506AC9DcE28bFe83fb06938d8.encrypted" ``` ### Import a wallet diff --git a/node-launchpad/src/config.rs b/node-launchpad/src/config.rs index 0591ada964..6a16aab547 100644 --- a/node-launchpad/src/config.rs +++ b/node-launchpad/src/config.rs @@ -21,9 +21,9 @@ const CONFIG: &str = include_str!("../.config/config.json5"); /// Where to store the Nodes data. /// -/// If `base_dir` is the primary mount point, we store in "/$HOME/user_data_dir/safe/node". +/// If `base_dir` is the primary mount point, we store in "/$HOME/user_data_dir/autonomi/node". /// -/// if not we store in "/safe/node". +/// if not we store in "/autonomi/node". /// /// If should_create is true, the directory will be created if it doesn't exists. pub fn get_launchpad_nodes_data_dir_path( @@ -43,7 +43,7 @@ pub fn get_launchpad_nodes_data_dir_path( base_dir.clone() }; mount_point.push(data_directory); - mount_point.push("safe"); + mount_point.push("autonomi"); mount_point.push("node"); if should_create { debug!("Creating nodes data dir: {:?}", mount_point.as_path()); @@ -69,7 +69,7 @@ pub fn get_launchpad_nodes_data_dir_path( pub fn get_launchpad_data_dir_path() -> Result { let mut home_dirs = dirs_next::data_dir().ok_or_else(|| eyre!("Data directory is not obtainable"))?; - home_dirs.push("safe"); + home_dirs.push("autonomi"); home_dirs.push("launchpad"); std::fs::create_dir_all(home_dirs.as_path())?; Ok(home_dirs) diff --git a/resources/scripts/get-foundation-cash.sh b/resources/scripts/get-foundation-cash.sh index ef13ff9e59..64eff307d0 100755 --- a/resources/scripts/get-foundation-cash.sh +++ b/resources/scripts/get-foundation-cash.sh @@ -19,6 +19,6 @@ fi exit 1 fi -scp root@$FOUNDATION_SERVER:/home/safe/.local/share/safe/test_faucet/wallet/foundation_disbursement.transfer $TMPDIR/foundation.transfer +scp root@$FOUNDATION_SERVER:/home/safe/.local/share/autonomi/test_faucet/wallet/foundation_disbursement.transfer $TMPDIR/foundation.transfer safe --peer $2 wallet receive $TMPDIR/foundation.transfer --file safe wallet balance