@aztec/pxe 0.0.1-commit.04852196a → 0.0.1-commit.04d373f
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.d.ts +12 -2
- package/dest/bin/check_oracle_version.d.ts.map +1 -1
- package/dest/bin/check_oracle_version.js +31 -25
- package/dest/bin/index.d.ts +2 -0
- package/dest/bin/index.d.ts.map +1 -0
- package/dest/bin/index.js +1 -0
- package/dest/block_synchronizer/block_stream_source.d.ts +10 -0
- package/dest/block_synchronizer/block_stream_source.d.ts.map +1 -0
- package/dest/block_synchronizer/block_stream_source.js +62 -0
- package/dest/block_synchronizer/block_synchronizer.d.ts +6 -2
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +30 -10
- package/dest/config/index.d.ts +7 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +12 -14
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +16 -5
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +51 -16
- 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 -11
- 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 -15
- package/dest/contract_function_simulator/index.d.ts +4 -1
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +3 -0
- package/dest/contract_function_simulator/noir-structs/bounded_vec.d.ts +48 -0
- package/dest/contract_function_simulator/noir-structs/bounded_vec.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/bounded_vec.js +45 -0
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +4 -6
- 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 +8 -9
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +13 -3
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +35 -4
- 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 +4 -7
- 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 +6 -10
- package/dest/contract_function_simulator/noir-structs/option.d.ts +61 -0
- package/dest/contract_function_simulator/noir-structs/option.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/option.js +62 -0
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +50 -38
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts +2 -2
- package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/note_packing_utils.js +2 -2
- package/dest/contract_function_simulator/oracle/oracle.d.ts +73 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +403 -262
- package/dest/contract_function_simulator/oracle/oracle_registry.d.ts +147 -0
- package/dest/contract_function_simulator/oracle/oracle_registry.d.ts.map +1 -0
- package/dest/contract_function_simulator/oracle/oracle_registry.js +1199 -0
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +36 -62
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +77 -80
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +100 -57
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +375 -122
- 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 +20 -3
- 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 +35 -64
- package/dest/contract_logging.d.ts +9 -4
- package/dest/contract_logging.d.ts.map +1 -1
- package/dest/contract_logging.js +21 -6
- package/dest/contract_sync/contract_sync_service.d.ts +7 -8
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
- package/dest/contract_sync/contract_sync_service.js +87 -49
- package/dest/contract_sync/helpers.d.ts +2 -4
- package/dest/contract_sync/helpers.d.ts.map +1 -1
- package/dest/contract_sync/helpers.js +12 -14
- package/dest/debug/pxe_debug_utils.d.ts +3 -8
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/debug/pxe_debug_utils.js +0 -6
- package/dest/entrypoints/client/bundle/index.d.ts +1 -2
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +0 -1
- 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 +13 -5
- package/dest/entrypoints/client/lazy/index.d.ts +1 -2
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +0 -1
- 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 +13 -5
- package/dest/entrypoints/pxe_creation_options.d.ts +9 -1
- 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 +3 -3
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +2 -2
- package/dest/entrypoints/server/utils.d.ts +4 -3
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +13 -5
- package/dest/events/event_service.d.ts +15 -6
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +44 -11
- 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/hooks/authorize_utility_call.d.ts +41 -0
- package/dest/hooks/authorize_utility_call.d.ts.map +1 -0
- package/dest/hooks/authorize_utility_call.js +4 -0
- package/dest/hooks/execution_hooks.d.ts +42 -0
- package/dest/hooks/execution_hooks.d.ts.map +1 -0
- package/dest/hooks/execution_hooks.js +9 -0
- package/dest/hooks/index.d.ts +4 -0
- package/dest/hooks/index.d.ts.map +1 -0
- package/dest/hooks/index.js +1 -0
- package/dest/logs/log_service.d.ts +9 -9
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +122 -72
- 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 +38 -0
- package/dest/notes/note_service.d.ts +27 -6
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +80 -56
- package/dest/notes_filter.d.ts +2 -3
- package/dest/notes_filter.d.ts.map +1 -1
- package/dest/oracle_version.d.ts +4 -3
- package/dest/oracle_version.d.ts.map +1 -1
- package/dest/oracle_version.js +20 -10
- package/dest/private_kernel/batch_planner.d.ts +47 -0
- package/dest/private_kernel/batch_planner.d.ts.map +1 -0
- package/dest/private_kernel/batch_planner.js +104 -0
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +1 -1
- package/dest/private_kernel/hints/test_utils.d.ts +1 -1
- package/dest/private_kernel/hints/test_utils.d.ts.map +1 -1
- package/dest/private_kernel/hints/test_utils.js +2 -3
- package/dest/private_kernel/private_kernel_execution_prover.d.ts +6 -2
- package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.js +152 -59
- package/dest/private_kernel/private_kernel_oracle.d.ts +10 -10
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_oracle.js +24 -22
- package/dest/pxe.d.ts +59 -10
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +154 -93
- package/dest/storage/anchor_block_store/anchor_block_store.js +1 -1
- package/dest/storage/backwards_compatibility_tests/kv_store_snapshot.d.ts +42 -0
- package/dest/storage/backwards_compatibility_tests/kv_store_snapshot.d.ts.map +1 -0
- package/dest/storage/backwards_compatibility_tests/kv_store_snapshot.js +93 -0
- package/dest/storage/backwards_compatibility_tests/schema_tests.d.ts +15 -0
- package/dest/storage/backwards_compatibility_tests/schema_tests.d.ts.map +1 -0
- package/dest/storage/backwards_compatibility_tests/schema_tests.js +591 -0
- package/dest/storage/backwards_compatibility_tests/store_spy.d.ts +19 -0
- package/dest/storage/backwards_compatibility_tests/store_spy.d.ts.map +1 -0
- package/dest/storage/backwards_compatibility_tests/store_spy.js +63 -0
- 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 +36 -28
- 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 +1 -1
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +9 -26
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +1 -1
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +2 -2
- package/dest/storage/open_pxe_stores.d.ts +33 -0
- package/dest/storage/open_pxe_stores.d.ts.map +1 -0
- package/dest/storage/open_pxe_stores.js +27 -0
- 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 +3 -0
- package/dest/storage/private_event_store/stored_private_event.js +1 -1
- 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/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 +141 -115
- package/dest/tagging/get_all_logs_by_tags.d.ts +34 -10
- package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
- package/dest/tagging/get_all_logs_by_tags.js +36 -37
- package/dest/tagging/index.d.ts +6 -5
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/index.js +4 -3
- package/dest/tagging/persist_sender_tagging_index_ranges.d.ts +29 -0
- package/dest/tagging/persist_sender_tagging_index_ranges.d.ts.map +1 -0
- package/dest/tagging/persist_sender_tagging_index_ranges.js +42 -0
- package/dest/tagging/recipient_sync/sync_tagged_private_logs.d.ts +56 -0
- package/dest/tagging/recipient_sync/sync_tagged_private_logs.d.ts.map +1 -0
- package/dest/tagging/recipient_sync/sync_tagged_private_logs.js +163 -0
- package/dest/tagging/recipient_sync/utils/find_highest_indexes.d.ts +3 -3
- package/dest/tagging/recipient_sync/utils/find_highest_indexes.d.ts.map +1 -1
- package/dest/tagging/reconcile_tagging_index_ranges.d.ts +36 -0
- package/dest/tagging/reconcile_tagging_index_ranges.d.ts.map +1 -0
- package/dest/tagging/reconcile_tagging_index_ranges.js +74 -0
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -5
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +29 -10
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +13 -7
- 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 +41 -10
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -4
- 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 +26 -13
- package/package.json +20 -17
- package/src/bin/check_oracle_version.ts +41 -31
- package/src/bin/index.ts +1 -0
- package/src/block_synchronizer/block_stream_source.ts +81 -0
- package/src/block_synchronizer/block_synchronizer.ts +33 -11
- package/src/config/index.ts +14 -8
- package/src/contract_function_simulator/contract_function_simulator.ts +80 -20
- package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -18
- package/src/contract_function_simulator/index.ts +3 -0
- package/src/contract_function_simulator/noir-structs/bounded_vec.ts +55 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +10 -9
- package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +36 -3
- 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 -10
- package/src/contract_function_simulator/noir-structs/option.ts +69 -0
- package/src/contract_function_simulator/oracle/interfaces.ts +65 -55
- package/src/contract_function_simulator/oracle/note_packing_utils.ts +3 -3
- package/src/contract_function_simulator/oracle/oracle.ts +497 -451
- package/src/contract_function_simulator/oracle/oracle_registry.ts +904 -0
- package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +102 -115
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +531 -202
- package/src/contract_function_simulator/pick_notes.ts +22 -3
- package/src/contract_function_simulator/proxied_contract_data_source.ts +41 -64
- package/src/contract_logging.ts +18 -5
- package/src/contract_sync/contract_sync_service.ts +120 -83
- package/src/contract_sync/helpers.ts +13 -25
- package/src/debug/pxe_debug_utils.ts +3 -11
- package/src/entrypoints/client/bundle/index.ts +0 -1
- package/src/entrypoints/client/bundle/utils.ts +10 -5
- package/src/entrypoints/client/lazy/index.ts +0 -1
- package/src/entrypoints/client/lazy/utils.ts +10 -5
- package/src/entrypoints/pxe_creation_options.ts +14 -0
- package/src/entrypoints/server/index.ts +2 -2
- package/src/entrypoints/server/utils.ts +15 -6
- package/src/events/event_service.ts +69 -21
- package/src/events/private_event_filter_validator.ts +21 -1
- package/src/hooks/authorize_utility_call.ts +44 -0
- package/src/hooks/execution_hooks.ts +48 -0
- package/src/hooks/index.ts +7 -0
- package/src/logs/log_service.ts +153 -134
- package/src/messages/message_context_service.ts +45 -0
- package/src/notes/note_service.ts +119 -85
- package/src/notes_filter.ts +1 -3
- package/src/oracle_version.ts +20 -10
- package/src/private_kernel/batch_planner.ts +169 -0
- package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +1 -1
- package/src/private_kernel/hints/test_utils.ts +2 -9
- package/src/private_kernel/private_kernel_execution_prover.ts +240 -82
- package/src/private_kernel/private_kernel_oracle.ts +35 -25
- package/src/pxe.ts +262 -98
- package/src/storage/anchor_block_store/anchor_block_store.ts +1 -1
- package/src/storage/backwards_compatibility_tests/__snapshots__/AddressStore.json +22 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/AnchorBlockStore.json +3 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/CapsuleStore.json +16 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/ContractStore.json +28 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/KeyStore.json +52 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/L2TipsKVStore.json +46 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/NoteStore.json +36 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/PrivateEventStore.json +44 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/RecipientTaggingStore.json +18 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/SenderAddressBookStore.json +16 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/SenderTaggingStore.json +22 -0
- package/src/storage/backwards_compatibility_tests/__snapshots__/opened_stores.json +97 -0
- package/src/storage/backwards_compatibility_tests/kv_store_snapshot.ts +122 -0
- package/src/storage/backwards_compatibility_tests/schema_tests.ts +712 -0
- package/src/storage/backwards_compatibility_tests/store_spy.ts +73 -0
- package/src/storage/capsule_store/capsule_service.ts +90 -0
- package/src/storage/capsule_store/capsule_store.ts +44 -26
- package/src/storage/capsule_store/index.ts +1 -0
- package/src/storage/contract_store/contract_store.ts +14 -35
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +2 -5
- package/src/storage/open_pxe_stores.ts +49 -0
- package/src/storage/private_event_store/private_event_store.ts +4 -0
- package/src/storage/private_event_store/stored_private_event.ts +1 -1
- package/src/storage/tagging_store/recipient_tagging_store.ts +5 -9
- package/src/storage/tagging_store/sender_tagging_store.ts +185 -138
- package/src/tagging/get_all_logs_by_tags.ts +78 -50
- package/src/tagging/index.ts +5 -4
- package/src/tagging/persist_sender_tagging_index_ranges.ts +57 -0
- package/src/tagging/recipient_sync/sync_tagged_private_logs.ts +240 -0
- package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
- package/src/tagging/reconcile_tagging_index_ranges.ts +102 -0
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +52 -12
- package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +44 -14
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +23 -14
- package/dest/access_scopes.d.ts +0 -9
- package/dest/access_scopes.d.ts.map +0 -1
- package/dest/access_scopes.js +0 -6
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +0 -14
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +0 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +0 -99
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +0 -14
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +0 -1
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +0 -33
- package/src/access_scopes.ts +0 -9
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +0 -140
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +0 -44
|
@@ -45,11 +45,11 @@ import { Oracle } from './oracle.js';
|
|
|
45
45
|
appCircuitName: functionName
|
|
46
46
|
});
|
|
47
47
|
const contractClassLogs = privateExecutionOracle.getContractClassLogs();
|
|
48
|
-
const rawReturnValues = await privateExecutionOracle.
|
|
48
|
+
const rawReturnValues = await privateExecutionOracle.getHashPreimage(publicInputs.returnsHash);
|
|
49
49
|
const newNotes = privateExecutionOracle.getNewNotes();
|
|
50
50
|
const noteHashNullifierCounterMap = privateExecutionOracle.getNoteHashNullifierCounterMap();
|
|
51
51
|
const offchainEffects = privateExecutionOracle.getOffchainEffects();
|
|
52
|
-
const
|
|
52
|
+
const taggingIndexRanges = privateExecutionOracle.getUsedTaggingIndexRanges();
|
|
53
53
|
const nestedExecutionResults = privateExecutionOracle.getNestedExecutionResults();
|
|
54
54
|
let timerSubtractionList = nestedExecutionResults;
|
|
55
55
|
let witgenTime = duration;
|
|
@@ -59,7 +59,9 @@ import { Oracle } from './oracle.js';
|
|
|
59
59
|
timerSubtractionList = timerSubtractionList.flatMap((nested)=>nested.nestedExecutionResults ?? []);
|
|
60
60
|
}
|
|
61
61
|
log.debug(`Returning from call to ${contractAddress.toString()}:${functionSelector}`);
|
|
62
|
-
return new PrivateCallExecutionResult(artifact.bytecode, Buffer.from(artifact.verificationKey, 'base64'), partialWitness, publicInputs, newNotes, noteHashNullifierCounterMap, rawReturnValues, offchainEffects
|
|
62
|
+
return new PrivateCallExecutionResult(artifact.bytecode, Buffer.from(artifact.verificationKey, 'base64'), partialWitness, publicInputs, newNotes, noteHashNullifierCounterMap, rawReturnValues, offchainEffects.map((e)=>({
|
|
63
|
+
data: e.data
|
|
64
|
+
})), taggingIndexRanges, nestedExecutionResults, contractClassLogs, {
|
|
63
65
|
timings: {
|
|
64
66
|
witgen: witgenTime,
|
|
65
67
|
oracles: acirExecutionResult.oracles
|
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
-
import { type
|
|
3
|
-
import { type FunctionAbi, type FunctionCall, FunctionSelector, type NoteSelector } from '@aztec/stdlib/abi';
|
|
2
|
+
import { type FunctionAbi, FunctionSelector, type NoteSelector } from '@aztec/stdlib/abi';
|
|
4
3
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
4
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
6
|
-
import { type ContractClassLog, type
|
|
7
|
-
import { Tag } from '@aztec/stdlib/logs';
|
|
5
|
+
import { type ContractClassLog, Tag, type TaggingIndexRange } from '@aztec/stdlib/logs';
|
|
8
6
|
import { type NoteStatus } from '@aztec/stdlib/note';
|
|
9
7
|
import { CallContext, CountedContractClassLog, NoteAndSlot, PrivateCallExecutionResult, type TxContext } from '@aztec/stdlib/tx';
|
|
10
|
-
import type { AccessScopes } from '../../access_scopes.js';
|
|
11
|
-
import type { ContractSyncService } from '../../contract_sync/contract_sync_service.js';
|
|
12
8
|
import type { SenderTaggingStore } from '../../storage/tagging_store/sender_tagging_store.js';
|
|
13
9
|
import type { ExecutionNoteCache } from '../execution_note_cache.js';
|
|
14
10
|
import { ExecutionTaggingIndexCache } from '../execution_tagging_index_cache.js';
|
|
15
11
|
import type { HashedValuesCache } from '../hashed_values_cache.js';
|
|
12
|
+
import { BoundedVec } from '../noir-structs/bounded_vec.js';
|
|
13
|
+
import { Option } from '../noir-structs/option.js';
|
|
16
14
|
import type { IPrivateExecutionOracle, NoteData } from './interfaces.js';
|
|
17
15
|
import { UtilityExecutionOracle, type UtilityExecutionOracleArgs } from './utility_execution_oracle.js';
|
|
18
16
|
/** Args for PrivateExecutionOracle constructor. */
|
|
@@ -20,17 +18,13 @@ export type PrivateExecutionOracleArgs = Omit<UtilityExecutionOracleArgs, 'contr
|
|
|
20
18
|
argsHash: Fr;
|
|
21
19
|
txContext: TxContext;
|
|
22
20
|
callContext: CallContext;
|
|
23
|
-
/** Needed to trigger contract synchronization before nested calls */
|
|
24
|
-
utilityExecutor: (call: FunctionCall, scopes: AccessScopes) => Promise<void>;
|
|
25
21
|
executionCache: HashedValuesCache;
|
|
26
22
|
noteCache: ExecutionNoteCache;
|
|
27
23
|
taggingIndexCache: ExecutionTaggingIndexCache;
|
|
28
24
|
senderTaggingStore: SenderTaggingStore;
|
|
29
|
-
contractSyncService: ContractSyncService;
|
|
30
25
|
totalPublicCalldataCount?: number;
|
|
31
26
|
sideEffectCounter?: number;
|
|
32
27
|
senderForTags?: AztecAddress;
|
|
33
|
-
simulator?: CircuitSimulator;
|
|
34
28
|
};
|
|
35
29
|
/**
|
|
36
30
|
* The execution oracle for the private part of a transaction.
|
|
@@ -49,21 +43,18 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
49
43
|
private newNotes;
|
|
50
44
|
private noteHashNullifierCounterMap;
|
|
51
45
|
private contractClassLogs;
|
|
52
|
-
private offchainEffects;
|
|
53
46
|
private nestedExecutionResults;
|
|
54
47
|
private readonly argsHash;
|
|
55
48
|
private readonly txContext;
|
|
56
49
|
private readonly callContext;
|
|
57
|
-
private readonly utilityExecutor;
|
|
58
50
|
private readonly executionCache;
|
|
59
51
|
private readonly noteCache;
|
|
60
52
|
private readonly taggingIndexCache;
|
|
61
53
|
private readonly senderTaggingStore;
|
|
62
|
-
private readonly contractSyncService;
|
|
63
54
|
private totalPublicCalldataCount;
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
private readonly
|
|
55
|
+
private readonly initialSideEffectCounter;
|
|
56
|
+
/** Sender for tags passed in at oracle construction time. Returned by `getSenderForTags`. */
|
|
57
|
+
private readonly defaultSenderForTags;
|
|
67
58
|
constructor(args: PrivateExecutionOracleArgs);
|
|
68
59
|
getPrivateContextInputs(): PrivateContextInputs;
|
|
69
60
|
/**
|
|
@@ -82,15 +73,9 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
82
73
|
*/
|
|
83
74
|
getContractClassLogs(): CountedContractClassLog[];
|
|
84
75
|
/**
|
|
85
|
-
*
|
|
76
|
+
* Returns the tagging index ranges that were used in this execution (and that need to be stored in the db).
|
|
86
77
|
*/
|
|
87
|
-
|
|
88
|
-
data: Fr[];
|
|
89
|
-
}[];
|
|
90
|
-
/**
|
|
91
|
-
* Returns the pre-tags that were used in this execution (and that need to be stored in the db).
|
|
92
|
-
*/
|
|
93
|
-
getUsedPreTags(): PreTag[];
|
|
78
|
+
getUsedTaggingIndexRanges(): TaggingIndexRange[];
|
|
94
79
|
/**
|
|
95
80
|
* Return the nested execution results during this execution.
|
|
96
81
|
*/
|
|
@@ -102,42 +87,44 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
102
87
|
* for a tag in order to emit a log. Constrained tagging should not use this as there is no
|
|
103
88
|
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
104
89
|
*
|
|
105
|
-
*
|
|
106
|
-
* 'senderForTags' value (unless it is replaced).
|
|
90
|
+
* Returns the wallet-supplied default sender for tags, or `None` if no default was provided.
|
|
107
91
|
*/
|
|
108
|
-
getSenderForTags(): Promise<AztecAddress
|
|
92
|
+
getSenderForTags(): Promise<Option<AztecAddress>>;
|
|
109
93
|
/**
|
|
110
|
-
*
|
|
94
|
+
* Returns the next app tag for a given sender and recipient pair (unconstrained delivery).
|
|
111
95
|
*
|
|
112
|
-
*
|
|
113
|
-
*
|
|
114
|
-
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
96
|
+
* The simulator computes the directional tagging secret (derived via ECDH from `(sender, recipient, contract)`),
|
|
97
|
+
* as well as the full siloed tag, and hands the opaque value back to the caller.
|
|
115
98
|
*
|
|
116
|
-
* Account contracts typically set this value before calling other contracts. The value persists
|
|
117
|
-
* through nested calls, meaning all calls down the stack will use the same 'senderForTags'
|
|
118
|
-
* value (unless it is replaced by another call to this setter).
|
|
119
|
-
*/
|
|
120
|
-
setSenderForTags(senderForTags: AztecAddress): Promise<void>;
|
|
121
|
-
/**
|
|
122
|
-
* Returns the next app tag for a given sender and recipient pair.
|
|
123
99
|
* @param sender - The address sending the log
|
|
124
100
|
* @param recipient - The address receiving the log
|
|
125
101
|
* @returns An app tag to be used in a log.
|
|
126
102
|
*/
|
|
127
103
|
getNextAppTagAsSender(sender: AztecAddress, recipient: AztecAddress): Promise<Tag>;
|
|
104
|
+
/**
|
|
105
|
+
* Returns the next sender-side index for a constrained-delivery app-siloed shared secret.
|
|
106
|
+
*
|
|
107
|
+
* Unlike the unconstrained variant, the simulator does not compute the secret: it was supplied by the calling contract
|
|
108
|
+
* (which retrieved it from an onchain handshake registry). The simulator only acts as a per-secret index counter.
|
|
109
|
+
* The caller computes the onchain tag itself.
|
|
110
|
+
*
|
|
111
|
+
* @param appSiloedSecret - The app-siloed shared secret retrieved from the handshake registry by the caller.
|
|
112
|
+
* @returns The next index to use for this secret.
|
|
113
|
+
*/
|
|
114
|
+
getNextConstrainedTaggingIndex(appSiloedSecret: Fr): Promise<number>;
|
|
128
115
|
/**
|
|
129
116
|
* Store values in the execution cache.
|
|
130
117
|
* @param values - Values to store.
|
|
131
118
|
* @returns The hash of the values.
|
|
132
119
|
*/
|
|
133
|
-
|
|
120
|
+
setHashPreimage(values: Fr[], hash: Fr): void;
|
|
134
121
|
/**
|
|
135
122
|
* Gets values from the execution cache.
|
|
136
123
|
* @param hash - Hash of the values.
|
|
137
124
|
* @returns The values.
|
|
138
125
|
*/
|
|
139
|
-
|
|
140
|
-
|
|
126
|
+
getHashPreimage(hash: Fr): Promise<Fr[]>;
|
|
127
|
+
doesNullifierExist(innerNullifier: Fr): Promise<boolean>;
|
|
141
128
|
/**
|
|
142
129
|
* Gets some notes for a storage slot.
|
|
143
130
|
*
|
|
@@ -159,7 +146,7 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
159
146
|
* @param status - The status of notes to fetch.
|
|
160
147
|
* @returns Array of note data.
|
|
161
148
|
*/
|
|
162
|
-
getNotes(owner: AztecAddress
|
|
149
|
+
getNotes(owner: Option<AztecAddress>, storageSlot: Fr, numSelects: number, selectByIndexes: number[], selectByOffsets: number[], selectByLengths: number[], selectValues: Fr[], selectComparators: number[], sortByIndexes: number[], sortByOffsets: number[], sortByLengths: number[], sortOrder: number[], limit: number, offset: number, status: NoteStatus, maxNotes: number, packedHintedNoteLength: number): Promise<BoundedVec<NoteData>>;
|
|
163
150
|
/**
|
|
164
151
|
* Keep track of the new note created during execution.
|
|
165
152
|
* It can be used in subsequent calls (or transactions when chaining txs is possible).
|
|
@@ -215,26 +202,13 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
215
202
|
endSideEffectCounter: Fr;
|
|
216
203
|
returnsHash: Fr;
|
|
217
204
|
}>;
|
|
218
|
-
/**
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
224
|
-
*/
|
|
225
|
-
notifyEnqueuedPublicFunctionCall(_targetContractAddress: AztecAddress, calldataHash: Fr, _sideEffectCounter: number, _isStaticCall: boolean): Promise<void>;
|
|
226
|
-
/**
|
|
227
|
-
* Verify relevant information when a public teardown function is set.
|
|
228
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
229
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
230
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
231
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
232
|
-
*/
|
|
233
|
-
notifySetPublicTeardownFunctionCall(_targetContractAddress: AztecAddress, calldataHash: Fr, _sideEffectCounter: number, _isStaticCall: boolean): Promise<void>;
|
|
234
|
-
notifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: number): Promise<void>;
|
|
235
|
-
isSideEffectCounterRevertible(sideEffectCounter: number): Promise<boolean>;
|
|
205
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */
|
|
206
|
+
assertValidPublicCalldata(calldataHash: Fr): Promise<void>;
|
|
207
|
+
getTotalPublicCalldataCount(): number;
|
|
208
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter: number): Promise<void>;
|
|
209
|
+
isExecutionInRevertiblePhase(sideEffectCounter: number): Promise<boolean>;
|
|
236
210
|
private deriveCallContext;
|
|
237
211
|
getDebugFunctionName(): Promise<string>;
|
|
238
|
-
|
|
212
|
+
protected get callerContext(): "private" | "private view";
|
|
239
213
|
}
|
|
240
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb25fb3JhY2xlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL29yYWNsZS9wcml2YXRlX2V4ZWN1dGlvbl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFFaEIsZ0JBQWdCLEVBQ2hCLEtBQUssWUFBWSxFQUVsQixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEVBR0wsS0FBSyxnQkFBZ0IsRUFDckIsR0FBRyxFQUNILEtBQUssaUJBQWlCLEVBQ3ZCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFRLEtBQUssVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUNMLFdBQVcsRUFDWCx1QkFBdUIsRUFDdkIsV0FBVyxFQUNYLDBCQUEwQixFQUMxQixLQUFLLFNBQVMsRUFDZixNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scURBQXFELENBQUM7QUFFOUYsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ25FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM1RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFbkQsT0FB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution_oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"private_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution_oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,16 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
4
4
|
import { Timer } from '@aztec/foundation/timer';
|
|
5
5
|
import { toACVMWitness } from '@aztec/simulator/client';
|
|
6
6
|
import { FunctionSelector, countArgumentsSize } from '@aztec/stdlib/abi';
|
|
7
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
7
8
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
8
9
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
9
|
-
import {
|
|
10
|
-
import { Tag } from '@aztec/stdlib/logs';
|
|
10
|
+
import { AppTaggingSecret, AppTaggingSecretKind, 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
|
+
import { BoundedVec } from '../noir-structs/bounded_vec.js';
|
|
16
|
+
import { Option } from '../noir-structs/option.js';
|
|
15
17
|
import { pickNotes } from '../pick_notes.js';
|
|
16
18
|
import { executePrivateFunction } from './private_execution.js';
|
|
17
19
|
import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
@@ -29,21 +31,17 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
29
31
|
*/ newNotes = [];
|
|
30
32
|
noteHashNullifierCounterMap = new Map();
|
|
31
33
|
contractClassLogs = [];
|
|
32
|
-
offchainEffects = [];
|
|
33
34
|
nestedExecutionResults = [];
|
|
34
35
|
argsHash;
|
|
35
36
|
txContext;
|
|
36
37
|
callContext;
|
|
37
|
-
utilityExecutor;
|
|
38
38
|
executionCache;
|
|
39
39
|
noteCache;
|
|
40
40
|
taggingIndexCache;
|
|
41
41
|
senderTaggingStore;
|
|
42
|
-
contractSyncService;
|
|
43
42
|
totalPublicCalldataCount;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
simulator;
|
|
43
|
+
initialSideEffectCounter;
|
|
44
|
+
/** Sender for tags passed in at oracle construction time. Returned by `getSenderForTags`. */ defaultSenderForTags;
|
|
47
45
|
constructor(args){
|
|
48
46
|
super({
|
|
49
47
|
...args,
|
|
@@ -53,19 +51,16 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
53
51
|
this.argsHash = args.argsHash;
|
|
54
52
|
this.txContext = args.txContext;
|
|
55
53
|
this.callContext = args.callContext;
|
|
56
|
-
this.utilityExecutor = args.utilityExecutor;
|
|
57
54
|
this.executionCache = args.executionCache;
|
|
58
55
|
this.noteCache = args.noteCache;
|
|
59
56
|
this.taggingIndexCache = args.taggingIndexCache;
|
|
60
57
|
this.senderTaggingStore = args.senderTaggingStore;
|
|
61
|
-
this.contractSyncService = args.contractSyncService;
|
|
62
58
|
this.totalPublicCalldataCount = args.totalPublicCalldataCount ?? 0;
|
|
63
|
-
this.
|
|
64
|
-
this.
|
|
65
|
-
this.simulator = args.simulator;
|
|
59
|
+
this.initialSideEffectCounter = args.sideEffectCounter ?? 0;
|
|
60
|
+
this.defaultSenderForTags = args.senderForTags;
|
|
66
61
|
}
|
|
67
62
|
getPrivateContextInputs() {
|
|
68
|
-
return new PrivateContextInputs(this.callContext, this.anchorBlockHeader, this.txContext, this.
|
|
63
|
+
return new PrivateContextInputs(this.callContext, this.anchorBlockHeader, this.txContext, this.initialSideEffectCounter);
|
|
69
64
|
}
|
|
70
65
|
// We still need this function until we can get user-defined ordering of structs for fn arguments
|
|
71
66
|
// TODO When that is sorted out on noir side, we can use instead the utilities in serialize.ts
|
|
@@ -103,14 +98,9 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
103
98
|
return this.contractClassLogs;
|
|
104
99
|
}
|
|
105
100
|
/**
|
|
106
|
-
*
|
|
107
|
-
*/
|
|
108
|
-
return this.
|
|
109
|
-
}
|
|
110
|
-
/**
|
|
111
|
-
* Returns the pre-tags that were used in this execution (and that need to be stored in the db).
|
|
112
|
-
*/ getUsedPreTags() {
|
|
113
|
-
return this.taggingIndexCache.getUsedPreTags();
|
|
101
|
+
* Returns the tagging index ranges that were used in this execution (and that need to be stored in the db).
|
|
102
|
+
*/ getUsedTaggingIndexRanges() {
|
|
103
|
+
return this.taggingIndexCache.getUsedTaggingIndexRanges();
|
|
114
104
|
}
|
|
115
105
|
/**
|
|
116
106
|
* Return the nested execution results during this execution.
|
|
@@ -124,44 +114,61 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
124
114
|
* for a tag in order to emit a log. Constrained tagging should not use this as there is no
|
|
125
115
|
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
126
116
|
*
|
|
127
|
-
*
|
|
128
|
-
* 'senderForTags' value (unless it is replaced).
|
|
117
|
+
* Returns the wallet-supplied default sender for tags, or `None` if no default was provided.
|
|
129
118
|
*/ getSenderForTags() {
|
|
130
|
-
return Promise.resolve(this.
|
|
119
|
+
return Promise.resolve(this.defaultSenderForTags ? Option.some(this.defaultSenderForTags) : Option.none(AztecAddress.ZERO));
|
|
131
120
|
}
|
|
132
121
|
/**
|
|
133
|
-
*
|
|
122
|
+
* Returns the next app tag for a given sender and recipient pair (unconstrained delivery).
|
|
134
123
|
*
|
|
135
|
-
*
|
|
136
|
-
*
|
|
137
|
-
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
124
|
+
* The simulator computes the directional tagging secret (derived via ECDH from `(sender, recipient, contract)`),
|
|
125
|
+
* as well as the full siloed tag, and hands the opaque value back to the caller.
|
|
138
126
|
*
|
|
139
|
-
* Account contracts typically set this value before calling other contracts. The value persists
|
|
140
|
-
* through nested calls, meaning all calls down the stack will use the same 'senderForTags'
|
|
141
|
-
* value (unless it is replaced by another call to this setter).
|
|
142
|
-
*/ setSenderForTags(senderForTags) {
|
|
143
|
-
this.senderForTags = senderForTags;
|
|
144
|
-
return Promise.resolve();
|
|
145
|
-
}
|
|
146
|
-
/**
|
|
147
|
-
* Returns the next app tag for a given sender and recipient pair.
|
|
148
127
|
* @param sender - The address sending the log
|
|
149
128
|
* @param recipient - The address receiving the log
|
|
150
129
|
* @returns An app tag to be used in a log.
|
|
151
130
|
*/ async getNextAppTagAsSender(sender, recipient) {
|
|
152
|
-
const extendedSecret = await this.#
|
|
153
|
-
|
|
131
|
+
const extendedSecret = await this.#calculateAppTaggingSecret(this.contractAddress, sender, recipient);
|
|
132
|
+
if (!extendedSecret) {
|
|
133
|
+
// We'd only fail to compute an extended secret if the recipient is an invalid address. To prevent
|
|
134
|
+
// king-of-the-hill attacks, instead of failing we use a random tag. By including a correct-looking tag in the
|
|
135
|
+
// log, the transaction shape is preserved and no privacy is leaked, even if the tag is bogus.
|
|
136
|
+
this.logger.warn(`Computing a tag for invalid recipient ${recipient} - returning a random tag instead`, {
|
|
137
|
+
contractAddress: this.contractAddress
|
|
138
|
+
});
|
|
139
|
+
return Tag.random();
|
|
140
|
+
}
|
|
141
|
+
const index = await this.#reserveNextIndexForSecret(extendedSecret);
|
|
154
142
|
this.logger.debug(`Incrementing tagging index for sender: ${sender}, recipient: ${recipient}, contract: ${this.contractAddress} to ${index}`);
|
|
155
|
-
this.taggingIndexCache.setLastUsedIndex(extendedSecret, index);
|
|
156
143
|
return Tag.compute({
|
|
157
144
|
extendedSecret,
|
|
158
145
|
index
|
|
159
146
|
});
|
|
160
147
|
}
|
|
161
|
-
|
|
148
|
+
/**
|
|
149
|
+
* Returns the next sender-side index for a constrained-delivery app-siloed shared secret.
|
|
150
|
+
*
|
|
151
|
+
* Unlike the unconstrained variant, the simulator does not compute the secret: it was supplied by the calling contract
|
|
152
|
+
* (which retrieved it from an onchain handshake registry). The simulator only acts as a per-secret index counter.
|
|
153
|
+
* The caller computes the onchain tag itself.
|
|
154
|
+
*
|
|
155
|
+
* @param appSiloedSecret - The app-siloed shared secret retrieved from the handshake registry by the caller.
|
|
156
|
+
* @returns The next index to use for this secret.
|
|
157
|
+
*/ async getNextConstrainedTaggingIndex(appSiloedSecret) {
|
|
158
|
+
const secret = new AppTaggingSecret(appSiloedSecret, this.contractAddress, AppTaggingSecretKind.CONSTRAINED);
|
|
159
|
+
const index = await this.#reserveNextIndexForSecret(secret);
|
|
160
|
+
this.logger.debug(`Incrementing tagging index for constrained-delivery secret in contract ${this.contractAddress} to ${index}`);
|
|
161
|
+
return index;
|
|
162
|
+
}
|
|
163
|
+
/** Resolves the next index for a given tagging secret, syncing from chain if it is missing from the in-tx cache. */ async #reserveNextIndexForSecret(secret) {
|
|
164
|
+
const index = await this.#getIndexToUseForSecret(secret);
|
|
165
|
+
this.taggingIndexCache.setLastUsedIndex(secret, index);
|
|
166
|
+
return index;
|
|
167
|
+
}
|
|
168
|
+
async #calculateAppTaggingSecret(contractAddress, sender, recipient) {
|
|
162
169
|
const senderCompleteAddress = await this.getCompleteAddressOrFail(sender);
|
|
163
170
|
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
164
|
-
return
|
|
171
|
+
return AppTaggingSecret.computeUnconstrained(senderCompleteAddress, senderIvsk, recipient, contractAddress, recipient);
|
|
165
172
|
}
|
|
166
173
|
async #getIndexToUseForSecret(secret) {
|
|
167
174
|
// If we have the tagging index in the cache, we use it. If not we obtain it from the execution data provider.
|
|
@@ -183,21 +190,21 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
183
190
|
* Store values in the execution cache.
|
|
184
191
|
* @param values - Values to store.
|
|
185
192
|
* @returns The hash of the values.
|
|
186
|
-
*/
|
|
193
|
+
*/ setHashPreimage(values, hash) {
|
|
187
194
|
return this.executionCache.store(values, hash);
|
|
188
195
|
}
|
|
189
196
|
/**
|
|
190
197
|
* Gets values from the execution cache.
|
|
191
198
|
* @param hash - Hash of the values.
|
|
192
199
|
* @returns The values.
|
|
193
|
-
*/
|
|
200
|
+
*/ getHashPreimage(hash) {
|
|
194
201
|
const preimage = this.executionCache.getPreimage(hash);
|
|
195
202
|
if (!preimage) {
|
|
196
203
|
throw new Error(`Preimage for hash ${hash.toString()} not found in cache`);
|
|
197
204
|
}
|
|
198
205
|
return Promise.resolve(preimage);
|
|
199
206
|
}
|
|
200
|
-
async
|
|
207
|
+
async doesNullifierExist(innerNullifier) {
|
|
201
208
|
// This oracle must be overridden because while utility execution can only meaningfully check if a nullifier exists
|
|
202
209
|
// in the synched block, during private execution there's also the possibility of it being pending, i.e. created
|
|
203
210
|
// in the current transaction.
|
|
@@ -205,7 +212,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
205
212
|
contractAddress: this.contractAddress
|
|
206
213
|
});
|
|
207
214
|
const nullifier = (await siloNullifier(this.contractAddress, innerNullifier)).toBigInt();
|
|
208
|
-
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.
|
|
215
|
+
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.doesNullifierExist(innerNullifier);
|
|
209
216
|
}
|
|
210
217
|
/**
|
|
211
218
|
* Gets some notes for a storage slot.
|
|
@@ -227,12 +234,12 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
227
234
|
* @param offset - The starting index for pagination.
|
|
228
235
|
* @param status - The status of notes to fetch.
|
|
229
236
|
* @returns Array of note data.
|
|
230
|
-
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
237
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status, maxNotes, packedHintedNoteLength) {
|
|
231
238
|
// Nullified pending notes are already removed from the list.
|
|
232
|
-
const pendingNotes = this.noteCache.getNotes(this.callContext.contractAddress, owner, storageSlot);
|
|
239
|
+
const pendingNotes = this.noteCache.getNotes(this.callContext.contractAddress, owner.value, storageSlot);
|
|
233
240
|
const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
|
|
234
241
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
235
|
-
const dbNotes = await noteService.getNotes(this.callContext.contractAddress, owner, storageSlot, status, this.scopes);
|
|
242
|
+
const dbNotes = await noteService.getNotes(this.callContext.contractAddress, owner.value, storageSlot, status, this.scopes);
|
|
236
243
|
const dbNotesFiltered = dbNotes.filter((n)=>!pendingNullifiers.has(n.siloedNullifier.value));
|
|
237
244
|
const notes = pickNotes([
|
|
238
245
|
...dbNotesFiltered,
|
|
@@ -259,7 +266,11 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
259
266
|
offset
|
|
260
267
|
});
|
|
261
268
|
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(', ')}`);
|
|
262
|
-
return
|
|
269
|
+
return BoundedVec.from({
|
|
270
|
+
data: notes,
|
|
271
|
+
maxLength: maxNotes,
|
|
272
|
+
elementSize: packedHintedNoteLength
|
|
273
|
+
});
|
|
263
274
|
}
|
|
264
275
|
/**
|
|
265
276
|
* Keep track of the new note created during execution.
|
|
@@ -387,19 +398,24 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
387
398
|
senderTaggingStore: this.senderTaggingStore,
|
|
388
399
|
recipientTaggingStore: this.recipientTaggingStore,
|
|
389
400
|
senderAddressBookStore: this.senderAddressBookStore,
|
|
390
|
-
|
|
401
|
+
capsuleService: this.capsuleService,
|
|
391
402
|
privateEventStore: this.privateEventStore,
|
|
403
|
+
messageContextService: this.messageContextService,
|
|
392
404
|
contractSyncService: this.contractSyncService,
|
|
393
405
|
jobId: this.jobId,
|
|
394
406
|
totalPublicCalldataCount: this.totalPublicCalldataCount,
|
|
395
407
|
sideEffectCounter,
|
|
396
408
|
log: this.logger,
|
|
397
409
|
scopes: this.scopes,
|
|
398
|
-
senderForTags: this.
|
|
399
|
-
simulator: this.simulator
|
|
410
|
+
senderForTags: this.defaultSenderForTags,
|
|
411
|
+
simulator: this.simulator,
|
|
412
|
+
hooks: this.hooks,
|
|
413
|
+
l2TipsStore: this.l2TipsStore
|
|
400
414
|
});
|
|
401
415
|
const setupTime = simulatorSetupTimer.ms();
|
|
402
416
|
const childExecutionResult = await executePrivateFunction(this.simulator, privateExecutionOracle, targetArtifact, targetContractAddress, functionSelector);
|
|
417
|
+
// Propagate the nested call's calldata count so the parent sees its increments on subsequent enqueues.
|
|
418
|
+
this.totalPublicCalldataCount = privateExecutionOracle.getTotalPublicCalldataCount();
|
|
403
419
|
if (isStaticCall) {
|
|
404
420
|
this.#checkValidStaticCall(childExecutionResult);
|
|
405
421
|
}
|
|
@@ -414,7 +430,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
414
430
|
returnsHash: publicInputs.returnsHash
|
|
415
431
|
};
|
|
416
432
|
}
|
|
417
|
-
|
|
433
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */ assertValidPublicCalldata(calldataHash) {
|
|
418
434
|
const calldata = this.executionCache.getPreimage(calldataHash);
|
|
419
435
|
if (!calldata) {
|
|
420
436
|
throw new Error('Calldata for public call not found in cache');
|
|
@@ -423,31 +439,15 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
423
439
|
if (this.totalPublicCalldataCount > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
|
|
424
440
|
throw new Error(`Too many total args to all enqueued public calls! (> ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS})`);
|
|
425
441
|
}
|
|
426
|
-
}
|
|
427
|
-
/**
|
|
428
|
-
* Verify relevant information when a public function is enqueued.
|
|
429
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
430
|
-
* @param calldataHash - The hash of the function selector and arguments.
|
|
431
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
432
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
433
|
-
*/ notifyEnqueuedPublicFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
434
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
435
442
|
return Promise.resolve();
|
|
436
443
|
}
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
440
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
441
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
442
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
443
|
-
*/ notifySetPublicTeardownFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
444
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
445
|
-
return Promise.resolve();
|
|
444
|
+
getTotalPublicCalldataCount() {
|
|
445
|
+
return this.totalPublicCalldataCount;
|
|
446
446
|
}
|
|
447
|
-
|
|
447
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter) {
|
|
448
448
|
return this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
|
|
449
449
|
}
|
|
450
|
-
|
|
450
|
+
isExecutionInRevertiblePhase(sideEffectCounter) {
|
|
451
451
|
return Promise.resolve(this.noteCache.isSideEffectCounterRevertible(sideEffectCounter));
|
|
452
452
|
}
|
|
453
453
|
/**
|
|
@@ -462,10 +462,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
462
462
|
getDebugFunctionName() {
|
|
463
463
|
return this.contractStore.getDebugFunctionName(this.contractAddress, this.callContext.functionSelector);
|
|
464
464
|
}
|
|
465
|
-
|
|
466
|
-
this.
|
|
467
|
-
data
|
|
468
|
-
});
|
|
469
|
-
return Promise.resolve();
|
|
465
|
+
get callerContext() {
|
|
466
|
+
return this.callContext.isStaticCall ? 'private view' : 'private';
|
|
470
467
|
}
|
|
471
468
|
}
|