@aztec/stdlib 0.0.1-commit.2ed92850 → 0.0.1-commit.3d8f95d
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/abi/function_call.d.ts +39 -9
- package/dest/abi/function_call.d.ts.map +1 -1
- package/dest/abi/function_call.js +20 -3
- package/dest/block/block_hash.d.ts +16 -19
- package/dest/block/block_hash.d.ts.map +1 -1
- package/dest/block/block_hash.js +21 -34
- package/dest/block/block_parameter.d.ts +4 -4
- package/dest/block/block_parameter.d.ts.map +1 -1
- package/dest/block/block_parameter.js +2 -2
- package/dest/block/in_block.d.ts +9 -9
- package/dest/block/in_block.d.ts.map +1 -1
- package/dest/block/in_block.js +5 -5
- package/dest/block/l2_block.d.ts +3 -2
- package/dest/block/l2_block.d.ts.map +1 -1
- package/dest/block/l2_block.js +2 -3
- package/dest/block/l2_block_source.d.ts +5 -4
- package/dest/block/l2_block_source.d.ts.map +1 -1
- package/dest/config/index.d.ts +2 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +1 -0
- package/dest/config/sequencer-config.d.ts +10 -0
- package/dest/config/sequencer-config.d.ts.map +1 -0
- package/dest/config/sequencer-config.js +12 -0
- package/dest/contract/contract_address.js +1 -1
- package/dest/contract/contract_class_id.d.ts +1 -1
- package/dest/contract/contract_class_id.js +1 -1
- package/dest/contract/private_function.js +1 -1
- package/dest/contract/private_function_membership_proof.d.ts +1 -1
- package/dest/contract/private_function_membership_proof.js +1 -1
- package/dest/database-version/database_version.d.ts +58 -0
- package/dest/database-version/database_version.d.ts.map +1 -0
- package/dest/database-version/database_version.js +69 -0
- package/dest/database-version/version_manager.d.ts +2 -50
- package/dest/database-version/version_manager.d.ts.map +1 -1
- package/dest/database-version/version_manager.js +1 -66
- package/dest/epoch-helpers/index.d.ts +7 -1
- package/dest/epoch-helpers/index.d.ts.map +1 -1
- package/dest/epoch-helpers/index.js +8 -2
- package/dest/hash/hash.js +2 -2
- package/dest/hash/map_slot.d.ts +1 -1
- package/dest/hash/map_slot.d.ts.map +1 -1
- package/dest/hash/map_slot.js +4 -3
- package/dest/interfaces/archiver.d.ts +1 -1
- package/dest/interfaces/archiver.d.ts.map +1 -1
- package/dest/interfaces/archiver.js +4 -3
- package/dest/interfaces/aztec-node-admin.d.ts +17 -2
- package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
- package/dest/interfaces/aztec-node-admin.js +3 -1
- package/dest/interfaces/aztec-node.d.ts +33 -54
- package/dest/interfaces/aztec-node.d.ts.map +1 -1
- package/dest/interfaces/aztec-node.js +6 -10
- package/dest/interfaces/block-builder.d.ts +10 -4
- package/dest/interfaces/block-builder.d.ts.map +1 -1
- package/dest/interfaces/block-builder.js +7 -0
- package/dest/interfaces/get_logs_response.d.ts +15 -8
- package/dest/interfaces/get_logs_response.d.ts.map +1 -1
- package/dest/interfaces/p2p.d.ts +2 -2
- package/dest/interfaces/p2p.d.ts.map +1 -1
- package/dest/interfaces/prover-broker.d.ts +16 -1
- package/dest/interfaces/prover-broker.d.ts.map +1 -1
- package/dest/interfaces/prover-broker.js +4 -1
- package/dest/interfaces/prover-client.d.ts +6 -1
- package/dest/interfaces/prover-client.d.ts.map +1 -1
- package/dest/interfaces/prover-client.js +5 -0
- package/dest/interfaces/proving-job.d.ts +200 -200
- package/dest/interfaces/slasher.d.ts +9 -1
- package/dest/interfaces/slasher.d.ts.map +1 -1
- package/dest/interfaces/slasher.js +2 -0
- package/dest/interfaces/validator.d.ts +49 -3
- package/dest/interfaces/validator.d.ts.map +1 -1
- package/dest/interfaces/validator.js +4 -1
- package/dest/keys/derivation.d.ts +3 -3
- package/dest/keys/derivation.js +8 -8
- package/dest/keys/key_types.d.ts +1 -1
- package/dest/keys/utils.d.ts +1 -1
- package/dest/keys/utils.d.ts.map +1 -1
- package/dest/keys/utils.js +7 -3
- package/dest/l1-contracts/slash_factory.d.ts +1 -1
- package/dest/l1-contracts/slash_factory.d.ts.map +1 -1
- package/dest/l1-contracts/slash_factory.js +1 -0
- package/dest/logs/extended_public_log.d.ts +13 -7
- package/dest/logs/extended_public_log.d.ts.map +1 -1
- package/dest/logs/log_id.d.ts +17 -14
- package/dest/logs/log_id.d.ts.map +1 -1
- package/dest/logs/log_id.js +20 -17
- package/dest/logs/siloed_tag.d.ts +1 -1
- package/dest/logs/siloed_tag.d.ts.map +1 -1
- package/dest/logs/siloed_tag.js +4 -3
- package/dest/messaging/l2_to_l1_membership.d.ts +2 -2
- package/dest/messaging/l2_to_l1_membership.js +3 -3
- package/dest/p2p/block_proposal.d.ts +10 -3
- package/dest/p2p/block_proposal.d.ts.map +1 -1
- package/dest/p2p/checkpoint_proposal.d.ts +17 -3
- package/dest/p2p/checkpoint_proposal.d.ts.map +1 -1
- package/dest/p2p/checkpoint_proposal.js +9 -0
- package/dest/p2p/constants.d.ts +3 -1
- package/dest/p2p/constants.d.ts.map +1 -1
- package/dest/p2p/constants.js +1 -0
- package/dest/rollup/checkpoint_rollup_public_inputs.d.ts +6 -6
- package/dest/rollup/checkpoint_rollup_public_inputs.d.ts.map +1 -1
- package/dest/rollup/checkpoint_rollup_public_inputs.js +2 -2
- package/dest/rollup/checkpoint_root_rollup_private_inputs.d.ts +2 -2
- package/dest/rollup/checkpoint_root_rollup_private_inputs.d.ts.map +1 -1
- package/dest/rollup/root_rollup_public_inputs.d.ts +6 -6
- package/dest/rollup/root_rollup_public_inputs.d.ts.map +1 -1
- package/dest/rollup/root_rollup_public_inputs.js +3 -3
- package/dest/slashing/empire.d.ts +1 -1
- package/dest/slashing/empire.d.ts.map +1 -1
- package/dest/slashing/empire.js +2 -0
- package/dest/slashing/helpers.d.ts +2 -2
- package/dest/slashing/helpers.d.ts.map +1 -1
- package/dest/slashing/helpers.js +6 -0
- package/dest/slashing/tally.d.ts +2 -1
- package/dest/slashing/tally.d.ts.map +1 -1
- package/dest/slashing/tally.js +6 -2
- package/dest/slashing/types.d.ts +7 -3
- package/dest/slashing/types.d.ts.map +1 -1
- package/dest/slashing/types.js +13 -1
- package/dest/stats/stats.d.ts +1 -3
- package/dest/stats/stats.d.ts.map +1 -1
- package/dest/tests/factories.js +3 -3
- package/dest/tests/mocks.d.ts +6 -2
- package/dest/tests/mocks.d.ts.map +1 -1
- package/dest/tests/mocks.js +4 -3
- package/dest/timetable/index.d.ts +37 -0
- package/dest/timetable/index.d.ts.map +1 -0
- package/dest/timetable/index.js +39 -0
- package/dest/trees/public_data_leaf.d.ts +2 -1
- package/dest/trees/public_data_leaf.d.ts.map +1 -1
- package/dest/trees/public_data_leaf.js +7 -6
- package/dest/tx/block_header.d.ts +3 -3
- package/dest/tx/block_header.d.ts.map +1 -1
- package/dest/tx/block_header.js +3 -3
- package/dest/tx/in_tx.d.ts +3 -3
- package/dest/tx/indexed_tx_effect.d.ts +5 -5
- package/dest/tx/indexed_tx_effect.d.ts.map +1 -1
- package/dest/tx/indexed_tx_effect.js +3 -2
- package/dest/tx/tx_receipt.d.ts +5 -5
- package/dest/tx/tx_receipt.d.ts.map +1 -1
- package/dest/tx/tx_receipt.js +2 -2
- package/dest/tx/validator/empty_validator.d.ts +2 -2
- package/dest/tx/validator/empty_validator.d.ts.map +1 -1
- package/dest/tx/validator/tx_validator.d.ts +2 -2
- package/dest/tx/validator/tx_validator.d.ts.map +1 -1
- package/package.json +24 -12
- package/src/abi/function_call.ts +25 -3
- package/src/block/block_hash.ts +25 -50
- package/src/block/block_parameter.ts +3 -3
- package/src/block/in_block.ts +6 -6
- package/src/block/l2_block.ts +3 -3
- package/src/block/l2_block_source.ts +4 -3
- package/src/config/index.ts +1 -0
- package/src/config/sequencer-config.ts +19 -0
- package/src/contract/contract_address.ts +1 -1
- package/src/contract/contract_class_id.ts +1 -1
- package/src/contract/private_function.ts +1 -1
- package/src/contract/private_function_membership_proof.ts +1 -1
- package/src/database-version/database_version.ts +87 -0
- package/src/database-version/version_manager.ts +1 -77
- package/src/epoch-helpers/index.ts +12 -0
- package/src/hash/hash.ts +2 -2
- package/src/hash/map_slot.ts +3 -2
- package/src/interfaces/archiver.ts +4 -3
- package/src/interfaces/aztec-node-admin.ts +3 -2
- package/src/interfaces/aztec-node.ts +42 -93
- package/src/interfaces/block-builder.ts +12 -2
- package/src/interfaces/p2p.ts +1 -1
- package/src/interfaces/prover-broker.ts +22 -0
- package/src/interfaces/prover-client.ts +7 -0
- package/src/interfaces/slasher.ts +4 -0
- package/src/interfaces/validator.ts +11 -3
- package/src/keys/derivation.ts +8 -8
- package/src/keys/key_types.ts +1 -1
- package/src/keys/utils.ts +7 -3
- package/src/l1-contracts/slash_factory.ts +1 -0
- package/src/logs/log_id.ts +22 -18
- package/src/logs/siloed_tag.ts +3 -2
- package/src/messaging/l2_to_l1_membership.ts +3 -3
- package/src/p2p/block_proposal.ts +9 -2
- package/src/p2p/checkpoint_proposal.ts +19 -2
- package/src/p2p/constants.ts +3 -0
- package/src/rollup/checkpoint_rollup_public_inputs.ts +5 -5
- package/src/rollup/root_rollup_public_inputs.ts +7 -7
- package/src/slashing/empire.ts +3 -1
- package/src/slashing/helpers.ts +8 -0
- package/src/slashing/tally.ts +8 -2
- package/src/slashing/types.ts +14 -0
- package/src/stats/stats.ts +0 -2
- package/src/tests/factories.ts +5 -5
- package/src/tests/mocks.ts +6 -4
- package/src/timetable/index.ts +66 -0
- package/src/trees/public_data_leaf.ts +11 -5
- package/src/tx/block_header.ts +6 -6
- package/src/tx/indexed_tx_effect.ts +3 -2
- package/src/tx/tx_receipt.ts +4 -4
- package/src/tx/validator/empty_validator.ts +1 -1
- package/src/tx/validator/tx_validator.ts +1 -1
- package/dest/database-version/index.d.ts +0 -2
- package/dest/database-version/index.d.ts.map +0 -1
- package/dest/database-version/index.js +0 -1
- package/src/database-version/index.ts +0 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import type { LoggerBindings } from '@aztec/foundation/log';
|
|
3
4
|
|
|
4
5
|
import type { L2Block } from '../block/l2_block.js';
|
|
5
6
|
import type { ChainConfig, SequencerConfig } from '../config/chain-config.js';
|
|
@@ -61,8 +62,16 @@ export const FullNodeBlockBuilderConfigKeys: (keyof FullNodeBlockBuilderConfig)[
|
|
|
61
62
|
'fakeThrowAfterProcessingTxCount',
|
|
62
63
|
] as const;
|
|
63
64
|
|
|
65
|
+
/** Thrown when no valid transactions are available to include in a block after processing, and this is not the first block in a checkpoint. */
|
|
66
|
+
export class NoValidTxsError extends Error {
|
|
67
|
+
constructor(public readonly failedTxs: FailedTx[]) {
|
|
68
|
+
super('No valid transactions to include in block');
|
|
69
|
+
this.name = 'NoValidTxsError';
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
64
73
|
/** Result of building a block within a checkpoint. */
|
|
65
|
-
export
|
|
74
|
+
export type BuildBlockInCheckpointResult = {
|
|
66
75
|
block: L2Block;
|
|
67
76
|
publicGas: Gas;
|
|
68
77
|
publicProcessorDuration: number;
|
|
@@ -70,7 +79,7 @@ export interface BuildBlockInCheckpointResult {
|
|
|
70
79
|
failedTxs: FailedTx[];
|
|
71
80
|
usedTxs: Tx[];
|
|
72
81
|
usedTxBlobFields: number;
|
|
73
|
-
}
|
|
82
|
+
};
|
|
74
83
|
|
|
75
84
|
/** Interface for building blocks within a checkpoint context. */
|
|
76
85
|
export interface ICheckpointBlockBuilder {
|
|
@@ -92,5 +101,6 @@ export interface ICheckpointsBuilder {
|
|
|
92
101
|
l1ToL2Messages: Fr[],
|
|
93
102
|
previousCheckpointOutHashes: Fr[],
|
|
94
103
|
fork: MerkleTreeWriteOperations,
|
|
104
|
+
bindings?: LoggerBindings,
|
|
95
105
|
): Promise<ICheckpointBlockBuilder>;
|
|
96
106
|
}
|
package/src/interfaces/p2p.ts
CHANGED
|
@@ -63,7 +63,7 @@ export interface P2PApiWithAttestations extends P2PApiWithoutAttestations {
|
|
|
63
63
|
|
|
64
64
|
export interface P2PClient extends P2PApiWithAttestations {
|
|
65
65
|
/** Manually adds checkpoint attestations to the p2p client attestation pool. */
|
|
66
|
-
|
|
66
|
+
addOwnCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
export type P2PApi<T extends P2PClientType = P2PClientType.Full> = T extends P2PClientType.Full
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { EpochNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
|
|
1
3
|
import type { ProvingRequestType } from '../proofs/proving_request_type.js';
|
|
2
4
|
import type { ProofUri, ProvingJob, ProvingJobId, ProvingJobStatus } from './proving-job.js';
|
|
3
5
|
|
|
@@ -88,3 +90,23 @@ export interface ProvingJobConsumer {
|
|
|
88
90
|
}
|
|
89
91
|
|
|
90
92
|
export interface ProvingJobBroker extends ProvingJobProducer, ProvingJobConsumer {}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Debug interface for replaying proving jobs from stored inputs.
|
|
96
|
+
* Used for benchmarking different agent configurations against the same workload.
|
|
97
|
+
*/
|
|
98
|
+
export interface ProvingJobBrokerDebug {
|
|
99
|
+
/**
|
|
100
|
+
* Replays a proving job by re-enqueuing it with inputs from the configured proof store.
|
|
101
|
+
* The proof type is parsed from the job ID (format: epoch:typeName:hash).
|
|
102
|
+
* @param jobId - The original job ID to replay
|
|
103
|
+
* @param epochNumber - The epoch number to assign
|
|
104
|
+
* @param inputsUri - The proof inputs location
|
|
105
|
+
*/
|
|
106
|
+
replayProvingJob(
|
|
107
|
+
jobId: ProvingJobId,
|
|
108
|
+
type: ProvingRequestType,
|
|
109
|
+
epochNumber: EpochNumber,
|
|
110
|
+
inputsUri: ProofUri,
|
|
111
|
+
): Promise<ProvingJobStatus>;
|
|
112
|
+
}
|
|
@@ -35,6 +35,8 @@ export type ProverConfig = ActualProverConfig & {
|
|
|
35
35
|
proverId?: EthAddress;
|
|
36
36
|
/** Number of proving agents to start within the prover. */
|
|
37
37
|
proverAgentCount: number;
|
|
38
|
+
/** Where to store proving request. Must be accessible to both prover node and agents. If not set will inline-encode the parameters */
|
|
39
|
+
proofStore?: string;
|
|
38
40
|
/** Store for failed proof inputs. */
|
|
39
41
|
failedProofStore?: string;
|
|
40
42
|
};
|
|
@@ -48,6 +50,7 @@ export const ProverConfigSchema = zodFor<ProverConfig>()(
|
|
|
48
50
|
proverTestDelayMs: z.number(),
|
|
49
51
|
proverTestDelayFactor: z.number(),
|
|
50
52
|
proverAgentCount: z.number(),
|
|
53
|
+
proofStore: z.string().optional(),
|
|
51
54
|
failedProofStore: z.string().optional(),
|
|
52
55
|
cancelJobsOnStop: z.boolean(),
|
|
53
56
|
}),
|
|
@@ -87,6 +90,10 @@ export const proverConfigMappings: ConfigMappingsType<ProverConfig> = {
|
|
|
87
90
|
description: 'The number of prover agents to start',
|
|
88
91
|
...numberConfigHelper(1),
|
|
89
92
|
},
|
|
93
|
+
proofStore: {
|
|
94
|
+
env: 'PROVER_PROOF_STORE',
|
|
95
|
+
description: 'Optional proof input store for the prover',
|
|
96
|
+
},
|
|
90
97
|
failedProofStore: {
|
|
91
98
|
env: 'PROVER_FAILED_PROOF_STORE',
|
|
92
99
|
description:
|
|
@@ -18,6 +18,8 @@ export interface SlasherConfig {
|
|
|
18
18
|
slashDataWithholdingPenalty: bigint;
|
|
19
19
|
slashInactivityPenalty: bigint;
|
|
20
20
|
slashBroadcastedInvalidBlockPenalty: bigint;
|
|
21
|
+
slashDuplicateProposalPenalty: bigint;
|
|
22
|
+
slashDuplicateAttestationPenalty: bigint;
|
|
21
23
|
slashProposeInvalidAttestationsPenalty: bigint;
|
|
22
24
|
slashAttestDescendantOfInvalidPenalty: bigint;
|
|
23
25
|
slashUnknownPenalty: bigint;
|
|
@@ -40,6 +42,8 @@ export const SlasherConfigSchema = zodFor<SlasherConfig>()(
|
|
|
40
42
|
slashInactivityConsecutiveEpochThreshold: z.number(),
|
|
41
43
|
slashInactivityPenalty: schemas.BigInt,
|
|
42
44
|
slashProposeInvalidAttestationsPenalty: schemas.BigInt,
|
|
45
|
+
slashDuplicateProposalPenalty: schemas.BigInt,
|
|
46
|
+
slashDuplicateAttestationPenalty: schemas.BigInt,
|
|
43
47
|
slashAttestDescendantOfInvalidPenalty: schemas.BigInt,
|
|
44
48
|
slashUnknownPenalty: schemas.BigInt,
|
|
45
49
|
slashOffenseExpirationRounds: z.number(),
|
|
@@ -51,17 +51,22 @@ export type ValidatorClientConfig = ValidatorHASignerConfig & {
|
|
|
51
51
|
/** Whether to run in fisherman mode: validates all proposals and attestations but does not broadcast attestations or participate in consensus */
|
|
52
52
|
fishermanMode?: boolean;
|
|
53
53
|
|
|
54
|
-
|
|
55
|
-
/** Skip checkpoint proposal validation and always attest (default: true) */
|
|
54
|
+
/** Skip checkpoint proposal validation and always attest (default: false) */
|
|
56
55
|
skipCheckpointProposalValidation?: boolean;
|
|
57
56
|
|
|
58
57
|
/** Skip pushing re-executed blocks to archiver (default: false) */
|
|
59
58
|
skipPushProposedBlocksToArchiver?: boolean;
|
|
59
|
+
|
|
60
|
+
/** Agree to attest to equivocated checkpoint proposals (for testing purposes only) */
|
|
61
|
+
attestToEquivocatedProposals?: boolean;
|
|
60
62
|
};
|
|
61
63
|
|
|
62
64
|
export type ValidatorClientFullConfig = ValidatorClientConfig &
|
|
63
65
|
Pick<SequencerConfig, 'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal'> &
|
|
64
|
-
Pick<
|
|
66
|
+
Pick<
|
|
67
|
+
SlasherConfig,
|
|
68
|
+
'slashBroadcastedInvalidBlockPenalty' | 'slashDuplicateProposalPenalty' | 'slashDuplicateAttestationPenalty'
|
|
69
|
+
> & {
|
|
65
70
|
/**
|
|
66
71
|
* Whether transactions are disabled for this node
|
|
67
72
|
* @remarks This should match the property in P2PConfig. It's not picked from there to avoid circular dependencies.
|
|
@@ -80,6 +85,7 @@ export const ValidatorClientConfigSchema = zodFor<Omit<ValidatorClientConfig, 'v
|
|
|
80
85
|
fishermanMode: z.boolean().optional(),
|
|
81
86
|
skipCheckpointProposalValidation: z.boolean().optional(),
|
|
82
87
|
skipPushProposedBlocksToArchiver: z.boolean().optional(),
|
|
88
|
+
attestToEquivocatedProposals: z.boolean().optional(),
|
|
83
89
|
}),
|
|
84
90
|
);
|
|
85
91
|
|
|
@@ -88,6 +94,8 @@ export const ValidatorClientFullConfigSchema = zodFor<Omit<ValidatorClientFullCo
|
|
|
88
94
|
txPublicSetupAllowList: z.array(AllowedElementSchema).optional(),
|
|
89
95
|
broadcastInvalidBlockProposal: z.boolean().optional(),
|
|
90
96
|
slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
|
|
97
|
+
slashDuplicateProposalPenalty: schemas.BigInt,
|
|
98
|
+
slashDuplicateAttestationPenalty: schemas.BigInt,
|
|
91
99
|
disableTransactions: z.boolean().optional(),
|
|
92
100
|
}),
|
|
93
101
|
);
|
package/src/keys/derivation.ts
CHANGED
|
@@ -10,8 +10,8 @@ import type { KeyPrefix } from './key_types.js';
|
|
|
10
10
|
import { PublicKeys } from './public_keys.js';
|
|
11
11
|
import { getKeyGenerator } from './utils.js';
|
|
12
12
|
|
|
13
|
-
export function
|
|
14
|
-
return computeAppSecretKey(
|
|
13
|
+
export function computeAppNullifierHidingKey(masterNullifierHidingKey: GrumpkinScalar, app: AztecAddress): Promise<Fr> {
|
|
14
|
+
return computeAppSecretKey(masterNullifierHidingKey, app, 'n'); // 'n' is the key prefix for nullifier hiding key
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
export function computeAppSecretKey(skM: GrumpkinScalar, app: AztecAddress, keyPrefix: KeyPrefix): Promise<Fr> {
|
|
@@ -26,8 +26,8 @@ export async function computeOvskApp(ovsk: GrumpkinScalar, app: AztecAddress): P
|
|
|
26
26
|
return GrumpkinScalar.fromBuffer(ovskAppFr.toBuffer());
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
export function
|
|
30
|
-
return sha512ToGrumpkinScalar([secretKey, GeneratorIndex.
|
|
29
|
+
export function deriveMasterNullifierHidingKey(secretKey: Fr): GrumpkinScalar {
|
|
30
|
+
return sha512ToGrumpkinScalar([secretKey, GeneratorIndex.NHK_M]);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
export function deriveMasterIncomingViewingSecretKey(secretKey: Fr): GrumpkinScalar {
|
|
@@ -93,15 +93,15 @@ export function derivePublicKeyFromSecretKey(secretKey: Fq) {
|
|
|
93
93
|
* @returns The derived keys.
|
|
94
94
|
*/
|
|
95
95
|
export async function deriveKeys(secretKey: Fr) {
|
|
96
|
-
// First we derive master secret keys - we use sha512 here because this derivation will never take place
|
|
96
|
+
// First we derive master secret/hiding keys - we use sha512 here because this derivation will never take place
|
|
97
97
|
// in a circuit
|
|
98
|
-
const
|
|
98
|
+
const masterNullifierHidingKey = deriveMasterNullifierHidingKey(secretKey);
|
|
99
99
|
const masterIncomingViewingSecretKey = deriveMasterIncomingViewingSecretKey(secretKey);
|
|
100
100
|
const masterOutgoingViewingSecretKey = deriveMasterOutgoingViewingSecretKey(secretKey);
|
|
101
101
|
const masterTaggingSecretKey = sha512ToGrumpkinScalar([secretKey, GeneratorIndex.TSK_M]);
|
|
102
102
|
|
|
103
103
|
// Then we derive master public keys
|
|
104
|
-
const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(
|
|
104
|
+
const masterNullifierPublicKey = await derivePublicKeyFromSecretKey(masterNullifierHidingKey);
|
|
105
105
|
const masterIncomingViewingPublicKey = await derivePublicKeyFromSecretKey(masterIncomingViewingSecretKey);
|
|
106
106
|
const masterOutgoingViewingPublicKey = await derivePublicKeyFromSecretKey(masterOutgoingViewingSecretKey);
|
|
107
107
|
const masterTaggingPublicKey = await derivePublicKeyFromSecretKey(masterTaggingSecretKey);
|
|
@@ -115,7 +115,7 @@ export async function deriveKeys(secretKey: Fr) {
|
|
|
115
115
|
);
|
|
116
116
|
|
|
117
117
|
return {
|
|
118
|
-
|
|
118
|
+
masterNullifierHidingKey,
|
|
119
119
|
masterIncomingViewingSecretKey,
|
|
120
120
|
masterOutgoingViewingSecretKey,
|
|
121
121
|
masterTaggingSecretKey,
|
package/src/keys/key_types.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { GeneratorIndex } from '@aztec/constants';
|
|
2
2
|
|
|
3
|
-
export type KeyGenerator = GeneratorIndex.
|
|
3
|
+
export type KeyGenerator = GeneratorIndex.NHK_M | GeneratorIndex.IVSK_M | GeneratorIndex.OVSK_M | GeneratorIndex.TSK_M;
|
|
4
4
|
export type KeyPrefix = 'n' | 'iv' | 'ov' | 't';
|
|
5
5
|
export const KEY_PREFIXES: KeyPrefix[] = ['n', 'iv', 'ov', 't'];
|
package/src/keys/utils.ts
CHANGED
|
@@ -3,7 +3,11 @@ import { GeneratorIndex } from '@aztec/constants';
|
|
|
3
3
|
import type { KeyGenerator, KeyPrefix } from './key_types.js';
|
|
4
4
|
|
|
5
5
|
export function getKeyGenerator(prefix: KeyPrefix): KeyGenerator {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
const map: Record<KeyPrefix, KeyGenerator> = {
|
|
7
|
+
n: GeneratorIndex.NHK_M,
|
|
8
|
+
iv: GeneratorIndex.IVSK_M,
|
|
9
|
+
ov: GeneratorIndex.OVSK_M,
|
|
10
|
+
t: GeneratorIndex.TSK_M,
|
|
11
|
+
};
|
|
12
|
+
return map[prefix];
|
|
9
13
|
}
|
package/src/logs/log_id.ts
CHANGED
|
@@ -1,26 +1,24 @@
|
|
|
1
1
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
2
2
|
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
3
3
|
import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
|
|
4
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
5
|
import { BufferReader } from '@aztec/foundation/serialize';
|
|
5
6
|
|
|
6
7
|
import { z } from 'zod';
|
|
7
8
|
|
|
8
|
-
import {
|
|
9
|
+
import { BlockHash } from '../block/block_hash.js';
|
|
9
10
|
import { schemas } from '../schemas/index.js';
|
|
11
|
+
import { TxHash } from '../tx/tx_hash.js';
|
|
10
12
|
|
|
11
13
|
/** A globally unique log id. */
|
|
12
14
|
export class LogId {
|
|
13
|
-
/**
|
|
14
|
-
* Parses a log id from a string.
|
|
15
|
-
* @param blockNumber - The block number.
|
|
16
|
-
* @param txIndex - The transaction index.
|
|
17
|
-
* @param logIndex - The log index.
|
|
18
|
-
*/
|
|
19
15
|
constructor(
|
|
20
16
|
/** The block number the log was emitted in. */
|
|
21
17
|
public readonly blockNumber: BlockNumber,
|
|
22
18
|
/** The hash of the block the log was emitted in. */
|
|
23
|
-
public readonly blockHash:
|
|
19
|
+
public readonly blockHash: BlockHash,
|
|
20
|
+
/** The hash of the transaction the log was emitted in. */
|
|
21
|
+
public readonly txHash: TxHash,
|
|
24
22
|
/** The index of a tx in a block the log was emitted in. */
|
|
25
23
|
public readonly txIndex: number,
|
|
26
24
|
/** The index of a log the tx was emitted in. */
|
|
@@ -40,7 +38,8 @@ export class LogId {
|
|
|
40
38
|
static random() {
|
|
41
39
|
return new LogId(
|
|
42
40
|
BlockNumber(Math.floor(Math.random() * 1000) + 1),
|
|
43
|
-
|
|
41
|
+
BlockHash.random(),
|
|
42
|
+
TxHash.random(),
|
|
44
43
|
Math.floor(Math.random() * 1000),
|
|
45
44
|
Math.floor(Math.random() * 100),
|
|
46
45
|
);
|
|
@@ -50,12 +49,14 @@ export class LogId {
|
|
|
50
49
|
return z
|
|
51
50
|
.object({
|
|
52
51
|
blockNumber: BlockNumberSchema,
|
|
53
|
-
blockHash:
|
|
52
|
+
blockHash: BlockHash.schema,
|
|
53
|
+
txHash: TxHash.schema,
|
|
54
54
|
txIndex: schemas.Integer,
|
|
55
55
|
logIndex: schemas.Integer,
|
|
56
56
|
})
|
|
57
57
|
.transform(
|
|
58
|
-
({ blockNumber, blockHash, txIndex, logIndex }) =>
|
|
58
|
+
({ blockNumber, blockHash, txHash, txIndex, logIndex }) =>
|
|
59
|
+
new LogId(blockNumber, blockHash, txHash, txIndex, logIndex),
|
|
59
60
|
);
|
|
60
61
|
}
|
|
61
62
|
|
|
@@ -67,6 +68,7 @@ export class LogId {
|
|
|
67
68
|
return Buffer.concat([
|
|
68
69
|
toBufferBE(BigInt(this.blockNumber), 4),
|
|
69
70
|
this.blockHash.toBuffer(),
|
|
71
|
+
this.txHash.toBuffer(),
|
|
70
72
|
toBufferBE(BigInt(this.txIndex), 4),
|
|
71
73
|
toBufferBE(BigInt(this.logIndex), 4),
|
|
72
74
|
]);
|
|
@@ -81,11 +83,12 @@ export class LogId {
|
|
|
81
83
|
const reader = BufferReader.asReader(buffer);
|
|
82
84
|
|
|
83
85
|
const blockNumber = BlockNumber(reader.readNumber());
|
|
84
|
-
const blockHash = reader.readObject(
|
|
86
|
+
const blockHash = new BlockHash(reader.readObject(Fr));
|
|
87
|
+
const txHash = reader.readObject(TxHash);
|
|
85
88
|
const txIndex = reader.readNumber();
|
|
86
89
|
const logIndex = reader.readNumber();
|
|
87
90
|
|
|
88
|
-
return new LogId(blockNumber, blockHash, txIndex, logIndex);
|
|
91
|
+
return new LogId(blockNumber, blockHash, txHash, txIndex, logIndex);
|
|
89
92
|
}
|
|
90
93
|
|
|
91
94
|
/**
|
|
@@ -93,7 +96,7 @@ export class LogId {
|
|
|
93
96
|
* @returns A string representation of the log id.
|
|
94
97
|
*/
|
|
95
98
|
public toString(): string {
|
|
96
|
-
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}-${this.blockHash.toString()}`;
|
|
99
|
+
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}-${this.blockHash.toString()}-${this.txHash.toString()}`;
|
|
97
100
|
}
|
|
98
101
|
|
|
99
102
|
/**
|
|
@@ -102,13 +105,14 @@ export class LogId {
|
|
|
102
105
|
* @returns A log id.
|
|
103
106
|
*/
|
|
104
107
|
static fromString(data: string): LogId {
|
|
105
|
-
const [rawBlockNumber, rawTxIndex, rawLogIndex, rawBlockHash] = data.split('-');
|
|
108
|
+
const [rawBlockNumber, rawTxIndex, rawLogIndex, rawBlockHash, rawTxHash] = data.split('-');
|
|
106
109
|
const blockNumber = BlockNumber(Number(rawBlockNumber));
|
|
107
|
-
const blockHash =
|
|
110
|
+
const blockHash = BlockHash.fromString(rawBlockHash);
|
|
111
|
+
const txHash = TxHash.fromString(rawTxHash);
|
|
108
112
|
const txIndex = Number(rawTxIndex);
|
|
109
113
|
const logIndex = Number(rawLogIndex);
|
|
110
114
|
|
|
111
|
-
return new LogId(blockNumber, blockHash, txIndex, logIndex);
|
|
115
|
+
return new LogId(blockNumber, blockHash, txHash, txIndex, logIndex);
|
|
112
116
|
}
|
|
113
117
|
|
|
114
118
|
/**
|
|
@@ -116,6 +120,6 @@ export class LogId {
|
|
|
116
120
|
* @returns A human readable representation of the log id.
|
|
117
121
|
*/
|
|
118
122
|
public toHumanReadable(): string {
|
|
119
|
-
return `logId: (blockNumber: ${this.blockNumber}, blockHash: ${this.blockHash.toString()}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
|
|
123
|
+
return `logId: (blockNumber: ${this.blockNumber}, blockHash: ${this.blockHash.toString()}, txHash: ${this.txHash.toString()}, txIndex: ${this.txIndex}, logIndex: ${this.logIndex})`;
|
|
120
124
|
}
|
|
121
125
|
}
|
package/src/logs/siloed_tag.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { GeneratorIndex } from '@aztec/constants';
|
|
2
|
+
import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
|
|
2
3
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
4
|
import type { ZodFor } from '@aztec/foundation/schemas';
|
|
4
5
|
|
|
@@ -22,7 +23,7 @@ export class SiloedTag {
|
|
|
22
23
|
constructor(public readonly value: Fr) {}
|
|
23
24
|
|
|
24
25
|
static async compute(tag: Tag, app: AztecAddress): Promise<SiloedTag> {
|
|
25
|
-
const siloedTag = await
|
|
26
|
+
const siloedTag = await poseidon2HashWithSeparator([app, tag.value], GeneratorIndex.PRIVATE_LOG_FIRST_FIELD);
|
|
26
27
|
return new SiloedTag(siloedTag);
|
|
27
28
|
}
|
|
28
29
|
|
|
@@ -32,10 +32,10 @@ import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot }
|
|
|
32
32
|
* - Compression: If a block has no messages (out hash = 0), that branch is ignored
|
|
33
33
|
*
|
|
34
34
|
* 4. **Epoch Tree**
|
|
35
|
-
* - Leaves: Checkpoint out hashes from all checkpoints in an epoch (padded to
|
|
35
|
+
* - Leaves: Checkpoint out hashes from all checkpoints in an epoch (padded to OUT_HASH_TREE_LEAF_COUNT)
|
|
36
36
|
* - Root: Epoch out hash (set in the root rollup's public inputs and inserted into the Outbox on L1 when the epoch is proven)
|
|
37
37
|
* - Type: Unbalanced, non-compressed
|
|
38
|
-
* - **Important**: Padded with zeros up to
|
|
38
|
+
* - **Important**: Padded with zeros up to OUT_HASH_TREE_LEAF_COUNT to allow for proofs of partial epochs
|
|
39
39
|
*
|
|
40
40
|
* ## Combined Membership Proof
|
|
41
41
|
* To prove a message exists in an epoch, we combine the sibling paths from all 4 trees:
|
|
@@ -163,7 +163,7 @@ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(
|
|
|
163
163
|
}
|
|
164
164
|
return buildCheckpointTree(messagesInCheckpoint).getRoot();
|
|
165
165
|
});
|
|
166
|
-
// Pad to
|
|
166
|
+
// Pad to OUT_HASH_TREE_LEAF_COUNT with zeros.
|
|
167
167
|
checkpointOutHashes = checkpointOutHashes.concat(
|
|
168
168
|
Array.from({ length: OUT_HASH_TREE_LEAF_COUNT - messagesInEpoch.length }, () => Buffer.alloc(32)),
|
|
169
169
|
);
|
|
@@ -30,8 +30,15 @@ export class BlockProposalHash extends Buffer32 {
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
export type BlockProposalOptions = {
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
/**
|
|
34
|
+
* Whether to include the tx objects along with the block proposal.
|
|
35
|
+
* Dramatically increases size of the payload but eliminates failed reexecutions due to missing txs.
|
|
36
|
+
*/
|
|
37
|
+
publishFullTxs?: boolean;
|
|
38
|
+
/**
|
|
39
|
+
* Whether to generate an invalid block proposal for broadcasting.
|
|
40
|
+
* Use only for testing.
|
|
41
|
+
*/
|
|
35
42
|
broadcastInvalidBlockProposal?: boolean;
|
|
36
43
|
};
|
|
37
44
|
|
|
@@ -32,8 +32,15 @@ export class CheckpointProposalHash extends Buffer32 {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
export type CheckpointProposalOptions = {
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
/**
|
|
36
|
+
* Whether to include the tx objects along with the block proposal.
|
|
37
|
+
* Dramatically increases size of the payload but eliminates failed reexecutions due to missing txs.
|
|
38
|
+
*/
|
|
39
|
+
publishFullTxs?: boolean;
|
|
40
|
+
/**
|
|
41
|
+
* Whether to generate an invalid checkpoint proposal for broadcasting.
|
|
42
|
+
* Use only for testing.
|
|
43
|
+
*/
|
|
37
44
|
broadcastInvalidCheckpointProposal?: boolean;
|
|
38
45
|
};
|
|
39
46
|
|
|
@@ -141,6 +148,16 @@ export class CheckpointProposal extends Gossipable {
|
|
|
141
148
|
};
|
|
142
149
|
}
|
|
143
150
|
|
|
151
|
+
toCheckpointInfo() {
|
|
152
|
+
return {
|
|
153
|
+
slotNumber: this.slotNumber,
|
|
154
|
+
archive: this.archive,
|
|
155
|
+
lastBlockNumber: this.lastBlock?.blockHeader.getBlockNumber(),
|
|
156
|
+
lastBlockIndex: this.lastBlock?.indexWithinCheckpoint,
|
|
157
|
+
blockHeadersHash: this.checkpointHeader.blockHeadersHash,
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
|
|
144
161
|
/**
|
|
145
162
|
* Get the payload to sign for this checkpoint proposal.
|
|
146
163
|
* The signature is over the checkpoint header + archive root (for consensus).
|
package/src/p2p/constants.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BlobAccumulator, FinalBlobBatchingChallenges } from '@aztec/blob-lib/types';
|
|
2
|
-
import {
|
|
2
|
+
import { MAX_CHECKPOINTS_PER_EPOCH } from '@aztec/constants';
|
|
3
3
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
5
|
import { bufferSchemaFor } from '@aztec/foundation/schemas';
|
|
@@ -38,11 +38,11 @@ export class CheckpointRollupPublicInputs {
|
|
|
38
38
|
/**
|
|
39
39
|
* The hashes of the headers of the constituent checkpoints.
|
|
40
40
|
*/
|
|
41
|
-
public checkpointHeaderHashes: Tuple<Fr, typeof
|
|
41
|
+
public checkpointHeaderHashes: Tuple<Fr, typeof MAX_CHECKPOINTS_PER_EPOCH>,
|
|
42
42
|
/**
|
|
43
43
|
* The summed transaction fees and recipients of the constituent checkpoints.
|
|
44
44
|
*/
|
|
45
|
-
public fees: Tuple<FeeRecipient, typeof
|
|
45
|
+
public fees: Tuple<FeeRecipient, typeof MAX_CHECKPOINTS_PER_EPOCH>,
|
|
46
46
|
/**
|
|
47
47
|
* Accumulated opening proofs for all blobs before this checkpoint range.
|
|
48
48
|
*/
|
|
@@ -65,8 +65,8 @@ export class CheckpointRollupPublicInputs {
|
|
|
65
65
|
reader.readObject(AppendOnlyTreeSnapshot),
|
|
66
66
|
reader.readObject(AppendOnlyTreeSnapshot),
|
|
67
67
|
reader.readObject(AppendOnlyTreeSnapshot),
|
|
68
|
-
reader.readArray(
|
|
69
|
-
reader.readArray(
|
|
68
|
+
reader.readArray(MAX_CHECKPOINTS_PER_EPOCH, Fr),
|
|
69
|
+
reader.readArray(MAX_CHECKPOINTS_PER_EPOCH, FeeRecipient),
|
|
70
70
|
reader.readObject(BlobAccumulator),
|
|
71
71
|
reader.readObject(BlobAccumulator),
|
|
72
72
|
reader.readObject(FinalBlobBatchingChallenges),
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FinalBlobAccumulator } from '@aztec/blob-lib/types';
|
|
2
|
-
import {
|
|
2
|
+
import { MAX_CHECKPOINTS_PER_EPOCH } from '@aztec/constants';
|
|
3
3
|
import { makeTuple } from '@aztec/foundation/array';
|
|
4
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
5
|
import { bufferSchemaFor } from '@aztec/foundation/schemas';
|
|
@@ -27,8 +27,8 @@ export class RootRollupPublicInputs {
|
|
|
27
27
|
*/
|
|
28
28
|
public outHash: Fr,
|
|
29
29
|
/** Hashes of checkpoint headers for this rollup. */
|
|
30
|
-
public checkpointHeaderHashes: Tuple<Fr, typeof
|
|
31
|
-
public fees: Tuple<FeeRecipient, typeof
|
|
30
|
+
public checkpointHeaderHashes: Tuple<Fr, typeof MAX_CHECKPOINTS_PER_EPOCH>,
|
|
31
|
+
public fees: Tuple<FeeRecipient, typeof MAX_CHECKPOINTS_PER_EPOCH>,
|
|
32
32
|
public constants: EpochConstantData,
|
|
33
33
|
public blobPublicInputs: FinalBlobAccumulator,
|
|
34
34
|
) {}
|
|
@@ -68,8 +68,8 @@ export class RootRollupPublicInputs {
|
|
|
68
68
|
Fr.fromBuffer(reader),
|
|
69
69
|
Fr.fromBuffer(reader),
|
|
70
70
|
Fr.fromBuffer(reader),
|
|
71
|
-
reader.readArray(
|
|
72
|
-
reader.readArray(
|
|
71
|
+
reader.readArray(MAX_CHECKPOINTS_PER_EPOCH, Fr),
|
|
72
|
+
reader.readArray(MAX_CHECKPOINTS_PER_EPOCH, FeeRecipient),
|
|
73
73
|
EpochConstantData.fromBuffer(reader),
|
|
74
74
|
reader.readObject(FinalBlobAccumulator),
|
|
75
75
|
);
|
|
@@ -99,8 +99,8 @@ export class RootRollupPublicInputs {
|
|
|
99
99
|
Fr.random(),
|
|
100
100
|
Fr.random(),
|
|
101
101
|
Fr.random(),
|
|
102
|
-
makeTuple(
|
|
103
|
-
makeTuple(
|
|
102
|
+
makeTuple(MAX_CHECKPOINTS_PER_EPOCH, Fr.random),
|
|
103
|
+
makeTuple(MAX_CHECKPOINTS_PER_EPOCH, FeeRecipient.random),
|
|
104
104
|
new EpochConstantData(Fr.random(), Fr.random(), Fr.random(), Fr.random(), Fr.random()),
|
|
105
105
|
FinalBlobAccumulator.random(),
|
|
106
106
|
);
|
package/src/slashing/empire.ts
CHANGED
|
@@ -83,7 +83,9 @@ export function getFirstEligibleRoundForOffense(
|
|
|
83
83
|
case OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS:
|
|
84
84
|
case OffenseType.PROPOSED_INCORRECT_ATTESTATIONS:
|
|
85
85
|
case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
|
|
86
|
-
case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
|
|
86
|
+
case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
|
|
87
|
+
case OffenseType.DUPLICATE_PROPOSAL:
|
|
88
|
+
case OffenseType.DUPLICATE_ATTESTATION: {
|
|
87
89
|
const slot = offense.epochOrSlot;
|
|
88
90
|
const detectedSlot = SlotNumber.fromBigInt(slot + 1n);
|
|
89
91
|
return getRoundForSlot(detectedSlot, constants).round + 1n;
|
package/src/slashing/helpers.ts
CHANGED
|
@@ -50,6 +50,8 @@ export function getPenaltyForOffense(
|
|
|
50
50
|
SlasherConfig,
|
|
51
51
|
| 'slashAttestDescendantOfInvalidPenalty'
|
|
52
52
|
| 'slashBroadcastedInvalidBlockPenalty'
|
|
53
|
+
| 'slashDuplicateProposalPenalty'
|
|
54
|
+
| 'slashDuplicateAttestationPenalty'
|
|
53
55
|
| 'slashPrunePenalty'
|
|
54
56
|
| 'slashDataWithholdingPenalty'
|
|
55
57
|
| 'slashUnknownPenalty'
|
|
@@ -71,6 +73,10 @@ export function getPenaltyForOffense(
|
|
|
71
73
|
return config.slashAttestDescendantOfInvalidPenalty;
|
|
72
74
|
case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
|
|
73
75
|
return config.slashBroadcastedInvalidBlockPenalty;
|
|
76
|
+
case OffenseType.DUPLICATE_PROPOSAL:
|
|
77
|
+
return config.slashDuplicateProposalPenalty;
|
|
78
|
+
case OffenseType.DUPLICATE_ATTESTATION:
|
|
79
|
+
return config.slashDuplicateAttestationPenalty;
|
|
74
80
|
case OffenseType.UNKNOWN:
|
|
75
81
|
return config.slashUnknownPenalty;
|
|
76
82
|
default: {
|
|
@@ -85,6 +91,8 @@ export function getTimeUnitForOffense(offense: OffenseType): 'epoch' | 'slot' {
|
|
|
85
91
|
switch (offense) {
|
|
86
92
|
case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
|
|
87
93
|
case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
|
|
94
|
+
case OffenseType.DUPLICATE_PROPOSAL:
|
|
95
|
+
case OffenseType.DUPLICATE_ATTESTATION:
|
|
88
96
|
case OffenseType.PROPOSED_INCORRECT_ATTESTATIONS:
|
|
89
97
|
case OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS:
|
|
90
98
|
return 'slot';
|
package/src/slashing/tally.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { sumBigint } from '@aztec/foundation/bigint';
|
|
2
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
2
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
4
|
import type { PartialBy } from '@aztec/foundation/types';
|
|
4
5
|
|
|
@@ -20,9 +21,10 @@ export function getSlashConsensusVotesFromOffenses(
|
|
|
20
21
|
settings: {
|
|
21
22
|
slashingAmounts: [bigint, bigint, bigint];
|
|
22
23
|
epochDuration: number;
|
|
24
|
+
targetCommitteeSize: number;
|
|
23
25
|
},
|
|
24
26
|
): ValidatorSlashVote[] {
|
|
25
|
-
const { slashingAmounts } = settings;
|
|
27
|
+
const { slashingAmounts, targetCommitteeSize } = settings;
|
|
26
28
|
|
|
27
29
|
if (committees.length !== epochsForCommittees.length) {
|
|
28
30
|
throw new Error('committees and epochsForCommittees must have the same length');
|
|
@@ -31,7 +33,9 @@ export function getSlashConsensusVotesFromOffenses(
|
|
|
31
33
|
const votes = committees.flatMap((committee, committeeIndex) => {
|
|
32
34
|
const committeeEpoch = epochsForCommittees[committeeIndex];
|
|
33
35
|
|
|
34
|
-
|
|
36
|
+
// Map over actual committee members, then pad to targetCommitteeSize.
|
|
37
|
+
// Padding handles cases where committees may be empty (e.g., when there aren't enough validators to fill the committee size during network startup).
|
|
38
|
+
const votes = committee.map(validator => {
|
|
35
39
|
// Find offenses for this validator in this specific epoch.
|
|
36
40
|
// If an offense has no epoch, it is considered for all epochs due to a slashAlways setting.
|
|
37
41
|
const validatorOffenses = offenses.filter(
|
|
@@ -45,6 +49,8 @@ export function getSlashConsensusVotesFromOffenses(
|
|
|
45
49
|
const slashUnits = getSlashUnitsForAmount(slashAmount, slashingAmounts);
|
|
46
50
|
return Number(slashUnits);
|
|
47
51
|
});
|
|
52
|
+
|
|
53
|
+
return padArrayEnd(votes, 0, targetCommitteeSize);
|
|
48
54
|
});
|
|
49
55
|
|
|
50
56
|
return votes;
|