Skip to content

ledger: change default folder to .namada #631

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.

Sign up for GitHub

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

Closed
Fraccaman wants to merge 3 commits into from
Closed

ledger: change default folder to .namada #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30fba16
fix: change .anoma to .namada
Oct 18, 2022
e648ae2
ledger: revert env
Oct 19, 2022
d67308c
now works and can be merged without issues i believe
bengtlofgren Oct 19, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-bridge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ jobs:
name: logs-e2e${{ matrix.make.suffix }}-${{ github.sha }}
path: |
/tmp/.*/logs/
/tmp/.*/e2e-test.*/setup/validator-*/.anoma/logs/*.log
/tmp/.*/e2e-test.*/setup/validator-*/.namada/logs/*.log
retention-days: 5
- name: Print sccache stats
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ jobs:
name: logs-e2e${{ matrix.make.suffix }}-${{ github.sha }}
path: |
/tmp/.*/logs/
/tmp/.*/e2e-test.*/setup/validator-*/.anoma/logs/*.log
/tmp/.*/e2e-test.*/setup/validator-*/.namada/logs/*.log
retention-days: 5
- name: Print sccache stats
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Anoma default home dir
/.anoma
# Namada default home dir
/.namada

# Generated by Cargo
# will have compiled files and executables
Expand Down
2 changes: 1 addition & 1 deletion apps/src/lib/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,7 @@ pub mod args {
configuration and state is stored. This value can also \
be set via `ANOMA_BASE_DIR` environment variable, but \
the argument takes precedence, if specified. Defaults to \
`.anoma`.",
`.namada`.",
))
.arg(WASM_DIR.def().about(
"Directory with built WASM validity predicates, \
Expand Down
9 changes: 9 additions & 0 deletions apps/src/lib/client/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ pub async fn join_network(
} else {
(PathBuf::from_str(".").unwrap(), false)
};

// For compatibility for releases created with ".anoma" base-dir
let old_base_dir = unpack_dir.join(".anoma");
if old_base_dir.exists() {
fs::rename(&old_base_dir, unpack_dir.join(config::DEFAULT_BASE_DIR))
.await
.unwrap();
}

archive.unpack(&unpack_dir).unwrap();

// Rename the base-dir from the default and rename wasm-dir, if non-default.
Expand Down
2 changes: 1 addition & 1 deletion apps/src/lib/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use thiserror::Error;
use crate::cli;

/// Base directory contains global config and chain directories.
pub const DEFAULT_BASE_DIR: &str = ".anoma";
pub const DEFAULT_BASE_DIR: &str = ".namada";
/// Default WASM dir.
pub const DEFAULT_WASM_DIR: &str = "wasm";
/// The WASM checksums file contains the hashes of built WASMs. It is inside the
Expand Down
2 changes: 1 addition & 1 deletion docker/namada/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ WORKDIR /app
RUN git clone -b v0.1.1-abcipp --single-branch https://github.com/heliaxdev/tendermint.git && cd tendermint && make build

FROM debian:bullseye-slim AS runtime
ENV ANOMA_BASE_DIR=/.anoma
Copy link
Contributor

@juped juped Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think it's a BASE_DIR not a BASE_NADIR

ENV ANOMA_BASE_NADIR=/.namada
ENV ANOMA_LOG_COLOR=false

RUN apt-get update && apt-get install libcurl4-openssl-dev -y && apt-get clean
Expand Down
2 changes: 1 addition & 1 deletion documentation/docs/src/user-guide/ledger.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Note that you need to have [joined a network](./getting-started.md) before you s

The node will attempt to connect to the persistent validator nodes and other peers in the network, and synchronize to the latest block.

By default, the ledger will store its configuration and state in the `.anoma` directory relative to the current working directory. You can use the `--base-dir` CLI global argument or `ANOMA_BASE_DIR` environment variable to change it.
By default, the ledger will store its configuration and state in the `.namada` directory relative to the current working directory. You can use the `--base-dir` CLI global argument or `ANOMA_BASE_DIR` environment variable to change it.

The ledger also needs access to the built WASM files that are used in the genesis block. These files are included in release and shouldn't be modified, otherwise your node will fail with a consensus error on the genesis block. By default, these are expected to be in the `wasm` directory, relative to the current working directory. This can also be set with the `--wasm-dir` CLI global argument, `ANOMA_WASM_DIR` environment variable or the configuration file.

Expand Down