@aztec/pxe 0.0.1-commit.d431d1c → 0.0.1-commit.d939eb5aa
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/bin/check_oracle_version.js +5 -5
- package/dest/block_synchronizer/block_synchronizer.d.ts +9 -5
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +68 -16
- package/dest/config/index.d.ts +4 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +12 -2
- package/dest/config/package_info.js +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +63 -31
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +206 -78
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts +28 -0
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts.map +1 -0
- package/dest/contract_function_simulator/ephemeral_array_service.js +78 -0
- 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 +2 -1
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +1 -0
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +5 -7
- 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 +9 -11
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
- 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 +2 -4
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +5 -8
- 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 +7 -12
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +65 -46
- 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 +47 -0
- package/dest/contract_function_simulator/oracle/oracle.d.ts +75 -42
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +319 -112
- package/dest/contract_function_simulator/oracle/private_execution.d.ts +2 -22
- package/dest/contract_function_simulator/oracle/private_execution.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -40
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +59 -77
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +120 -86
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +134 -67
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +337 -151
- package/dest/contract_function_simulator/pick_notes.d.ts +1 -1
- package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
- package/dest/contract_function_simulator/pick_notes.js +9 -2
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +1 -1
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +1 -1
- package/dest/contract_function_simulator/proxied_contract_data_source.js +3 -0
- package/dest/contract_logging.d.ts +27 -0
- package/dest/contract_logging.d.ts.map +1 -0
- package/dest/contract_logging.js +38 -0
- package/dest/contract_sync/contract_sync_service.d.ts +44 -0
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
- package/dest/contract_sync/contract_sync_service.js +116 -0
- package/dest/contract_sync/helpers.d.ts +28 -0
- package/dest/contract_sync/helpers.d.ts.map +1 -0
- package/dest/contract_sync/helpers.js +60 -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 +3 -1
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +2 -0
- package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +23 -9
- package/dest/entrypoints/client/lazy/index.d.ts +3 -1
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +2 -0
- package/dest/entrypoints/client/lazy/utils.d.ts +3 -3
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +24 -10
- package/dest/entrypoints/pxe_creation_options.d.ts +5 -2
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/pxe_creation_options.js +3 -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 +2 -2
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +30 -11
- 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 +21 -10
- package/dest/events/private_event_filter_validator.d.ts +3 -2
- package/dest/events/private_event_filter_validator.d.ts.map +1 -1
- package/dest/events/private_event_filter_validator.js +15 -0
- 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 +10 -9
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +50 -64
- 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 +8 -8
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +29 -19
- package/dest/notes_filter.d.ts +24 -0
- package/dest/notes_filter.d.ts.map +1 -0
- package/dest/notes_filter.js +4 -0
- package/dest/oracle_version.d.ts +4 -3
- package/dest/oracle_version.d.ts.map +1 -1
- package/dest/oracle_version.js +20 -9
- 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 +20 -15
- 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 +74 -24
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +142 -80
- 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_service.d.ts +21 -0
- package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
- package/dest/storage/capsule_store/capsule_service.js +50 -0
- package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
- package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
- package/dest/storage/capsule_store/capsule_store.js +39 -36
- package/dest/storage/capsule_store/index.d.ts +2 -1
- package/dest/storage/capsule_store/index.d.ts.map +1 -1
- package/dest/storage/capsule_store/index.js +1 -0
- 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 +47 -49
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +278 -252
- 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 +17 -4
- package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
- package/dest/storage/private_event_store/private_event_store.js +198 -147
- 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 +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 +29 -28
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +233 -137
- 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 +7 -21
- 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 +13 -7
- 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 +6 -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 +42 -27
- package/package.json +25 -16
- package/src/bin/check_oracle_version.ts +5 -4
- package/src/block_synchronizer/block_synchronizer.ts +82 -33
- package/src/config/index.ts +9 -1
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +366 -142
- package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
- package/src/contract_function_simulator/index.ts +1 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +10 -10
- package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +5 -11
- package/src/contract_function_simulator/oracle/interfaces.ts +95 -58
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
- package/src/contract_function_simulator/oracle/oracle.ts +404 -150
- package/src/contract_function_simulator/oracle/private_execution.ts +5 -64
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +160 -182
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +564 -182
- package/src/contract_function_simulator/pick_notes.ts +9 -2
- package/src/contract_function_simulator/proxied_contract_data_source.ts +8 -1
- package/src/contract_logging.ts +52 -0
- package/src/contract_sync/contract_sync_service.ts +176 -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 +2 -0
- package/src/entrypoints/client/bundle/utils.ts +18 -18
- package/src/entrypoints/client/lazy/index.ts +2 -0
- package/src/entrypoints/client/lazy/utils.ts +19 -18
- package/src/entrypoints/pxe_creation_options.ts +9 -1
- package/src/entrypoints/server/index.ts +3 -1
- package/src/entrypoints/server/utils.ts +24 -29
- package/src/events/event_service.ts +22 -11
- package/src/events/private_event_filter_validator.ts +21 -1
- package/src/job_coordinator/job_coordinator.ts +4 -3
- package/src/logs/log_service.ts +93 -105
- package/src/messages/message_context_service.ts +44 -0
- package/src/notes/note_service.ts +38 -26
- package/src/notes_filter.ts +24 -0
- package/src/oracle_version.ts +20 -9
- 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 +24 -19
- package/src/private_kernel/private_kernel_oracle.ts +9 -9
- package/src/pxe.ts +272 -126
- 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_service.ts +90 -0
- package/src/storage/capsule_store/capsule_store.ts +42 -34
- package/src/storage/capsule_store/index.ts +1 -0
- 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 +318 -318
- package/src/storage/note_store/stored_note.ts +48 -0
- package/src/storage/private_event_store/private_event_store.ts +250 -190
- package/src/storage/private_event_store/stored_private_event.ts +73 -0
- 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 +287 -156
- 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 +19 -24
- 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 +25 -10
- 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 +39 -29
- 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/tree_membership/tree_membership_service.d.ts +0 -50
- package/dest/tree_membership/tree_membership_service.d.ts.map +0 -1
- package/dest/tree_membership/tree_membership_service.js +0 -75
- package/src/tree_membership/tree_membership_service.ts +0 -97
|
@@ -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,29 @@ 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
|
-
|
|
137
|
-
|
|
138
|
-
|
|
143
|
+
*/ async getNextAppTagAsSender(sender, recipient) {
|
|
144
|
+
const extendedSecret = await this.#calculateExtendedDirectionalAppTaggingSecret(this.contractAddress, sender, recipient);
|
|
145
|
+
if (!extendedSecret) {
|
|
146
|
+
// We'd only fail to compute an extended secret if the recipient is an invalid address. To prevent
|
|
147
|
+
// king-of-the-hill attacks, instead of failing we use a random tag. By including a correct-looking tag in the
|
|
148
|
+
// log, the transaction shape is preserved and no privacy is leaked, even if the tag is bogus.
|
|
149
|
+
this.logger.warn(`Computing a tag for invalid recipient ${recipient} - returning a random tag instead`, {
|
|
150
|
+
contractAddress: this.contractAddress
|
|
151
|
+
});
|
|
152
|
+
return Tag.random();
|
|
153
|
+
}
|
|
154
|
+
const index = await this.#getIndexToUseForSecret(extendedSecret);
|
|
155
|
+
this.logger.debug(`Incrementing tagging index for sender: ${sender}, recipient: ${recipient}, contract: ${this.contractAddress} to ${index}`);
|
|
156
|
+
this.taggingIndexCache.setLastUsedIndex(extendedSecret, index);
|
|
139
157
|
return Tag.compute({
|
|
140
|
-
|
|
158
|
+
extendedSecret,
|
|
141
159
|
index
|
|
142
160
|
});
|
|
143
161
|
}
|
|
144
|
-
async #
|
|
145
|
-
const senderCompleteAddress = await this.
|
|
162
|
+
async #calculateExtendedDirectionalAppTaggingSecret(contractAddress, sender, recipient) {
|
|
163
|
+
const senderCompleteAddress = await this.getCompleteAddressOrFail(sender);
|
|
146
164
|
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
147
|
-
return
|
|
165
|
+
return ExtendedDirectionalAppTaggingSecret.compute(senderCompleteAddress, senderIvsk, recipient, contractAddress, recipient);
|
|
148
166
|
}
|
|
149
167
|
async #getIndexToUseForSecret(secret) {
|
|
150
168
|
// If we have the tagging index in the cache, we use it. If not we obtain it from the execution data provider.
|
|
@@ -155,7 +173,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
155
173
|
// This is a tagging secret we've not yet used in this tx, so first sync our store to make sure its indices
|
|
156
174
|
// are up to date. We do this here because this store is not synced as part of the global sync because
|
|
157
175
|
// that'd be wasteful as most tagging secrets are not used in each tx.
|
|
158
|
-
await syncSenderTaggingIndexes(secret, this.
|
|
176
|
+
await syncSenderTaggingIndexes(secret, this.aztecNode, this.senderTaggingStore, await this.anchorBlockHeader.hash(), this.jobId);
|
|
159
177
|
const lastUsedIndex = await this.senderTaggingStore.getLastUsedIndex(secret, this.jobId);
|
|
160
178
|
// If lastUsedIndex is undefined, we've never used this secret, so start from 0
|
|
161
179
|
// Otherwise, the next index to use is one past the last used index
|
|
@@ -166,29 +184,29 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
166
184
|
* Store values in the execution cache.
|
|
167
185
|
* @param values - Values to store.
|
|
168
186
|
* @returns The hash of the values.
|
|
169
|
-
*/
|
|
187
|
+
*/ setHashPreimage(values, hash) {
|
|
170
188
|
return this.executionCache.store(values, hash);
|
|
171
189
|
}
|
|
172
190
|
/**
|
|
173
191
|
* Gets values from the execution cache.
|
|
174
192
|
* @param hash - Hash of the values.
|
|
175
193
|
* @returns The values.
|
|
176
|
-
*/
|
|
194
|
+
*/ getHashPreimage(hash) {
|
|
177
195
|
const preimage = this.executionCache.getPreimage(hash);
|
|
178
196
|
if (!preimage) {
|
|
179
197
|
throw new Error(`Preimage for hash ${hash.toString()} not found in cache`);
|
|
180
198
|
}
|
|
181
199
|
return Promise.resolve(preimage);
|
|
182
200
|
}
|
|
183
|
-
async
|
|
201
|
+
async doesNullifierExist(innerNullifier) {
|
|
184
202
|
// This oracle must be overridden because while utility execution can only meaningfully check if a nullifier exists
|
|
185
203
|
// in the synched block, during private execution there's also the possibility of it being pending, i.e. created
|
|
186
204
|
// in the current transaction.
|
|
187
|
-
this.
|
|
205
|
+
this.logger.debug(`Checking existence of inner nullifier ${innerNullifier}`, {
|
|
188
206
|
contractAddress: this.contractAddress
|
|
189
207
|
});
|
|
190
208
|
const nullifier = (await siloNullifier(this.contractAddress, innerNullifier)).toBigInt();
|
|
191
|
-
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.
|
|
209
|
+
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.doesNullifierExist(innerNullifier);
|
|
192
210
|
}
|
|
193
211
|
/**
|
|
194
212
|
* Gets some notes for a storage slot.
|
|
@@ -210,11 +228,11 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
210
228
|
* @param offset - The starting index for pagination.
|
|
211
229
|
* @param status - The status of notes to fetch.
|
|
212
230
|
* @returns Array of note data.
|
|
213
|
-
*/ async
|
|
231
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
214
232
|
// Nullified pending notes are already removed from the list.
|
|
215
233
|
const pendingNotes = this.noteCache.getNotes(this.callContext.contractAddress, owner, storageSlot);
|
|
216
234
|
const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
|
|
217
|
-
const noteService = new NoteService(this.noteStore, this.aztecNode, this.
|
|
235
|
+
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
218
236
|
const dbNotes = await noteService.getNotes(this.callContext.contractAddress, owner, storageSlot, status, this.scopes);
|
|
219
237
|
const dbNotesFiltered = dbNotes.filter((n)=>!pendingNullifiers.has(n.siloedNullifier.value));
|
|
220
238
|
const notes = pickNotes([
|
|
@@ -241,7 +259,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
241
259
|
limit,
|
|
242
260
|
offset
|
|
243
261
|
});
|
|
244
|
-
this.
|
|
262
|
+
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
263
|
return notes;
|
|
246
264
|
}
|
|
247
265
|
/**
|
|
@@ -254,8 +272,8 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
254
272
|
* @param noteItems - The items to be included in a Note.
|
|
255
273
|
* @param noteHash - A hash of the new note.
|
|
256
274
|
* @returns
|
|
257
|
-
*/
|
|
258
|
-
this.
|
|
275
|
+
*/ notifyCreatedNote(owner, storageSlot, randomness, noteTypeId, noteItems, noteHash, counter) {
|
|
276
|
+
this.logger.debug(`Notified of new note with inner hash ${noteHash}`, {
|
|
259
277
|
contractAddress: this.callContext.contractAddress,
|
|
260
278
|
storageSlot,
|
|
261
279
|
randomness,
|
|
@@ -286,7 +304,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
286
304
|
* within the current transaction/execution.
|
|
287
305
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
288
306
|
* @param noteHash - A hash of the new note.
|
|
289
|
-
*/ async
|
|
307
|
+
*/ async notifyNullifiedNote(innerNullifier, noteHash, counter) {
|
|
290
308
|
const nullifiedNoteHashCounter = await this.noteCache.nullifyNote(this.callContext.contractAddress, innerNullifier, noteHash);
|
|
291
309
|
if (nullifiedNoteHashCounter !== undefined) {
|
|
292
310
|
this.noteHashNullifierCounterMap.set(nullifiedNoteHashCounter, counter);
|
|
@@ -297,22 +315,33 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
297
315
|
* within the current transaction/execution.
|
|
298
316
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
299
317
|
* @param noteHash - A hash of the new note.
|
|
300
|
-
*/
|
|
301
|
-
this.
|
|
318
|
+
*/ notifyCreatedNullifier(innerNullifier) {
|
|
319
|
+
this.logger.debug(`Notified of new inner nullifier ${innerNullifier}`, {
|
|
302
320
|
contractAddress: this.contractAddress
|
|
303
321
|
});
|
|
304
322
|
return this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
|
|
305
323
|
}
|
|
306
324
|
/**
|
|
325
|
+
* Check if a nullifier has been emitted in the same transaction, i.e. if notifyCreatedNullifier has been
|
|
326
|
+
* called for this inner nullifier from the contract with the specified address.
|
|
327
|
+
* @param innerNullifier - The inner nullifier to check.
|
|
328
|
+
* @param contractAddress - Address of the contract that emitted the nullifier.
|
|
329
|
+
* @returns A boolean indicating whether the nullifier is pending or not.
|
|
330
|
+
*/ async isNullifierPending(innerNullifier, contractAddress) {
|
|
331
|
+
const siloedNullifier = await siloNullifier(contractAddress, innerNullifier);
|
|
332
|
+
const isNullifierPending = this.noteCache.getNullifiers(contractAddress).has(siloedNullifier.toBigInt());
|
|
333
|
+
return Promise.resolve(isNullifierPending);
|
|
334
|
+
}
|
|
335
|
+
/**
|
|
307
336
|
* Emit a contract class log.
|
|
308
337
|
* This fn exists because we only carry a poseidon hash through the kernels, and need to
|
|
309
338
|
* keep the preimage in ts for later.
|
|
310
339
|
* @param log - The contract class log to be emitted.
|
|
311
340
|
* @param counter - The contract class log's counter.
|
|
312
|
-
*/
|
|
341
|
+
*/ notifyCreatedContractClassLog(log, counter) {
|
|
313
342
|
this.contractClassLogs.push(new CountedContractClassLog(log, counter));
|
|
314
343
|
const text = log.toBuffer().toString('hex');
|
|
315
|
-
this.
|
|
344
|
+
this.logger.verbose(`Emitted log from ContractClassRegistry: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`);
|
|
316
345
|
}
|
|
317
346
|
#checkValidStaticCall(childExecutionResult) {
|
|
318
347
|
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) {
|
|
@@ -327,21 +356,51 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
327
356
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
328
357
|
* @param isStaticCall - Whether the call is a static call.
|
|
329
358
|
* @returns The execution result.
|
|
330
|
-
*/ async
|
|
359
|
+
*/ async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
331
360
|
if (!this.simulator) {
|
|
332
361
|
// In practice it is only when creating inline private contexts in a Noir test using TXE that we create an
|
|
333
362
|
// instance of this class without a simulator.
|
|
334
363
|
throw new Error('No simulator provided, cannot perform a nested private call');
|
|
335
364
|
}
|
|
336
365
|
const simulatorSetupTimer = new Timer();
|
|
337
|
-
this.
|
|
366
|
+
this.logger.debug(`Calling private function ${targetContractAddress}:${functionSelector} from ${this.callContext.contractAddress}`);
|
|
338
367
|
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
339
|
-
await
|
|
340
|
-
await this.contractStore.syncPrivateState(targetContractAddress, functionSelector, this.utilityExecutor);
|
|
368
|
+
await this.contractSyncService.ensureContractSynced(targetContractAddress, functionSelector, this.utilityExecutor, this.anchorBlockHeader, this.jobId, this.scopes);
|
|
341
369
|
const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(targetContractAddress, functionSelector);
|
|
342
370
|
const derivedTxContext = this.txContext.clone();
|
|
343
371
|
const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
|
|
344
|
-
const privateExecutionOracle = new PrivateExecutionOracle(
|
|
372
|
+
const privateExecutionOracle = new PrivateExecutionOracle({
|
|
373
|
+
argsHash,
|
|
374
|
+
txContext: derivedTxContext,
|
|
375
|
+
callContext: derivedCallContext,
|
|
376
|
+
anchorBlockHeader: this.anchorBlockHeader,
|
|
377
|
+
utilityExecutor: this.utilityExecutor,
|
|
378
|
+
authWitnesses: this.authWitnesses,
|
|
379
|
+
capsules: this.capsules,
|
|
380
|
+
executionCache: this.executionCache,
|
|
381
|
+
noteCache: this.noteCache,
|
|
382
|
+
taggingIndexCache: this.taggingIndexCache,
|
|
383
|
+
contractStore: this.contractStore,
|
|
384
|
+
noteStore: this.noteStore,
|
|
385
|
+
keyStore: this.keyStore,
|
|
386
|
+
addressStore: this.addressStore,
|
|
387
|
+
aztecNode: this.aztecNode,
|
|
388
|
+
senderTaggingStore: this.senderTaggingStore,
|
|
389
|
+
recipientTaggingStore: this.recipientTaggingStore,
|
|
390
|
+
senderAddressBookStore: this.senderAddressBookStore,
|
|
391
|
+
capsuleService: this.capsuleService,
|
|
392
|
+
privateEventStore: this.privateEventStore,
|
|
393
|
+
messageContextService: this.messageContextService,
|
|
394
|
+
contractSyncService: this.contractSyncService,
|
|
395
|
+
jobId: this.jobId,
|
|
396
|
+
totalPublicCalldataCount: this.totalPublicCalldataCount,
|
|
397
|
+
sideEffectCounter,
|
|
398
|
+
log: this.logger,
|
|
399
|
+
scopes: this.scopes,
|
|
400
|
+
senderForTags: this.senderForTags,
|
|
401
|
+
simulator: this.simulator,
|
|
402
|
+
l2TipsStore: this.l2TipsStore
|
|
403
|
+
});
|
|
345
404
|
const setupTime = simulatorSetupTimer.ms();
|
|
346
405
|
const childExecutionResult = await executePrivateFunction(this.simulator, privateExecutionOracle, targetArtifact, targetContractAddress, functionSelector);
|
|
347
406
|
if (isStaticCall) {
|
|
@@ -358,7 +417,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
358
417
|
returnsHash: publicInputs.returnsHash
|
|
359
418
|
};
|
|
360
419
|
}
|
|
361
|
-
|
|
420
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */ assertValidPublicCalldata(calldataHash) {
|
|
362
421
|
const calldata = this.executionCache.getPreimage(calldataHash);
|
|
363
422
|
if (!calldata) {
|
|
364
423
|
throw new Error('Calldata for public call not found in cache');
|
|
@@ -367,31 +426,12 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
367
426
|
if (this.totalPublicCalldataCount > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
|
|
368
427
|
throw new Error(`Too many total args to all enqueued public calls! (> ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS})`);
|
|
369
428
|
}
|
|
370
|
-
}
|
|
371
|
-
/**
|
|
372
|
-
* Verify relevant information when a public function is enqueued.
|
|
373
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
374
|
-
* @param calldataHash - The hash of the function selector and arguments.
|
|
375
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
376
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
377
|
-
*/ privateNotifyEnqueuedPublicFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
378
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
379
|
-
return Promise.resolve();
|
|
380
|
-
}
|
|
381
|
-
/**
|
|
382
|
-
* Verify relevant information when a public teardown function is set.
|
|
383
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
384
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
385
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
386
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
387
|
-
*/ privateNotifySetPublicTeardownFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
388
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
389
429
|
return Promise.resolve();
|
|
390
430
|
}
|
|
391
|
-
|
|
431
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter) {
|
|
392
432
|
return this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
|
|
393
433
|
}
|
|
394
|
-
|
|
434
|
+
isExecutionInRevertiblePhase(sideEffectCounter) {
|
|
395
435
|
return Promise.resolve(this.noteCache.isSideEffectCounterRevertible(sideEffectCounter));
|
|
396
436
|
}
|
|
397
437
|
/**
|
|
@@ -406,10 +446,4 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
406
446
|
getDebugFunctionName() {
|
|
407
447
|
return this.contractStore.getDebugFunctionName(this.contractAddress, this.callContext.functionSelector);
|
|
408
448
|
}
|
|
409
|
-
utilityEmitOffchainEffect(data) {
|
|
410
|
-
this.offchainEffects.push({
|
|
411
|
-
data
|
|
412
|
-
});
|
|
413
|
-
return Promise.resolve();
|
|
414
|
-
}
|
|
415
449
|
}
|