From bf2a2dc56321da7bd0bc7443c496f93a3d2fea20 Mon Sep 17 00:00:00 2001 From: Liu <57480598+liu-zhipeng@users.noreply.github.com> Date: Tue, 17 Oct 2023 01:09:43 +0800 Subject: [PATCH] fix: staging ops --- ops/testnet/staging/backend/config.tf | 8 ++--- ops/testnet/staging/backend/main.tf | 2 +- ops/testnet/staging/core/config.tf | 46 +++++++++++++-------------- ops/testnet/staging/core/outputs.tf | 4 +++ ops/testnet/staging/core/variables.tf | 6 ++-- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/ops/testnet/staging/backend/config.tf b/ops/testnet/staging/backend/config.tf index c2bd94961b..9bfc25241a 100644 --- a/ops/testnet/staging/backend/config.tf +++ b/ops/testnet/staging/backend/config.tf @@ -65,10 +65,10 @@ locals { local_cartographer_config = jsonencode({ logLevel = "debug" chains = { - "1735356532" = {} - "1735353714" = {} - "9991" = {} - "1734439522" = {} + "1735356532" = { confirmations = 1 } + "1735353714" = { confirmations = 10 } + "9991" = { confirmations = 200 } + "1734439522" = { confirmations = 1 } } environment = var.stage }) diff --git a/ops/testnet/staging/backend/main.tf b/ops/testnet/staging/backend/main.tf index b0d78caab4..7c17da428d 100755 --- a/ops/testnet/staging/backend/main.tf +++ b/ops/testnet/staging/backend/main.tf @@ -62,7 +62,7 @@ module "cartographer-db-alarms" { enable_free_storage_space_too_low_alarm = true stage = var.stage environment = var.environment - sns_topic_subscription_emails = ["carlo@connext.network", "rahul@connext.network"] + sns_topic_subscription_emails = ["carlo@connext.network", "rahul@proximalabs.io", "preetham@proximalabs.io", "sanchay@proximalabs.io"] } module "postgrest" { diff --git a/ops/testnet/staging/core/config.tf b/ops/testnet/staging/core/config.tf index c5f844ae3e..5c2a7cde07 100644 --- a/ops/testnet/staging/core/config.tf +++ b/ops/testnet/staging/core/config.tf @@ -104,9 +104,9 @@ locals { "1734439522" = { providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"] } - "2053862260" = { - providers = ["https://zksync2-testnet.zksync.dev"] - } + # "2053862260" = { + # providers = ["https://zksync2-testnet.zksync.dev"] + # } } web3SignerUrl = "https://${module.sequencer_web3signer.service_endpoint}" relayers = [ @@ -163,12 +163,12 @@ locals { queueLimit = 100000 subscribe = true }, - { - name = "2053862260" - limit = 1 - queueLimit = 100000 - subscribe = true - }, + # { + # name = "2053862260" + # limit = 1 + # queueLimit = 100000 + # subscribe = true + # }, { name = "1734439522" limit = 1 @@ -197,11 +197,11 @@ locals { target = "9991" keys = ["9991"] }, - { - exchange = "sequencerX" - target = "2053862260" - keys = ["2053862260"] - }, + # { + # exchange = "sequencerX" + # target = "2053862260" + # keys = ["2053862260"] + # }, { exchange = "sequencerX" target = "1734439522" @@ -245,9 +245,9 @@ locals { "1734439522" = { providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"] } - "2053862260" = { - providers = ["https://zksync2-testnet.zksync.dev"] - } + # "2053862260" = { + # providers = ["https://zksync2-testnet.zksync.dev"] + # } } cartographerUrl = "https://postgrest.testnet.staging.connext.ninja" web3SignerUrl = "https://${module.router_web3signer.service_endpoint}" @@ -276,9 +276,9 @@ locals { "1734439522" = { providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"] } - "2053862260" = { - providers = ["https://zksync2-testnet.zksync.dev"] - } + # "2053862260" = { + # providers = ["https://zksync2-testnet.zksync.dev"] + # } } gelatoApiKey = "${var.gelato_api_key}" relayers = [ @@ -326,9 +326,9 @@ locals { "1734439522" = { providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"] } - "2053862260" = { - providers = ["https://zksync2-testnet.zksync.dev"] - } + # "2053862260" = { + # providers = ["https://zksync2-testnet.zksync.dev"] + # } } environment = var.stage web3SignerUrl = "https://${module.relayer_web3signer.service_endpoint}" diff --git a/ops/testnet/staging/core/outputs.tf b/ops/testnet/staging/core/outputs.tf index 985d10614d..2fa67bab84 100755 --- a/ops/testnet/staging/core/outputs.tf +++ b/ops/testnet/staging/core/outputs.tf @@ -49,6 +49,10 @@ output "router-subscriber-service-endpoint" { value = module.router_subscriber.service_endpoint } +output "router-executor-service-endpoint" { + value = module.router_executor.service_endpoint +} + output "relayer-service-endpoint" { value = module.relayer.service_endpoint } diff --git a/ops/testnet/staging/core/variables.tf b/ops/testnet/staging/core/variables.tf index 615a6222a7..08f4d01ceb 100755 --- a/ops/testnet/staging/core/variables.tf +++ b/ops/testnet/staging/core/variables.tf @@ -33,13 +33,13 @@ variable "full_image_name_router_publisher" { variable "full_image_name_router_subscriber" { type = string - description = "router image name" + description = "lighthouse subscriber image name" default = "ghcr.io/connext/router-subscriber:sha-b5bb49a" } variable "full_image_name_lighthouse_prover_subscriber" { type = string - description = "router image name" + description = "lighthouse prover image name" default = "ghcr.io/connext/lighthouse-subscriber:sha-b5bb49a" } @@ -200,5 +200,5 @@ variable "betteruptime_api_key" { variable "betteruptime_requester_email" { type = string - default = "layne@connext.network" + default = "layne@proximalabs.io" }