From 4dc91d73620c78aabd083e4f13188111cd4f2d00 Mon Sep 17 00:00:00 2001 From: spypsy Date: Mon, 4 Dec 2023 17:22:32 +0000 Subject: [PATCH 1/4] fix(ci): faucet chainID & don't deploy contracts from node --- yarn-project/aztec-faucet/terraform/variables.tf | 3 ++- yarn-project/aztec-node/terraform/main.tf | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/yarn-project/aztec-faucet/terraform/variables.tf b/yarn-project/aztec-faucet/terraform/variables.tf index ae556c6c842..42ed1838367 100644 --- a/yarn-project/aztec-faucet/terraform/variables.tf +++ b/yarn-project/aztec-faucet/terraform/variables.tf @@ -17,7 +17,8 @@ variable "API_PREFIX" { } variable "CHAIN_ID" { - type = string + type = string + default = 31337 } variable "FAUCET_PRIVATE_KEY" { diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf index e70980cb72c..9916b82e7be 100644 --- a/yarn-project/aztec-node/terraform/main.tf +++ b/yarn-project/aztec-node/terraform/main.tf @@ -140,6 +140,10 @@ resource "aws_ecs_task_definition" "aztec-node" { "name": "DEPLOY_TAG", "value": "${var.DEPLOY_TAG}" }, + { + "name": "DEPLOY_AZTEC_CONTRACTS", + "value": "false" + }, { "name": "AZTEC_NODE_PORT", "value": "80" From 2052495571a48210bc2d364665581cb3918112d5 Mon Sep 17 00:00:00 2001 From: spypsy Date: Mon, 4 Dec 2023 17:49:27 +0000 Subject: [PATCH 2/4] CHAIN_ID in createTestnetChain --- yarn-project/ethereum/src/testnet.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/ethereum/src/testnet.ts b/yarn-project/ethereum/src/testnet.ts index 4c3694f9361..83deeddc164 100644 --- a/yarn-project/ethereum/src/testnet.ts +++ b/yarn-project/ethereum/src/testnet.ts @@ -2,11 +2,11 @@ import { Chain } from 'viem'; import { EthereumChain } from './ethereum_chain.js'; -const { DEPLOY_TAG = 'aztec-dev' } = process.env; +const { DEPLOY_TAG = 'aztec-dev', CHAIN_ID = 31337 } = process.env; export const createTestnetChain = (apiKey: string) => { const chain: Chain = { - id: 677868, + id: +CHAIN_ID, name: 'testnet', network: 'aztec', nativeCurrency: { From 7cc24ef4cbf3079641b6479fcdafc278eee2c728 Mon Sep 17 00:00:00 2001 From: spypsy Date: Mon, 4 Dec 2023 17:56:45 +0000 Subject: [PATCH 3/4] use full ETHEREUM_HOST --- yarn-project/aztec-node/terraform/main.tf | 2 +- yarn-project/aztec-node/terraform/variables.tf | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf index 9916b82e7be..4c5cdcb47df 100644 --- a/yarn-project/aztec-node/terraform/main.tf +++ b/yarn-project/aztec-node/terraform/main.tf @@ -154,7 +154,7 @@ resource "aws_ecs_task_definition" "aztec-node" { }, { "name": "ETHEREUM_HOST", - "value": "testnet" + "value": "https://${var.DEPLOY_TAG}-mainnet-fork.aztec.network:8545/${var.API_KEY}" }, { "name": "ARCHIVER_POLLING_INTERVAL", diff --git a/yarn-project/aztec-node/terraform/variables.tf b/yarn-project/aztec-node/terraform/variables.tf index 30e0f59f597..fbf4665c85a 100644 --- a/yarn-project/aztec-node/terraform/variables.tf +++ b/yarn-project/aztec-node/terraform/variables.tf @@ -2,6 +2,11 @@ variable "DEPLOY_TAG" { type = string } +variable "ETHEREUM_HOST" { + type = string + default = "testnet" +} + variable "API_KEY" { type = string } From 287d1d5876f2ab954aca35edacbdb30c25217930 Mon Sep 17 00:00:00 2001 From: spypsy Date: Mon, 4 Dec 2023 18:02:28 +0000 Subject: [PATCH 4/4] remove var --- yarn-project/aztec-node/terraform/variables.tf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/yarn-project/aztec-node/terraform/variables.tf b/yarn-project/aztec-node/terraform/variables.tf index fbf4665c85a..30e0f59f597 100644 --- a/yarn-project/aztec-node/terraform/variables.tf +++ b/yarn-project/aztec-node/terraform/variables.tf @@ -2,11 +2,6 @@ variable "DEPLOY_TAG" { type = string } -variable "ETHEREUM_HOST" { - type = string - default = "testnet" -} - variable "API_KEY" { type = string }