Skip to content

Commit be0a7cc

Browse files
author
AztecBot
committed
Merge branch 'next' into merge-train/barretenberg
2 parents 7973511 + 77fee76 commit be0a7cc

File tree

5 files changed

+66
-53
lines changed

5 files changed

+66
-53
lines changed

‎.github/workflows/deploy-staging-networks.yml‎

Lines changed: 55 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ jobs:
116116
DEPLOY_INTERNAL_BOOTNODE=false
117117
STORE_SNAPSHOT_URL="${{ secrets.GCS_TESTNET_SNAPSHOT_URL }}/staging-public/"
118118
PROVER_FAILED_PROOF_STORE=gs://aztec-develop/staging-public/failed-proofs
119+
TEST_ACCOUNTS=false
120+
SPONSORED_FPC=true
119121
120122
BOT_TRANSFERS_REPLICAS=1
121123
BOT_TRANSFERS_TX_INTERVAL_SECONDS=250
@@ -155,58 +157,59 @@ jobs:
155157
#############
156158
# Deploy staging-ignition network
157159
#############
158-
# - name: Write staging-ignition network env file
159-
# if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
160-
# run: |
161-
# NAMESPACE=staging-ignition
162-
# cat > ${{ env.NETWORK_ENV_FILE }} <<EOF
163-
# CREATE_ETH_DEVNET=false
164-
# GCP_PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}
165-
# GCP_REGION=us-west1-a
166-
# CLUSTER=aztec-gke-private
167-
# SALT=11757379062
168-
# NAMESPACE=${NAMESPACE}
169-
# AZTEC_DOCKER_IMAGE="aztecprotocol/aztec:${SEMVER}"
170-
# TRANSACTIONS_DISABLED=true
171-
# NETWORK=staging-ignition
160+
- name: Write staging-ignition network env file
161+
if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
162+
run: |
163+
NAMESPACE=staging-ignition
164+
cat > ${{ env.NETWORK_ENV_FILE }} <<EOF
165+
CREATE_ETH_DEVNET=false
166+
GCP_PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}
167+
GCP_REGION=us-west1-a
168+
CLUSTER=aztec-gke-private
169+
SALT=1175732583
170+
NAMESPACE=${NAMESPACE}
171+
AZTEC_DOCKER_IMAGE="aztecprotocol/aztec:${SEMVER}"
172+
TRANSACTIONS_DISABLED=true
173+
TEST_ACCOUNTS=false
174+
SPONSORED_FPC=false
175+
NETWORK=staging-ignition
172176
173-
# ETHEREUM_CHAIN_ID=11155111
174-
# ETHEREUM_RPC_URLS=${{ secrets.SEPOLIA_RPC_URLS }}
175-
# ETHEREUM_CONSENSUS_HOST_URLS=${{ secrets.SEPOLIA_CONSENSUS_HOST_URLS }}
176-
# ETHEREUM_CONSENSUS_HOST_API_KEYS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEYS }}
177-
# ETHEREUM_CONSENSUS_HOST_API_KEY_HEADERS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEY_HEADERS }}
178-
# FUNDING_PRIVATE_KEY=${{ secrets.SEPOLIA_FUNDING_PRIVATE_KEY }}
179-
# LABS_INFRA_MNEMONIC=${{ secrets.SEPOLIA_LABS_STAGING_IGNITION_MNEMONIC }}
180-
# ROLLUP_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_LABS_ROLLUP_PRIVATE_KEY }}
181-
# OTEL_COLLECTOR_ENDPOINT=${{ secrets.OTEL_COLLECTOR_URL }}
182-
# VERIFY_CONTRACTS=true
183-
# ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }}
184-
# STORE_SNAPSHOT_URL="${{ secrets.GCS_TESTNET_SNAPSHOT_URL }}/staging-ignition/"
185-
# DEPLOY_INTERNAL_BOOTNODE=false
186-
# BOT_TRANSFERS_REPLICAS=0
187-
# BOT_SWAPS_REPLICAS=0
188-
# DEPLOY_INTERNAL_BOOTNODE=false
189-
# FLUSH_ENTRY_QUEUE=false
190-
# EOF
191-
# echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV
177+
ETHEREUM_CHAIN_ID=11155111
178+
ETHEREUM_RPC_URLS=${{ secrets.SEPOLIA_RPC_URLS }}
179+
ETHEREUM_CONSENSUS_HOST_URLS=${{ secrets.SEPOLIA_CONSENSUS_HOST_URLS }}
180+
ETHEREUM_CONSENSUS_HOST_API_KEYS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEYS }}
181+
ETHEREUM_CONSENSUS_HOST_API_KEY_HEADERS=${{ secrets.SEPOLIA_CONSENSUS_HOST_API_KEY_HEADERS }}
182+
FUNDING_PRIVATE_KEY=${{ secrets.SEPOLIA_FUNDING_PRIVATE_KEY }}
183+
LABS_INFRA_MNEMONIC=${{ secrets.SEPOLIA_LABS_STAGING_IGNITION_MNEMONIC }}
184+
ROLLUP_DEPLOYMENT_PRIVATE_KEY=${{ secrets.SEPOLIA_LABS_ROLLUP_PRIVATE_KEY }}
185+
OTEL_COLLECTOR_ENDPOINT=${{ secrets.OTEL_COLLECTOR_URL }}
186+
VERIFY_CONTRACTS=true
187+
ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }}
188+
STORE_SNAPSHOT_URL="${{ secrets.GCS_TESTNET_SNAPSHOT_URL }}/staging-ignition/"
189+
BOT_TRANSFERS_REPLICAS=0
190+
BOT_SWAPS_REPLICAS=0
191+
DEPLOY_INTERNAL_BOOTNODE=false
192+
FLUSH_ENTRY_QUEUE=false
193+
EOF
194+
echo "NAMESPACE=$NAMESPACE" >> $GITHUB_ENV
192195
193-
# - name: Run
194-
# if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
195-
# env:
196-
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
197-
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
198-
# GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
199-
# RUN_ID: ${{ github.run_id }}
200-
# SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
201-
# # Pass the base64 encoded strings, and where they should be decoded to
202-
# NETWORK_ENV_FILE: ${{ env.NETWORK_ENV_FILE }}
203-
# GOOGLE_APPLICATION_CREDENTIALS: ${{ env.GOOGLE_APPLICATION_CREDENTIALS }}
204-
# NAMESPACE: ${{ env.NAMESPACE }}
205-
# REF_NAME: "v${{ env.SEMVER }}"
206-
# run: |
207-
# # the network env file and gcp credentials file are mounted into the ec2 instance
208-
# # see ci3/bootstrap_ec2
209-
# exec ./ci.sh network-deploy
196+
- name: Run
197+
if: env.SEMVER != '' && env.MAJOR_VERSION == '2'
198+
env:
199+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
200+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
201+
GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
202+
RUN_ID: ${{ github.run_id }}
203+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
204+
# Pass the base64 encoded strings, and where they should be decoded to
205+
NETWORK_ENV_FILE: ${{ env.NETWORK_ENV_FILE }}
206+
GOOGLE_APPLICATION_CREDENTIALS: ${{ env.GOOGLE_APPLICATION_CREDENTIALS }}
207+
NAMESPACE: ${{ env.NAMESPACE }}
208+
REF_NAME: "v${{ env.SEMVER }}"
209+
run: |
210+
# the network env file and gcp credentials file are mounted into the ec2 instance
211+
# see ci3/bootstrap_ec2
212+
exec ./ci.sh network-deploy
210213
211214
#############
212215
# Deploy testnet if we are not a pre-release (i.e. semver does not contain a hyphen)
@@ -223,6 +226,8 @@ jobs:
223226
SALT=1757380290
224227
NAMESPACE=${NAMESPACE}
225228
AZTEC_DOCKER_IMAGE="aztecprotocol/aztec:${SEMVER}"
229+
TEST_ACCOUNTS=false
230+
SPONSORED_FPC=true
226231
NETWORK=testnet
227232
228233
ETHEREUM_CHAIN_ID=11155111

