Merge branch 'next' into merge-train/barretenberg

Author: AztecBot

.test_patterns.yml

@@ -221,6 +221,12 @@ tests:
     error_regex: "expect\\(received\\).toContain\\(expected\\)"
     owners:
       - *palla
+  # http://ci.aztec-labs.com/3b197577b96c3639
+  # http://ci.aztec-labs.com/d429457d95d075e2
+  - regex: "src/e2e_p2p/slash_veto_demo.test.ts"
+    error_regex: "timeout: sending signal TERM to command|ValidatorSelection__InsufficientValidatorSetSize"
+    owners:
+      - *palla
 
   # yarn-project tests
   - regex: "p2p/src/services/discv5/discv5_service.test.ts"

docs/docs/developers/reference/environment_reference/cli_reference.md

@@ -301,7 +301,7 @@ aztec start --port 8081 --pxe --pxe.nodeUrl=$BOOTNODE --pxe.proverEnabled true -
 #### Example Usage
 
 ```bash
-aztec start --network alpha-testnet --l1-rpc-urls https://example.com --l1-consensus-host-urls https://example.com --sequencer.blobSinkUrl http://34.82.117.158:5052  --sequencer.validatorPrivateKey 0xYourPrivateKey --sequencer.coinbase 0xYourAddress --p2p.p2pIp 999.99.999.99
+aztec start --network alpha-testnet --l1-rpc-urls https://example.com --l1-consensus-host-urls https://example.com --sequencer.blobSinkUrl http://34.82.117.158:5052  --sequencer.validatorPrivateKeys 0xYourPrivateKey --sequencer.coinbase 0xYourAddress --p2p.p2pIp 999.99.999.99
 ```
 
 #### Blob Sink Options

docs/docs/the_aztec_network/guides/run_nodes/how_to_run_sequencer.md

@@ -81,7 +81,7 @@ aztec start --node --archiver --sequencer \
   --network alpha-testnet \
   --l1-rpc-urls $ETHEREUM_HOSTS \
   --l1-consensus-host-urls $L1_CONSENSUS_HOST_URLS \
-  --sequencer.validatorPrivateKey $VALIDATOR_PRIVATE_KEY \
+  --sequencer.validatorPrivateKeys $VALIDATOR_PRIVATE_KEY \
   --sequencer.coinbase $COINBASE \
   --p2p.p2pIp $P2P_IP
 ```
@@ -146,7 +146,7 @@ To use the `aztec start` command, you need to obtain the following:
 
 #### Ethereum Keys
 
-You will need an Ethereum private key and the corresponding public address. The private key is set via the `--sequencer.validatorPrivateKey` flag while the public address should be specified via the `--sequencer.coinbase ` flag.
+You will need an Ethereum private key and the corresponding public address. The private key is set via the `--sequencer.validatorPrivateKeys` flag while the public address should be specified via the `--sequencer.coinbase ` flag.
 
 The private key is needed as your validator will post blocks to Ethereum, and the public address will be the recipient of any block rewards.
 
@@ -176,7 +176,7 @@ aztec start --node --archiver --sequencer \
   --network alpha-testnet \
   --l1-rpc-urls https://example.com \
   --l1-consensus-host-urls https://example.com \
-  --sequencer.validatorPrivateKey 0xYourPrivateKey \
+  --sequencer.validatorPrivateKeys 0xYourPrivateKey \
   --sequencer.coinbase 0xYourAddress \
   --p2p.p2pIp 999.99.999.99 \
   --p2p.maxTxPoolSize 1000000000

docs/versioned_docs/version-v1.2.0/developers/reference/environment_reference/cli_reference.md

@@ -301,7 +301,7 @@ aztec start --port 8081 --pxe --pxe.nodeUrl=$BOOTNODE --pxe.proverEnabled true -
 #### Example Usage
 
 ```bash
