chore: Accumulated backports to v5-next (#24750)

BEGIN_COMMIT_OVERRIDE
fix(docs-examples): pin typescript to 5.x in execute runner (#24736)
chore(spartan): restore 7 day mainnet slash grace period (#24804)
chore(spartan): restore 7 day mainnet slash grace period (backport
#24804) (#24808)
feat: allow custom proof submission target address (#24270)
END_COMMIT_OVERRIDE

Author: AztecBot

docs/docs-developers/docs/tutorials/js_tutorials/aztecjs-getting-started.md

@@ -24,7 +24,7 @@ yarn init -y
 Next, add the TypeScript dependencies:
 
 ```sh
-yarn add typescript @types/node tsx
+yarn add "typescript@^5.3.3" @types/node tsx
 ```
 
 :::tip

docs/docs-operate/operators/sequencer-management/slashing-configuration.md

@@ -45,7 +45,7 @@ Round N: Proposers vote on offenses from Round N-2
 - **Round Size**: 128 L2 slots (approximately 2.6 hours at 72 seconds per slot)
 - **Slashing Offset**: 2 rounds (proposers in round N vote on offenses from round N-2)
 - **Execution Delay**: 2 rounds on the v5 testnet (~5 hours; mainnet uses 28 rounds, ~3 days)
-- **Grace Period**: First 64 slots after the rollup becomes canonical on the v5 testnet (~1.3 hours; mainnet uses 1,200 slots, ~1 day); configurable per node via `SLASH_GRACE_PERIOD_L2_SLOTS`
+- **Grace Period**: First 64 slots after the rollup becomes canonical on the v5 testnet (~1.3 hours; mainnet uses 8,400 slots, ~7 days); configurable per node via `SLASH_GRACE_PERIOD_L2_SLOTS`
 
 ### Slashing Amounts
 

docs/examples/ts/aztecjs_runner/run.sh

@@ -115,7 +115,10 @@ setup_project() {
         [ ${#NPM_DEPS[@]} -gt 0 ] && yarn_add_with_retry "${NPM_DEPS[@]}"
     fi
 
-    yarn_add_with_retry -D typescript@^5.3.3 tsx
+    # Pin typescript to the 5.x line used across the monorepo. An unpinned
+    # `yarn add typescript` now resolves to the 7.x native port, whose package
+    # layout has no lib/_tsc.js, so yarn 4's builtin compat patch fails to apply.
+    yarn_add_with_retry -D "typescript@^5.3.3" tsx
 
     # Copy tsconfig
     cp "$EXAMPLES_DIR/tsconfig.template.json" tsconfig.json

spartan/environments/network-defaults.yml

@@ -358,7 +358,7 @@ networks:
     ENABLE_AUTO_SHUTDOWN: false
     # Slasher penalties - more lenient initially
     SLASH_DATA_WITHHOLDING_PENALTY: 0
-    SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8
+    SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.7
     SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2
     SLASH_INACTIVITY_PENALTY: 2000e18
     SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2000e18
@@ -369,4 +369,4 @@ networks:
     SLASH_UNKNOWN_PENALTY: 2000e18
     SLASH_INVALID_BLOCK_PENALTY: 2000e18
     SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2000e18  # AZIP-16: activated at SMALL
-    SLASH_GRACE_PERIOD_L2_SLOTS: 1200
+    SLASH_GRACE_PERIOD_L2_SLOTS: 8400 # 7 days at a 72s slot

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

@@ -191,6 +191,7 @@ export type EnvVar =
   | 'PROVER_FAILED_PROOF_STORE'
   | 'PROVER_NODE_FAILED_EPOCH_STORE'
   | 'PROVER_NODE_DISABLE_PROOF_PUBLISH'
+  | 'PROVER_NODE_PROOF_SUBMISSION_TARGET_ADDRESS'
   | 'PROVER_ID'
   | 'PROVER_NODE_POLLING_INTERVAL_MS'
   | 'PROVER_NODE_MAX_PENDING_JOBS'

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

@@ -6,6 +6,7 @@ import {
   numberConfigHelper,
   pickConfigMappings,
 } from '@aztec/foundation/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
 import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
 import type { KeyStore } from '@aztec/node-keystore/types';
@@ -44,6 +45,7 @@ export type SpecificProverNodeConfig = {
   txGatheringIntervalMs: number;
   txGatheringBatchSize: number;
   txGatheringMaxParallelRequestsPerNode: number;
+  proofSubmissionTargetAddress?: EthAddress;
 };
 
 export const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
@@ -97,6 +99,14 @@ export const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProver
     description: 'Whether the prover node skips publishing proofs to L1',
     ...booleanConfigHelper(false),
   },
+  proofSubmissionTargetAddress: {
+    env: 'PROVER_NODE_PROOF_SUBMISSION_TARGET_ADDRESS',
+    description:
+      'Optional L1 address the submitEpochRootProof tx is sent to. Must expose the identical submitEpochRootProof ABI ' +
+      'and forward to the rollup. Defaults to the rollup address.',
+    parseEnv: (val: string) => EthAddress.fromString(val),
+    defaultValue: undefined,
+  },
 };
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {

yarn-project/prover-node/src/factory.ts

@@ -135,6 +135,7 @@ export async function createProverNode(
     deps.publisherFactory ??
     new ProverPublisherFactory(config, {
       rollupContract,
+      proofSubmissionTarget: config.proofSubmissionTargetAddress,
       publisherManager: new PublisherManager(l1TxUtils, getPublisherConfigFromProverConfig(config), {
         bindings: log.getBindings(),
         funder: funderL1TxUtils,

yarn-project/prover-node/src/prover-node-publisher.test.ts

@@ -47,6 +47,68 @@ describe('prover-node-publisher', () => {
     publisher = new ProverNodePublisher(config, { rollupContract: rollup, l1TxUtils: l1Utils });
   });
 
+  const setupPublishData = (pending: number, proven: number, fromCheckpoint: number, toCheckpoint: number) => {
+    // Create public inputs for every checkpoint
+    const checkpoints = Array.from({ length: 100 }, () => {
+      return RootRollupPublicInputs.random();
+    });
+
+    // Return the tips specified by the test
+    rollup.getTips.mockResolvedValue({
+      pending: CheckpointNumber(pending),
+      proven: CheckpointNumber(proven),
+    });
+
+    // Return the requested checkpoint
+    rollup.getCheckpoint.mockImplementation((checkpointNumber: CheckpointNumber) =>
+      Promise.resolve({
+        archive: checkpoints[checkpointNumber - 1].endArchiveRoot,
+        attestationsHash: Buffer32.ZERO, // unused,
+        payloadDigest: Buffer32.ZERO, // unused,
+        headerHash: Buffer32.ZERO, // unused,
+        blobCommitmentsHash: Buffer32.ZERO, // unused,
+        outHash: '0x', // unused,
+        slotNumber: SlotNumber(0), // unused,
+        feeHeader: {
+          excessMana: 0n, // unused
+          manaUsed: 0n, // unused
+          ethPerFeeAsset: 0n, // unused
+          congestionCost: 0n, // unused
+          proverCost: 0n, // unused
+        },
+      }),
+    );
+
+    // We have built a rollup proof of the range fromCheckpoint - toCheckpoint
+    // so we need to set our archives and hashes accordingly
+    const ourPublicInputs = RootRollupPublicInputs.random();
+    ourPublicInputs.previousArchiveRoot = checkpoints[fromCheckpoint - 2]?.endArchiveRoot ?? Fr.ZERO;
+    ourPublicInputs.endArchiveRoot = checkpoints[toCheckpoint - 1]?.endArchiveRoot ?? Fr.ZERO;
+
+    const ourBatchedBlob = new BatchedBlob(
+      ourPublicInputs.blobPublicInputs.blobCommitmentsHash,
+      ourPublicInputs.blobPublicInputs.z,
+      ourPublicInputs.blobPublicInputs.y,
+      ourPublicInputs.blobPublicInputs.c,
+      ourPublicInputs.blobPublicInputs.c.negate(), // Fill with dummy value
+    );
+
+    // Return our public inputs
+    const totalFields = ourPublicInputs.toFields();
+    rollup.getEpochProofPublicInputs.mockResolvedValue(totalFields);
+
+    return {
+      epochNumber: EpochNumber(2),
+      fromCheckpoint: CheckpointNumber(fromCheckpoint),
+      toCheckpoint: CheckpointNumber(toCheckpoint),
+      publicInputs: ourPublicInputs,
+      headers: makeHeadersForRange(fromCheckpoint, toCheckpoint),
+      proof: Proof.empty(),
+      batchedBlobInputs: ourBatchedBlob,
+      attestations: [],
+    };
+  };
+
   const testCases = [
     // Usual case of proving full epoch
     { pending: 65, proven: 32, fromCheckpoint: 33, toCheckpoint: 64, expectedPublish: true, message: '' },
@@ -336,4 +398,34 @@ describe('prover-node-publisher', () => {
 
     expect(result).toBe(false);
   });
+
+  describe('proof submission target', () => {
+    it('defaults the submit tx target to the rollup address', async () => {
+      const rollupAddress = EthAddress.random().toString();
+      (rollup as any).address = rollupAddress;
+      publisher = new ProverNodePublisher(config, { rollupContract: rollup, l1TxUtils: l1Utils });
+
+      await publisher.submitEpochProof(setupPublishData(65, 32, 33, 64));
+      expect(l1Utils.sendAndMonitorTransaction).toHaveBeenCalledWith(
+        expect.objectContaining({ to: rollupAddress }),
+        expect.anything(),
+      );
+    });
+
+    it('redirects the submit tx to the configured proof submission target', async () => {
+      (rollup as any).address = EthAddress.random().toString();
+      const target = EthAddress.random();
+      publisher = new ProverNodePublisher(config, {
+        rollupContract: rollup,
+        l1TxUtils: l1Utils,
+        proofSubmissionTarget: target,
+      });
+
+      await publisher.submitEpochProof(setupPublishData(65, 32, 33, 64));
+      expect(l1Utils.sendAndMonitorTransaction).toHaveBeenCalledWith(
+        expect.objectContaining({ to: target.toString() }),
+        expect.anything(),
+      );
+    });
+  });
 });

yarn-project/prover-node/src/prover-node-publisher.ts

@@ -40,13 +40,16 @@ export class ProverNodePublisher {
 
   protected rollupContract: RollupContract;
 
+  protected proofSubmissionTarget: Hex;
+
   public readonly l1TxUtils: L1TxUtils;
 
   constructor(
     config: TxSenderConfig & PublisherConfig,
     deps: {
       rollupContract: RollupContract;
       l1TxUtils: L1TxUtils;
+      proofSubmissionTarget?: EthAddress;
       telemetry?: TelemetryClient;
     },
     bindings?: LoggerBindings,
@@ -57,6 +60,7 @@ export class ProverNodePublisher {
     this.log = createLogger('prover-node:l1-tx-publisher', bindings);
 
     this.rollupContract = deps.rollupContract;
+    this.proofSubmissionTarget = deps.proofSubmissionTarget?.toString() ?? deps.rollupContract.address;
     this.l1TxUtils = deps.l1TxUtils;
   }
 
@@ -217,7 +221,7 @@ export class ProverNodePublisher {
     const senderAddress = this.l1TxUtils.getSenderAddress();
 
     const [gasLimit, gasPrice, latestBlock] = await Promise.all([
-      this.l1TxUtils.estimateGas(senderAddress.toString() as `0x${string}`, { to: this.rollupContract.address, data }),
+      this.l1TxUtils.estimateGas(senderAddress.toString() as `0x${string}`, { to: this.proofSubmissionTarget, data }),
       this.l1TxUtils.getGasPrice(),
       this.l1TxUtils.client.getBlock({ blockTag: 'latest' }),
     ]);
@@ -288,7 +292,7 @@ export class ProverNodePublisher {
     });
     try {
       const { receipt } = await this.l1TxUtils.sendAndMonitorTransaction(
-        { to: this.rollupContract.address, data },
+        { to: this.proofSubmissionTarget, data },
         { txTimeoutAt: args.deadline },
       );
       if (receipt.status !== 'success') {
@@ -298,7 +302,7 @@ export class ProverNodePublisher {
             args: [...txArgs],
             functionName: 'submitEpochRootProof',
             abi: RollupAbi,
-            address: this.rollupContract.address,
+            address: this.proofSubmissionTarget,
           },
           /*blobInputs*/ undefined,
           /*stateOverride*/ [],

yarn-project/prover-node/src/prover-publisher-factory.ts

@@ -1,6 +1,7 @@
 import type { RollupContract } from '@aztec/ethereum/contracts';
 import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
 import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LoggerBindings } from '@aztec/foundation/log';
 import type { ProverPublisherConfig, ProverTxSenderConfig } from '@aztec/sequencer-client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
@@ -13,6 +14,7 @@ export class ProverPublisherFactory {
     private deps: {
       rollupContract: RollupContract;
       publisherManager: PublisherManager<L1TxUtils>;
+      proofSubmissionTarget?: EthAddress;
       telemetry?: TelemetryClient;
     },
     private bindings?: LoggerBindings,
@@ -37,6 +39,7 @@ export class ProverPublisherFactory {
       {
         rollupContract: this.deps.rollupContract,
         l1TxUtils: l1Publisher,
+        proofSubmissionTarget: this.deps.proofSubmissionTarget,
         telemetry: this.deps.telemetry,
       },
       this.bindings,