Skip to content

chore: Backport fix to staging-ignition to v2 #17159

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
alexghr merged 1 commit into from
Sep 19, 2025
Merged

chore: Backport fix to staging-ignition to v2 #17159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
105 changes: 55 additions & 50 deletions .github/workflows/deploy-staging-networks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ jobs:
DEPLOY_INTERNAL_BOOTNODE=false
STORE_SNAPSHOT_URL="${{ secrets.GCS_TESTNET_SNAPSHOT_URL }}/staging-public/"
PROVER_FAILED_PROOF_STORE=gs://aztec-develop/staging-public/failed-proofs
TEST_ACCOUNTS=false
SPONSORED_FPC=true

BOT_TRANSFERS_REPLICAS=1
BOT_TRANSFERS_TX_INTERVAL_SECONDS=250
Expand Down Expand Up @@ -155,58 +157,59 @@ jobs:
#############
# Deploy staging-ignition network
#############
# - name: Write staging-ignition network env file
# if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
# run: |
# NAMESPACE=staging-ignition
# cat > ${{ env.NETWORK_ENV_FILE }} <<EOF
# CREATE_ETH_DEVNET=false
# GCP_PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}
# GCP_REGION=us-west1-a
# CLUSTER=aztec-gke-private
# SALT=11757379062
# NAMESPACE=${NAMESPACE}
# AZTEC_DOCKER_IMAGE="aztecprotocol/aztec:${SEMVER}"
# TRANSACTIONS_DISABLED=true
# NETWORK=staging-ignition
- name: Write staging-ignition network env file
if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
run: |
NAMESPACE=staging-ignition
cat > ${{ env.NETWORK_ENV_FILE }} <<EOF
CREATE_ETH_DEVNET=false
GCP_PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}
GCP_REGION=us-west1-a
CLUSTER=aztec-gke-private
SALT=1175732583
NAMESPACE=${NAMESPACE}
AZTEC_DOCKER_IMAGE="aztecprotocol/aztec:${SEMVER}"
TRANSACTIONS_DISABLED=true
TEST_ACCOUNTS=false
SPONSORED_FPC=false
NETWORK=staging-ignition

# ETHEREUM_CHAIN_ID=11155111
# ETHEREUM_RPC_URLS=${{ secrets.SEPOLIA_RPC_URLS }}
# ETHEREUM_CONSENSUS_HOST_URLS=${{ secrets.SEPOLIA_CONSENSUS_HOST_URLS }}
# ETHEREUM_CONSENSUS_HOST_API_KEYS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEYS }}
# ETHEREUM_CONSENSUS_HOST_API_KEY_HEADERS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEY_HEADERS }}
# FUNDING_PRIVATE_KEY=${{ secrets.SEPOLIA_FUNDING_PRIVATE_KEY }}
# LABS_INFRA_MNEMONIC=${{ secrets.SEPOLIA_LABS_STAGING_IGNITION_MNEMONIC }}
# ROLLUP_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_LABS_ROLLUP_PRIVATE_KEY }}
# OTEL_COLLECTOR_ENDPOINT=${{ secrets.OTEL_COLLECTOR_URL }}
# VERIFY_CONTRACTS=true
# ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }}
# STORE_SNAPSHOT_URL="${{ secrets.GCS_TESTNET_SNAPSHOT_URL }}/staging-ignition/"
# DEPLOY_INTERNAL_BOOTNODE=false
# BOT_TRANSFERS_REPLICAS=0
# BOT_SWAPS_REPLICAS=0
# DEPLOY_INTERNAL_BOOTNODE=false
# FLUSH_ENTRY_QUEUE=false
# EOF
# echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV
ETHEREUM_CHAIN_ID=11155111
ETHEREUM_RPC_URLS=${{ secrets.SEPOLIA_RPC_URLS }}
ETHEREUM_CONSENSUS_HOST_URLS=${{ secrets.SEPOLIA_CONSENSUS_HOST_URLS }}
ETHEREUM_CONSENSUS_HOST_API_KEYS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEYS }}
ETHEREUM_CONSENSUS_HOST_API_KEY_HEADERS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEY_HEADERS }}
FUNDING_PRIVATE_KEY=${{ secrets.SEPOLIA_FUNDING_PRIVATE_KEY }}
LABS_INFRA_MNEMONIC=${{ secrets.SEPOLIA_LABS_STAGING_IGNITION_MNEMONIC }}
ROLLUP_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_LABS_ROLLUP_PRIVATE_KEY }}
OTEL_COLLECTOR_ENDPOINT=${{ secrets.OTEL_COLLECTOR_URL }}
VERIFY_CONTRACTS=true
ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }}
STORE_SNAPSHOT_URL="${{ secrets.GCS_TESTNET_SNAPSHOT_URL }}/staging-ignition/"
BOT_TRANSFERS_REPLICAS=0
BOT_SWAPS_REPLICAS=0
DEPLOY_INTERNAL_BOOTNODE=false
FLUSH_ENTRY_QUEUE=false
EOF
echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV

# - name: Run
# if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
# RUN_ID: ${{ github.run_id }}
# SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
# # Pass the base64 encoded strings, and where they should be decoded to
# NETWORK_ENV_FILE: ${{ env.NETWORK_ENV_FILE }}
# GOOGLE_APPLICATION_CREDENTIALS: ${{ env.GOOGLE_APPLICATION_CREDENTIALS }}
# NAMESPACE: ${{ env.NAMESPACE }}
# REF_NAME: "v${{ env.SEMVER }}"
# run: |
# # the network env file and gcp credentials file are mounted into the ec2 instance
# # see ci3/bootstrap_ec2
# exec ./ci.sh network-deploy
- name: Run
if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
RUN_ID: ${{ github.run_id }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
# Pass the base64 encoded strings, and where they should be decoded to
NETWORK_ENV_FILE: ${{ env.NETWORK_ENV_FILE }}
GOOGLE_APPLICATION_CREDENTIALS: ${{ env.GOOGLE_APPLICATION_CREDENTIALS }}
NAMESPACE: ${{ env.NAMESPACE }}
REF_NAME: "v${{ env.SEMVER }}"
run: |
# the network env file and gcp credentials file are mounted into the ec2 instance
# see ci3/bootstrap_ec2
exec ./ci.sh network-deploy

#############
# Deploy testnet if we are not a pre-release (i.e. semver does not contain a hyphen)
Expand All @@ -223,6 +226,8 @@ jobs:
SALT=1757380290
NAMESPACE=${NAMESPACE}
AZTEC_DOCKER_IMAGE="aztecprotocol/aztec:${SEMVER}"
TEST_ACCOUNTS=false
SPONSORED_FPC=true
NETWORK=testnet

ETHEREUM_CHAIN_ID=11155111
Expand Down
2 changes: 2 additions & 0 deletions spartan/scripts/deploy_network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ LABS_INFRA_INDICES=${LABS_INFRA_INDICES:-0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,1
DESTROY_ROLLUP_CONTRACTS=${DESTROY_ROLLUP_CONTRACTS:-false}
CREATE_ROLLUP_CONTRACTS=${CREATE_ROLLUP_CONTRACTS:-true}
SPONSORED_FPC=${SPONSORED_FPC:-true}
TEST_ACCOUNTS=${TEST_ACCOUNTS:-false}
REAL_VERIFIER=${REAL_VERIFIER:-true}


Expand Down Expand Up @@ -201,6 +202,7 @@ L1_CHAIN_ID = "${ETHEREUM_CHAIN_ID}"
SALT = "${SALT}"
VALIDATORS = "${VALIDATOR_ADDRESSES}"
SPONSORED_FPC = ${SPONSORED_FPC}
TEST_ACCOUNTS = ${TEST_ACCOUNTS}
REAL_VERIFIER = ${REAL_VERIFIER}
AZTEC_SLOT_DURATION = ${AZTEC_SLOT_DURATION:-null}
AZTEC_EPOCH_DURATION = ${AZTEC_EPOCH_DURATION:-null}
Expand Down
1 change: 1 addition & 0 deletions spartan/terraform/deploy-rollup-contracts/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ locals {
["--create-verification-json", "/tmp/l1-verify"],
var.SALT != null ? ["--salt", tostring(var.SALT)] : [],
var.SPONSORED_FPC ? ["--sponsored-fpc"] : [],
var.TEST_ACCOUNTS ? ["--test-accounts"] : [],
var.REAL_VERIFIER ? ["--real-verifier"] : []
)

Expand Down
5 changes: 5 additions & 0 deletions spartan/terraform/deploy-rollup-contracts/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ variable "SPONSORED_FPC" {
type = bool
}

variable "TEST_ACCOUNTS" {
description = "Enable test accounts"
type = bool
}

variable "REAL_VERIFIER" {
description = "Deploy real verifier"
type = bool
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/cli/src/config/chain_l2_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
sponsoredFPC: false,
p2pEnabled: true,
p2pBootstrapNodes: [],
registryAddress: '0x6c04b1c116ec1ea0f918e3cc91e87b0af3e23b73',
slashFactoryAddress: '',
feeAssetHandlerAddress: '',
registryAddress: '0xa2ed20f46dc58e5af6035ec61d463ac85a6d52d3',
slashFactoryAddress: '0x2c03d596f4b5f0c1d0d2dbf92a5964dfc658763c',
feeAssetHandlerAddress: '0x48be40187f2932bd14cd4d111fba26646da96c36',
seqMinTxsPerBlock: 0,
seqMaxTxsPerBlock: 0,
realProofs: true,
Expand Down
Loading