@aztec/stdlib 0.0.1-commit.d1da697d6 → 0.0.1-commit.d20b825a7
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/authorization_selector.d.ts +3 -6
- package/dest/abi/authorization_selector.d.ts.map +1 -1
- package/dest/abi/encoder.d.ts +1 -1
- package/dest/abi/encoder.d.ts.map +1 -1
- package/dest/abi/encoder.js +32 -6
- package/dest/abi/event_selector.d.ts +3 -6
- package/dest/abi/event_selector.d.ts.map +1 -1
- package/dest/abi/function_selector.d.ts +3 -6
- package/dest/abi/function_selector.d.ts.map +1 -1
- package/dest/abi/function_selector.js +1 -3
- package/dest/abi/note_selector.d.ts +3 -6
- package/dest/abi/note_selector.d.ts.map +1 -1
- package/dest/abi/note_selector.js +1 -3
- package/dest/avm/avm.d.ts +300 -300
- package/dest/aztec-address/index.d.ts +3 -6
- package/dest/aztec-address/index.d.ts.map +1 -1
- package/dest/aztec-address/index.js +2 -4
- package/dest/block/block_data.d.ts +8 -8
- package/dest/block/block_data.d.ts.map +1 -1
- package/dest/block/block_data.js +2 -2
- package/dest/block/block_hash.d.ts +11 -10
- package/dest/block/block_hash.d.ts.map +1 -1
- package/dest/block/block_hash.js +10 -9
- package/dest/block/l2_block_info.d.ts +6 -5
- package/dest/block/l2_block_info.d.ts.map +1 -1
- package/dest/block/l2_block_info.js +6 -5
- package/dest/block/l2_block_stream/interfaces.d.ts +6 -3
- package/dest/block/l2_block_stream/interfaces.d.ts.map +1 -1
- package/dest/block/l2_block_stream/l2_tips_store_base.d.ts +1 -1
- package/dest/block/l2_block_stream/l2_tips_store_base.d.ts.map +1 -1
- package/dest/block/l2_block_stream/l2_tips_store_base.js +1 -1
- package/dest/block/test/l2_tips_store_test_suite.js +1 -1
- package/dest/config/chain-config.d.ts +1 -1
- package/dest/config/chain-config.d.ts.map +1 -1
- package/dest/config/chain-config.js +7 -1
- package/dest/config/sequencer-config.d.ts +2 -2
- package/dest/config/sequencer-config.d.ts.map +1 -1
- package/dest/config/sequencer-config.js +10 -3
- package/dest/contract/contract_address.d.ts +1 -1
- package/dest/contract/contract_address.js +2 -2
- package/dest/contract/private_function.d.ts +1 -1
- package/dest/contract/private_function.d.ts.map +1 -1
- package/dest/contract/private_function.js +2 -4
- package/dest/gas/fee_math.d.ts +49 -0
- package/dest/gas/fee_math.d.ts.map +1 -0
- package/dest/gas/fee_math.js +80 -0
- package/dest/gas/gas_fees.d.ts +5 -1
- package/dest/gas/gas_fees.d.ts.map +1 -1
- package/dest/gas/gas_fees.js +10 -1
- package/dest/gas/index.d.ts +2 -1
- package/dest/gas/index.d.ts.map +1 -1
- package/dest/gas/index.js +1 -0
- package/dest/ha-signing/config.d.ts +6 -6
- package/dest/ha-signing/config.d.ts.map +1 -1
- package/dest/ha-signing/config.js +4 -3
- package/dest/ha-signing/index.d.ts +2 -2
- package/dest/ha-signing/index.d.ts.map +1 -1
- package/dest/ha-signing/index.js +1 -1
- package/dest/ha-signing/local_config.js +1 -1
- package/dest/ha-signing/types.d.ts +37 -32
- package/dest/ha-signing/types.d.ts.map +1 -1
- package/dest/ha-signing/types.js +13 -6
- package/dest/hash/hash.d.ts +16 -1
- package/dest/hash/hash.d.ts.map +1 -1
- package/dest/hash/hash.js +32 -0
- package/dest/interfaces/archiver.d.ts +11 -1
- package/dest/interfaces/archiver.d.ts.map +1 -1
- package/dest/interfaces/archiver.js +3 -1
- package/dest/interfaces/aztec-node-admin.d.ts +8 -14
- package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
- package/dest/interfaces/aztec-node-admin.js +1 -2
- package/dest/interfaces/aztec-node-debug.d.ts +21 -0
- package/dest/interfaces/aztec-node-debug.d.ts.map +1 -0
- package/dest/interfaces/aztec-node-debug.js +18 -0
- package/dest/interfaces/aztec-node.d.ts +10 -1
- package/dest/interfaces/aztec-node.d.ts.map +1 -1
- package/dest/interfaces/aztec-node.js +2 -0
- package/dest/interfaces/client.d.ts +2 -1
- package/dest/interfaces/client.d.ts.map +1 -1
- package/dest/interfaces/client.js +1 -0
- package/dest/interfaces/merkle_tree_operations.d.ts +4 -3
- package/dest/interfaces/merkle_tree_operations.d.ts.map +1 -1
- package/dest/interfaces/prover-client.d.ts +1 -1
- package/dest/interfaces/prover-client.d.ts.map +1 -1
- package/dest/interfaces/prover-client.js +0 -3
- package/dest/interfaces/slasher.d.ts +1 -10
- package/dest/interfaces/slasher.d.ts.map +1 -1
- package/dest/interfaces/slasher.js +0 -2
- package/dest/interfaces/validator.d.ts +14 -17
- package/dest/interfaces/validator.d.ts.map +1 -1
- package/dest/l1-contracts/index.d.ts +2 -2
- package/dest/l1-contracts/index.d.ts.map +1 -1
- package/dest/l1-contracts/index.js +1 -1
- package/dest/logs/log_id.d.ts +1 -1
- package/dest/logs/log_id.d.ts.map +1 -1
- package/dest/logs/log_id.js +1 -2
- package/dest/logs/siloed_tag.d.ts +5 -7
- package/dest/logs/siloed_tag.d.ts.map +1 -1
- package/dest/logs/siloed_tag.js +4 -0
- package/dest/logs/tag.d.ts +5 -6
- package/dest/logs/tag.d.ts.map +1 -1
- package/dest/logs/tag.js +4 -0
- package/dest/p2p/block_proposal.d.ts +6 -8
- package/dest/p2p/block_proposal.d.ts.map +1 -1
- package/dest/p2p/block_proposal.js +4 -9
- package/dest/p2p/checkpoint_attestation.d.ts +4 -6
- package/dest/p2p/checkpoint_attestation.d.ts.map +1 -1
- package/dest/p2p/checkpoint_attestation.js +2 -7
- package/dest/p2p/checkpoint_proposal.d.ts +8 -10
- package/dest/p2p/checkpoint_proposal.d.ts.map +1 -1
- package/dest/p2p/checkpoint_proposal.js +5 -24
- package/dest/p2p/gossipable.d.ts +4 -4
- package/dest/p2p/gossipable.d.ts.map +1 -1
- package/dest/parity/parity_base_private_inputs.d.ts +7 -3
- package/dest/parity/parity_base_private_inputs.d.ts.map +1 -1
- package/dest/parity/parity_base_private_inputs.js +7 -5
- package/dest/parity/parity_public_inputs.d.ts +7 -3
- package/dest/parity/parity_public_inputs.d.ts.map +1 -1
- package/dest/parity/parity_public_inputs.js +6 -3
- package/dest/rollup/block_headers_hash.d.ts +1 -1
- package/dest/rollup/block_headers_hash.d.ts.map +1 -1
- package/dest/rollup/block_headers_hash.js +8 -2
- package/dest/slashing/index.d.ts +2 -3
- package/dest/slashing/index.d.ts.map +1 -1
- package/dest/slashing/index.js +1 -2
- package/dest/slashing/serialization.d.ts +2 -6
- package/dest/slashing/serialization.d.ts.map +1 -1
- package/dest/slashing/serialization.js +0 -60
- package/dest/slashing/types.d.ts +4 -90
- package/dest/slashing/types.d.ts.map +1 -1
- package/dest/slashing/types.js +0 -14
- package/dest/slashing/{tally.d.ts → votes.d.ts} +1 -1
- package/dest/slashing/{tally.d.ts.map → votes.d.ts.map} +1 -1
- package/dest/slashing/{tally.js → votes.js} +1 -1
- package/dest/tests/factories.d.ts +2 -7
- package/dest/tests/factories.d.ts.map +1 -1
- package/dest/tests/factories.js +8 -18
- package/dest/tests/mocks.d.ts +1 -1
- package/dest/tests/mocks.d.ts.map +1 -1
- package/dest/tests/mocks.js +12 -17
- package/dest/timetable/index.d.ts +51 -1
- package/dest/timetable/index.d.ts.map +1 -1
- package/dest/timetable/index.js +204 -14
- package/dest/trees/nullifier_leaf.d.ts +2 -1
- package/dest/trees/nullifier_leaf.d.ts.map +1 -1
- package/dest/trees/nullifier_leaf.js +3 -0
- package/dest/tx/block_header.d.ts +2 -2
- package/dest/tx/block_header.d.ts.map +1 -1
- package/dest/tx/block_header.js +1 -1
- package/dest/tx/fee_provider.d.ts +10 -0
- package/dest/tx/fee_provider.d.ts.map +1 -0
- package/dest/tx/fee_provider.js +1 -0
- package/dest/tx/global_variable_builder.d.ts +3 -16
- package/dest/tx/global_variable_builder.d.ts.map +1 -1
- package/dest/tx/index.d.ts +2 -1
- package/dest/tx/index.d.ts.map +1 -1
- package/dest/tx/index.js +1 -0
- package/dest/tx/indexed_tx_effect.d.ts +1 -1
- package/dest/tx/indexed_tx_effect.d.ts.map +1 -1
- package/dest/tx/indexed_tx_effect.js +1 -2
- package/dest/tx/simulated_tx.d.ts +1 -1
- package/dest/tx/simulated_tx.js +1 -1
- package/dest/tx/tx.d.ts +3 -3
- package/dest/tx/tx.d.ts.map +1 -1
- package/dest/types/shared.d.ts +1 -10
- package/dest/types/shared.d.ts.map +1 -1
- package/dest/types/shared.js +0 -9
- package/dest/vks/verification_key.d.ts +2 -137
- package/dest/vks/verification_key.d.ts.map +1 -1
- package/dest/vks/verification_key.js +5 -126
- package/dest/world-state/genesis_data.d.ts +11 -0
- package/dest/world-state/genesis_data.d.ts.map +1 -0
- package/dest/world-state/genesis_data.js +4 -0
- package/dest/world-state/index.d.ts +2 -1
- package/dest/world-state/index.d.ts.map +1 -1
- package/dest/world-state/index.js +1 -0
- package/dest/world-state/world_state_revision.d.ts +8 -1
- package/dest/world-state/world_state_revision.d.ts.map +1 -1
- package/dest/world-state/world_state_revision.js +7 -1
- package/package.json +8 -8
- package/src/abi/authorization_selector.ts +2 -8
- package/src/abi/encoder.ts +42 -6
- package/src/abi/event_selector.ts +2 -8
- package/src/abi/function_selector.ts +3 -12
- package/src/abi/note_selector.ts +3 -12
- package/src/aztec-address/index.ts +4 -10
- package/src/block/block_data.ts +3 -4
- package/src/block/block_hash.ts +21 -14
- package/src/block/l2_block_info.ts +8 -6
- package/src/block/l2_block_stream/interfaces.ts +6 -2
- package/src/block/l2_block_stream/l2_tips_store_base.ts +1 -1
- package/src/block/test/l2_tips_store_test_suite.ts +1 -1
- package/src/config/chain-config.ts +7 -1
- package/src/config/sequencer-config.ts +14 -4
- package/src/contract/contract_address.ts +2 -2
- package/src/contract/private_function.ts +3 -1
- package/src/gas/README.md +31 -0
- package/src/gas/fee_math.ts +120 -0
- package/src/gas/gas_fees.ts +17 -4
- package/src/gas/index.ts +1 -0
- package/src/ha-signing/config.ts +5 -2
- package/src/ha-signing/index.ts +3 -1
- package/src/ha-signing/local_config.ts +1 -1
- package/src/ha-signing/types.ts +48 -34
- package/src/hash/hash.ts +27 -0
- package/src/interfaces/archiver.ts +8 -0
- package/src/interfaces/aztec-node-admin.ts +3 -6
- package/src/interfaces/aztec-node-debug.ts +40 -0
- package/src/interfaces/aztec-node.ts +15 -0
- package/src/interfaces/client.ts +1 -0
- package/src/interfaces/merkle_tree_operations.ts +3 -2
- package/src/interfaces/prover-client.ts +2 -5
- package/src/interfaces/slasher.ts +0 -6
- package/src/interfaces/validator.ts +15 -8
- package/src/l1-contracts/index.ts +1 -1
- package/src/logs/log_id.ts +1 -2
- package/src/logs/siloed_tag.ts +8 -9
- package/src/logs/tag.ts +8 -8
- package/src/p2p/block_proposal.ts +13 -9
- package/src/p2p/checkpoint_attestation.ts +5 -9
- package/src/p2p/checkpoint_proposal.ts +21 -36
- package/src/p2p/gossipable.ts +4 -4
- package/src/parity/parity_base_private_inputs.ts +10 -4
- package/src/parity/parity_public_inputs.ts +9 -2
- package/src/rollup/block_headers_hash.ts +11 -2
- package/src/slashing/index.ts +1 -2
- package/src/slashing/serialization.ts +1 -81
- package/src/slashing/types.ts +3 -35
- package/src/slashing/{tally.ts → votes.ts} +1 -1
- package/src/tests/factories.ts +14 -20
- package/src/tests/mocks.ts +14 -10
- package/src/timetable/index.ts +293 -13
- package/src/trees/nullifier_leaf.ts +4 -0
- package/src/tx/block_header.ts +2 -2
- package/src/tx/fee_provider.ts +10 -0
- package/src/tx/global_variable_builder.ts +2 -18
- package/src/tx/index.ts +1 -0
- package/src/tx/indexed_tx_effect.ts +1 -2
- package/src/tx/simulated_tx.ts +1 -1
- package/src/tx/tx.ts +2 -2
- package/src/types/shared.ts +0 -10
- package/src/vks/verification_key.ts +5 -184
- package/src/world-state/genesis_data.ts +15 -0
- package/src/world-state/index.ts +1 -0
- package/src/world-state/world_state_revision.ts +9 -1
- package/dest/abi/mocked_keys.d.ts +0 -2
- package/dest/abi/mocked_keys.d.ts.map +0 -1
- package/dest/abi/mocked_keys.js +0 -1
- package/dest/l1-contracts/slash_factory.d.ts +0 -45
- package/dest/l1-contracts/slash_factory.d.ts.map +0 -1
- package/dest/l1-contracts/slash_factory.js +0 -158
- package/dest/slashing/empire.d.ts +0 -31
- package/dest/slashing/empire.d.ts.map +0 -1
- package/dest/slashing/empire.js +0 -87
- package/src/abi/mocked_keys.ts +0 -2
- package/src/l1-contracts/slash_factory.ts +0 -180
- package/src/slashing/empire.ts +0 -104
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* TypeScript port of fee computation logic from FeeLib.sol.
|
|
3
|
+
* Used to predict worst-case min fees over a future window of L2 slots.
|
|
4
|
+
*/
|
|
5
|
+
export declare const MINIMUM_CONGESTION_MULTIPLIER = 1000000000n;
|
|
6
|
+
export declare const L1_GAS_PER_CHECKPOINT_PROPOSED = 300000n;
|
|
7
|
+
export declare const L1_GAS_PER_EPOCH_VERIFIED = 3600000n;
|
|
8
|
+
export declare const BLOBS_PER_CHECKPOINT = 3n;
|
|
9
|
+
export declare const BLOB_GAS_PER_BLOB: bigint;
|
|
10
|
+
export declare const MAGIC_CONGESTION_VALUE_MULTIPLIER = 854700854n;
|
|
11
|
+
export declare const MAGIC_CONGESTION_VALUE_DIVISOR = 100000000n;
|
|
12
|
+
export declare const ETH_PER_FEE_ASSET_PRECISION = 1000000000000n;
|
|
13
|
+
export declare const MIN_ETH_PER_FEE_ASSET = 100n;
|
|
14
|
+
/** Number of L2 slots of lag before new oracle values activate. Defines the prediction window. */
|
|
15
|
+
export declare const FEE_ORACLE_LAG = 2;
|
|
16
|
+
/** Expected mana usage per checkpoint for fee prediction. */
|
|
17
|
+
export declare enum ManaUsageEstimate {
|
|
18
|
+
/** No usage — fees decrease as congestion drains. */
|
|
19
|
+
None = "none",
|
|
20
|
+
/** Target usage — congestion stays roughly flat (steady state). */
|
|
21
|
+
Target = "target",
|
|
22
|
+
/** Limit usage (2x target) — worst case, congestion grows maximally. */
|
|
23
|
+
Limit = "limit"
|
|
24
|
+
}
|
|
25
|
+
/** Parameters for computing the mana min fee at a given point in time. */
|
|
26
|
+
export type ManaMinFeeParams = {
|
|
27
|
+
l1BaseFee: bigint;
|
|
28
|
+
l1BlobFee: bigint;
|
|
29
|
+
manaTarget: bigint;
|
|
30
|
+
epochDuration: bigint;
|
|
31
|
+
provingCostPerManaEth: bigint;
|
|
32
|
+
excessMana: bigint;
|
|
33
|
+
ethPerFeeAsset: bigint;
|
|
34
|
+
};
|
|
35
|
+
/**
|
|
36
|
+
* Taylor series approximation of `factor * e^(numerator/denominator)`.
|
|
37
|
+
* Direct port of FeeLib.sol fakeExponential (EIP-4844 style).
|
|
38
|
+
*/
|
|
39
|
+
export declare function fakeExponential(factor: bigint, numerator: bigint, denominator: bigint): bigint;
|
|
40
|
+
/** Computes excess mana for the next checkpoint, clamped to zero. */
|
|
41
|
+
export declare function computeExcessMana(prevExcessMana: bigint, prevManaUsed: bigint, manaTarget: bigint): bigint;
|
|
42
|
+
/** Computes the congestion multiplier from excess mana (1e9 = no congestion). */
|
|
43
|
+
export declare function computeCongestionMultiplier(excessMana: bigint, manaTarget: bigint): bigint;
|
|
44
|
+
/**
|
|
45
|
+
* Computes the full mana min fee (sequencer + prover + congestion) in fee asset terms.
|
|
46
|
+
* Mirrors FeeLib.getManaMinFeeComponentsAt + summedMinFee.
|
|
47
|
+
*/
|
|
48
|
+
export declare function computeManaMinFee(params: ManaMinFeeParams): bigint;
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX21hdGguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nYXMvZmVlX21hdGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztHQUdHO0FBR0gsZUFBTyxNQUFNLDZCQUE2QixjQUFpQixDQUFDO0FBQzVELGVBQU8sTUFBTSw4QkFBOEIsVUFBVyxDQUFDO0FBQ3ZELGVBQU8sTUFBTSx5QkFBeUIsV0FBYSxDQUFDO0FBQ3BELGVBQU8sTUFBTSxvQkFBb0IsS0FBSyxDQUFDO0FBQ3ZDLGVBQU8sTUFBTSxpQkFBaUIsUUFBWSxDQUFDO0FBQzNDLGVBQU8sTUFBTSxpQ0FBaUMsYUFBZSxDQUFDO0FBQzlELGVBQU8sTUFBTSw4QkFBOEIsYUFBZSxDQUFDO0FBQzNELGVBQU8sTUFBTSwyQkFBMkIsaUJBQXFCLENBQUM7QUFDOUQsZUFBTyxNQUFNLHFCQUFxQixPQUFPLENBQUM7QUFFMUMsa0dBQWtHO0FBQ2xHLGVBQU8sTUFBTSxjQUFjLElBQUksQ0FBQztBQUVoQyw2REFBNkQ7QUFDN0Qsb0JBQVksaUJBQWlCO0lBQzNCLHVEQUFxRDtJQUNyRCxJQUFJLFNBQVM7SUFDYixxRUFBbUU7SUFDbkUsTUFBTSxXQUFXO0lBQ2pCLDBFQUF3RTtJQUN4RSxLQUFLLFVBQVU7Q0FDaEI7QUFFRCwwRUFBMEU7QUFDMUUsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsY0FBYyxFQUFFLE1BQU0sQ0FBQztDQUN4QixDQUFDO0FBRUY7OztHQUdHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBVTlGO0FBRUQscUVBQXFFO0FBQ3JFLHdCQUFnQixpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBRzFHO0FBRUQsaUZBQWlGO0FBQ2pGLHdCQUFnQiwyQkFBMkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUkxRjtBQWVEOzs7R0FHRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLEdBQUcsTUFBTSxDQWlDbEUifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fee_math.d.ts","sourceRoot":"","sources":["../../src/gas/fee_math.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,eAAO,MAAM,6BAA6B,cAAiB,CAAC;AAC5D,eAAO,MAAM,8BAA8B,UAAW,CAAC;AACvD,eAAO,MAAM,yBAAyB,WAAa,CAAC;AACpD,eAAO,MAAM,oBAAoB,KAAK,CAAC;AACvC,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAC3C,eAAO,MAAM,iCAAiC,aAAe,CAAC;AAC9D,eAAO,MAAM,8BAA8B,aAAe,CAAC;AAC3D,eAAO,MAAM,2BAA2B,iBAAqB,CAAC;AAC9D,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,kGAAkG;AAClG,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC,6DAA6D;AAC7D,oBAAY,iBAAiB;IAC3B,uDAAqD;IACrD,IAAI,SAAS;IACb,qEAAmE;IACnE,MAAM,WAAW;IACjB,0EAAwE;IACxE,KAAK,UAAU;CAChB;AAED,0EAA0E;AAC1E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAU9F;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAG1G;AAED,iFAAiF;AACjF,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAI1F;AAeD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAiClE"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* TypeScript port of fee computation logic from FeeLib.sol.
|
|
3
|
+
* Used to predict worst-case min fees over a future window of L2 slots.
|
|
4
|
+
*/ // Constants matching FeeLib.sol
|
|
5
|
+
export const MINIMUM_CONGESTION_MULTIPLIER = 1_000_000_000n;
|
|
6
|
+
export const L1_GAS_PER_CHECKPOINT_PROPOSED = 300_000n;
|
|
7
|
+
export const L1_GAS_PER_EPOCH_VERIFIED = 3_600_000n;
|
|
8
|
+
export const BLOBS_PER_CHECKPOINT = 3n;
|
|
9
|
+
export const BLOB_GAS_PER_BLOB = 2n ** 17n;
|
|
10
|
+
export const MAGIC_CONGESTION_VALUE_MULTIPLIER = 854_700_854n;
|
|
11
|
+
export const MAGIC_CONGESTION_VALUE_DIVISOR = 100_000_000n;
|
|
12
|
+
export const ETH_PER_FEE_ASSET_PRECISION = 1_000_000_000_000n;
|
|
13
|
+
export const MIN_ETH_PER_FEE_ASSET = 100n;
|
|
14
|
+
/** Number of L2 slots of lag before new oracle values activate. Defines the prediction window. */ export const FEE_ORACLE_LAG = 2;
|
|
15
|
+
/** Expected mana usage per checkpoint for fee prediction. */ export var ManaUsageEstimate = /*#__PURE__*/ function(ManaUsageEstimate) {
|
|
16
|
+
/** No usage — fees decrease as congestion drains. */ ManaUsageEstimate["None"] = "none";
|
|
17
|
+
/** Target usage — congestion stays roughly flat (steady state). */ ManaUsageEstimate["Target"] = "target";
|
|
18
|
+
/** Limit usage (2x target) — worst case, congestion grows maximally. */ ManaUsageEstimate["Limit"] = "limit";
|
|
19
|
+
return ManaUsageEstimate;
|
|
20
|
+
}({});
|
|
21
|
+
/**
|
|
22
|
+
* Taylor series approximation of `factor * e^(numerator/denominator)`.
|
|
23
|
+
* Direct port of FeeLib.sol fakeExponential (EIP-4844 style).
|
|
24
|
+
*/ export function fakeExponential(factor, numerator, denominator) {
|
|
25
|
+
let i = 1n;
|
|
26
|
+
let output = 0n;
|
|
27
|
+
let numeratorAccumulator = factor * denominator;
|
|
28
|
+
while(numeratorAccumulator > 0n){
|
|
29
|
+
output += numeratorAccumulator;
|
|
30
|
+
numeratorAccumulator = numeratorAccumulator * numerator / (denominator * i);
|
|
31
|
+
i += 1n;
|
|
32
|
+
}
|
|
33
|
+
return output / denominator;
|
|
34
|
+
}
|
|
35
|
+
/** Computes excess mana for the next checkpoint, clamped to zero. */ export function computeExcessMana(prevExcessMana, prevManaUsed, manaTarget) {
|
|
36
|
+
const sum = prevExcessMana + prevManaUsed;
|
|
37
|
+
return sum > manaTarget ? sum - manaTarget : 0n;
|
|
38
|
+
}
|
|
39
|
+
/** Computes the congestion multiplier from excess mana (1e9 = no congestion). */ export function computeCongestionMultiplier(excessMana, manaTarget) {
|
|
40
|
+
const denominator = manaTarget * MAGIC_CONGESTION_VALUE_MULTIPLIER / MAGIC_CONGESTION_VALUE_DIVISOR;
|
|
41
|
+
const cappedNumerator = excessMana < denominator * 100n ? excessMana : denominator * 100n;
|
|
42
|
+
return fakeExponential(MINIMUM_CONGESTION_MULTIPLIER, cappedNumerator, denominator);
|
|
43
|
+
}
|
|
44
|
+
/** Ceiling division for positive bigints. */ function ceilDiv(a, b) {
|
|
45
|
+
return (a + b - 1n) / b;
|
|
46
|
+
}
|
|
47
|
+
/** Converts an ETH value to fee asset value using ethPerFeeAsset (1e12 precision). */ function toFeeAsset(ethValue, ethPerFeeAsset) {
|
|
48
|
+
if (ethPerFeeAsset === 0n) {
|
|
49
|
+
return 0n;
|
|
50
|
+
}
|
|
51
|
+
return ceilDiv(ethValue * ETH_PER_FEE_ASSET_PRECISION, ethPerFeeAsset);
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Computes the full mana min fee (sequencer + prover + congestion) in fee asset terms.
|
|
55
|
+
* Mirrors FeeLib.getManaMinFeeComponentsAt + summedMinFee.
|
|
56
|
+
*/ export function computeManaMinFee(params) {
|
|
57
|
+
const { l1BaseFee, l1BlobFee, manaTarget, epochDuration, provingCostPerManaEth, excessMana, ethPerFeeAsset } = params;
|
|
58
|
+
if (manaTarget === 0n) {
|
|
59
|
+
return 0n;
|
|
60
|
+
}
|
|
61
|
+
// Sequencer cost per mana (in ETH)
|
|
62
|
+
const ethUsed = L1_GAS_PER_CHECKPOINT_PROPOSED * l1BaseFee + BLOBS_PER_CHECKPOINT * BLOB_GAS_PER_BLOB * l1BlobFee;
|
|
63
|
+
const sequencerCostEth = ceilDiv(ethUsed, manaTarget);
|
|
64
|
+
// Prover cost per mana (in ETH): L1 verification gas + governance-set proving cost
|
|
65
|
+
const proverCostEth = ceilDiv(ceilDiv(L1_GAS_PER_EPOCH_VERIFIED * l1BaseFee, epochDuration), manaTarget) + provingCostPerManaEth;
|
|
66
|
+
// Total base cost in ETH (congestion is computed on this)
|
|
67
|
+
const totalEth = sequencerCostEth + proverCostEth;
|
|
68
|
+
// Congestion multiplier and cost (in ETH)
|
|
69
|
+
const congestionMul = computeCongestionMultiplier(excessMana, manaTarget);
|
|
70
|
+
const congestionCostEth = totalEth * congestionMul / MINIMUM_CONGESTION_MULTIPLIER - totalEth;
|
|
71
|
+
// Convert all components to fee asset
|
|
72
|
+
const clampedEthPerFeeAsset = ethPerFeeAsset < MIN_ETH_PER_FEE_ASSET ? MIN_ETH_PER_FEE_ASSET : ethPerFeeAsset;
|
|
73
|
+
const sequencerCost = toFeeAsset(sequencerCostEth, clampedEthPerFeeAsset);
|
|
74
|
+
const proverCost = toFeeAsset(proverCostEth, clampedEthPerFeeAsset);
|
|
75
|
+
const congestionCost = toFeeAsset(congestionCostEth, clampedEthPerFeeAsset);
|
|
76
|
+
const total = sequencerCost + proverCost + congestionCost;
|
|
77
|
+
// Cap at uint128 max (matching FeeLib.summedMinFee)
|
|
78
|
+
const UINT128_MAX = (1n << 128n) - 1n;
|
|
79
|
+
return total < UINT128_MAX ? total : UINT128_MAX;
|
|
80
|
+
}
|
package/dest/gas/gas_fees.d.ts
CHANGED
|
@@ -49,4 +49,8 @@ export declare class GasFees {
|
|
|
49
49
|
};
|
|
50
50
|
[inspect.custom](): string;
|
|
51
51
|
}
|
|
52
|
-
|
|
52
|
+
/** Provides projected minimum gas fees for the next block. */
|
|
53
|
+
export interface BlockMinFeesProvider {
|
|
54
|
+
getCurrentMinFees(): Promise<GasFees>;
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX2ZlZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nYXMvZ2FzX2ZlZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFDTCxZQUFZLEVBQ1osV0FBVyxFQUlaLE1BQU0sNkJBQTZCLENBQUM7QUFDckMsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMvQixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQWE5QyxxQ0FBcUM7QUFDckMscUJBQWEsT0FBTztJQUNsQixTQUFnQixXQUFXLEVBQUUsT0FBTyxDQUFDO0lBQ3JDLFNBQWdCLFdBQVcsRUFBRSxPQUFPLENBQUM7SUFFckMsWUFBWSxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFHckU7SUFFRCxNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsS0FBSyxJQUFJLE9BQU8sQ0FFZjtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsT0FBTyxXQUVwQjtJQUVELEdBQUcsQ0FBQyxTQUFTLEVBQUUsYUFBYSxVQU8zQjtJQUVELEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE1BQU0sV0FXMUI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDLFdBRXBDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLE9BQU8sQ0FLeEM7SUFFRCxNQUFNLENBQUMsTUFBTSxZQUVaO0lBRUQsTUFBTSxDQUFDLEtBQUssWUFFWDtJQUVELE9BQU8sWUFFTjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsT0FBTyxDQUd4RDtJQUVELFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLFdBRzNDO0lBRUQsUUFBUSxTQUVQO0lBRUQsU0FBUzs7O01BS1I7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FFZjtDQUNGO0FBRUQsOERBQThEO0FBQzlELE1BQU0sV0FBVyxvQkFBb0I7SUFDbkMsaUJBQWlCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0NBQ3ZDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gas_fees.d.ts","sourceRoot":"","sources":["../../src/gas/gas_fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EACL,YAAY,EACZ,WAAW,EAIZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"gas_fees.d.ts","sourceRoot":"","sources":["../../src/gas/gas_fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EACL,YAAY,EACZ,WAAW,EAIZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAa9C,qCAAqC;AACrC,qBAAa,OAAO;IAClB,SAAgB,WAAW,EAAE,OAAO,CAAC;IACrC,SAAgB,WAAW,EAAE,OAAO,CAAC;IAErC,YAAY,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAGrE;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,KAAK,IAAI,OAAO,CAEf;IAED,MAAM,CAAC,KAAK,EAAE,OAAO,WAEpB;IAED,GAAG,CAAC,SAAS,EAAE,aAAa,UAO3B;IAED,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,WAW1B;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,WAEpC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAKxC;IAED,MAAM,CAAC,MAAM,YAEZ;IAED,MAAM,CAAC,KAAK,YAEX;IAED,OAAO,YAEN;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAGxD;IAED,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,WAG3C;IAED,QAAQ,SAEP;IAED,SAAS;;;MAKR;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;CACF;AAED,8DAA8D;AAC9D,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACvC"}
|
package/dest/gas/gas_fees.js
CHANGED
|
@@ -3,6 +3,15 @@ import { schemas } from '@aztec/foundation/schemas';
|
|
|
3
3
|
import { BufferReader, FieldReader, bigintToUInt128BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
|
|
4
4
|
import { inspect } from 'util';
|
|
5
5
|
import { z } from 'zod';
|
|
6
|
+
/**
|
|
7
|
+
* Multiplies a bigint by a non-integer scalar and returns the ceiling of the result.
|
|
8
|
+
* Avoids converting the bigint to Number (which loses precision above 2^53) by instead
|
|
9
|
+
* scaling the scalar into a bigint rational and performing ceiling division.
|
|
10
|
+
*/ function bigintMulCeil(value, scalar) {
|
|
11
|
+
const SCALE = 1_000_000_000_000n; // 1e12
|
|
12
|
+
const scaledScalar = BigInt(Math.round(scalar * 1e12));
|
|
13
|
+
return (value * scaledScalar + SCALE - 1n) / SCALE;
|
|
14
|
+
}
|
|
6
15
|
_computedKey = inspect.custom;
|
|
7
16
|
/** Gas prices for each dimension. */ export class GasFees {
|
|
8
17
|
feePerDaGas;
|
|
@@ -40,7 +49,7 @@ _computedKey = inspect.custom;
|
|
|
40
49
|
const s = BigInt(scalar);
|
|
41
50
|
return new GasFees(this.feePerDaGas * s, this.feePerL2Gas * s);
|
|
42
51
|
} else {
|
|
43
|
-
return new GasFees(
|
|
52
|
+
return new GasFees(bigintMulCeil(this.feePerDaGas, scalar), bigintMulCeil(this.feePerL2Gas, scalar));
|
|
44
53
|
}
|
|
45
54
|
}
|
|
46
55
|
static from(fields) {
|
package/dest/gas/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
export * from './fee_math.js';
|
|
1
2
|
export * from './gas.js';
|
|
2
3
|
export * from './gas_fees.js';
|
|
3
4
|
export * from './gas_settings.js';
|
|
4
5
|
export * from './gas_used.js';
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nYXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLGVBQWUsQ0FBQyJ9
|
package/dest/gas/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/gas/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/gas/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC"}
|
package/dest/gas/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
2
|
-
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
2
|
+
import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
/**
|
|
@@ -64,7 +64,7 @@ export interface ValidatorHASignerConfig extends BaseSignerConfig {
|
|
|
64
64
|
* PostgreSQL connection string
|
|
65
65
|
* Format: postgresql://user:password@host:port/database
|
|
66
66
|
*/
|
|
67
|
-
databaseUrl?: string
|
|
67
|
+
databaseUrl?: SecretValue<string>;
|
|
68
68
|
/** Maximum number of clients in the pool (default: 10) */
|
|
69
69
|
poolMaxCount?: number;
|
|
70
70
|
/** Minimum number of clients in the pool (default: 0) */
|
|
@@ -97,7 +97,7 @@ export declare const ValidatorHASignerConfigSchema: z.ZodObject<{
|
|
|
97
97
|
cleanupOldDutiesAfterHours: z.ZodOptional<z.ZodNumber>;
|
|
98
98
|
} & {
|
|
99
99
|
haSigningEnabled: z.ZodBoolean;
|
|
100
|
-
databaseUrl: z.ZodOptional<z.
|
|
100
|
+
databaseUrl: z.ZodOptional<z.ZodType<SecretValue<string>, any, any>>;
|
|
101
101
|
poolMaxCount: z.ZodOptional<z.ZodNumber>;
|
|
102
102
|
poolMinCount: z.ZodOptional<z.ZodNumber>;
|
|
103
103
|
poolIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
@@ -112,7 +112,7 @@ export declare const ValidatorHASignerConfigSchema: z.ZodObject<{
|
|
|
112
112
|
maxStuckDutiesAgeMs?: number | undefined;
|
|
113
113
|
cleanupOldDutiesAfterHours?: number | undefined;
|
|
114
114
|
haSigningEnabled: boolean;
|
|
115
|
-
databaseUrl?: string | undefined;
|
|
115
|
+
databaseUrl?: SecretValue<string> | undefined;
|
|
116
116
|
poolMaxCount?: number | undefined;
|
|
117
117
|
poolMinCount?: number | undefined;
|
|
118
118
|
poolIdleTimeoutMs?: number | undefined;
|
|
@@ -127,10 +127,10 @@ export declare const ValidatorHASignerConfigSchema: z.ZodObject<{
|
|
|
127
127
|
maxStuckDutiesAgeMs?: number | undefined;
|
|
128
128
|
cleanupOldDutiesAfterHours?: number | undefined;
|
|
129
129
|
haSigningEnabled: boolean;
|
|
130
|
-
databaseUrl?:
|
|
130
|
+
databaseUrl?: any;
|
|
131
131
|
poolMaxCount?: number | undefined;
|
|
132
132
|
poolMinCount?: number | undefined;
|
|
133
133
|
poolIdleTimeoutMs?: number | undefined;
|
|
134
134
|
poolConnectionTimeoutMs?: number | undefined;
|
|
135
135
|
}>;
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGEtc2lnbmluZy9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNqRixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFDdkIsV0FBVyxFQU9aLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEI7O0dBRUc7QUFDSCxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLHNEQUFzRDtJQUN0RCxXQUFXLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQ3hELHNDQUFzQztJQUN0QyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2Ysc0VBQXNFO0lBQ3RFLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixvRUFBb0U7SUFDcEUsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLGtHQUFrRztJQUNsRyxtQkFBbUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUM3QixnRkFBZ0Y7SUFDaEYsMEJBQTBCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDckM7QUFFRCxlQUFPLE1BQU0sd0JBQXdCLEVBQUUsa0JBQWtCLENBQUMsZ0JBQWdCLENBbUN6RSxDQUFDO0FBRUYsZUFBTyxNQUFNLHNCQUFzQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQU9FLENBQUM7QUFFdEM7Ozs7R0FJRztBQUNILE1BQU0sV0FBVyx1QkFBd0IsU0FBUSxnQkFBZ0I7SUFDL0QsMERBQTBEO0lBQzFELGdCQUFnQixFQUFFLE9BQU8sQ0FBQztJQUMxQjs7O09BR0c7SUFDSCxXQUFXLENBQUMsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDbEMsMERBQTBEO0lBQzFELFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0Qix5REFBeUQ7SUFDekQsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLG9EQUFvRDtJQUNwRCxpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUMzQixrRUFBa0U7SUFDbEUsdUJBQXVCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7QUFFRCxlQUFPLE1BQU0sK0JBQStCLEVBQUUsa0JBQWtCLENBQUMsdUJBQXVCLENBaUN2RixDQUFDO0FBRUYsZUFBTyxNQUFNLDhCQUE4QixFQUFFLHVCQUU1QyxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFnQixnQkFBZ0IsSUFBSSx1QkFBdUIsQ0FFMUQ7QUFFRCxlQUFPLE1BQU0sNkJBQTZCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQU9FLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/ha-signing/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EACL,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/ha-signing/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EACL,KAAK,kBAAkB,EACvB,WAAW,EAOZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,sDAAsD;IACtD,WAAW,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IACxD,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oEAAoE;IACpE,gBAAgB,EAAE,MAAM,CAAC;IACzB,kGAAkG;IAClG,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,gFAAgF;IAChF,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAmCzE,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOE,CAAC;AAEtC;;;;GAIG;AACH,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC/D,0DAA0D;IAC1D,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kEAAkE;IAClE,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,eAAO,MAAM,+BAA+B,EAAE,kBAAkB,CAAC,uBAAuB,CAiCvF,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,uBAE5C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,uBAAuB,CAE1D;AAED,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
|
|
1
|
+
import { SecretValue, booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper, secretStringConfigHelper } from '@aztec/foundation/config';
|
|
2
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import { z } from 'zod';
|
|
4
4
|
export const baseSignerConfigMappings = {
|
|
@@ -56,7 +56,8 @@ export const validatorHASignerConfigMappings = {
|
|
|
56
56
|
},
|
|
57
57
|
databaseUrl: {
|
|
58
58
|
env: 'VALIDATOR_HA_DATABASE_URL',
|
|
59
|
-
description: 'PostgreSQL connection string for validator HA signer (format: postgresql://user:password@host:port/database)'
|
|
59
|
+
description: 'PostgreSQL connection string for validator HA signer (format: postgresql://user:password@host:port/database)',
|
|
60
|
+
...secretStringConfigHelper()
|
|
60
61
|
},
|
|
61
62
|
poolMaxCount: {
|
|
62
63
|
env: 'VALIDATOR_HA_POOL_MAX',
|
|
@@ -89,7 +90,7 @@ export const defaultValidatorHASignerConfig = getDefaultConfig(validatorHASigner
|
|
|
89
90
|
}
|
|
90
91
|
export const ValidatorHASignerConfigSchema = BaseSignerConfigSchema.extend({
|
|
91
92
|
haSigningEnabled: z.boolean(),
|
|
92
|
-
databaseUrl: z.string().optional(),
|
|
93
|
+
databaseUrl: SecretValue.schema(z.string()).optional(),
|
|
93
94
|
poolMaxCount: z.number().min(0).optional(),
|
|
94
95
|
poolMinCount: z.number().min(0).optional(),
|
|
95
96
|
poolIdleTimeoutMs: z.number().min(0).optional(),
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { type BaseSignerConfig, BaseSignerConfigSchema, baseSignerConfigMappings, type ValidatorHASignerConfig, ValidatorHASignerConfigSchema, defaultValidatorHASignerConfig, getConfigEnvVars, validatorHASignerConfigMappings, } from './config.js';
|
|
2
2
|
export { type LocalSignerConfig, LocalSignerConfigSchema, getLocalSignerConfigEnvVars, localSignerConfigMappings, } from './local_config.js';
|
|
3
|
-
export { DutyType, type BlockProposalSigningContext, type
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
export { DutyType, type AttestationSigningContext, type BlockProposalSigningContext, type CheckpointProposalSigningContext, type HAProtectedSigningContext, type NoHAProtectionSigningContext, type SigningContext, type VoteSigningContext, getBlockNumberFromSigningContext, getCheckpointNumberFromSigningContext, isHAProtectedContext, } from './types.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYS1zaWduaW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUNyQixzQkFBc0IsRUFDdEIsd0JBQXdCLEVBQ3hCLEtBQUssdUJBQXVCLEVBQzVCLDZCQUE2QixFQUM3Qiw4QkFBOEIsRUFDOUIsZ0JBQWdCLEVBQ2hCLCtCQUErQixHQUNoQyxNQUFNLGFBQWEsQ0FBQztBQUNyQixPQUFPLEVBQ0wsS0FBSyxpQkFBaUIsRUFDdEIsdUJBQXVCLEVBQ3ZCLDJCQUEyQixFQUMzQix5QkFBeUIsR0FDMUIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQ0wsUUFBUSxFQUNSLEtBQUsseUJBQXlCLEVBQzlCLEtBQUssMkJBQTJCLEVBQ2hDLEtBQUssZ0NBQWdDLEVBQ3JDLEtBQUsseUJBQXlCLEVBQzlCLEtBQUssNEJBQTRCLEVBQ2pDLEtBQUssY0FBYyxFQUNuQixLQUFLLGtCQUFrQixFQUN2QixnQ0FBZ0MsRUFDaEMscUNBQXFDLEVBQ3JDLG9CQUFvQixHQUNyQixNQUFNLFlBQVksQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ha-signing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,uBAAuB,EAC5B,6BAA6B,EAC7B,8BAA8B,EAC9B,gBAAgB,EAChB,+BAA+B,GAChC,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,iBAAiB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,QAAQ,EACR,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAC9B,KAAK,4BAA4B,EACjC,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ha-signing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,uBAAuB,EAC5B,6BAA6B,EAC7B,8BAA8B,EAC9B,gBAAgB,EAChB,+BAA+B,GAChC,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,iBAAiB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,QAAQ,EACR,KAAK,yBAAyB,EAC9B,KAAK,2BAA2B,EAChC,KAAK,gCAAgC,EACrC,KAAK,yBAAyB,EAC9B,KAAK,4BAA4B,EACjC,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,gCAAgC,EAChC,qCAAqC,EACrC,oBAAoB,GACrB,MAAM,YAAY,CAAC"}
|
package/dest/ha-signing/index.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { BaseSignerConfigSchema, baseSignerConfigMappings, ValidatorHASignerConfigSchema, defaultValidatorHASignerConfig, getConfigEnvVars, validatorHASignerConfigMappings } from './config.js';
|
|
2
2
|
export { LocalSignerConfigSchema, getLocalSignerConfigEnvVars, localSignerConfigMappings } from './local_config.js';
|
|
3
|
-
export { DutyType, getBlockNumberFromSigningContext, isHAProtectedContext } from './types.js';
|
|
3
|
+
export { DutyType, getBlockNumberFromSigningContext, getCheckpointNumberFromSigningContext, isHAProtectedContext } from './types.js';
|
|
@@ -9,7 +9,7 @@ export const localSignerConfigMappings = {
|
|
|
9
9
|
signingProtectionMapSizeKb: {
|
|
10
10
|
env: 'SIGNING_PROTECTION_MAP_SIZE_KB',
|
|
11
11
|
description: 'Maximum size of the local signing-protection LMDB store in KB. Overwrites the general dataStoreMapSizeKb.',
|
|
12
|
-
parseEnv: (val)
|
|
12
|
+
parseEnv: (val)=>+val
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
15
|
export const LocalSignerConfigSchema = zodFor()(BaseSignerConfigSchema.extend({
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BlockNumber,
|
|
1
|
+
import { BlockNumber, CheckpointNumber, type IndexWithinCheckpoint, type SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
/**
|
|
3
3
|
* Type of validator duty being performed
|
|
4
4
|
*/
|
|
@@ -12,38 +12,38 @@ export declare enum DutyType {
|
|
|
12
12
|
AUTH_REQUEST = "AUTH_REQUEST",
|
|
13
13
|
TXS = "TXS"
|
|
14
14
|
}
|
|
15
|
-
/**
|
|
16
|
-
* Base context for signing operations
|
|
17
|
-
*/
|
|
18
|
-
interface BaseSigningContext {
|
|
19
|
-
/** Slot number for this duty */
|
|
20
|
-
slot: SlotNumber;
|
|
21
|
-
/**
|
|
22
|
-
* Block or checkpoint number for this duty.
|
|
23
|
-
* For block proposals, this is the block number.
|
|
24
|
-
* For checkpoint proposals, this is the checkpoint number.
|
|
25
|
-
*/
|
|
26
|
-
blockNumber: BlockNumber | CheckpointNumber;
|
|
27
|
-
}
|
|
28
15
|
/**
|
|
29
16
|
* Signing context for block proposals.
|
|
30
|
-
*
|
|
17
|
+
* Includes both the block number and the checkpoint number the block belongs to.
|
|
31
18
|
*/
|
|
32
|
-
export interface BlockProposalSigningContext
|
|
19
|
+
export interface BlockProposalSigningContext {
|
|
20
|
+
slot: SlotNumber;
|
|
21
|
+
blockNumber: BlockNumber;
|
|
22
|
+
checkpointNumber: CheckpointNumber;
|
|
33
23
|
/** Block index within checkpoint (0, 1, 2...). Required for block proposals. */
|
|
34
24
|
blockIndexWithinCheckpoint: IndexWithinCheckpoint;
|
|
35
25
|
dutyType: DutyType.BLOCK_PROPOSAL;
|
|
36
26
|
}
|
|
37
27
|
/**
|
|
38
|
-
* Signing context for
|
|
39
|
-
*
|
|
28
|
+
* Signing context for checkpoint proposals.
|
|
29
|
+
* Includes the checkpoint number being proposed, but not a block number.
|
|
30
|
+
*/
|
|
31
|
+
export interface CheckpointProposalSigningContext {
|
|
32
|
+
slot: SlotNumber;
|
|
33
|
+
checkpointNumber: CheckpointNumber;
|
|
34
|
+
dutyType: DutyType.CHECKPOINT_PROPOSAL;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Signing context for attestation duties (checkpoint attestations).
|
|
38
|
+
* Includes the checkpoint number when available (from proposal validation).
|
|
40
39
|
*/
|
|
41
|
-
export interface
|
|
42
|
-
|
|
40
|
+
export interface AttestationSigningContext {
|
|
41
|
+
slot: SlotNumber;
|
|
42
|
+
checkpointNumber: CheckpointNumber;
|
|
43
|
+
dutyType: DutyType.ATTESTATION | DutyType.ATTESTATIONS_AND_SIGNERS;
|
|
43
44
|
}
|
|
44
45
|
/**
|
|
45
46
|
* Signing context for governance/slashing votes which only need slot for HA protection.
|
|
46
|
-
* blockNumber is not applicable (internally always 0).
|
|
47
47
|
*/
|
|
48
48
|
export interface VoteSigningContext {
|
|
49
49
|
slot: SlotNumber;
|
|
@@ -57,17 +57,18 @@ export interface NoHAProtectionSigningContext {
|
|
|
57
57
|
dutyType: DutyType.AUTH_REQUEST | DutyType.TXS;
|
|
58
58
|
}
|
|
59
59
|
/**
|
|
60
|
-
* Signing contexts that require HA protection (excludes AUTH_REQUEST).
|
|
60
|
+
* Signing contexts that require HA protection (excludes AUTH_REQUEST and TXS).
|
|
61
61
|
* Used by the HA signer's signWithProtection method.
|
|
62
62
|
*/
|
|
63
|
-
export type HAProtectedSigningContext = BlockProposalSigningContext |
|
|
63
|
+
export type HAProtectedSigningContext = BlockProposalSigningContext | CheckpointProposalSigningContext | AttestationSigningContext | VoteSigningContext;
|
|
64
64
|
/**
|
|
65
65
|
* Context required for slashing protection during signing operations.
|
|
66
66
|
* Uses discriminated union to enforce type safety:
|
|
67
|
-
* - BLOCK_PROPOSAL duties
|
|
68
|
-
* -
|
|
69
|
-
* -
|
|
70
|
-
* -
|
|
67
|
+
* - BLOCK_PROPOSAL duties have blockNumber, checkpointNumber, and blockIndexWithinCheckpoint
|
|
68
|
+
* - CHECKPOINT_PROPOSAL duties have checkpointNumber
|
|
69
|
+
* - ATTESTATION/ATTESTATIONS_AND_SIGNERS duties have only slot
|
|
70
|
+
* - Vote duties have only slot
|
|
71
|
+
* - AUTH_REQUEST and TXS duties don't need HA protection
|
|
71
72
|
*/
|
|
72
73
|
export type SigningContext = HAProtectedSigningContext | NoHAProtectionSigningContext;
|
|
73
74
|
/**
|
|
@@ -77,9 +78,13 @@ export type SigningContext = HAProtectedSigningContext | NoHAProtectionSigningCo
|
|
|
77
78
|
export declare function isHAProtectedContext(context: SigningContext): context is HAProtectedSigningContext;
|
|
78
79
|
/**
|
|
79
80
|
* Gets the block number from a signing context.
|
|
80
|
-
*
|
|
81
|
-
|
|
81
|
+
* Only BLOCK_PROPOSAL duties carry a block number; all others return BlockNumber(0).
|
|
82
|
+
*/
|
|
83
|
+
export declare function getBlockNumberFromSigningContext(context: HAProtectedSigningContext): BlockNumber;
|
|
84
|
+
/**
|
|
85
|
+
* Gets the checkpoint number from a signing context.
|
|
86
|
+
* BLOCK_PROPOSAL, CHECKPOINT_PROPOSAL, ATTESTATION, and ATTESTATIONS_AND_SIGNERS duties carry a checkpoint number;
|
|
87
|
+
* vote duties return CheckpointNumber(0).
|
|
82
88
|
*/
|
|
83
|
-
export declare function
|
|
84
|
-
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYS1zaWduaW5nL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxXQUFXLEVBQ1gsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyxVQUFVLEVBQ2hCLE1BQU0saUNBQWlDLENBQUM7QUFFekM7O0dBRUc7QUFDSCxvQkFBWSxRQUFRO0lBQ2xCLGNBQWMsbUJBQW1CO0lBQ2pDLG1CQUFtQix3QkFBd0I7SUFDM0MsV0FBVyxnQkFBZ0I7SUFDM0Isd0JBQXdCLDZCQUE2QjtJQUNyRCxlQUFlLG9CQUFvQjtJQUNuQyxhQUFhLGtCQUFrQjtJQUMvQixZQUFZLGlCQUFpQjtJQUM3QixHQUFHLFFBQVE7Q0FDWjtBQUVEOztHQUVHO0FBQ0gsVUFBVSxrQkFBa0I7SUFDMUIsZ0NBQWdDO0lBQ2hDLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakI7Ozs7T0FJRztJQUNILFdBQVcsRUFBRSxXQUFXLEdBQUcsZ0JBQWdCLENBQUM7Q0FDN0M7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFdBQVcsMkJBQTRCLFNBQVEsa0JBQWtCO0lBQ3JFLGdGQUFnRjtJQUNoRiwwQkFBMEIsRUFBRSxxQkFBcUIsQ0FBQztJQUNsRCxRQUFRLEVBQUUsUUFBUSxDQUFDLGNBQWMsQ0FBQztDQUNuQztBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyxtQkFBb0IsU0FBUSxrQkFBa0I7SUFDN0QsUUFBUSxFQUFFLFFBQVEsQ0FBQyxtQkFBbUIsR0FBRyxRQUFRLENBQUMsV0FBVyxHQUFHLFFBQVEsQ0FBQyx3QkFBd0IsQ0FBQztDQUNuRztBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakMsSUFBSSxFQUFFLFVBQVUsQ0FBQztJQUNqQixRQUFRLEVBQUUsUUFBUSxDQUFDLGVBQWUsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDO0NBQzdEO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxXQUFXLDRCQUE0QjtJQUMzQyxRQUFRLEVBQUUsUUFBUSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO0NBQ2hEO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLHlCQUF5QixHQUFHLDJCQUEyQixHQUFHLG1CQUFtQixHQUFHLGtCQUFrQixDQUFDO0FBRS9HOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLE1BQU0sY0FBYyxHQUFHLHlCQUF5QixHQUFHLDRCQUE0QixDQUFDO0FBRXRGOzs7R0FHRztBQUNILHdCQUFnQixvQkFBb0IsQ0FBQyxPQUFPLEVBQUUsY0FBYyxHQUFHLE9BQU8sSUFBSSx5QkFBeUIsQ0FFbEc7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGdDQUFnQyxDQUFDLE9BQU8sRUFBRSx5QkFBeUIsR0FBRyxXQUFXLEdBQUcsZ0JBQWdCLENBWW5IIn0=
|
|
89
|
+
export declare function getCheckpointNumberFromSigningContext(context: HAProtectedSigningContext): CheckpointNumber;
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYS1zaWduaW5nL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxXQUFXLEVBQ1gsZ0JBQWdCLEVBQ2hCLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssVUFBVSxFQUNoQixNQUFNLGlDQUFpQyxDQUFDO0FBRXpDOztHQUVHO0FBQ0gsb0JBQVksUUFBUTtJQUNsQixjQUFjLG1CQUFtQjtJQUNqQyxtQkFBbUIsd0JBQXdCO0lBQzNDLFdBQVcsZ0JBQWdCO0lBQzNCLHdCQUF3Qiw2QkFBNkI7SUFDckQsZUFBZSxvQkFBb0I7SUFDbkMsYUFBYSxrQkFBa0I7SUFDL0IsWUFBWSxpQkFBaUI7SUFDN0IsR0FBRyxRQUFRO0NBQ1o7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFdBQVcsMkJBQTJCO0lBQzFDLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakIsV0FBVyxFQUFFLFdBQVcsQ0FBQztJQUN6QixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQztJQUNuQyxnRkFBZ0Y7SUFDaEYsMEJBQTBCLEVBQUUscUJBQXFCLENBQUM7SUFDbEQsUUFBUSxFQUFFLFFBQVEsQ0FBQyxjQUFjLENBQUM7Q0FDbkM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFdBQVcsZ0NBQWdDO0lBQy9DLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakIsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7SUFDbkMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQztDQUN4QztBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyx5QkFBeUI7SUFDeEMsSUFBSSxFQUFFLFVBQVUsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQztJQUNuQyxRQUFRLEVBQUUsUUFBUSxDQUFDLFdBQVcsR0FBRyxRQUFRLENBQUMsd0JBQXdCLENBQUM7Q0FDcEU7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakMsSUFBSSxFQUFFLFVBQVUsQ0FBQztJQUNqQixRQUFRLEVBQUUsUUFBUSxDQUFDLGVBQWUsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDO0NBQzdEO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxXQUFXLDRCQUE0QjtJQUMzQyxRQUFRLEVBQUUsUUFBUSxDQUFDLFlBQVksR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDO0NBQ2hEO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLHlCQUF5QixHQUNqQywyQkFBMkIsR0FDM0IsZ0NBQWdDLEdBQ2hDLHlCQUF5QixHQUN6QixrQkFBa0IsQ0FBQztBQUV2Qjs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sTUFBTSxjQUFjLEdBQUcseUJBQXlCLEdBQUcsNEJBQTRCLENBQUM7QUFFdEY7OztHQUdHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLE9BQU8sRUFBRSxjQUFjLEdBQUcsT0FBTyxJQUFJLHlCQUF5QixDQUVsRztBQUVEOzs7R0FHRztBQUNILHdCQUFnQixnQ0FBZ0MsQ0FBQyxPQUFPLEVBQUUseUJBQXlCLEdBQUcsV0FBVyxDQUtoRztBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0IscUNBQXFDLENBQUMsT0FBTyxFQUFFLHlCQUF5QixHQUFHLGdCQUFnQixDQVUxRyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/ha-signing/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/ha-signing/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,oBAAY,QAAQ;IAClB,cAAc,mBAAmB;IACjC,mBAAmB,wBAAwB;IAC3C,WAAW,gBAAgB;IAC3B,wBAAwB,6BAA6B;IACrD,eAAe,oBAAoB;IACnC,aAAa,kBAAkB;IAC/B,YAAY,iBAAiB;IAC7B,GAAG,QAAQ;CACZ;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gFAAgF;IAChF,0BAA0B,EAAE,qBAAqB,CAAC;IAClD,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC;CACnC;AAED;;;GAGG;AACH,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,QAAQ,CAAC,mBAAmB,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC,wBAAwB,CAAC;CACpE;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC;CAC7D;AAED;;;GAGG;AACH,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,QAAQ,CAAC,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GACjC,2BAA2B,GAC3B,gCAAgC,GAChC,yBAAyB,GACzB,kBAAkB,CAAC;AAEvB;;;;;;;;GAQG;AACH,MAAM,MAAM,cAAc,GAAG,yBAAyB,GAAG,4BAA4B,CAAC;AAEtF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,IAAI,yBAAyB,CAElG;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,yBAAyB,GAAG,WAAW,CAKhG;AAED;;;;GAIG;AACH,wBAAgB,qCAAqC,CAAC,OAAO,EAAE,yBAAyB,GAAG,gBAAgB,CAU1G"}
|
package/dest/ha-signing/types.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
1
|
+
import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
/**
|
|
3
3
|
* Type of validator duty being performed
|
|
4
4
|
*/ export var DutyType = /*#__PURE__*/ function(DutyType) {
|
|
@@ -20,13 +20,20 @@ import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
22
22
|
* Gets the block number from a signing context.
|
|
23
|
-
*
|
|
24
|
-
* - Other duties: returns the blockNumber from the context
|
|
23
|
+
* Only BLOCK_PROPOSAL duties carry a block number; all others return BlockNumber(0).
|
|
25
24
|
*/ export function getBlockNumberFromSigningContext(context) {
|
|
26
|
-
|
|
27
|
-
if (context.dutyType === "BLOCK_PROPOSAL" || context.dutyType === "CHECKPOINT_PROPOSAL" || context.dutyType === "ATTESTATION" || context.dutyType === "ATTESTATIONS_AND_SIGNERS") {
|
|
25
|
+
if (context.dutyType === "BLOCK_PROPOSAL") {
|
|
28
26
|
return context.blockNumber;
|
|
29
27
|
}
|
|
30
|
-
// Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE) don't have blockNumber
|
|
31
28
|
return BlockNumber(0);
|
|
32
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* Gets the checkpoint number from a signing context.
|
|
32
|
+
* BLOCK_PROPOSAL, CHECKPOINT_PROPOSAL, ATTESTATION, and ATTESTATIONS_AND_SIGNERS duties carry a checkpoint number;
|
|
33
|
+
* vote duties return CheckpointNumber(0).
|
|
34
|
+
*/ export function getCheckpointNumberFromSigningContext(context) {
|
|
35
|
+
if (context.dutyType === "BLOCK_PROPOSAL" || context.dutyType === "CHECKPOINT_PROPOSAL" || context.dutyType === "ATTESTATION" || context.dutyType === "ATTESTATIONS_AND_SIGNERS") {
|
|
36
|
+
return context.checkpointNumber;
|
|
37
|
+
}
|
|
38
|
+
return CheckpointNumber(0);
|
|
39
|
+
}
|
package/dest/hash/hash.d.ts
CHANGED
|
@@ -2,6 +2,12 @@ import { DomainSeparator } from '@aztec/constants';
|
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { AztecAddress } from '../aztec-address/index.js';
|
|
5
|
+
/** Computes a Poseidon2 merkle tree internal node hash for append-only trees (note-hash, L1->L2, archive). */
|
|
6
|
+
export declare function computeMerkleHash(left: Fr, right: Fr): Promise<Fr>;
|
|
7
|
+
/** Merkle-node hasher for the nullifier tree's sibling paths. */
|
|
8
|
+
export declare function computeNullifierMerkleHash(left: Fr, right: Fr): Promise<Fr>;
|
|
9
|
+
/** Merkle-node hasher for the public-data tree's sibling paths. */
|
|
10
|
+
export declare function computePublicDataMerkleHash(left: Fr, right: Fr): Promise<Fr>;
|
|
5
11
|
/**
|
|
6
12
|
* Computes a hash of a given verification key.
|
|
7
13
|
* @param keyAsFields - The verification key as fields.
|
|
@@ -63,6 +69,15 @@ export declare function computeSiloedPublicInitializationNullifier(contract: Azt
|
|
|
63
69
|
export declare function computeProtocolNullifier(txRequestHash: Fr): Promise<Fr>;
|
|
64
70
|
/** Domain-separates a raw log tag with the given domain separator. */
|
|
65
71
|
export declare function computeLogTag(rawTag: number | bigint | boolean | Fr | Buffer, domSep: DomainSeparator): Promise<Fr>;
|
|
72
|
+
/**
|
|
73
|
+
* Computes the commitment of a private event from its preimage.
|
|
74
|
+
* @param randomness - Random value emitted alongside the event to prevent preimage brute-forcing.
|
|
75
|
+
* @param eventSelector - Event selector as an Fr.
|
|
76
|
+
* @param content - Serialized event content.
|
|
77
|
+
*
|
|
78
|
+
* @dev Must match the implementation in aztec-nr/aztec/src/event/event_interface.nr > compute_private_serialized_event_commitment
|
|
79
|
+
*/
|
|
80
|
+
export declare function computePrivateEventCommitment(randomness: Fr, eventSelector: Fr, content: Fr[]): Promise<Fr>;
|
|
66
81
|
export declare function computeSiloedPrivateLogFirstField(contract: AztecAddress, field: Fr): Promise<Fr>;
|
|
67
82
|
/**
|
|
68
83
|
* Computes a public data tree value ready for insertion.
|
|
@@ -111,4 +126,4 @@ export declare function computeL2ToL1MessageHash({ l2Sender, l1Recipient, conten
|
|
|
111
126
|
rollupVersion: Fr;
|
|
112
127
|
chainId: Fr;
|
|
113
128
|
}): Fr;
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hhc2gvaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFvQyxNQUFNLGtCQUFrQixDQUFDO0FBR3JGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFekQsOEdBQThHO0FBQzlHLHdCQUFnQixpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVsRTtBQUVELGlFQUFpRTtBQUNqRSx3QkFBZ0IsMEJBQTBCLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFM0U7QUFFRCxtRUFBbUU7QUFDbkUsd0JBQWdCLDJCQUEyQixDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRTVFO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixNQUFNLENBQUMsV0FBVyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FHM0Q7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFnQixvQkFBb0IsQ0FBQyxhQUFhLEVBQUUsRUFBRSxFQUFFLGFBQWEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUUxRjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFnQixZQUFZLENBQUMsUUFBUSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FFOUU7QUFFRDs7Ozs7R0FL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
|
package/dest/hash/hash.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/hash/hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAoC,MAAM,kBAAkB,CAAC;AAGrF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAG3D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAE1F;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEpF;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAErF;AAED;;;;;GAKG;AACH,wBAAsB,2CAA2C,CAC/D,QAAQ,EAAE,YAAY,EACtB,kBAAkB,EAAE,EAAE,GACrB,OAAO,CAAC,EAAE,CAAC,CAMb;AAED;;;;;;GAMG;AACH,wBAAsB,0CAA0C,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEvE;AAED,sEAAsE;AACtE,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,EAAE,CAAC,CAEnH;AAED,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhG;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzG;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAM1D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE/D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzD;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,eAMtG;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,WAAW,EACX,OAAO,EACP,aAAa,EACb,OAAO,EACR,EAAE;IACD,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,EAAE,CAAC;IACZ,aAAa,EAAE,EAAE,CAAC;IAClB,OAAO,EAAE,EAAE,CAAC;CACb,MAEA"}
|
|
1
|
+
{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/hash/hash.ts"],"names":[],"mappings":"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"}
|
package/dest/hash/hash.js
CHANGED
|
@@ -3,6 +3,24 @@ import { poseidon2Hash, poseidon2HashWithSeparator } from '@aztec/foundation/cry
|
|
|
3
3
|
import { sha256ToField } from '@aztec/foundation/crypto/sha256';
|
|
4
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
5
|
import { AztecAddress } from '../aztec-address/index.js';
|
|
6
|
+
/** Computes a Poseidon2 merkle tree internal node hash for append-only trees (note-hash, L1->L2, archive). */ export function computeMerkleHash(left, right) {
|
|
7
|
+
return poseidon2HashWithSeparator([
|
|
8
|
+
left,
|
|
9
|
+
right
|
|
10
|
+
], DomainSeparator.MERKLE_HASH);
|
|
11
|
+
}
|
|
12
|
+
/** Merkle-node hasher for the nullifier tree's sibling paths. */ export function computeNullifierMerkleHash(left, right) {
|
|
13
|
+
return poseidon2HashWithSeparator([
|
|
14
|
+
left,
|
|
15
|
+
right
|
|
16
|
+
], DomainSeparator.NULLIFIER_MERKLE);
|
|
17
|
+
}
|
|
18
|
+
/** Merkle-node hasher for the public-data tree's sibling paths. */ export function computePublicDataMerkleHash(left, right) {
|
|
19
|
+
return poseidon2HashWithSeparator([
|
|
20
|
+
left,
|
|
21
|
+
right
|
|
22
|
+
], DomainSeparator.PUBLIC_DATA_MERKLE);
|
|
23
|
+
}
|
|
6
24
|
/**
|
|
7
25
|
* Computes a hash of a given verification key.
|
|
8
26
|
* @param keyAsFields - The verification key as fields.
|
|
@@ -95,6 +113,20 @@ import { AztecAddress } from '../aztec-address/index.js';
|
|
|
95
113
|
new Fr(rawTag)
|
|
96
114
|
], domSep);
|
|
97
115
|
}
|
|
116
|
+
/**
|
|
117
|
+
* Computes the commitment of a private event from its preimage.
|
|
118
|
+
* @param randomness - Random value emitted alongside the event to prevent preimage brute-forcing.
|
|
119
|
+
* @param eventSelector - Event selector as an Fr.
|
|
120
|
+
* @param content - Serialized event content.
|
|
121
|
+
*
|
|
122
|
+
* @dev Must match the implementation in aztec-nr/aztec/src/event/event_interface.nr > compute_private_serialized_event_commitment
|
|
123
|
+
*/ export function computePrivateEventCommitment(randomness, eventSelector, content) {
|
|
124
|
+
return poseidon2HashWithSeparator([
|
|
125
|
+
randomness,
|
|
126
|
+
eventSelector,
|
|
127
|
+
...content
|
|
128
|
+
], DomainSeparator.EVENT_COMMITMENT);
|
|
129
|
+
}
|
|
98
130
|
export function computeSiloedPrivateLogFirstField(contract, field) {
|
|
99
131
|
return poseidon2HashWithSeparator([
|
|
100
132
|
contract,
|