@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
|
@@ -1,46 +1,68 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { ARCHIVE_HEIGHT, type NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
|
|
2
2
|
import type { BlockNumber } from '@aztec/foundation/branded-types';
|
|
3
|
+
import { uniqueBy } from '@aztec/foundation/collection';
|
|
3
4
|
import { Aes128 } from '@aztec/foundation/crypto/aes128';
|
|
4
5
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
|
-
import { Point } from '@aztec/foundation/curves/grumpkin';
|
|
6
6
|
import { LogLevels, type Logger, createLogger } from '@aztec/foundation/log';
|
|
7
|
-
import
|
|
7
|
+
import { MembershipWitness } from '@aztec/foundation/trees';
|
|
8
8
|
import type { KeyStore } from '@aztec/key-store';
|
|
9
|
+
import {
|
|
10
|
+
type CircuitSimulator,
|
|
11
|
+
ExecutionError,
|
|
12
|
+
extractCallStack,
|
|
13
|
+
resolveAssertionMessageFromError,
|
|
14
|
+
toACVMWitness,
|
|
15
|
+
witnessMapToFields,
|
|
16
|
+
} from '@aztec/simulator/client';
|
|
17
|
+
import { type FunctionCall, FunctionSelector } from '@aztec/stdlib/abi';
|
|
9
18
|
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
10
19
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
|
-
import { BlockHash } from '@aztec/stdlib/block';
|
|
20
|
+
import { BlockHash, type L2TipsProvider } from '@aztec/stdlib/block';
|
|
12
21
|
import type { CompleteAddress, ContractInstance, PartialAddress } from '@aztec/stdlib/contract';
|
|
13
22
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
14
23
|
import type { AztecNode } from '@aztec/stdlib/interfaces/server';
|
|
15
24
|
import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
25
|
+
import { PublicKey, PublicKeys, computeAddressSecret, hashPublicKey } from '@aztec/stdlib/keys';
|
|
26
|
+
import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
|
|
18
27
|
import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
|
|
19
28
|
import type { NoteStatus } from '@aztec/stdlib/note';
|
|
20
29
|
import { MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
|
|
21
|
-
import
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
30
|
+
import {
|
|
31
|
+
type BlockHeader,
|
|
32
|
+
type Capsule,
|
|
33
|
+
type IndexedTxEffect,
|
|
34
|
+
type OffchainEffect,
|
|
35
|
+
TxEffect,
|
|
36
|
+
type TxHash,
|
|
37
|
+
} from '@aztec/stdlib/tx';
|
|
38
|
+
|
|
39
|
+
import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
|
|
40
|
+
import type { ContractSyncService } from '../../contract_sync/contract_sync_service.js';
|
|
25
41
|
import { EventService } from '../../events/event_service.js';
|
|
42
|
+
import type { UtilityCallAuthorizationRequest } from '../../hooks/authorize_utility_call.js';
|
|
43
|
+
import type { ExecutionHooks } from '../../hooks/index.js';
|
|
26
44
|
import { LogService } from '../../logs/log_service.js';
|
|
45
|
+
import { MessageContextService } from '../../messages/message_context_service.js';
|
|
27
46
|
import { NoteService } from '../../notes/note_service.js';
|
|
28
|
-
import {
|
|
47
|
+
import { ORACLE_VERSION_MAJOR } from '../../oracle_version.js';
|
|
29
48
|
import type { AddressStore } from '../../storage/address_store/address_store.js';
|
|
30
|
-
import type {
|
|
49
|
+
import type { CapsuleService } from '../../storage/capsule_store/capsule_service.js';
|
|
31
50
|
import type { ContractStore } from '../../storage/contract_store/contract_store.js';
|
|
32
51
|
import type { NoteStore } from '../../storage/note_store/note_store.js';
|
|
33
52
|
import type { PrivateEventStore } from '../../storage/private_event_store/private_event_store.js';
|
|
34
53
|
import type { RecipientTaggingStore } from '../../storage/tagging_store/recipient_tagging_store.js';
|
|
35
54
|
import type { SenderAddressBookStore } from '../../storage/tagging_store/sender_address_book_store.js';
|
|
55
|
+
import { EphemeralArrayService } from '../ephemeral_array_service.js';
|
|
56
|
+
import { BoundedVec } from '../noir-structs/bounded_vec.js';
|
|
36
57
|
import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
|
|
37
58
|
import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
|
|
38
|
-
import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
|
|
39
59
|
import { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
|
|
60
|
+
import { Option } from '../noir-structs/option.js';
|
|
40
61
|
import { UtilityContext } from '../noir-structs/utility_context.js';
|
|
41
62
|
import { pickNotes } from '../pick_notes.js';
|
|
42
63
|
import type { IMiscOracle, IUtilityExecutionOracle, NoteData } from './interfaces.js';
|
|
43
64
|
import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
65
|
+
import { Oracle } from './oracle.js';
|
|
44
66
|
|
|
45
67
|
/** Args for UtilityExecutionOracle constructor. */
|
|
46
68
|
export type UtilityExecutionOracleArgs = {
|
|
@@ -56,11 +78,18 @@ export type UtilityExecutionOracleArgs = {
|
|
|
56
78
|
aztecNode: AztecNode;
|
|
57
79
|
recipientTaggingStore: RecipientTaggingStore;
|
|
58
80
|
senderAddressBookStore: SenderAddressBookStore;
|
|
59
|
-
|
|
81
|
+
capsuleService: CapsuleService;
|
|
60
82
|
privateEventStore: PrivateEventStore;
|
|
83
|
+
messageContextService: MessageContextService;
|
|
84
|
+
contractSyncService: ContractSyncService;
|
|
85
|
+
l2TipsStore: L2TipsProvider;
|
|
61
86
|
jobId: string;
|
|
62
87
|
log?: ReturnType<typeof createLogger>;
|
|
63
|
-
scopes:
|
|
88
|
+
scopes: AztecAddress[];
|
|
89
|
+
simulator: CircuitSimulator;
|
|
90
|
+
hooks?: ExecutionHooks;
|
|
91
|
+
/** Needed to trigger contract synchronization before nested cross-contract calls. */
|
|
92
|
+
utilityExecutor: (call: FunctionCall, scopes: AztecAddress[]) => Promise<void>;
|
|
64
93
|
};
|
|
65
94
|
|
|
66
95
|
/**
|
|
@@ -71,6 +100,12 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
71
100
|
isUtility = true as const;
|
|
72
101
|
|
|
73
102
|
private contractLogger: Logger | undefined;
|
|
103
|
+
private aztecnrLogger: Logger | undefined;
|
|
104
|
+
private offchainEffects: OffchainEffect[] = [];
|
|
105
|
+
private readonly ephemeralArrayService = new EphemeralArrayService();
|
|
106
|
+
|
|
107
|
+
// We store oracle version to be able to show a nice error message when an oracle handler is missing.
|
|
108
|
+
private contractOracleVersion: { major: number; minor: number } | undefined;
|
|
74
109
|
|
|
75
110
|
protected readonly contractAddress: AztecAddress;
|
|
76
111
|
protected readonly authWitnesses: AuthWitness[];
|
|
@@ -83,11 +118,17 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
83
118
|
protected readonly aztecNode: AztecNode;
|
|
84
119
|
protected readonly recipientTaggingStore: RecipientTaggingStore;
|
|
85
120
|
protected readonly senderAddressBookStore: SenderAddressBookStore;
|
|
86
|
-
protected readonly
|
|
121
|
+
protected readonly capsuleService: CapsuleService;
|
|
87
122
|
protected readonly privateEventStore: PrivateEventStore;
|
|
123
|
+
protected readonly messageContextService: MessageContextService;
|
|
124
|
+
protected readonly contractSyncService: ContractSyncService;
|
|
125
|
+
protected readonly l2TipsStore: L2TipsProvider;
|
|
88
126
|
protected readonly jobId: string;
|
|
89
127
|
protected logger: ReturnType<typeof createLogger>;
|
|
90
|
-
protected readonly scopes:
|
|
128
|
+
protected readonly scopes: AztecAddress[];
|
|
129
|
+
protected readonly simulator: CircuitSimulator;
|
|
130
|
+
protected readonly hooks: ExecutionHooks | undefined;
|
|
131
|
+
protected readonly utilityExecutor: (call: FunctionCall, scopes: AztecAddress[]) => Promise<void>;
|
|
91
132
|
|
|
92
133
|
constructor(args: UtilityExecutionOracleArgs) {
|
|
93
134
|
this.contractAddress = args.contractAddress;
|
|
@@ -101,17 +142,36 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
101
142
|
this.aztecNode = args.aztecNode;
|
|
102
143
|
this.recipientTaggingStore = args.recipientTaggingStore;
|
|
103
144
|
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
104
|
-
this.
|
|
145
|
+
this.capsuleService = args.capsuleService;
|
|
105
146
|
this.privateEventStore = args.privateEventStore;
|
|
147
|
+
this.messageContextService = args.messageContextService;
|
|
148
|
+
this.contractSyncService = args.contractSyncService;
|
|
149
|
+
this.l2TipsStore = args.l2TipsStore;
|
|
106
150
|
this.jobId = args.jobId;
|
|
107
151
|
this.logger = args.log ?? createLogger('simulator:client_view_context');
|
|
108
152
|
this.scopes = args.scopes;
|
|
153
|
+
this.simulator = args.simulator;
|
|
154
|
+
this.hooks = args.hooks;
|
|
155
|
+
this.utilityExecutor = args.utilityExecutor;
|
|
109
156
|
}
|
|
110
157
|
|
|
111
|
-
public assertCompatibleOracleVersion(
|
|
112
|
-
if (
|
|
113
|
-
|
|
158
|
+
public assertCompatibleOracleVersion(major: number, minor: number): void {
|
|
159
|
+
if (major !== ORACLE_VERSION_MAJOR) {
|
|
160
|
+
const hint =
|
|
161
|
+
major > ORACLE_VERSION_MAJOR
|
|
162
|
+
? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.'
|
|
163
|
+
: 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
|
|
164
|
+
throw new Error(
|
|
165
|
+
`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`,
|
|
166
|
+
);
|
|
114
167
|
}
|
|
168
|
+
|
|
169
|
+
this.contractOracleVersion = { major, minor };
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
// Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
|
|
173
|
+
public nonOracleFunctionGetContractOracleVersion(): { major: number; minor: number } | undefined {
|
|
174
|
+
return this.contractOracleVersion;
|
|
115
175
|
}
|
|
116
176
|
|
|
117
177
|
public getRandomField(): Fr {
|
|
@@ -130,33 +190,36 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
130
190
|
* @throws If scopes are defined and the account is not in the scopes.
|
|
131
191
|
*/
|
|
132
192
|
public async getKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest> {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
138
|
-
hasAccess = true;
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
if (!hasAccess) {
|
|
142
|
-
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
193
|
+
let hasAccess = false;
|
|
194
|
+
for (let i = 0; i < this.scopes.length && !hasAccess; i++) {
|
|
195
|
+
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
196
|
+
hasAccess = true;
|
|
143
197
|
}
|
|
144
198
|
}
|
|
199
|
+
if (!hasAccess) {
|
|
200
|
+
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
201
|
+
}
|
|
145
202
|
return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
|
|
146
203
|
}
|
|
147
204
|
|
|
148
205
|
/**
|
|
149
206
|
* Fetches the index and sibling path of a leaf at a given block from the note hash tree.
|
|
150
|
-
* @param
|
|
151
|
-
* witness.
|
|
207
|
+
* @param blockHash - The hash of a block that contains the note hash tree root in which to find the
|
|
208
|
+
* membership witness.
|
|
152
209
|
* @param noteHash - The note hash to find in the note hash tree.
|
|
153
210
|
* @returns The membership witness containing the leaf index and sibling path
|
|
154
211
|
*/
|
|
155
|
-
public getNoteHashMembershipWitness(
|
|
156
|
-
|
|
212
|
+
public async getNoteHashMembershipWitness(
|
|
213
|
+
blockHash: BlockHash,
|
|
157
214
|
noteHash: Fr,
|
|
158
|
-
): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT
|
|
159
|
-
|
|
215
|
+
): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>> {
|
|
216
|
+
const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
217
|
+
this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash),
|
|
218
|
+
);
|
|
219
|
+
if (!witness) {
|
|
220
|
+
throw new Error(`Note hash ${noteHash} not found in the note hash tree at block ${blockHash.toString()}.`);
|
|
221
|
+
}
|
|
222
|
+
return witness;
|
|
160
223
|
}
|
|
161
224
|
|
|
162
225
|
/**
|
|
@@ -165,16 +228,22 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
165
228
|
* Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
|
|
166
229
|
* its block hash is appended as a new leaf to the archive tree.
|
|
167
230
|
*
|
|
168
|
-
* @param
|
|
231
|
+
* @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
|
|
169
232
|
* witness.
|
|
170
233
|
* @param blockHash - The block hash to find in the archive tree.
|
|
171
234
|
* @returns The membership witness containing the leaf index and sibling path
|
|
172
235
|
*/
|
|
173
|
-
public getBlockHashMembershipWitness(
|
|
174
|
-
|
|
236
|
+
public async getBlockHashMembershipWitness(
|
|
237
|
+
referenceBlockHash: BlockHash,
|
|
175
238
|
blockHash: BlockHash,
|
|
176
|
-
): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT
|
|
177
|
-
|
|
239
|
+
): Promise<Option<MembershipWitness<typeof ARCHIVE_HEIGHT>>> {
|
|
240
|
+
// Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
|
|
241
|
+
// hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
|
|
242
|
+
// membership witness as there is none.
|
|
243
|
+
const witness = await this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, () =>
|
|
244
|
+
this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash),
|
|
245
|
+
);
|
|
246
|
+
return witness ? Option.some(witness) : Option.none(MembershipWitness.empty(ARCHIVE_HEIGHT));
|
|
178
247
|
}
|
|
179
248
|
|
|
180
249
|
/**
|
|
@@ -183,11 +252,14 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
183
252
|
* @param nullifier - Nullifier we try to find witness for.
|
|
184
253
|
* @returns The nullifier membership witness (if found).
|
|
185
254
|
*/
|
|
186
|
-
public getNullifierMembershipWitness(
|
|
187
|
-
blockHash
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
255
|
+
public async getNullifierMembershipWitness(blockHash: BlockHash, nullifier: Fr): Promise<NullifierMembershipWitness> {
|
|
256
|
+
const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
257
|
+
this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier),
|
|
258
|
+
);
|
|
259
|
+
if (!witness) {
|
|
260
|
+
throw new Error(`Nullifier membership witness not found at block ${blockHash.toString()}.`);
|
|
261
|
+
}
|
|
262
|
+
return witness;
|
|
191
263
|
}
|
|
192
264
|
|
|
193
265
|
/**
|
|
@@ -199,11 +271,19 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
199
271
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
200
272
|
* we are trying to prove non-inclusion for.
|
|
201
273
|
*/
|
|
202
|
-
public getLowNullifierMembershipWitness(
|
|
274
|
+
public async getLowNullifierMembershipWitness(
|
|
203
275
|
blockHash: BlockHash,
|
|
204
276
|
nullifier: Fr,
|
|
205
|
-
): Promise<NullifierMembershipWitness
|
|
206
|
-
|
|
277
|
+
): Promise<NullifierMembershipWitness> {
|
|
278
|
+
const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
279
|
+
this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier),
|
|
280
|
+
);
|
|
281
|
+
if (!witness) {
|
|
282
|
+
throw new Error(
|
|
283
|
+
`Low nullifier witness not found for nullifier ${nullifier} at block hash ${blockHash.toString()}.`,
|
|
284
|
+
);
|
|
285
|
+
}
|
|
286
|
+
return witness;
|
|
207
287
|
}
|
|
208
288
|
|
|
209
289
|
/**
|
|
@@ -212,8 +292,14 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
212
292
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
213
293
|
* @returns - The witness
|
|
214
294
|
*/
|
|
215
|
-
public getPublicDataWitness(blockHash: BlockHash, leafSlot: Fr): Promise<PublicDataWitness
|
|
216
|
-
|
|
295
|
+
public async getPublicDataWitness(blockHash: BlockHash, leafSlot: Fr): Promise<PublicDataWitness> {
|
|
296
|
+
const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
297
|
+
this.aztecNode.getPublicDataWitness(blockHash, leafSlot),
|
|
298
|
+
);
|
|
299
|
+
if (!witness) {
|
|
300
|
+
throw new Error(`Public data witness not found for slot ${leafSlot} at block hash ${blockHash.toString()}.`);
|
|
301
|
+
}
|
|
302
|
+
return witness;
|
|
217
303
|
}
|
|
218
304
|
|
|
219
305
|
/**
|
|
@@ -221,14 +307,22 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
221
307
|
* @param blockNumber - The number of a block of which to get the block header.
|
|
222
308
|
* @returns Block extracted from a block with block number `blockNumber`.
|
|
223
309
|
*/
|
|
224
|
-
public async getBlockHeader(blockNumber: BlockNumber): Promise<BlockHeader
|
|
310
|
+
public async getBlockHeader(blockNumber: BlockNumber): Promise<BlockHeader> {
|
|
225
311
|
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
|
|
226
312
|
if (blockNumber > anchorBlockNumber) {
|
|
227
313
|
throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
|
|
228
314
|
}
|
|
229
315
|
|
|
316
|
+
// Most contracts query state at the "current" block, which is the anchor. Skip the RPC when we can.
|
|
317
|
+
if (blockNumber === anchorBlockNumber) {
|
|
318
|
+
return this.anchorBlockHeader;
|
|
319
|
+
}
|
|
320
|
+
|
|
230
321
|
const block = await this.aztecNode.getBlock(blockNumber);
|
|
231
|
-
|
|
322
|
+
if (!block?.header) {
|
|
323
|
+
throw new Error(`Block header not found for block ${blockNumber}.`);
|
|
324
|
+
}
|
|
325
|
+
return block.header;
|
|
232
326
|
}
|
|
233
327
|
|
|
234
328
|
/**
|
|
@@ -236,14 +330,14 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
236
330
|
* @param account - The account address.
|
|
237
331
|
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
238
332
|
*/
|
|
239
|
-
public async
|
|
333
|
+
public async getPublicKeysAndPartialAddress(
|
|
240
334
|
account: AztecAddress,
|
|
241
|
-
): Promise<{ publicKeys: PublicKeys; partialAddress: PartialAddress }
|
|
335
|
+
): Promise<Option<{ publicKeys: PublicKeys; partialAddress: PartialAddress }>> {
|
|
242
336
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
243
337
|
if (!completeAddress) {
|
|
244
|
-
return
|
|
338
|
+
return Option.none({ publicKeys: PublicKeys.default(), partialAddress: Fr.ZERO });
|
|
245
339
|
}
|
|
246
|
-
return { publicKeys: completeAddress.publicKeys, partialAddress: completeAddress.partialAddress };
|
|
340
|
+
return Option.some({ publicKeys: completeAddress.publicKeys, partialAddress: completeAddress.partialAddress });
|
|
247
341
|
}
|
|
248
342
|
|
|
249
343
|
protected async getCompleteAddressOrFail(account: AztecAddress): Promise<CompleteAddress> {
|
|
@@ -271,13 +365,16 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
271
365
|
}
|
|
272
366
|
|
|
273
367
|
/**
|
|
274
|
-
* Returns an auth witness for the given message hash
|
|
275
|
-
* for this transaction first, and falls back to the local database if not found.
|
|
368
|
+
* Returns an auth witness for the given message hash from the list of transient witnesses for this transaction.
|
|
276
369
|
* @param messageHash - Hash of the message to authenticate.
|
|
277
|
-
* @returns Authentication witness for the requested message hash.
|
|
370
|
+
* @returns Authentication witness for the requested message hash, or undefined if not found.
|
|
278
371
|
*/
|
|
279
|
-
public getAuthWitness(messageHash: Fr): Promise<Fr[]
|
|
280
|
-
|
|
372
|
+
public getAuthWitness(messageHash: Fr): Promise<Fr[]> {
|
|
373
|
+
const witness = this.authWitnesses.find(w => w.requestHash.equals(messageHash))?.witness;
|
|
374
|
+
if (!witness) {
|
|
375
|
+
throw new Error(`Unknown auth witness for message hash ${messageHash}`);
|
|
376
|
+
}
|
|
377
|
+
return Promise.resolve(witness);
|
|
281
378
|
}
|
|
282
379
|
|
|
283
380
|
/**
|
|
@@ -303,7 +400,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
303
400
|
* @returns Array of note data.
|
|
304
401
|
*/
|
|
305
402
|
public async getNotes(
|
|
306
|
-
owner: AztecAddress
|
|
403
|
+
owner: Option<AztecAddress>,
|
|
307
404
|
storageSlot: Fr,
|
|
308
405
|
numSelects: number,
|
|
309
406
|
selectByIndexes: number[],
|
|
@@ -318,11 +415,13 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
318
415
|
limit: number,
|
|
319
416
|
offset: number,
|
|
320
417
|
status: NoteStatus,
|
|
321
|
-
|
|
418
|
+
maxNotes: number,
|
|
419
|
+
packedHintedNoteLength: number,
|
|
420
|
+
): Promise<BoundedVec<NoteData>> {
|
|
322
421
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
323
422
|
|
|
324
|
-
const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
|
|
325
|
-
|
|
423
|
+
const dbNotes = await noteService.getNotes(this.contractAddress, owner.value, storageSlot, status, this.scopes);
|
|
424
|
+
const picked = pickNotes<NoteData>(dbNotes, {
|
|
326
425
|
selects: selectByIndexes.slice(0, numSelects).map((index, i) => ({
|
|
327
426
|
selector: { index, offset: selectByOffsets[i], length: selectByLengths[i] },
|
|
328
427
|
value: selectValues[i],
|
|
@@ -335,6 +434,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
335
434
|
limit,
|
|
336
435
|
offset,
|
|
337
436
|
});
|
|
437
|
+
return BoundedVec.from({ data: picked, maxLength: maxNotes, elementSize: packedHintedNoteLength });
|
|
338
438
|
}
|
|
339
439
|
|
|
340
440
|
/**
|
|
@@ -342,7 +442,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
342
442
|
* @param innerNullifier - The inner nullifier.
|
|
343
443
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
344
444
|
*/
|
|
345
|
-
public async
|
|
445
|
+
public async doesNullifierExist(innerNullifier: Fr) {
|
|
346
446
|
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
347
447
|
siloNullifier(this.contractAddress, innerNullifier!),
|
|
348
448
|
this.anchorBlockHeader.hash(),
|
|
@@ -354,7 +454,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
354
454
|
}
|
|
355
455
|
|
|
356
456
|
/**
|
|
357
|
-
*
|
|
457
|
+
* Returns the membership witness of an un-nullified L1 to L2 message.
|
|
358
458
|
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
359
459
|
* @param messageHash - Hash of the message.
|
|
360
460
|
* @param secret - Secret used to compute a nullifier.
|
|
@@ -367,6 +467,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
367
467
|
contractAddress,
|
|
368
468
|
messageHash,
|
|
369
469
|
secret,
|
|
470
|
+
await this.anchorBlockHeader.hash(),
|
|
370
471
|
);
|
|
371
472
|
|
|
372
473
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
@@ -379,29 +480,31 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
379
480
|
* @param startStorageSlot - The starting storage slot.
|
|
380
481
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
381
482
|
*/
|
|
382
|
-
public
|
|
483
|
+
public getFromPublicStorage(
|
|
383
484
|
blockHash: BlockHash,
|
|
384
485
|
contractAddress: AztecAddress,
|
|
385
486
|
startStorageSlot: Fr,
|
|
386
487
|
numberOfElements: number,
|
|
387
488
|
) {
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
489
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, async () => {
|
|
490
|
+
const slots = Array(numberOfElements)
|
|
491
|
+
.fill(0)
|
|
492
|
+
.map((_, i) => new Fr(startStorageSlot.value + BigInt(i)));
|
|
391
493
|
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
494
|
+
const values = await Promise.all(
|
|
495
|
+
slots.map(storageSlot => this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)),
|
|
496
|
+
);
|
|
395
497
|
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
498
|
+
this.logger.debug(
|
|
499
|
+
`Oracle storage read: slots=[${slots.map(slot => slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`,
|
|
500
|
+
);
|
|
399
501
|
|
|
400
|
-
|
|
502
|
+
return values;
|
|
503
|
+
});
|
|
401
504
|
}
|
|
402
505
|
|
|
403
506
|
/**
|
|
404
|
-
* Returns a per-contract logger whose output is prefixed with `
|
|
507
|
+
* Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
405
508
|
*/
|
|
406
509
|
async #getContractLogger(): Promise<Logger> {
|
|
407
510
|
if (!this.contractLogger) {
|
|
@@ -410,201 +513,427 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
410
513
|
this.contractLogger = await createContractLogger(
|
|
411
514
|
this.contractAddress,
|
|
412
515
|
addr => this.contractStore.getDebugContractName(addr),
|
|
516
|
+
'user',
|
|
413
517
|
{ instanceId: this.jobId },
|
|
414
518
|
);
|
|
415
519
|
}
|
|
416
520
|
return this.contractLogger;
|
|
417
521
|
}
|
|
418
522
|
|
|
523
|
+
/**
|
|
524
|
+
* Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
|
|
525
|
+
*/
|
|
526
|
+
async #getAztecnrLogger(): Promise<Logger> {
|
|
527
|
+
if (!this.aztecnrLogger) {
|
|
528
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
529
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
530
|
+
this.aztecnrLogger = await createContractLogger(
|
|
531
|
+
this.contractAddress,
|
|
532
|
+
addr => this.contractStore.getDebugContractName(addr),
|
|
533
|
+
'aztecnr',
|
|
534
|
+
{ instanceId: this.jobId },
|
|
535
|
+
);
|
|
536
|
+
}
|
|
537
|
+
return this.aztecnrLogger;
|
|
538
|
+
}
|
|
539
|
+
|
|
419
540
|
public async log(level: number, message: string, fields: Fr[]): Promise<void> {
|
|
420
541
|
if (!LogLevels[level]) {
|
|
421
542
|
throw new Error(`Invalid log level: ${level}`);
|
|
422
543
|
}
|
|
423
|
-
|
|
424
|
-
|
|
544
|
+
|
|
545
|
+
const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
|
|
546
|
+
|
|
547
|
+
const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
|
|
548
|
+
logContractMessage(logger, LogLevels[level], strippedMessage, fields);
|
|
425
549
|
}
|
|
426
550
|
|
|
427
|
-
|
|
428
|
-
|
|
551
|
+
/** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */
|
|
552
|
+
public async getPendingTaggedLogs(scope: AztecAddress): Promise<Fr> {
|
|
553
|
+
const logService = this.#createLogService();
|
|
554
|
+
const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
|
|
555
|
+
return this.ephemeralArrayService.newArray(logs.map(log => log.toFields()));
|
|
556
|
+
}
|
|
557
|
+
|
|
558
|
+
#createLogService(): LogService {
|
|
559
|
+
return new LogService(
|
|
429
560
|
this.aztecNode,
|
|
430
561
|
this.anchorBlockHeader,
|
|
562
|
+
this.l2TipsStore,
|
|
431
563
|
this.keyStore,
|
|
432
|
-
this.capsuleStore,
|
|
433
564
|
this.recipientTaggingStore,
|
|
434
565
|
this.senderAddressBookStore,
|
|
435
566
|
this.addressStore,
|
|
436
567
|
this.jobId,
|
|
437
568
|
this.logger.getBindings(),
|
|
438
569
|
);
|
|
439
|
-
|
|
440
|
-
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
|
|
441
570
|
}
|
|
442
571
|
|
|
443
|
-
/**
|
|
444
|
-
* Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
|
|
445
|
-
* `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
|
|
446
|
-
* queryable via `get_notes` and `getPrivateEvents`.
|
|
447
|
-
*
|
|
448
|
-
* This automatically clears both validation request queues, so no further work needs to be done by the caller.
|
|
449
|
-
* @param contractAddress - The address of the contract that the logs are tagged for.
|
|
450
|
-
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
451
|
-
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
452
|
-
*/
|
|
453
572
|
public async validateAndStoreEnqueuedNotesAndEvents(
|
|
454
|
-
contractAddress: AztecAddress,
|
|
455
573
|
noteValidationRequestsArrayBaseSlot: Fr,
|
|
456
574
|
eventValidationRequestsArrayBaseSlot: Fr,
|
|
575
|
+
scope: AztecAddress,
|
|
457
576
|
) {
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
}
|
|
577
|
+
const noteValidationRequests = this.ephemeralArrayService
|
|
578
|
+
.readArrayAt(noteValidationRequestsArrayBaseSlot)
|
|
579
|
+
.map(fields => NoteValidationRequest.fromFields(fields));
|
|
462
580
|
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)
|
|
467
|
-
).map(NoteValidationRequest.fromFields);
|
|
581
|
+
const eventValidationRequests = this.ephemeralArrayService
|
|
582
|
+
.readArrayAt(eventValidationRequestsArrayBaseSlot)
|
|
583
|
+
.map(fields => EventValidationRequest.fromFields(fields));
|
|
468
584
|
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
).map(EventValidationRequest.fromFields);
|
|
585
|
+
await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
|
|
586
|
+
}
|
|
472
587
|
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
request.noteHash,
|
|
483
|
-
request.nullifier,
|
|
484
|
-
request.txHash,
|
|
485
|
-
request.recipient,
|
|
486
|
-
),
|
|
487
|
-
);
|
|
588
|
+
async #processValidationRequests(
|
|
589
|
+
noteValidationRequests: NoteValidationRequest[],
|
|
590
|
+
eventValidationRequests: EventValidationRequest[],
|
|
591
|
+
scope: AztecAddress,
|
|
592
|
+
) {
|
|
593
|
+
const txEffects = await this.#fetchTxEffects([
|
|
594
|
+
...noteValidationRequests.map(r => r.txHash),
|
|
595
|
+
...eventValidationRequests.map(r => r.txHash),
|
|
596
|
+
]);
|
|
488
597
|
|
|
598
|
+
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
489
599
|
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
490
|
-
const eventStorePromises = eventValidationRequests.map(request =>
|
|
491
|
-
eventService.validateAndStoreEvent(
|
|
492
|
-
request.contractAddress,
|
|
493
|
-
request.eventTypeId,
|
|
494
|
-
request.randomness,
|
|
495
|
-
request.serializedEvent,
|
|
496
|
-
request.eventCommitment,
|
|
497
|
-
request.txHash,
|
|
498
|
-
request.recipient,
|
|
499
|
-
),
|
|
500
|
-
);
|
|
501
|
-
|
|
502
|
-
await Promise.all([...noteStorePromises, ...eventStorePromises]);
|
|
503
600
|
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
601
|
+
await Promise.all([
|
|
602
|
+
noteService.validateAndStoreNotes(noteValidationRequests, scope, txEffects),
|
|
603
|
+
eventService.validateAndStoreEvents(eventValidationRequests, scope, txEffects),
|
|
604
|
+
]);
|
|
507
605
|
}
|
|
508
606
|
|
|
509
|
-
public async
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
// TODO(#10727): allow other contracts to process partial notes
|
|
515
|
-
if (!this.contractAddress.equals(contractAddress)) {
|
|
516
|
-
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
517
|
-
}
|
|
607
|
+
public async getLogsByTag(requestArrayBaseSlot: Fr): Promise<Fr> {
|
|
608
|
+
const logRetrievalRequests = this.ephemeralArrayService
|
|
609
|
+
.readArrayAt(requestArrayBaseSlot)
|
|
610
|
+
.map(LogRetrievalRequest.fromFields);
|
|
611
|
+
const logService = this.#createLogService();
|
|
518
612
|
|
|
519
|
-
|
|
520
|
-
// don't need to wait for the network round-trip.
|
|
521
|
-
const logRetrievalRequests = (
|
|
522
|
-
await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)
|
|
523
|
-
).map(LogRetrievalRequest.fromFields);
|
|
613
|
+
const logRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
|
|
524
614
|
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
this.
|
|
528
|
-
this.keyStore,
|
|
529
|
-
this.capsuleStore,
|
|
530
|
-
this.recipientTaggingStore,
|
|
531
|
-
this.senderAddressBookStore,
|
|
532
|
-
this.addressStore,
|
|
533
|
-
this.jobId,
|
|
534
|
-
this.logger.getBindings(),
|
|
615
|
+
// Create an inner ephemeral array for each request's matching logs, then wrap all slots in an outer array.
|
|
616
|
+
const innerSlots = logRetrievalResponses.map(responses =>
|
|
617
|
+
this.ephemeralArrayService.newArray(responses.map(r => r.toFields())),
|
|
535
618
|
);
|
|
536
619
|
|
|
537
|
-
|
|
620
|
+
return this.ephemeralArrayService.newArray(innerSlots.map(slot => [slot]));
|
|
621
|
+
}
|
|
538
622
|
|
|
539
|
-
|
|
540
|
-
|
|
623
|
+
/** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response slot. */
|
|
624
|
+
public async getMessageContextsByTxHash(requestArrayBaseSlot: Fr): Promise<Fr> {
|
|
625
|
+
const requestFields = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot);
|
|
541
626
|
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
627
|
+
const txHashes = requestFields.map((fields, i) => {
|
|
628
|
+
if (fields.length !== 1) {
|
|
629
|
+
throw new Error(
|
|
630
|
+
`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`,
|
|
631
|
+
);
|
|
632
|
+
}
|
|
633
|
+
return fields[0];
|
|
634
|
+
});
|
|
635
|
+
|
|
636
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(
|
|
637
|
+
txHashes,
|
|
638
|
+
this.anchorBlockHeader.getBlockNumber(),
|
|
548
639
|
);
|
|
640
|
+
|
|
641
|
+
return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
|
|
549
642
|
}
|
|
550
643
|
|
|
551
|
-
|
|
644
|
+
/**
|
|
645
|
+
* Fetches the effects of a transaction by its hash. Returns null if the tx is not found or is beyond the anchor
|
|
646
|
+
* block.
|
|
647
|
+
*/
|
|
648
|
+
public async getTxEffect(txHash: TxHash): Promise<Option<TxEffect>> {
|
|
649
|
+
if (txHash.hash.isZero()) {
|
|
650
|
+
throw new Error('Invalid tx hash passed into aztec_utl_getTxEffect oracle handler');
|
|
651
|
+
}
|
|
652
|
+
|
|
653
|
+
const txEffect = await this.aztecNode.getTxEffect(txHash);
|
|
654
|
+
if (!txEffect || txEffect.l2BlockNumber > this.anchorBlockHeader.getBlockNumber()) {
|
|
655
|
+
return Option.none(TxEffect.empty());
|
|
656
|
+
}
|
|
657
|
+
|
|
658
|
+
return Option.some(txEffect.data);
|
|
659
|
+
}
|
|
660
|
+
|
|
661
|
+
public setCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[], scope: AztecAddress): void {
|
|
552
662
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
553
663
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
554
664
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
555
665
|
}
|
|
556
|
-
this.
|
|
557
|
-
return Promise.resolve();
|
|
666
|
+
this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
|
|
558
667
|
}
|
|
559
668
|
|
|
560
|
-
public async
|
|
669
|
+
public async getCapsule(
|
|
670
|
+
contractAddress: AztecAddress,
|
|
671
|
+
slot: Fr,
|
|
672
|
+
tSize: number,
|
|
673
|
+
scope: AztecAddress,
|
|
674
|
+
): Promise<Option<Fr[]>> {
|
|
561
675
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
562
676
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
563
677
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
564
678
|
}
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
this.capsules.find(c => c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ??
|
|
568
|
-
(await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId))
|
|
569
|
-
);
|
|
679
|
+
const values = await this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
|
|
680
|
+
return values ? Option.some(values) : Option.none(new Array(tSize).fill(Fr.ZERO));
|
|
570
681
|
}
|
|
571
682
|
|
|
572
|
-
public deleteCapsule(contractAddress: AztecAddress, slot: Fr):
|
|
683
|
+
public deleteCapsule(contractAddress: AztecAddress, slot: Fr, scope: AztecAddress): void {
|
|
573
684
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
574
685
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
575
686
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
576
687
|
}
|
|
577
|
-
this.
|
|
578
|
-
return Promise.resolve();
|
|
688
|
+
this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
|
|
579
689
|
}
|
|
580
690
|
|
|
581
|
-
public copyCapsule(
|
|
691
|
+
public copyCapsule(
|
|
692
|
+
contractAddress: AztecAddress,
|
|
693
|
+
srcSlot: Fr,
|
|
694
|
+
dstSlot: Fr,
|
|
695
|
+
numEntries: number,
|
|
696
|
+
scope: AztecAddress,
|
|
697
|
+
): Promise<void> {
|
|
582
698
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
583
699
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
584
700
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
585
701
|
}
|
|
586
|
-
return this.
|
|
702
|
+
return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
|
|
703
|
+
}
|
|
704
|
+
|
|
705
|
+
/**
|
|
706
|
+
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
707
|
+
* stored notes or events are discovered.
|
|
708
|
+
*/
|
|
709
|
+
public setContractSyncCacheInvalid(contractAddress: AztecAddress, scopes: BoundedVec<AztecAddress>): void {
|
|
710
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
711
|
+
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
712
|
+
}
|
|
713
|
+
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes.data);
|
|
587
714
|
}
|
|
588
715
|
|
|
589
716
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
590
|
-
public
|
|
591
|
-
|
|
592
|
-
|
|
717
|
+
public async decryptAes128(
|
|
718
|
+
ciphertext: BoundedVec<number>,
|
|
719
|
+
iv: Buffer,
|
|
720
|
+
symKey: Buffer,
|
|
721
|
+
): Promise<Option<BoundedVec<number>>> {
|
|
722
|
+
const capacity = ciphertext.maxLength;
|
|
723
|
+
try {
|
|
724
|
+
const aes128 = new Aes128();
|
|
725
|
+
const plaintext = await aes128.decryptBufferCBC(Buffer.from(ciphertext.data), iv, symKey);
|
|
726
|
+
return Option.some(BoundedVec.from<number>({ data: [...plaintext], maxLength: capacity }));
|
|
727
|
+
} catch {
|
|
728
|
+
return Option.none(BoundedVec.empty<number>({ maxLength: capacity }));
|
|
729
|
+
}
|
|
593
730
|
}
|
|
594
731
|
|
|
595
732
|
/**
|
|
596
|
-
* Retrieves
|
|
597
|
-
* @param address - The address
|
|
598
|
-
* @param
|
|
599
|
-
* @
|
|
733
|
+
* Retrieves app-siloed shared secrets for multiple ephemeral public keys stored in an ephemeral array.
|
|
734
|
+
* @param address - The recipient address.
|
|
735
|
+
* @param ephPksSlot - Ephemeral array slot containing the serialized Points.
|
|
736
|
+
* @param contractAddress - The contract address for app-siloing (validated against execution context).
|
|
737
|
+
* @returns The slot of a new ephemeral array containing the computed shared secrets.
|
|
600
738
|
*/
|
|
601
|
-
public async
|
|
602
|
-
|
|
739
|
+
public async getSharedSecrets(address: AztecAddress, ephPksSlot: Fr, contractAddress: AztecAddress): Promise<Fr> {
|
|
740
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
741
|
+
throw new Error(
|
|
742
|
+
`getSharedSecrets called with contract address ${contractAddress}, expected ${this.contractAddress}`,
|
|
743
|
+
);
|
|
744
|
+
}
|
|
603
745
|
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
604
|
-
const
|
|
605
|
-
|
|
606
|
-
);
|
|
746
|
+
const ivpkMHash = await hashPublicKey(recipientCompleteAddress.publicKeys.ivpkM);
|
|
747
|
+
const ivskM = await this.keyStore.getMasterSecretKey(ivpkMHash);
|
|
607
748
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
608
|
-
|
|
749
|
+
|
|
750
|
+
const ephPkFields = this.ephemeralArrayService.readArrayAt(ephPksSlot);
|
|
751
|
+
const secrets = await Promise.all(
|
|
752
|
+
ephPkFields.map(fields =>
|
|
753
|
+
deriveAppSiloedSharedSecret(addressSecret, PublicKey.fromFields(fields), this.contractAddress),
|
|
754
|
+
),
|
|
755
|
+
);
|
|
756
|
+
|
|
757
|
+
return this.ephemeralArrayService.newArray(secrets.map(s => [s]));
|
|
758
|
+
}
|
|
759
|
+
|
|
760
|
+
public pushEphemeral(slot: Fr, elements: Fr[]): number {
|
|
761
|
+
return this.ephemeralArrayService.push(slot, elements);
|
|
762
|
+
}
|
|
763
|
+
|
|
764
|
+
public popEphemeral(slot: Fr): Fr[] {
|
|
765
|
+
return this.ephemeralArrayService.pop(slot);
|
|
766
|
+
}
|
|
767
|
+
|
|
768
|
+
public getEphemeral(slot: Fr, index: number): Fr[] {
|
|
769
|
+
return this.ephemeralArrayService.get(slot, index);
|
|
770
|
+
}
|
|
771
|
+
|
|
772
|
+
public setEphemeral(slot: Fr, index: number, elements: Fr[]): void {
|
|
773
|
+
this.ephemeralArrayService.set(slot, index, elements);
|
|
774
|
+
}
|
|
775
|
+
|
|
776
|
+
public getEphemeralLen(slot: Fr): number {
|
|
777
|
+
return this.ephemeralArrayService.len(slot);
|
|
778
|
+
}
|
|
779
|
+
|
|
780
|
+
public removeEphemeral(slot: Fr, index: number): void {
|
|
781
|
+
this.ephemeralArrayService.remove(slot, index);
|
|
782
|
+
}
|
|
783
|
+
|
|
784
|
+
public clearEphemeral(slot: Fr): void {
|
|
785
|
+
this.ephemeralArrayService.clear(slot);
|
|
786
|
+
}
|
|
787
|
+
|
|
788
|
+
public emitOffchainEffect(data: Fr[]): Promise<void> {
|
|
789
|
+
this.offchainEffects.push({ data, contractAddress: this.contractAddress });
|
|
790
|
+
return Promise.resolve();
|
|
791
|
+
}
|
|
792
|
+
|
|
793
|
+
/** Executes another utility function from within this one and returns its serialized return values. */
|
|
794
|
+
public async callUtilityFunction(
|
|
795
|
+
targetContractAddress: AztecAddress,
|
|
796
|
+
functionSelector: FunctionSelector,
|
|
797
|
+
args: Fr[],
|
|
798
|
+
): Promise<Fr[]> {
|
|
799
|
+
const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(
|
|
800
|
+
targetContractAddress,
|
|
801
|
+
functionSelector,
|
|
802
|
+
);
|
|
803
|
+
|
|
804
|
+
if (!targetContractAddress.equals(this.contractAddress)) {
|
|
805
|
+
const [callerInstance, targetInstance] = await Promise.all([
|
|
806
|
+
this.getContractInstance(this.contractAddress),
|
|
807
|
+
this.getContractInstance(targetContractAddress),
|
|
808
|
+
]);
|
|
809
|
+
const request: UtilityCallAuthorizationRequest = {
|
|
810
|
+
caller: this.contractAddress,
|
|
811
|
+
callerClassId: callerInstance.currentContractClassId,
|
|
812
|
+
target: targetContractAddress,
|
|
813
|
+
targetClassId: targetInstance.currentContractClassId,
|
|
814
|
+
functionSelector,
|
|
815
|
+
functionName: targetArtifact.name,
|
|
816
|
+
args,
|
|
817
|
+
callerContext: this.callerContext,
|
|
818
|
+
};
|
|
819
|
+
|
|
820
|
+
const response = this.hooks
|
|
821
|
+
? await this.hooks.authorizeUtilityCall(request)
|
|
822
|
+
: { authorized: false, reason: 'No execution hooks configured' };
|
|
823
|
+
|
|
824
|
+
if (!response.authorized) {
|
|
825
|
+
const reason = response.reason ? `: ${response.reason}` : '';
|
|
826
|
+
throw new Error(
|
|
827
|
+
`Cross-contract utility call denied${reason}. ${this.contractAddress} attempted to call ` +
|
|
828
|
+
`${targetContractAddress}:${functionSelector} (${targetArtifact.name}). ` +
|
|
829
|
+
`See https://docs.aztec.network/errors/11`,
|
|
830
|
+
);
|
|
831
|
+
}
|
|
832
|
+
|
|
833
|
+
await this.contractSyncService.ensureContractSynced(
|
|
834
|
+
targetContractAddress,
|
|
835
|
+
functionSelector,
|
|
836
|
+
this.utilityExecutor,
|
|
837
|
+
this.anchorBlockHeader,
|
|
838
|
+
this.jobId,
|
|
839
|
+
this.scopes,
|
|
840
|
+
);
|
|
841
|
+
}
|
|
842
|
+
|
|
843
|
+
this.logger.debug(
|
|
844
|
+
`Calling nested utility function ${targetContractAddress}:${functionSelector} from ${this.contractAddress}`,
|
|
845
|
+
);
|
|
846
|
+
|
|
847
|
+
const nestedOracle = new UtilityExecutionOracle({
|
|
848
|
+
contractAddress: targetContractAddress,
|
|
849
|
+
authWitnesses: this.authWitnesses,
|
|
850
|
+
capsules: this.capsules,
|
|
851
|
+
anchorBlockHeader: this.anchorBlockHeader,
|
|
852
|
+
contractStore: this.contractStore,
|
|
853
|
+
noteStore: this.noteStore,
|
|
854
|
+
keyStore: this.keyStore,
|
|
855
|
+
addressStore: this.addressStore,
|
|
856
|
+
aztecNode: this.aztecNode,
|
|
857
|
+
recipientTaggingStore: this.recipientTaggingStore,
|
|
858
|
+
senderAddressBookStore: this.senderAddressBookStore,
|
|
859
|
+
capsuleService: this.capsuleService,
|
|
860
|
+
privateEventStore: this.privateEventStore,
|
|
861
|
+
messageContextService: this.messageContextService,
|
|
862
|
+
contractSyncService: this.contractSyncService,
|
|
863
|
+
l2TipsStore: this.l2TipsStore,
|
|
864
|
+
jobId: this.jobId,
|
|
865
|
+
scopes: this.scopes,
|
|
866
|
+
simulator: this.simulator,
|
|
867
|
+
hooks: this.hooks,
|
|
868
|
+
utilityExecutor: this.utilityExecutor,
|
|
869
|
+
log: this.logger,
|
|
870
|
+
});
|
|
871
|
+
|
|
872
|
+
const initialWitness = toACVMWitness(0, args);
|
|
873
|
+
const acvmCallback = new Oracle(nestedOracle);
|
|
874
|
+
const acirExecutionResult = await this.simulator
|
|
875
|
+
.executeUserCircuit(initialWitness, targetArtifact, acvmCallback.toACIRCallback())
|
|
876
|
+
.catch((err: Error) => {
|
|
877
|
+
err.message = resolveAssertionMessageFromError(err, targetArtifact);
|
|
878
|
+
throw new ExecutionError(
|
|
879
|
+
err.message,
|
|
880
|
+
{ contractAddress: targetContractAddress, functionSelector },
|
|
881
|
+
extractCallStack(err, targetArtifact.debug),
|
|
882
|
+
{ cause: err },
|
|
883
|
+
);
|
|
884
|
+
});
|
|
885
|
+
|
|
886
|
+
return witnessMapToFields(acirExecutionResult.returnWitness);
|
|
887
|
+
}
|
|
888
|
+
|
|
889
|
+
/** Returns offchain effects collected during execution. */
|
|
890
|
+
public getOffchainEffects(): OffchainEffect[] {
|
|
891
|
+
return this.offchainEffects;
|
|
892
|
+
}
|
|
893
|
+
|
|
894
|
+
/**
|
|
895
|
+
* Fetches tx effects for the given hashes in parallel, deduplicating repeated hashes so each tx is only requested
|
|
896
|
+
* once. Returns a map keyed by `TxHash.toString()`; hashes for which the node has no tx effect are omitted.
|
|
897
|
+
*/
|
|
898
|
+
async #fetchTxEffects(txHashes: TxHash[]): Promise<Map<string, IndexedTxEffect>> {
|
|
899
|
+
const uniqueTxHashes = uniqueBy(txHashes, h => h.toString());
|
|
900
|
+
const fetched = await Promise.all(uniqueTxHashes.map(h => this.aztecNode.getTxEffect(h)));
|
|
901
|
+
return new Map(
|
|
902
|
+
uniqueTxHashes
|
|
903
|
+
.map((h, i): [string, IndexedTxEffect | undefined] => [h.toString(), fetched[i]])
|
|
904
|
+
.filter((entry): entry is [string, IndexedTxEffect] => entry[1] !== undefined),
|
|
905
|
+
);
|
|
906
|
+
}
|
|
907
|
+
|
|
908
|
+
/** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */
|
|
909
|
+
async #queryWithBlockHashNotAfterAnchor<T>(blockHash: BlockHash, query: () => Promise<T>): Promise<T> {
|
|
910
|
+
// Most contracts query state at the "current" block, which is the anchor. Skip the validation when we can.
|
|
911
|
+
const anchorHash = await this.anchorBlockHeader.hash();
|
|
912
|
+
if (blockHash.equals(anchorHash)) {
|
|
913
|
+
return query();
|
|
914
|
+
}
|
|
915
|
+
|
|
916
|
+
const [response] = await Promise.all([
|
|
917
|
+
query(),
|
|
918
|
+
(async () => {
|
|
919
|
+
const block = await this.aztecNode.getBlock(blockHash);
|
|
920
|
+
const header = block?.header;
|
|
921
|
+
if (!header) {
|
|
922
|
+
throw new Error(`Could not find block header for block hash ${blockHash}`);
|
|
923
|
+
}
|
|
924
|
+
|
|
925
|
+
if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
|
|
926
|
+
throw new Error(
|
|
927
|
+
`Made a node query with a reference block hash ${blockHash} with block number ${header.getBlockNumber()}, which is ahead of the anchor block number ${this.anchorBlockHeader.getBlockNumber()} (from anchor block hash ${anchorHash}).`,
|
|
928
|
+
);
|
|
929
|
+
}
|
|
930
|
+
})(),
|
|
931
|
+
]);
|
|
932
|
+
return response;
|
|
933
|
+
}
|
|
934
|
+
|
|
935
|
+
/** The execution context of the current call. */
|
|
936
|
+
protected get callerContext(): 'private' | 'private view' | 'utility' {
|
|
937
|
+
return 'utility';
|
|
609
938
|
}
|
|
610
939
|
}
|