diff --git a/networks.autogenerated.json b/networks.autogenerated.json index e79fe97..2a6811e 100644 --- a/networks.autogenerated.json +++ b/networks.autogenerated.json @@ -2,19 +2,19 @@ "cosmos-hub": { "devnet": { "ACCOUNT_PREFIX": "cosmos", - "BASE_DIR": ".", + "BASE_DIR": "$HOME/.", "BINARY": "gaiad", "BLOCK_SECONDS": 6, - "CHAIN_DATA": "./.gaiad", - "CHAIN_DIR": "./.gaiad", + "CHAIN_DATA": "$HOME/./.gaiad", + "CHAIN_DIR": "$HOME/./.gaiad", "CHAIN_ID": "cosmos-hub-dev", - "CONFIG_FOLDER": "./.gaiad/config", + "CONFIG_FOLDER": "$HOME/./.gaiad/config", "CONSENSUS_GRPC_PORT": 39095, "CONSENSUS_RPC_PORT": 38095, "FEE": "uatom", "GRPCPORT": 19095, "GRPCWEB": 20096, - "KEYRING_TEST": "./.gaiad", + "KEYRING_TEST": "$HOME/./.gaiad", "NETWORK_ID": 5, "NODE": "https://127.0.0.1:26662", "P2PPORT": 26761, @@ -38,9 +38,9 @@ }, "devnet": { "directories": { - "DATA_DIRECTORY": ".", + "DATA_DIRECTORY": "$HOME/.", "HOME": "$HOME/.devnet", - "LOG_DIRECTORY": "." + "LOG_DIRECTORY": "$HOME/." }, "mnemonics": { "ALICE": "document prefer nurse marriage flavor cheese west when knee drink sorry minimum thunder tilt cherry behave cute stove elder couch badge gown coral expire", @@ -67,14 +67,14 @@ "neutron": { "devnet": { "ACCOUNT_PREFIX": "neutron", - "BASE_DIR": ".", + "BASE_DIR": "$HOME/.", "BINARY": "neutrond", "BLOCK_SECONDS": 6, "CHAINID": "neutron-dev", - "CHAIN_DATA": "./.neutrond", - "CHAIN_DIR": "./.neutrond", + "CHAIN_DATA": "$HOME/./.neutrond", + "CHAIN_DIR": "$HOME/./.neutrond", "CHAIN_ID": "neutron-dev", - "CONFIG_FOLDER": "./.neutrond/config", + "CONFIG_FOLDER": "$HOME/./.neutrond/config", "CONSENSUS_GRPC_PORT": 39094, "CONSENSUS_RPC_PORT": 38094, "FEE": "untrn", @@ -82,7 +82,7 @@ "GRPCWEB": 20095, "IBCATOMDENOM": "uibcatom", "IBCUSDCDENOM": "uibcusdc", - "KEYRING_TEST": "./.neutrond", + "KEYRING_TEST": "$HOME/./.neutrond", "NETWORK_ID": 4, "NODE": "tcp://127.0.0.1:38094", "P2PPORT": 26760, @@ -111,15 +111,15 @@ "ACCOUNT_PREFIX": "osmo", "BINARY": "osmosisd", "BLOCK_SECONDS": 5, - "CHAIN_DATA": ".osmosisd", + "CHAIN_DATA": "$HOME/./.osmosisd", "CHAIN_ID": "osmosis-dev", - "CONFIG_FOLDER": ".osmosisd/config", + "CONFIG_FOLDER": "$HOME/./.osmosisd/config", "CONSENSUS_GRPC_PORT": 39093, "CONSENSUS_RPC_PORT": 38093, "FEE": "uosmo", "GRPCPORT": 19093, "GRPCWEB": 20094, - "KEYRING_TEST": ".osmosisd", + "KEYRING_TEST": "$HOME/./.osmosisd", "NETWORK_ID": 3, "NODE": "tcp://127.0.0.1:38093", "P2PPORT": 26759, @@ -160,7 +160,7 @@ "devnet": { "CHAIN_ID_A": "centauri-dev", "CHAIN_ID_B": "osmosis-dev", - "RELAY_DATA": "./osmosis-centauri", + "RELAY_DATA": "$HOME/./osmosis-centauri", "REST_PORT": 31066, "TELEMETRY_PORT": 30142 } @@ -168,21 +168,21 @@ "pica": { "devnet": { "ACCOUNT_PREFIX": "centauri", - "BASE_DIR": ".", + "BASE_DIR": "$HOME/.", "BINARY": "centaurid", "BLOCK_SECONDS": 5, - "CHAIN_DATA": ".banksy", - "CHAIN_DIR": ".banksy", + "CHAIN_DATA": "$HOME/./.banksy", + "CHAIN_DIR": "$HOME/./.banksy", "CHAIN_DIR_NAME": ".banksy", "CHAIN_ID": "centauri-dev", - "CONFIG_FOLDER": ".banksy/config", + "CONFIG_FOLDER": "$HOME/./.banksy/config", "CONSENSUS_GRPC_PORT": 27657, "CONSENSUS_RPC_PORT": 26657, "FEE": "ppica", "GRPCPORT": 9090, "GRPWEB": 9091, - "KEYRING_TEST": ".banksy", - "LOG_DIRECTORY": ".banksy/logs", + "KEYRING_TEST": "$HOME/./.banksy", + "LOG_DIRECTORY": "$HOME/./.banksy/logs", "NETWORK_ID": 2, "NODE": "tcp://127.0.0.1:26657", "RESTPORT": 1516 diff --git a/networks/cosmos-hub.nix b/networks/cosmos-hub.nix index f1f9f38..a96bba0 100644 --- a/networks/cosmos-hub.nix +++ b/networks/cosmos-hub.nix @@ -25,7 +25,7 @@ in CONSENSUS_GRPC_PORT = 39090 + self.NETWORK_ID; CONSENSUS_RPC_PORT = 38090 + self.NETWORK_ID; GRPCWEB = 20091 + self.NETWORK_ID; - BASE_DIR = "."; + BASE_DIR = devnet.directories.DATA_DIRECTORY; CHAIN_DATA = "${BASE_DIR}/.gaiad"; CONFIG_FOLDER = "${CHAIN_DATA}/config"; CHAIN_DIR = CHAIN_DATA; diff --git a/networks/default.nix b/networks/default.nix index 0254389..bb17903 100644 --- a/networks/default.nix +++ b/networks/default.nix @@ -2,8 +2,8 @@ rec { devnet = { directories = { HOME= "$HOME/.devnet"; - DATA_DIRECTORY = "."; - LOG_DIRECTORY = "."; + DATA_DIRECTORY = "$HOME/."; + LOG_DIRECTORY = "$HOME/."; }; mnemonics = { # action from usual users diff --git a/networks/neutron.nix b/networks/neutron.nix index 6e0d34f..e901298 100644 --- a/networks/neutron.nix +++ b/networks/neutron.nix @@ -8,7 +8,7 @@ let ACCOUNT_PREFIX = "neutron"; }; devnetTemplate = self: rec { - BASE_DIR = "."; + BASE_DIR = devnet.directories.DATA_DIRECTORY; CHAIN_DATA = "${BASE_DIR}/.neutrond"; CHAIN_DIR = CHAIN_DATA; KEYRING_TEST = CHAIN_DATA; diff --git a/networks/osmosis-centauri.nix b/networks/osmosis-centauri.nix index 9eddee3..c1aea46 100644 --- a/networks/osmosis-centauri.nix +++ b/networks/osmosis-centauri.nix @@ -3,7 +3,7 @@ devnet = rec { TELEMETRY_PORT = 30142; REST_PORT = 31066; - RELAY_DATA = "./osmosis-centauri"; + RELAY_DATA = "${devnet.directories.DATA_DIRECTORY}/osmosis-centauri"; CHAIN_ID_A = chain_a.devnet.CHAIN_ID; CHAIN_ID_B = chain_b.devnet.CHAIN_ID; }; diff --git a/networks/osmosis.nix b/networks/osmosis.nix index 97e8fe1..4b41571 100644 --- a/networks/osmosis.nix +++ b/networks/osmosis.nix @@ -12,12 +12,13 @@ in DIR = "prod/.osmosisd"; BINARY = "osmosisd"; BLOCK_SECONDS = 6; - NODE = "https://rpc.osmosis.zone:443"; + NODE = "https://rpc.osmosis.zone:443"; + }; devnet = self // rec { BINARY = "osmosisd"; BLOCK_SECONDS = 5; - CHAIN_DATA = ".osmosisd"; + CHAIN_DATA = "${devnet.directories.DATA_DIRECTORY}/.osmosisd"; CHAIN_ID = "osmosis-dev"; CONFIG_FOLDER = "${CHAIN_DATA}/config"; CONSENSUS_GRPC_PORT = 39090 + self.NETWORK_ID; diff --git a/networks/pica.nix b/networks/pica.nix index 4ec3f4f..700b72c 100644 --- a/networks/pica.nix +++ b/networks/pica.nix @@ -24,11 +24,11 @@ in BLOCK_TIME = 7; }; devnet = self // rec { - LOG_DIRECTORY="${CHAIN_DIR_NAME}/logs"; - BASE_DIR = "."; + LOG_DIRECTORY="${devnet.directories.LOG_DIRECTORY}/${CHAIN_DIR_NAME}/logs"; + BASE_DIR = devnet.directories.DATA_DIRECTORY; CHAIN_DIR_NAME = ".banksy"; BLOCK_SECONDS=5; - CHAIN_DATA = CHAIN_DIR_NAME; + CHAIN_DATA = "${BASE_DIR}/${CHAIN_DIR_NAME}"; CHAIN_DIR = CHAIN_DATA; CONFIG_FOLDER = "${CHAIN_DATA}/config"; KEYRING_TEST = CHAIN_DATA;