@aztec/stdlib 0.0.1-commit.86469d5 → 0.0.1-commit.87a0206
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/in_block.js +1 -1
- package/dest/interfaces/aztec-node-admin.d.ts +10 -1
- package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
- package/dest/interfaces/get_logs_response.d.ts +8 -1
- 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 +34 -34
- package/dest/interfaces/slasher.d.ts +5 -1
- package/dest/interfaces/slasher.d.ts.map +1 -1
- package/dest/interfaces/slasher.js +1 -0
- package/dest/interfaces/validator.d.ts +11 -2
- package/dest/interfaces/validator.d.ts.map +1 -1
- package/dest/interfaces/validator.js +1 -0
- package/dest/logs/extended_public_log.d.ts +7 -1
- package/dest/logs/extended_public_log.d.ts.map +1 -1
- package/dest/logs/log_id.d.ts +10 -7
- package/dest/logs/log_id.d.ts.map +1 -1
- package/dest/logs/log_id.js +15 -13
- package/dest/messaging/l2_to_l1_membership.d.ts +2 -2
- package/dest/messaging/l2_to_l1_membership.js +3 -3
- package/dest/p2p/checkpoint_proposal.d.ts +8 -1
- package/dest/p2p/checkpoint_proposal.d.ts.map +1 -1
- package/dest/p2p/checkpoint_proposal.js +9 -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 +1 -0
- package/dest/slashing/helpers.d.ts +2 -2
- package/dest/slashing/helpers.d.ts.map +1 -1
- package/dest/slashing/helpers.js +3 -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 +5 -3
- package/dest/slashing/types.d.ts.map +1 -1
- package/dest/slashing/types.js +7 -1
- package/dest/tests/factories.js +3 -3
- package/package.json +20 -10
- package/src/abi/function_call.ts +25 -3
- package/src/block/in_block.ts +1 -1
- 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 +2 -0
- package/src/interfaces/validator.ts +2 -1
- package/src/logs/log_id.ts +15 -12
- package/src/messaging/l2_to_l1_membership.ts +3 -3
- package/src/p2p/checkpoint_proposal.ts +10 -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 +2 -1
- package/src/slashing/helpers.ts +4 -0
- package/src/slashing/tally.ts +8 -2
- package/src/slashing/types.ts +7 -0
- package/src/tests/factories.ts +5 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/stdlib",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.87a0206",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"inherits": [
|
|
6
6
|
"../package.common.json",
|
|
@@ -65,7 +65,17 @@
|
|
|
65
65
|
},
|
|
66
66
|
"typedocOptions": {
|
|
67
67
|
"entryPoints": [
|
|
68
|
-
"./src/index.ts"
|
|
68
|
+
"./src/abi/index.ts",
|
|
69
|
+
"./src/aztec-address/index.ts",
|
|
70
|
+
"./src/block/index.ts",
|
|
71
|
+
"./src/contract/index.ts",
|
|
72
|
+
"./src/gas/index.ts",
|
|
73
|
+
"./src/hash/index.ts",
|
|
74
|
+
"./src/keys/index.ts",
|
|
75
|
+
"./src/logs/index.ts",
|
|
76
|
+
"./src/note/index.ts",
|
|
77
|
+
"./src/proofs/index.ts",
|
|
78
|
+
"./src/tx/index.ts"
|
|
69
79
|
],
|
|
70
80
|
"name": "stdlib",
|
|
71
81
|
"tsconfig": "./tsconfig.json"
|
|
@@ -79,14 +89,14 @@
|
|
|
79
89
|
},
|
|
80
90
|
"dependencies": {
|
|
81
91
|
"@aws-sdk/client-s3": "^3.892.0",
|
|
82
|
-
"@aztec/bb.js": "0.0.1-commit.
|
|
83
|
-
"@aztec/blob-lib": "0.0.1-commit.
|
|
84
|
-
"@aztec/constants": "0.0.1-commit.
|
|
85
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
86
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
87
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
88
|
-
"@aztec/noir-noirc_abi": "0.0.1-commit.
|
|
89
|
-
"@aztec/validator-ha-signer": "0.0.1-commit.
|
|
92
|
+
"@aztec/bb.js": "0.0.1-commit.87a0206",
|
|
93
|
+
"@aztec/blob-lib": "0.0.1-commit.87a0206",
|
|
94
|
+
"@aztec/constants": "0.0.1-commit.87a0206",
|
|
95
|
+
"@aztec/ethereum": "0.0.1-commit.87a0206",
|
|
96
|
+
"@aztec/foundation": "0.0.1-commit.87a0206",
|
|
97
|
+
"@aztec/l1-artifacts": "0.0.1-commit.87a0206",
|
|
98
|
+
"@aztec/noir-noirc_abi": "0.0.1-commit.87a0206",
|
|
99
|
+
"@aztec/validator-ha-signer": "0.0.1-commit.87a0206",
|
|
90
100
|
"@google-cloud/storage": "^7.15.0",
|
|
91
101
|
"axios": "^1.12.0",
|
|
92
102
|
"json-stringify-deterministic": "1.0.12",
|
package/src/abi/function_call.ts
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import type { FieldsOf } from '@aztec/foundation/types';
|
|
3
3
|
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
|
|
4
6
|
import { AztecAddress } from '../aztec-address/index.js';
|
|
5
|
-
import {
|
|
7
|
+
import { schemas } from '../schemas/index.js';
|
|
8
|
+
import { type AbiType, AbiTypeSchema, FunctionType } from './abi.js';
|
|
6
9
|
import { FunctionSelector } from './function_selector.js';
|
|
7
10
|
|
|
8
11
|
/** A request to call a function on a contract. */
|
|
@@ -43,12 +46,31 @@ export class FunctionCall {
|
|
|
43
46
|
return new FunctionCall(...FunctionCall.getFields(fields));
|
|
44
47
|
}
|
|
45
48
|
|
|
49
|
+
static get schema() {
|
|
50
|
+
return z
|
|
51
|
+
.object({
|
|
52
|
+
name: z.string(),
|
|
53
|
+
to: schemas.AztecAddress,
|
|
54
|
+
selector: schemas.FunctionSelector,
|
|
55
|
+
type: z.nativeEnum(FunctionType),
|
|
56
|
+
isStatic: z.boolean(),
|
|
57
|
+
hideMsgSender: z.boolean(),
|
|
58
|
+
args: z.array(schemas.Fr),
|
|
59
|
+
returnTypes: z.array(AbiTypeSchema),
|
|
60
|
+
})
|
|
61
|
+
.transform(FunctionCall.from);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
public isPublicStatic(): boolean {
|
|
65
|
+
return this.type === FunctionType.PUBLIC && this.isStatic;
|
|
66
|
+
}
|
|
67
|
+
|
|
46
68
|
/**
|
|
47
69
|
* Creates an empty function call.
|
|
48
70
|
* @returns an empty function call.
|
|
49
71
|
*/
|
|
50
72
|
public static empty() {
|
|
51
|
-
return {
|
|
73
|
+
return FunctionCall.from({
|
|
52
74
|
name: '',
|
|
53
75
|
to: AztecAddress.ZERO,
|
|
54
76
|
selector: FunctionSelector.empty(),
|
|
@@ -57,6 +79,6 @@ export class FunctionCall {
|
|
|
57
79
|
isStatic: false,
|
|
58
80
|
args: [],
|
|
59
81
|
returnTypes: [],
|
|
60
|
-
};
|
|
82
|
+
});
|
|
61
83
|
}
|
|
62
84
|
}
|
package/src/block/in_block.ts
CHANGED
|
@@ -17,7 +17,7 @@ export type DataInBlock<T> = {
|
|
|
17
17
|
|
|
18
18
|
export function randomInBlock(): InBlock {
|
|
19
19
|
return {
|
|
20
|
-
l2BlockNumber: BlockNumber(Math.floor(Math.random() * 1000)),
|
|
20
|
+
l2BlockNumber: BlockNumber(Math.floor(Math.random() * 1000) + 1),
|
|
21
21
|
l2BlockHash: BlockHash.random(),
|
|
22
22
|
};
|
|
23
23
|
}
|
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,7 @@ export interface SlasherConfig {
|
|
|
18
18
|
slashDataWithholdingPenalty: bigint;
|
|
19
19
|
slashInactivityPenalty: bigint;
|
|
20
20
|
slashBroadcastedInvalidBlockPenalty: bigint;
|
|
21
|
+
slashDuplicateProposalPenalty: bigint;
|
|
21
22
|
slashProposeInvalidAttestationsPenalty: bigint;
|
|
22
23
|
slashAttestDescendantOfInvalidPenalty: bigint;
|
|
23
24
|
slashUnknownPenalty: bigint;
|
|
@@ -40,6 +41,7 @@ export const SlasherConfigSchema = zodFor<SlasherConfig>()(
|
|
|
40
41
|
slashInactivityConsecutiveEpochThreshold: z.number(),
|
|
41
42
|
slashInactivityPenalty: schemas.BigInt,
|
|
42
43
|
slashProposeInvalidAttestationsPenalty: schemas.BigInt,
|
|
44
|
+
slashDuplicateProposalPenalty: schemas.BigInt,
|
|
43
45
|
slashAttestDescendantOfInvalidPenalty: schemas.BigInt,
|
|
44
46
|
slashUnknownPenalty: schemas.BigInt,
|
|
45
47
|
slashOffenseExpirationRounds: z.number(),
|
|
@@ -60,7 +60,7 @@ export type ValidatorClientConfig = ValidatorHASignerConfig & {
|
|
|
60
60
|
|
|
61
61
|
export type ValidatorClientFullConfig = ValidatorClientConfig &
|
|
62
62
|
Pick<SequencerConfig, 'txPublicSetupAllowList' | 'broadcastInvalidBlockProposal'> &
|
|
63
|
-
Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty'> & {
|
|
63
|
+
Pick<SlasherConfig, 'slashBroadcastedInvalidBlockPenalty' | 'slashDuplicateProposalPenalty'> & {
|
|
64
64
|
/**
|
|
65
65
|
* Whether transactions are disabled for this node
|
|
66
66
|
* @remarks This should match the property in P2PConfig. It's not picked from there to avoid circular dependencies.
|
|
@@ -87,6 +87,7 @@ export const ValidatorClientFullConfigSchema = zodFor<Omit<ValidatorClientFullCo
|
|
|
87
87
|
txPublicSetupAllowList: z.array(AllowedElementSchema).optional(),
|
|
88
88
|
broadcastInvalidBlockProposal: z.boolean().optional(),
|
|
89
89
|
slashBroadcastedInvalidBlockPenalty: schemas.BigInt,
|
|
90
|
+
slashDuplicateProposalPenalty: schemas.BigInt,
|
|
90
91
|
disableTransactions: z.boolean().optional(),
|
|
91
92
|
}),
|
|
92
93
|
);
|
package/src/logs/log_id.ts
CHANGED
|
@@ -8,20 +8,17 @@ import { z } from 'zod';
|
|
|
8
8
|
|
|
9
9
|
import { BlockHash } from '../block/block_hash.js';
|
|
10
10
|
import { schemas } from '../schemas/index.js';
|
|
11
|
+
import { TxHash } from '../tx/tx_hash.js';
|
|
11
12
|
|
|
12
13
|
/** A globally unique log id. */
|
|
13
14
|
export class LogId {
|
|
14
|
-
/**
|
|
15
|
-
* Parses a log id from a string.
|
|
16
|
-
* @param blockNumber - The block number.
|
|
17
|
-
* @param txIndex - The transaction index.
|
|
18
|
-
* @param logIndex - The log index.
|
|
19
|
-
*/
|
|
20
15
|
constructor(
|
|
21
16
|
/** The block number the log was emitted in. */
|
|
22
17
|
public readonly blockNumber: BlockNumber,
|
|
23
18
|
/** The hash of the block the log was emitted in. */
|
|
24
19
|
public readonly blockHash: BlockHash,
|
|
20
|
+
/** The hash of the transaction the log was emitted in. */
|
|
21
|
+
public readonly txHash: TxHash,
|
|
25
22
|
/** The index of a tx in a block the log was emitted in. */
|
|
26
23
|
public readonly txIndex: number,
|
|
27
24
|
/** The index of a log the tx was emitted in. */
|
|
@@ -42,6 +39,7 @@ export class LogId {
|
|
|
42
39
|
return new LogId(
|
|
43
40
|
BlockNumber(Math.floor(Math.random() * 1000) + 1),
|
|
44
41
|
BlockHash.random(),
|
|
42
|
+
TxHash.random(),
|
|
45
43
|
Math.floor(Math.random() * 1000),
|
|
46
44
|
Math.floor(Math.random() * 100),
|
|
47
45
|
);
|
|
@@ -52,11 +50,13 @@ export class LogId {
|
|
|
52
50
|
.object({
|
|
53
51
|
blockNumber: BlockNumberSchema,
|
|
54
52
|
blockHash: BlockHash.schema,
|
|
53
|
+
txHash: TxHash.schema,
|
|
55
54
|
txIndex: schemas.Integer,
|
|
56
55
|
logIndex: schemas.Integer,
|
|
57
56
|
})
|
|
58
57
|
.transform(
|
|
59
|
-
({ blockNumber, blockHash, txIndex, logIndex }) =>
|
|
58
|
+
({ blockNumber, blockHash, txHash, txIndex, logIndex }) =>
|
|
59
|
+
new LogId(blockNumber, blockHash, txHash, txIndex, logIndex),
|
|
60
60
|
);
|
|
61
61
|
}
|
|
62
62
|
|
|
@@ -68,6 +68,7 @@ export class LogId {
|
|
|
68
68
|
return Buffer.concat([
|
|
69
69
|
toBufferBE(BigInt(this.blockNumber), 4),
|
|
70
70
|
this.blockHash.toBuffer(),
|
|
71
|
+
this.txHash.toBuffer(),
|
|
71
72
|
toBufferBE(BigInt(this.txIndex), 4),
|
|
72
73
|
toBufferBE(BigInt(this.logIndex), 4),
|
|
73
74
|
]);
|
|
@@ -83,10 +84,11 @@ export class LogId {
|
|
|
83
84
|
|
|
84
85
|
const blockNumber = BlockNumber(reader.readNumber());
|
|
85
86
|
const blockHash = new BlockHash(reader.readObject(Fr));
|
|
87
|
+
const txHash = reader.readObject(TxHash);
|
|
86
88
|
const txIndex = reader.readNumber();
|
|
87
89
|
const logIndex = reader.readNumber();
|
|
88
90
|
|
|
89
|
-
return new LogId(blockNumber, blockHash, txIndex, logIndex);
|
|
91
|
+
return new LogId(blockNumber, blockHash, txHash, txIndex, logIndex);
|
|
90
92
|
}
|
|
91
93
|
|
|
92
94
|
/**
|
|
@@ -94,7 +96,7 @@ export class LogId {
|
|
|
94
96
|
* @returns A string representation of the log id.
|
|
95
97
|
*/
|
|
96
98
|
public toString(): string {
|
|
97
|
-
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}-${this.blockHash.toString()}`;
|
|
99
|
+
return `${this.blockNumber}-${this.txIndex}-${this.logIndex}-${this.blockHash.toString()}-${this.txHash.toString()}`;
|
|
98
100
|
}
|
|
99
101
|
|
|
100
102
|
/**
|
|
@@ -103,13 +105,14 @@ export class LogId {
|
|
|
103
105
|
* @returns A log id.
|
|
104
106
|
*/
|
|
105
107
|
static fromString(data: string): LogId {
|
|
106
|
-
const [rawBlockNumber, rawTxIndex, rawLogIndex, rawBlockHash] = data.split('-');
|
|
108
|
+
const [rawBlockNumber, rawTxIndex, rawLogIndex, rawBlockHash, rawTxHash] = data.split('-');
|
|
107
109
|
const blockNumber = BlockNumber(Number(rawBlockNumber));
|
|
108
110
|
const blockHash = BlockHash.fromString(rawBlockHash);
|
|
111
|
+
const txHash = TxHash.fromString(rawTxHash);
|
|
109
112
|
const txIndex = Number(rawTxIndex);
|
|
110
113
|
const logIndex = Number(rawLogIndex);
|
|
111
114
|
|
|
112
|
-
return new LogId(blockNumber, blockHash, txIndex, logIndex);
|
|
115
|
+
return new LogId(blockNumber, blockHash, txHash, txIndex, logIndex);
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
/**
|
|
@@ -117,6 +120,6 @@ export class LogId {
|
|
|
117
120
|
* @returns A human readable representation of the log id.
|
|
118
121
|
*/
|
|
119
122
|
public toHumanReadable(): string {
|
|
120
|
-
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})`;
|
|
121
124
|
}
|
|
122
125
|
}
|
|
@@ -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
|
);
|
|
@@ -148,6 +148,16 @@ export class CheckpointProposal extends Gossipable {
|
|
|
148
148
|
};
|
|
149
149
|
}
|
|
150
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
|
+
|
|
151
161
|
/**
|
|
152
162
|
* Get the payload to sign for this checkpoint proposal.
|
|
153
163
|
* The signature is over the checkpoint header + archive root (for consensus).
|
|
@@ -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,8 @@ 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: {
|
|
87
88
|
const slot = offense.epochOrSlot;
|
|
88
89
|
const detectedSlot = SlotNumber.fromBigInt(slot + 1n);
|
|
89
90
|
return getRoundForSlot(detectedSlot, constants).round + 1n;
|
package/src/slashing/helpers.ts
CHANGED
|
@@ -50,6 +50,7 @@ export function getPenaltyForOffense(
|
|
|
50
50
|
SlasherConfig,
|
|
51
51
|
| 'slashAttestDescendantOfInvalidPenalty'
|
|
52
52
|
| 'slashBroadcastedInvalidBlockPenalty'
|
|
53
|
+
| 'slashDuplicateProposalPenalty'
|
|
53
54
|
| 'slashPrunePenalty'
|
|
54
55
|
| 'slashDataWithholdingPenalty'
|
|
55
56
|
| 'slashUnknownPenalty'
|
|
@@ -71,6 +72,8 @@ export function getPenaltyForOffense(
|
|
|
71
72
|
return config.slashAttestDescendantOfInvalidPenalty;
|
|
72
73
|
case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
|
|
73
74
|
return config.slashBroadcastedInvalidBlockPenalty;
|
|
75
|
+
case OffenseType.DUPLICATE_PROPOSAL:
|
|
76
|
+
return config.slashDuplicateProposalPenalty;
|
|
74
77
|
case OffenseType.UNKNOWN:
|
|
75
78
|
return config.slashUnknownPenalty;
|
|
76
79
|
default: {
|
|
@@ -85,6 +88,7 @@ export function getTimeUnitForOffense(offense: OffenseType): 'epoch' | 'slot' {
|
|
|
85
88
|
switch (offense) {
|
|
86
89
|
case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
|
|
87
90
|
case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
|
|
91
|
+
case OffenseType.DUPLICATE_PROPOSAL:
|
|
88
92
|
case OffenseType.PROPOSED_INCORRECT_ATTESTATIONS:
|
|
89
93
|
case OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS:
|
|
90
94
|
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;
|
package/src/slashing/types.ts
CHANGED
|
@@ -20,6 +20,8 @@ export enum OffenseType {
|
|
|
20
20
|
PROPOSED_INCORRECT_ATTESTATIONS = 6,
|
|
21
21
|
/** A committee member attested to a block that was built as a descendent of an invalid block (as in a block with invalid attestations) */
|
|
22
22
|
ATTESTED_DESCENDANT_OF_INVALID = 7,
|
|
23
|
+
/** A proposer sent duplicate proposals for the same position (slot, indexWithinCheckpoint for blocks or slot for checkpoints) */
|
|
24
|
+
DUPLICATE_PROPOSAL = 8,
|
|
23
25
|
}
|
|
24
26
|
|
|
25
27
|
export function getOffenseTypeName(offense: OffenseType) {
|
|
@@ -40,6 +42,8 @@ export function getOffenseTypeName(offense: OffenseType) {
|
|
|
40
42
|
return 'proposed_incorrect_attestations';
|
|
41
43
|
case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
|
|
42
44
|
return 'attested_descendant_of_invalid';
|
|
45
|
+
case OffenseType.DUPLICATE_PROPOSAL:
|
|
46
|
+
return 'duplicate_proposal';
|
|
43
47
|
default:
|
|
44
48
|
throw new Error(`Unknown offense type: ${offense}`);
|
|
45
49
|
}
|
|
@@ -56,6 +60,7 @@ export const OffenseToBigInt: Record<OffenseType, bigint> = {
|
|
|
56
60
|
[OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS]: 5n,
|
|
57
61
|
[OffenseType.PROPOSED_INCORRECT_ATTESTATIONS]: 6n,
|
|
58
62
|
[OffenseType.ATTESTED_DESCENDANT_OF_INVALID]: 7n,
|
|
63
|
+
[OffenseType.DUPLICATE_PROPOSAL]: 8n,
|
|
59
64
|
};
|
|
60
65
|
|
|
61
66
|
export function bigIntToOffense(offense: bigint): OffenseType {
|
|
@@ -76,6 +81,8 @@ export function bigIntToOffense(offense: bigint): OffenseType {
|
|
|
76
81
|
return OffenseType.PROPOSED_INCORRECT_ATTESTATIONS;
|
|
77
82
|
case 7n:
|
|
78
83
|
return OffenseType.ATTESTED_DESCENDANT_OF_INVALID;
|
|
84
|
+
case 8n:
|
|
85
|
+
return OffenseType.DUPLICATE_PROPOSAL;
|
|
79
86
|
default:
|
|
80
87
|
throw new Error(`Unknown offense: ${offense}`);
|
|
81
88
|
}
|
package/src/tests/factories.ts
CHANGED
|
@@ -7,11 +7,11 @@ import {
|
|
|
7
7
|
import {
|
|
8
8
|
ARCHIVE_HEIGHT,
|
|
9
9
|
AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
|
|
10
|
-
AZTEC_MAX_EPOCH_DURATION,
|
|
11
10
|
CHONK_PROOF_LENGTH,
|
|
12
11
|
CONTRACT_CLASS_LOG_SIZE_IN_FIELDS,
|
|
13
12
|
GeneratorIndex,
|
|
14
13
|
L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
|
|
14
|
+
MAX_CHECKPOINTS_PER_EPOCH,
|
|
15
15
|
MAX_CONTRACT_CLASS_LOGS_PER_TX,
|
|
16
16
|
MAX_ENQUEUED_CALLS_PER_CALL,
|
|
17
17
|
MAX_ENQUEUED_CALLS_PER_TX,
|
|
@@ -851,8 +851,8 @@ export function makeCheckpointRollupPublicInputs(seed = 0) {
|
|
|
851
851
|
makeAppendOnlyTreeSnapshot(seed + 0x200),
|
|
852
852
|
makeAppendOnlyTreeSnapshot(seed + 0x300),
|
|
853
853
|
makeAppendOnlyTreeSnapshot(seed + 0x350),
|
|
854
|
-
makeTuple(
|
|
855
|
-
makeTuple(
|
|
854
|
+
makeTuple(MAX_CHECKPOINTS_PER_EPOCH, () => fr(seed), 0x400),
|
|
855
|
+
makeTuple(MAX_CHECKPOINTS_PER_EPOCH, () => makeFeeRecipient(seed), 0x500),
|
|
856
856
|
makeBlobAccumulator(seed + 0x600),
|
|
857
857
|
makeBlobAccumulator(seed + 0x700),
|
|
858
858
|
makeFinalBlobBatchingChallenges(seed + 0x800),
|
|
@@ -888,8 +888,8 @@ export function makeRootRollupPublicInputs(seed = 0): RootRollupPublicInputs {
|
|
|
888
888
|
fr(seed + 0x100),
|
|
889
889
|
fr(seed + 0x200),
|
|
890
890
|
fr(seed + 0x300),
|
|
891
|
-
makeTuple(
|
|
892
|
-
makeTuple(
|
|
891
|
+
makeTuple(MAX_CHECKPOINTS_PER_EPOCH, () => fr(seed), 0x400),
|
|
892
|
+
makeTuple(MAX_CHECKPOINTS_PER_EPOCH, () => makeFeeRecipient(seed), 0x500),
|
|
893
893
|
makeEpochConstantData(seed + 0x600),
|
|
894
894
|
makeFinalBlobAccumulator(seed + 0x700),
|
|
895
895
|
);
|