chore: merge v4 into v4-next (with conflicts)

spartan/environments/network-defaults.yml

@@ -112,8 +112,7 @@ l1-contracts: &l1-contracts-defaults
 # These configure the slasher node's operational behavior.
 # Used by yarn-project/slasher for penalty calculation and offense tracking.
 
-slasher: &slasher
-  # Minimum penalty percentage multiplier.
+slasher: &slasher # Minimum penalty percentage multiplier.
   SLASH_MIN_PENALTY_PERCENTAGE: 0.5
   # Maximum penalty percentage multiplier.
   SLASH_MAX_PENALTY_PERCENTAGE: 2.0
@@ -215,16 +214,16 @@ networks:
     AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1
     AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1
     # Network identity
-    L1_CHAIN_ID: 11155111  # Sepolia
+    L1_CHAIN_ID: 11155111 # Sepolia
     # Genesis state
-    TEST_ACCOUNTS: true     # Fund test accounts with fee juice
-    SPONSORED_FPC: true     # Fund sponsored FPC with fee juice
+    TEST_ACCOUNTS: true # Fund test accounts with fee juice
+    SPONSORED_FPC: true # Fund sponsored FPC with fee juice
     TRANSACTIONS_DISABLED: false
     # Sequencer
     SEQ_MAX_TX_PER_BLOCK: 18
     # Prover
-    PROVER_REAL_PROOFS: false   # Use mock proofs
-    PXE_PROVER_ENABLED: false   # Disable PXE proving
+    PROVER_REAL_PROOFS: false # Use mock proofs
+    PXE_PROVER_ENABLED: false # Disable PXE proving
     # Sync
     SYNC_SNAPSHOTS_URLS: ""
     SKIP_ARCHIVER_INITIAL_SYNC: false
@@ -269,7 +268,7 @@ networks:
     AZTEC_SLASH_AMOUNT_MEDIUM: 100000e18
     AZTEC_SLASH_AMOUNT_LARGE: 100000e18
     # Network identity
-    L1_CHAIN_ID: 11155111  # Sepolia
+    L1_CHAIN_ID: 11155111 # Sepolia
     # Genesis state
     TEST_ACCOUNTS: false
     SPONSORED_FPC: false
@@ -314,15 +313,15 @@ networks:
     AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000
     AZTEC_MANA_TARGET: 75000000
     AZTEC_PROVING_COST_PER_MANA: 25000000
-    AZTEC_EXIT_DELAY_SECONDS: 345600  # 4 days
-    AZTEC_SLASHING_DISABLE_DURATION: 259200  # 3 days
+    AZTEC_EXIT_DELAY_SECONDS: 345600 # 4 days
+    AZTEC_SLASHING_DISABLE_DURATION: 259200 # 3 days
     AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500
     AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 500
     AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 1
     AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 400
     AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 4
     # Network identity
-    L1_CHAIN_ID: 1  # Ethereum mainnet
+    L1_CHAIN_ID: 1 # Ethereum mainnet
     # Genesis state - no test accounts, no sponsored FPC
     TEST_ACCOUNTS: false
     SPONSORED_FPC: false
@@ -343,13 +342,13 @@ networks:
     # Slasher penalties - more lenient initially
     SLASH_PRUNE_PENALTY: 0
     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
-    SLASH_DUPLICATE_PROPOSAL_PENALTY: 2000e18
-    SLASH_DUPLICATE_ATTESTATION_PENALTY: 2000e18
+    SLASH_DUPLICATE_PROPOSAL_PENALTY: 0
+    SLASH_DUPLICATE_ATTESTATION_PENALTY: 0
     SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2000e18
     SLASH_UNKNOWN_PENALTY: 2000e18
     SLASH_INVALID_BLOCK_PENALTY: 2000e18
-    SLASH_GRACE_PERIOD_L2_SLOTS: 1200
+    SLASH_GRACE_PERIOD_L2_SLOTS: 8400

yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts

@@ -157,7 +157,7 @@ describe('e2e_deploy_contract deploy method', () => {
 
     // First send the deploy transaction
     // Pay priority fee to ensure the deployment transaction gets processed first.
-    const maxPriorityFeesPerGas = new GasFees(1n, 0n);
+    const maxPriorityFeesPerGas = new GasFees(0n, 1n);
     const deployTxPromise = deployTx.send({
       from: defaultAccountAddress,
       fee: { gasSettings: { maxPriorityFeesPerGas } },

yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts

@@ -30,6 +30,8 @@ const CHECK_ALERTS = process.env.CHECK_ALERTS === 'true';
 const NUM_VALIDATORS = 4;
 const NUM_TXS_PER_NODE = 2;
 const BOOT_NODE_UDP_PORT = 4500;
+const AZTEC_SLOT_DURATION = 36;
+const AZTEC_EPOCH_DURATION = 4;
 
 const DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'gossip-'));
 
@@ -61,8 +63,8 @@ describe('e2e_p2p_network', () => {
       startProverNode: false, // we'll start our own using p2p
       initialConfig: {
         ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
-        aztecSlotDuration: 36,
-        aztecEpochDuration: 4,
+        aztecSlotDuration: AZTEC_SLOT_DURATION,
+        aztecEpochDuration: AZTEC_EPOCH_DURATION,
         slashingRoundSizeInEpochs: 2,
         slashingQuorum: 5,
         listenAddress: '127.0.0.1',
@@ -205,13 +207,15 @@ describe('e2e_p2p_network', () => {
     }
 
     // Ensure prover node did its job and collected txs from p2p
+    // Timeout must exceed one full epoch (aztecSlotDuration * aztecEpochDuration = 36 * 4 = 144s)
+    // plus time for the prover to generate and submit the proof.
     await retryUntil(
       async () => {
         const provenBlock = await nodes[0].getProvenBlockNumber();
         return provenBlock > 0;
       },
       'proven block',
-      120,
+      300,
     );
   });
 });