-aztec start --network alpha-testnet --l1-rpc-urls https://example.com --l1-consensus-host-urls https://example.com --sequencer.blobSinkUrl http://34.82.117.158:5052  --sequencer.validatorPrivateKey 0xYourPrivateKey --sequencer.coinbase 0xYourAddress --p2p.p2pIp 999.99.999.99
+aztec start --network alpha-testnet --l1-rpc-urls https://example.com --l1-consensus-host-urls https://example.com --sequencer.blobSinkUrl http://34.82.117.158:5052  --sequencer.validatorPrivateKeys 0xYourPrivateKey --sequencer.coinbase 0xYourAddress --p2p.p2pIp 999.99.999.99
 ```
 
 #### Blob Sink Options

docs/versioned_docs/version-v1.2.0/the_aztec_network/guides/run_nodes/how_to_run_sequencer.md

@@ -81,7 +81,7 @@ aztec start --node --archiver --sequencer \
   --network alpha-testnet \
   --l1-rpc-urls $ETHEREUM_HOSTS \
   --l1-consensus-host-urls $L1_CONSENSUS_HOST_URLS \
-  --sequencer.validatorPrivateKey $VALIDATOR_PRIVATE_KEY \
+  --sequencer.validatorPrivateKeys $VALIDATOR_PRIVATE_KEY \
   --sequencer.coinbase $COINBASE \
   --p2p.p2pIp $P2P_IP
 ```
@@ -146,7 +146,7 @@ To use the `aztec start` command, you need to obtain the following:
 
 #### Ethereum Keys
 
-You will need an Ethereum private key and the corresponding public address. The private key is set via the `--sequencer.validatorPrivateKey` flag while the public address should be specified via the `--sequencer.coinbase ` flag.
+You will need an Ethereum private key and the corresponding public address. The private key is set via the `--sequencer.validatorPrivateKeys` flag while the public address should be specified via the `--sequencer.coinbase ` flag.
 
 The private key is needed as your validator will post blocks to Ethereum, and the public address will be the recipient of any block rewards.
 
@@ -176,7 +176,7 @@ aztec start --node --archiver --sequencer \
   --network alpha-testnet \
   --l1-rpc-urls https://example.com \
   --l1-consensus-host-urls https://example.com \
-  --sequencer.validatorPrivateKey 0xYourPrivateKey \
+  --sequencer.validatorPrivateKeys 0xYourPrivateKey \
   --sequencer.coinbase 0xYourAddress \
   --p2p.p2pIp 999.99.999.99 \
   --p2p.maxTxPoolSize 1000000000

spartan/bootstrap.sh