‎spartan/scripts/deploy_network.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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
4343
DESTROY_ROLLUP_CONTRACTS=${DESTROY_ROLLUP_CONTRACTS:-false}
4444
CREATE_ROLLUP_CONTRACTS=${CREATE_ROLLUP_CONTRACTS:-true}
4545
SPONSORED_FPC=${SPONSORED_FPC:-true}
46+
TEST_ACCOUNTS=${TEST_ACCOUNTS:-false}
4647
REAL_VERIFIER=${REAL_VERIFIER:-true}
4748

4849

@@ -213,6 +214,7 @@ L1_CHAIN_ID = "${ETHEREUM_CHAIN_ID}"
213214
SALT = "${SALT}"
214215
VALIDATORS = "${VALIDATOR_ADDRESSES}"
215216
SPONSORED_FPC = ${SPONSORED_FPC}
217+
TEST_ACCOUNTS = ${TEST_ACCOUNTS}
216218
REAL_VERIFIER = ${REAL_VERIFIER}
217219
AZTEC_SLOT_DURATION = ${AZTEC_SLOT_DURATION:-null}
218220
AZTEC_EPOCH_DURATION = ${AZTEC_EPOCH_DURATION:-null}

‎spartan/terraform/deploy-rollup-contracts/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ locals {
2929
["--create-verification-json", "/tmp/l1-verify"],
3030
var.SALT != null ? ["--salt", tostring(var.SALT)] : [],
3131
var.SPONSORED_FPC ? ["--sponsored-fpc"] : [],
32+
var.TEST_ACCOUNTS ? ["--test-accounts"] : [],
3233
var.REAL_VERIFIER ? ["--real-verifier"] : [],
3334
var.FLUSH_ENTRY_QUEUE ? ["--flush-entry-queue"] : []
3435
)

‎spartan/terraform/deploy-rollup-contracts/variables.tf‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ variable "SPONSORED_FPC" {
4949
type = bool
5050
}
5151

52+
variable "TEST_ACCOUNTS" {
53+
description = "Enable test accounts"
54+
type = bool
55+
}
56+
5257
variable "REAL_VERIFIER" {
5358
description = "Deploy real verifier"
5459
type = bool

‎yarn-project/cli/src/config/chain_l2_config.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
7676
sponsoredFPC: false,
7777
p2pEnabled: true,
7878
p2pBootstrapNodes: [],
79-
registryAddress: '0xf299347e765cfb27f913bde8e4983fd0f195676f',
80-
slashFactoryAddress: '',
81-
feeAssetHandlerAddress: '',
79+
registryAddress: '0xa2ed20f46dc58e5af6035ec61d463ac85a6d52d3',
80+
slashFactoryAddress: '0x2c03d596f4b5f0c1d0d2dbf92a5964dfc658763c',
81+
feeAssetHandlerAddress: '0x48be40187f2932bd14cd4d111fba26646da96c36',
8282
seqMinTxsPerBlock: 0,
8383
seqMaxTxsPerBlock: 0,
8484
realProofs: true,

0 commit comments

Comments
 (0)