@aztec/validator-client 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240
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/README.md +93 -24
- package/dest/checkpoint_builder.d.ts +35 -26
- package/dest/checkpoint_builder.d.ts.map +1 -1
- package/dest/checkpoint_builder.js +144 -48
- package/dest/config.d.ts +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +44 -20
- package/dest/duties/validation_service.d.ts +26 -14
- package/dest/duties/validation_service.d.ts.map +1 -1
- package/dest/duties/validation_service.js +79 -38
- package/dest/factory.d.ts +11 -5
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +11 -5
- package/dest/index.d.ts +2 -3
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -2
- package/dest/key_store/ha_key_store.d.ts +99 -0
- package/dest/key_store/ha_key_store.d.ts.map +1 -0
- package/dest/key_store/ha_key_store.js +208 -0
- package/dest/key_store/index.d.ts +2 -1
- package/dest/key_store/index.d.ts.map +1 -1
- package/dest/key_store/index.js +1 -0
- package/dest/key_store/interface.d.ts +36 -6
- package/dest/key_store/interface.d.ts.map +1 -1
- package/dest/key_store/local_key_store.d.ts +10 -5
- package/dest/key_store/local_key_store.d.ts.map +1 -1
- package/dest/key_store/local_key_store.js +8 -4
- package/dest/key_store/node_keystore_adapter.d.ts +18 -5
- package/dest/key_store/node_keystore_adapter.d.ts.map +1 -1
- package/dest/key_store/node_keystore_adapter.js +18 -4
- package/dest/key_store/web3signer_key_store.d.ts +10 -5
- package/dest/key_store/web3signer_key_store.d.ts.map +1 -1
- package/dest/key_store/web3signer_key_store.js +8 -4
- package/dest/metrics.d.ts +16 -3
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +58 -5
- package/dest/proposal_handler.d.ts +135 -0
- package/dest/proposal_handler.d.ts.map +1 -0
- package/dest/proposal_handler.js +1111 -0
- package/dest/validator.d.ts +60 -25
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +393 -257
- package/package.json +21 -17
- package/src/checkpoint_builder.ts +211 -61
- package/src/config.ts +43 -18
- package/src/duties/validation_service.ts +119 -46
- package/src/factory.ts +21 -3
- package/src/index.ts +1 -2
- package/src/key_store/ha_key_store.ts +269 -0
- package/src/key_store/index.ts +1 -0
- package/src/key_store/interface.ts +44 -5
- package/src/key_store/local_key_store.ts +13 -4
- package/src/key_store/node_keystore_adapter.ts +27 -4
- package/src/key_store/web3signer_key_store.ts +17 -4
- package/src/metrics.ts +81 -6
- package/src/proposal_handler.ts +1207 -0
- package/src/validator.ts +529 -307
- package/dest/block_proposal_handler.d.ts +0 -63
- package/dest/block_proposal_handler.d.ts.map +0 -1
- package/dest/block_proposal_handler.js +0 -551
- package/dest/tx_validator/index.d.ts +0 -3
- package/dest/tx_validator/index.d.ts.map +0 -1
- package/dest/tx_validator/index.js +0 -2
- package/dest/tx_validator/nullifier_cache.d.ts +0 -14
- package/dest/tx_validator/nullifier_cache.d.ts.map +0 -1
- package/dest/tx_validator/nullifier_cache.js +0 -24
- package/dest/tx_validator/tx_validator_factory.d.ts +0 -18
- package/dest/tx_validator/tx_validator_factory.d.ts.map +0 -1
- package/dest/tx_validator/tx_validator_factory.js +0 -53
- package/src/block_proposal_handler.ts +0 -556
- package/src/tx_validator/index.ts +0 -2
- package/src/tx_validator/nullifier_cache.ts +0 -30
- package/src/tx_validator/tx_validator_factory.ts +0 -133
package/dest/config.d.ts
CHANGED
|
@@ -8,4 +8,4 @@ export declare const validatorClientConfigMappings: ConfigMappingsType<Validator
|
|
|
8
8
|
* @returns The validator configuration.
|
|
9
9
|
*/
|
|
10
10
|
export declare function getProverEnvVars(): ValidatorClientConfig;
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQU14QixNQUFNLDBCQUEwQixDQUFDO0FBR2xDLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFN0UsWUFBWSxFQUFFLHFCQUFxQixFQUFFLENBQUM7QUFFdEMsZUFBTyxNQUFNLDZCQUE2QixFQUFFLGtCQUFrQixDQUFDLHFCQUFxQixDQTZGbkYsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBZ0IsZ0JBQWdCLElBQUkscUJBQXFCLENBRXhEIn0=
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,YAAY,EAAE,qBAAqB,EAAE,CAAC;AAEtC,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CA6FnF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
|
package/dest/config.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, secretValueConfigHelper } from '@aztec/foundation/config';
|
|
1
|
+
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper, secretValueConfigHelper } from '@aztec/foundation/config';
|
|
2
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import { localSignerConfigMappings, validatorHASignerConfigMappings } from '@aztec/stdlib/ha-signing';
|
|
3
4
|
export const validatorClientConfigMappings = {
|
|
4
5
|
validatorPrivateKeys: {
|
|
5
6
|
env: 'VALIDATOR_PRIVATE_KEYS',
|
|
@@ -15,6 +16,12 @@ export const validatorClientConfigMappings = {
|
|
|
15
16
|
parseEnv: (val)=>val.split(',').filter((address)=>address && address.trim().length > 0).map((address)=>EthAddress.fromString(address.trim())),
|
|
16
17
|
defaultValue: []
|
|
17
18
|
},
|
|
19
|
+
l1ChainId: {
|
|
20
|
+
env: 'L1_CHAIN_ID',
|
|
21
|
+
description: 'The chain ID of the ethereum host.',
|
|
22
|
+
parseEnv: (val)=>+val,
|
|
23
|
+
defaultValue: 31337
|
|
24
|
+
},
|
|
18
25
|
disableValidator: {
|
|
19
26
|
env: 'VALIDATOR_DISABLED',
|
|
20
27
|
description: 'Do not run the validator',
|
|
@@ -30,36 +37,53 @@ export const validatorClientConfigMappings = {
|
|
|
30
37
|
description: 'Interval between polling for new attestations',
|
|
31
38
|
...numberConfigHelper(200)
|
|
32
39
|
},
|
|
33
|
-
validatorReexecute: {
|
|
34
|
-
env: 'VALIDATOR_REEXECUTE',
|
|
35
|
-
description: 'Re-execute transactions before attesting',
|
|
36
|
-
...booleanConfigHelper(true)
|
|
37
|
-
},
|
|
38
|
-
validatorReexecuteDeadlineMs: {
|
|
39
|
-
env: 'VALIDATOR_REEXECUTE_DEADLINE_MS',
|
|
40
|
-
description: 'Will re-execute until this many milliseconds are left in the slot',
|
|
41
|
-
...numberConfigHelper(6000)
|
|
42
|
-
},
|
|
43
40
|
alwaysReexecuteBlockProposals: {
|
|
44
|
-
env: 'ALWAYS_REEXECUTE_BLOCK_PROPOSALS',
|
|
45
41
|
description: 'Whether to always reexecute block proposals, even for non-validator nodes (useful for monitoring network status).',
|
|
46
|
-
|
|
42
|
+
defaultValue: true
|
|
47
43
|
},
|
|
48
44
|
fishermanMode: {
|
|
49
45
|
env: 'FISHERMAN_MODE',
|
|
50
46
|
description: 'Whether to run in fisherman mode: validates all proposals and attestations but does not broadcast attestations or participate in consensus.',
|
|
51
47
|
...booleanConfigHelper(false)
|
|
52
48
|
},
|
|
53
|
-
// TODO(palla/mbps): Change default to false once checkpoint validation is stable
|
|
54
49
|
skipCheckpointProposalValidation: {
|
|
55
|
-
description: 'Skip checkpoint proposal validation and always attest (default:
|
|
56
|
-
defaultValue:
|
|
50
|
+
description: 'Skip checkpoint proposal validation and always attest (default: false)',
|
|
51
|
+
defaultValue: false
|
|
57
52
|
},
|
|
58
|
-
// TODO(palla/mbps): Change default to false once block sync is stable
|
|
59
53
|
skipPushProposedBlocksToArchiver: {
|
|
60
|
-
description: 'Skip pushing re-executed blocks to archiver (default:
|
|
61
|
-
defaultValue:
|
|
62
|
-
}
|
|
54
|
+
description: 'Skip pushing re-executed blocks to archiver (default: false)',
|
|
55
|
+
defaultValue: false
|
|
56
|
+
},
|
|
57
|
+
attestToEquivocatedProposals: {
|
|
58
|
+
description: 'Agree to attest to equivocated checkpoint proposals (for testing purposes only)',
|
|
59
|
+
...booleanConfigHelper(false)
|
|
60
|
+
},
|
|
61
|
+
skipProposalSlotValidation: {
|
|
62
|
+
description: 'Accept proposal validation regardless of slot timing (for testing only)',
|
|
63
|
+
...booleanConfigHelper(false)
|
|
64
|
+
},
|
|
65
|
+
validateMaxL2BlockGas: {
|
|
66
|
+
env: 'VALIDATOR_MAX_L2_BLOCK_GAS',
|
|
67
|
+
description: 'Maximum L2 block gas for validation. Proposals exceeding this limit are rejected.',
|
|
68
|
+
...optionalNumberConfigHelper()
|
|
69
|
+
},
|
|
70
|
+
validateMaxDABlockGas: {
|
|
71
|
+
env: 'VALIDATOR_MAX_DA_BLOCK_GAS',
|
|
72
|
+
description: 'Maximum DA block gas for validation. Proposals exceeding this limit are rejected.',
|
|
73
|
+
...optionalNumberConfigHelper()
|
|
74
|
+
},
|
|
75
|
+
validateMaxTxsPerBlock: {
|
|
76
|
+
env: 'VALIDATOR_MAX_TX_PER_BLOCK',
|
|
77
|
+
description: 'Maximum transactions per block for validation. Proposals exceeding this limit are rejected.',
|
|
78
|
+
...optionalNumberConfigHelper()
|
|
79
|
+
},
|
|
80
|
+
validateMaxTxsPerCheckpoint: {
|
|
81
|
+
env: 'VALIDATOR_MAX_TX_PER_CHECKPOINT',
|
|
82
|
+
description: 'Maximum transactions per checkpoint for validation. Proposals exceeding this limit are rejected.',
|
|
83
|
+
...optionalNumberConfigHelper()
|
|
84
|
+
},
|
|
85
|
+
...localSignerConfigMappings,
|
|
86
|
+
...validatorHASignerConfigMappings
|
|
63
87
|
};
|
|
64
88
|
/**
|
|
65
89
|
* Returns the prover configuration from the environment variables.
|
|
@@ -1,42 +1,45 @@
|
|
|
1
|
+
import { type CheckpointNumber, IndexWithinCheckpoint, type SlotNumber } from '@aztec/foundation/branded-types';
|
|
1
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
3
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
4
|
import type { Signature } from '@aztec/foundation/eth-signature';
|
|
4
|
-
import
|
|
5
|
-
import type
|
|
6
|
-
import {
|
|
7
|
-
import type { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
5
|
+
import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
|
|
6
|
+
import { BlockProposal, type BlockProposalOptions, CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore, type CheckpointProposalOptions, type CoordinationSignatureContext } from '@aztec/stdlib/p2p';
|
|
7
|
+
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
8
8
|
import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
9
9
|
import type { ValidatorKeyStore } from '../key_store/interface.js';
|
|
10
10
|
export declare class ValidationService {
|
|
11
11
|
private keyStore;
|
|
12
|
+
private signatureContext;
|
|
12
13
|
private log;
|
|
13
|
-
constructor(keyStore: ValidatorKeyStore, log?: import("@aztec/foundation/log").Logger);
|
|
14
|
+
constructor(keyStore: ValidatorKeyStore, signatureContext: CoordinationSignatureContext, log?: import("@aztec/foundation/log").Logger);
|
|
14
15
|
/**
|
|
15
16
|
* Create a block proposal with the given header, archive, and transactions
|
|
16
17
|
*
|
|
17
18
|
* @param blockHeader - The block header
|
|
18
|
-
* @param
|
|
19
|
+
* @param blockIndexWithinCheckpoint - The block index within checkpoint for HA signing context
|
|
19
20
|
* @param inHash - Hash of L1 to L2 messages for this checkpoint
|
|
20
21
|
* @param archive - The archive of the current block
|
|
21
|
-
* @param txs -
|
|
22
|
+
* @param txs - Ordered list of transactions (Tx[])
|
|
23
|
+
* @param proposerAttesterAddress - The address of the proposer/attester, or undefined
|
|
22
24
|
* @param options - Block proposal options (including broadcastInvalidBlockProposal for testing)
|
|
23
25
|
*
|
|
24
26
|
* @returns A block proposal signing the above information
|
|
27
|
+
* @throws DutyAlreadySignedError if HA signer indicates duty already signed by another node
|
|
28
|
+
* @throws SlashingProtectionError if attempting to sign different data for same slot
|
|
25
29
|
*/
|
|
26
|
-
createBlockProposal(blockHeader: BlockHeader,
|
|
30
|
+
createBlockProposal(blockHeader: BlockHeader, checkpointNumber: CheckpointNumber, blockIndexWithinCheckpoint: IndexWithinCheckpoint, inHash: Fr, archive: Fr, txs: Tx[], proposerAttesterAddress: EthAddress | undefined, options: BlockProposalOptions): Promise<BlockProposal>;
|
|
27
31
|
/**
|
|
28
32
|
* Create a checkpoint proposal with the last block header and checkpoint header
|
|
29
33
|
*
|
|
30
34
|
* @param checkpointHeader - The checkpoint header containing aggregated data
|
|
31
35
|
* @param archive - The archive of the checkpoint
|
|
32
|
-
* @param
|
|
36
|
+
* @param lastBlockProposal - Signed block proposal for the last block in the checkpoint, or undefined
|
|
33
37
|
* @param proposerAttesterAddress - The address of the proposer
|
|
34
38
|
* @param options - Checkpoint proposal options
|
|
35
39
|
*
|
|
36
40
|
* @returns A checkpoint proposal signing the above information
|
|
37
41
|
*/
|
|
38
|
-
createCheckpointProposal(checkpointHeader: CheckpointHeader, archive: Fr,
|
|
39
|
-
private getPayloadSigner;
|
|
42
|
+
createCheckpointProposal(checkpointHeader: CheckpointHeader, archive: Fr, checkpointNumber: CheckpointNumber, feeAssetPriceModifier: bigint, lastBlockProposal: BlockProposal | undefined, proposerAttesterAddress: EthAddress | undefined, options: CheckpointProposalOptions): Promise<CheckpointProposal>;
|
|
40
43
|
/**
|
|
41
44
|
* Attest with selection of validators to the given checkpoint proposal
|
|
42
45
|
*
|
|
@@ -47,7 +50,16 @@ export declare class ValidationService {
|
|
|
47
50
|
* @param attestors - The validators to attest with
|
|
48
51
|
* @returns checkpoint attestations
|
|
49
52
|
*/
|
|
50
|
-
attestToCheckpointProposal(proposal: CheckpointProposalCore, attestors: EthAddress[]): Promise<CheckpointAttestation[]>;
|
|
51
|
-
|
|
53
|
+
attestToCheckpointProposal(proposal: CheckpointProposalCore, attestors: EthAddress[], checkpointNumber: CheckpointNumber): Promise<CheckpointAttestation[]>;
|
|
54
|
+
/**
|
|
55
|
+
* Sign attestations and signers payload
|
|
56
|
+
* @param attestationsAndSigners - The attestations and signers to sign
|
|
57
|
+
* @param proposer - The proposer address to sign with
|
|
58
|
+
* @param slot - The slot number for HA signing context
|
|
59
|
+
* @returns signature
|
|
60
|
+
* @throws DutyAlreadySignedError if already signed by another HA node
|
|
61
|
+
* @throws SlashingProtectionError if attempting to sign different data for same slot
|
|
62
|
+
*/
|
|
63
|
+
signAttestationsAndSigners(attestationsAndSigners: CommitteeAttestationsAndSigners, proposer: EthAddress, slot: SlotNumber, checkpointNumber: CheckpointNumber): Promise<Signature>;
|
|
52
64
|
}
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZHV0aWVzL3ZhbGlkYXRpb25fc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxxQkFBcUIsRUFBRSxLQUFLLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2hILE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRSxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN0RSxPQUFPLEVBQ0wsYUFBYSxFQUNiLEtBQUssb0JBQW9CLEVBQ3pCLHFCQUFxQixFQUNyQixrQkFBa0IsRUFDbEIsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSyx5QkFBeUIsRUFFOUIsS0FBSyw0QkFBNEIsRUFFbEMsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJeEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVuRSxxQkFBYSxpQkFBaUI7SUFFMUIsT0FBTyxDQUFDLFFBQVE7SUFDaEIsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsR0FBRztJQUhiLFlBQ1UsUUFBUSxFQUFFLGlCQUFpQixFQUMzQixnQkFBZ0IsRUFBRSw0QkFBNEIsRUFDOUMsR0FBRyx5Q0FBK0MsRUFDeEQ7SUFFSjs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNJLG1CQUFtQixDQUN4QixXQUFXLEVBQUUsV0FBVyxFQUN4QixnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsMEJBQTBCLEVBQUUscUJBQXFCLEVBQ2pELE1BQU0sRUFBRSxFQUFFLEVBQ1YsT0FBTyxFQUFFLEVBQUUsRUFDWCxHQUFHLEVBQUUsRUFBRSxFQUFFLEVBQ1QsdUJBQXVCLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDL0MsT0FBTyxFQUFFLG9CQUFvQixHQUM1QixPQUFPLENBQUMsYUFBYSxDQUFDLENBOEJ4QjtJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSSx3QkFBd0IsQ0FDN0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLE9BQU8sRUFBRSxFQUFFLEVBQ1gsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLHFCQUFxQixFQUFFLE1BQU0sRUFDN0IsaUJBQWlCLEVBQUUsYUFBYSxHQUFHLFNBQVMsRUFDNUMsdUJBQXVCLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDL0MsT0FBTyxFQUFFLHlCQUF5QixHQUNqQyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FnQzdCO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0csMEJBQTBCLENBQzlCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFVBQVUsRUFBRSxFQUN2QixnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FDakMsT0FBTyxDQUFDLHFCQUFxQixFQUFFLENBQUMsQ0EyQ2xDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCwwQkFBMEIsQ0FDeEIsc0JBQXNCLEVBQUUsK0JBQStCLEVBQ3ZELFFBQVEsRUFBRSxVQUFVLEVBQ3BCLElBQUksRUFBRSxVQUFVLEVBQ2hCLGdCQUFnQixFQUFFLGdCQUFnQixHQUNqQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBU3BCO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAChH,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EACL,aAAa,EACb,KAAK,oBAAoB,EACzB,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAE9B,KAAK,4BAA4B,EAElC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAIxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,GAAG;IAHb,YACU,QAAQ,EAAE,iBAAiB,EAC3B,gBAAgB,EAAE,4BAA4B,EAC9C,GAAG,yCAA+C,EACxD;IAEJ;;;;;;;;;;;;;;OAcG;IACI,mBAAmB,CACxB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,0BAA0B,EAAE,qBAAqB,EACjD,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE,EACX,GAAG,EAAE,EAAE,EAAE,EACT,uBAAuB,EAAE,UAAU,GAAG,SAAS,EAC/C,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,CAAC,CA8BxB;IAED;;;;;;;;;;OAUG;IACI,wBAAwB,CAC7B,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,EAAE,EACX,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,MAAM,EAC7B,iBAAiB,EAAE,aAAa,GAAG,SAAS,EAC5C,uBAAuB,EAAE,UAAU,GAAG,SAAS,EAC/C,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,kBAAkB,CAAC,CAgC7B;IAED;;;;;;;;;OASG;IACG,0BAA0B,CAC9B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,UAAU,EAAE,EACvB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,qBAAqB,EAAE,CAAC,CA2ClC;IAED;;;;;;;;OAQG;IACH,0BAA0B,CACxB,sBAAsB,EAAE,+BAA+B,EACvD,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,UAAU,EAChB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,SAAS,CAAC,CASpB;CACF"}
|
|
@@ -1,69 +1,73 @@
|
|
|
1
|
-
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
2
|
-
import { keccak256 } from '@aztec/foundation/crypto/keccak';
|
|
3
1
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
2
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
-
import { BlockProposal, CheckpointAttestation, CheckpointProposal, ConsensusPayload,
|
|
3
|
+
import { BlockProposal, CheckpointAttestation, CheckpointProposal, ConsensusPayload, getCoordinationSignatureTypedData } from '@aztec/stdlib/p2p';
|
|
4
|
+
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
5
|
+
import { DutyAlreadySignedError, SlashingProtectionError } from '@aztec/validator-ha-signer/errors';
|
|
6
|
+
import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
6
7
|
export class ValidationService {
|
|
7
8
|
keyStore;
|
|
9
|
+
signatureContext;
|
|
8
10
|
log;
|
|
9
|
-
constructor(keyStore, log = createLogger('validator:validation-service')){
|
|
11
|
+
constructor(keyStore, signatureContext, log = createLogger('validator:validation-service')){
|
|
10
12
|
this.keyStore = keyStore;
|
|
13
|
+
this.signatureContext = signatureContext;
|
|
11
14
|
this.log = log;
|
|
12
15
|
}
|
|
13
16
|
/**
|
|
14
17
|
* Create a block proposal with the given header, archive, and transactions
|
|
15
18
|
*
|
|
16
19
|
* @param blockHeader - The block header
|
|
17
|
-
* @param
|
|
20
|
+
* @param blockIndexWithinCheckpoint - The block index within checkpoint for HA signing context
|
|
18
21
|
* @param inHash - Hash of L1 to L2 messages for this checkpoint
|
|
19
22
|
* @param archive - The archive of the current block
|
|
20
|
-
* @param txs -
|
|
23
|
+
* @param txs - Ordered list of transactions (Tx[])
|
|
24
|
+
* @param proposerAttesterAddress - The address of the proposer/attester, or undefined
|
|
21
25
|
* @param options - Block proposal options (including broadcastInvalidBlockProposal for testing)
|
|
22
26
|
*
|
|
23
27
|
* @returns A block proposal signing the above information
|
|
24
|
-
|
|
25
|
-
|
|
28
|
+
* @throws DutyAlreadySignedError if HA signer indicates duty already signed by another node
|
|
29
|
+
* @throws SlashingProtectionError if attempting to sign different data for same slot
|
|
30
|
+
*/ createBlockProposal(blockHeader, checkpointNumber, blockIndexWithinCheckpoint, inHash, archive, txs, proposerAttesterAddress, options) {
|
|
26
31
|
// For testing: change the new archive to trigger state_mismatch validation failure
|
|
27
32
|
if (options.broadcastInvalidBlockProposal) {
|
|
28
33
|
archive = Fr.random();
|
|
29
34
|
this.log.warn(`Creating INVALID block proposal for slot ${blockHeader.globalVariables.slotNumber}`);
|
|
30
35
|
}
|
|
31
|
-
|
|
36
|
+
// Create a signer that uses the appropriate address
|
|
37
|
+
const address = proposerAttesterAddress ?? this.keyStore.getAddress(0);
|
|
38
|
+
const payloadSigner = (typedData, context)=>this.keyStore.signTypedDataWithAddress(address, typedData, context);
|
|
39
|
+
const txsSigner = (typedData, context)=>this.keyStore.signTypedDataWithAddress(address, typedData, context);
|
|
40
|
+
return BlockProposal.createProposalFromSigner(blockHeader, checkpointNumber, blockIndexWithinCheckpoint, inHash, archive, txs.map((tx)=>tx.getTxHash()), options.publishFullTxs ? txs : undefined, this.signatureContext, payloadSigner, txsSigner);
|
|
32
41
|
}
|
|
33
42
|
/**
|
|
34
43
|
* Create a checkpoint proposal with the last block header and checkpoint header
|
|
35
44
|
*
|
|
36
45
|
* @param checkpointHeader - The checkpoint header containing aggregated data
|
|
37
46
|
* @param archive - The archive of the checkpoint
|
|
38
|
-
* @param
|
|
47
|
+
* @param lastBlockProposal - Signed block proposal for the last block in the checkpoint, or undefined
|
|
39
48
|
* @param proposerAttesterAddress - The address of the proposer
|
|
40
49
|
* @param options - Checkpoint proposal options
|
|
41
50
|
*
|
|
42
51
|
* @returns A checkpoint proposal signing the above information
|
|
43
|
-
*/ createCheckpointProposal(checkpointHeader, archive,
|
|
44
|
-
|
|
45
|
-
//
|
|
52
|
+
*/ createCheckpointProposal(checkpointHeader, archive, checkpointNumber, feeAssetPriceModifier, lastBlockProposal, proposerAttesterAddress, options) {
|
|
53
|
+
// For testing: corrupt the checkpoint so observers' checkpoint validation fails.
|
|
54
|
+
//
|
|
55
|
+
// Keep `archive` aligned with `lastBlockProposal.archiveRoot` so the archive-based lookup
|
|
56
|
+
// in `validateCheckpointProposal` (`getBlockData({ archive })`) still succeeds
|
|
46
57
|
if (options.broadcastInvalidCheckpointProposal) {
|
|
47
|
-
archive = Fr.random();
|
|
58
|
+
archive = lastBlockProposal?.archiveRoot ?? Fr.random();
|
|
59
|
+
checkpointHeader = CheckpointHeader.from({
|
|
60
|
+
...checkpointHeader,
|
|
61
|
+
epochOutHash: Fr.random()
|
|
62
|
+
});
|
|
48
63
|
this.log.warn(`Creating INVALID checkpoint proposal for slot ${checkpointHeader.slotNumber}`);
|
|
49
64
|
}
|
|
50
|
-
//
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
txHashes: lastBlockInfo.txs.map((tx)=>tx.getTxHash()),
|
|
55
|
-
txs: options.publishFullTxs ? lastBlockInfo.txs : undefined
|
|
65
|
+
// Create a signer that takes payload and context, and uses the appropriate address
|
|
66
|
+
const payloadSigner = (typedData, context)=>{
|
|
67
|
+
const address = proposerAttesterAddress ?? this.keyStore.getAddress(0);
|
|
68
|
+
return this.keyStore.signTypedDataWithAddress(address, typedData, context);
|
|
56
69
|
};
|
|
57
|
-
return CheckpointProposal.createProposalFromSigner(checkpointHeader, archive,
|
|
58
|
-
}
|
|
59
|
-
getPayloadSigner(proposerAttesterAddress) {
|
|
60
|
-
if (proposerAttesterAddress !== undefined) {
|
|
61
|
-
return (payload)=>this.keyStore.signMessageWithAddress(proposerAttesterAddress, payload);
|
|
62
|
-
} else {
|
|
63
|
-
// if there is no proposer attester address, just use the first signer
|
|
64
|
-
const signer = this.keyStore.getAddress(0);
|
|
65
|
-
return (payload)=>this.keyStore.signMessageWithAddress(signer, payload);
|
|
66
|
-
}
|
|
70
|
+
return CheckpointProposal.createProposalFromSigner(checkpointHeader, archive, checkpointNumber, feeAssetPriceModifier, lastBlockProposal, this.signatureContext, payloadSigner);
|
|
67
71
|
}
|
|
68
72
|
/**
|
|
69
73
|
* Attest with selection of validators to the given checkpoint proposal
|
|
@@ -74,15 +78,52 @@ export class ValidationService {
|
|
|
74
78
|
* @param proposal - The checkpoint proposal (core version without lastBlock) to attest to
|
|
75
79
|
* @param attestors - The validators to attest with
|
|
76
80
|
* @returns checkpoint attestations
|
|
77
|
-
*/ async attestToCheckpointProposal(proposal, attestors) {
|
|
81
|
+
*/ async attestToCheckpointProposal(proposal, attestors, checkpointNumber) {
|
|
78
82
|
// Create the attestation payload from the checkpoint proposal
|
|
79
|
-
const payload = new ConsensusPayload(proposal.checkpointHeader, proposal.archive);
|
|
80
|
-
const
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
+
const payload = new ConsensusPayload(proposal.checkpointHeader, proposal.archive, proposal.feeAssetPriceModifier, this.signatureContext);
|
|
84
|
+
const typedData = getCoordinationSignatureTypedData(payload);
|
|
85
|
+
const context = {
|
|
86
|
+
slot: proposal.slotNumber,
|
|
87
|
+
checkpointNumber,
|
|
88
|
+
dutyType: DutyType.ATTESTATION
|
|
89
|
+
};
|
|
90
|
+
// Sign each attestor in parallel, catching HA errors per-attestor
|
|
91
|
+
const results = await Promise.allSettled(attestors.map(async (attestor)=>{
|
|
92
|
+
const sig = await this.keyStore.signTypedDataWithAddress(attestor, typedData, context);
|
|
93
|
+
return new CheckpointAttestation(payload, sig, proposal.signature);
|
|
94
|
+
}));
|
|
95
|
+
const attestations = [];
|
|
96
|
+
for(let i = 0; i < results.length; i++){
|
|
97
|
+
const result = results[i];
|
|
98
|
+
if (result.status === 'fulfilled') {
|
|
99
|
+
attestations.push(result.value);
|
|
100
|
+
} else {
|
|
101
|
+
const error = result.reason;
|
|
102
|
+
if (error instanceof DutyAlreadySignedError || error instanceof SlashingProtectionError) {
|
|
103
|
+
this.log.verbose(`Attestation for slot ${proposal.slotNumber} by ${attestors[i]} already signed by another High-Availability node`);
|
|
104
|
+
// Continue with remaining attestors
|
|
105
|
+
} else {
|
|
106
|
+
throw error;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
return attestations;
|
|
83
111
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
112
|
+
/**
|
|
113
|
+
* Sign attestations and signers payload
|
|
114
|
+
* @param attestationsAndSigners - The attestations and signers to sign
|
|
115
|
+
* @param proposer - The proposer address to sign with
|
|
116
|
+
* @param slot - The slot number for HA signing context
|
|
117
|
+
* @returns signature
|
|
118
|
+
* @throws DutyAlreadySignedError if already signed by another HA node
|
|
119
|
+
* @throws SlashingProtectionError if attempting to sign different data for same slot
|
|
120
|
+
*/ signAttestationsAndSigners(attestationsAndSigners, proposer, slot, checkpointNumber) {
|
|
121
|
+
const context = {
|
|
122
|
+
slot,
|
|
123
|
+
checkpointNumber,
|
|
124
|
+
dutyType: DutyType.ATTESTATIONS_AND_SIGNERS
|
|
125
|
+
};
|
|
126
|
+
const typedData = getCoordinationSignatureTypedData(attestationsAndSigners);
|
|
127
|
+
return this.keyStore.signTypedDataWithAddress(proposer, typedData, context);
|
|
87
128
|
}
|
|
88
129
|
}
|
package/dest/factory.d.ts
CHANGED
|
@@ -4,22 +4,26 @@ import type { DateProvider } from '@aztec/foundation/timer';
|
|
|
4
4
|
import type { KeystoreManager } from '@aztec/node-keystore';
|
|
5
5
|
import { type P2PClient } from '@aztec/p2p';
|
|
6
6
|
import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
7
|
+
import type { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
|
|
7
8
|
import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
8
9
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
9
10
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
10
|
-
import {
|
|
11
|
+
import type { SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
|
|
11
12
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
13
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
12
14
|
import { ValidatorClient } from './validator.js';
|
|
13
|
-
export declare function
|
|
15
|
+
export declare function createProposalHandler(config: ValidatorClientFullConfig, deps: {
|
|
14
16
|
checkpointsBuilder: FullNodeCheckpointsBuilder;
|
|
15
17
|
worldState: WorldStateSynchronizer;
|
|
16
18
|
blockSource: L2BlockSource & L2BlockSink;
|
|
17
19
|
l1ToL2MessageSource: L1ToL2MessageSource;
|
|
18
20
|
p2pClient: P2PClient;
|
|
19
21
|
epochCache: EpochCache;
|
|
22
|
+
blobClient: BlobClientInterface;
|
|
20
23
|
dateProvider: DateProvider;
|
|
21
24
|
telemetry: TelemetryClient;
|
|
22
|
-
|
|
25
|
+
reexecutionTracker: CheckpointReexecutionTracker;
|
|
26
|
+
}): ProposalHandler;
|
|
23
27
|
export declare function createValidatorClient(config: ValidatorClientFullConfig, deps: {
|
|
24
28
|
checkpointsBuilder: FullNodeCheckpointsBuilder;
|
|
25
29
|
worldState: WorldStateSynchronizer;
|
|
@@ -31,5 +35,7 @@ export declare function createValidatorClient(config: ValidatorClientFullConfig,
|
|
|
31
35
|
epochCache: EpochCache;
|
|
32
36
|
keyStoreManager: KeystoreManager | undefined;
|
|
33
37
|
blobClient: BlobClientInterface;
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
reexecutionTracker: CheckpointReexecutionTracker;
|
|
39
|
+
slashingProtectionDb?: SlashingProtectionDatabase;
|
|
40
|
+
}): Promise<ValidatorClient> | undefined;
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEVBQTBCLEtBQUssU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3BFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDekcsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRW5GLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFMUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3hELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVqRCx3QkFBZ0IscUJBQXFCLENBQ25DLE1BQU0sRUFBRSx5QkFBeUIsRUFDakMsSUFBSSxFQUFFO0lBQ0osa0JBQWtCLEVBQUUsMEJBQTBCLENBQUM7SUFDL0MsVUFBVSxFQUFFLHNCQUFzQixDQUFDO0lBQ25DLFdBQVcsRUFBRSxhQUFhLEdBQUcsV0FBVyxDQUFDO0lBQ3pDLG1CQUFtQixFQUFFLG1CQUFtQixDQUFDO0lBQ3pDLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDaEMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLGtCQUFrQixFQUFFLDRCQUE0QixDQUFDO0NBQ2xELG1CQTRCRjtBQUVELHdCQUFnQixxQkFBcUIsQ0FDbkMsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxJQUFJLEVBQUU7SUFDSixrQkFBa0IsRUFBRSwwQkFBMEIsQ0FBQztJQUMvQyxVQUFVLEVBQUUsc0JBQXNCLENBQUM7SUFDbkMsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixXQUFXLEVBQUUsYUFBYSxHQUFHLFdBQVcsQ0FBQztJQUN6QyxtQkFBbUIsRUFBRSxtQkFBbUIsQ0FBQztJQUN6QyxTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLFlBQVksRUFBRSxZQUFZLENBQUM7SUFDM0IsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixlQUFlLEVBQUUsZUFBZSxHQUFHLFNBQVMsQ0FBQztJQUM3QyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDaEMsa0JBQWtCLEVBQUUsNEJBQTRCLENBQUM7SUFDakQsb0JBQW9CLENBQUMsRUFBRSwwQkFBMEIsQ0FBQztDQUNuRCx3Q0F1QkYifQ==
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAEnF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,yBAAyB,EACjC,IAAI,EAAE;IACJ,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,UAAU,EAAE,sBAAsB,CAAC;IACnC,WAAW,EAAE,aAAa,GAAG,WAAW,CAAC;IACzC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,mBAAmB,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,eAAe,CAAC;IAC3B,kBAAkB,EAAE,4BAA4B,CAAC;CAClD,mBA4BF;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,yBAAyB,EACjC,IAAI,EAAE;IACJ,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,UAAU,EAAE,sBAAsB,CAAC;IACnC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,aAAa,GAAG,WAAW,CAAC;IACzC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,UAAU,EAAE,mBAAmB,CAAC;IAChC,kBAAkB,EAAE,4BAA4B,CAAC;IACjD,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;CACnD,wCAuBF"}
|
package/dest/factory.js
CHANGED
|
@@ -1,18 +1,24 @@
|
|
|
1
1
|
import { BlockProposalValidator } from '@aztec/p2p';
|
|
2
|
-
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
3
2
|
import { ValidatorMetrics } from './metrics.js';
|
|
3
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
4
4
|
import { ValidatorClient } from './validator.js';
|
|
5
|
-
export function
|
|
5
|
+
export function createProposalHandler(config, deps) {
|
|
6
6
|
const metrics = new ValidatorMetrics(deps.telemetry);
|
|
7
7
|
const blockProposalValidator = new BlockProposalValidator(deps.epochCache, {
|
|
8
|
-
txsPermitted: !config.disableTransactions
|
|
8
|
+
txsPermitted: !config.disableTransactions,
|
|
9
|
+
maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
|
|
10
|
+
maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
|
|
11
|
+
signatureContext: {
|
|
12
|
+
chainId: config.l1ChainId,
|
|
13
|
+
rollupAddress: config.rollupAddress
|
|
14
|
+
}
|
|
9
15
|
});
|
|
10
|
-
return new
|
|
16
|
+
return new ProposalHandler(deps.checkpointsBuilder, deps.worldState, deps.blockSource, deps.l1ToL2MessageSource, deps.p2pClient.getTxProvider(), blockProposalValidator, deps.epochCache, config, deps.blobClient, deps.reexecutionTracker, metrics, deps.dateProvider, deps.telemetry, undefined);
|
|
11
17
|
}
|
|
12
18
|
export function createValidatorClient(config, deps) {
|
|
13
19
|
if (config.disableValidator || !deps.keyStoreManager) {
|
|
14
20
|
return undefined;
|
|
15
21
|
}
|
|
16
22
|
const txProvider = deps.p2pClient.getTxProvider();
|
|
17
|
-
return ValidatorClient.new(config, deps.checkpointsBuilder, deps.worldState, deps.epochCache, deps.p2pClient, deps.blockSource, deps.l1ToL2MessageSource, txProvider, deps.keyStoreManager, deps.blobClient, deps.dateProvider, deps.telemetry);
|
|
23
|
+
return ValidatorClient.new(config, deps.checkpointsBuilder, deps.worldState, deps.epochCache, deps.p2pClient, deps.blockSource, deps.l1ToL2MessageSource, txProvider, deps.keyStoreManager, deps.blobClient, deps.reexecutionTracker, deps.dateProvider, deps.telemetry, deps.slashingProtectionDb);
|
|
18
24
|
}
|
package/dest/index.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './proposal_handler.js';
|
|
2
2
|
export * from './checkpoint_builder.js';
|
|
3
3
|
export * from './config.js';
|
|
4
4
|
export * from './factory.js';
|
|
5
5
|
export * from './validator.js';
|
|
6
6
|
export * from './key_store/index.js';
|
|
7
|
-
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMseUJBQXlCLENBQUMifQ==
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHNCQUFzQixDQUFDIn0=
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './proposal_handler.js';
|
|
2
2
|
export * from './checkpoint_builder.js';
|
|
3
3
|
export * from './config.js';
|
|
4
4
|
export * from './factory.js';
|
|
5
5
|
export * from './validator.js';
|
|
6
6
|
export * from './key_store/index.js';
|
|
7
|
-
export * from './tx_validator/index.js';
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* High Availability Key Store
|
|
3
|
+
*
|
|
4
|
+
* A ValidatorKeyStore wrapper that adds slashing protection for HA validator setups.
|
|
5
|
+
* When multiple validator nodes are running, only one node will sign for a given duty.
|
|
6
|
+
*/
|
|
7
|
+
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
8
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
9
|
+
import type { Signature } from '@aztec/foundation/eth-signature';
|
|
10
|
+
import type { EthRemoteSignerConfig } from '@aztec/node-keystore';
|
|
11
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
12
|
+
import { type SigningContext } from '@aztec/validator-ha-signer/types';
|
|
13
|
+
import type { ValidatorHASigner } from '@aztec/validator-ha-signer/validator-ha-signer';
|
|
14
|
+
import { type TypedDataDefinition } from 'viem';
|
|
15
|
+
import type { ExtendedValidatorKeyStore } from './interface.js';
|
|
16
|
+
/**
|
|
17
|
+
* High Availability Key Store
|
|
18
|
+
*
|
|
19
|
+
* Wraps a base ExtendedValidatorKeyStore and ValidatorHASigner to provide
|
|
20
|
+
* HA-protected signing operations (when context is provided).
|
|
21
|
+
*
|
|
22
|
+
* The extended interface methods (getAttesterAddresses, getCoinbaseAddress, etc.)
|
|
23
|
+
* are pure pass-through since they don't require HA coordination.
|
|
24
|
+
*
|
|
25
|
+
* Usage:
|
|
26
|
+
* ```typescript
|
|
27
|
+
* const baseKeyStore = NodeKeystoreAdapter.fromPrivateKeys(privateKeys);
|
|
28
|
+
* const haSigner = new ValidatorHASigner(db, config);
|
|
29
|
+
* const haKeyStore = new HAKeyStore(baseKeyStore, haSigner);
|
|
30
|
+
*
|
|
31
|
+
* // Without context - signs directly (no HA protection)
|
|
32
|
+
* const sig = await haKeyStore.signMessageWithAddress(addr, msg);
|
|
33
|
+
*
|
|
34
|
+
* // With context - HA protected, throws DutyAlreadySignedError if already signed
|
|
35
|
+
* const result = await haKeyStore.signMessageWithAddress(addr, msg, {
|
|
36
|
+
* slot: 100n,
|
|
37
|
+
* blockNumber: 50n,
|
|
38
|
+
* dutyType: DutyType.BLOCK_PROPOSAL,
|
|
39
|
+
* });
|
|
40
|
+
* ```
|
|
41
|
+
*/
|
|
42
|
+
export declare class HAKeyStore implements ExtendedValidatorKeyStore {
|
|
43
|
+
private readonly baseKeyStore;
|
|
44
|
+
private readonly haSigner;
|
|
45
|
+
private readonly log;
|
|
46
|
+
constructor(baseKeyStore: ExtendedValidatorKeyStore, haSigner: ValidatorHASigner);
|
|
47
|
+
/**
|
|
48
|
+
* Sign typed data with all addresses.
|
|
49
|
+
* Coordinates across nodes to prevent double-signing for most duty types.
|
|
50
|
+
* AUTH_REQUEST and TXS duties bypass HA protection since signing multiple times is safe.
|
|
51
|
+
* Returns only signatures that were successfully claimed by this node.
|
|
52
|
+
*/
|
|
53
|
+
signTypedData(typedData: TypedDataDefinition, context: SigningContext): Promise<Signature[]>;
|
|
54
|
+
/**
|
|
55
|
+
* Sign a message with all addresses.
|
|
56
|
+
* Coordinates across nodes to prevent double-signing for most duty types.
|
|
57
|
+
* AUTH_REQUEST and TXS duties bypass HA protection since signing multiple times is safe.
|
|
58
|
+
* Returns only signatures that were successfully claimed by this node.
|
|
59
|
+
*/
|
|
60
|
+
signMessage(message: Buffer32, context: SigningContext): Promise<Signature[]>;
|
|
61
|
+
/**
|
|
62
|
+
* Sign typed data with a specific address.
|
|
63
|
+
* Coordinates across nodes to prevent double-signing for most duty types.
|
|
64
|
+
* AUTH_REQUEST and TXS duties bypass HA protection since signing multiple times is safe.
|
|
65
|
+
* @throws DutyAlreadySignedError if the duty was already signed by another node
|
|
66
|
+
* @throws SlashingProtectionError if attempting to sign different data for the same slot
|
|
67
|
+
*/
|
|
68
|
+
signTypedDataWithAddress(address: EthAddress, typedData: TypedDataDefinition, context: SigningContext): Promise<Signature>;
|
|
69
|
+
/**
|
|
70
|
+
* Sign a message with a specific address.
|
|
71
|
+
* Coordinates across nodes to prevent double-signing for most duty types.
|
|
72
|
+
* AUTH_REQUEST and TXS duties bypass HA protection since signing multiple times is safe.
|
|
73
|
+
* @throws DutyAlreadySignedError if the duty was already signed by another node
|
|
74
|
+
* @throws SlashingProtectionError if attempting to sign different data for the same slot
|
|
75
|
+
*/
|
|
76
|
+
signMessageWithAddress(address: EthAddress, message: Buffer32, context: SigningContext): Promise<Signature>;
|
|
77
|
+
getAddress(index: number): EthAddress;
|
|
78
|
+
getAddresses(): EthAddress[];
|
|
79
|
+
getAttesterAddresses(): EthAddress[];
|
|
80
|
+
getCoinbaseAddress(attesterAddress: EthAddress): EthAddress;
|
|
81
|
+
getPublisherAddresses(attesterAddress: EthAddress): EthAddress[];
|
|
82
|
+
getFeeRecipient(attesterAddress: EthAddress): AztecAddress;
|
|
83
|
+
getRemoteSignerConfig(attesterAddress: EthAddress): EthRemoteSignerConfig | undefined;
|
|
84
|
+
/**
|
|
85
|
+
* Process signing errors from the HA signer.
|
|
86
|
+
* Logs expected HA errors (already signed) at appropriate levels.
|
|
87
|
+
* Re-throws unexpected errors.
|
|
88
|
+
*/
|
|
89
|
+
private processSigningError;
|
|
90
|
+
/**
|
|
91
|
+
* Start the high-availability key store
|
|
92
|
+
*/
|
|
93
|
+
start(): Promise<void>;
|
|
94
|
+
/**
|
|
95
|
+
* Stop the high-availability key store
|
|
96
|
+
*/
|
|
97
|
+
stop(): Promise<void>;
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFfa2V5X3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2V5X3N0b3JlL2hhX2tleV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7R0FLRztBQUNILE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sRUFFTCxLQUFLLGNBQWMsRUFFcEIsTUFBTSxrQ0FBa0MsQ0FBQztBQUMxQyxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGdEQUFnRCxDQUFDO0FBRXhGLE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFpQixNQUFNLE1BQU0sQ0FBQztBQUUvRCxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRWhFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBeUJHO0FBQ0gscUJBQWEsVUFBVyxZQUFXLHlCQUF5QjtJQUl4RCxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRO0lBSjNCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFnQztJQUVwRCxZQUNtQixZQUFZLEVBQUUseUJBQXlCLEVBQ3ZDLFFBQVEsRUFBRSxpQkFBaUIsRUFLN0M7SUFFRDs7Ozs7T0FLRztJQUNHLGFBQWEsQ0FBQyxTQUFTLEVBQUUsbUJBQW1CLEVBQUUsT0FBTyxFQUFFLGNBQWMsR0FBRyxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUMsQ0ErQmpHO0lBRUQ7Ozs7O09BS0c7SUFDRyxXQUFXLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQStCbEY7SUFFRDs7Ozs7O09BTUc7SUFDRyx3QkFBd0IsQ0FDNUIsT0FBTyxFQUFFLFVBQVUsRUFDbkIsU0FBUyxFQUFFLG1CQUFtQixFQUM5QixPQUFPLEVBQUUsY0FBYyxHQUN0QixPQUFPLENBQUMsU0FBUyxDQUFDLENBa0JwQjtJQUVEOzs7Ozs7T0FNRztJQUNHLHNCQUFzQixDQUFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FjaEg7SUFNRCxVQUFVLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxVQUFVLENBRXBDO0lBRUQsWUFBWSxJQUFJLFVBQVUsRUFBRSxDQUUzQjtJQUVELG9CQUFvQixJQUFJLFVBQVUsRUFBRSxDQUVuQztJQUVELGtCQUFrQixDQUFDLGVBQWUsRUFBRSxVQUFVLEdBQUcsVUFBVSxDQUUxRDtJQUVELHFCQUFxQixDQUFDLGVBQWUsRUFBRSxVQUFVLEdBQUcsVUFBVSxFQUFFLENBRS9EO0lBRUQsZUFBZSxDQUFDLGVBQWUsRUFBRSxVQUFVLEdBQUcsWUFBWSxDQUV6RDtJQUVELHFCQUFxQixDQUFDLGVBQWUsRUFBRSxVQUFVLEdBQUcscUJBQXFCLEdBQUcsU0FBUyxDQUVwRjtJQUVEOzs7O09BSUc7SUFDSCxPQUFPLENBQUMsbUJBQW1CO0lBd0IzQjs7T0FFRztJQUNVLEtBQUssa0JBRWpCO0lBRUQ7O09BRUc7SUFDVSxJQUFJLGtCQUVoQjtDQUNGIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ha_key_store.d.ts","sourceRoot":"","sources":["../../src/key_store/ha_key_store.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAExF,OAAO,EAAE,KAAK,mBAAmB,EAAiB,MAAM,MAAM,CAAC;AAE/D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBAAa,UAAW,YAAW,yBAAyB;IAIxD,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAJ3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAEpD,YACmB,YAAY,EAAE,yBAAyB,EACvC,QAAQ,EAAE,iBAAiB,EAK7C;IAED;;;;;OAKG;IACG,aAAa,CAAC,SAAS,EAAE,mBAAmB,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CA+BjG;IAED;;;;;OAKG;IACG,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CA+BlF;IAED;;;;;;OAMG;IACG,wBAAwB,CAC5B,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,mBAAmB,EAC9B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,SAAS,CAAC,CAkBpB;IAED;;;;;;OAMG;IACG,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAchH;IAMD,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAEpC;IAED,YAAY,IAAI,UAAU,EAAE,CAE3B;IAED,oBAAoB,IAAI,UAAU,EAAE,CAEnC;IAED,kBAAkB,CAAC,eAAe,EAAE,UAAU,GAAG,UAAU,CAE1D;IAED,qBAAqB,CAAC,eAAe,EAAE,UAAU,GAAG,UAAU,EAAE,CAE/D;IAED,eAAe,CAAC,eAAe,EAAE,UAAU,GAAG,YAAY,CAEzD;IAED,qBAAqB,CAAC,eAAe,EAAE,UAAU,GAAG,qBAAqB,GAAG,SAAS,CAEpF;IAED;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAwB3B;;OAEG;IACU,KAAK,kBAEjB;IAED;;OAEG;IACU,IAAI,kBAEhB;CACF"}
|