Skip to content

Update to use TheGraph endpoints and cicd updates #74

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
abs2023 merged 5 commits into from
Jan 28, 2026
Merged

Update to use TheGraph endpoints and cicd updates #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8be1987
refactor: DRY version tagging with gen-tag composite action
Jan 27, 2026
cba3659
refactor: DRY version tagging with gen-tag composite action (#71)
abs2023 Jan 28, 2026
76cfeb1
feat: Add Graph API key and Futures subgraph ID variables
Jan 28, 2026
62f92c8
feat: Add Graph API key and Futures subgraph ID variables (#72)
abs2023 Jan 28, 2026
b528e7c
Convert Proxy-Router STG to new TheGraph endpoints (#73)
abs2023 Jan 28, 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
14 changes: 14 additions & 0 deletions .bedrock/.terragrunt/00_variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,17 @@ variable "validator_eth_node_address" {
sensitive = true
default = ""
}

variable "graph_api_key" {
description = "The Graph API Key for accessing published subgraphs"
type = string
sensitive = true
default = ""
}

variable "futures_subgraph_id" {
description = "The Graph Subgraph ID for Futures (from published subgraph)"
type = string
sensitive = true
default = ""
}
10 changes: 6 additions & 4 deletions .bedrock/.terragrunt/01_secrets_manager.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ resource "aws_secretsmanager_secret_version" "proxy_router" {
count = var.proxy_router["create"] ? 1 : 0
secret_id = aws_secretsmanager_secret.proxy_router[0].id
secret_string = jsonencode({
wallet_private_key = var.proxy_wallet_private_key
eth_node_address = var.proxy_eth_node_address
wallet_private_key = var.proxy_wallet_private_key
eth_node_address = var.proxy_eth_node_address
futures_subgraph_url = "https://gateway.thegraph.com/api/${var.graph_api_key}/subgraphs/id/${var.futures_subgraph_id}"
})
}

Expand All @@ -55,8 +56,9 @@ resource "aws_secretsmanager_secret_version" "proxy_validator" {
count = var.proxy_validator["create"] ? 1 : 0
secret_id = aws_secretsmanager_secret.proxy_validator[0].id
secret_string = jsonencode({
wallet_private_key = var.validator_wallet_private_key
eth_node_address = var.validator_eth_node_address
wallet_private_key = var.validator_wallet_private_key
eth_node_address = var.validator_eth_node_address
futures_subgraph_url = "https://gateway.thegraph.com/api/${var.graph_api_key}/subgraphs/id/${var.futures_subgraph_id}"
})
}

Expand Down
4 changes: 2 additions & 2 deletions .bedrock/.terragrunt/02_proxy_n_router_svc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ resource "aws_ecs_task_definition" "proxy_router_use1_1" {
launch_type = "FARGATE"
essential = true
environment = [
{ "name" : "FUTURES_SUBGRAPH_URL", "value" : var.account_lifecycle == "prd" ? "https://graph.lmn.lumerin.io/subgraphs/name/futures" : "https://graph.${var.account_lifecycle}.lumerin.io/subgraphs/name/futures" },
{ "name" : "MULTICALL_ADDRESS", "value" : "0xcA11bde05977b3631167028862bE2a173976CA11" },
{ "name" : "FUTURES_ADDRESS", "value" : var.futures_address },
# { "name" : "FUTURES_VALIDATOR_URL_OVERRIDE", "value" : var.futures_validator_url_override },
Expand Down Expand Up @@ -131,7 +130,8 @@ resource "aws_ecs_task_definition" "proxy_router_use1_1" {
]
secrets = [
{ "name" : "WALLET_PRIVATE_KEY", "valueFrom" : "${aws_secretsmanager_secret.proxy_router[0].arn}:wallet_private_key::" },
{ "name" : "ETH_NODE_ADDRESS", "valueFrom" : "${aws_secretsmanager_secret.proxy_router[0].arn}:eth_node_address::" }
{ "name" : "ETH_NODE_ADDRESS", "valueFrom" : "${aws_secretsmanager_secret.proxy_router[0].arn}:eth_node_address::" },
{ "name" : "FUTURES_SUBGRAPH_URL", "valueFrom" : "${aws_secretsmanager_secret.proxy_router[0].arn}:futures_subgraph_url::" }
]
portMappings = [
{
Expand Down
4 changes: 2 additions & 2 deletions .bedrock/.terragrunt/02_proxy_n_validator_svc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ resource "aws_ecs_task_definition" "proxy_validator_use1_1" {
launch_type = "FARGATE"
essential = true
environment = [
{ "name" : "FUTURES_SUBGRAPH_URL", "value" : var.account_lifecycle == "prd" ? "https://graph.lmn.lumerin.io/subgraphs/name/futures" : "https://graph.${var.account_lifecycle}.lumerin.io/subgraphs/name/futures" },
{ "name" : "MULTICALL_ADDRESS", "value" : "0xcA11bde05977b3631167028862bE2a173976CA11" },
{ "name" : "FUTURES_ADDRESS", "value" : var.futures_address },
# { "name" : "FUTURES_VALIDATOR_URL_OVERRIDE", "value" : var.futures_validator_url_override },
Expand Down Expand Up @@ -131,7 +130,8 @@ resource "aws_ecs_task_definition" "proxy_validator_use1_1" {
]
secrets = [
{ "name" : "WALLET_PRIVATE_KEY", "valueFrom" : "${aws_secretsmanager_secret.proxy_validator[0].arn}:wallet_private_key::" },
{ "name" : "ETH_NODE_ADDRESS", "valueFrom" : "${aws_secretsmanager_secret.proxy_validator[0].arn}:eth_node_address::" }
{ "name" : "ETH_NODE_ADDRESS", "valueFrom" : "${aws_secretsmanager_secret.proxy_validator[0].arn}:eth_node_address::" },
{ "name" : "FUTURES_SUBGRAPH_URL", "valueFrom" : "${aws_secretsmanager_secret.proxy_validator[0].arn}:futures_subgraph_url::" }
]
portMappings = [
{
Expand Down
147 changes: 147 additions & 0 deletions .github/actions/gen-tag/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
name: 'Generate Version Tag'
description: 'Generates component-based version tags for monorepo deployments'

inputs:
component:
description: 'Component name (folder name, e.g., indexer, ui, oracle-update)'
required: true
major_version:
description: 'Target major version (triggers major bump if greater than current)'
required: false
default: '3'
environment_override:
description: 'Override environment (for workflow_dispatch). Leave empty for branch-based detection.'
required: false
default: ''

outputs:
tag_name:
description: 'Full tag name (e.g., indexer-v2.0.5-dev)'
value: ${{ steps.gen_tag.outputs.tag_name }}
vtag:
description: 'Version tag (same as tag_name)'
value: ${{ steps.gen_tag.outputs.vtag }}
version:
description: 'Version string with v prefix (e.g., v2.0.5-dev)'
value: ${{ steps.gen_tag.outputs.version }}
vfull:
description: 'Semantic version without prefix (e.g., 2.0.5)'
value: ${{ steps.gen_tag.outputs.vfull }}
environment:
description: 'Deployment environment (dev, stg, main)'
value: ${{ steps.determine_env.outputs.environment }}
should_create_release:
description: 'Whether to create a GitHub release (true for main)'
value: ${{ steps.determine_env.outputs.should_create_release }}
is_cicd_branch:
description: 'Whether this is a CI/CD test branch'
value: ${{ steps.determine_env.outputs.is_cicd_branch }}

runs:
using: 'composite'
steps:
- name: Determine environment
id: determine_env
shell: bash
run: |
ENV_OVERRIDE="${{ inputs.environment_override }}"
IS_CICD="false"

if [ -n "$ENV_OVERRIDE" ]; then
# Use override from workflow_dispatch
ENV="$ENV_OVERRIDE"
CREATE_RELEASE="false"
[ "$ENV" == "main" ] && CREATE_RELEASE="true"
else
# Detect from branch name
BRANCH="${{ github.ref_name }}"
if [ "$BRANCH" == "main" ]; then
ENV="main"
CREATE_RELEASE="true"
elif [ "$BRANCH" == "stg" ]; then
ENV="stg"
CREATE_RELEASE="false"
elif [[ "$BRANCH" == cicd/* ]]; then
ENV="dev"
CREATE_RELEASE="false"
IS_CICD="true"
echo "🔧 CI/CD test branch detected - will skip build/deploy"
else
ENV="dev"
CREATE_RELEASE="false"
fi
fi
echo "environment=${ENV}" >> $GITHUB_OUTPUT
echo "should_create_release=${CREATE_RELEASE}" >> $GITHUB_OUTPUT
echo "is_cicd_branch=${IS_CICD}" >> $GITHUB_OUTPUT

- name: Generate version tag
id: gen_tag
shell: bash
run: |
# Component-based versioning for monorepo
# Pattern: <component>-v<major>.<minor>.<patch>[-env]
COMPONENT="${{ inputs.component }}"
VMAJ_NEW=${{ inputs.major_version }}
VMIN_NEW=0
VPAT_NEW=0

set +o pipefail

# Find the last production tag for this component (without -dev/-stg suffix)
# Use git tag -l with sort to find latest, not git describe (which requires reachability)
VLAST=$(git tag -l "${COMPONENT}-v[0-9]*" | grep -E "^${COMPONENT}-v[0-9]+\.[0-9]+\.[0-9]+$" | sort -V | tail -n 1 | sed "s/${COMPONENT}-v//" || echo "")

if [ -n "$VLAST" ]; then
# Parse existing version
eval $(echo "$VLAST" | awk -F '.' '{print "VMAJ="$1" VMIN="$2" VPAT="$3}')
else
# No existing tags - start fresh
VMAJ=$VMAJ_NEW
VMIN=0
VPAT=0
fi

ENV="${{ steps.determine_env.outputs.environment }}"

if [ "$ENV" = "main" ]; then
# Production release - increment version
if [ "$VMAJ_NEW" -gt "$VMAJ" ]; then
# Major version bump requested
VMAJ=$VMAJ_NEW
VMIN=$VMIN_NEW
VPAT=$VPAT_NEW
else
# Increment minor version, reset patch
VMIN=$((VMIN+1))
VPAT=0
fi
VFULL=${VMAJ}.${VMIN}.${VPAT}
VTAG=${COMPONENT}-v${VFULL}
VERSION="v${VFULL}"
else
# Non-production - use commit count as patch for uniqueness
MB=$(git merge-base refs/remotes/origin/main HEAD 2>/dev/null || git rev-parse HEAD)
VPAT=$(git rev-list --count --no-merges ${MB}..HEAD 2>/dev/null || echo "0")
VFULL=${VMAJ}.${VMIN}.${VPAT}
RNAME=${GITHUB_REF_NAME##*/}
[ "$GITHUB_EVENT_NAME" = "pull_request" ] && RNAME=pr${GITHUB_REF_NAME%/merge}
VTAG=${COMPONENT}-v${VFULL}-${RNAME}
VERSION="v${VFULL}-${RNAME}"
fi

# Output variables
echo "tag_name=${VTAG}" >> $GITHUB_OUTPUT
echo "vtag=${VTAG}" >> $GITHUB_OUTPUT
echo "version=${VERSION}" >> $GITHUB_OUTPUT
echo "vfull=${VFULL}" >> $GITHUB_OUTPUT

# Summary
echo "📦 Component: ${COMPONENT}" >> $GITHUB_STEP_SUMMARY
echo "🌍 Environment: ${ENV}" >> $GITHUB_STEP_SUMMARY
echo "✅ Proposed Tag: ${VTAG} (will be created after successful deployment)" >> $GITHUB_STEP_SUMMARY
if [ -n "$VLAST" ]; then
echo "📋 Last Production Tag: ${COMPONENT}-v${VLAST}" >> $GITHUB_STEP_SUMMARY
else
echo "📋 Last Production Tag: (none - first deployment)" >> $GITHUB_STEP_SUMMARY
fi
89 changes: 21 additions & 68 deletions .github/workflows/build-deploy-proxy-router.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,83 +38,34 @@ jobs:
runs-on: ubuntu-latest
name: Generate Tag Name
outputs:
tag_name: ${{ steps.gen_tag_name.outputs.tag_name }}
vtag: ${{ steps.gen_tag_name.outputs.vtag }}
vfull: ${{ steps.gen_tag_name.outputs.vfull }}
image_name: ${{ steps.gen_tag_name.outputs.image_name }}
environment: ${{ steps.gen_tag_name.outputs.environment }}
is_cicd_branch: ${{ steps.gen_tag_name.outputs.is_cicd_branch }}
tag_name: ${{ steps.gen_tag.outputs.tag_name }}
vtag: ${{ steps.gen_tag.outputs.vtag }}
vfull: ${{ steps.gen_tag.outputs.vfull }}
version: ${{ steps.gen_tag.outputs.version }}
image_name: ${{ steps.config.outputs.image_name }}
environment: ${{ steps.gen_tag.outputs.environment }}
is_cicd_branch: ${{ steps.gen_tag.outputs.is_cicd_branch }}
steps:
- name: Clone repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Determine tag name
id: gen_tag_name
shell: bash
- name: Generate version tag
id: gen_tag
uses: ./.github/actions/gen-tag
with:
component: proxy-router
major_version: '3'

- name: Config
id: config
run: |
IMAGE_NAME="ghcr.io/lumerin-protocol/proxy-router"
VMAJ_NEW=1
VMIN_NEW=2
VPAT_NEW=4
IS_CICD="false"
set +o pipefail
VLAST=$(git describe --tags --abbrev=0 --match='v[1-9]*' refs/remotes/origin/main 2>/dev/null | cut -c2-)

if [ -n "$VLAST" ]; then
eval $(echo "$VLAST" | awk -F '.' '{print "VMAJ="$1" VMIN="$2" VPAT="$3}')
else
VMAJ=0
VMIN=0
VPAT=0
fi

# Determine environment
if [ "$GITHUB_REF_NAME" = "main" ]; then
ENV="main"
elif [ "$GITHUB_REF_NAME" = "stg" ]; then
ENV="stg"
elif [[ "$GITHUB_REF_NAME" == cicd/* ]]; then
ENV="dev"
IS_CICD="true"
echo "🔧 CI/CD test branch detected - will run build test only"
else
ENV="dev"
fi

if [ "$GITHUB_REF_NAME" = "main" ]; then
if [ "$VMAJ_NEW" -gt "$VMAJ" ]; then
VMAJ=$VMAJ_NEW
VMIN=$VMIN_NEW
VPAT=$VPAT_NEW
else
VMIN=$((VMIN+1))
VPAT=0
fi
VFULL=${VMAJ}.${VMIN}.${VPAT}
VTAG=v$VFULL
else
MB=$(git merge-base refs/remotes/origin/main HEAD)
VPAT=$(git rev-list --count --no-merges ${MB}..HEAD)
VFULL=${VMAJ}.${VMIN}.${VPAT}
RNAME=${GITHUB_REF_NAME##*/}
[ "$GITHUB_EVENT_NAME" = "pull_request" ] && RNAME=pr${GITHUB_REF_NAME%/merge}
VTAG=v${VFULL}-${RNAME}
fi

# Output variables for use in subsequent jobs environment
echo "tag_name=${VTAG}" >> $GITHUB_OUTPUT
echo "vtag=${VTAG}" >> $GITHUB_OUTPUT
echo "vfull=${VFULL}" >> $GITHUB_OUTPUT
echo "image_name=${IMAGE_NAME}" >> $GITHUB_OUTPUT
echo "environment=${ENV}" >> $GITHUB_OUTPUT
echo "is_cicd_branch=${IS_CICD}" >> $GITHUB_OUTPUT
echo "✅ New Build Tag: $VTAG" >> $GITHUB_STEP_SUMMARY
echo "✅ Docker Image: ${IMAGE_NAME}:${VTAG}" >> $GITHUB_STEP_SUMMARY
echo "🌍 Environment: ${ENV}" >> $GITHUB_STEP_SUMMARY
if [ "$IS_CICD" == "true" ]; then
echo "✅ Docker Image: ${IMAGE_NAME}:${{ steps.gen_tag.outputs.tag_name }}" >> $GITHUB_STEP_SUMMARY
if [ "${{ steps.gen_tag.outputs.is_cicd_branch }}" == "true" ]; then
echo "🔧 CI/CD Test Mode: Build test only" >> $GITHUB_STEP_SUMMARY
fi

Expand Down Expand Up @@ -150,8 +101,10 @@ jobs:
run: |
BUILDTAG=${{ needs.Generate-Tag.outputs.tag_name }}
BUILDIMAGE=${{ needs.Generate-Tag.outputs.image_name }}
# Construct Graph URL from org secrets/vars (using DEV for CI testing)
FUTURES_SUBGRAPH_URL="https://gateway.thegraph.com/api/${{ secrets.DEV_GRAPH_APIKEY }}/subgraphs/id/${{ vars.DEV_FUTURES_SUBGRAPH_ID }}"
docker run -d --name proxy-router-test \
-e FUTURES_SUBGRAPH_URL=${{ vars.FUTURES_SUBGRAPH_URL }} \
-e FUTURES_SUBGRAPH_URL="${FUTURES_SUBGRAPH_URL}" \
-e MULTICALL_ADDRESS=${{ vars.MULTICALL_ADDRESS }} \
-e FUTURES_ADDRESS=${{ vars.FUTURES_ADDRESS }} \
-e FUTURES_VALIDATOR_URL_OVERRIDE=${{ vars.FUTURES_VALIDATOR_URL_OVERRIDE }} \
Expand Down