Update networks client setup

ComposableFi · Mar 22, 2024 · 7483e0e · 7483e0e
1 parent 09b1ca7
commit 7483e0e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 39 deletions.
diff --git a/networks.autogenerated.json b/networks.autogenerated.json
@@ -2,20 +2,19 @@
   "cosmos-hub": {
     "devnet": {
       "ACCOUNT_PREFIX": "cosmos",
-      "BASE_DIR": "$HOME/.devnet",
+      "BASE_DIR": ".",
       "BINARY": "gaiad",
       "BLOCK_SECONDS": 6,
-      "CHAIN_DATA": "$HOME/.devnet/.gaiad",
-      "CHAIN_DIR": "$HOME/.devnet/.gaiad",
+      "CHAIN_DATA": "./.gaiad",
+      "CHAIN_DIR": "./.gaiad",
       "CHAIN_ID": "cosmos-hub-dev",
-      "CONFIG_FOLDER": "$HOME/.devnet/.gaiad/config",
+      "CONFIG_FOLDER": "./.gaiad/config",
       "CONSENSUS_GRPC_PORT": 39095,
       "CONSENSUS_RPC_PORT": 38095,
       "FEE": "uatom",
       "GRPCPORT": 19095,
       "GRPCWEB": 20096,
-      "HOME": "$HOME/.devnet",
-      "KEYRING_TEST": "$HOME/.devnet/.gaiad",
+      "KEYRING_TEST": "./.gaiad",
       "NETWORK_ID": 5,
       "NODE": "https://127.0.0.1:26662",
       "P2PPORT": 26761,
@@ -67,23 +66,22 @@
   "neutron": {
     "devnet": {
       "ACCOUNT_PREFIX": "neutron",
-      "BASE_DIR": "$HOME/.devnet",
+      "BASE_DIR": ".",
       "BINARY": "neutrond",
       "BLOCK_SECONDS": 6,
       "CHAINID": "neutron-dev",
-      "CHAIN_DATA": "$HOME/.devnet/.neutrond",
-      "CHAIN_DIR": "$HOME/.devnet/.neutrond",
+      "CHAIN_DATA": "./.neutrond",
+      "CHAIN_DIR": "./.neutrond",
       "CHAIN_ID": "neutron-dev",
-      "CONFIG_FOLDER": "$HOME/.devnet/.neutrond/config",
+      "CONFIG_FOLDER": "./.neutrond/config",
       "CONSENSUS_GRPC_PORT": 39094,
       "CONSENSUS_RPC_PORT": 38094,
       "FEE": "untrn",
       "GRPCPORT": 19094,
       "GRPCWEB": 20095,
-      "HOME": "$HOME/.devnet",
       "IBCATOMDENOM": "uibcatom",
       "IBCUSDCDENOM": "uibcusdc",
-      "KEYRING_TEST": "$HOME/.devnet/.neutrond",
+      "KEYRING_TEST": "./.neutrond",
       "NETWORK_ID": 4,
       "NODE": "tcp://127.0.0.1:38094",
       "P2PPORT": 26760,
@@ -112,16 +110,16 @@
       "ACCOUNT_PREFIX": "osmo",
       "BINARY": "osmosisd",
       "BLOCK_SECONDS": 5,
-      "CHAIN_DATA": "$HOME/.devnet/.osmosisd",
+      "CHAIN_DATA": ".osmosisd",
       "CHAIN_ID": "osmosis-dev",
-      "CONFIG_FOLDER": "$HOME/.devnet/.osmosisd/config",
+      "CONFIG_FOLDER": ".osmosisd/config",
       "CONSENSUS_GRPC_PORT": 39093,
       "CONSENSUS_RPC_PORT": 38093,
       "FEE": "uosmo",
       "GRPCPORT": 19093,
       "GRPCWEB": 20094,
       "HOME": "$HOME/.devnet",
-      "KEYRING_TEST": "$HOME/.devnet/.osmosisd",
+      "KEYRING_TEST": ".osmosisd",
       "NETWORK_ID": 3,
       "NODE": "tcp://127.0.0.1:38093",
       "P2PPORT": 26759,
@@ -134,7 +132,6 @@
       "BINARY": "osmosisd",
       "BLOCK_SECONDS": 6,
       "CHAIN_ID": "osmosis-1",
-      "CVM_OUTPOST_CONTRACT_ADDRESS": "osmo1sy7pdmawyerekcl6xwz4v2p87j726auntcu48fvhsy24rkhv7n4s9yg267",
       "DIR": "prod/.osmosisd",
       "FEE": "uosmo",
       "NETWORK_ID": 3,
@@ -172,22 +169,21 @@
   "pica": {
     "devnet": {
       "ACCOUNT_PREFIX": "centauri",
-      "BASE_DIR": "$HOME/.devnet",
+      "BASE_DIR": ".",
       "BINARY": "centaurid",
       "BLOCK_SECONDS": 5,
-      "CHAIN_DATA": "$HOME/.devnet/.banksy",
-      "CHAIN_DIR": "$HOME/.devnet/.banksy",
+      "CHAIN_DATA": ".banksy",
+      "CHAIN_DIR": ".banksy",
       "CHAIN_DIR_NAME": ".banksy",
       "CHAIN_ID": "centauri-dev",
-      "CONFIG_FOLDER": "$HOME/.devnet/.banksy/config",
+      "CONFIG_FOLDER": ".banksy/config",
       "CONSENSUS_GRPC_PORT": 27657,
       "CONSENSUS_RPC_PORT": 26657,
       "FEE": "ppica",
       "GRPCPORT": 9090,
       "GRPWEB": 9091,
-      "HOME": "$HOME/.devnet",
-      "KEYRING_TEST": "$HOME/.devnet/.banksy",
-      "LOG_DIRECTORY": "$HOME/.devnet/.banksy/logs",
+      "KEYRING_TEST": ".banksy",
+      "LOG_DIRECTORY": ".banksy/logs",
       "NETWORK_ID": 2,
       "NODE": "tcp://127.0.0.1:26657",
       "RESTPORT": 1516
@@ -197,7 +193,6 @@
       "BINARY": "centaurid",
       "BLOCK_TIME": 7,
       "CHAIN_ID": "centauri-1",
-      "CVM_OUTPOST_CONTRACT_ADDRESS": "centauri1vlh6knyx870k2mc9fspx08ka4fuddsxx6s8tjp83n7xkyckkgm8q25mwr6",
       "DIR": "prod/.banksy",
       "FEE": "ppica",
       "GRPC": "http://composable-grpc.polkachu.com:22290",

diff --git a/networks/cosmos-hub.nix b/networks/cosmos-hub.nix
@@ -25,9 +25,8 @@ in
     CONSENSUS_GRPC_PORT = 39090 + self.NETWORK_ID;
     CONSENSUS_RPC_PORT = 38090 + self.NETWORK_ID;
     GRPCWEB = 20091 + self.NETWORK_ID;
-    HOME = "${devnet.directories.DEVNET_DATA_DIRECTORY}";
-    BASE_DIR = HOME;
-    CHAIN_DATA = "${HOME}/.gaiad";
+    BASE_DIR = ".";
+    CHAIN_DATA = "${BASE_DIR}/.gaiad";
     CONFIG_FOLDER = "${CHAIN_DATA}/config";
     CHAIN_DIR = CHAIN_DATA;
     KEYRING_TEST = CHAIN_DATA;

diff --git a/networks/neutron.nix b/networks/neutron.nix
@@ -8,9 +8,8 @@ let
     ACCOUNT_PREFIX = "neutron";
   };
   devnetTemplate = self: rec {
-    HOME = "${devnet.directories.DEVNET_DATA_DIRECTORY}";
-    BASE_DIR = HOME;
-    CHAIN_DATA = "${HOME}/.neutrond";
+    BASE_DIR = ".";
+    CHAIN_DATA = "${BASE_DIR}/.neutrond";
     CHAIN_DIR = CHAIN_DATA;
     KEYRING_TEST = CHAIN_DATA;
     CHAINID = CHAIN_ID;

diff --git a/networks/osmosis.nix b/networks/osmosis.nix
@@ -12,14 +12,12 @@ in
     DIR = "prod/.osmosisd";
     BINARY = "osmosisd";
     BLOCK_SECONDS = 6;
-    NODE = "https://rpc.osmosis.zone:443";    
-    CVM_OUTPOST_CONTRACT_ADDRESS = "osmo1sy7pdmawyerekcl6xwz4v2p87j726auntcu48fvhsy24rkhv7n4s9yg267";
-
+    NODE = "https://rpc.osmosis.zone:443";        
   };
   devnet = self // rec {
     BINARY = "osmosisd";
     BLOCK_SECONDS = 5;
-    CHAIN_DATA = "${HOME}/.osmosisd";
+    CHAIN_DATA = ".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
@@ -16,7 +16,6 @@ in
     RPC = https://composable-rpc.polkachu.com:443;
     GRPC_SECURE = https://composable-grpc.polkachu.com:22290;
     GRPC = http://composable-grpc.polkachu.com:22290;
-    CVM_OUTPOST_CONTRACT_ADDRESS = "centauri1vlh6knyx870k2mc9fspx08ka4fuddsxx6s8tjp83n7xkyckkgm8q25mwr6";
   };
   testnet = self // {
     CHAIN_ID = "banksy-testnet-3";
@@ -25,12 +24,11 @@ in
     BLOCK_TIME = 7;
   };
   devnet = self // rec {
-    HOME = "${devnet.directories.DEVNET_DATA_DIRECTORY}";
-    LOG_DIRECTORY="${devnet.directories.DEVNET_LOG_DIRECTORY}/.banksy/logs";
-    BASE_DIR = HOME;
+    LOG_DIRECTORY="${CHAIN_DIR_NAME}/logs";
+    BASE_DIR = ".";
     CHAIN_DIR_NAME = ".banksy";
     BLOCK_SECONDS=5;
-    CHAIN_DATA = "${HOME}/${CHAIN_DIR_NAME}";
+    CHAIN_DATA = CHAIN_DIR_NAME;
     CHAIN_DIR = CHAIN_DATA;
     CONFIG_FOLDER = "${CHAIN_DATA}/config";
     KEYRING_TEST = CHAIN_DATA;