From 2d297b088cffd97a43fdbda174e80d8f4ac9e687 Mon Sep 17 00:00:00 2001 From: spypsy Date: Fri, 20 Oct 2023 16:38:39 +0000 Subject: [PATCH 1/7] WIP new anvil mainnet fork running AWS --- iac/main.tf | 24 ++ iac/mainnet-fork/Dockerfile | 18 ++ iac/mainnet-fork/nginx/gateway.conf | 14 + iac/mainnet-fork/nginx/nginx.conf | 53 ++++ iac/mainnet-fork/scripts/install_foundry.sh | 21 ++ iac/mainnet-fork/scripts/run_nginx_anvil.sh | 24 ++ iac/mainnet-fork/scripts/wait_for_fork | 15 + iac/mainnet-fork/terraform/main.tf | 286 ++++++++++++++++++++ iac/mainnet-fork/terraform/variables.tf | 16 ++ iac/output.tf | 4 + 10 files changed, 475 insertions(+) create mode 100644 iac/mainnet-fork/Dockerfile create mode 100644 iac/mainnet-fork/nginx/gateway.conf create mode 100644 iac/mainnet-fork/nginx/nginx.conf create mode 100755 iac/mainnet-fork/scripts/install_foundry.sh create mode 100755 iac/mainnet-fork/scripts/run_nginx_anvil.sh create mode 100755 iac/mainnet-fork/scripts/wait_for_fork create mode 100644 iac/mainnet-fork/terraform/main.tf create mode 100644 iac/mainnet-fork/terraform/variables.tf diff --git a/iac/main.tf b/iac/main.tf index 6c088f4042d7..821a7c1c57a9 100644 --- a/iac/main.tf +++ b/iac/main.tf @@ -50,6 +50,30 @@ resource "aws_lb" "aztec-network" { } } +# Create our application load balancer. +resource "aws_alb" "aztec-network-alb" { + name = "aztec-network-alb" + internal = false + load_balancer_type = "application" + security_groups = [ + data.terraform_remote_state.setup_iac.outputs.security_group_public_id + ] + subnets = [ + data.terraform_remote_state.setup_iac.outputs.subnet_az1_id, + data.terraform_remote_state.setup_iac.outputs.subnet_az2_id + ] + + access_logs { + bucket = "aztec-logs" + prefix = "aztec3-alb-logs" + enabled = true + } + + tags = { + Name = "aztec3" + } +} + resource "aws_security_group" "security-group-p2p" { name = "security-group-p2p" description = "Allow inbound p2p traffic" diff --git a/iac/mainnet-fork/Dockerfile b/iac/mainnet-fork/Dockerfile new file mode 100644 index 000000000000..c0240ccadc85 --- /dev/null +++ b/iac/mainnet-fork/Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu:focal + +# Install nginx +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections +RUN apt-get update && apt install -y git curl nginx + +# Copy nginx config +COPY . . +COPY nginx/gateway.conf /etc/nginx/gateway.conf +COPY nginx/nginx.conf /etc/nginx/nginx.conf + +# Install foundry +RUN ./scripts/install_foundry.sh +ENV PATH="./foundry/bin:${PATH}" + +# Run anvil and nginx +EXPOSE 80 +ENTRYPOINT ["sh", "-c", "./scripts/run_nginx_anvil.sh"] \ No newline at end of file diff --git a/iac/mainnet-fork/nginx/gateway.conf b/iac/mainnet-fork/nginx/gateway.conf new file mode 100644 index 000000000000..74f889b9eff1 --- /dev/null +++ b/iac/mainnet-fork/nginx/gateway.conf @@ -0,0 +1,14 @@ +server { + listen 80 default_server; + listen 8545; + + location = /{{API_KEY}} { + proxy_pass http://0.0.0.0:8544; + rewrite ^/{{API_KEY}}(.*) /$1 break; + } + + # Error responses + error_page 404 = @400; # Treat invalid paths as bad requests + proxy_intercept_errors on; # Do not send backend errors to client + default_type application/json; # If no content-type, assume JSON +} \ No newline at end of file diff --git a/iac/mainnet-fork/nginx/nginx.conf b/iac/mainnet-fork/nginx/nginx.conf new file mode 100644 index 000000000000..0deef80724e2 --- /dev/null +++ b/iac/mainnet-fork/nginx/nginx.conf @@ -0,0 +1,53 @@ + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + + gzip on; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + + include /etc/nginx/gateway.conf; + include /etc/nginx/conf.d/*.conf; +} + diff --git a/iac/mainnet-fork/scripts/install_foundry.sh b/iac/mainnet-fork/scripts/install_foundry.sh new file mode 100755 index 000000000000..3842f6a4318b --- /dev/null +++ b/iac/mainnet-fork/scripts/install_foundry.sh @@ -0,0 +1,21 @@ +#!/bin/sh +set -eu + +export FOUNDRY_DIR="$PWD/.foundry" +FOUNDRY_BIN_DIR="$FOUNDRY_DIR/bin" +BIN_URL="https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup" +BIN_PATH="$FOUNDRY_BIN_DIR/foundryup" +FOUNDRY_MAN_DIR="$FOUNDRY_DIR/share/man/man1" + +# Clean +rm -rf $FOUNDRY_DIR + +# Install foundryup. +mkdir -p $FOUNDRY_BIN_DIR +mkdir -p $FOUNDRY_MAN_DIR +curl -# -L $BIN_URL -o $BIN_PATH +chmod +x $BIN_PATH +export PATH=$FOUNDRY_BIN_DIR:$PATH + +# Use version. +foundryup \ No newline at end of file diff --git a/iac/mainnet-fork/scripts/run_nginx_anvil.sh b/iac/mainnet-fork/scripts/run_nginx_anvil.sh new file mode 100755 index 000000000000..1c95837ac1b5 --- /dev/null +++ b/iac/mainnet-fork/scripts/run_nginx_anvil.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +set -eum pipefail + +# Run nginx and anvil alongside each other +trap 'kill $(jobs -p)' SIGTERM + +# Anvil defaults - Nginx assumes these values to be as they are +HOST="0.0.0.0" +PORT=8544 +ETHEREUM_HOST=$HOST:$PORT + +# Data directory for anvil state +mkdir -p /data + +# Run anvil silently +.foundry/bin/anvil --silent --host $HOST -p $PORT -m "$MNEMONIC" -f=https://mainnet.infura.io/v3/$INFURA_API_KEY --chain-id=$CHAIN_ID --fork-block-number=15918000 --block-base-fee-per-gas=10 -s=$SNAPSHOT_FREQUENCY --state=./data/state --balance=1000000000000000000 >/dev/null & + +echo "Waiting for ethereum host at $ETHEREUM_HOST..." +while ! curl -s $ETHEREUM_HOST >/dev/null; do sleep 1; done + +echo "Starting nginx..." +nginx & +wait diff --git a/iac/mainnet-fork/scripts/wait_for_fork b/iac/mainnet-fork/scripts/wait_for_fork new file mode 100755 index 000000000000..4d990e30f888 --- /dev/null +++ b/iac/mainnet-fork/scripts/wait_for_fork @@ -0,0 +1,15 @@ +#!/bin/bash +set -e + +# When destroying and applying mainnet fork terraform, it may not be +# ready for a while, as it must register with DNS etc. +# This script waits on a healthy status from the fork - a valid response to the chainid request +# We retry every 20 seconds, and wait for a total of 5 minutes (15 times) + +export ETHEREUM_HOST="https://aztec-mainnet-fork.aztec.network:8545/$FORK_API_KEY" + +curl -H "Content-Type: application/json" -X POST --data '{"method":"eth_chainId","params":[],"id":33,"jsonrpc":"2.0"}' \ + --connect-timeout 30 \ + --retry 15 \ + --retry-delay 20 \ + $ETHEREUM_HOST diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf new file mode 100644 index 000000000000..06ff54ed605e --- /dev/null +++ b/iac/mainnet-fork/terraform/main.tf @@ -0,0 +1,286 @@ +terraform { + backend "s3" { + bucket = "aztec-terraform" + key = "aztec-network/iac" + region = "eu-west-2" + } + required_providers { + aws = { + source = "hashicorp/aws" + version = "3.74.2" + } + } +} + +data "terraform_remote_state" "setup_iac" { + backend = "s3" + config = { + bucket = "aztec-terraform" + key = "setup/setup-iac" + region = "eu-west-2" + } +} + +data "terraform_remote_state" "aztec-network_iac" { + backend = "s3" + config = { + bucket = "aztec-terraform" + key = "aztec-network/iac" + region = "eu-west-2" + } +} + +data "terraform_remote_state" "aztec2_iac" { + backend = "s3" + config = { + bucket = "aztec-terraform" + key = "aztec2/iac" + region = "eu-west-2" + } +} + + +data "aws_alb" "aztec-network-alb" { + arn = data.terraform_remote_state.aztec-network_iac.outputs.alb_arn +} + +provider "aws" { + profile = "default" + region = "eu-west-2" +} + +resource "aws_service_discovery_service" "aztec_mainnet_fork" { + name = "aztec-mainnet-fork" + + health_check_custom_config { + failure_threshold = 1 + } + + dns_config { + namespace_id = data.terraform_remote_state.setup_iac.outputs.local_service_discovery_id + + dns_records { + ttl = 60 + type = "A" + } + + dns_records { + ttl = 60 + type = "SRV" + } + + routing_policy = "MULTIVALUE" + } + + provisioner "local-exec" { + when = destroy + command = "${path.module}/../servicediscovery-drain.sh ${self.id}" + } +} + +# EFS filesystem for mainnet fork +resource "aws_efs_file_system" "aztec_mainnet_fork_data_store" { + creation_token = "aztec-mainnet-fork-data" + + tags = { + Name = "aztec-mainnet-fork-data" + } + + lifecycle_policy { + transition_to_ia = "AFTER_30_DAYS" + } +} + +resource "aws_efs_mount_target" "aztec_fork_private_az1" { + file_system_id = aws_efs_file_system.aztec_mainnet_fork_data_store.id + subnet_id = data.terraform_remote_state.setup_iac.outputs.subnet_az1_private_id + security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id] +} + +resource "aws_efs_mount_target" "aztec_fork_private_az2" { + file_system_id = aws_efs_file_system.aztec_mainnet_fork_data_store.id + subnet_id = data.terraform_remote_state.setup_iac.outputs.subnet_az2_private_id + security_groups = [data.terraform_remote_state.setup_iac.outputs.security_group_private_id] +} + +# Define deployment task and service +resource "aws_ecs_task_definition" "aztec_mainnet_fork" { + family = "aztec-mainnet-fork" + requires_compatibilities = ["FARGATE"] + network_mode = "awsvpc" + cpu = "2048" + memory = "4096" + execution_role_arn = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn + + volume { + name = "efs-data-store" + efs_volume_configuration { + file_system_id = aws_efs_file_system.aztec_mainnet_fork_data_store.id + } + } + + container_definitions = < Date: Mon, 23 Oct 2023 11:56:02 +0000 Subject: [PATCH 2/7] Use aztec2 ALB --- build_manifest.yml | 4 +++ iac/main.tf | 24 ------------- iac/mainnet-fork/terraform/main.tf | 56 +++++++++++++++++++++--------- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/build_manifest.yml b/build_manifest.yml index c3d413b15527..031e74396620 100644 --- a/build_manifest.yml +++ b/build_manifest.yml @@ -174,6 +174,10 @@ p2p-bootstrap: dependencies: - yarn-project +mainnet-fork: + buildDir: iac/mainnet-fork + projectDir: iac/mainnet-fork + docs: buildDir: . dockerfile: docs/Dockerfile diff --git a/iac/main.tf b/iac/main.tf index 821a7c1c57a9..6c088f4042d7 100644 --- a/iac/main.tf +++ b/iac/main.tf @@ -50,30 +50,6 @@ resource "aws_lb" "aztec-network" { } } -# Create our application load balancer. -resource "aws_alb" "aztec-network-alb" { - name = "aztec-network-alb" - internal = false - load_balancer_type = "application" - security_groups = [ - data.terraform_remote_state.setup_iac.outputs.security_group_public_id - ] - subnets = [ - data.terraform_remote_state.setup_iac.outputs.subnet_az1_id, - data.terraform_remote_state.setup_iac.outputs.subnet_az2_id - ] - - access_logs { - bucket = "aztec-logs" - prefix = "aztec3-alb-logs" - enabled = true - } - - tags = { - Name = "aztec3" - } -} - resource "aws_security_group" "security-group-p2p" { name = "security-group-p2p" description = "Allow inbound p2p traffic" diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf index 06ff54ed605e..fadd7d3412bb 100644 --- a/iac/mainnet-fork/terraform/main.tf +++ b/iac/mainnet-fork/terraform/main.tf @@ -41,7 +41,7 @@ data "terraform_remote_state" "aztec2_iac" { data "aws_alb" "aztec-network-alb" { - arn = data.terraform_remote_state.aztec-network_iac.outputs.alb_arn + arn = data.terraform_remote_state.aztec2_iac.outputs.alb_arn } provider "aws" { @@ -174,26 +174,48 @@ DEFINITION } -# Configure ALB listener. -resource "aws_alb_listener" "mainnet-fork-listener" { - load_balancer_arn = data.aws_alb.aztec-network-alb.arn - port = "8545" - protocol = "HTTPS" - ssl_policy = "ELBSecurityPolicy-2016-08" - certificate_arn = data.terraform_remote_state.aztec2_iac.outputs.aws_acm_certificate_aztec_network_arn +# ALB to to limit public requests to apikey routes +resource "aws_alb_target_group" "mainnet_fork" { + name = "aztec-network-mainnet-fork" + port = "80" + protocol = "HTTP" + target_type = "ip" + vpc_id = data.terraform_remote_state.setup_iac.outputs.vpc_id + deregistration_delay = 5 + depends_on = [ + data.aws_alb.aztec2 + ] - default_action { - type = "fixed-response" + health_check { + path = "/" + matcher = "404,400" + interval = 300 + healthy_threshold = 2 + unhealthy_threshold = 10 + timeout = 120 + } - fixed_response { - content_type = "text/plain" - message_body = "Not found." - status_code = "404" - } + tags = { + name = "aztec-network-mainnet-fork" } } +resource "aws_lb_listener_rule" "mainnet_fork_route" { + listener_arn = data.terraform_remote_state.aztec2_iac.outputs.mainnet-fork-listener-id + + action { + type = "forward" + target_group_arn = aws_alb_target_group.mainnet_fork.arn + } + + condition { + host_header { + values = ["aztec-network-mainnet-fork.aztec.network"] + } + } +} + resource "aws_ecs_service" "aztec_mainnet_fork" { name = "aztec-mainnet-fork" cluster = data.terraform_remote_state.setup_iac.outputs.ecs_cluster_id @@ -240,7 +262,7 @@ resource "aws_alb_target_group" "aztec_mainnet_fork" { vpc_id = data.terraform_remote_state.setup_iac.outputs.vpc_id deregistration_delay = 5 depends_on = [ - data.aws_alb.aztec-network-alb + data.aws_alb.aztec2 ] health_check { @@ -268,7 +290,7 @@ resource "aws_lb_listener_rule" "aztec_mainnet_fork_route" { condition { host_header { - values = ["aztec-mainnet-fork.aztec.network"] + values = ["mainnet-fork.aztec.network"] } } } From 0adedc8b1b8536d8e4583e8b1d651b77d05b24a4 Mon Sep 17 00:00:00 2001 From: spypsy Date: Mon, 23 Oct 2023 18:20:04 +0100 Subject: [PATCH 3/7] Fixes --- build_manifest.yml | 2 +- iac/mainnet-fork/terraform/main.tf | 45 ++++++++++++------------- iac/mainnet-fork/terraform/variables.tf | 5 --- iac/output.tf | 10 ++---- 4 files changed, 26 insertions(+), 36 deletions(-) diff --git a/build_manifest.yml b/build_manifest.yml index 031e74396620..fcbff3b1be41 100644 --- a/build_manifest.yml +++ b/build_manifest.yml @@ -174,7 +174,7 @@ p2p-bootstrap: dependencies: - yarn-project -mainnet-fork: +aztec-mainnet-fork: buildDir: iac/mainnet-fork projectDir: iac/mainnet-fork diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf index fadd7d3412bb..ca46ad2a9701 100644 --- a/iac/mainnet-fork/terraform/main.tf +++ b/iac/mainnet-fork/terraform/main.tf @@ -1,7 +1,7 @@ terraform { backend "s3" { bucket = "aztec-terraform" - key = "aztec-network/iac" + key = "aztec-network/mainnet-fork" region = "eu-west-2" } required_providers { @@ -40,7 +40,7 @@ data "terraform_remote_state" "aztec2_iac" { } -data "aws_alb" "aztec-network-alb" { +data "aws_alb" "aztec-network_alb" { arn = data.terraform_remote_state.aztec2_iac.outputs.alb_arn } @@ -50,7 +50,7 @@ provider "aws" { } resource "aws_service_discovery_service" "aztec_mainnet_fork" { - name = "aztec-mainnet-fork" + name = "aztec-network-mainnet-fork" health_check_custom_config { failure_threshold = 1 @@ -80,10 +80,10 @@ resource "aws_service_discovery_service" "aztec_mainnet_fork" { # EFS filesystem for mainnet fork resource "aws_efs_file_system" "aztec_mainnet_fork_data_store" { - creation_token = "aztec-mainnet-fork-data" + creation_token = "aztec-network-mainnet-fork-data" tags = { - Name = "aztec-mainnet-fork-data" + Name = "aztec-network-mainnet-fork-data" } lifecycle_policy { @@ -105,7 +105,7 @@ resource "aws_efs_mount_target" "aztec_fork_private_az2" { # Define deployment task and service resource "aws_ecs_task_definition" "aztec_mainnet_fork" { - family = "aztec-mainnet-fork" + family = "aztec-network-mainnet-fork" requires_compatibilities = ["FARGATE"] network_mode = "awsvpc" cpu = "2048" @@ -122,10 +122,9 @@ resource "aws_ecs_task_definition" "aztec_mainnet_fork" { container_definitions = < Date: Tue, 24 Oct 2023 11:15:47 +0100 Subject: [PATCH 4/7] Add build step to circleCI --- .circleci/config.yml | 13 +++++++++++++ build_manifest.yml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff3c13631a61..6284197e53e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -465,6 +465,17 @@ jobs: name: "Build and test" command: build aztec-node | add_timestamps + mainnet-fork: + machine: + image: ubuntu-2204:2023.07.2 + resource_class: large + steps: + - *checkout + - *setup_env + - run: + name: "Build" + command: build mainnet-fork | add_timestamps + aztec-faucet: machine: image: ubuntu-2204:2023.07.2 @@ -1222,6 +1233,8 @@ workflows: - l1-contracts: *defaults - noir-contracts-build: *defaults + - mainnet-fork: *defaults + # Yarn Project - yarn-project-base: requires: diff --git a/build_manifest.yml b/build_manifest.yml index fcbff3b1be41..031e74396620 100644 --- a/build_manifest.yml +++ b/build_manifest.yml @@ -174,7 +174,7 @@ p2p-bootstrap: dependencies: - yarn-project -aztec-mainnet-fork: +mainnet-fork: buildDir: iac/mainnet-fork projectDir: iac/mainnet-fork From 7444f3a20259230fb6fb3f58e0b65f0e5a7d6782 Mon Sep 17 00:00:00 2001 From: spypsy Date: Tue, 24 Oct 2023 11:27:18 +0100 Subject: [PATCH 5/7] Fix TF typo Co-authored-by: PhilWindle <60546371+PhilWindle@users.noreply.github.com> --- iac/mainnet-fork/terraform/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf index ca46ad2a9701..7714dc8e861d 100644 --- a/iac/mainnet-fork/terraform/main.tf +++ b/iac/mainnet-fork/terraform/main.tf @@ -210,7 +210,7 @@ resource "aws_lb_listener_rule" "mainnet_fork_route" { condition { host_header { - values = ["aztec-network-mainnet-fork.aztec.networkq"] + values = ["aztec-network-mainnet-fork.aztec.network"] } } } From bcc06cf299c3662eca44932883bd58352511c15d Mon Sep 17 00:00:00 2001 From: spypsy Date: Tue, 24 Oct 2023 11:58:56 +0100 Subject: [PATCH 6/7] PR + nginx fixes --- iac/mainnet-fork/scripts/run_nginx_anvil.sh | 4 +++ iac/mainnet-fork/terraform/main.tf | 33 +-------------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/iac/mainnet-fork/scripts/run_nginx_anvil.sh b/iac/mainnet-fork/scripts/run_nginx_anvil.sh index 1c95837ac1b5..4b701f132560 100755 --- a/iac/mainnet-fork/scripts/run_nginx_anvil.sh +++ b/iac/mainnet-fork/scripts/run_nginx_anvil.sh @@ -2,6 +2,10 @@ set -eum pipefail +# Replace API_KEY in nginx config +echo "Replacing api key with $API_KEY in nginx config..." +sed -i 's/{{API_KEY}}/'$API_KEY'/' /etc/nginx/gateway.conf + # Run nginx and anvil alongside each other trap 'kill $(jobs -p)' SIGTERM diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf index 7714dc8e861d..f7ea557e96f6 100644 --- a/iac/mainnet-fork/terraform/main.tf +++ b/iac/mainnet-fork/terraform/main.tf @@ -71,11 +71,6 @@ resource "aws_service_discovery_service" "aztec_mainnet_fork" { routing_policy = "MULTIVALUE" } - - provisioner "local-exec" { - when = destroy - command = "${path.module}/../servicediscovery-drain.sh ${self.id}" - } } # EFS filesystem for mainnet fork @@ -186,7 +181,7 @@ resource "aws_alb_target_group" "mainnet_fork" { ] health_check { - path = "/" + path = "/${var.FORK_API_KEY}" matcher = "404,400" interval = 300 healthy_threshold = 2 @@ -252,32 +247,6 @@ resource "aws_cloudwatch_log_group" "aztec_mainnet_fork_logs" { retention_in_days = "14" } -# ALB to to limit public requests to apikey routes -resource "aws_alb_target_group" "aztec_mainnet_fork" { - name = "aztec-network-mainnet-fork" - port = "80" - protocol = "HTTP" - target_type = "ip" - vpc_id = data.terraform_remote_state.setup_iac.outputs.vpc_id - deregistration_delay = 5 - depends_on = [ - data.aws_alb.aztec-network_alb - ] - - health_check { - path = "/" - matcher = "404,400" - interval = 300 - healthy_threshold = 2 - unhealthy_threshold = 10 - timeout = 120 - } - - tags = { - name = "aztec-network-mainnet-fork" - } -} - resource "aws_lb_listener_rule" "aztec_mainnet_fork_route" { # listener_arn = data.terraform_remote_state.setup_iac.outputs.mainnet-fork-listener-id listener_arn = data.terraform_remote_state.aztec2_iac.outputs.mainnet-fork-listener-id From 457535390e08cc25d9ae083df06f093f91b72623 Mon Sep 17 00:00:00 2001 From: spypsy Date: Wed, 25 Oct 2023 14:39:42 +0100 Subject: [PATCH 7/7] use ECR_URL --- iac/mainnet-fork/terraform/main.tf | 2 +- iac/mainnet-fork/terraform/variables.tf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf index f7ea557e96f6..beb2ab353576 100644 --- a/iac/mainnet-fork/terraform/main.tf +++ b/iac/mainnet-fork/terraform/main.tf @@ -118,7 +118,7 @@ resource "aws_ecs_task_definition" "aztec_mainnet_fork" { [ { "name": "aztec-network-mainnet-fork", - "image": "278380418400.dkr.ecr.eu-west-2.amazonaws.com/aztec-mainnet-fork:aztec3-packages-prod", + "image": "${var.ECR_URL}/aztec-mainnet-fork:aztec3-packages-prod", "essential": true, "environment": [ { diff --git a/iac/mainnet-fork/terraform/variables.tf b/iac/mainnet-fork/terraform/variables.tf index ae3e85ee695e..611e9b677188 100644 --- a/iac/mainnet-fork/terraform/variables.tf +++ b/iac/mainnet-fork/terraform/variables.tf @@ -9,3 +9,7 @@ variable "FORK_MNEMONIC" { variable "FORK_API_KEY" { type = string } + +variable "ECR_URL" { + type = string +}