diff --git a/.github/workflows/deploy-staging-networks.yml b/.github/workflows/deploy-staging-networks.yml index d7b1f762de37..abfe89f810ba 100644 --- a/.github/workflows/deploy-staging-networks.yml +++ b/.github/workflows/deploy-staging-networks.yml @@ -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 @@ -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 }} < ${{ env.NETWORK_ENV_FILE }} <> $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) @@ -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 diff --git a/spartan/scripts/deploy_network.sh b/spartan/scripts/deploy_network.sh index 7271998694b5..2e6dec6c9d25 100755 --- a/spartan/scripts/deploy_network.sh +++ b/spartan/scripts/deploy_network.sh @@ -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} @@ -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} diff --git a/spartan/terraform/deploy-rollup-contracts/main.tf b/spartan/terraform/deploy-rollup-contracts/main.tf index d2ade1e89327..0017e64af1c6 100644 --- a/spartan/terraform/deploy-rollup-contracts/main.tf +++ b/spartan/terraform/deploy-rollup-contracts/main.tf @@ -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"] : [] ) diff --git a/spartan/terraform/deploy-rollup-contracts/variables.tf b/spartan/terraform/deploy-rollup-contracts/variables.tf index 9769a9bb24ed..f98cbe131c3c 100644 --- a/spartan/terraform/deploy-rollup-contracts/variables.tf +++ b/spartan/terraform/deploy-rollup-contracts/variables.tf @@ -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 diff --git a/yarn-project/cli/src/config/chain_l2_config.ts b/yarn-project/cli/src/config/chain_l2_config.ts index 994e1d4a3994..de9571d54846 100644 --- a/yarn-project/cli/src/config/chain_l2_config.ts +++ b/yarn-project/cli/src/config/chain_l2_config.ts @@ -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,