Skip to content

fix: switch to lh handler #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liu-zhipeng merged 2 commits into from
Mar 24, 2026
Merged

fix: switch to lh handler #604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e111f0
fix: switch to lh handler
otsybizov Mar 23, 2026
b4f8439
fix: wrapped redis auth token with urlencode
otsybizov Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-test-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
SERVICES="${SERVICES},${ENVIRONMENT}-${STAGE}-relayer-web3signer"
SERVICES="${SERVICES},${ENVIRONMENT}-${STAGE}-watchtower"
SERVICES="${SERVICES},${ENVIRONMENT}-${STAGE}-watchtower-web3signer"
# SERVICES="${SERVICES},${ENVIRONMENT}-${STAGE}-lighthouse-handler" # temporarily disabled — using lambda pollers
SERVICES="${SERVICES},${ENVIRONMENT}-${STAGE}-lighthouse-handler"
SERVICES="${SERVICES},${ENVIRONMENT}-${STAGE}-lighthouse-web3signer"
SERVICES="${SERVICES},${ENVIRONMENT}-${STAGE}-monitor"
echo "ECS_SERVICES=${SERVICES}" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -1007,7 +1007,7 @@ jobs:

terraform-services-core-mainnet-staging:
if: github.ref == 'refs/heads/mainnet-staging'
needs: [set-aws-region, e2e-tests] # build-and-push-lighthouse-handler-image removed — handler temporarily disabled
needs: [set-aws-region, e2e-tests, build-and-push-lighthouse-handler-image]
env:
AWS_PROFILE: aws-deployer-connext
TF_VAR_full_image_name_relayer: chimera-${{ github.sha }}
Expand Down
3 changes: 1 addition & 2 deletions ops/mainnet/staging/backend/config.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ locals {
{ name = "DD_LOGS_ENABLED", value = "true" },
{ name = "DD_API_KEY", value = var.dd_api_key },
{ name = "CARTOGRAPHER_ADMIN_TOKEN", value = var.cartographer_admin_token },
# REDIS_URL removed temporarily — lighthouse queue Redis disabled, using poller lambdas instead
# { name = "REDIS_URL", value = "rediss://:${urlencode(data.terraform_remote_state.core.outputs.lighthouse_queue_redis_auth_token)}@${module.lighthouse_queue_privatelink.endpoint_dns_name}:${data.terraform_remote_state.core.outputs.lighthouse_queue_redis_port}?tlsServername=${data.terraform_remote_state.core.outputs.lighthouse_queue_redis_address}" },
{ name = "REDIS_URL", value = "rediss://:${urlencode(data.terraform_remote_state.core.outputs.lighthouse_queue_redis_auth_token)}@${module.lighthouse_queue_privatelink.endpoint_dns_name}:${data.terraform_remote_state.core.outputs.lighthouse_queue_redis_port}?tlsServername=${data.terraform_remote_state.core.outputs.lighthouse_queue_redis_address}" },
]

local_cartographer_config_obj = {
Expand Down
23 changes: 11 additions & 12 deletions ops/mainnet/staging/backend/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,17 @@ module "cartographer-handler" {

# PrivateLink consumer endpoint — gives cartographer-handler access to the
# lighthouse queue Redis that lives in the core VPC.
# Temporarily disabled while lighthouse queue Redis issue is being resolved.
# module "lighthouse_queue_privatelink" {
# source = "../../../modules/privatelink/consumer"
# stage = var.stage
# environment = var.environment
# family = "lh-queue"
# vpc_id = module.network.vpc_id
# subnet_ids = module.network.public_subnets
# endpoint_service_name = data.terraform_remote_state.core.outputs.lighthouse_queue_endpoint_service_name
# port = data.terraform_remote_state.core.outputs.lighthouse_queue_redis_port
# allowed_cidr_blocks = [var.cidr_block]
# }
module "lighthouse_queue_privatelink" {
source = "../../../modules/privatelink/consumer"
stage = var.stage
environment = var.environment
family = "lh-queue"
vpc_id = module.network.vpc_id
subnet_ids = module.network.public_subnets
endpoint_service_name = data.terraform_remote_state.core.outputs.lighthouse_queue_endpoint_service_name
port = data.terraform_remote_state.core.outputs.lighthouse_queue_redis_port
allowed_cidr_blocks = [var.cidr_block]
}

module "network" {
source = "../../../modules/networking"
Expand Down
20 changes: 10 additions & 10 deletions ops/mainnet/staging/core/config.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ locals {
GRAPH_API_KEY = var.graph_api_key
}

# lighthouse_handler_env_vars = [
# { name = "LIGHTHOUSE_CONFIG", value = local.local_lighthouse_config },
# { name = "LIGHTHOUSE_SERVICE", value = "handler" },
# { name = "REDIS_URL", value = "rediss://:${var.lighthouse_queue_redis_auth_token}@${module.lighthouse_queue_cache.redis_instance_address}:${module.lighthouse_queue_cache.redis_instance_port}" },
# { name = "ENVIRONMENT", value = var.environment },
# { name = "STAGE", value = var.stage },
# { name = "DD_ENV", value = "${var.environment}-${var.stage}" },
# { name = "DD_LOGS_ENABLED", value = "true" },
# { name = "DD_API_KEY", value = var.dd_api_key },
# ]
lighthouse_handler_env_vars = [
{ name = "LIGHTHOUSE_CONFIG", value = local.local_lighthouse_config },
{ name = "LIGHTHOUSE_SERVICE", value = "handler" },
{ name = "REDIS_URL", value = "rediss://:${var.lighthouse_queue_redis_auth_token}@${module.lighthouse_queue_cache.redis_instance_address}:${module.lighthouse_queue_cache.redis_instance_port}" },
{ name = "ENVIRONMENT", value = var.environment },
{ name = "STAGE", value = var.stage },
{ name = "DD_ENV", value = "${var.environment}-${var.stage}" },
{ name = "DD_LOGS_ENABLED", value = "true" },
{ name = "DD_API_KEY", value = var.dd_api_key },
]

lighthouse_web3signer_env_vars = [
{ name = "WEB3_SIGNER_PRIVATE_KEY", value = var.lighthouse_web3_signer_private_key },
Expand Down
Loading
Loading