@aztec/pxe 0.0.1-commit.e61ad554 → 0.0.1-commit.ec5f612
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/access_scopes.d.ts +9 -0
- package/dest/access_scopes.d.ts.map +1 -0
- package/dest/access_scopes.js +6 -0
- package/dest/block_synchronizer/block_synchronizer.d.ts +5 -3
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +11 -5
- package/dest/config/package_info.js +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +54 -30
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +174 -70
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +5 -5
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +3 -3
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +2 -2
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.js +1 -1
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +10 -10
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.d.ts +5 -5
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +38 -26
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +36 -36
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +74 -29
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +53 -29
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +84 -63
- package/dest/contract_logging.d.ts +22 -0
- package/dest/contract_logging.d.ts.map +1 -0
- package/dest/contract_logging.js +23 -0
- package/dest/contract_sync/contract_sync_service.d.ts +43 -0
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
- package/dest/contract_sync/contract_sync_service.js +97 -0
- package/dest/contract_sync/helpers.d.ts +29 -0
- package/dest/contract_sync/helpers.d.ts.map +1 -0
- package/dest/contract_sync/{index.js → helpers.js} +13 -12
- package/dest/debug/pxe_debug_utils.d.ts +24 -10
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/debug/pxe_debug_utils.js +28 -18
- package/dest/entrypoints/client/bundle/index.d.ts +4 -1
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +3 -0
- package/dest/entrypoints/client/bundle/utils.d.ts +1 -1
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +21 -7
- package/dest/entrypoints/client/lazy/index.d.ts +4 -1
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +3 -0
- package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +22 -8
- package/dest/entrypoints/pxe_creation_options.d.ts +3 -2
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/server/index.d.ts +4 -2
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +3 -1
- package/dest/entrypoints/server/utils.d.ts +1 -1
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +28 -9
- package/dest/events/event_service.d.ts +4 -5
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +5 -6
- package/dest/job_coordinator/job_coordinator.d.ts +3 -2
- package/dest/job_coordinator/job_coordinator.d.ts.map +1 -1
- package/dest/job_coordinator/job_coordinator.js +3 -2
- package/dest/logs/log_service.d.ts +7 -5
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +19 -29
- package/dest/notes/note_service.d.ts +7 -7
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +9 -9
- package/dest/notes_filter.d.ts +25 -0
- package/dest/notes_filter.d.ts.map +1 -0
- package/dest/notes_filter.js +4 -0
- package/dest/oracle_version.d.ts +3 -3
- package/dest/oracle_version.d.ts.map +1 -1
- package/dest/oracle_version.js +2 -2
- package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
- package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
- package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
- package/dest/private_kernel/hints/index.d.ts +1 -1
- package/dest/private_kernel/hints/index.js +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +129 -68
- package/dest/private_kernel/hints/test_utils.d.ts +122 -0
- package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
- package/dest/private_kernel/hints/test_utils.js +203 -0
- package/dest/private_kernel/private_kernel_execution_prover.d.ts +3 -2
- package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.js +21 -13
- package/dest/private_kernel/private_kernel_oracle.d.ts +8 -4
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_oracle.js +7 -3
- package/dest/pxe.d.ts +69 -23
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +98 -63
- package/dest/storage/address_store/address_store.d.ts +1 -1
- package/dest/storage/address_store/address_store.d.ts.map +1 -1
- package/dest/storage/address_store/address_store.js +12 -11
- package/dest/storage/anchor_block_store/anchor_block_store.d.ts +9 -1
- package/dest/storage/anchor_block_store/anchor_block_store.d.ts.map +1 -1
- package/dest/storage/anchor_block_store/anchor_block_store.js +8 -1
- package/dest/storage/capsule_store/capsule_store.js +6 -8
- package/dest/storage/contract_store/contract_store.d.ts +42 -15
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +157 -72
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +13 -3
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +147 -107
- package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
- package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
- package/dest/storage/private_event_store/private_event_store.js +84 -61
- package/dest/storage/private_event_store/stored_private_event.d.ts +4 -4
- package/dest/storage/private_event_store/stored_private_event.d.ts.map +1 -1
- package/dest/storage/private_event_store/stored_private_event.js +2 -2
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/recipient_tagging_store.js +31 -19
- package/dest/storage/tagging_store/sender_address_book_store.d.ts +1 -1
- package/dest/storage/tagging_store/sender_address_book_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_address_book_store.js +20 -14
- package/dest/storage/tagging_store/sender_tagging_store.d.ts +5 -5
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +184 -114
- package/dest/tagging/get_all_logs_by_tags.d.ts +4 -4
- package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
- package/dest/tagging/get_all_logs_by_tags.js +17 -3
- package/dest/tagging/index.d.ts +2 -2
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/index.js +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +5 -6
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +7 -7
- package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +2 -2
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +7 -8
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +5 -9
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +3 -6
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -8
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +14 -15
- package/package.json +25 -16
- package/src/access_scopes.ts +9 -0
- package/src/block_synchronizer/block_synchronizer.ts +23 -19
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +323 -128
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +5 -5
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +1 -1
- package/src/contract_function_simulator/oracle/interfaces.ts +12 -12
- package/src/contract_function_simulator/oracle/oracle.ts +41 -24
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +100 -110
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +139 -70
- package/src/contract_logging.ts +39 -0
- package/src/contract_sync/contract_sync_service.ts +152 -0
- package/src/contract_sync/{index.ts → helpers.ts} +21 -21
- package/src/debug/pxe_debug_utils.ts +63 -19
- package/src/entrypoints/client/bundle/index.ts +3 -0
- package/src/entrypoints/client/bundle/utils.ts +16 -15
- package/src/entrypoints/client/lazy/index.ts +3 -0
- package/src/entrypoints/client/lazy/utils.ts +17 -15
- package/src/entrypoints/pxe_creation_options.ts +2 -1
- package/src/entrypoints/server/index.ts +3 -1
- package/src/entrypoints/server/utils.ts +22 -26
- package/src/events/event_service.ts +4 -6
- package/src/job_coordinator/job_coordinator.ts +4 -3
- package/src/logs/log_service.ts +31 -38
- package/src/notes/note_service.ts +9 -10
- package/src/notes_filter.ts +26 -0
- package/src/oracle_version.ts +2 -2
- package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
- package/src/private_kernel/hints/index.ts +1 -1
- package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +164 -117
- package/src/private_kernel/hints/test_utils.ts +325 -0
- package/src/private_kernel/private_kernel_execution_prover.ts +25 -15
- package/src/private_kernel/private_kernel_oracle.ts +9 -9
- package/src/pxe.ts +191 -115
- package/src/storage/address_store/address_store.ts +15 -15
- package/src/storage/anchor_block_store/anchor_block_store.ts +8 -0
- package/src/storage/capsule_store/capsule_store.ts +8 -8
- package/src/storage/contract_store/contract_store.ts +186 -76
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +169 -132
- package/src/storage/private_event_store/private_event_store.ts +102 -81
- package/src/storage/private_event_store/stored_private_event.ts +3 -3
- package/src/storage/tagging_store/recipient_tagging_store.ts +38 -24
- package/src/storage/tagging_store/sender_address_book_store.ts +20 -14
- package/src/storage/tagging_store/sender_tagging_store.ts +214 -130
- package/src/tagging/get_all_logs_by_tags.ts +31 -7
- package/src/tagging/index.ts +1 -1
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +9 -12
- package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +12 -17
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +6 -11
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +14 -23
- package/dest/contract_sync/index.d.ts +0 -23
- package/dest/contract_sync/index.d.ts.map +0 -1
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type PrivateKernelCircuitPublicInputs, PrivateKernelResetCircuitPrivateInputs, type PrivateKernelSimulateOutput } from '@aztec/stdlib/kernel';
|
|
1
|
+
import { type PrivateKernelCircuitPublicInputs, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, type PrivateKernelSimulateOutput } from '@aztec/stdlib/kernel';
|
|
2
2
|
import { type PrivateCallExecutionResult } from '@aztec/stdlib/tx';
|
|
3
3
|
import type { PrivateKernelOracle } from '../private_kernel_oracle.js';
|
|
4
4
|
export declare class PrivateKernelResetPrivateInputsBuilder {
|
|
@@ -14,15 +14,16 @@ export declare class PrivateKernelResetPrivateInputsBuilder {
|
|
|
14
14
|
private transientDataSquashingHints;
|
|
15
15
|
private requestedDimensions;
|
|
16
16
|
constructor(previousKernelOutput: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>, executionStack: PrivateCallExecutionResult[], noteHashNullifierCounterMap: Map<number, number>, splitCounter: number);
|
|
17
|
+
getRequestedDimensions(): PrivateKernelResetDimensions;
|
|
17
18
|
needsReset(): boolean;
|
|
18
19
|
build(oracle: PrivateKernelOracle): Promise<PrivateKernelResetCircuitPrivateInputs>;
|
|
19
20
|
private reduceReadRequestActions;
|
|
20
21
|
private needsResetNoteHashReadRequests;
|
|
21
22
|
private needsResetNullifierReadRequests;
|
|
22
|
-
private
|
|
23
|
+
private needsResetKeyValidationRequests;
|
|
23
24
|
private needsResetTransientData;
|
|
24
25
|
private needsSiloNoteHashes;
|
|
25
26
|
private needsSiloNullifiers;
|
|
26
27
|
private needsSiloPrivateLogs;
|
|
27
28
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcmVzZXRfcHJpdmF0ZV9pbnB1dHNfYnVpbGRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL2hpbnRzL3ByaXZhdGVfa2VybmVsX3Jlc2V0X3ByaXZhdGVfaW5wdXRzX2J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZUEsT0FBTyxFQUtMLEtBQUssZ0NBQWdDLEVBRXJDLHNDQUFzQyxFQUN0Qyw0QkFBNEIsRUFFNUIsS0FBSywyQkFBMkIsRUFhakMsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsS0FBSywwQkFBMEIsRUFBaUIsTUFBTSxrQkFBa0IsQ0FBQztBQUdsRixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBbUN2RSxxQkFBYSxzQ0FBc0M7SUFlL0MsT0FBTyxDQUFDLG9CQUFvQjtJQUM1QixPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsMkJBQTJCO0lBQ25DLE9BQU8sQ0FBQyxZQUFZO0lBakJ0QixPQUFPLENBQUMsY0FBYyxDQUFtQztJQUV6RCxPQUFPLENBQUMsYUFBYSxDQUFDLENBQTZCO0lBRW5ELE9BQU8sQ0FBQyxvQkFBb0IsQ0FBcUU7SUFDakcsT0FBTyxDQUFDLHFCQUFxQixDQUFxRTtJQUNsRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBUztJQUNsQyxPQUFPLENBQUMsMkJBQTJCLENBR2pDO0lBQ0YsT0FBTyxDQUFDLG1CQUFtQixDQUF3QztJQUVuRSxZQUNVLG9CQUFvQixFQUFFLDJCQUEyQixDQUFDLGdDQUFnQyxDQUFDLEVBQ25GLGNBQWMsRUFBRSwwQkFBMEIsRUFBRSxFQUM1QywyQkFBMkIsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxFQUNoRCxZQUFZLEVBQUUsTUFBTSxFQUk3QjtJQUVELHNCQUFzQixJQUFJLDRCQUE0QixDQUVyRDtJQUVELFVBQVUsSUFBSSxPQUFPLENBc0JwQjtJQUVLLEtBQUssQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLG1EQThFdEM7SUFFRCxPQUFPLENBQUMsd0JBQXdCO0lBMkJoQyxPQUFPLENBQUMsOEJBQThCO0lBMEV0QyxPQUFPLENBQUMsK0JBQStCO0lBeUV2QyxPQUFPLENBQUMsK0JBQStCO0lBYXZDLE9BQU8sQ0FBQyx1QkFBdUI7SUEwRi9CLE9BQU8sQ0FBQyxtQkFBbUI7SUFpQjNCLE9BQU8sQ0FBQyxtQkFBbUI7SUFpQjNCLE9BQU8sQ0FBQyxvQkFBb0I7Q0FxQjdCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_kernel_reset_private_inputs_builder.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts"],"names":[],"mappings":"AAeA,OAAO,EAKL,KAAK,gCAAgC,EAErC,sCAAsC,
|
|
1
|
+
{"version":3,"file":"private_kernel_reset_private_inputs_builder.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts"],"names":[],"mappings":"AAeA,OAAO,EAKL,KAAK,gCAAgC,EAErC,sCAAsC,EACtC,4BAA4B,EAE5B,KAAK,2BAA2B,EAajC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,kBAAkB,CAAC;AAGlF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAmCvE,qBAAa,sCAAsC;IAe/C,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,YAAY;IAjBtB,OAAO,CAAC,cAAc,CAAmC;IAEzD,OAAO,CAAC,aAAa,CAAC,CAA6B;IAEnD,OAAO,CAAC,oBAAoB,CAAqE;IACjG,OAAO,CAAC,qBAAqB,CAAqE;IAClG,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,2BAA2B,CAGjC;IACF,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,YACU,oBAAoB,EAAE,2BAA2B,CAAC,gCAAgC,CAAC,EACnF,cAAc,EAAE,0BAA0B,EAAE,EAC5C,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,YAAY,EAAE,MAAM,EAI7B;IAED,sBAAsB,IAAI,4BAA4B,CAErD;IAED,UAAU,IAAI,OAAO,CAsBpB;IAEK,KAAK,CAAC,MAAM,EAAE,mBAAmB,mDA8EtC;IAED,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,8BAA8B;IA0EtC,OAAO,CAAC,+BAA+B;IAyEvC,OAAO,CAAC,+BAA+B;IAavC,OAAO,CAAC,uBAAuB;IA0F/B,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,oBAAoB;CAqB7B"}
|
|
@@ -4,14 +4,9 @@ import { padArrayEnd } from '@aztec/foundation/collection';
|
|
|
4
4
|
import { assertLength } from '@aztec/foundation/serialize';
|
|
5
5
|
import { MembershipWitness } from '@aztec/foundation/trees';
|
|
6
6
|
import { privateKernelResetDimensionsConfig } from '@aztec/noir-protocol-circuits-types/client';
|
|
7
|
-
import { KeyValidationHint, PaddedSideEffects, PrivateKernelData, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, PrivateKernelResetHints, ReadRequestActionEnum, ReadRequestResetActions,
|
|
7
|
+
import { KeyValidationHint, PaddedSideEffects, PrivateKernelData, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, PrivateKernelResetHints, ReadRequestActionEnum, ReadRequestResetActions, TransientDataSquashingHint, buildNoteHashReadRequestHintsFromResetActions, buildNullifierReadRequestHintsFromResetActions, buildTransientDataHints, countSquashedLogs, findPrivateKernelResetDimensions, getNoteHashReadRequestResetActions, getNullifierReadRequestResetActions, privateKernelResetDimensionNames } from '@aztec/stdlib/kernel';
|
|
8
8
|
import { collectNested } from '@aztec/stdlib/tx';
|
|
9
9
|
import { VkData } from '@aztec/stdlib/vks';
|
|
10
|
-
function collectNestedReadRequests(executionStack, extractReadRequests) {
|
|
11
|
-
return collectNested(executionStack, (executionResult)=>{
|
|
12
|
-
return extractReadRequests(executionResult).getActiveItems();
|
|
13
|
-
});
|
|
14
|
-
}
|
|
15
10
|
function getNullifierMembershipWitnessResolver(oracle) {
|
|
16
11
|
return async (nullifier)=>{
|
|
17
12
|
const res = await oracle.getNullifierMembershipWitness(nullifier);
|
|
@@ -25,7 +20,7 @@ function getNullifierMembershipWitnessResolver(oracle) {
|
|
|
25
20
|
};
|
|
26
21
|
};
|
|
27
22
|
}
|
|
28
|
-
async function
|
|
23
|
+
async function getMasterSecretKeysAndKeyTypeDomainSeparators(keyValidationRequests, numRequestsToVerify, oracle) {
|
|
29
24
|
const numRequestsToProcess = Math.min(keyValidationRequests.claimedLength, numRequestsToVerify);
|
|
30
25
|
const keysHints = await Promise.all(keyValidationRequests.array.slice(0, numRequestsToProcess).map(async ({ request })=>{
|
|
31
26
|
const secretKeys = await oracle.getMasterSecretKey(request.request.pkM);
|
|
@@ -51,18 +46,21 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
51
46
|
this.executionStack = executionStack;
|
|
52
47
|
this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
|
|
53
48
|
this.splitCounter = splitCounter;
|
|
54
|
-
this.previousKernel = previousKernelOutput.publicInputs;
|
|
55
|
-
this.requestedDimensions = PrivateKernelResetDimensions.empty();
|
|
56
49
|
this.noteHashResetActions = ReadRequestResetActions.empty(MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
57
50
|
this.nullifierResetActions = ReadRequestResetActions.empty(MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
58
51
|
this.transientDataSquashingHints = makeTuple(MAX_NULLIFIERS_PER_TX, ()=>new TransientDataSquashingHint(MAX_NULLIFIERS_PER_TX, MAX_NOTE_HASHES_PER_TX));
|
|
52
|
+
this.requestedDimensions = PrivateKernelResetDimensions.empty();
|
|
53
|
+
this.previousKernel = previousKernelOutput.publicInputs;
|
|
59
54
|
this.nextIteration = executionStack[this.executionStack.length - 1]?.publicInputs;
|
|
60
55
|
}
|
|
56
|
+
getRequestedDimensions() {
|
|
57
|
+
return this.requestedDimensions;
|
|
58
|
+
}
|
|
61
59
|
needsReset() {
|
|
62
60
|
const fns = [
|
|
63
61
|
()=>this.needsResetNoteHashReadRequests(),
|
|
64
62
|
()=>this.needsResetNullifierReadRequests(),
|
|
65
|
-
()=>this.
|
|
63
|
+
()=>this.needsResetKeyValidationRequests(),
|
|
66
64
|
()=>this.needsResetTransientData()
|
|
67
65
|
];
|
|
68
66
|
if (this.nextIteration) {
|
|
@@ -87,8 +85,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
87
85
|
throw new Error('Reset is not required.');
|
|
88
86
|
}
|
|
89
87
|
const isInner = !!this.nextIteration;
|
|
90
|
-
// "final" reset must be done
|
|
91
|
-
// Because the code that silo note hashes can't be run repeatedly.
|
|
88
|
+
// "final" reset must be done exactly once, because siloing can't be run repeatedly.
|
|
92
89
|
// The dimensions found must be big enough to reset all values, i.e. empty remainder.
|
|
93
90
|
const allowRemainder = isInner;
|
|
94
91
|
const dimensions = findPrivateKernelResetDimensions(this.requestedDimensions, privateKernelResetDimensionsConfig, isInner, allowRemainder);
|
|
@@ -101,7 +98,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
101
98
|
buildNullifierReadRequestHintsFromResetActions({
|
|
102
99
|
getNullifierMembershipWitness: getNullifierMembershipWitnessResolver(oracle)
|
|
103
100
|
}, this.previousKernel.validationRequests.nullifierReadRequests, this.nullifierResetActions),
|
|
104
|
-
|
|
101
|
+
getMasterSecretKeysAndKeyTypeDomainSeparators(this.previousKernel.validationRequests.scopedKeyValidationRequestsAndSeparators, dimensions.KEY_VALIDATION, oracle)
|
|
105
102
|
]);
|
|
106
103
|
const vkData = new VkData(this.previousKernelOutput.verificationKey, Number(previousVkMembershipWitness.leafIndex), previousVkMembershipWitness.siblingPath);
|
|
107
104
|
const previousKernelData = new PrivateKernelData(this.previousKernelOutput.publicInputs, vkData);
|
|
@@ -130,69 +127,112 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
130
127
|
}
|
|
131
128
|
resetActions.pendingReadHints = resetActions.pendingReadHints.slice(0, maxPending);
|
|
132
129
|
}
|
|
133
|
-
needsResetNoteHashReadRequests(
|
|
130
|
+
needsResetNoteHashReadRequests(forceReset = false) {
|
|
134
131
|
const numCurr = this.previousKernel.validationRequests.noteHashReadRequests.claimedLength;
|
|
135
132
|
const numNext = this.nextIteration ? this.nextIteration.noteHashReadRequests.claimedLength : 0;
|
|
136
|
-
const maxAmountToKeep = !this.nextIteration ||
|
|
133
|
+
const maxAmountToKeep = !this.nextIteration || forceReset ? 0 : MAX_NOTE_HASH_READ_REQUESTS_PER_TX;
|
|
137
134
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
138
135
|
return false;
|
|
139
136
|
}
|
|
140
|
-
const
|
|
141
|
-
return executionResult.publicInputs.noteHashes.getActiveItems().map((noteHash)=>new ScopedNoteHash(noteHash, executionResult.publicInputs.callContext.contractAddress));
|
|
142
|
-
});
|
|
143
|
-
const resetActions = getNoteHashReadRequestResetActions(this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes, futureNoteHashes);
|
|
137
|
+
const resetActions = getNoteHashReadRequestResetActions(this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes);
|
|
144
138
|
const numPendingReads = resetActions.pendingReadHints.length;
|
|
145
139
|
const numSettledReads = resetActions.actions.reduce((accum, action)=>accum + (action === ReadRequestActionEnum.READ_AS_SETTLED ? 1 : 0), 0);
|
|
140
|
+
const totalReadsToReset = numPendingReads + numSettledReads;
|
|
141
|
+
const minResetNeeded = numCurr + numNext - maxAmountToKeep;
|
|
142
|
+
if (totalReadsToReset < minResetNeeded) {
|
|
143
|
+
if (!this.nextIteration) {
|
|
144
|
+
// In the final reset, all note hashes have been emitted. So if we can't reset all requests, at least one
|
|
145
|
+
// pending read request doesn't match any of them.
|
|
146
|
+
throw new Error('No matching note hash found for note hash read request.');
|
|
147
|
+
} else if (!forceReset) {
|
|
148
|
+
// A pending read request can only be reset if its note hash has already been included (e.g. a parent call might
|
|
149
|
+
// be reading a note hash emitted by a child call. The read request of the parent call is included before the note
|
|
150
|
+
// hash of the child call).
|
|
151
|
+
// If we can't clear enough read requests to make room for the next iteration's reads, we're stuck.
|
|
152
|
+
throw new Error('Number of note hash read requests exceeds the limit.');
|
|
153
|
+
} else if (totalReadsToReset == 0) {
|
|
154
|
+
// It's transient data squashing asking for the read requests to be reset first (forceReset == true), and
|
|
155
|
+
// there's nothing to reset, returns false and let needsResetTransientData throw a more descriptive error.
|
|
156
|
+
return false;
|
|
157
|
+
}
|
|
158
|
+
// Otherwise, forceReset is true, we should proceed to reset as many as we can.
|
|
159
|
+
}
|
|
146
160
|
if (!this.nextIteration) {
|
|
161
|
+
// If there's no next iteration, we need to reset all the read requests.
|
|
147
162
|
this.noteHashResetActions = resetActions;
|
|
148
163
|
this.requestedDimensions.NOTE_HASH_PENDING_READ = numPendingReads;
|
|
149
164
|
this.requestedDimensions.NOTE_HASH_SETTLED_READ = numSettledReads;
|
|
150
165
|
} else {
|
|
151
|
-
//
|
|
166
|
+
// If there's a next iteration, only one dimension can be reset at a time.
|
|
167
|
+
// So we pick the dimension that has more read requests to reset.
|
|
152
168
|
if (numPendingReads > numSettledReads) {
|
|
169
|
+
// Reset the pending read requests.
|
|
170
|
+
const pendingOnlyActions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_PENDING ? action : ReadRequestActionEnum.SKIP), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
171
|
+
this.noteHashResetActions = new ReadRequestResetActions(pendingOnlyActions, resetActions.pendingReadHints);
|
|
153
172
|
this.requestedDimensions.NOTE_HASH_PENDING_READ = numPendingReads;
|
|
154
|
-
this.noteHashResetActions.actions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_PENDING ? action : ReadRequestActionEnum.SKIP), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
155
|
-
this.noteHashResetActions.pendingReadHints = resetActions.pendingReadHints;
|
|
156
173
|
} else {
|
|
174
|
+
// Reset the settled read requests.
|
|
175
|
+
const settledOnlyActions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_SETTLED ? action : ReadRequestActionEnum.SKIP), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
176
|
+
this.noteHashResetActions = new ReadRequestResetActions(settledOnlyActions, []);
|
|
157
177
|
this.requestedDimensions.NOTE_HASH_SETTLED_READ = numSettledReads;
|
|
158
|
-
this.noteHashResetActions.actions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_SETTLED ? action : ReadRequestActionEnum.SKIP), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
159
178
|
}
|
|
160
179
|
}
|
|
161
180
|
return true;
|
|
162
181
|
}
|
|
163
|
-
needsResetNullifierReadRequests(
|
|
182
|
+
needsResetNullifierReadRequests(forceReset = false) {
|
|
164
183
|
const numCurr = this.previousKernel.validationRequests.nullifierReadRequests.claimedLength;
|
|
165
184
|
const numNext = this.nextIteration ? this.nextIteration.nullifierReadRequests.claimedLength : 0;
|
|
166
|
-
const maxAmountToKeep = !this.nextIteration ||
|
|
185
|
+
const maxAmountToKeep = !this.nextIteration || forceReset ? 0 : MAX_NULLIFIER_READ_REQUESTS_PER_TX;
|
|
167
186
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
168
187
|
return false;
|
|
169
188
|
}
|
|
170
|
-
const
|
|
171
|
-
return executionResult.publicInputs.nullifiers.getActiveItems().map((nullifier)=>new ScopedNullifier(nullifier, executionResult.publicInputs.callContext.contractAddress));
|
|
172
|
-
});
|
|
173
|
-
const resetActions = getNullifierReadRequestResetActions(this.previousKernel.validationRequests.nullifierReadRequests, this.previousKernel.end.nullifiers, futureNullifiers);
|
|
189
|
+
const resetActions = getNullifierReadRequestResetActions(this.previousKernel.validationRequests.nullifierReadRequests, this.previousKernel.end.nullifiers);
|
|
174
190
|
const numPendingReads = resetActions.pendingReadHints.length;
|
|
175
191
|
const numSettledReads = resetActions.actions.reduce((accum, action)=>accum + (action === ReadRequestActionEnum.READ_AS_SETTLED ? 1 : 0), 0);
|
|
192
|
+
const totalReadsToReset = numPendingReads + numSettledReads;
|
|
193
|
+
const minResetNeeded = numCurr + numNext - maxAmountToKeep;
|
|
194
|
+
if (totalReadsToReset < minResetNeeded) {
|
|
195
|
+
if (!this.nextIteration) {
|
|
196
|
+
// In the final reset, all nullifiers have been emitted. So if we can't reset all requests, at least one pending
|
|
197
|
+
// read request doesn't match any of them.
|
|
198
|
+
throw new Error('No matching nullifier found for nullifier read request.');
|
|
199
|
+
} else if (!forceReset) {
|
|
200
|
+
// A pending read request can only be reset if its nullifier has already been included (e.g. a parent call might
|
|
201
|
+
// be reading a nullifier emitted by a child call. The read request of the parent call is included before the
|
|
202
|
+
// nullifier of the child call).
|
|
203
|
+
// If we can't clear enough read requests to make room for the next iteration's reads, we're stuck.
|
|
204
|
+
throw new Error('Number of nullifier read requests exceeds the limit.');
|
|
205
|
+
} else if (totalReadsToReset == 0) {
|
|
206
|
+
// It's transient data squashing asking for the read requests to be reset first (forceReset == true), and
|
|
207
|
+
// there's nothing to reset, returns false and let needsResetTransientData throw a more descriptive error.
|
|
208
|
+
return false;
|
|
209
|
+
}
|
|
210
|
+
// Otherwise, forceReset is true, we should proceed to reset as many as we can.
|
|
211
|
+
}
|
|
176
212
|
if (!this.nextIteration) {
|
|
213
|
+
// If there's no next iteration, we need to reset all the read requests.
|
|
177
214
|
this.nullifierResetActions = resetActions;
|
|
178
215
|
this.requestedDimensions.NULLIFIER_PENDING_READ = numPendingReads;
|
|
179
216
|
this.requestedDimensions.NULLIFIER_SETTLED_READ = numSettledReads;
|
|
180
217
|
} else {
|
|
181
|
-
//
|
|
218
|
+
// If there's a next iteration, we can only reset one dimension at a time.
|
|
182
219
|
if (numPendingReads > numSettledReads) {
|
|
220
|
+
// Reset the pending read requests.
|
|
221
|
+
const pendingOnlyActions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_PENDING ? action : ReadRequestActionEnum.SKIP), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
222
|
+
this.nullifierResetActions = new ReadRequestResetActions(pendingOnlyActions, resetActions.pendingReadHints);
|
|
183
223
|
this.requestedDimensions.NULLIFIER_PENDING_READ = numPendingReads;
|
|
184
|
-
this.nullifierResetActions.actions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_PENDING ? action : ReadRequestActionEnum.SKIP), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
185
|
-
this.nullifierResetActions.pendingReadHints = resetActions.pendingReadHints;
|
|
186
224
|
} else {
|
|
225
|
+
// Reset the settled read requests.
|
|
226
|
+
const settledOnlyActions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_SETTLED ? action : ReadRequestActionEnum.SKIP), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
227
|
+
this.nullifierResetActions = new ReadRequestResetActions(settledOnlyActions, []);
|
|
187
228
|
this.requestedDimensions.NULLIFIER_SETTLED_READ = numSettledReads;
|
|
188
|
-
this.nullifierResetActions.actions = assertLength(resetActions.actions.map((action)=>action === ReadRequestActionEnum.READ_AS_SETTLED ? action : ReadRequestActionEnum.SKIP), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
189
229
|
}
|
|
190
230
|
}
|
|
191
231
|
return true;
|
|
192
232
|
}
|
|
193
|
-
|
|
194
|
-
const numCurr = this.previousKernel.validationRequests.
|
|
195
|
-
const numNext = this.nextIteration ? this.nextIteration.
|
|
233
|
+
needsResetKeyValidationRequests() {
|
|
234
|
+
const numCurr = this.previousKernel.validationRequests.scopedKeyValidationRequestsAndSeparators.claimedLength;
|
|
235
|
+
const numNext = this.nextIteration ? this.nextIteration.keyValidationRequestsAndSeparators.claimedLength : 0;
|
|
196
236
|
const maxAmountToKeep = !this.nextIteration ? 0 : MAX_KEY_VALIDATION_REQUESTS_PER_TX;
|
|
197
237
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
198
238
|
return false;
|
|
@@ -201,8 +241,6 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
201
241
|
return true;
|
|
202
242
|
}
|
|
203
243
|
needsResetTransientData() {
|
|
204
|
-
// Initialize this to 0 so that needsSilo can be run.
|
|
205
|
-
this.numTransientData = 0;
|
|
206
244
|
const nextAccumNoteHashes = this.previousKernel.end.noteHashes.claimedLength + (this.nextIteration?.noteHashes.claimedLength ?? 0);
|
|
207
245
|
const noteHashWillOverflow = nextAccumNoteHashes > MAX_NOTE_HASHES_PER_TX;
|
|
208
246
|
const nextAccumNullifiers = this.previousKernel.end.nullifiers.claimedLength + (this.nextIteration?.nullifiers.claimedLength ?? 0);
|
|
@@ -212,27 +250,45 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
212
250
|
if (this.nextIteration && !noteHashWillOverflow && !nullifierWillOverflow && !logsWillOverflow) {
|
|
213
251
|
return false;
|
|
214
252
|
}
|
|
215
|
-
const futureNoteHashReads =
|
|
216
|
-
const futureNullifierReads =
|
|
217
|
-
|
|
218
|
-
// (i.e. none of the future logs are linked to the to-be-squashed note hashes).
|
|
253
|
+
const futureNoteHashReads = collectNested(this.executionStack, (executionResult)=>executionResult.publicInputs.noteHashReadRequests.getActiveItems());
|
|
254
|
+
const futureNullifierReads = collectNested(this.executionStack, (executionResult)=>executionResult.publicInputs.nullifierReadRequests.getActiveItems());
|
|
255
|
+
const futureLogs = collectNested(this.executionStack, (executionResult)=>executionResult.publicInputs.privateLogs.getActiveItems());
|
|
219
256
|
if (this.nextIteration) {
|
|
220
|
-
// If it's not the final reset, only one dimension will be reset at a time.
|
|
221
|
-
//
|
|
257
|
+
// If it's not the final reset, only one dimension will be reset at a time. Since we are resetting the transient
|
|
258
|
+
// data, the note hash and nullifier read requests in the previous kernel won't be squashed and need to be
|
|
259
|
+
// included in the future read requests.
|
|
222
260
|
futureNoteHashReads.push(...this.previousKernel.validationRequests.noteHashReadRequests.getActiveItems());
|
|
223
261
|
futureNullifierReads.push(...this.previousKernel.validationRequests.nullifierReadRequests.getActiveItems());
|
|
224
262
|
}
|
|
225
|
-
const { numTransientData, hints: transientDataSquashingHints } = buildTransientDataHints(this.previousKernel.end.noteHashes, this.previousKernel.end.nullifiers, futureNoteHashReads, futureNullifierReads, this.noteHashNullifierCounterMap, this.splitCounter);
|
|
226
|
-
if (this.nextIteration
|
|
227
|
-
const
|
|
228
|
-
const
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
263
|
+
const { numTransientData, hints: transientDataSquashingHints } = buildTransientDataHints(this.previousKernel.end.noteHashes, this.previousKernel.end.nullifiers, futureNoteHashReads, futureNullifierReads, futureLogs, this.noteHashNullifierCounterMap, this.splitCounter);
|
|
264
|
+
if (this.nextIteration) {
|
|
265
|
+
const noteHashOverflowBy = noteHashWillOverflow ? nextAccumNoteHashes - MAX_NOTE_HASHES_PER_TX - numTransientData : 0;
|
|
266
|
+
const nullifierOverflowBy = nullifierWillOverflow ? nextAccumNullifiers - MAX_NULLIFIERS_PER_TX - numTransientData : 0;
|
|
267
|
+
const numSquashedLogs = logsWillOverflow ? countSquashedLogs(this.previousKernel.end.noteHashes, this.previousKernel.end.privateLogs, transientDataSquashingHints.slice(0, numTransientData)) : 0;
|
|
268
|
+
const logsOverflowBy = logsWillOverflow ? nextAccumLogs - MAX_PRIVATE_LOGS_PER_TX - numSquashedLogs : 0;
|
|
269
|
+
if (noteHashOverflowBy > 0 || nullifierOverflowBy > 0 || logsOverflowBy > 0) {
|
|
270
|
+
// There's not enough transient data to squash to clear space for the overflow. It may be because some data is
|
|
271
|
+
// still required for read requests. Force a reset of the read requests first, and return to transient data
|
|
272
|
+
// squashing in the next round of reset.
|
|
273
|
+
// Note that clearing the read requests might not be enough to clear more space for the overflow. In this case,
|
|
274
|
+
// running the next reset will fail at the following check.
|
|
275
|
+
// Only one dimension can be reset at a time for an inner reset, so we try the note hash read requests first
|
|
276
|
+
// (which also helps with log overflow), then fall back to nullifier read requests.
|
|
277
|
+
const forceReset = true;
|
|
278
|
+
if ((noteHashOverflowBy > 0 || logsOverflowBy > 0) && this.needsResetNoteHashReadRequests(forceReset)) {
|
|
279
|
+
return true;
|
|
280
|
+
}
|
|
281
|
+
if (nullifierOverflowBy > 0 && this.needsResetNullifierReadRequests(forceReset)) {
|
|
282
|
+
return true;
|
|
283
|
+
}
|
|
284
|
+
if (noteHashWillOverflow) {
|
|
285
|
+
throw new Error('Number of note hashes exceeds the limit.');
|
|
286
|
+
}
|
|
287
|
+
if (nullifierWillOverflow) {
|
|
288
|
+
throw new Error('Number of nullifiers exceeds the limit.');
|
|
289
|
+
}
|
|
290
|
+
throw new Error('Number of private logs exceeds the limit.');
|
|
232
291
|
}
|
|
233
|
-
// Clearing the read requests might not be enough to squash the overflown data.
|
|
234
|
-
// In this case, the next iteration will fail at the above check.
|
|
235
|
-
return true;
|
|
236
292
|
}
|
|
237
293
|
this.numTransientData = numTransientData;
|
|
238
294
|
this.transientDataSquashingHints = transientDataSquashingHints;
|
|
@@ -243,8 +299,12 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
243
299
|
if (this.numTransientData === undefined) {
|
|
244
300
|
throw new Error('`needsResetTransientData` must be run before `needsSiloNoteHashes`.');
|
|
245
301
|
}
|
|
246
|
-
const
|
|
247
|
-
|
|
302
|
+
const noteHashes = this.previousKernel.end.noteHashes;
|
|
303
|
+
if (noteHashes.claimedLength > 0 && noteHashes.array[0].contractAddress.isZero()) {
|
|
304
|
+
// Already siloed.
|
|
305
|
+
return false;
|
|
306
|
+
}
|
|
307
|
+
const numToSilo = noteHashes.claimedLength - this.numTransientData;
|
|
248
308
|
this.requestedDimensions.NOTE_HASH_SILOING = numToSilo;
|
|
249
309
|
return numToSilo > 0;
|
|
250
310
|
}
|
|
@@ -252,13 +312,13 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
252
312
|
if (this.numTransientData === undefined) {
|
|
253
313
|
throw new Error('`needsResetTransientData` must be run before `needsSiloNullifiers`.');
|
|
254
314
|
}
|
|
255
|
-
const
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
const
|
|
261
|
-
this.requestedDimensions.NULLIFIER_SILOING =
|
|
315
|
+
const nullifiers = this.previousKernel.end.nullifiers;
|
|
316
|
+
if (nullifiers.claimedLength > 0 && nullifiers.array[0].contractAddress.isZero()) {
|
|
317
|
+
// Already siloed.
|
|
318
|
+
return false;
|
|
319
|
+
}
|
|
320
|
+
const numToSilo = nullifiers.claimedLength - this.numTransientData;
|
|
321
|
+
this.requestedDimensions.NULLIFIER_SILOING = numToSilo;
|
|
262
322
|
return numToSilo > 0;
|
|
263
323
|
}
|
|
264
324
|
needsSiloPrivateLogs() {
|
|
@@ -266,11 +326,12 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
266
326
|
throw new Error('`needsResetTransientData` must be run before `needsSiloPrivateLogs`.');
|
|
267
327
|
}
|
|
268
328
|
const privateLogs = this.previousKernel.end.privateLogs;
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
const
|
|
329
|
+
if (privateLogs.claimedLength > 0 && privateLogs.array[0].contractAddress.isZero()) {
|
|
330
|
+
// Already siloed.
|
|
331
|
+
return false;
|
|
332
|
+
}
|
|
333
|
+
const numSquashedLogs = countSquashedLogs(this.previousKernel.end.noteHashes, privateLogs, this.transientDataSquashingHints.slice(0, this.numTransientData));
|
|
334
|
+
const numToSilo = privateLogs.claimedLength - numSquashedLogs;
|
|
274
335
|
this.requestedDimensions.PRIVATE_LOG_SILOING = numToSilo;
|
|
275
336
|
return numToSilo > 0;
|
|
276
337
|
}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
3
|
+
import { PrivateCircuitPublicInputs, PrivateKernelCircuitPublicInputs, type PrivateKernelSimulateOutput } from '@aztec/stdlib/kernel';
|
|
4
|
+
import { PrivateCallExecutionResult } from '@aztec/stdlib/tx';
|
|
5
|
+
/** Builder for PrivateKernelCircuitPublicInputs with fluent API for adding side effects. */
|
|
6
|
+
export declare class PrivateKernelCircuitPublicInputsBuilder {
|
|
7
|
+
private contractAddress;
|
|
8
|
+
private noteHashes;
|
|
9
|
+
private nullifiers;
|
|
10
|
+
private noteHashReadRequests;
|
|
11
|
+
private nullifierReadRequests;
|
|
12
|
+
private keyValidationRequests;
|
|
13
|
+
private privateLogs;
|
|
14
|
+
private nextCounter;
|
|
15
|
+
constructor(contractAddress?: AztecAddress, startCounter?: number);
|
|
16
|
+
private getCounter;
|
|
17
|
+
/** Adds a note hash to the accumulated data. Defaults are generated randomly. */
|
|
18
|
+
addNoteHash(opts?: {
|
|
19
|
+
value?: Fr;
|
|
20
|
+
counter?: number;
|
|
21
|
+
contractAddress?: AztecAddress;
|
|
22
|
+
}): this;
|
|
23
|
+
/** Adds a nullifier to the accumulated data. Defaults are generated randomly. */
|
|
24
|
+
addNullifier(opts?: {
|
|
25
|
+
value?: Fr;
|
|
26
|
+
noteHash?: Fr;
|
|
27
|
+
counter?: number;
|
|
28
|
+
contractAddress?: AztecAddress;
|
|
29
|
+
}): this;
|
|
30
|
+
/** Adds a pending note hash read request (non-empty contract address, can match a pending note hash). */
|
|
31
|
+
addPendingNoteHashReadRequest(opts?: {
|
|
32
|
+
value?: Fr;
|
|
33
|
+
counter?: number;
|
|
34
|
+
contractAddress?: AztecAddress;
|
|
35
|
+
}): this;
|
|
36
|
+
/** Adds a settled note hash read request (empty contract address, resolved against the note hash tree). */
|
|
37
|
+
addSettledNoteHashReadRequest(opts?: {
|
|
38
|
+
value?: Fr;
|
|
39
|
+
counter?: number;
|
|
40
|
+
}): this;
|
|
41
|
+
/** Adds a pending nullifier read request (non-empty contract address, can match a pending nullifier). */
|
|
42
|
+
addPendingNullifierReadRequest(opts?: {
|
|
43
|
+
value?: Fr;
|
|
44
|
+
counter?: number;
|
|
45
|
+
contractAddress?: AztecAddress;
|
|
46
|
+
}): this;
|
|
47
|
+
/** Adds a settled nullifier read request (empty contract address, resolved against the nullifier tree). */
|
|
48
|
+
addSettledNullifierReadRequest(opts?: {
|
|
49
|
+
value?: Fr;
|
|
50
|
+
counter?: number;
|
|
51
|
+
}): this;
|
|
52
|
+
/** Adds a key validation request to validation requests. */
|
|
53
|
+
addKeyValidationRequest(opts?: {
|
|
54
|
+
contractAddress?: AztecAddress;
|
|
55
|
+
}): this;
|
|
56
|
+
/** Adds a private log to the accumulated data. Defaults are generated randomly. */
|
|
57
|
+
addPrivateLog(opts?: {
|
|
58
|
+
noteHashCounter?: number;
|
|
59
|
+
counter?: number;
|
|
60
|
+
contractAddress?: AztecAddress;
|
|
61
|
+
}): this;
|
|
62
|
+
/** Builds the PrivateKernelCircuitPublicInputs with all added side effects. */
|
|
63
|
+
build(): PrivateKernelCircuitPublicInputs;
|
|
64
|
+
}
|
|
65
|
+
/** Builder for PrivateCircuitPublicInputs (call-level) with fluent API for adding side effects. */
|
|
66
|
+
export declare class PrivateCircuitPublicInputsBuilder {
|
|
67
|
+
private contractAddress;
|
|
68
|
+
private noteHashes;
|
|
69
|
+
private nullifiers;
|
|
70
|
+
private noteHashReadRequests;
|
|
71
|
+
private nullifierReadRequests;
|
|
72
|
+
private keyValidationRequests;
|
|
73
|
+
private privateLogs;
|
|
74
|
+
private nextCounter;
|
|
75
|
+
constructor(contractAddress?: AztecAddress, startCounter?: number);
|
|
76
|
+
private getCounter;
|
|
77
|
+
/** Adds a note hash. Defaults are generated randomly. */
|
|
78
|
+
addNoteHash(opts?: {
|
|
79
|
+
value?: Fr;
|
|
80
|
+
counter?: number;
|
|
81
|
+
}): this;
|
|
82
|
+
/** Adds a nullifier. Defaults are generated randomly. */
|
|
83
|
+
addNullifier(opts?: {
|
|
84
|
+
value?: Fr;
|
|
85
|
+
noteHash?: Fr;
|
|
86
|
+
counter?: number;
|
|
87
|
+
}): this;
|
|
88
|
+
/** Adds a pending note hash read request (non-empty contract address, can match a pending note hash). */
|
|
89
|
+
addPendingNoteHashReadRequest(opts?: {
|
|
90
|
+
value?: Fr;
|
|
91
|
+
counter?: number;
|
|
92
|
+
}): this;
|
|
93
|
+
/** Adds a settled note hash read request (empty contract address, resolved against the note hash tree). */
|
|
94
|
+
addSettledNoteHashReadRequest(opts?: {
|
|
95
|
+
value?: Fr;
|
|
96
|
+
counter?: number;
|
|
97
|
+
}): this;
|
|
98
|
+
/** Adds a pending nullifier read request (non-empty contract address, can match a pending nullifier). */
|
|
99
|
+
addPendingNullifierReadRequest(opts?: {
|
|
100
|
+
value?: Fr;
|
|
101
|
+
counter?: number;
|
|
102
|
+
}): this;
|
|
103
|
+
/** Adds a settled nullifier read request (empty contract address, resolved against the nullifier tree). */
|
|
104
|
+
addSettledNullifierReadRequest(opts?: {
|
|
105
|
+
value?: Fr;
|
|
106
|
+
counter?: number;
|
|
107
|
+
}): this;
|
|
108
|
+
/** Adds a key validation request. */
|
|
109
|
+
addKeyValidationRequest(): this;
|
|
110
|
+
/** Adds a private log. Defaults are generated randomly. */
|
|
111
|
+
addPrivateLog(opts?: {
|
|
112
|
+
noteHashCounter?: number;
|
|
113
|
+
counter?: number;
|
|
114
|
+
}): this;
|
|
115
|
+
/** Builds the PrivateCircuitPublicInputs with all added side effects. */
|
|
116
|
+
build(): PrivateCircuitPublicInputs;
|
|
117
|
+
}
|
|
118
|
+
/** Wraps a PrivateKernelCircuitPublicInputs in a PrivateKernelSimulateOutput. */
|
|
119
|
+
export declare function makeKernelOutput(publicInputs?: PrivateKernelCircuitPublicInputs): PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>;
|
|
120
|
+
/** Wraps a PrivateCircuitPublicInputs in a PrivateCallExecutionResult. */
|
|
121
|
+
export declare function makeExecutionResult(publicInputs?: PrivateCircuitPublicInputs): PrivateCallExecutionResult;
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL2hpbnRzL3Rlc3RfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBTUwsMEJBQTBCLEVBQzFCLGdDQUFnQyxFQUNoQyxLQUFLLDJCQUEyQixFQU1qQyxNQUFNLHNCQUFzQixDQUFDO0FBRzlCLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBYTlELDRGQUE0RjtBQUM1RixxQkFBYSx1Q0FBdUM7SUFVaEQsT0FBTyxDQUFDLGVBQWU7SUFUekIsT0FBTyxDQUFDLFVBQVUsQ0FBd0I7SUFDMUMsT0FBTyxDQUFDLFVBQVUsQ0FBeUI7SUFDM0MsT0FBTyxDQUFDLG9CQUFvQixDQUEyQjtJQUN2RCxPQUFPLENBQUMscUJBQXFCLENBQTJCO0lBQ3hELE9BQU8sQ0FBQyxxQkFBcUIsQ0FBZ0Q7SUFDN0UsT0FBTyxDQUFDLFdBQVcsQ0FBOEI7SUFDakQsT0FBTyxDQUFDLFdBQVcsQ0FBUztJQUU1QixZQUNVLGVBQWUsR0FBRSxZQUF1QyxFQUNoRSxZQUFZLFNBQUksRUFHakI7SUFFRCxPQUFPLENBQUMsVUFBVTtJQVFsQixpRkFBaUY7SUFDakYsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQUMsZUFBZSxDQUFDLEVBQUUsWUFBWSxDQUFBO0tBQUUsR0FBRyxJQUFJLENBTXpGO0lBRUQsaUZBQWlGO0lBQ2pGLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUFDLFFBQVEs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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/test_utils.ts"],"names":[],"mappings":"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"}
|