chore(seq)!: disable sequencer and disable validator as one env var, update p2p listen port names

yarn-project/Earthfile

@@ -296,7 +296,8 @@ network-test-fake-proofs:
         ./boot-node.sh \
         ./ethereum.sh \
         "./prover-node.sh false" \
-        ./pxe.sh
+        ./pxe.sh \
+        "./validator.sh 8081"
 
 publish-npm:
     FROM +build

yarn-project/aztec-node/src/aztec-node/config.ts

@@ -22,9 +22,6 @@ export type AztecNodeConfig = ArchiverConfig &
   WorldStateConfig &
   Pick<ProverClientConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
   P2PConfig & {
-    /** Whether the sequencer is disabled for this node. */
-    disableSequencer: boolean;
-
     /** Whether the validator is disabled for this node */
     disableValidator: boolean;
   };
@@ -36,11 +33,6 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...proverClientConfigMappings,
   ...worldStateConfigMappings,
   ...p2pConfigMappings,
-  disableSequencer: {
-    env: 'SEQ_DISABLED',
-    description: 'Whether the sequencer is disabled for this node.',
-    ...booleanConfigHelper(),
-  },
   disableValidator: {
     env: 'VALIDATOR_DISABLED',
     description: 'Whether the validator is disabled for this node.',

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -164,7 +164,7 @@ export class AztecNodeService implements AztecNode {
     const validatorClient = createValidatorClient(config, p2pClient, telemetry);
 
     // now create the sequencer
-    const sequencer = config.disableSequencer
+    const sequencer = config.disableValidator
       ? undefined
       : await SequencerClient.new(
           config,

yarn-project/aztec/src/cli/cmds/start_node.ts

@@ -64,7 +64,7 @@ export const startNode = async (
   }
 
   if (!options.sequencer) {
-    nodeConfig.disableSequencer = true;
+    nodeConfig.disableValidator = true;
   } else {
     const sequencerConfig = extractNamespacedOptions(options, 'sequencer');
     let account;

yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts

@@ -51,7 +51,7 @@ describe('benchmarks/process_history', () => {
         // Create a new node and measure how much time it takes it to sync
         const dataDirectory = makeDataDirectory(chainLength);
         context.logger.info(`Set up data directory at ${dataDirectory}`);
-        const nodeConfig: AztecNodeConfig = { ...context.config, disableSequencer: true, dataDirectory };
+        const nodeConfig: AztecNodeConfig = { ...context.config, disableValidator: true, dataDirectory };
         const [nodeSyncTime, node] = await elapsed(async () => {
           const node = await AztecNodeService.createAndSync(nodeConfig);
           // call getPublicStorageAt (which calls #getWorldState, which calls #syncWorldState) to force a sync with

yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts

@@ -36,7 +36,7 @@ describe('benchmarks/publish_rollup', () => {
       // and call getPublicStorageAt (which calls #getWorldState, which calls #syncWorldState) to force a sync with
       // world state to ensure the node has caught up
       context.logger.info(`Starting new aztec node`);
-      const node = await AztecNodeService.createAndSync({ ...context.config, disableSequencer: true });
+      const node = await AztecNodeService.createAndSync({ ...context.config, disableValidator: true });
       await node.getPublicStorageAt(AztecAddress.random(), Fr.random(), 'latest');
 
       // Spin up a new pxe and sync it, we'll use it to test sync times of new accounts for the last block

yarn-project/end-to-end/src/e2e_synching.test.ts

@@ -469,7 +469,7 @@ describe('e2e_synching', () => {
             // All the blocks have been "re-played" and we are now to simply get a new node up to speed
             const timer = new Timer();
             const freshNode = await AztecNodeService.createAndSync(
-              { ...opts.config!, disableSequencer: true, disableValidator: true },
+              { ...opts.config!, disableValidator: true },
               new NoopTelemetryClient(),
             );
             const syncTime = timer.s();

yarn-project/foundation/src/config/env_var.ts

@@ -112,7 +112,6 @@ export type EnvVar =
   | 'ROLLUP_CONTRACT_ADDRESS'
   | 'SEQ_ALLOWED_SETUP_FN'
   | 'SEQ_ALLOWED_TEARDOWN_FN'
-  | 'SEQ_DISABLED'
   | 'SEQ_MAX_BLOCK_SIZE_IN_BYTES'
   | 'SEQ_MAX_SECONDS_BETWEEN_BLOCKS'
   | 'SEQ_MAX_TX_PER_BLOCK'