@aztec/pxe 0.0.1-commit.6d3c34e → 0.0.1-commit.7035c9bd6
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/bin/check_oracle_version.js +1 -1
- package/dest/block_synchronizer/block_synchronizer.d.ts +11 -5
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +72 -21
- package/dest/config/index.d.ts +4 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +18 -1
- package/dest/config/package_info.js +1 -1
- package/dest/contract_function_simulator/benchmarked_node.d.ts +9 -0
- package/dest/contract_function_simulator/benchmarked_node.d.ts.map +1 -0
- package/dest/contract_function_simulator/benchmarked_node.js +77 -0
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +64 -36
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +224 -88
- package/dest/contract_function_simulator/execution_note_cache.d.ts +18 -9
- package/dest/contract_function_simulator/execution_note_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_note_cache.js +45 -28
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
- package/dest/contract_function_simulator/index.d.ts +3 -2
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +2 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +3 -4
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +6 -5
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +1 -3
- package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts +16 -0
- package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/message_tx_context.js +57 -0
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +3 -5
- 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 +4 -6
- package/dest/contract_function_simulator/noir-structs/utility_context.d.ts +4 -10
- package/dest/contract_function_simulator/noir-structs/utility_context.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/utility_context.js +7 -18
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +56 -47
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +42 -0
- package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.d.ts +3 -1
- package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts +6 -6
- package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/note_packing_utils.js +8 -8
- package/dest/contract_function_simulator/oracle/oracle.d.ts +45 -42
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +209 -117
- package/dest/contract_function_simulator/oracle/private_execution.d.ts +2 -26
- package/dest/contract_function_simulator/oracle/private_execution.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -38
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +60 -76
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +113 -88
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +107 -56
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +214 -137
- 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 +45 -0
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
- package/dest/contract_sync/contract_sync_service.js +114 -0
- package/dest/contract_sync/helpers.d.ts +29 -0
- package/dest/contract_sync/helpers.d.ts.map +1 -0
- package/dest/contract_sync/helpers.js +55 -0
- 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 -17
- 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 +5 -1
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +4 -0
- 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 +6 -6
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +19 -22
- package/dest/events/private_event_filter_validator.d.ts +5 -5
- package/dest/events/private_event_filter_validator.d.ts.map +1 -1
- package/dest/events/private_event_filter_validator.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 +8 -5
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +31 -33
- package/dest/messages/message_context_service.d.ts +17 -0
- package/dest/messages/message_context_service.d.ts.map +1 -0
- package/dest/messages/message_context_service.js +36 -0
- package/dest/notes/note_service.d.ts +10 -9
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +34 -38
- 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 +5 -4
- 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 +3 -3
- package/dest/private_kernel/hints/index.d.ts.map +1 -1
- package/dest/private_kernel/hints/index.js +2 -2
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +29 -0
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -0
- package/dest/private_kernel/hints/{build_private_kernel_reset_private_inputs.js → private_kernel_reset_private_inputs_builder.js} +140 -73
- 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 +22 -14
- package/dest/private_kernel/private_kernel_oracle.d.ts +23 -24
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_oracle.js +94 -2
- package/dest/pxe.d.ts +80 -59
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +155 -145
- 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.d.ts +24 -9
- package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
- package/dest/storage/capsule_store/capsule_store.js +130 -23
- package/dest/storage/contract_store/contract_store.d.ts +42 -16
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +157 -84
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +50 -51
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +284 -263
- package/dest/storage/note_store/stored_note.d.ts +16 -0
- package/dest/storage/note_store/stored_note.d.ts.map +1 -0
- package/dest/storage/note_store/stored_note.js +43 -0
- package/dest/storage/private_event_store/private_event_store.d.ts +43 -8
- package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
- package/dest/storage/private_event_store/private_event_store.js +226 -111
- package/dest/storage/private_event_store/stored_private_event.d.ts +23 -0
- package/dest/storage/private_event_store/stored_private_event.d.ts.map +1 -0
- package/dest/storage/private_event_store/stored_private_event.js +56 -0
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts +16 -9
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/recipient_tagging_store.js +88 -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 +43 -32
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +300 -122
- package/dest/tagging/get_all_logs_by_tags.d.ts +24 -0
- package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -0
- package/dest/tagging/get_all_logs_by_tags.js +60 -0
- package/dest/tagging/index.d.ts +4 -3
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/index.js +2 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +5 -5
- 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 +11 -11
- 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 -7
- 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 +16 -12
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +5 -8
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +18 -12
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +23 -16
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +8 -7
- 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 +44 -27
- package/package.json +27 -18
- package/src/access_scopes.ts +9 -0
- package/src/bin/check_oracle_version.ts +1 -0
- package/src/block_synchronizer/block_synchronizer.ts +91 -33
- package/src/config/index.ts +15 -1
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/benchmarked_node.ts +103 -0
- package/src/contract_function_simulator/contract_function_simulator.ts +386 -153
- package/src/contract_function_simulator/execution_note_cache.ts +44 -25
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
- package/src/contract_function_simulator/index.ts +2 -1
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +9 -6
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +1 -4
- package/src/contract_function_simulator/noir-structs/message_tx_context.ts +55 -0
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +4 -7
- package/src/contract_function_simulator/noir-structs/utility_context.ts +6 -25
- package/src/contract_function_simulator/oracle/interfaces.ts +69 -59
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +135 -0
- package/src/contract_function_simulator/oracle/note_packing_utils.ts +10 -10
- package/src/contract_function_simulator/oracle/oracle.ts +235 -165
- package/src/contract_function_simulator/oracle/private_execution.ts +5 -71
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +153 -184
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +318 -154
- package/src/contract_logging.ts +39 -0
- package/src/contract_sync/contract_sync_service.ts +181 -0
- package/src/contract_sync/helpers.ts +98 -0
- package/src/debug/pxe_debug_utils.ts +63 -18
- 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 +4 -0
- package/src/entrypoints/server/utils.ts +22 -26
- package/src/events/event_service.ts +17 -25
- package/src/events/private_event_filter_validator.ts +3 -5
- package/src/job_coordinator/job_coordinator.ts +4 -3
- package/src/logs/log_service.ts +51 -40
- package/src/messages/message_context_service.ts +45 -0
- package/src/notes/note_service.ts +41 -45
- package/src/notes_filter.ts +26 -0
- package/src/oracle_version.ts +5 -4
- 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 +2 -2
- package/src/private_kernel/hints/{build_private_kernel_reset_private_inputs.ts → private_kernel_reset_private_inputs_builder.ts} +195 -136
- package/src/private_kernel/hints/test_utils.ts +325 -0
- package/src/private_kernel/private_kernel_execution_prover.ts +26 -16
- package/src/private_kernel/private_kernel_oracle.ts +116 -37
- package/src/pxe.ts +286 -223
- 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 +159 -23
- package/src/storage/contract_store/contract_store.ts +186 -96
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +326 -320
- package/src/storage/note_store/stored_note.ts +48 -0
- package/src/storage/private_event_store/private_event_store.ts +292 -124
- package/src/storage/private_event_store/stored_private_event.ts +73 -0
- package/src/storage/tagging_store/recipient_tagging_store.ts +111 -21
- package/src/storage/tagging_store/sender_address_book_store.ts +20 -14
- package/src/storage/tagging_store/sender_tagging_store.ts +366 -134
- package/src/tagging/get_all_logs_by_tags.ts +92 -0
- package/src/tagging/index.ts +3 -2
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +22 -14
- package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +17 -16
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +31 -15
- package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +29 -26
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +42 -29
- package/dest/contract_function_simulator/proxied_node.d.ts +0 -9
- package/dest/contract_function_simulator/proxied_node.d.ts.map +0 -1
- package/dest/contract_function_simulator/proxied_node.js +0 -27
- package/dest/private_kernel/hints/build_private_kernel_reset_private_inputs.d.ts +0 -28
- package/dest/private_kernel/hints/build_private_kernel_reset_private_inputs.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
- package/dest/private_kernel/private_kernel_oracle_impl.d.ts +0 -46
- package/dest/private_kernel/private_kernel_oracle_impl.d.ts.map +0 -1
- package/dest/private_kernel/private_kernel_oracle_impl.js +0 -85
- package/dest/public_storage/public_storage_service.d.ts +0 -24
- package/dest/public_storage/public_storage_service.d.ts.map +0 -1
- package/dest/public_storage/public_storage_service.js +0 -26
- package/dest/tree_membership/tree_membership_service.d.ts +0 -52
- package/dest/tree_membership/tree_membership_service.d.ts.map +0 -1
- package/dest/tree_membership/tree_membership_service.js +0 -84
- package/src/contract_function_simulator/proxied_node.ts +0 -33
- package/src/private_kernel/private_kernel_oracle_impl.ts +0 -127
- package/src/public_storage/public_storage_service.ts +0 -33
- package/src/tree_membership/tree_membership_service.ts +0 -112
|
@@ -6,22 +6,33 @@ import { toACVMWitness } from '@aztec/simulator/client';
|
|
|
6
6
|
import { FunctionSelector, countArgumentsSize } from '@aztec/stdlib/abi';
|
|
7
7
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
8
8
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
9
|
-
import {
|
|
9
|
+
import { ExtendedDirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
|
|
10
10
|
import { Tag } from '@aztec/stdlib/logs';
|
|
11
11
|
import { Note } from '@aztec/stdlib/note';
|
|
12
12
|
import { CallContext, CountedContractClassLog, NoteAndSlot } from '@aztec/stdlib/tx';
|
|
13
13
|
import { NoteService } from '../../notes/note_service.js';
|
|
14
14
|
import { syncSenderTaggingIndexes } from '../../tagging/index.js';
|
|
15
15
|
import { pickNotes } from '../pick_notes.js';
|
|
16
|
-
import { executePrivateFunction
|
|
16
|
+
import { executePrivateFunction } from './private_execution.js';
|
|
17
17
|
import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
18
18
|
/**
|
|
19
19
|
* The execution oracle for the private part of a transaction.
|
|
20
20
|
*/ export class PrivateExecutionOracle extends UtilityExecutionOracle {
|
|
21
|
+
isPrivate = true;
|
|
22
|
+
/**
|
|
23
|
+
* New notes created during this execution.
|
|
24
|
+
* It's possible that a note in this list has been nullified (in the same or other executions) and doesn't exist in
|
|
25
|
+
* the ExecutionNoteCache and the final proof data. But we still include those notes in the execution result because
|
|
26
|
+
* their commitments are still in the public inputs of this execution.
|
|
27
|
+
* This information is only for references (currently used for tests), and is not used for any sort of constrains.
|
|
28
|
+
* Users can also use this to get a clearer idea of what's happened during a simulation.
|
|
29
|
+
*/ newNotes = [];
|
|
30
|
+
noteHashNullifierCounterMap = new Map();
|
|
31
|
+
contractClassLogs = [];
|
|
32
|
+
nestedExecutionResults = [];
|
|
21
33
|
argsHash;
|
|
22
34
|
txContext;
|
|
23
35
|
callContext;
|
|
24
|
-
anchorBlockHeader;
|
|
25
36
|
utilityExecutor;
|
|
26
37
|
executionCache;
|
|
27
38
|
noteCache;
|
|
@@ -31,21 +42,24 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
31
42
|
sideEffectCounter;
|
|
32
43
|
senderForTags;
|
|
33
44
|
simulator;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
constructor(args){
|
|
46
|
+
super({
|
|
47
|
+
...args,
|
|
48
|
+
contractAddress: args.callContext.contractAddress,
|
|
49
|
+
log: args.log ?? createLogger('simulator:client_execution_context')
|
|
50
|
+
});
|
|
51
|
+
this.argsHash = args.argsHash;
|
|
52
|
+
this.txContext = args.txContext;
|
|
53
|
+
this.callContext = args.callContext;
|
|
54
|
+
this.utilityExecutor = args.utilityExecutor;
|
|
55
|
+
this.executionCache = args.executionCache;
|
|
56
|
+
this.noteCache = args.noteCache;
|
|
57
|
+
this.taggingIndexCache = args.taggingIndexCache;
|
|
58
|
+
this.senderTaggingStore = args.senderTaggingStore;
|
|
59
|
+
this.totalPublicCalldataCount = args.totalPublicCalldataCount ?? 0;
|
|
60
|
+
this.sideEffectCounter = args.sideEffectCounter ?? 0;
|
|
61
|
+
this.senderForTags = args.senderForTags;
|
|
62
|
+
this.simulator = args.simulator;
|
|
49
63
|
}
|
|
50
64
|
getPrivateContextInputs() {
|
|
51
65
|
return new PrivateContextInputs(this.callContext, this.anchorBlockHeader, this.txContext, this.sideEffectCounter);
|
|
@@ -86,14 +100,9 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
86
100
|
return this.contractClassLogs;
|
|
87
101
|
}
|
|
88
102
|
/**
|
|
89
|
-
*
|
|
90
|
-
*/
|
|
91
|
-
return this.
|
|
92
|
-
}
|
|
93
|
-
/**
|
|
94
|
-
* Returns the pre-tags that were used in this execution (and that need to be stored in the db).
|
|
95
|
-
*/ getUsedPreTags() {
|
|
96
|
-
return this.taggingIndexCache.getUsedPreTags();
|
|
103
|
+
* Returns the tagging index ranges that were used in this execution (and that need to be stored in the db).
|
|
104
|
+
*/ getUsedTaggingIndexRanges() {
|
|
105
|
+
return this.taggingIndexCache.getUsedTaggingIndexRanges();
|
|
97
106
|
}
|
|
98
107
|
/**
|
|
99
108
|
* Return the nested execution results during this execution.
|
|
@@ -109,7 +118,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
109
118
|
*
|
|
110
119
|
* The value persists through nested calls, meaning all calls down the stack will use the same
|
|
111
120
|
* 'senderForTags' value (unless it is replaced).
|
|
112
|
-
*/
|
|
121
|
+
*/ getSenderForTags() {
|
|
113
122
|
return Promise.resolve(this.senderForTags);
|
|
114
123
|
}
|
|
115
124
|
/**
|
|
@@ -122,7 +131,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
122
131
|
* Account contracts typically set this value before calling other contracts. The value persists
|
|
123
132
|
* through nested calls, meaning all calls down the stack will use the same 'senderForTags'
|
|
124
133
|
* value (unless it is replaced by another call to this setter).
|
|
125
|
-
*/
|
|
134
|
+
*/ setSenderForTags(senderForTags) {
|
|
126
135
|
this.senderForTags = senderForTags;
|
|
127
136
|
return Promise.resolve();
|
|
128
137
|
}
|
|
@@ -131,20 +140,20 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
131
140
|
* @param sender - The address sending the log
|
|
132
141
|
* @param recipient - The address receiving the log
|
|
133
142
|
* @returns An app tag to be used in a log.
|
|
134
|
-
*/ async
|
|
135
|
-
const
|
|
136
|
-
const index = await this.#getIndexToUseForSecret(
|
|
137
|
-
this.
|
|
138
|
-
this.taggingIndexCache.setLastUsedIndex(
|
|
143
|
+
*/ async getNextAppTagAsSender(sender, recipient) {
|
|
144
|
+
const extendedSecret = await this.#calculateExtendedDirectionalAppTaggingSecret(this.contractAddress, sender, recipient);
|
|
145
|
+
const index = await this.#getIndexToUseForSecret(extendedSecret);
|
|
146
|
+
this.logger.debug(`Incrementing tagging index for sender: ${sender}, recipient: ${recipient}, contract: ${this.contractAddress} to ${index}`);
|
|
147
|
+
this.taggingIndexCache.setLastUsedIndex(extendedSecret, index);
|
|
139
148
|
return Tag.compute({
|
|
140
|
-
|
|
149
|
+
extendedSecret,
|
|
141
150
|
index
|
|
142
151
|
});
|
|
143
152
|
}
|
|
144
|
-
async #
|
|
145
|
-
const senderCompleteAddress = await this.
|
|
153
|
+
async #calculateExtendedDirectionalAppTaggingSecret(contractAddress, sender, recipient) {
|
|
154
|
+
const senderCompleteAddress = await this.getCompleteAddressOrFail(sender);
|
|
146
155
|
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
147
|
-
return
|
|
156
|
+
return ExtendedDirectionalAppTaggingSecret.compute(senderCompleteAddress, senderIvsk, recipient, contractAddress, recipient);
|
|
148
157
|
}
|
|
149
158
|
async #getIndexToUseForSecret(secret) {
|
|
150
159
|
// If we have the tagging index in the cache, we use it. If not we obtain it from the execution data provider.
|
|
@@ -155,8 +164,8 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
155
164
|
// This is a tagging secret we've not yet used in this tx, so first sync our store to make sure its indices
|
|
156
165
|
// are up to date. We do this here because this store is not synced as part of the global sync because
|
|
157
166
|
// that'd be wasteful as most tagging secrets are not used in each tx.
|
|
158
|
-
await syncSenderTaggingIndexes(secret, this.
|
|
159
|
-
const lastUsedIndex = await this.senderTaggingStore.getLastUsedIndex(secret);
|
|
167
|
+
await syncSenderTaggingIndexes(secret, this.aztecNode, this.senderTaggingStore, await this.anchorBlockHeader.hash(), this.jobId);
|
|
168
|
+
const lastUsedIndex = await this.senderTaggingStore.getLastUsedIndex(secret, this.jobId);
|
|
160
169
|
// If lastUsedIndex is undefined, we've never used this secret, so start from 0
|
|
161
170
|
// Otherwise, the next index to use is one past the last used index
|
|
162
171
|
return lastUsedIndex === undefined ? 0 : lastUsedIndex + 1;
|
|
@@ -166,29 +175,29 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
166
175
|
* Store values in the execution cache.
|
|
167
176
|
* @param values - Values to store.
|
|
168
177
|
* @returns The hash of the values.
|
|
169
|
-
*/
|
|
178
|
+
*/ storeInExecutionCache(values, hash) {
|
|
170
179
|
return this.executionCache.store(values, hash);
|
|
171
180
|
}
|
|
172
181
|
/**
|
|
173
182
|
* Gets values from the execution cache.
|
|
174
183
|
* @param hash - Hash of the values.
|
|
175
184
|
* @returns The values.
|
|
176
|
-
*/
|
|
185
|
+
*/ loadFromExecutionCache(hash) {
|
|
177
186
|
const preimage = this.executionCache.getPreimage(hash);
|
|
178
187
|
if (!preimage) {
|
|
179
188
|
throw new Error(`Preimage for hash ${hash.toString()} not found in cache`);
|
|
180
189
|
}
|
|
181
190
|
return Promise.resolve(preimage);
|
|
182
191
|
}
|
|
183
|
-
async
|
|
192
|
+
async checkNullifierExists(innerNullifier) {
|
|
184
193
|
// This oracle must be overridden because while utility execution can only meaningfully check if a nullifier exists
|
|
185
194
|
// in the synched block, during private execution there's also the possibility of it being pending, i.e. created
|
|
186
195
|
// in the current transaction.
|
|
187
|
-
this.
|
|
196
|
+
this.logger.debug(`Checking existence of inner nullifier ${innerNullifier}`, {
|
|
188
197
|
contractAddress: this.contractAddress
|
|
189
198
|
});
|
|
190
199
|
const nullifier = (await siloNullifier(this.contractAddress, innerNullifier)).toBigInt();
|
|
191
|
-
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.
|
|
200
|
+
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.checkNullifierExists(innerNullifier);
|
|
192
201
|
}
|
|
193
202
|
/**
|
|
194
203
|
* Gets some notes for a storage slot.
|
|
@@ -210,11 +219,11 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
210
219
|
* @param offset - The starting index for pagination.
|
|
211
220
|
* @param status - The status of notes to fetch.
|
|
212
221
|
* @returns Array of note data.
|
|
213
|
-
*/ async
|
|
222
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
214
223
|
// Nullified pending notes are already removed from the list.
|
|
215
224
|
const pendingNotes = this.noteCache.getNotes(this.callContext.contractAddress, owner, storageSlot);
|
|
216
225
|
const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
|
|
217
|
-
const noteService = new NoteService(this.noteStore, this.aztecNode, this.
|
|
226
|
+
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
218
227
|
const dbNotes = await noteService.getNotes(this.callContext.contractAddress, owner, storageSlot, status, this.scopes);
|
|
219
228
|
const dbNotesFiltered = dbNotes.filter((n)=>!pendingNullifiers.has(n.siloedNullifier.value));
|
|
220
229
|
const notes = pickNotes([
|
|
@@ -241,7 +250,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
241
250
|
limit,
|
|
242
251
|
offset
|
|
243
252
|
});
|
|
244
|
-
this.
|
|
253
|
+
this.logger.debug(`Returning ${notes.length} notes for ${this.callContext.contractAddress} at ${storageSlot}: ${notes.map((n)=>`${n.noteNonce.toString()}:[${n.note.items.map((i)=>i.toString()).join(',')}]`).join(', ')}`);
|
|
245
254
|
return notes;
|
|
246
255
|
}
|
|
247
256
|
/**
|
|
@@ -254,8 +263,8 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
254
263
|
* @param noteItems - The items to be included in a Note.
|
|
255
264
|
* @param noteHash - A hash of the new note.
|
|
256
265
|
* @returns
|
|
257
|
-
*/
|
|
258
|
-
this.
|
|
266
|
+
*/ notifyCreatedNote(owner, storageSlot, randomness, noteTypeId, noteItems, noteHash, counter) {
|
|
267
|
+
this.logger.debug(`Notified of new note with inner hash ${noteHash}`, {
|
|
259
268
|
contractAddress: this.callContext.contractAddress,
|
|
260
269
|
storageSlot,
|
|
261
270
|
randomness,
|
|
@@ -271,7 +280,8 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
271
280
|
noteNonce: Fr.ZERO,
|
|
272
281
|
note,
|
|
273
282
|
siloedNullifier: undefined,
|
|
274
|
-
noteHash
|
|
283
|
+
noteHash,
|
|
284
|
+
isPending: true
|
|
275
285
|
}, counter);
|
|
276
286
|
this.newNotes.push(NoteAndSlot.from({
|
|
277
287
|
note,
|
|
@@ -285,7 +295,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
285
295
|
* within the current transaction/execution.
|
|
286
296
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
287
297
|
* @param noteHash - A hash of the new note.
|
|
288
|
-
*/ async
|
|
298
|
+
*/ async notifyNullifiedNote(innerNullifier, noteHash, counter) {
|
|
289
299
|
const nullifiedNoteHashCounter = await this.noteCache.nullifyNote(this.callContext.contractAddress, innerNullifier, noteHash);
|
|
290
300
|
if (nullifiedNoteHashCounter !== undefined) {
|
|
291
301
|
this.noteHashNullifierCounterMap.set(nullifiedNoteHashCounter, counter);
|
|
@@ -296,22 +306,33 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
296
306
|
* within the current transaction/execution.
|
|
297
307
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
298
308
|
* @param noteHash - A hash of the new note.
|
|
299
|
-
*/
|
|
300
|
-
this.
|
|
309
|
+
*/ notifyCreatedNullifier(innerNullifier) {
|
|
310
|
+
this.logger.debug(`Notified of new inner nullifier ${innerNullifier}`, {
|
|
301
311
|
contractAddress: this.contractAddress
|
|
302
312
|
});
|
|
303
313
|
return this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
|
|
304
314
|
}
|
|
305
315
|
/**
|
|
316
|
+
* Check if a nullifier has been emitted in the same transaction, i.e. if notifyCreatedNullifier has been
|
|
317
|
+
* called for this inner nullifier from the contract with the specified address.
|
|
318
|
+
* @param innerNullifier - The inner nullifier to check.
|
|
319
|
+
* @param contractAddress - Address of the contract that emitted the nullifier.
|
|
320
|
+
* @returns A boolean indicating whether the nullifier is pending or not.
|
|
321
|
+
*/ async isNullifierPending(innerNullifier, contractAddress) {
|
|
322
|
+
const siloedNullifier = await siloNullifier(contractAddress, innerNullifier);
|
|
323
|
+
const isNullifierPending = this.noteCache.getNullifiers(contractAddress).has(siloedNullifier.toBigInt());
|
|
324
|
+
return Promise.resolve(isNullifierPending);
|
|
325
|
+
}
|
|
326
|
+
/**
|
|
306
327
|
* Emit a contract class log.
|
|
307
328
|
* This fn exists because we only carry a poseidon hash through the kernels, and need to
|
|
308
329
|
* keep the preimage in ts for later.
|
|
309
330
|
* @param log - The contract class log to be emitted.
|
|
310
331
|
* @param counter - The contract class log's counter.
|
|
311
|
-
*/
|
|
332
|
+
*/ notifyCreatedContractClassLog(log, counter) {
|
|
312
333
|
this.contractClassLogs.push(new CountedContractClassLog(log, counter));
|
|
313
334
|
const text = log.toBuffer().toString('hex');
|
|
314
|
-
this.
|
|
335
|
+
this.logger.verbose(`Emitted log from ContractClassRegistry: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`);
|
|
315
336
|
}
|
|
316
337
|
#checkValidStaticCall(childExecutionResult) {
|
|
317
338
|
if (childExecutionResult.publicInputs.noteHashes.claimedLength > 0 || childExecutionResult.publicInputs.nullifiers.claimedLength > 0 || childExecutionResult.publicInputs.l2ToL1Msgs.claimedLength > 0 || childExecutionResult.publicInputs.privateLogs.claimedLength > 0 || childExecutionResult.publicInputs.contractClassLogsHashes.claimedLength > 0) {
|
|
@@ -326,21 +347,50 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
326
347
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
327
348
|
* @param isStaticCall - Whether the call is a static call.
|
|
328
349
|
* @returns The execution result.
|
|
329
|
-
*/ async
|
|
350
|
+
*/ async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
330
351
|
if (!this.simulator) {
|
|
331
352
|
// In practice it is only when creating inline private contexts in a Noir test using TXE that we create an
|
|
332
353
|
// instance of this class without a simulator.
|
|
333
354
|
throw new Error('No simulator provided, cannot perform a nested private call');
|
|
334
355
|
}
|
|
335
356
|
const simulatorSetupTimer = new Timer();
|
|
336
|
-
this.
|
|
357
|
+
this.logger.debug(`Calling private function ${targetContractAddress}:${functionSelector} from ${this.callContext.contractAddress}`);
|
|
337
358
|
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
338
|
-
await
|
|
339
|
-
await this.contractStore.syncPrivateState(targetContractAddress, functionSelector, this.utilityExecutor);
|
|
359
|
+
await this.contractSyncService.ensureContractSynced(targetContractAddress, functionSelector, this.utilityExecutor, this.anchorBlockHeader, this.jobId, this.scopes);
|
|
340
360
|
const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(targetContractAddress, functionSelector);
|
|
341
361
|
const derivedTxContext = this.txContext.clone();
|
|
342
362
|
const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
|
|
343
|
-
const privateExecutionOracle = new PrivateExecutionOracle(
|
|
363
|
+
const privateExecutionOracle = new PrivateExecutionOracle({
|
|
364
|
+
argsHash,
|
|
365
|
+
txContext: derivedTxContext,
|
|
366
|
+
callContext: derivedCallContext,
|
|
367
|
+
anchorBlockHeader: this.anchorBlockHeader,
|
|
368
|
+
utilityExecutor: this.utilityExecutor,
|
|
369
|
+
authWitnesses: this.authWitnesses,
|
|
370
|
+
capsules: this.capsules,
|
|
371
|
+
executionCache: this.executionCache,
|
|
372
|
+
noteCache: this.noteCache,
|
|
373
|
+
taggingIndexCache: this.taggingIndexCache,
|
|
374
|
+
contractStore: this.contractStore,
|
|
375
|
+
noteStore: this.noteStore,
|
|
376
|
+
keyStore: this.keyStore,
|
|
377
|
+
addressStore: this.addressStore,
|
|
378
|
+
aztecNode: this.aztecNode,
|
|
379
|
+
senderTaggingStore: this.senderTaggingStore,
|
|
380
|
+
recipientTaggingStore: this.recipientTaggingStore,
|
|
381
|
+
senderAddressBookStore: this.senderAddressBookStore,
|
|
382
|
+
capsuleStore: this.capsuleStore,
|
|
383
|
+
privateEventStore: this.privateEventStore,
|
|
384
|
+
messageContextService: this.messageContextService,
|
|
385
|
+
contractSyncService: this.contractSyncService,
|
|
386
|
+
jobId: this.jobId,
|
|
387
|
+
totalPublicCalldataCount: this.totalPublicCalldataCount,
|
|
388
|
+
sideEffectCounter,
|
|
389
|
+
log: this.logger,
|
|
390
|
+
scopes: this.scopes,
|
|
391
|
+
senderForTags: this.senderForTags,
|
|
392
|
+
simulator: this.simulator
|
|
393
|
+
});
|
|
344
394
|
const setupTime = simulatorSetupTimer.ms();
|
|
345
395
|
const childExecutionResult = await executePrivateFunction(this.simulator, privateExecutionOracle, targetArtifact, targetContractAddress, functionSelector);
|
|
346
396
|
if (isStaticCall) {
|
|
@@ -357,7 +407,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
357
407
|
returnsHash: publicInputs.returnsHash
|
|
358
408
|
};
|
|
359
409
|
}
|
|
360
|
-
|
|
410
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */ validatePublicCalldata(calldataHash) {
|
|
361
411
|
const calldata = this.executionCache.getPreimage(calldataHash);
|
|
362
412
|
if (!calldata) {
|
|
363
413
|
throw new Error('Calldata for public call not found in cache');
|
|
@@ -366,31 +416,12 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
366
416
|
if (this.totalPublicCalldataCount > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
|
|
367
417
|
throw new Error(`Too many total args to all enqueued public calls! (> ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS})`);
|
|
368
418
|
}
|
|
369
|
-
}
|
|
370
|
-
/**
|
|
371
|
-
* Verify relevant information when a public function is enqueued.
|
|
372
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
373
|
-
* @param calldataHash - The hash of the function selector and arguments.
|
|
374
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
375
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
376
|
-
*/ privateNotifyEnqueuedPublicFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
377
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
378
419
|
return Promise.resolve();
|
|
379
420
|
}
|
|
380
|
-
|
|
381
|
-
* Verify relevant information when a public teardown function is set.
|
|
382
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
383
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
384
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
385
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
386
|
-
*/ privateNotifySetPublicTeardownFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
387
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
388
|
-
return Promise.resolve();
|
|
389
|
-
}
|
|
390
|
-
privateNotifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter) {
|
|
421
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter) {
|
|
391
422
|
return this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
|
|
392
423
|
}
|
|
393
|
-
|
|
424
|
+
inRevertiblePhase(sideEffectCounter) {
|
|
394
425
|
return Promise.resolve(this.noteCache.isSideEffectCounterRevertible(sideEffectCounter));
|
|
395
426
|
}
|
|
396
427
|
/**
|
|
@@ -405,10 +436,4 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
405
436
|
getDebugFunctionName() {
|
|
406
437
|
return this.contractStore.getDebugFunctionName(this.contractAddress, this.callContext.functionSelector);
|
|
407
438
|
}
|
|
408
|
-
utilityEmitOffchainEffect(data) {
|
|
409
|
-
this.offchainEffects.push({
|
|
410
|
-
data
|
|
411
|
-
});
|
|
412
|
-
return Promise.resolve();
|
|
413
|
-
}
|
|
414
439
|
}
|