From afc86a5c09a5ff22ce70f2fb159ba0965582422c Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Fri, 17 May 2024 09:52:00 +0530 Subject: [PATCH] Update azimuth watchers stack --- .../docker-compose-watcher-azimuth.yml | 64 +++++++++---------- .../watcher-azimuth/start-job-runner.sh | 11 ++-- .../config/watcher-azimuth/start-server.sh | 11 ++-- .../watcher-config-template.toml | 4 +- .../data/stacks/azimuth/README.md | 2 +- .../data/stacks/azimuth/stack.yml | 2 +- 6 files changed, 50 insertions(+), 44 deletions(-) diff --git a/stack_orchestrator/data/compose/docker-compose-watcher-azimuth.yml b/stack_orchestrator/data/compose/docker-compose-watcher-azimuth.yml index 48e77082..eaa495f9 100644 --- a/stack_orchestrator/data/compose/docker-compose-watcher-azimuth.yml +++ b/stack_orchestrator/data/compose/docker-compose-watcher-azimuth.yml @@ -32,8 +32,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT_ENDPOINT} CERC_HISTORICAL_BLOCK_RANGE: 500 CONTRACT_ADDRESS: 0x223c067F8CF28ae173EE5CafEa60cA44C335fecB CONTRACT_NAME: Azimuth @@ -66,8 +66,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/azimuth-watcher command: "./start-server.sh" volumes: @@ -94,8 +94,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} CONTRACT_ADDRESS: 0x325f68d32BdEe6Ed86E7235ff2480e2A433D6189 CONTRACT_NAME: Censures STARTING_BLOCK: 6784954 @@ -127,8 +127,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/censures-watcher command: "./start-server.sh" volumes: @@ -155,8 +155,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} CONTRACT_ADDRESS: 0xe7e7f69b34D7d9Bd8d61Fb22C33b22708947971A CONTRACT_NAME: Claims STARTING_BLOCK: 6784941 @@ -188,8 +188,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/claims-watcher command: "./start-server.sh" volumes: @@ -216,8 +216,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} CONTRACT_ADDRESS: 0x8C241098C3D3498Fe1261421633FD57986D74AeA CONTRACT_NAME: ConditionalStarRelease STARTING_BLOCK: 6828004 @@ -249,8 +249,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/conditional-star-release-watcher command: "./start-server.sh" volumes: @@ -277,8 +277,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} CONTRACT_ADDRESS: 0xf6b461fE1aD4bd2ce25B23Fe0aff2ac19B3dFA76 CONTRACT_NAME: DelegatedSending STARTING_BLOCK: 6784956 @@ -310,8 +310,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/delegated-sending-watcher command: "./start-server.sh" volumes: @@ -338,8 +338,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} CONTRACT_ADDRESS: 0x33EeCbf908478C10614626A9D304bfe18B78DD73 CONTRACT_NAME: Ecliptic STARTING_BLOCK: 13692129 @@ -371,8 +371,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/ecliptic-watcher command: "./start-server.sh" volumes: @@ -399,8 +399,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} CONTRACT_ADDRESS: 0x86cd9cd0992F04231751E3761De45cEceA5d1801 CONTRACT_NAME: LinearStarRelease STARTING_BLOCK: 6784943 @@ -432,8 +432,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/linear-star-release-watcher command: "./start-server.sh" volumes: @@ -460,8 +460,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} CONTRACT_ADDRESS: 0x7fEcaB617c868Bb5996d99D95200D2Fa708218e4 CONTRACT_NAME: Polls STARTING_BLOCK: 6784912 @@ -493,8 +493,8 @@ services: condition: service_healthy environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} - CERC_IPLD_ETH_RPC: ${CERC_IPLD_ETH_RPC} - CERC_IPLD_ETH_GQL: ${CERC_IPLD_ETH_GQL} + CERC_ETH_RPC_ENDPOINTS: ${CERC_ETH_RPC_ENDPOINTS} + CERC_IPLD_ETH_GQL_ENDPOINT: ${CERC_IPLD_ETH_GQL_ENDPOINT} working_dir: /app/packages/polls-watcher command: "./start-server.sh" volumes: diff --git a/stack_orchestrator/data/config/watcher-azimuth/start-job-runner.sh b/stack_orchestrator/data/config/watcher-azimuth/start-job-runner.sh index 4bcad74c..f59ef6c6 100755 --- a/stack_orchestrator/data/config/watcher-azimuth/start-job-runner.sh +++ b/stack_orchestrator/data/config/watcher-azimuth/start-job-runner.sh @@ -4,16 +4,19 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then set -x fi -echo "Using IPLD ETH RPC endpoint ${CERC_IPLD_ETH_RPC}" -echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL}" +echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}" +echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL_ENDPOINT}" echo "Using historicalLogsBlockRange ${CERC_HISTORICAL_BLOCK_RANGE:-2000}" +# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array +RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/') + # Replace env variables in template TOML file # Read in the config template TOML file and modify it WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml) WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \ - sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}|g; \ - s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}|g; \ + sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}|g; \ + s|REPLACE_WITH_CERC_IPLD_ETH_GQL_ENDPOINT|${CERC_IPLD_ETH_GQL_ENDPOINT}|g; \ s|REPLACE_WITH_CERC_HISTORICAL_BLOCK_RANGE|${CERC_HISTORICAL_BLOCK_RANGE:-2000}| ") # Write the modified content to a new file diff --git a/stack_orchestrator/data/config/watcher-azimuth/start-server.sh b/stack_orchestrator/data/config/watcher-azimuth/start-server.sh index fa334653..4e6bbf59 100755 --- a/stack_orchestrator/data/config/watcher-azimuth/start-server.sh +++ b/stack_orchestrator/data/config/watcher-azimuth/start-server.sh @@ -4,16 +4,19 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then set -x fi -echo "Using IPLD ETH RPC endpoint ${CERC_IPLD_ETH_RPC}" -echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL}" +echo "Using ETH RPC endpoints ${CERC_ETH_RPC_ENDPOINTS}" +echo "Using IPLD GQL endpoint ${CERC_IPLD_ETH_GQL_ENDPOINT}" echo "Using historicalLogsBlockRange ${CERC_HISTORICAL_BLOCK_RANGE:-2000}" +# Convert the comma-separated list in CERC_ETH_RPC_ENDPOINTS to a JSON array +RPC_ENDPOINTS_ARRAY=$(echo "$CERC_ETH_RPC_ENDPOINTS" | tr ',' '\n' | awk '{print "\"" $0 "\""}' | paste -sd, - | sed 's/^/[/; s/$/]/') + # Replace env variables in template TOML file # Read in the config template TOML file and modify it WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml) WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \ - sed -E "s|REPLACE_WITH_CERC_IPLD_ETH_RPC|${CERC_IPLD_ETH_RPC}|g; \ - s|REPLACE_WITH_CERC_IPLD_ETH_GQL|${CERC_IPLD_ETH_GQL}|g; \ + sed -E "s|REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS|${RPC_ENDPOINTS_ARRAY}|g; \ + s|REPLACE_WITH_CERC_IPLD_ETH_GQL_ENDPOINT|${CERC_IPLD_ETH_GQL_ENDPOINT}|g; \ s|REPLACE_WITH_CERC_HISTORICAL_BLOCK_RANGE|${CERC_HISTORICAL_BLOCK_RANGE:-2000}| ") # Write the modified content to a new file diff --git a/stack_orchestrator/data/config/watcher-azimuth/watcher-config-template.toml b/stack_orchestrator/data/config/watcher-azimuth/watcher-config-template.toml index 2a91fedf..1d4c3152 100644 --- a/stack_orchestrator/data/config/watcher-azimuth/watcher-config-template.toml +++ b/stack_orchestrator/data/config/watcher-azimuth/watcher-config-template.toml @@ -13,8 +13,8 @@ [upstream] [upstream.ethServer] - gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL" - rpcProviderEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_RPC" + gqlApiEndpoint = "REPLACE_WITH_CERC_IPLD_ETH_GQL_ENDPOINT" + rpcProviderEndpoint = "REPLACE_WITH_CERC_ETH_RPC_ENDPOINTS" [jobQueue] historicalLogsBlockRange = REPLACE_WITH_CERC_HISTORICAL_BLOCK_RANGE diff --git a/stack_orchestrator/data/stacks/azimuth/README.md b/stack_orchestrator/data/stacks/azimuth/README.md index 21200369..cee81ed5 100644 --- a/stack_orchestrator/data/stacks/azimuth/README.md +++ b/stack_orchestrator/data/stacks/azimuth/README.md @@ -94,7 +94,7 @@ Inside the deployment directory, open the file `config.env` and add variable to ```bash # External RPC endpoints - CERC_IPLD_ETH_RPC= + CERC_ETH_RPC_ENDPOINTS=https://example-rpc-endpoint-1,https://example-rpc-endpoint-2 ``` * NOTE: If RPC endpoint is on the host machine, use `host.docker.internal` as the hostname to access the host port, or use the `ip a` command to find the IP address of the `docker0` interface (this will usually be something like `172.17.0.1` or `172.18.0.1`) diff --git a/stack_orchestrator/data/stacks/azimuth/stack.yml b/stack_orchestrator/data/stacks/azimuth/stack.yml index 374f2af0..34e950c4 100644 --- a/stack_orchestrator/data/stacks/azimuth/stack.yml +++ b/stack_orchestrator/data/stacks/azimuth/stack.yml @@ -1,7 +1,7 @@ version: "1.0" name: azimuth repos: - - github.com/cerc-io/azimuth-watcher-ts@v0.1.3 + - github.com/cerc-io/azimuth-watcher-ts@v0.1.4 containers: - cerc/watcher-azimuth pods: