From ed83c3c82d03e8d80cacfdc3e77389f106ef2654 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 10:20:59 +0000
Subject: [PATCH 01/16] Configure sandbox for network

---
 yarn-project/aztec-node/terraform/main.tf    |  4 +-
 yarn-project/aztec-sandbox/src/bin/index.ts  | 13 ++++-
 yarn-project/aztec-sandbox/src/sandbox.ts    | 51 +++++++++++++-------
 yarn-project/p2p-bootstrap/terraform/main.tf |  4 +-
 yarn-project/sequencer-client/src/config.ts  |  4 +-
 5 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index 7f64a6d9f1d..bc62fa3060b 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -99,7 +99,7 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-1",
-    "image": "${var.ECR_URL}/aztec-node:latest",
+    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
@@ -392,7 +392,7 @@ resource "aws_ecs_task_definition" "aztec-node-2" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-2",
-    "image": "${var.ECR_URL}/aztec-node:latest",
+    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
diff --git a/yarn-project/aztec-sandbox/src/bin/index.ts b/yarn-project/aztec-sandbox/src/bin/index.ts
index 184ca5ad707..db3e148ab52 100644
--- a/yarn-project/aztec-sandbox/src/bin/index.ts
+++ b/yarn-project/aztec-sandbox/src/bin/index.ts
@@ -22,11 +22,20 @@ const logger = createDebugLogger('aztec:sandbox');
  * Creates the sandbox from provided config and deploys any initial L1 and L2 contracts
  */
 async function createAndInitialiseSandbox() {
-  const { l1Contracts, node, pxe, stop } = await createSandbox();
+  const { aztecNodeConfig, node, pxe, stop } = await createSandbox();
   logger.info('Setting up test accounts...');
+  if (aztecNodeConfig.p2pEnabled) {
+    return {
+      aztecNodeConfig,
+      pxe,
+      node,
+      stop,
+      accounts: [],
+    };
+  }
   const accounts = await deployInitialSandboxAccounts(pxe);
   return {
-    l1Contracts,
+    aztecNodeConfig,
     pxe,
     node,
     stop,
diff --git a/yarn-project/aztec-sandbox/src/sandbox.ts b/yarn-project/aztec-sandbox/src/sandbox.ts
index 81ba9429050..b62bf26a54f 100644
--- a/yarn-project/aztec-sandbox/src/sandbox.ts
+++ b/yarn-project/aztec-sandbox/src/sandbox.ts
@@ -22,7 +22,7 @@ import {
 } from '@aztec/l1-artifacts';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe';
 
-import { createPublicClient, http as httpViemTransport } from 'viem';
+import { HDAccount, Hex, createPublicClient, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
@@ -65,23 +65,12 @@ async function waitThenDeploy(config: AztecNodeConfig, deployFunction: () => Pro
   return await deployFunction();
 }
 
-/** Sandbox settings. */
-export type SandboxConfig = AztecNodeConfig & {
-  /** Mnemonic used to derive the L1 deployer private key.*/
-  l1Mnemonic: string;
-};
-
 /**
- * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
- * Does not start any HTTP services nor populate any initial accounts.
- * @param config - Optional Sandbox settings.
+ * Function to deploy our L1 contracts to the sandbox L1
+ * @param aztecNodeConfig - The Aztec Node Config
+ * @param hdAccount - Account for publishing L1 contracts
  */
-export async function createSandbox(config: Partial<SandboxConfig> = {}) {
-  const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars(), ...config };
-  const pxeServiceConfig = getPXEServiceConfig();
-  const hdAccount = mnemonicToAccount(config.l1Mnemonic ?? MNEMONIC);
-  const privKey = hdAccount.getHdKey().privateKey;
-
+async function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount) {
   const l1Artifacts: L1ContractArtifactsForDeployment = {
     contractDeploymentEmitter: {
       contractAbi: ContractDeploymentEmitterAbi,
@@ -108,12 +97,38 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
   const l1Contracts = await waitThenDeploy(aztecNodeConfig, () =>
     deployL1Contracts(aztecNodeConfig.rpcUrl, hdAccount, localAnvil, logger, l1Artifacts),
   );
-  aztecNodeConfig.publisherPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
   aztecNodeConfig.l1Contracts.rollupAddress = l1Contracts.l1ContractAddresses.rollupAddress;
   aztecNodeConfig.l1Contracts.contractDeploymentEmitterAddress =
     l1Contracts.l1ContractAddresses.contractDeploymentEmitterAddress;
   aztecNodeConfig.l1Contracts.inboxAddress = l1Contracts.l1ContractAddresses.inboxAddress;
   aztecNodeConfig.l1Contracts.registryAddress = l1Contracts.l1ContractAddresses.registryAddress;
+  return l1Contracts;
+}
+
+/** Sandbox settings. */
+export type SandboxConfig = AztecNodeConfig & {
+  /** Mnemonic used to derive the L1 deployer private key.*/
+  l1Mnemonic: string;
+};
+
+/**
+ * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
+ * Does not start any HTTP services nor populate any initial accounts.
+ * @param config - Optional Sandbox settings.
+ */
+export async function createSandbox(config: Partial<SandboxConfig> = {}) {
+  const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars(), ...config };
+  const pxeServiceConfig = getPXEServiceConfig();
+  const hdAccount = mnemonicToAccount(config.l1Mnemonic ?? MNEMONIC);
+  const emptyKey: Hex = `0x${'0000000000000000000000000000000000000000000000000000000000000000'}`;
+  if (aztecNodeConfig.publisherPrivateKey === emptyKey) {
+    const privKey = hdAccount.getHdKey().privateKey;
+    aztecNodeConfig.publisherPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
+  }
+
+  if (aztecNodeConfig.p2pEnabled === false) {
+    await deployContractsToL1(aztecNodeConfig, hdAccount);
+  }
 
   const node = await AztecNodeService.createAndSync(aztecNodeConfig);
   const pxe = await createPXEService(node, pxeServiceConfig);
@@ -123,5 +138,5 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
     await node.stop();
   };
 
-  return { node, pxe, l1Contracts, stop };
+  return { node, pxe, aztecNodeConfig, stop };
 }
diff --git a/yarn-project/p2p-bootstrap/terraform/main.tf b/yarn-project/p2p-bootstrap/terraform/main.tf
index cd3e4d591c1..8e44f28913d 100644
--- a/yarn-project/p2p-bootstrap/terraform/main.tf
+++ b/yarn-project/p2p-bootstrap/terraform/main.tf
@@ -97,7 +97,7 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-1" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-bootstrap-1",
-    "image": "${var.ECR_URL}/p2p-bootstrap:latest",
+    "image": "${var.ECR_URL}/p2p-bootstrap:aztec3-packages-prod",
     "essential": true,
     "command": ["start"],
     "memoryReservation": 3776,
@@ -273,7 +273,7 @@ resource "aws_ecs_task_definition" "aztec-bootstrap-2" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-bootstrap-2",
-    "image": "${var.ECR_URL}/p2p-bootstrap:latest",
+    "image": "${var.ECR_URL}/p2p-bootstrap:aztec3-packages-prod",
     "essential": true,
     "command": ["start"],
     "memoryReservation": 3776,
diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts
index 5ceffb81a41..019aadf53ce 100644
--- a/yarn-project/sequencer-client/src/config.ts
+++ b/yarn-project/sequencer-client/src/config.ts
@@ -1,6 +1,8 @@
 import { L1ContractAddresses } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
+import { Hex } from 'viem';
+
 import { GlobalReaderConfig } from './global_variable_builder/index.js';
 import { PublisherConfig, TxSenderConfig } from './publisher/config.js';
 import { SequencerConfig } from './sequencer/config.js';
@@ -43,7 +45,7 @@ export function getConfigEnvVars(): SequencerClientConfig {
     CONTRACT_DEPLOYMENT_EMITTER_ADDRESS,
   } = process.env;
 
-  const publisherPrivateKey: `0x${string}` = `0x${
+  const publisherPrivateKey: Hex = `0x${
     SEQ_PUBLISHER_PRIVATE_KEY
       ? SEQ_PUBLISHER_PRIVATE_KEY.replace('0x', '')
       : '0000000000000000000000000000000000000000000000000000000000000000'

From ba8165bd5ce404be60f56b8a1805ab18513de322 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 14:37:06 +0000
Subject: [PATCH 02/16] Fix chain id

---
 .../aztec-node/src/aztec-node/server.ts       | 12 ++++++---
 yarn-project/aztec-sandbox/src/bin/index.ts   |  5 ++--
 yarn-project/cli/src/index.ts                 |  6 +++--
 yarn-project/sequencer-client/src/config.ts   |  4 ---
 .../src/sequencer/sequencer.ts                | 26 ++++++++++++-------
 5 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index 08bab77942a..caaf437956e 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -73,7 +73,7 @@ export class AztecNodeService implements AztecNode {
     private log = createDebugLogger('aztec:node'),
   ) {
     const message =
-      `Started Aztec Node with contracts - \n` +
+      `Started Aztec Node against chain ${chainId.toString(16)} with contracts - \n` +
       `Rollup: ${config.l1Contracts.rollupAddress.toString()}\n` +
       `Registry: ${config.l1Contracts.registryAddress.toString()}\n` +
       `Inbox: ${config.l1Contracts.inboxAddress.toString()}\n` +
@@ -91,6 +91,12 @@ export class AztecNodeService implements AztecNode {
     // first create and sync the archiver
     const archiver = await Archiver.createAndSync(config);
 
+    // get the chain id here
+    const lastBlockNumber = await archiver.getBlockNumber();
+    const globalVariableBuilder = getGlobalVariableBuilder(config);
+    // just use the next block number for this query
+    const globalVariables = await globalVariableBuilder.buildGlobalVariables(new Fr(lastBlockNumber + 1));
+
     // we identify the P2P transaction protocol by using the rollup contract address.
     // this may well change in future
     config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
@@ -122,9 +128,9 @@ export class AztecNodeService implements AztecNode {
       archiver,
       worldStateSynchronizer,
       sequencer,
-      config.chainId,
+      Number(globalVariables.chainId.value),
       config.version,
-      getGlobalVariableBuilder(config),
+      globalVariableBuilder,
       db,
     );
   }
diff --git a/yarn-project/aztec-sandbox/src/bin/index.ts b/yarn-project/aztec-sandbox/src/bin/index.ts
index db3e148ab52..ca1aa4d16b9 100644
--- a/yarn-project/aztec-sandbox/src/bin/index.ts
+++ b/yarn-project/aztec-sandbox/src/bin/index.ts
@@ -23,8 +23,8 @@ const logger = createDebugLogger('aztec:sandbox');
  */
 async function createAndInitialiseSandbox() {
   const { aztecNodeConfig, node, pxe, stop } = await createSandbox();
-  logger.info('Setting up test accounts...');
   if (aztecNodeConfig.p2pEnabled) {
+    logger.info(`Not setting up test accounts as we are connecting to a network`);
     return {
       aztecNodeConfig,
       pxe,
@@ -33,6 +33,7 @@ async function createAndInitialiseSandbox() {
       accounts: [],
     };
   }
+  logger.info('Setting up test accounts...');
   const accounts = await deployInitialSandboxAccounts(pxe);
   return {
     aztecNodeConfig,
@@ -69,7 +70,7 @@ async function main() {
   startHttpRpcServer(pxe, createPXERpcServer, PXE_PORT);
   logger.info(`PXE JSON-RPC Server listening on port ${PXE_PORT}`);
   logger.info(`Debug logs will be written to ${logPath}`);
-  const accountStrings = [`Initial Accounts:\n\n`];
+  const accountStrings = accounts.length ? [`Initial Accounts:\n\n`] : [];
 
   const registeredAccounts = await pxe.getRegisteredAccounts();
   for (const account of accounts) {
diff --git a/yarn-project/cli/src/index.ts b/yarn-project/cli/src/index.ts
index 6ac81cd4af2..6a43362609b 100644
--- a/yarn-project/cli/src/index.ts
+++ b/yarn-project/cli/src/index.ts
@@ -218,14 +218,16 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const args = encodeArgs(rawArgs, constructorArtifact!.parameters);
       debugLogger(`Encoded arguments: ${args.join(', ')}`);
 
-      const tx = deployer.deploy(...args).send({ contractAddressSalt: salt });
+      const deployMethod = deployer.deploy(...args);
+      const tx = deployMethod.send({ contractAddressSalt: salt });
       const txHash = await tx.getTxHash();
       debugLogger(`Deploy tx sent with hash ${txHash}`);
       if (wait) {
         const deployed = await tx.wait();
         log(`\nContract deployed at ${deployed.contractAddress!.toString()}\n`);
       } else {
-        log(`\nDeployment transaction hash: ${txHash}\n`);
+        log(`\nContract Address: ${deployMethod.completeAddress?.address.toString() ?? 'N/A'}`);
+        log(`Deployment transaction hash: ${txHash}\n`);
       }
     });
 
diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts
index 019aadf53ce..5f7aed23b63 100644
--- a/yarn-project/sequencer-client/src/config.ts
+++ b/yarn-project/sequencer-client/src/config.ts
@@ -9,8 +9,6 @@ import { SequencerConfig } from './sequencer/config.js';
 
 /** Chain configuration. */
 type ChainConfig = {
-  /** The chain id of the ethereum host. */
-  chainId: number;
   /** The version of the rollup. */
   version: number;
 };
@@ -31,7 +29,6 @@ export function getConfigEnvVars(): SequencerClientConfig {
   const {
     SEQ_PUBLISHER_PRIVATE_KEY,
     ETHEREUM_HOST,
-    CHAIN_ID,
     VERSION,
     API_KEY,
     SEQ_REQUIRED_CONFS,
@@ -64,7 +61,6 @@ export function getConfigEnvVars(): SequencerClientConfig {
 
   return {
     rpcUrl: ETHEREUM_HOST ? ETHEREUM_HOST : '',
-    chainId: CHAIN_ID ? +CHAIN_ID : 31337, // 31337 is the default chain id for anvil
     version: VERSION ? +VERSION : 1, // 1 is our default version
     apiKey: API_KEY,
     requiredConfirmations: SEQ_REQUIRED_CONFS ? +SEQ_REQUIRED_CONFS : 1,
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index c2014632262..ec2e9865e5a 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -130,17 +130,17 @@ export class Sequencer {
       if (pendingTxs.length < this.minTxsPerBLock) return;
       this.log.info(`Retrieved ${pendingTxs.length} txs from P2P pool`);
 
+      const blockNumber = (await this.l2BlockSource.getBlockNumber()) + 1;
+      const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(blockNumber));
+
       // Filter out invalid txs
       // TODO: It should be responsibility of the P2P layer to validate txs before passing them on here
-      const validTxs = await this.takeValidTxs(pendingTxs);
+      const validTxs = await this.takeValidTxs(pendingTxs, newGlobalVariables);
       if (validTxs.length < this.minTxsPerBLock) return;
 
-      const blockNumber = (await this.l2BlockSource.getBlockNumber()) + 1;
-
       this.log.info(`Building block ${blockNumber} with ${validTxs.length} transactions`);
       this.state = SequencerState.CREATING_BLOCK;
 
-      const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(new Fr(blockNumber));
       const prevGlobalVariables = (await this.l2BlockSource.getL2Block(-1))?.globalVariables ?? GlobalVariables.empty();
 
       // Process txs and drop the ones that fail processing
@@ -240,16 +240,24 @@ export class Sequencer {
     }
   }
 
-  protected async takeValidTxs<T extends Tx | ProcessedTx>(txs: T[]): Promise<T[]> {
+  protected async takeValidTxs<T extends Tx | ProcessedTx>(txs: T[], globalVariables: GlobalVariables): Promise<T[]> {
     const validTxs: T[] = [];
-    const doubleSpendTxs = [];
+    const txsToDelete = [];
     const thisBlockNullifiers: Set<bigint> = new Set();
 
     // Process txs until we get to maxTxsPerBlock, rejecting double spends in the process
     for (const tx of txs) {
+      if (tx.data.constants.txContext.chainId !== globalVariables.chainId) {
+        this.log(
+          `Deleting tx for incorrect chain ${tx.data.constants.txContext.chainId.toString()}, tx hash ${await Tx.getHash(
+            tx,
+          )}`,
+        );
+        txsToDelete.push(tx);
+      }
       if (await this.isTxDoubleSpend(tx)) {
         this.log(`Deleting double spend tx ${await Tx.getHash(tx)}`);
-        doubleSpendTxs.push(tx);
+        txsToDelete.push(tx);
         continue;
       } else if (this.isTxDoubleSpendSameBlock(tx, thisBlockNullifiers)) {
         // We don't drop these txs from the p2p pool immediately since they become valid
@@ -264,8 +272,8 @@ export class Sequencer {
     }
 
     // Make sure we remove these from the tx pool so we do not consider it again
-    if (doubleSpendTxs.length > 0) {
-      await this.p2pClient.deleteTxs(await Tx.getHashes([...doubleSpendTxs]));
+    if (txsToDelete.length > 0) {
+      await this.p2pClient.deleteTxs(await Tx.getHashes([...txsToDelete]));
     }
 
     return validTxs;

From c7a5e392bd4684f74b81f8c20cf2aa1c6463ab6b Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 14:38:29 +0000
Subject: [PATCH 03/16] Fix

---
 yarn-project/sequencer-client/src/sequencer/sequencer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index ec2e9865e5a..6470f494235 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -254,6 +254,7 @@ export class Sequencer {
           )}`,
         );
         txsToDelete.push(tx);
+        continue;
       }
       if (await this.isTxDoubleSpend(tx)) {
         this.log(`Deleting double spend tx ${await Tx.getHash(tx)}`);

From d9cd0befe7a25e80ef809dd8c9e435ee9b60b741 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 14:44:01 +0000
Subject: [PATCH 04/16] Test fix

---
 .../end-to-end/src/integration_l1_publisher.test.ts    | 10 ++++++----
 .../sequencer-client/src/sequencer/sequencer.ts        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
index 5875d3af99a..65e7ea2a672 100644
--- a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
+++ b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
@@ -87,6 +87,8 @@ describe('L1Publisher integration', () => {
   // The global variables of the last rollup
   let prevGlobals: GlobalVariables;
 
+  const chainId = 1;
+
   beforeEach(async () => {
     deployerAccount = privateKeyToAccount(deployerPK);
     const {
@@ -148,7 +150,7 @@ describe('L1Publisher integration', () => {
     const historicTreeRoots = await getHistoricBlockData(builderDb, prevGlobals);
     const tx = await makeEmptyProcessedTxFromHistoricTreeRoots(
       historicTreeRoots,
-      new Fr(config.chainId),
+      new Fr(chainId),
       new Fr(config.version),
     );
     return tx;
@@ -157,7 +159,7 @@ describe('L1Publisher integration', () => {
   const makeBloatedProcessedTx = async (seed = 0x1) => {
     const tx = mockTx(seed);
     const kernelOutput = KernelCircuitPublicInputs.empty();
-    kernelOutput.constants.txContext.chainId = fr(config.chainId);
+    kernelOutput.constants.txContext.chainId = fr(chainId);
     kernelOutput.constants.txContext.version = fr(config.version);
     kernelOutput.constants.blockData = await getHistoricBlockData(builderDb, prevGlobals);
     kernelOutput.end.publicDataUpdateRequests = makeTuple(
@@ -267,7 +269,7 @@ describe('L1Publisher integration', () => {
         await makeBloatedProcessedTx(totalNullifiersPerBlock * i + 4 * MAX_NEW_NULLIFIERS_PER_TX),
       ];
       const globalVariables = new GlobalVariables(
-        new Fr(config.chainId),
+        new Fr(chainId),
         new Fr(config.version),
         new Fr(1 + i),
         new Fr(await rollup.read.lastBlockTs()),
@@ -359,7 +361,7 @@ describe('L1Publisher integration', () => {
         await makeEmptyProcessedTx(),
       ];
       const globalVariables = new GlobalVariables(
-        new Fr(config.chainId),
+        new Fr(chainId),
         new Fr(config.version),
         new Fr(1 + i),
         new Fr(await rollup.read.lastBlockTs()),
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index 6470f494235..74cdd060abd 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -157,7 +157,7 @@ export class Sequencer {
       // public functions emitting nullifiers would pass earlier check but fail here.
       // Note that we're checking all nullifiers generated in the private execution twice,
       // we could store the ones already checked and skip them here as an optimisation.
-      const processedValidTxs = await this.takeValidTxs(processedTxs);
+      const processedValidTxs = await this.takeValidTxs(processedTxs, newGlobalVariables);
 
       if (processedValidTxs.length === 0) {
         this.log('No txs processed correctly to build block. Exiting');

From 35c65e0de52c5da1eb7941d3848a20f1d51d5f75 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 14:53:35 +0000
Subject: [PATCH 05/16] Debug

---
 yarn-project/sequencer-client/src/sequencer/sequencer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index 74cdd060abd..9167b25b7ad 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -249,7 +249,7 @@ export class Sequencer {
     for (const tx of txs) {
       if (tx.data.constants.txContext.chainId !== globalVariables.chainId) {
         this.log(
-          `Deleting tx for incorrect chain ${tx.data.constants.txContext.chainId.toString()}, tx hash ${await Tx.getHash(
+          `Deleting tx for incorrect chain ${tx.data.constants.txContext.chainId.toString()}, global chain ${globalVariables.chainId.toString()}, tx hash ${await Tx.getHash(
             tx,
           )}`,
         );

From 40fe38d825fc40ad55212361a510a6d3c2d723ba Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 15:00:50 +0000
Subject: [PATCH 06/16] Fix

---
 yarn-project/sequencer-client/src/sequencer/sequencer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index 9167b25b7ad..42fdf313d33 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -247,7 +247,7 @@ export class Sequencer {
 
     // Process txs until we get to maxTxsPerBlock, rejecting double spends in the process
     for (const tx of txs) {
-      if (tx.data.constants.txContext.chainId !== globalVariables.chainId) {
+      if (tx.data.constants.txContext.chainId.value !== globalVariables.chainId.value) {
         this.log(
           `Deleting tx for incorrect chain ${tx.data.constants.txContext.chainId.toString()}, global chain ${globalVariables.chainId.toString()}, tx hash ${await Tx.getHash(
             tx,

From c8426ed49a3674e5eb191f414f79b77c46602cc4 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 18:30:59 +0000
Subject: [PATCH 07/16] Got rid of chain id from TF

---
 yarn-project/aztec-node/terraform/main.tf      | 12 ++----------
 yarn-project/aztec-node/terraform/variables.tf |  4 ----
 yarn-project/cli/src/index.ts                  |  4 ++--
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index bc62fa3060b..228a4ecde34 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -99,7 +99,7 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-1",
-    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
+    "image": "philwindle/aztec-node:latest",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
@@ -195,10 +195,6 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
         "name": "P2P_ENABLED",
         "value": "true"
       },
-      {
-        "name": "CHAIN_ID",
-        "value": "${var.CHAIN_ID}"
-      },
       {
         "name": "PEER_ID_PRIVATE_KEY",
         "value": "${var.NODE_1_PRIVATE_KEY}"
@@ -392,7 +388,7 @@ resource "aws_ecs_task_definition" "aztec-node-2" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-2",
-    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
+    "image": "philwindle/aztec-node:latest",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
@@ -488,10 +484,6 @@ resource "aws_ecs_task_definition" "aztec-node-2" {
         "name": "P2P_ENABLED",
         "value": "true"
       },
-      {
-        "name": "CHAIN_ID",
-        "value": "${var.CHAIN_ID}"
-      },
       {
         "name": "PEER_ID_PRIVATE_KEY",
         "value": "${var.NODE_2_PRIVATE_KEY}"
diff --git a/yarn-project/aztec-node/terraform/variables.tf b/yarn-project/aztec-node/terraform/variables.tf
index 789d7793f7f..67c2f77a0e5 100644
--- a/yarn-project/aztec-node/terraform/variables.tf
+++ b/yarn-project/aztec-node/terraform/variables.tf
@@ -26,10 +26,6 @@ variable "SEQ_2_PUBLISHER_PRIVATE_KEY" {
   type = string
 }
 
-variable "CHAIN_ID" {
-  type = string
-}
-
 variable "BOOTNODE_1_LISTEN_PORT" {
   type = string
 }
diff --git a/yarn-project/cli/src/index.ts b/yarn-project/cli/src/index.ts
index 6a43362609b..5b96a19c17d 100644
--- a/yarn-project/cli/src/index.ts
+++ b/yarn-project/cli/src/index.ts
@@ -460,7 +460,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const wallet = await getSchnorrAccount(client, privateKey, privateKey, accountCreationSalt).getWallet();
       const contract = await Contract.at(contractAddress, contractArtifact, wallet);
       const tx = contract.methods[functionName](...functionArgs).send();
-      log(`Transaction hash: ${(await tx.getTxHash()).toString()}`);
+      log(`\nTransaction hash: ${(await tx.getTxHash()).toString()}`);
       if (options.wait) {
         await tx.wait();
 
@@ -471,7 +471,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
         log(`Block number: ${receipt.blockNumber}`);
         log(`Block hash: ${receipt.blockHash?.toString('hex')}`);
       } else {
-        log('\nTransaction pending. Check status with get-tx-receipt');
+        log('Transaction pending. Check status with get-tx-receipt');
       }
     });
 

From ca7a3a342e5a158b542d7a3e8a079905dcc8aafc Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 18:32:31 +0000
Subject: [PATCH 08/16] TF fix

---
 yarn-project/aztec-node/terraform/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index 228a4ecde34..81d61b301c3 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -99,7 +99,7 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-1",
-    "image": "philwindle/aztec-node:latest",
+    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
@@ -388,7 +388,7 @@ resource "aws_ecs_task_definition" "aztec-node-2" {
 [
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-2",
-    "image": "philwindle/aztec-node:latest",
+    "image": "${var.ECR_URL}/aztec-node:aztec3-packages-prod",
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [

From da85b53a9035f9caaebe976a72c143fda786134e Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 18:38:22 +0000
Subject: [PATCH 09/16] Cleanup

---
 yarn-project/aztec-sandbox/src/sandbox.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/aztec-sandbox/src/sandbox.ts b/yarn-project/aztec-sandbox/src/sandbox.ts
index b62bf26a54f..3cb4276db8e 100644
--- a/yarn-project/aztec-sandbox/src/sandbox.ts
+++ b/yarn-project/aztec-sandbox/src/sandbox.ts
@@ -126,7 +126,7 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
     aztecNodeConfig.publisherPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
   }
 
-  if (aztecNodeConfig.p2pEnabled === false) {
+  if (!aztecNodeConfig.p2pEnabled) {
     await deployContractsToL1(aztecNodeConfig, hdAccount);
   }
 

From e2f3a02bcb9ac3418da865a5033c9c442ba267a5 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 18:40:12 +0000
Subject: [PATCH 10/16] Cleanup

---
 yarn-project/sequencer-client/src/sequencer/sequencer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index 4a218323c9c..c0368c02434 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -249,7 +249,7 @@ export class Sequencer {
     for (const tx of txs) {
       if (tx.data.constants.txContext.chainId.value !== globalVariables.chainId.value) {
         this.log(
-          `Deleting tx for incorrect chain ${tx.data.constants.txContext.chainId.toString()}, global chain ${globalVariables.chainId.toString()}, tx hash ${await Tx.getHash(
+          `Deleting tx for incorrect chain ${tx.data.constants.txContext.chainId.toString()}, tx hash ${await Tx.getHash(
             tx,
           )}`,
         );

From 9ff3ee241fb727076182b8cc7968f5277e1fe3c7 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 18:58:28 +0000
Subject: [PATCH 11/16] Cleanup

---
 yarn-project/aztec-sandbox/src/sandbox.ts     |  6 ++--
 yarn-project/ethereum/src/constants.ts        |  3 ++
 yarn-project/ethereum/src/index.ts            |  1 +
 yarn-project/sequencer-client/src/config.ts   | 10 +++---
 .../src/sequencer/sequencer.test.ts           | 32 ++++++++++++++++++-
 5 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 yarn-project/ethereum/src/constants.ts

diff --git a/yarn-project/aztec-sandbox/src/sandbox.ts b/yarn-project/aztec-sandbox/src/sandbox.ts
index 3cb4276db8e..2e2d6b0c9f4 100644
--- a/yarn-project/aztec-sandbox/src/sandbox.ts
+++ b/yarn-project/aztec-sandbox/src/sandbox.ts
@@ -3,6 +3,7 @@ import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/azte
 import {
   DeployL1Contracts,
   L1ContractArtifactsForDeployment,
+  NULL_KEY,
   createEthereumChain,
   deployL1Contracts,
 } from '@aztec/ethereum';
@@ -22,7 +23,7 @@ import {
 } from '@aztec/l1-artifacts';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe';
 
-import { HDAccount, Hex, createPublicClient, http as httpViemTransport } from 'viem';
+import { HDAccount, createPublicClient, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
@@ -120,8 +121,7 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
   const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars(), ...config };
   const pxeServiceConfig = getPXEServiceConfig();
   const hdAccount = mnemonicToAccount(config.l1Mnemonic ?? MNEMONIC);
-  const emptyKey: Hex = `0x${'0000000000000000000000000000000000000000000000000000000000000000'}`;
-  if (aztecNodeConfig.publisherPrivateKey === emptyKey) {
+  if (aztecNodeConfig.publisherPrivateKey === NULL_KEY) {
     const privKey = hdAccount.getHdKey().privateKey;
     aztecNodeConfig.publisherPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
   }
diff --git a/yarn-project/ethereum/src/constants.ts b/yarn-project/ethereum/src/constants.ts
new file mode 100644
index 00000000000..fa71f161b2a
--- /dev/null
+++ b/yarn-project/ethereum/src/constants.ts
@@ -0,0 +1,3 @@
+import { Hex } from 'viem';
+
+export const NULL_KEY: Hex = `0x${'0000000000000000000000000000000000000000000000000000000000000000'}`;
diff --git a/yarn-project/ethereum/src/index.ts b/yarn-project/ethereum/src/index.ts
index c8edddb8dde..6765234a136 100644
--- a/yarn-project/ethereum/src/index.ts
+++ b/yarn-project/ethereum/src/index.ts
@@ -6,6 +6,7 @@ import { createTestnetChain } from './testnet.js';
 export * from './testnet.js';
 export * from './deploy_l1_contracts.js';
 export * from './l1_contract_addresses.js';
+export * from './constants.js';
 
 /**
  * Helper function to create an instance of Aztec Chain from an rpc url and api key.
diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts
index 48bc81076f2..c506b8c58b9 100644
--- a/yarn-project/sequencer-client/src/config.ts
+++ b/yarn-project/sequencer-client/src/config.ts
@@ -1,4 +1,4 @@
-import { L1ContractAddresses } from '@aztec/ethereum';
+import { L1ContractAddresses, NULL_KEY } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 import { Hex } from 'viem';
@@ -42,11 +42,9 @@ export function getConfigEnvVars(): SequencerClientConfig {
     CONTRACT_DEPLOYMENT_EMITTER_ADDRESS,
   } = process.env;
 
-  const publisherPrivateKey: Hex = `0x${
-    SEQ_PUBLISHER_PRIVATE_KEY
-      ? SEQ_PUBLISHER_PRIVATE_KEY.replace('0x', '')
-      : '0000000000000000000000000000000000000000000000000000000000000000'
-  }`;
+  const publisherPrivateKey: Hex = SEQ_PUBLISHER_PRIVATE_KEY
+    ? `0x${SEQ_PUBLISHER_PRIVATE_KEY.replace('0x', '')}`
+    : NULL_KEY;
   // Populate the relevant addresses for use by the sequencer
   const addresses: L1ContractAddresses = {
     rollupAddress: ROLLUP_CONTRACT_ADDRESS ? EthAddress.fromString(ROLLUP_CONTRACT_ADDRESS) : EthAddress.ZERO,
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
index 5966ca6c1bf..99337113e57 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
@@ -44,7 +44,7 @@ describe('sequencer', () => {
 
   let sequencer: TestSubject;
 
-  const chainId = Fr.ZERO;
+  const chainId = new Fr(12345);
   const version = Fr.ZERO;
 
   beforeEach(() => {
@@ -156,6 +156,36 @@ describe('sequencer', () => {
     expect(publisher.processL2Block).toHaveBeenCalledWith(block);
     expect(p2p.deleteTxs).toHaveBeenCalledWith([await doubleSpendTx.getTxHash()]);
   });
+
+  it('builds a block out of several txs rejecting incorrect chain ids', async () => {
+    const txs = [mockTx(0x10000), mockTx(0x20000), mockTx(0x30000)];
+    const invalidChainTx = txs[1];
+    const block = L2Block.random(lastBlockNumber + 1);
+    const proof = makeEmptyProof();
+
+    p2p.getTxs.mockResolvedValueOnce(txs);
+    blockBuilder.buildL2Block.mockResolvedValueOnce([block, proof]);
+    publisher.processL2Block.mockResolvedValueOnce(true);
+    globalVariableBuilder.buildGlobalVariables.mockResolvedValueOnce(
+      new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO),
+    );
+
+    // We make the chain id on the invalid tx not equal to the configured chain id
+    invalidChainTx.data.constants.txContext.chainId = new Fr(1n + chainId.value);
+
+    await sequencer.initialSync();
+    await sequencer.work();
+
+    const expectedTxHashes = [...(await Tx.getHashes([txs[0], txs[2]])), TxHash.ZERO, TxHash.ZERO];
+
+    expect(blockBuilder.buildL2Block).toHaveBeenCalledWith(
+      new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO),
+      expectedTxHashes.map(hash => expect.objectContaining({ hash })),
+      Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(new Fr(0n)),
+    );
+    expect(publisher.processL2Block).toHaveBeenCalledWith(block);
+    expect(p2p.deleteTxs).toHaveBeenCalledWith([await invalidChainTx.getTxHash()]);
+  });
 });
 
 class TestSubject extends Sequencer {

From e556f4fe2a17603dd638a4dad1967771641d1479 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 19:03:43 +0000
Subject: [PATCH 12/16] Test fix

---
 .../sequencer-client/src/sequencer/sequencer.test.ts       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
index 99337113e57..f826b1112ef 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
@@ -99,6 +99,7 @@ describe('sequencer', () => {
 
   it('builds a block out of a single tx', async () => {
     const tx = mockTx();
+    tx.data.constants.txContext.chainId = chainId;
     const block = L2Block.random(lastBlockNumber + 1);
     const proof = makeEmptyProof();
 
@@ -124,6 +125,9 @@ describe('sequencer', () => {
 
   it('builds a block out of several txs rejecting double spends', async () => {
     const txs = [mockTx(0x10000), mockTx(0x20000), mockTx(0x30000)];
+    txs.forEach(tx => {
+      tx.data.constants.txContext.chainId = chainId;
+    });
     const doubleSpendTx = txs[1];
     const block = L2Block.random(lastBlockNumber + 1);
     const proof = makeEmptyProof();
@@ -159,6 +163,9 @@ describe('sequencer', () => {
 
   it('builds a block out of several txs rejecting incorrect chain ids', async () => {
     const txs = [mockTx(0x10000), mockTx(0x20000), mockTx(0x30000)];
+    txs.forEach(tx => {
+      tx.data.constants.txContext.chainId = chainId;
+    });
     const invalidChainTx = txs[1];
     const block = L2Block.random(lastBlockNumber + 1);
     const proof = makeEmptyProof();

From 76b42e77751ef80bedf375940f573e245d0ffcbd Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 19:04:45 +0000
Subject: [PATCH 13/16] Cleanup

---
 yarn-project/aztec-node/src/aztec-node/server.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index 20a04f9e71a..60a468a2af0 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -73,7 +73,7 @@ export class AztecNodeService implements AztecNode {
     private log = createDebugLogger('aztec:node'),
   ) {
     const message =
-      `Started Aztec Node against chain ${chainId.toString(16)} with contracts - \n` +
+      `Started Aztec Node against chain 0x${chainId.toString(16)} with contracts - \n` +
       `Rollup: ${config.l1Contracts.rollupAddress.toString()}\n` +
       `Registry: ${config.l1Contracts.registryAddress.toString()}\n` +
       `Inbox: ${config.l1Contracts.inboxAddress.toString()}\n` +

From 0e8cee075466a0b4920b02d14052db328216cf56 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 20:46:11 +0000
Subject: [PATCH 14/16] Review changes

---
 .../aztec-node/src/aztec-node/server.test.ts  | 17 +++++++++++++++++
 .../aztec-node/src/aztec-node/server.ts       | 19 ++++++++++---------
 yarn-project/aztec-node/terraform/main.tf     |  8 ++++++++
 .../aztec-node/terraform/variables.tf         |  4 ++++
 yarn-project/sequencer-client/src/config.ts   |  4 ++++
 5 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 yarn-project/aztec-node/src/aztec-node/server.test.ts

diff --git a/yarn-project/aztec-node/src/aztec-node/server.test.ts b/yarn-project/aztec-node/src/aztec-node/server.test.ts
new file mode 100644
index 00000000000..a972190d03b
--- /dev/null
+++ b/yarn-project/aztec-node/src/aztec-node/server.test.ts
@@ -0,0 +1,17 @@
+import { createEthereumChain } from '@aztec/ethereum';
+
+import { AztecNodeConfig, AztecNodeService } from '../index.js';
+
+describe('aztec node service', () => {
+  it('fails to create Aztec Node if given incorrect chain id', async () => {
+    const config: Partial<AztecNodeConfig> = {
+      rpcUrl: 'testnet',
+      apiKey: '12345',
+      chainId: 12345, // not the testnet chain id
+    };
+    const ethereumChain = createEthereumChain(config.rpcUrl!, config.apiKey);
+    await expect(() => AztecNodeService.createAndSync(config as AztecNodeConfig)).rejects.toThrow(
+      `RPC URL configured for chain id ${ethereumChain.chainInfo.id} but expected id ${config.chainId}`,
+    );
+  });
+});
diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index 60a468a2af0..029415a467a 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -9,7 +9,7 @@ import {
   PRIVATE_DATA_TREE_HEIGHT,
 } from '@aztec/circuits.js';
 import { computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
-import { L1ContractAddresses } from '@aztec/ethereum';
+import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { InMemoryTxPool, P2P, createP2PClient } from '@aztec/p2p';
@@ -88,15 +88,16 @@ export class AztecNodeService implements AztecNode {
    * @returns - A fully synced Aztec Node for use in development/testing.
    */
   public static async createAndSync(config: AztecNodeConfig) {
+    const ethereumChain = createEthereumChain(config.rpcUrl, config.apiKey);
+    //validate that the actual chain id matches that specified in configuration
+    if (config.chainId !== ethereumChain.chainInfo.id) {
+      throw new Error(
+        `RPC URL configured for chain id ${ethereumChain.chainInfo.id} but expected id ${config.chainId}`,
+      );
+    }
     // first create and sync the archiver
     const archiver = await Archiver.createAndSync(config);
 
-    // get the chain id here
-    const lastBlockNumber = await archiver.getBlockNumber();
-    const globalVariableBuilder = getGlobalVariableBuilder(config);
-    // just use the next block number for this query
-    const globalVariables = await globalVariableBuilder.buildGlobalVariables(new Fr(lastBlockNumber + 1));
-
     // we identify the P2P transaction protocol by using the rollup contract address.
     // this may well change in future
     config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
@@ -128,9 +129,9 @@ export class AztecNodeService implements AztecNode {
       archiver,
       worldStateSynchronizer,
       sequencer,
-      Number(globalVariables.chainId.value),
+      ethereumChain.chainInfo.id,
       config.version,
-      globalVariableBuilder,
+      getGlobalVariableBuilder(config),
       db,
     );
   }
diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index 81d61b301c3..bc62fa3060b 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -195,6 +195,10 @@ resource "aws_ecs_task_definition" "aztec-node-1" {
         "name": "P2P_ENABLED",
         "value": "true"
       },
+      {
+        "name": "CHAIN_ID",
+        "value": "${var.CHAIN_ID}"
+      },
       {
         "name": "PEER_ID_PRIVATE_KEY",
         "value": "${var.NODE_1_PRIVATE_KEY}"
@@ -484,6 +488,10 @@ resource "aws_ecs_task_definition" "aztec-node-2" {
         "name": "P2P_ENABLED",
         "value": "true"
       },
+      {
+        "name": "CHAIN_ID",
+        "value": "${var.CHAIN_ID}"
+      },
       {
         "name": "PEER_ID_PRIVATE_KEY",
         "value": "${var.NODE_2_PRIVATE_KEY}"
diff --git a/yarn-project/aztec-node/terraform/variables.tf b/yarn-project/aztec-node/terraform/variables.tf
index 67c2f77a0e5..789d7793f7f 100644
--- a/yarn-project/aztec-node/terraform/variables.tf
+++ b/yarn-project/aztec-node/terraform/variables.tf
@@ -26,6 +26,10 @@ variable "SEQ_2_PUBLISHER_PRIVATE_KEY" {
   type = string
 }
 
+variable "CHAIN_ID" {
+  type = string
+}
+
 variable "BOOTNODE_1_LISTEN_PORT" {
   type = string
 }
diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts
index c506b8c58b9..1db3bdf6c3c 100644
--- a/yarn-project/sequencer-client/src/config.ts
+++ b/yarn-project/sequencer-client/src/config.ts
@@ -9,6 +9,8 @@ import { SequencerConfig } from './sequencer/config.js';
 
 /** Chain configuration. */
 type ChainConfig = {
+  /** The chain id of the ethereum host. */
+  chainId: number;
   /** The version of the rollup. */
   version: number;
 };
@@ -29,6 +31,7 @@ export function getConfigEnvVars(): SequencerClientConfig {
   const {
     SEQ_PUBLISHER_PRIVATE_KEY,
     ETHEREUM_HOST,
+    CHAIN_ID,
     VERSION,
     API_KEY,
     SEQ_REQUIRED_CONFIRMATIONS,
@@ -59,6 +62,7 @@ export function getConfigEnvVars(): SequencerClientConfig {
 
   return {
     rpcUrl: ETHEREUM_HOST ? ETHEREUM_HOST : '',
+    chainId: CHAIN_ID ? +CHAIN_ID : 31337, // 31337 is the default chain id for anvil
     version: VERSION ? +VERSION : 1, // 1 is our default version
     apiKey: API_KEY,
     requiredConfirmations: SEQ_REQUIRED_CONFIRMATIONS ? +SEQ_REQUIRED_CONFIRMATIONS : 1,

From f54a1c0f541cf3f7446295cb561bc3f729d656a3 Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 20:59:35 +0000
Subject: [PATCH 15/16] Review changes

---
 .../aztec.js/src/contract_deployer/deploy_method.ts |  2 +-
 .../src/contract_deployer/deploy_sent_tx.ts         | 13 +++++++++++--
 yarn-project/cli/src/index.ts                       |  5 ++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/yarn-project/aztec.js/src/contract_deployer/deploy_method.ts b/yarn-project/aztec.js/src/contract_deployer/deploy_method.ts
index f6e1991e632..a97ae9fc6cb 100644
--- a/yarn-project/aztec.js/src/contract_deployer/deploy_method.ts
+++ b/yarn-project/aztec.js/src/contract_deployer/deploy_method.ts
@@ -123,7 +123,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   public send(options: DeployOptions = {}): DeploySentTx<TContract> {
     const txHashPromise = super.send(options).getTxHash();
-    return new DeploySentTx(this.artifact, this.pxe, txHashPromise);
+    return new DeploySentTx(this.artifact, this.pxe, txHashPromise, this.completeAddress);
   }
 
   /**
diff --git a/yarn-project/aztec.js/src/contract_deployer/deploy_sent_tx.ts b/yarn-project/aztec.js/src/contract_deployer/deploy_sent_tx.ts
index 4441c831bed..93c16ad56a9 100644
--- a/yarn-project/aztec.js/src/contract_deployer/deploy_sent_tx.ts
+++ b/yarn-project/aztec.js/src/contract_deployer/deploy_sent_tx.ts
@@ -1,4 +1,4 @@
-import { FieldsOf } from '@aztec/circuits.js';
+import { CompleteAddress, FieldsOf } from '@aztec/circuits.js';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { TxHash, TxReceipt } from '@aztec/types';
 
@@ -20,7 +20,16 @@ export type DeployTxReceipt<TContract extends ContractBase = Contract> = FieldsO
  * A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
  */
 export class DeploySentTx<TContract extends Contract = Contract> extends SentTx {
-  constructor(private artifact: ContractArtifact, wallet: PXE | Wallet, txHashPromise: Promise<TxHash>) {
+  constructor(
+    private artifact: ContractArtifact,
+    wallet: PXE | Wallet,
+    txHashPromise: Promise<TxHash>,
+
+    /**
+     * The complete address of the deployed contract
+     */
+    public completeContractAddress?: CompleteAddress,
+  ) {
     super(wallet, txHashPromise);
   }
 
diff --git a/yarn-project/cli/src/index.ts b/yarn-project/cli/src/index.ts
index 5b96a19c17d..3b164760ddf 100644
--- a/yarn-project/cli/src/index.ts
+++ b/yarn-project/cli/src/index.ts
@@ -218,15 +218,14 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const args = encodeArgs(rawArgs, constructorArtifact!.parameters);
       debugLogger(`Encoded arguments: ${args.join(', ')}`);
 
-      const deployMethod = deployer.deploy(...args);
-      const tx = deployMethod.send({ contractAddressSalt: salt });
+      const tx = deployer.deploy(...args).send({ contractAddressSalt: salt });
       const txHash = await tx.getTxHash();
       debugLogger(`Deploy tx sent with hash ${txHash}`);
       if (wait) {
         const deployed = await tx.wait();
         log(`\nContract deployed at ${deployed.contractAddress!.toString()}\n`);
       } else {
-        log(`\nContract Address: ${deployMethod.completeAddress?.address.toString() ?? 'N/A'}`);
+        log(`\nContract Address: ${tx.completeContractAddress?.address.toString() ?? 'N/A'}`);
         log(`Deployment transaction hash: ${txHash}\n`);
       }
     });

From 5c3ad9236ea000bc954198f517b4ddacf0596cbb Mon Sep 17 00:00:00 2001
From: PhilWindle <philip.windle@gmail.com>
Date: Thu, 12 Oct 2023 21:08:21 +0000
Subject: [PATCH 16/16] Test fix

---
 yarn-project/end-to-end/src/integration_l1_publisher.test.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
index 65e7ea2a672..5e66d1222c6 100644
--- a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
+++ b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
@@ -13,6 +13,7 @@ import {
   range,
 } from '@aztec/circuits.js';
 import { fr, makeNewContractData, makeProof } from '@aztec/circuits.js/factories';
+import { createEthereumChain } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { to2Fields } from '@aztec/foundation/serialize';
@@ -87,7 +88,7 @@ describe('L1Publisher integration', () => {
   // The global variables of the last rollup
   let prevGlobals: GlobalVariables;
 
-  const chainId = 1;
+  const chainId = createEthereumChain(config.rpcUrl, config.apiKey).chainInfo.id;
 
   beforeEach(async () => {
     deployerAccount = privateKeyToAccount(deployerPK);