@aztec/pxe 0.0.1-commit.29c6b1a3 → 0.0.1-commit.2c0ee1788
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bin/check_oracle_version.js +4 -4
- 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 +37 -0
- package/dest/block_synchronizer/block_synchronizer.d.ts +10 -4
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +38 -12
- package/dest/config/index.d.ts +2 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +8 -15
- package/dest/config/package_info.js +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +63 -31
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +207 -77
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts +28 -0
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts.map +1 -0
- package/dest/contract_function_simulator/ephemeral_array_service.js +78 -0
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
- package/dest/contract_function_simulator/index.d.ts +2 -1
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +1 -0
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +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 -10
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +2 -4
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +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 -11
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +63 -45
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +47 -0
- package/dest/contract_function_simulator/oracle/oracle.d.ts +76 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +312 -108
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +58 -85
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +123 -97
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +134 -70
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +379 -143
- 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 +3 -0
- package/dest/contract_logging.d.ts +27 -0
- package/dest/contract_logging.d.ts.map +1 -0
- package/dest/contract_logging.js +38 -0
- package/dest/contract_sync/contract_sync_service.d.ts +44 -0
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
- package/dest/contract_sync/contract_sync_service.js +116 -0
- package/dest/contract_sync/helpers.d.ts +28 -0
- package/dest/contract_sync/helpers.d.ts.map +1 -0
- package/dest/contract_sync/{index.js → helpers.js} +19 -13
- package/dest/debug/pxe_debug_utils.d.ts +14 -10
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/debug/pxe_debug_utils.js +16 -15
- package/dest/entrypoints/client/bundle/index.d.ts +3 -1
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +2 -0
- package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +23 -9
- package/dest/entrypoints/client/lazy/index.d.ts +3 -1
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +2 -0
- package/dest/entrypoints/client/lazy/utils.d.ts +3 -3
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +24 -10
- package/dest/entrypoints/pxe_creation_options.d.ts +5 -2
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/pxe_creation_options.js +3 -1
- package/dest/entrypoints/server/index.d.ts +4 -3
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +3 -2
- package/dest/entrypoints/server/utils.d.ts +2 -2
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +30 -11
- package/dest/events/event_service.d.ts +5 -5
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +30 -10
- package/dest/events/private_event_filter_validator.d.ts +3 -2
- package/dest/events/private_event_filter_validator.d.ts.map +1 -1
- package/dest/events/private_event_filter_validator.js +15 -0
- package/dest/job_coordinator/job_coordinator.d.ts +3 -2
- package/dest/job_coordinator/job_coordinator.d.ts.map +1 -1
- package/dest/job_coordinator/job_coordinator.js +3 -2
- package/dest/logs/log_service.d.ts +10 -9
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +41 -61
- package/dest/messages/message_context_service.d.ts +17 -0
- package/dest/messages/message_context_service.d.ts.map +1 -0
- package/dest/messages/message_context_service.js +36 -0
- package/dest/notes/note_service.d.ts +7 -8
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +23 -14
- package/dest/notes_filter.d.ts +24 -0
- package/dest/notes_filter.d.ts.map +1 -0
- package/dest/notes_filter.js +4 -0
- package/dest/oracle_version.d.ts +4 -3
- package/dest/oracle_version.d.ts.map +1 -1
- package/dest/oracle_version.js +20 -10
- package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
- package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
- package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
- package/dest/private_kernel/hints/index.d.ts +1 -1
- package/dest/private_kernel/hints/index.js +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +129 -68
- package/dest/private_kernel/hints/test_utils.d.ts +122 -0
- package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
- package/dest/private_kernel/hints/test_utils.js +203 -0
- package/dest/private_kernel/private_kernel_execution_prover.d.ts +3 -2
- package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.js +20 -15
- package/dest/private_kernel/private_kernel_oracle.d.ts +10 -6
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_oracle.js +19 -18
- package/dest/pxe.d.ts +85 -24
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +169 -86
- package/dest/storage/address_store/address_store.d.ts +1 -1
- package/dest/storage/address_store/address_store.d.ts.map +1 -1
- package/dest/storage/address_store/address_store.js +12 -11
- package/dest/storage/anchor_block_store/anchor_block_store.d.ts +9 -1
- package/dest/storage/anchor_block_store/anchor_block_store.d.ts.map +1 -1
- package/dest/storage/anchor_block_store/anchor_block_store.js +9 -2
- 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 +42 -36
- package/dest/storage/capsule_store/index.d.ts +2 -1
- package/dest/storage/capsule_store/index.d.ts.map +1 -1
- package/dest/storage/capsule_store/index.js +1 -0
- package/dest/storage/contract_store/contract_store.d.ts +42 -15
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +160 -73
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +13 -3
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +147 -107
- package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
- package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
- package/dest/storage/private_event_store/private_event_store.js +87 -61
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/recipient_tagging_store.js +31 -19
- package/dest/storage/tagging_store/sender_address_book_store.d.ts +1 -1
- package/dest/storage/tagging_store/sender_address_book_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_address_book_store.js +20 -14
- package/dest/storage/tagging_store/sender_tagging_store.d.ts +29 -28
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +233 -137
- package/dest/tagging/get_all_logs_by_tags.d.ts +1 -1
- package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
- package/dest/tagging/get_all_logs_by_tags.js +17 -3
- package/dest/tagging/index.d.ts +3 -3
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/index.js +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +4 -5
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +8 -22
- package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +2 -2
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +6 -7
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -8
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +13 -7
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -7
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +36 -24
- package/package.json +25 -16
- package/src/bin/check_oracle_version.ts +4 -4
- package/src/block_synchronizer/block_stream_source.ts +52 -0
- package/src/block_synchronizer/block_synchronizer.ts +53 -22
- package/src/config/index.ts +3 -9
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +367 -136
- package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
- package/src/contract_function_simulator/index.ts +1 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +9 -9
- package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +4 -10
- package/src/contract_function_simulator/oracle/interfaces.ts +97 -59
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
- package/src/contract_function_simulator/oracle/oracle.ts +399 -144
- package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +155 -190
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +623 -172
- package/src/contract_function_simulator/pick_notes.ts +22 -3
- package/src/contract_function_simulator/proxied_contract_data_source.ts +8 -1
- package/src/contract_logging.ts +52 -0
- package/src/contract_sync/contract_sync_service.ts +176 -0
- package/src/contract_sync/{index.ts → helpers.ts} +22 -22
- package/src/debug/pxe_debug_utils.ts +48 -18
- package/src/entrypoints/client/bundle/index.ts +2 -0
- package/src/entrypoints/client/bundle/utils.ts +18 -18
- package/src/entrypoints/client/lazy/index.ts +2 -0
- package/src/entrypoints/client/lazy/utils.ts +19 -18
- package/src/entrypoints/pxe_creation_options.ts +9 -1
- package/src/entrypoints/server/index.ts +3 -2
- package/src/entrypoints/server/utils.ts +24 -29
- package/src/events/event_service.ts +34 -11
- package/src/events/private_event_filter_validator.ts +21 -1
- package/src/job_coordinator/job_coordinator.ts +4 -3
- package/src/logs/log_service.ts +77 -105
- package/src/messages/message_context_service.ts +44 -0
- package/src/notes/note_service.ts +24 -15
- package/src/notes_filter.ts +24 -0
- package/src/oracle_version.ts +20 -10
- package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
- package/src/private_kernel/hints/index.ts +1 -1
- package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +164 -117
- package/src/private_kernel/hints/test_utils.ts +325 -0
- package/src/private_kernel/private_kernel_execution_prover.ts +24 -19
- package/src/private_kernel/private_kernel_oracle.ts +21 -21
- package/src/pxe.ts +318 -143
- package/src/storage/address_store/address_store.ts +15 -15
- package/src/storage/anchor_block_store/anchor_block_store.ts +9 -1
- package/src/storage/capsule_store/capsule_service.ts +90 -0
- package/src/storage/capsule_store/capsule_store.ts +52 -34
- package/src/storage/capsule_store/index.ts +1 -0
- package/src/storage/contract_store/contract_store.ts +193 -81
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +166 -132
- package/src/storage/private_event_store/private_event_store.ts +106 -81
- package/src/storage/tagging_store/recipient_tagging_store.ts +38 -24
- package/src/storage/tagging_store/sender_address_book_store.ts +20 -14
- package/src/storage/tagging_store/sender_tagging_store.ts +287 -156
- package/src/tagging/get_all_logs_by_tags.ts +28 -4
- package/src/tagging/index.ts +2 -2
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +12 -25
- package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +10 -15
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +23 -10
- package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +27 -26
- package/dest/contract_sync/index.d.ts +0 -23
- package/dest/contract_sync/index.d.ts.map +0 -1
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
|
@@ -3,35 +3,48 @@ import type { BlockNumber } from '@aztec/foundation/branded-types';
|
|
|
3
3
|
import { Aes128 } from '@aztec/foundation/crypto/aes128';
|
|
4
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
5
|
import { Point } from '@aztec/foundation/curves/grumpkin';
|
|
6
|
-
import { LogLevels,
|
|
6
|
+
import { LogLevels, type Logger, createLogger } from '@aztec/foundation/log';
|
|
7
7
|
import type { MembershipWitness } from '@aztec/foundation/trees';
|
|
8
8
|
import type { KeyStore } from '@aztec/key-store';
|
|
9
|
+
import { isProtocolContract } from '@aztec/protocol-contracts';
|
|
10
|
+
import {
|
|
11
|
+
type CircuitSimulator,
|
|
12
|
+
ExecutionError,
|
|
13
|
+
extractCallStack,
|
|
14
|
+
resolveAssertionMessageFromError,
|
|
15
|
+
toACVMWitness,
|
|
16
|
+
witnessMapToFields,
|
|
17
|
+
} from '@aztec/simulator/client';
|
|
18
|
+
import { FunctionSelector } from '@aztec/stdlib/abi';
|
|
9
19
|
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
10
20
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
|
-
import { BlockHash } from '@aztec/stdlib/block';
|
|
12
|
-
import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
|
|
21
|
+
import { BlockHash, type L2TipsProvider } from '@aztec/stdlib/block';
|
|
22
|
+
import type { CompleteAddress, ContractInstance, PartialAddress } from '@aztec/stdlib/contract';
|
|
13
23
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
14
24
|
import type { AztecNode } from '@aztec/stdlib/interfaces/server';
|
|
15
25
|
import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
|
|
16
|
-
import { computeAddressSecret } from '@aztec/stdlib/keys';
|
|
17
|
-
import {
|
|
26
|
+
import { type PublicKeys, computeAddressSecret } from '@aztec/stdlib/keys';
|
|
27
|
+
import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
|
|
18
28
|
import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
|
|
19
29
|
import type { NoteStatus } from '@aztec/stdlib/note';
|
|
20
30
|
import { MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
|
|
21
|
-
import type { BlockHeader, Capsule } from '@aztec/stdlib/tx';
|
|
31
|
+
import type { BlockHeader, Capsule, OffchainEffect } from '@aztec/stdlib/tx';
|
|
22
32
|
|
|
33
|
+
import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
|
|
34
|
+
import type { ContractSyncService } from '../../contract_sync/contract_sync_service.js';
|
|
23
35
|
import { EventService } from '../../events/event_service.js';
|
|
24
36
|
import { LogService } from '../../logs/log_service.js';
|
|
37
|
+
import { MessageContextService } from '../../messages/message_context_service.js';
|
|
25
38
|
import { NoteService } from '../../notes/note_service.js';
|
|
26
|
-
import {
|
|
39
|
+
import { ORACLE_VERSION_MAJOR } from '../../oracle_version.js';
|
|
27
40
|
import type { AddressStore } from '../../storage/address_store/address_store.js';
|
|
28
|
-
import type {
|
|
29
|
-
import type { CapsuleStore } from '../../storage/capsule_store/capsule_store.js';
|
|
41
|
+
import type { CapsuleService } from '../../storage/capsule_store/capsule_service.js';
|
|
30
42
|
import type { ContractStore } from '../../storage/contract_store/contract_store.js';
|
|
31
43
|
import type { NoteStore } from '../../storage/note_store/note_store.js';
|
|
32
44
|
import type { PrivateEventStore } from '../../storage/private_event_store/private_event_store.js';
|
|
33
45
|
import type { RecipientTaggingStore } from '../../storage/tagging_store/recipient_tagging_store.js';
|
|
34
46
|
import type { SenderAddressBookStore } from '../../storage/tagging_store/sender_address_book_store.js';
|
|
47
|
+
import { EphemeralArrayService } from '../ephemeral_array_service.js';
|
|
35
48
|
import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
|
|
36
49
|
import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
|
|
37
50
|
import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
|
|
@@ -40,6 +53,32 @@ import { UtilityContext } from '../noir-structs/utility_context.js';
|
|
|
40
53
|
import { pickNotes } from '../pick_notes.js';
|
|
41
54
|
import type { IMiscOracle, IUtilityExecutionOracle, NoteData } from './interfaces.js';
|
|
42
55
|
import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
56
|
+
import { Oracle } from './oracle.js';
|
|
57
|
+
|
|
58
|
+
/** Args for UtilityExecutionOracle constructor. */
|
|
59
|
+
export type UtilityExecutionOracleArgs = {
|
|
60
|
+
contractAddress: AztecAddress;
|
|
61
|
+
/** List of transient auth witnesses to be used during this simulation */
|
|
62
|
+
authWitnesses: AuthWitness[];
|
|
63
|
+
capsules: Capsule[]; // TODO(#12425): Rename to transientCapsules
|
|
64
|
+
anchorBlockHeader: BlockHeader;
|
|
65
|
+
contractStore: ContractStore;
|
|
66
|
+
noteStore: NoteStore;
|
|
67
|
+
keyStore: KeyStore;
|
|
68
|
+
addressStore: AddressStore;
|
|
69
|
+
aztecNode: AztecNode;
|
|
70
|
+
recipientTaggingStore: RecipientTaggingStore;
|
|
71
|
+
senderAddressBookStore: SenderAddressBookStore;
|
|
72
|
+
capsuleService: CapsuleService;
|
|
73
|
+
privateEventStore: PrivateEventStore;
|
|
74
|
+
messageContextService: MessageContextService;
|
|
75
|
+
contractSyncService: ContractSyncService;
|
|
76
|
+
l2TipsStore: L2TipsProvider;
|
|
77
|
+
jobId: string;
|
|
78
|
+
log?: ReturnType<typeof createLogger>;
|
|
79
|
+
scopes: AztecAddress[];
|
|
80
|
+
simulator: CircuitSimulator;
|
|
81
|
+
};
|
|
43
82
|
|
|
44
83
|
/**
|
|
45
84
|
* The oracle for an execution of utility contract functions.
|
|
@@ -48,40 +87,103 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
48
87
|
isMisc = true as const;
|
|
49
88
|
isUtility = true as const;
|
|
50
89
|
|
|
51
|
-
private
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
90
|
+
private contractLogger: Logger | undefined;
|
|
91
|
+
private aztecnrLogger: Logger | undefined;
|
|
92
|
+
private offchainEffects: OffchainEffect[] = [];
|
|
93
|
+
private readonly ephemeralArrayService = new EphemeralArrayService();
|
|
94
|
+
|
|
95
|
+
// We store oracle version to be able to show a nice error message when an oracle handler is missing.
|
|
96
|
+
private contractOracleVersion: { major: number; minor: number } | undefined;
|
|
97
|
+
|
|
98
|
+
protected readonly contractAddress: AztecAddress;
|
|
99
|
+
protected readonly authWitnesses: AuthWitness[];
|
|
100
|
+
protected readonly capsules: Capsule[];
|
|
101
|
+
protected readonly anchorBlockHeader: BlockHeader;
|
|
102
|
+
protected readonly contractStore: ContractStore;
|
|
103
|
+
protected readonly noteStore: NoteStore;
|
|
104
|
+
protected readonly keyStore: KeyStore;
|
|
105
|
+
protected readonly addressStore: AddressStore;
|
|
106
|
+
protected readonly aztecNode: AztecNode;
|
|
107
|
+
protected readonly recipientTaggingStore: RecipientTaggingStore;
|
|
108
|
+
protected readonly senderAddressBookStore: SenderAddressBookStore;
|
|
109
|
+
protected readonly capsuleService: CapsuleService;
|
|
110
|
+
protected readonly privateEventStore: PrivateEventStore;
|
|
111
|
+
protected readonly messageContextService: MessageContextService;
|
|
112
|
+
protected readonly contractSyncService: ContractSyncService;
|
|
113
|
+
protected readonly l2TipsStore: L2TipsProvider;
|
|
114
|
+
protected readonly jobId: string;
|
|
115
|
+
protected logger: ReturnType<typeof createLogger>;
|
|
116
|
+
protected readonly scopes: AztecAddress[];
|
|
117
|
+
protected readonly simulator: CircuitSimulator;
|
|
118
|
+
|
|
119
|
+
constructor(args: UtilityExecutionOracleArgs) {
|
|
120
|
+
this.contractAddress = args.contractAddress;
|
|
121
|
+
this.authWitnesses = args.authWitnesses;
|
|
122
|
+
this.capsules = args.capsules;
|
|
123
|
+
this.anchorBlockHeader = args.anchorBlockHeader;
|
|
124
|
+
this.contractStore = args.contractStore;
|
|
125
|
+
this.noteStore = args.noteStore;
|
|
126
|
+
this.keyStore = args.keyStore;
|
|
127
|
+
this.addressStore = args.addressStore;
|
|
128
|
+
this.aztecNode = args.aztecNode;
|
|
129
|
+
this.recipientTaggingStore = args.recipientTaggingStore;
|
|
130
|
+
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
131
|
+
this.capsuleService = args.capsuleService;
|
|
132
|
+
this.privateEventStore = args.privateEventStore;
|
|
133
|
+
this.messageContextService = args.messageContextService;
|
|
134
|
+
this.contractSyncService = args.contractSyncService;
|
|
135
|
+
this.l2TipsStore = args.l2TipsStore;
|
|
136
|
+
this.jobId = args.jobId;
|
|
137
|
+
this.logger = args.log ?? createLogger('simulator:client_view_context');
|
|
138
|
+
this.scopes = args.scopes;
|
|
139
|
+
this.simulator = args.simulator;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
public assertCompatibleOracleVersion(major: number, minor: number): void {
|
|
143
|
+
// TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
|
|
144
|
+
// Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
|
|
145
|
+
// the expected pinned version or the current one. We want to allow for both the pinned and the current versions
|
|
146
|
+
// because we want this code to work with both the pinned and unpinned version since some branches do not have the
|
|
147
|
+
// pinned contracts (like e.g. next)
|
|
148
|
+
const LEGACY_ORACLE_VERSION = 12;
|
|
149
|
+
if (isProtocolContract(this.contractAddress)) {
|
|
150
|
+
if (major !== LEGACY_ORACLE_VERSION && major !== ORACLE_VERSION_MAJOR) {
|
|
151
|
+
const hint =
|
|
152
|
+
major > ORACLE_VERSION_MAJOR
|
|
153
|
+
? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.'
|
|
154
|
+
: '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.';
|
|
155
|
+
throw new Error(
|
|
156
|
+
`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION_MAJOR}, got ${major})`,
|
|
157
|
+
);
|
|
158
|
+
}
|
|
159
|
+
this.contractOracleVersion = { major, minor };
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
if (major !== ORACLE_VERSION_MAJOR) {
|
|
164
|
+
const hint =
|
|
165
|
+
major > ORACLE_VERSION_MAJOR
|
|
166
|
+
? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.'
|
|
167
|
+
: '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.';
|
|
168
|
+
throw new Error(
|
|
169
|
+
`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`,
|
|
170
|
+
);
|
|
77
171
|
}
|
|
172
|
+
|
|
173
|
+
// Major matches - store both major and minor for later diagnostics (e.g. when an oracle is not found)
|
|
174
|
+
this.contractOracleVersion = { major, minor };
|
|
78
175
|
}
|
|
79
176
|
|
|
80
|
-
|
|
177
|
+
// Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
|
|
178
|
+
public nonOracleFunctionGetContractOracleVersion(): { major: number; minor: number } | undefined {
|
|
179
|
+
return this.contractOracleVersion;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
public getRandomField(): Fr {
|
|
81
183
|
return Fr.random();
|
|
82
184
|
}
|
|
83
185
|
|
|
84
|
-
public
|
|
186
|
+
public getUtilityContext(): UtilityContext {
|
|
85
187
|
return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
|
|
86
188
|
}
|
|
87
189
|
|
|
@@ -90,35 +192,58 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
90
192
|
* @param pkMHash - The master public key hash.
|
|
91
193
|
* @returns A Promise that resolves to nullifier keys.
|
|
92
194
|
* @throws If the keys are not registered in the key store.
|
|
195
|
+
* @throws If scopes are defined and the account is not in the scopes.
|
|
93
196
|
*/
|
|
94
|
-
public
|
|
197
|
+
public async getKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest> {
|
|
198
|
+
let hasAccess = false;
|
|
199
|
+
for (let i = 0; i < this.scopes.length && !hasAccess; i++) {
|
|
200
|
+
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
201
|
+
hasAccess = true;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
if (!hasAccess) {
|
|
205
|
+
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
206
|
+
}
|
|
95
207
|
return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
|
|
96
208
|
}
|
|
97
209
|
|
|
98
210
|
/**
|
|
99
211
|
* Fetches the index and sibling path of a leaf at a given block from the note hash tree.
|
|
100
|
-
* @param blockHash - The block hash
|
|
101
|
-
*
|
|
212
|
+
* @param blockHash - The hash of a block that contains the note hash tree root in which to find the
|
|
213
|
+
* membership witness.
|
|
214
|
+
* @param noteHash - The note hash to find in the note hash tree.
|
|
102
215
|
* @returns The membership witness containing the leaf index and sibling path
|
|
103
216
|
*/
|
|
104
|
-
public
|
|
217
|
+
public getNoteHashMembershipWitness(
|
|
105
218
|
blockHash: BlockHash,
|
|
106
|
-
|
|
219
|
+
noteHash: Fr,
|
|
107
220
|
): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT> | undefined> {
|
|
108
|
-
return this
|
|
221
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
222
|
+
this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash),
|
|
223
|
+
);
|
|
109
224
|
}
|
|
110
225
|
|
|
111
226
|
/**
|
|
112
|
-
* Fetches the index and sibling path of a
|
|
113
|
-
*
|
|
114
|
-
*
|
|
227
|
+
* Fetches the index and sibling path of a block hash in the archive tree.
|
|
228
|
+
*
|
|
229
|
+
* Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
|
|
230
|
+
* its block hash is appended as a new leaf to the archive tree.
|
|
231
|
+
*
|
|
232
|
+
* @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
|
|
233
|
+
* witness.
|
|
234
|
+
* @param blockHash - The block hash to find in the archive tree.
|
|
115
235
|
* @returns The membership witness containing the leaf index and sibling path
|
|
116
236
|
*/
|
|
117
|
-
public
|
|
237
|
+
public getBlockHashMembershipWitness(
|
|
238
|
+
referenceBlockHash: BlockHash,
|
|
118
239
|
blockHash: BlockHash,
|
|
119
|
-
leafValue: Fr,
|
|
120
240
|
): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined> {
|
|
121
|
-
|
|
241
|
+
// Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
|
|
242
|
+
// hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
|
|
243
|
+
// membership witness as there is none.
|
|
244
|
+
return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, () =>
|
|
245
|
+
this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash),
|
|
246
|
+
);
|
|
122
247
|
}
|
|
123
248
|
|
|
124
249
|
/**
|
|
@@ -127,11 +252,13 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
127
252
|
* @param nullifier - Nullifier we try to find witness for.
|
|
128
253
|
* @returns The nullifier membership witness (if found).
|
|
129
254
|
*/
|
|
130
|
-
public
|
|
255
|
+
public getNullifierMembershipWitness(
|
|
131
256
|
blockHash: BlockHash,
|
|
132
257
|
nullifier: Fr,
|
|
133
258
|
): Promise<NullifierMembershipWitness | undefined> {
|
|
134
|
-
return this
|
|
259
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
260
|
+
this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier),
|
|
261
|
+
);
|
|
135
262
|
}
|
|
136
263
|
|
|
137
264
|
/**
|
|
@@ -143,11 +270,13 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
143
270
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
144
271
|
* we are trying to prove non-inclusion for.
|
|
145
272
|
*/
|
|
146
|
-
public
|
|
273
|
+
public getLowNullifierMembershipWitness(
|
|
147
274
|
blockHash: BlockHash,
|
|
148
275
|
nullifier: Fr,
|
|
149
276
|
): Promise<NullifierMembershipWitness | undefined> {
|
|
150
|
-
return this
|
|
277
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
278
|
+
this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier),
|
|
279
|
+
);
|
|
151
280
|
}
|
|
152
281
|
|
|
153
282
|
/**
|
|
@@ -156,8 +285,10 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
156
285
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
157
286
|
* @returns - The witness
|
|
158
287
|
*/
|
|
159
|
-
public
|
|
160
|
-
return this
|
|
288
|
+
public getPublicDataWitness(blockHash: BlockHash, leafSlot: Fr): Promise<PublicDataWitness | undefined> {
|
|
289
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, () =>
|
|
290
|
+
this.aztecNode.getPublicDataWitness(blockHash, leafSlot),
|
|
291
|
+
);
|
|
161
292
|
}
|
|
162
293
|
|
|
163
294
|
/**
|
|
@@ -165,8 +296,8 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
165
296
|
* @param blockNumber - The number of a block of which to get the block header.
|
|
166
297
|
* @returns Block extracted from a block with block number `blockNumber`.
|
|
167
298
|
*/
|
|
168
|
-
public async
|
|
169
|
-
const anchorBlockNumber =
|
|
299
|
+
public async getBlockHeader(blockNumber: BlockNumber): Promise<BlockHeader | undefined> {
|
|
300
|
+
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
|
|
170
301
|
if (blockNumber > anchorBlockNumber) {
|
|
171
302
|
throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
|
|
172
303
|
}
|
|
@@ -176,16 +307,21 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
176
307
|
}
|
|
177
308
|
|
|
178
309
|
/**
|
|
179
|
-
* Retrieve the
|
|
310
|
+
* Retrieve the public keys and partial address associated to a given address.
|
|
180
311
|
* @param account - The account address.
|
|
181
|
-
* @returns
|
|
182
|
-
* @throws An error if the account is not registered in the database.
|
|
312
|
+
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
183
313
|
*/
|
|
184
|
-
public
|
|
185
|
-
|
|
314
|
+
public async getPublicKeysAndPartialAddress(
|
|
315
|
+
account: AztecAddress,
|
|
316
|
+
): Promise<{ publicKeys: PublicKeys; partialAddress: PartialAddress } | undefined> {
|
|
317
|
+
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
318
|
+
if (!completeAddress) {
|
|
319
|
+
return undefined;
|
|
320
|
+
}
|
|
321
|
+
return { publicKeys: completeAddress.publicKeys, partialAddress: completeAddress.partialAddress };
|
|
186
322
|
}
|
|
187
323
|
|
|
188
|
-
protected async
|
|
324
|
+
protected async getCompleteAddressOrFail(account: AztecAddress): Promise<CompleteAddress> {
|
|
189
325
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
190
326
|
if (!completeAddress) {
|
|
191
327
|
throw new Error(
|
|
@@ -201,11 +337,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
201
337
|
* @param address - Address.
|
|
202
338
|
* @returns A contract instance.
|
|
203
339
|
*/
|
|
204
|
-
public
|
|
205
|
-
return this.getContractInstance(address);
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
protected async getContractInstance(address: AztecAddress): Promise<ContractInstance> {
|
|
340
|
+
public async getContractInstance(address: AztecAddress): Promise<ContractInstance> {
|
|
209
341
|
const instance = await this.contractStore.getContractInstance(address);
|
|
210
342
|
if (!instance) {
|
|
211
343
|
throw new Error(`No contract instance found for address ${address.toString()}`);
|
|
@@ -214,12 +346,11 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
214
346
|
}
|
|
215
347
|
|
|
216
348
|
/**
|
|
217
|
-
* Returns an auth witness for the given message hash
|
|
218
|
-
* for this transaction first, and falls back to the local database if not found.
|
|
349
|
+
* Returns an auth witness for the given message hash from the list of transient witnesses for this transaction.
|
|
219
350
|
* @param messageHash - Hash of the message to authenticate.
|
|
220
|
-
* @returns Authentication witness for the requested message hash.
|
|
351
|
+
* @returns Authentication witness for the requested message hash, or undefined if not found.
|
|
221
352
|
*/
|
|
222
|
-
public
|
|
353
|
+
public getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined> {
|
|
223
354
|
return Promise.resolve(this.authWitnesses.find(w => w.requestHash.equals(messageHash))?.witness);
|
|
224
355
|
}
|
|
225
356
|
|
|
@@ -245,7 +376,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
245
376
|
* @param status - The status of notes to fetch.
|
|
246
377
|
* @returns Array of note data.
|
|
247
378
|
*/
|
|
248
|
-
public async
|
|
379
|
+
public async getNotes(
|
|
249
380
|
owner: AztecAddress | undefined,
|
|
250
381
|
storageSlot: Fr,
|
|
251
382
|
numSelects: number,
|
|
@@ -262,7 +393,7 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
262
393
|
offset: number,
|
|
263
394
|
status: NoteStatus,
|
|
264
395
|
): Promise<NoteData[]> {
|
|
265
|
-
const noteService = new NoteService(this.noteStore, this.aztecNode, this.
|
|
396
|
+
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
266
397
|
|
|
267
398
|
const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
|
|
268
399
|
return pickNotes<NoteData>(dbNotes, {
|
|
@@ -285,26 +416,32 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
285
416
|
* @param innerNullifier - The inner nullifier.
|
|
286
417
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
287
418
|
*/
|
|
288
|
-
public async
|
|
289
|
-
const nullifier = await
|
|
290
|
-
|
|
419
|
+
public async doesNullifierExist(innerNullifier: Fr) {
|
|
420
|
+
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
421
|
+
siloNullifier(this.contractAddress, innerNullifier!),
|
|
422
|
+
this.anchorBlockHeader.hash(),
|
|
423
|
+
]);
|
|
424
|
+
const [leafIndex] = await this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
|
|
425
|
+
nullifier,
|
|
426
|
+
]);
|
|
291
427
|
return leafIndex?.data !== undefined;
|
|
292
428
|
}
|
|
293
429
|
|
|
294
430
|
/**
|
|
295
|
-
*
|
|
431
|
+
* Returns the membership witness of an un-nullified L1 to L2 message.
|
|
296
432
|
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
297
433
|
* @param messageHash - Hash of the message.
|
|
298
434
|
* @param secret - Secret used to compute a nullifier.
|
|
299
435
|
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
300
436
|
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
301
437
|
*/
|
|
302
|
-
public async
|
|
438
|
+
public async getL1ToL2MembershipWitness(contractAddress: AztecAddress, messageHash: Fr, secret: Fr) {
|
|
303
439
|
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(
|
|
304
440
|
this.aztecNode,
|
|
305
441
|
contractAddress,
|
|
306
442
|
messageHash,
|
|
307
443
|
secret,
|
|
444
|
+
await this.anchorBlockHeader.hash(),
|
|
308
445
|
);
|
|
309
446
|
|
|
310
447
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
@@ -317,90 +454,192 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
317
454
|
* @param startStorageSlot - The starting storage slot.
|
|
318
455
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
319
456
|
*/
|
|
320
|
-
public
|
|
457
|
+
public getFromPublicStorage(
|
|
321
458
|
blockHash: BlockHash,
|
|
322
459
|
contractAddress: AztecAddress,
|
|
323
460
|
startStorageSlot: Fr,
|
|
324
461
|
numberOfElements: number,
|
|
325
462
|
) {
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
463
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, async () => {
|
|
464
|
+
const slots = Array(numberOfElements)
|
|
465
|
+
.fill(0)
|
|
466
|
+
.map((_, i) => new Fr(startStorageSlot.value + BigInt(i)));
|
|
329
467
|
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
468
|
+
const values = await Promise.all(
|
|
469
|
+
slots.map(storageSlot => this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)),
|
|
470
|
+
);
|
|
333
471
|
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
472
|
+
this.logger.debug(
|
|
473
|
+
`Oracle storage read: slots=[${slots.map(slot => slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`,
|
|
474
|
+
);
|
|
337
475
|
|
|
338
|
-
|
|
476
|
+
return values;
|
|
477
|
+
});
|
|
478
|
+
}
|
|
479
|
+
|
|
480
|
+
/**
|
|
481
|
+
* Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
482
|
+
*/
|
|
483
|
+
async #getContractLogger(): Promise<Logger> {
|
|
484
|
+
if (!this.contractLogger) {
|
|
485
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
486
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
487
|
+
this.contractLogger = await createContractLogger(
|
|
488
|
+
this.contractAddress,
|
|
489
|
+
addr => this.contractStore.getDebugContractName(addr),
|
|
490
|
+
'user',
|
|
491
|
+
{ instanceId: this.jobId },
|
|
492
|
+
);
|
|
493
|
+
}
|
|
494
|
+
return this.contractLogger;
|
|
495
|
+
}
|
|
496
|
+
|
|
497
|
+
/**
|
|
498
|
+
* Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
|
|
499
|
+
*/
|
|
500
|
+
async #getAztecnrLogger(): Promise<Logger> {
|
|
501
|
+
if (!this.aztecnrLogger) {
|
|
502
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
503
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
504
|
+
this.aztecnrLogger = await createContractLogger(
|
|
505
|
+
this.contractAddress,
|
|
506
|
+
addr => this.contractStore.getDebugContractName(addr),
|
|
507
|
+
'aztecnr',
|
|
508
|
+
{ instanceId: this.jobId },
|
|
509
|
+
);
|
|
510
|
+
}
|
|
511
|
+
return this.aztecnrLogger;
|
|
339
512
|
}
|
|
340
513
|
|
|
341
|
-
public
|
|
514
|
+
public async log(level: number, message: string, fields: Fr[]): Promise<void> {
|
|
342
515
|
if (!LogLevels[level]) {
|
|
343
|
-
throw new Error(`Invalid
|
|
516
|
+
throw new Error(`Invalid log level: ${level}`);
|
|
344
517
|
}
|
|
345
|
-
|
|
346
|
-
|
|
518
|
+
|
|
519
|
+
const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
|
|
520
|
+
|
|
521
|
+
const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
|
|
522
|
+
logContractMessage(logger, LogLevels[level], strippedMessage, fields);
|
|
523
|
+
}
|
|
524
|
+
|
|
525
|
+
// Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
526
|
+
public async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot: Fr, scope: AztecAddress) {
|
|
527
|
+
const logService = this.#createLogService();
|
|
528
|
+
const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
|
|
529
|
+
await this.capsuleService.appendToCapsuleArray(
|
|
530
|
+
this.contractAddress,
|
|
531
|
+
pendingTaggedLogArrayBaseSlot,
|
|
532
|
+
logs.map(log => log.toFields()),
|
|
533
|
+
this.jobId,
|
|
534
|
+
scope,
|
|
535
|
+
);
|
|
536
|
+
}
|
|
537
|
+
|
|
538
|
+
/** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */
|
|
539
|
+
public async getPendingTaggedLogsV2(scope: AztecAddress): Promise<Fr> {
|
|
540
|
+
const logService = this.#createLogService();
|
|
541
|
+
const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
|
|
542
|
+
return this.ephemeralArrayService.newArray(logs.map(log => log.toFields()));
|
|
347
543
|
}
|
|
348
544
|
|
|
349
|
-
|
|
350
|
-
|
|
545
|
+
#createLogService(): LogService {
|
|
546
|
+
return new LogService(
|
|
351
547
|
this.aztecNode,
|
|
352
|
-
this.
|
|
548
|
+
this.anchorBlockHeader,
|
|
549
|
+
this.l2TipsStore,
|
|
353
550
|
this.keyStore,
|
|
354
|
-
this.capsuleStore,
|
|
355
551
|
this.recipientTaggingStore,
|
|
356
552
|
this.senderAddressBookStore,
|
|
357
553
|
this.addressStore,
|
|
358
554
|
this.jobId,
|
|
555
|
+
this.logger.getBindings(),
|
|
359
556
|
);
|
|
360
|
-
|
|
361
|
-
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockStore, this.jobId);
|
|
362
|
-
|
|
363
|
-
// It is acceptable to run the following operations in parallel for several reasons:
|
|
364
|
-
// 1. syncTaggedLogs does not write to the note store — it only stores the pending tagged logs in a capsule array,
|
|
365
|
-
// which is then processed in Noir after this handler returns.
|
|
366
|
-
// 2. Even if syncTaggedLogs did write to the note store, it would not cause inconsistent state.
|
|
367
|
-
await Promise.all([
|
|
368
|
-
logService.syncTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes),
|
|
369
|
-
noteService.syncNoteNullifiers(this.contractAddress),
|
|
370
|
-
]);
|
|
371
557
|
}
|
|
372
558
|
|
|
373
559
|
/**
|
|
374
|
-
*
|
|
375
|
-
* `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
|
|
376
|
-
* queryable via `get_notes` and `getPrivateEvents`.
|
|
560
|
+
* Legacy: validates note/event requests stored in capsule arrays.
|
|
377
561
|
*
|
|
378
|
-
*
|
|
379
|
-
* @param contractAddress - The address of the contract that the logs are tagged for.
|
|
380
|
-
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
381
|
-
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
562
|
+
* Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
382
563
|
*/
|
|
383
|
-
public async
|
|
564
|
+
public async validateAndStoreEnqueuedNotesAndEvents(
|
|
384
565
|
contractAddress: AztecAddress,
|
|
385
566
|
noteValidationRequestsArrayBaseSlot: Fr,
|
|
386
567
|
eventValidationRequestsArrayBaseSlot: Fr,
|
|
568
|
+
maxNotePackedLen: number,
|
|
569
|
+
maxEventSerializedLen: number,
|
|
570
|
+
scope: AztecAddress,
|
|
387
571
|
) {
|
|
388
572
|
// TODO(#10727): allow other contracts to store notes
|
|
389
573
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
390
574
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
391
575
|
}
|
|
392
576
|
|
|
393
|
-
// We read all note and event validation requests and process them all concurrently. This makes the process much
|
|
394
|
-
// faster as we don't need to wait for the network round-trip.
|
|
395
577
|
const noteValidationRequests = (
|
|
396
|
-
await this.
|
|
397
|
-
|
|
578
|
+
await this.capsuleService.readCapsuleArray(
|
|
579
|
+
contractAddress,
|
|
580
|
+
noteValidationRequestsArrayBaseSlot,
|
|
581
|
+
this.jobId,
|
|
582
|
+
scope,
|
|
583
|
+
)
|
|
584
|
+
).map(fields => NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
398
585
|
|
|
399
586
|
const eventValidationRequests = (
|
|
400
|
-
await this.
|
|
401
|
-
|
|
587
|
+
await this.capsuleService.readCapsuleArray(
|
|
588
|
+
contractAddress,
|
|
589
|
+
eventValidationRequestsArrayBaseSlot,
|
|
590
|
+
this.jobId,
|
|
591
|
+
scope,
|
|
592
|
+
)
|
|
593
|
+
).map(fields => EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
594
|
+
|
|
595
|
+
await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
|
|
402
596
|
|
|
403
|
-
|
|
597
|
+
await this.capsuleService.setCapsuleArray(
|
|
598
|
+
contractAddress,
|
|
599
|
+
noteValidationRequestsArrayBaseSlot,
|
|
600
|
+
[],
|
|
601
|
+
this.jobId,
|
|
602
|
+
scope,
|
|
603
|
+
);
|
|
604
|
+
await this.capsuleService.setCapsuleArray(
|
|
605
|
+
contractAddress,
|
|
606
|
+
eventValidationRequestsArrayBaseSlot,
|
|
607
|
+
[],
|
|
608
|
+
this.jobId,
|
|
609
|
+
scope,
|
|
610
|
+
);
|
|
611
|
+
}
|
|
612
|
+
|
|
613
|
+
public async validateAndStoreEnqueuedNotesAndEventsV2(
|
|
614
|
+
noteValidationRequestsArrayBaseSlot: Fr,
|
|
615
|
+
eventValidationRequestsArrayBaseSlot: Fr,
|
|
616
|
+
maxNotePackedLen: number,
|
|
617
|
+
maxEventSerializedLen: number,
|
|
618
|
+
scope: AztecAddress,
|
|
619
|
+
) {
|
|
620
|
+
const noteValidationRequests = this.ephemeralArrayService
|
|
621
|
+
.readArrayAt(noteValidationRequestsArrayBaseSlot)
|
|
622
|
+
.map(fields => NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
623
|
+
|
|
624
|
+
const eventValidationRequests = this.ephemeralArrayService
|
|
625
|
+
.readArrayAt(eventValidationRequestsArrayBaseSlot)
|
|
626
|
+
.map(fields => EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
627
|
+
|
|
628
|
+
await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
|
|
629
|
+
}
|
|
630
|
+
|
|
631
|
+
/**
|
|
632
|
+
* Dispatches note and event validation requests to the service layer.
|
|
633
|
+
*
|
|
634
|
+
* This function is an auxiliary to support legacy (capsule backed) and new (ephemeral array backed) versions of the
|
|
635
|
+
* `validateAndStoreEnqueuedNotesAndEvents` oracle.
|
|
636
|
+
*/
|
|
637
|
+
async #processValidationRequests(
|
|
638
|
+
noteValidationRequests: NoteValidationRequest[],
|
|
639
|
+
eventValidationRequests: EventValidationRequest[],
|
|
640
|
+
scope: AztecAddress,
|
|
641
|
+
) {
|
|
642
|
+
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
404
643
|
const noteStorePromises = noteValidationRequests.map(request =>
|
|
405
644
|
noteService.validateAndStoreNote(
|
|
406
645
|
request.contractAddress,
|
|
@@ -412,11 +651,11 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
412
651
|
request.noteHash,
|
|
413
652
|
request.nullifier,
|
|
414
653
|
request.txHash,
|
|
415
|
-
|
|
654
|
+
scope,
|
|
416
655
|
),
|
|
417
656
|
);
|
|
418
657
|
|
|
419
|
-
const eventService = new EventService(this.
|
|
658
|
+
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
420
659
|
const eventStorePromises = eventValidationRequests.map(request =>
|
|
421
660
|
eventService.validateAndStoreEvent(
|
|
422
661
|
request.contractAddress,
|
|
@@ -425,21 +664,18 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
425
664
|
request.serializedEvent,
|
|
426
665
|
request.eventCommitment,
|
|
427
666
|
request.txHash,
|
|
428
|
-
|
|
667
|
+
scope,
|
|
429
668
|
),
|
|
430
669
|
);
|
|
431
670
|
|
|
432
671
|
await Promise.all([...noteStorePromises, ...eventStorePromises]);
|
|
433
|
-
|
|
434
|
-
// Requests are cleared once we're done.
|
|
435
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
436
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
437
672
|
}
|
|
438
673
|
|
|
439
|
-
public async
|
|
674
|
+
public async getLogsByTag(
|
|
440
675
|
contractAddress: AztecAddress,
|
|
441
676
|
logRetrievalRequestsArrayBaseSlot: Fr,
|
|
442
677
|
logRetrievalResponsesArrayBaseSlot: Fr,
|
|
678
|
+
scope: AztecAddress,
|
|
443
679
|
) {
|
|
444
680
|
// TODO(#10727): allow other contracts to process partial notes
|
|
445
681
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
@@ -449,100 +685,315 @@ export class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOra
|
|
|
449
685
|
// We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
|
|
450
686
|
// don't need to wait for the network round-trip.
|
|
451
687
|
const logRetrievalRequests = (
|
|
452
|
-
await this.
|
|
688
|
+
await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)
|
|
453
689
|
).map(LogRetrievalRequest.fromFields);
|
|
454
690
|
|
|
455
|
-
const logService =
|
|
456
|
-
|
|
457
|
-
this.anchorBlockStore,
|
|
458
|
-
this.keyStore,
|
|
459
|
-
this.capsuleStore,
|
|
460
|
-
this.recipientTaggingStore,
|
|
461
|
-
this.senderAddressBookStore,
|
|
462
|
-
this.addressStore,
|
|
463
|
-
this.jobId,
|
|
464
|
-
);
|
|
465
|
-
|
|
466
|
-
const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
|
|
691
|
+
const logService = this.#createLogService();
|
|
692
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
|
|
467
693
|
|
|
468
694
|
// Requests are cleared once we're done.
|
|
469
|
-
await this.
|
|
695
|
+
await this.capsuleService.setCapsuleArray(
|
|
696
|
+
contractAddress,
|
|
697
|
+
logRetrievalRequestsArrayBaseSlot,
|
|
698
|
+
[],
|
|
699
|
+
this.jobId,
|
|
700
|
+
scope,
|
|
701
|
+
);
|
|
470
702
|
|
|
471
703
|
// The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
|
|
472
|
-
await this.
|
|
704
|
+
await this.capsuleService.setCapsuleArray(
|
|
473
705
|
contractAddress,
|
|
474
706
|
logRetrievalResponsesArrayBaseSlot,
|
|
475
707
|
maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption),
|
|
476
708
|
this.jobId,
|
|
709
|
+
scope,
|
|
477
710
|
);
|
|
478
711
|
}
|
|
479
712
|
|
|
480
|
-
public
|
|
713
|
+
public async getLogsByTagV2(requestArrayBaseSlot: Fr): Promise<Fr> {
|
|
714
|
+
const logRetrievalRequests = this.ephemeralArrayService
|
|
715
|
+
.readArrayAt(requestArrayBaseSlot)
|
|
716
|
+
.map(LogRetrievalRequest.fromFields);
|
|
717
|
+
const logService = this.#createLogService();
|
|
718
|
+
|
|
719
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
|
|
720
|
+
|
|
721
|
+
return this.ephemeralArrayService.newArray(maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption));
|
|
722
|
+
}
|
|
723
|
+
|
|
724
|
+
// Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
725
|
+
public async getMessageContextsByTxHash(
|
|
726
|
+
contractAddress: AztecAddress,
|
|
727
|
+
messageContextRequestsArrayBaseSlot: Fr,
|
|
728
|
+
messageContextResponsesArrayBaseSlot: Fr,
|
|
729
|
+
scope: AztecAddress,
|
|
730
|
+
) {
|
|
731
|
+
try {
|
|
732
|
+
if (!this.contractAddress.equals(contractAddress)) {
|
|
733
|
+
throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
734
|
+
}
|
|
735
|
+
|
|
736
|
+
// TODO(@mverzilli): this is a prime example of where using an ephemeral array would make much more sense, we don't
|
|
737
|
+
// need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
|
|
738
|
+
// At the same time, we don't want to allow any global scope access other than where backwards compatibility
|
|
739
|
+
// forces us to. Hence we need the scope here to be artificial.
|
|
740
|
+
const requestCapsules = await this.capsuleService.readCapsuleArray(
|
|
741
|
+
contractAddress,
|
|
742
|
+
messageContextRequestsArrayBaseSlot,
|
|
743
|
+
this.jobId,
|
|
744
|
+
scope,
|
|
745
|
+
);
|
|
746
|
+
|
|
747
|
+
const txHashes = requestCapsules.map((fields, i) => {
|
|
748
|
+
if (fields.length !== 1) {
|
|
749
|
+
throw new Error(
|
|
750
|
+
`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`,
|
|
751
|
+
);
|
|
752
|
+
}
|
|
753
|
+
return fields[0];
|
|
754
|
+
});
|
|
755
|
+
|
|
756
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(
|
|
757
|
+
txHashes,
|
|
758
|
+
this.anchorBlockHeader.getBlockNumber(),
|
|
759
|
+
);
|
|
760
|
+
|
|
761
|
+
// Leave response in response capsule array.
|
|
762
|
+
await this.capsuleService.setCapsuleArray(
|
|
763
|
+
contractAddress,
|
|
764
|
+
messageContextResponsesArrayBaseSlot,
|
|
765
|
+
maybeMessageContexts.map(MessageContext.toSerializedOption),
|
|
766
|
+
this.jobId,
|
|
767
|
+
scope,
|
|
768
|
+
);
|
|
769
|
+
} finally {
|
|
770
|
+
await this.capsuleService.setCapsuleArray(
|
|
771
|
+
contractAddress,
|
|
772
|
+
messageContextRequestsArrayBaseSlot,
|
|
773
|
+
[],
|
|
774
|
+
this.jobId,
|
|
775
|
+
scope,
|
|
776
|
+
);
|
|
777
|
+
}
|
|
778
|
+
}
|
|
779
|
+
|
|
780
|
+
/** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response slot. */
|
|
781
|
+
public async getMessageContextsByTxHashV2(requestArrayBaseSlot: Fr): Promise<Fr> {
|
|
782
|
+
const requestFields = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot);
|
|
783
|
+
|
|
784
|
+
const txHashes = requestFields.map((fields, i) => {
|
|
785
|
+
if (fields.length !== 1) {
|
|
786
|
+
throw new Error(
|
|
787
|
+
`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`,
|
|
788
|
+
);
|
|
789
|
+
}
|
|
790
|
+
return fields[0];
|
|
791
|
+
});
|
|
792
|
+
|
|
793
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(
|
|
794
|
+
txHashes,
|
|
795
|
+
this.anchorBlockHeader.getBlockNumber(),
|
|
796
|
+
);
|
|
797
|
+
|
|
798
|
+
return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
|
|
799
|
+
}
|
|
800
|
+
|
|
801
|
+
public setCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[], scope: AztecAddress): void {
|
|
481
802
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
482
803
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
483
804
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
484
805
|
}
|
|
485
|
-
this.
|
|
486
|
-
return Promise.resolve();
|
|
806
|
+
this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
|
|
487
807
|
}
|
|
488
808
|
|
|
489
|
-
public
|
|
809
|
+
public getCapsule(contractAddress: AztecAddress, slot: Fr, scope: AztecAddress): Promise<Fr[] | null> {
|
|
490
810
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
491
811
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
492
812
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
493
813
|
}
|
|
494
|
-
return (
|
|
495
|
-
// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
|
|
496
|
-
this.capsules.find(c => c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ??
|
|
497
|
-
(await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId))
|
|
498
|
-
);
|
|
814
|
+
return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
|
|
499
815
|
}
|
|
500
816
|
|
|
501
|
-
public
|
|
817
|
+
public deleteCapsule(contractAddress: AztecAddress, slot: Fr, scope: AztecAddress): void {
|
|
502
818
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
503
819
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
504
820
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
505
821
|
}
|
|
506
|
-
this.
|
|
507
|
-
return Promise.resolve();
|
|
822
|
+
this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
|
|
508
823
|
}
|
|
509
824
|
|
|
510
|
-
public
|
|
825
|
+
public copyCapsule(
|
|
511
826
|
contractAddress: AztecAddress,
|
|
512
827
|
srcSlot: Fr,
|
|
513
828
|
dstSlot: Fr,
|
|
514
829
|
numEntries: number,
|
|
830
|
+
scope: AztecAddress,
|
|
515
831
|
): Promise<void> {
|
|
516
832
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
517
833
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
518
834
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
519
835
|
}
|
|
520
|
-
return this.
|
|
836
|
+
return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
|
|
837
|
+
}
|
|
838
|
+
|
|
839
|
+
/**
|
|
840
|
+
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
841
|
+
* stored notes or events are discovered.
|
|
842
|
+
*/
|
|
843
|
+
public setContractSyncCacheInvalid(contractAddress: AztecAddress, scopes: AztecAddress[]): void {
|
|
844
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
845
|
+
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
846
|
+
}
|
|
847
|
+
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
|
|
521
848
|
}
|
|
522
849
|
|
|
523
850
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
524
|
-
public
|
|
851
|
+
public decryptAes128(ciphertext: Buffer, iv: Buffer, symKey: Buffer): Promise<Buffer> {
|
|
525
852
|
const aes128 = new Aes128();
|
|
526
853
|
return aes128.decryptBufferCBC(ciphertext, iv, symKey);
|
|
527
854
|
}
|
|
528
855
|
|
|
529
856
|
/**
|
|
530
|
-
* Retrieves the shared secret for a given address and ephemeral public key.
|
|
857
|
+
* Retrieves the app-siloed shared secret for a given address and ephemeral public key.
|
|
531
858
|
* @param address - The address to get the secret for.
|
|
532
859
|
* @param ephPk - The ephemeral public key to get the secret for.
|
|
533
|
-
* @
|
|
860
|
+
* @param contractAddress - The contract address for app-siloing (validated against execution context).
|
|
861
|
+
* @returns The app-siloed shared secret as a Field.
|
|
534
862
|
*/
|
|
535
|
-
public
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
const recipientCompleteAddress = await this.
|
|
863
|
+
public async getSharedSecret(address: AztecAddress, ephPk: Point, contractAddress: AztecAddress): Promise<Fr> {
|
|
864
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
865
|
+
throw new Error(
|
|
866
|
+
`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`,
|
|
867
|
+
);
|
|
868
|
+
}
|
|
869
|
+
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
542
870
|
const ivskM = await this.keyStore.getMasterSecretKey(
|
|
543
871
|
recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey,
|
|
544
872
|
);
|
|
545
873
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
546
|
-
return
|
|
874
|
+
return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
|
|
875
|
+
}
|
|
876
|
+
|
|
877
|
+
public pushEphemeral(slot: Fr, elements: Fr[]): number {
|
|
878
|
+
return this.ephemeralArrayService.push(slot, elements);
|
|
879
|
+
}
|
|
880
|
+
|
|
881
|
+
public popEphemeral(slot: Fr): Fr[] {
|
|
882
|
+
return this.ephemeralArrayService.pop(slot);
|
|
883
|
+
}
|
|
884
|
+
|
|
885
|
+
public getEphemeral(slot: Fr, index: number): Fr[] {
|
|
886
|
+
return this.ephemeralArrayService.get(slot, index);
|
|
887
|
+
}
|
|
888
|
+
|
|
889
|
+
public setEphemeral(slot: Fr, index: number, elements: Fr[]): void {
|
|
890
|
+
this.ephemeralArrayService.set(slot, index, elements);
|
|
891
|
+
}
|
|
892
|
+
|
|
893
|
+
public getEphemeralLen(slot: Fr): number {
|
|
894
|
+
return this.ephemeralArrayService.len(slot);
|
|
895
|
+
}
|
|
896
|
+
|
|
897
|
+
public removeEphemeral(slot: Fr, index: number): void {
|
|
898
|
+
this.ephemeralArrayService.remove(slot, index);
|
|
899
|
+
}
|
|
900
|
+
|
|
901
|
+
public clearEphemeral(slot: Fr): void {
|
|
902
|
+
this.ephemeralArrayService.clear(slot);
|
|
903
|
+
}
|
|
904
|
+
|
|
905
|
+
public emitOffchainEffect(data: Fr[]): Promise<void> {
|
|
906
|
+
this.offchainEffects.push({ data, contractAddress: this.contractAddress });
|
|
907
|
+
return Promise.resolve();
|
|
908
|
+
}
|
|
909
|
+
|
|
910
|
+
/** Executes another utility function from within this one and returns its serialized return values. */
|
|
911
|
+
public async callUtilityFunction(
|
|
912
|
+
targetContractAddress: AztecAddress,
|
|
913
|
+
functionSelector: FunctionSelector,
|
|
914
|
+
args: Fr[],
|
|
915
|
+
): Promise<Fr[]> {
|
|
916
|
+
// TODO(F-29): We want to support cross-contract utility calls, but doing so safely requires wallets to have
|
|
917
|
+
// a way to authorize which contracts can be called transitively, since those calls may expose private state.
|
|
918
|
+
// Until that is in place, restrict nested utility calls to the same contract only.
|
|
919
|
+
if (!targetContractAddress.equals(this.contractAddress)) {
|
|
920
|
+
throw new Error(
|
|
921
|
+
`Cross-contract utility calls are not yet supported: cannot call ${targetContractAddress} from utility function on ${this.contractAddress}.`,
|
|
922
|
+
);
|
|
923
|
+
}
|
|
924
|
+
|
|
925
|
+
this.logger.debug(
|
|
926
|
+
`Calling nested utility function ${targetContractAddress}:${functionSelector} from ${this.contractAddress}`,
|
|
927
|
+
);
|
|
928
|
+
|
|
929
|
+
const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(
|
|
930
|
+
targetContractAddress,
|
|
931
|
+
functionSelector,
|
|
932
|
+
);
|
|
933
|
+
|
|
934
|
+
const nestedOracle = new UtilityExecutionOracle({
|
|
935
|
+
contractAddress: targetContractAddress,
|
|
936
|
+
authWitnesses: this.authWitnesses,
|
|
937
|
+
capsules: this.capsules,
|
|
938
|
+
anchorBlockHeader: this.anchorBlockHeader,
|
|
939
|
+
contractStore: this.contractStore,
|
|
940
|
+
noteStore: this.noteStore,
|
|
941
|
+
keyStore: this.keyStore,
|
|
942
|
+
addressStore: this.addressStore,
|
|
943
|
+
aztecNode: this.aztecNode,
|
|
944
|
+
recipientTaggingStore: this.recipientTaggingStore,
|
|
945
|
+
senderAddressBookStore: this.senderAddressBookStore,
|
|
946
|
+
capsuleService: this.capsuleService,
|
|
947
|
+
privateEventStore: this.privateEventStore,
|
|
948
|
+
messageContextService: this.messageContextService,
|
|
949
|
+
contractSyncService: this.contractSyncService,
|
|
950
|
+
l2TipsStore: this.l2TipsStore,
|
|
951
|
+
jobId: this.jobId,
|
|
952
|
+
scopes: this.scopes,
|
|
953
|
+
simulator: this.simulator,
|
|
954
|
+
log: this.logger,
|
|
955
|
+
});
|
|
956
|
+
|
|
957
|
+
const initialWitness = toACVMWitness(0, args);
|
|
958
|
+
const acvmCallback = new Oracle(nestedOracle);
|
|
959
|
+
const acirExecutionResult = await this.simulator
|
|
960
|
+
.executeUserCircuit(initialWitness, targetArtifact, acvmCallback.toACIRCallback())
|
|
961
|
+
.catch((err: Error) => {
|
|
962
|
+
err.message = resolveAssertionMessageFromError(err, targetArtifact);
|
|
963
|
+
throw new ExecutionError(
|
|
964
|
+
err.message,
|
|
965
|
+
{ contractAddress: targetContractAddress, functionSelector },
|
|
966
|
+
extractCallStack(err, targetArtifact.debug),
|
|
967
|
+
{ cause: err },
|
|
968
|
+
);
|
|
969
|
+
});
|
|
970
|
+
|
|
971
|
+
return witnessMapToFields(acirExecutionResult.returnWitness);
|
|
972
|
+
}
|
|
973
|
+
|
|
974
|
+
/** Returns offchain effects collected during execution. */
|
|
975
|
+
public getOffchainEffects(): OffchainEffect[] {
|
|
976
|
+
return this.offchainEffects;
|
|
977
|
+
}
|
|
978
|
+
|
|
979
|
+
/** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */
|
|
980
|
+
async #queryWithBlockHashNotAfterAnchor<T>(blockHash: BlockHash, query: () => Promise<T>): Promise<T> {
|
|
981
|
+
const [response] = await Promise.all([
|
|
982
|
+
query(),
|
|
983
|
+
(async () => {
|
|
984
|
+
const block = await this.aztecNode.getBlock(blockHash);
|
|
985
|
+
const header = block?.header;
|
|
986
|
+
if (!header) {
|
|
987
|
+
throw new Error(`Could not find block header for block hash ${blockHash}`);
|
|
988
|
+
}
|
|
989
|
+
|
|
990
|
+
if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
|
|
991
|
+
throw new Error(
|
|
992
|
+
`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 ${await this.anchorBlockHeader.hash()}).`,
|
|
993
|
+
);
|
|
994
|
+
}
|
|
995
|
+
})(),
|
|
996
|
+
]);
|
|
997
|
+
return response;
|
|
547
998
|
}
|
|
548
999
|
}
|