@@ -79,6 +79,7 @@ function network_test_cmds {
   local run_test_script="yarn-project/end-to-end/scripts/run_test.sh"
   echo $run_test_script simple src/spartan/smoke.test.ts
   echo $run_test_script simple src/spartan/transfer.test.ts
+  echo $run_test_script simple src/spartan/slash_inactivity.test.ts
 }
 
 function single_test {

spartan/environments/scenario.local.env

@@ -5,8 +5,18 @@ SALT=123
 LABS_INFRA_MNEMONIC="test test test test test test test test test test test junk"
 FUNDING_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
 REAL_VERIFIER=false
-AZTEC_EPOCH_DURATION=8
+SENTINEL_ENABLED=true
+
+AZTEC_EPOCH_DURATION=4
 AZTEC_SLOT_DURATION=24
+AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS=2
+AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS=1
+AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
+AZTEC_ACTIVATION_THRESHOLD=100000000000000000000
+AZTEC_EJECTION_THRESHOLD=50000000000000000000
+AZTEC_SLASH_AMOUNT_SMALL=5000000000000000000
+AZTEC_SLASH_AMOUNT_MEDIUM=10000000000000000000
+AZTEC_SLASH_AMOUNT_LARGE=15000000000000000000
 
 # The following need to be set manually
 # AZTEC_DOCKER_IMAGE=aztecprotocol/aztec:whatever

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

@@ -1122,7 +1122,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
   public async setConfig(config: Partial<AztecNodeAdminConfig>): Promise<void> {
     const newConfig = { ...this.config, ...config };
-    this.sequencer?.updateSequencerConfig(config);
+    this.sequencer?.updateConfig(config);
     this.slasherClient?.updateConfig(config);
     this.validatorsSentinel?.updateConfig(config);
     // this.blockBuilder.updateConfig(config); // TODO: Spyros has a PR to add the builder to `this`, so we can do this

yarn-project/aztec-node/src/sentinel/sentinel.test.ts

@@ -4,7 +4,7 @@ import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { AztecLMDBStoreV2, openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import type { P2PClient } from '@aztec/p2p';
-import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
+import { OffenseType, WANT_TO_SLASH_EVENT, type WantToSlashArgs } from '@aztec/slasher';
 import type { SlasherConfig } from '@aztec/slasher/config';
 import {
   type L2BlockSource,
@@ -24,7 +24,7 @@ import type {
 } from '@aztec/stdlib/validators';
 
 import { jest } from '@jest/globals';
-import { type MockProxy, mock, mockDeep } from 'jest-mock-extended';
+import { type MockProxy, mock } from 'jest-mock-extended';
 
 import { Sentinel } from './sentinel.js';
 import { SentinelStore } from './store.js';
@@ -287,8 +287,8 @@ describe('sentinel', () => {
         jest.spyOn(sentinel, 'computeStatsForValidator').mockReturnValue({
           address: validator,
           totalSlots: 2,
-          missedProposals: { count: 0, currentStreak: 0, rate: 0 },
-          missedAttestations: { count: 0, currentStreak: 0, rate: 0 },
+          missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+          missedAttestations: { count: 0, currentStreak: 0, rate: 0, total: 0 },
           history: mockHistory,
         });
 
@@ -298,8 +298,8 @@ describe('sentinel', () => {
           validator: {
             address: validator,
             totalSlots: 2,
-            missedProposals: { count: 0, currentStreak: 0, rate: 0 },
-            missedAttestations: { count: 0, currentStreak: 0, rate: 0 },
+            missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+            missedAttestations: { count: 0, currentStreak: 0, rate: 0, total: 0 },
             history: mockHistory,
           },
           allTimeProvenPerformance: mockProvenPerformance,
@@ -316,8 +316,8 @@ describe('sentinel', () => {
         const computeStatsSpy = jest.spyOn(sentinel, 'computeStatsForValidator').mockReturnValue({
           address: validator,
           totalSlots: 1,
-          missedProposals: { count: 0, currentStreak: 0, rate: 0 },
-          missedAttestations: { count: 0, currentStreak: 0, rate: 0 },
+          missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+          missedAttestations: { count: 0, currentStreak: 0, rate: 0, total: 0 },
           history: mockHistory,
         });
 
@@ -333,8 +333,8 @@ describe('sentinel', () => {
         const computeStatsSpy = jest.spyOn(sentinel, 'computeStatsForValidator').mockReturnValue({
           address: validator,
           totalSlots: 1,
-          missedProposals: { count: 0, currentStreak: 0, rate: 0 },
-          missedAttestations: { count: 0, currentStreak: 0, rate: 0 },
+          missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+          missedAttestations: { count: 0, currentStreak: 0, rate: 0, total: 0 },
           history: mockHistory,
         });
 
@@ -357,8 +357,8 @@ describe('sentinel', () => {
         jest.spyOn(sentinel, 'computeStatsForValidator').mockReturnValue({
           address: validator,
           totalSlots: 1,
-          missedProposals: { count: 0, currentStreak: 0, rate: 0 },
-          missedAttestations: { count: 0, currentStreak: 0, rate: 0 },
+          missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+          missedAttestations: { count: 0, currentStreak: 0, rate: 0, total: 0 },
           history: mockHistory,
         });
 
@@ -379,65 +379,52 @@ describe('sentinel', () => {
       const epochNumber = getEpochAtSlot(slot, l1Constants);
       const validator1 = EthAddress.random();
       const validator2 = EthAddress.random();
-      const headerSlots = times(5, i => slot - BigInt(i));
-      const mockHeaders = headerSlots.map(s => {
-        const header = mockDeep<PublishedL2Block['block']['header']>();
-        header.getSlot.mockReturnValue(s);
-        return header;
-      });
+      const validator3 = EthAddress.random();
+      const headerSlots = times(l1Constants.epochDuration, i => slot - BigInt(i)).reverse();
 
       epochCache.getEpochAndSlotNow.mockReturnValue({ epoch: epochNumber, slot, ts, now: ts });
       archiver.getBlock.calledWith(blockNumber).mockResolvedValue(mockBlock.block);
       archiver.getL1Constants.mockResolvedValue(l1Constants);
-
-      archiver.getBlockHeadersForEpoch.calledWith(epochNumber).mockResolvedValue(mockHeaders as any);
+      epochCache.getL1Constants.mockReturnValue(l1Constants);
 
       epochCache.getCommittee.mockResolvedValue({
-        committee: [validator1, validator2],
+        committee: [validator1, validator2, validator3],
         seed: 0n,
         epoch: epochNumber,
       });
-      const statsResult = {
+
+      const statsResult: ValidatorsStats = {
         stats: {
+          // Validator 1 missed 1 attestation only, we won't slash them
           [validator1.toString()]: {
             address: validator1,
             totalSlots: headerSlots.length,
-            missedProposals: { count: 0, currentStreak: 0, rate: 0 },
-            missedAttestations: { count: 1, currentStreak: 0, rate: 1 / 5 },
-            history: [
-              { slot: headerSlots[0], status: 'attestation-sent' },
-              { slot: headerSlots[1], status: 'attestation-missed' },
-              { slot: headerSlots[2], status: 'attestation-sent' },
-              { slot: headerSlots[3], status: 'attestation-sent' },
-              { slot: headerSlots[4], status: 'attestation-sent' },
-            ],
-          } as ValidatorStats,
+            missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+            missedAttestations: { count: 1, currentStreak: 0, rate: 1 / 8, total: 8 },
+            history: [],
+          },
+          // Validator 2 missed 7 out of 8, we will slash them
           [validator2.toString()]: {
             address: validator2,
             totalSlots: headerSlots.length,
-            missedProposals: { count: 0, currentStreak: 0, rate: 0 },
-            // We should only count the slots that are in the proven epoch (0, 1, 2)!!
-            missedAttestations: { count: 4, currentStreak: 3, rate: 4 / 5 },
-            history: [
-              { slot: headerSlots[0], status: 'attestation-missed' },
-              { slot: headerSlots[1], status: 'attestation-sent' },
-              { slot: headerSlots[2], status: 'attestation-missed' },
-              { slot: headerSlots[3], status: 'attestation-missed' },
-              { slot: headerSlots[4], status: 'attestation-missed' },
-            ],
-          } as ValidatorStats,
-          '0xNotAnAddress': {
-            address: EthAddress.ZERO, // Placeholder
-            totalSlots: 0,
-            missedProposals: { count: 0, currentStreak: 0, rate: undefined },
-            missedAttestations: { count: 0, currentStreak: 0, rate: undefined },
+            missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+            missedAttestations: { count: 7, currentStreak: 3, rate: 7 / 8, total: 8 },
+            history: [],
+          },
+          // Validator 3 missed 4 attestations out of 4, so we will slash them even though the epoch has 8 slots
+          // This difference happens because we don't count attestations for a slot where there was no proposal
+          [validator3.toString()]: {
+            address: validator3,
+            totalSlots: headerSlots.length,
+            missedProposals: { count: 0, currentStreak: 0, rate: 0, total: 0 },
+            missedAttestations: { count: 4, currentStreak: 4, rate: 4 / 4, total: 4 },
             history: [],
-          } as ValidatorStats, // To test filtering
+          },
         },
         lastProcessedSlot: slot,
         initialSlot: 0n,
         slotWindow: 15,
-      } as ValidatorsStats;
+      };
       const computeStatsSpy = jest.spyOn(sentinel, 'computeStats').mockResolvedValue(statsResult);
       const emitSpy = jest.spyOn(sentinel, 'emit');
 
@@ -446,20 +433,20 @@ describe('sentinel', () => {
       expect(computeStatsSpy).toHaveBeenCalledWith({
         fromSlot: headerSlots[0],
         toSlot: headerSlots[headerSlots.length - 1],
+        validators: [validator1, validator2, validator3],
+      });
+      const makeInactivitySlash = (validator: EthAddress): WantToSlashArgs => ({
+        validator,
+        amount: config.slashInactivityPenalty,
+        offenseType: OffenseType.INACTIVITY,
+        epochOrSlot: 1n,
       });
 
       expect(emitSpy).toHaveBeenCalledTimes(1);
-      expect(emitSpy).toHaveBeenCalledWith(
-        WANT_TO_SLASH_EVENT,
-        expect.arrayContaining([
-          expect.objectContaining({
-            validator: validator2,
-            amount: config.slashInactivityPenalty,
-            offenseType: OffenseType.INACTIVITY,
-            epochOrSlot: epochNumber,
-          }),
-        ]),
-      );
+      expect(emitSpy).toHaveBeenCalledWith(WANT_TO_SLASH_EVENT, [
+        makeInactivitySlash(validator2),
+        makeInactivitySlash(validator3),
+      ]);
     });
   });
 
@@ -673,10 +660,6 @@ class TestSentinel extends Sentinel {
     return super.handleProvenPerformance(epoch, performance);
   }
 
-  public override updateProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance) {
-    return super.updateProvenPerformance(epoch, performance);
-  }
-
   public override getValidatorStats(validatorAddress: EthAddress, fromSlot?: bigint, toSlot?: bigint) {
     return super.getValidatorStats(validatorAddress, fromSlot, toSlot);
   }