From b154234e0e1d27288f9a23ca142c047b6c708cd1 Mon Sep 17 00:00:00 2001 From: Shreerang Kale Date: Fri, 23 May 2025 09:56:45 +0530 Subject: [PATCH 1/2] Add zenith stage1 default network --- .env.example | 3 ++- src/utils/constants.ts | 14 +++++++++++++- .../compose/docker-compose-laconic-wallet-web.yml | 3 ++- stack/stack-orchestrator/config/app/run.sh | 6 ++++-- .../stack/laconic-wallet-web/README.md | 7 +++++-- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index 7171052..9d770e8 100644 --- a/.env.example +++ b/.env.example @@ -5,7 +5,8 @@ REACT_APP_DEFAULT_GAS_PRICE=0.025 REACT_APP_GAS_ADJUSTMENT=2 REACT_APP_LACONICD_RPC_URL=https://laconicd-sapo.laconic.com -REACT_APP_ZENITHD_RPC_URL= +REACT_APP_ZENITHD_STAGE0_RPC_URL= +REACT_APP_ZENITHD_STAGE1_RPC_URL= # Example: https://example-url-1.com,https://example-url-2.com REACT_APP_ALLOWED_URLS= diff --git a/src/utils/constants.ts b/src/utils/constants.ts index eacb04c..d1c08ba 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -22,7 +22,19 @@ export const DEFAULT_NETWORKS: NetworksFormData[] = [ chainId: 'zenith-testnet-stage0', networkName: 'zenithd stage 0 testnet', namespace: COSMOS, - rpcUrl: process.env.REACT_APP_ZENITHD_RPC_URL || '', + rpcUrl: process.env.REACT_APP_ZENITHD_STAGE0_RPC_URL || '', + blockExplorerUrl: '', + nativeDenom: 'znt', + addressPrefix: 'zenith', + coinType: '118', + gasPrice: '0.01', + isDefault: true, + }, + { + chainId: 'zenith-testnet-stage1', + networkName: 'zenithd stage 1 testnet', + namespace: COSMOS, + rpcUrl: process.env.REACT_APP_ZENITHD_STAGE1_RPC_URL || '', blockExplorerUrl: '', nativeDenom: 'znt', addressPrefix: 'zenith', diff --git a/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml b/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml index b253f2c..56d501a 100644 --- a/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml +++ b/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml @@ -10,7 +10,8 @@ services: CERC_DEFAULT_GAS_PRICE: ${CERC_DEFAULT_GAS_PRICE:-0.025} CERC_GAS_ADJUSTMENT: ${CERC_GAS_ADJUSTMENT:-2} CERC_LACONICD_RPC_URL: ${CERC_LACONICD_RPC_URL:-https://laconicd.laconic.com} - CERC_ZENITHD_RPC_URL: ${CERC_ZENITHD_RPC_URL} + CERC_ZENITHD_STAGE0_RPC_URL: ${CERC_ZENITHD_STAGE0_RPC_URL} + CERC_ZENITHD_STAGE1_RPC_URL: ${CERC_ZENITHD_STAGE1_RPC_URL} CERC_ALLOWED_URLS: ${CERC_ALLOWED_URLS} command: ["bash", "/scripts/run.sh"] volumes: diff --git a/stack/stack-orchestrator/config/app/run.sh b/stack/stack-orchestrator/config/app/run.sh index a5c3ed1..bb59bda 100755 --- a/stack/stack-orchestrator/config/app/run.sh +++ b/stack/stack-orchestrator/config/app/run.sh @@ -10,7 +10,8 @@ echo "WALLET_CONNECT_ID: ${WALLET_CONNECT_ID}" echo "CERC_DEFAULT_GAS_PRICE: ${CERC_DEFAULT_GAS_PRICE}" echo "CERC_GAS_ADJUSTMENT: ${CERC_GAS_ADJUSTMENT}" echo "CERC_LACONICD_RPC_URL: ${CERC_LACONICD_RPC_URL}" -echo "CERC_ZENITHD_RPC_URL: ${CERC_ZENITHD_RPC_URL}" +echo "CERC_ZENITHD_STAGE0_RPC_URL: ${CERC_ZENITHD_STAGE0_RPC_URL}" +echo "CERC_ZENITHD_STAGE1_RPC_URL: ${CERC_ZENITHD_STAGE1_RPC_URL}" echo "CERC_ALLOWED_URLS: ${CERC_ALLOWED_URLS}" # Build with required env @@ -18,7 +19,8 @@ REACT_APP_WALLET_CONNECT_PROJECT_ID=$WALLET_CONNECT_ID \ REACT_APP_DEFAULT_GAS_PRICE=$CERC_DEFAULT_GAS_PRICE \ REACT_APP_GAS_ADJUSTMENT=$CERC_GAS_ADJUSTMENT \ REACT_APP_LACONICD_RPC_URL=$CERC_LACONICD_RPC_URL \ -REACT_APP_ZENITHD_RPC_URL=$CERC_ZENITHD_RPC_URL \ +REACT_APP_ZENITHD_STAGE0_RPC_URL=$CERC_ZENITHD_STAGE0_RPC_URL \ +REACT_APP_ZENITHD_STAGE1_RPC_URL=$CERC_ZENITHD_STAGE1_RPC_URL \ REACT_APP_ALLOWED_URLS=$CERC_ALLOWED_URLS \ yarn build diff --git a/stack/stack-orchestrator/stack/laconic-wallet-web/README.md b/stack/stack-orchestrator/stack/laconic-wallet-web/README.md index 4bf8d47..3a491e7 100644 --- a/stack/stack-orchestrator/stack/laconic-wallet-web/README.md +++ b/stack/stack-orchestrator/stack/laconic-wallet-web/README.md @@ -67,8 +67,11 @@ Instructions for running the `laconic-wallet-web` using [laconic-so](https://git # RPC endpoint of laconicd node (default: https://laconicd.laconic.com) CERC_LACONICD_RPC_URL= - # RPC endpoint of zenithd node - CERC_ZENITHD_RPC_URL= + # Zenith RPC endpoint + # Stage 0 + CERC_ZENITHD_STAGE0_RPC_URL= + # Stage 1 + CERC_ZENITHD_STAGE1_RPC_URL= ``` ## Start the deployment -- 2.45.2 From 5283781f08abc7027eb259e66ecda54e4995d25f Mon Sep 17 00:00:00 2001 From: Shreerang Kale Date: Fri, 23 May 2025 15:48:35 +0530 Subject: [PATCH 2/2] Update rpc url env variable --- .env.example | 3 +-- src/utils/constants.ts | 4 ++-- .../compose/docker-compose-laconic-wallet-web.yml | 3 +-- stack/stack-orchestrator/config/app/run.sh | 6 ++---- stack/stack-orchestrator/stack/laconic-wallet-web/README.md | 5 +---- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index 9d770e8..7171052 100644 --- a/.env.example +++ b/.env.example @@ -5,8 +5,7 @@ REACT_APP_DEFAULT_GAS_PRICE=0.025 REACT_APP_GAS_ADJUSTMENT=2 REACT_APP_LACONICD_RPC_URL=https://laconicd-sapo.laconic.com -REACT_APP_ZENITHD_STAGE0_RPC_URL= -REACT_APP_ZENITHD_STAGE1_RPC_URL= +REACT_APP_ZENITHD_RPC_URL= # Example: https://example-url-1.com,https://example-url-2.com REACT_APP_ALLOWED_URLS= diff --git a/src/utils/constants.ts b/src/utils/constants.ts index d1c08ba..0039548 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -22,7 +22,7 @@ export const DEFAULT_NETWORKS: NetworksFormData[] = [ chainId: 'zenith-testnet-stage0', networkName: 'zenithd stage 0 testnet', namespace: COSMOS, - rpcUrl: process.env.REACT_APP_ZENITHD_STAGE0_RPC_URL || '', + rpcUrl: process.env.REACT_APP_ZENITHD_RPC_URL || '', blockExplorerUrl: '', nativeDenom: 'znt', addressPrefix: 'zenith', @@ -34,7 +34,7 @@ export const DEFAULT_NETWORKS: NetworksFormData[] = [ chainId: 'zenith-testnet-stage1', networkName: 'zenithd stage 1 testnet', namespace: COSMOS, - rpcUrl: process.env.REACT_APP_ZENITHD_STAGE1_RPC_URL || '', + rpcUrl: process.env.REACT_APP_ZENITHD_RPC_URL || '', blockExplorerUrl: '', nativeDenom: 'znt', addressPrefix: 'zenith', diff --git a/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml b/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml index 56d501a..b253f2c 100644 --- a/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml +++ b/stack/stack-orchestrator/compose/docker-compose-laconic-wallet-web.yml @@ -10,8 +10,7 @@ services: CERC_DEFAULT_GAS_PRICE: ${CERC_DEFAULT_GAS_PRICE:-0.025} CERC_GAS_ADJUSTMENT: ${CERC_GAS_ADJUSTMENT:-2} CERC_LACONICD_RPC_URL: ${CERC_LACONICD_RPC_URL:-https://laconicd.laconic.com} - CERC_ZENITHD_STAGE0_RPC_URL: ${CERC_ZENITHD_STAGE0_RPC_URL} - CERC_ZENITHD_STAGE1_RPC_URL: ${CERC_ZENITHD_STAGE1_RPC_URL} + CERC_ZENITHD_RPC_URL: ${CERC_ZENITHD_RPC_URL} CERC_ALLOWED_URLS: ${CERC_ALLOWED_URLS} command: ["bash", "/scripts/run.sh"] volumes: diff --git a/stack/stack-orchestrator/config/app/run.sh b/stack/stack-orchestrator/config/app/run.sh index bb59bda..a5c3ed1 100755 --- a/stack/stack-orchestrator/config/app/run.sh +++ b/stack/stack-orchestrator/config/app/run.sh @@ -10,8 +10,7 @@ echo "WALLET_CONNECT_ID: ${WALLET_CONNECT_ID}" echo "CERC_DEFAULT_GAS_PRICE: ${CERC_DEFAULT_GAS_PRICE}" echo "CERC_GAS_ADJUSTMENT: ${CERC_GAS_ADJUSTMENT}" echo "CERC_LACONICD_RPC_URL: ${CERC_LACONICD_RPC_URL}" -echo "CERC_ZENITHD_STAGE0_RPC_URL: ${CERC_ZENITHD_STAGE0_RPC_URL}" -echo "CERC_ZENITHD_STAGE1_RPC_URL: ${CERC_ZENITHD_STAGE1_RPC_URL}" +echo "CERC_ZENITHD_RPC_URL: ${CERC_ZENITHD_RPC_URL}" echo "CERC_ALLOWED_URLS: ${CERC_ALLOWED_URLS}" # Build with required env @@ -19,8 +18,7 @@ REACT_APP_WALLET_CONNECT_PROJECT_ID=$WALLET_CONNECT_ID \ REACT_APP_DEFAULT_GAS_PRICE=$CERC_DEFAULT_GAS_PRICE \ REACT_APP_GAS_ADJUSTMENT=$CERC_GAS_ADJUSTMENT \ REACT_APP_LACONICD_RPC_URL=$CERC_LACONICD_RPC_URL \ -REACT_APP_ZENITHD_STAGE0_RPC_URL=$CERC_ZENITHD_STAGE0_RPC_URL \ -REACT_APP_ZENITHD_STAGE1_RPC_URL=$CERC_ZENITHD_STAGE1_RPC_URL \ +REACT_APP_ZENITHD_RPC_URL=$CERC_ZENITHD_RPC_URL \ REACT_APP_ALLOWED_URLS=$CERC_ALLOWED_URLS \ yarn build diff --git a/stack/stack-orchestrator/stack/laconic-wallet-web/README.md b/stack/stack-orchestrator/stack/laconic-wallet-web/README.md index 3a491e7..ba2b399 100644 --- a/stack/stack-orchestrator/stack/laconic-wallet-web/README.md +++ b/stack/stack-orchestrator/stack/laconic-wallet-web/README.md @@ -68,10 +68,7 @@ Instructions for running the `laconic-wallet-web` using [laconic-so](https://git CERC_LACONICD_RPC_URL= # Zenith RPC endpoint - # Stage 0 - CERC_ZENITHD_STAGE0_RPC_URL= - # Stage 1 - CERC_ZENITHD_STAGE1_RPC_URL= + CERC_ZENITHD_RPC_URL= ``` ## Start the deployment -- 2.45.2