@aztec/pxe 0.0.1-commit.d1f2d6c → 0.0.1-commit.d20b825a7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bin/check_oracle_version.js +5 -5
- package/dest/block_synchronizer/block_synchronizer.d.ts +10 -4
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +30 -6
- 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 +206 -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 +5 -7
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +9 -11
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +2 -4
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +5 -8
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.js +7 -12
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +62 -46
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +47 -0
- package/dest/contract_function_simulator/oracle/oracle.d.ts +75 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +310 -113
- package/dest/contract_function_simulator/oracle/private_execution.d.ts +3 -22
- package/dest/contract_function_simulator/oracle/private_execution.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -49
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +60 -84
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +125 -98
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +128 -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 +330 -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/helpers.js +60 -0
- package/dest/debug/pxe_debug_utils.d.ts +24 -10
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/debug/pxe_debug_utils.js +28 -18
- package/dest/entrypoints/client/bundle/index.d.ts +3 -1
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +2 -0
- package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +23 -9
- package/dest/entrypoints/client/lazy/index.d.ts +3 -1
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +2 -0
- package/dest/entrypoints/client/lazy/utils.d.ts +3 -3
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +24 -10
- package/dest/entrypoints/pxe_creation_options.d.ts +5 -2
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/pxe_creation_options.js +3 -1
- package/dest/entrypoints/server/index.d.ts +4 -2
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +3 -1
- package/dest/entrypoints/server/utils.d.ts +2 -2
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +30 -11
- package/dest/events/event_service.d.ts +6 -6
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +31 -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/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 -62
- 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 -15
- 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 -87
- 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 -16
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +160 -85
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +14 -4
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +149 -109
- 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/private_event_store/stored_private_event.d.ts +4 -4
- package/dest/storage/private_event_store/stored_private_event.d.ts.map +1 -1
- package/dest/storage/private_event_store/stored_private_event.js +2 -2
- 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 +4 -4
- 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 +5 -6
- 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 +7 -8
- 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 +5 -9
- 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 +6 -8
- 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 +5 -4
- package/src/block_synchronizer/block_synchronizer.ts +45 -21
- package/src/config/index.ts +3 -9
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +366 -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 +10 -10
- package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +5 -11
- package/src/contract_function_simulator/oracle/interfaces.ts +90 -62
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
- package/src/contract_function_simulator/oracle/oracle.ts +391 -150
- package/src/contract_function_simulator/oracle/private_execution.ts +5 -83
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +160 -193
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +552 -179
- 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/helpers.ts +98 -0
- package/src/debug/pxe_debug_utils.ts +63 -19
- package/src/entrypoints/client/bundle/index.ts +2 -0
- package/src/entrypoints/client/bundle/utils.ts +18 -18
- package/src/entrypoints/client/lazy/index.ts +2 -0
- package/src/entrypoints/client/lazy/utils.ts +19 -18
- package/src/entrypoints/pxe_creation_options.ts +9 -1
- package/src/entrypoints/server/index.ts +3 -1
- package/src/entrypoints/server/utils.ts +24 -29
- package/src/events/event_service.ts +35 -12
- 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 -106
- package/src/messages/message_context_service.ts +44 -0
- package/src/notes/note_service.ts +25 -17
- 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 -144
- 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 -101
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +168 -134
- package/src/storage/private_event_store/private_event_store.ts +106 -81
- package/src/storage/private_event_store/stored_private_event.ts +3 -3
- 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 +31 -7
- package/src/tagging/index.ts +2 -2
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +14 -27
- package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +12 -17
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +25 -12
- 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 +30 -29
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { Aes128 } from '@aztec/foundation/crypto/aes128';
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
-
import { LogLevels,
|
|
3
|
+
import { LogLevels, createLogger } from '@aztec/foundation/log';
|
|
4
|
+
import { isProtocolContract } from '@aztec/protocol-contracts';
|
|
4
5
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
5
6
|
import { computeAddressSecret } from '@aztec/stdlib/keys';
|
|
6
|
-
import {
|
|
7
|
+
import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
|
|
7
8
|
import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
|
|
8
9
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
10
|
+
import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
|
|
9
11
|
import { EventService } from '../../events/event_service.js';
|
|
10
12
|
import { LogService } from '../../logs/log_service.js';
|
|
11
13
|
import { NoteService } from '../../notes/note_service.js';
|
|
12
|
-
import {
|
|
14
|
+
import { ORACLE_VERSION_MAJOR } from '../../oracle_version.js';
|
|
15
|
+
import { EphemeralArrayService } from '../ephemeral_array_service.js';
|
|
13
16
|
import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
|
|
14
17
|
import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
|
|
15
18
|
import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
|
|
@@ -20,6 +23,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
20
23
|
/**
|
|
21
24
|
* The oracle for an execution of utility contract functions.
|
|
22
25
|
*/ export class UtilityExecutionOracle {
|
|
26
|
+
isMisc = true;
|
|
27
|
+
isUtility = true;
|
|
28
|
+
contractLogger;
|
|
29
|
+
aztecnrLogger;
|
|
30
|
+
offchainEffects = [];
|
|
31
|
+
ephemeralArrayService = new EphemeralArrayService();
|
|
32
|
+
// We store oracle version to be able to show a nice error message when an oracle handler is missing.
|
|
33
|
+
contractOracleVersion;
|
|
23
34
|
contractAddress;
|
|
24
35
|
authWitnesses;
|
|
25
36
|
capsules;
|
|
@@ -29,48 +40,73 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
29
40
|
keyStore;
|
|
30
41
|
addressStore;
|
|
31
42
|
aztecNode;
|
|
32
|
-
anchorBlockStore;
|
|
33
43
|
recipientTaggingStore;
|
|
34
44
|
senderAddressBookStore;
|
|
35
|
-
|
|
45
|
+
capsuleService;
|
|
36
46
|
privateEventStore;
|
|
47
|
+
messageContextService;
|
|
48
|
+
contractSyncService;
|
|
49
|
+
l2TipsStore;
|
|
37
50
|
jobId;
|
|
38
|
-
|
|
51
|
+
logger;
|
|
39
52
|
scopes;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
this.
|
|
45
|
-
this.
|
|
46
|
-
this.
|
|
47
|
-
this.
|
|
48
|
-
this.
|
|
49
|
-
this.
|
|
50
|
-
this.
|
|
51
|
-
this.
|
|
52
|
-
this.
|
|
53
|
-
this.
|
|
54
|
-
this.
|
|
55
|
-
this.
|
|
56
|
-
this.
|
|
57
|
-
this.
|
|
58
|
-
this.
|
|
59
|
-
this.
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
this
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
53
|
+
constructor(args){
|
|
54
|
+
this.contractAddress = args.contractAddress;
|
|
55
|
+
this.authWitnesses = args.authWitnesses;
|
|
56
|
+
this.capsules = args.capsules;
|
|
57
|
+
this.anchorBlockHeader = args.anchorBlockHeader;
|
|
58
|
+
this.contractStore = args.contractStore;
|
|
59
|
+
this.noteStore = args.noteStore;
|
|
60
|
+
this.keyStore = args.keyStore;
|
|
61
|
+
this.addressStore = args.addressStore;
|
|
62
|
+
this.aztecNode = args.aztecNode;
|
|
63
|
+
this.recipientTaggingStore = args.recipientTaggingStore;
|
|
64
|
+
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
65
|
+
this.capsuleService = args.capsuleService;
|
|
66
|
+
this.privateEventStore = args.privateEventStore;
|
|
67
|
+
this.messageContextService = args.messageContextService;
|
|
68
|
+
this.contractSyncService = args.contractSyncService;
|
|
69
|
+
this.l2TipsStore = args.l2TipsStore;
|
|
70
|
+
this.jobId = args.jobId;
|
|
71
|
+
this.logger = args.log ?? createLogger('simulator:client_view_context');
|
|
72
|
+
this.scopes = args.scopes;
|
|
73
|
+
}
|
|
74
|
+
assertCompatibleOracleVersion(major, minor) {
|
|
75
|
+
// TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
|
|
76
|
+
// Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
|
|
77
|
+
// the expected pinned version or the current one. We want to allow for both the pinned and the current versions
|
|
78
|
+
// because we want this code to work with both the pinned and unpinned version since some branches do not have the
|
|
79
|
+
// pinned contracts (like e.g. next)
|
|
80
|
+
const LEGACY_ORACLE_VERSION = 12;
|
|
81
|
+
if (isProtocolContract(this.contractAddress)) {
|
|
82
|
+
if (major !== LEGACY_ORACLE_VERSION && major !== ORACLE_VERSION_MAJOR) {
|
|
83
|
+
const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : '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.';
|
|
84
|
+
throw new Error(`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})`);
|
|
85
|
+
}
|
|
86
|
+
this.contractOracleVersion = {
|
|
87
|
+
major,
|
|
88
|
+
minor
|
|
89
|
+
};
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
if (major !== ORACLE_VERSION_MAJOR) {
|
|
93
|
+
const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : '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.';
|
|
94
|
+
throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`);
|
|
68
95
|
}
|
|
96
|
+
// Major matches - store both major and minor for later diagnostics (e.g. when an oracle is not found)
|
|
97
|
+
this.contractOracleVersion = {
|
|
98
|
+
major,
|
|
99
|
+
minor
|
|
100
|
+
};
|
|
69
101
|
}
|
|
70
|
-
|
|
102
|
+
// Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
|
|
103
|
+
nonOracleFunctionGetContractOracleVersion() {
|
|
104
|
+
return this.contractOracleVersion;
|
|
105
|
+
}
|
|
106
|
+
getRandomField() {
|
|
71
107
|
return Fr.random();
|
|
72
108
|
}
|
|
73
|
-
|
|
109
|
+
getUtilityContext() {
|
|
74
110
|
return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
|
|
75
111
|
}
|
|
76
112
|
/**
|
|
@@ -78,32 +114,51 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
78
114
|
* @param pkMHash - The master public key hash.
|
|
79
115
|
* @returns A Promise that resolves to nullifier keys.
|
|
80
116
|
* @throws If the keys are not registered in the key store.
|
|
81
|
-
|
|
117
|
+
* @throws If scopes are defined and the account is not in the scopes.
|
|
118
|
+
*/ async getKeyValidationRequest(pkMHash) {
|
|
119
|
+
let hasAccess = false;
|
|
120
|
+
for(let i = 0; i < this.scopes.length && !hasAccess; i++){
|
|
121
|
+
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
122
|
+
hasAccess = true;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
if (!hasAccess) {
|
|
126
|
+
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
127
|
+
}
|
|
82
128
|
return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
|
|
83
129
|
}
|
|
84
130
|
/**
|
|
85
131
|
* Fetches the index and sibling path of a leaf at a given block from the note hash tree.
|
|
86
|
-
* @param blockHash - The block hash
|
|
87
|
-
*
|
|
132
|
+
* @param blockHash - The hash of a block that contains the note hash tree root in which to find the
|
|
133
|
+
* membership witness.
|
|
134
|
+
* @param noteHash - The note hash to find in the note hash tree.
|
|
88
135
|
* @returns The membership witness containing the leaf index and sibling path
|
|
89
|
-
*/
|
|
90
|
-
return this.aztecNode.getNoteHashMembershipWitness(blockHash,
|
|
136
|
+
*/ getNoteHashMembershipWitness(blockHash, noteHash) {
|
|
137
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
|
|
91
138
|
}
|
|
92
139
|
/**
|
|
93
|
-
* Fetches the index and sibling path of a
|
|
94
|
-
*
|
|
95
|
-
*
|
|
140
|
+
* Fetches the index and sibling path of a block hash in the archive tree.
|
|
141
|
+
*
|
|
142
|
+
* Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
|
|
143
|
+
* its block hash is appended as a new leaf to the archive tree.
|
|
144
|
+
*
|
|
145
|
+
* @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
|
|
146
|
+
* witness.
|
|
147
|
+
* @param blockHash - The block hash to find in the archive tree.
|
|
96
148
|
* @returns The membership witness containing the leaf index and sibling path
|
|
97
|
-
*/
|
|
98
|
-
|
|
149
|
+
*/ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
|
|
150
|
+
// Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
|
|
151
|
+
// hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
|
|
152
|
+
// membership witness as there is none.
|
|
153
|
+
return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
|
|
99
154
|
}
|
|
100
155
|
/**
|
|
101
156
|
* Returns a nullifier membership witness for a given nullifier at a given block.
|
|
102
157
|
* @param blockHash - The block hash at which to get the index.
|
|
103
158
|
* @param nullifier - Nullifier we try to find witness for.
|
|
104
159
|
* @returns The nullifier membership witness (if found).
|
|
105
|
-
*/
|
|
106
|
-
return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
|
|
160
|
+
*/ getNullifierMembershipWitness(blockHash, nullifier) {
|
|
161
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
|
|
107
162
|
}
|
|
108
163
|
/**
|
|
109
164
|
* Returns a low nullifier membership witness for a given nullifier at a given block.
|
|
@@ -113,23 +168,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
113
168
|
* @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
|
|
114
169
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
115
170
|
* we are trying to prove non-inclusion for.
|
|
116
|
-
*/
|
|
117
|
-
return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
|
|
171
|
+
*/ getLowNullifierMembershipWitness(blockHash, nullifier) {
|
|
172
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
|
|
118
173
|
}
|
|
119
174
|
/**
|
|
120
175
|
* Returns a public data tree witness for a given leaf slot at a given block.
|
|
121
176
|
* @param blockHash - The block hash at which to get the index.
|
|
122
177
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
123
178
|
* @returns - The witness
|
|
124
|
-
*/
|
|
125
|
-
return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
|
|
179
|
+
*/ getPublicDataWitness(blockHash, leafSlot) {
|
|
180
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
|
|
126
181
|
}
|
|
127
182
|
/**
|
|
128
183
|
* Fetches a block header of a given block.
|
|
129
184
|
* @param blockNumber - The number of a block of which to get the block header.
|
|
130
185
|
* @returns Block extracted from a block with block number `blockNumber`.
|
|
131
|
-
*/ async
|
|
132
|
-
const anchorBlockNumber =
|
|
186
|
+
*/ async getBlockHeader(blockNumber) {
|
|
187
|
+
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
|
|
133
188
|
if (blockNumber > anchorBlockNumber) {
|
|
134
189
|
throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
|
|
135
190
|
}
|
|
@@ -137,14 +192,20 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
137
192
|
return block?.header;
|
|
138
193
|
}
|
|
139
194
|
/**
|
|
140
|
-
* Retrieve the
|
|
195
|
+
* Retrieve the public keys and partial address associated to a given address.
|
|
141
196
|
* @param account - The account address.
|
|
142
|
-
* @returns
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
197
|
+
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
198
|
+
*/ async getPublicKeysAndPartialAddress(account) {
|
|
199
|
+
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
200
|
+
if (!completeAddress) {
|
|
201
|
+
return undefined;
|
|
202
|
+
}
|
|
203
|
+
return {
|
|
204
|
+
publicKeys: completeAddress.publicKeys,
|
|
205
|
+
partialAddress: completeAddress.partialAddress
|
|
206
|
+
};
|
|
146
207
|
}
|
|
147
|
-
async
|
|
208
|
+
async getCompleteAddressOrFail(account) {
|
|
148
209
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
149
210
|
if (!completeAddress) {
|
|
150
211
|
throw new Error(`No public key registered for address ${account}.
|
|
@@ -156,10 +217,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
156
217
|
* Returns a contract instance associated with an address or throws if not found.
|
|
157
218
|
* @param address - Address.
|
|
158
219
|
* @returns A contract instance.
|
|
159
|
-
*/
|
|
160
|
-
return this.getContractInstance(address);
|
|
161
|
-
}
|
|
162
|
-
async getContractInstance(address) {
|
|
220
|
+
*/ async getContractInstance(address) {
|
|
163
221
|
const instance = await this.contractStore.getContractInstance(address);
|
|
164
222
|
if (!instance) {
|
|
165
223
|
throw new Error(`No contract instance found for address ${address.toString()}`);
|
|
@@ -167,11 +225,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
167
225
|
return instance;
|
|
168
226
|
}
|
|
169
227
|
/**
|
|
170
|
-
* Returns an auth witness for the given message hash
|
|
171
|
-
* for this transaction first, and falls back to the local database if not found.
|
|
228
|
+
* Returns an auth witness for the given message hash from the list of transient witnesses for this transaction.
|
|
172
229
|
* @param messageHash - Hash of the message to authenticate.
|
|
173
|
-
* @returns Authentication witness for the requested message hash.
|
|
174
|
-
*/
|
|
230
|
+
* @returns Authentication witness for the requested message hash, or undefined if not found.
|
|
231
|
+
*/ getAuthWitness(messageHash) {
|
|
175
232
|
return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
|
|
176
233
|
}
|
|
177
234
|
/**
|
|
@@ -195,8 +252,8 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
195
252
|
* @param offset - The starting index for pagination.
|
|
196
253
|
* @param status - The status of notes to fetch.
|
|
197
254
|
* @returns Array of note data.
|
|
198
|
-
*/ async
|
|
199
|
-
const noteService = new NoteService(this.noteStore, this.aztecNode, this.
|
|
255
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
256
|
+
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
200
257
|
const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
|
|
201
258
|
return pickNotes(dbNotes, {
|
|
202
259
|
selects: selectByIndexes.slice(0, numSelects).map((index, i)=>({
|
|
@@ -224,22 +281,25 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
224
281
|
* Check if a nullifier exists in the nullifier tree.
|
|
225
282
|
* @param innerNullifier - The inner nullifier.
|
|
226
283
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
227
|
-
*/ async
|
|
228
|
-
const nullifier = await
|
|
229
|
-
|
|
284
|
+
*/ async doesNullifierExist(innerNullifier) {
|
|
285
|
+
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
286
|
+
siloNullifier(this.contractAddress, innerNullifier),
|
|
287
|
+
this.anchorBlockHeader.hash()
|
|
288
|
+
]);
|
|
289
|
+
const [leafIndex] = await this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
|
|
230
290
|
nullifier
|
|
231
291
|
]);
|
|
232
292
|
return leafIndex?.data !== undefined;
|
|
233
293
|
}
|
|
234
294
|
/**
|
|
235
|
-
*
|
|
295
|
+
* Returns the membership witness of an un-nullified L1 to L2 message.
|
|
236
296
|
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
237
297
|
* @param messageHash - Hash of the message.
|
|
238
298
|
* @param secret - Secret used to compute a nullifier.
|
|
239
299
|
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
240
300
|
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
241
|
-
*/ async
|
|
242
|
-
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
|
|
301
|
+
*/ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
302
|
+
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
|
|
243
303
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
244
304
|
}
|
|
245
305
|
/**
|
|
@@ -248,125 +308,252 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
248
308
|
* @param contractAddress - The address to read storage from.
|
|
249
309
|
* @param startStorageSlot - The starting storage slot.
|
|
250
310
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
251
|
-
*/
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
311
|
+
*/ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
|
|
312
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
|
|
313
|
+
const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
|
|
314
|
+
const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
|
|
315
|
+
this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
|
|
316
|
+
return values;
|
|
317
|
+
});
|
|
318
|
+
}
|
|
319
|
+
/**
|
|
320
|
+
* Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
321
|
+
*/ async #getContractLogger() {
|
|
322
|
+
if (!this.contractLogger) {
|
|
323
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
324
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
325
|
+
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
|
|
326
|
+
instanceId: this.jobId
|
|
327
|
+
});
|
|
328
|
+
}
|
|
329
|
+
return this.contractLogger;
|
|
256
330
|
}
|
|
257
|
-
|
|
331
|
+
/**
|
|
332
|
+
* Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
|
|
333
|
+
*/ async #getAztecnrLogger() {
|
|
334
|
+
if (!this.aztecnrLogger) {
|
|
335
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
336
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
337
|
+
this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
|
|
338
|
+
instanceId: this.jobId
|
|
339
|
+
});
|
|
340
|
+
}
|
|
341
|
+
return this.aztecnrLogger;
|
|
342
|
+
}
|
|
343
|
+
async log(level, message, fields) {
|
|
258
344
|
if (!LogLevels[level]) {
|
|
259
|
-
throw new Error(`Invalid
|
|
345
|
+
throw new Error(`Invalid log level: ${level}`);
|
|
260
346
|
}
|
|
261
|
-
const
|
|
262
|
-
this
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
347
|
+
const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
|
|
348
|
+
const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
|
|
349
|
+
logContractMessage(logger, LogLevels[level], strippedMessage, fields);
|
|
350
|
+
}
|
|
351
|
+
// Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
352
|
+
async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
|
|
353
|
+
const logService = this.#createLogService();
|
|
354
|
+
const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
|
|
355
|
+
await this.capsuleService.appendToCapsuleArray(this.contractAddress, pendingTaggedLogArrayBaseSlot, logs.map((log)=>log.toFields()), this.jobId, scope);
|
|
356
|
+
}
|
|
357
|
+
/** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */ async getPendingTaggedLogsV2(scope) {
|
|
358
|
+
const logService = this.#createLogService();
|
|
359
|
+
const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
|
|
360
|
+
return this.ephemeralArrayService.newArray(logs.map((log)=>log.toFields()));
|
|
361
|
+
}
|
|
362
|
+
#createLogService() {
|
|
363
|
+
return new LogService(this.aztecNode, this.anchorBlockHeader, this.l2TipsStore, this.keyStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
275
364
|
}
|
|
276
365
|
/**
|
|
277
|
-
*
|
|
278
|
-
* `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
|
|
279
|
-
* queryable via `get_notes` and `getPrivateEvents`.
|
|
366
|
+
* Legacy: validates note/event requests stored in capsule arrays.
|
|
280
367
|
*
|
|
281
|
-
*
|
|
282
|
-
|
|
283
|
-
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
284
|
-
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
285
|
-
*/ async utilityValidateEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
|
|
368
|
+
* Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
369
|
+
*/ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
|
|
286
370
|
// TODO(#10727): allow other contracts to store notes
|
|
287
371
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
288
372
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
289
373
|
}
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
const
|
|
374
|
+
const noteValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
375
|
+
const eventValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
376
|
+
await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
|
|
377
|
+
await this.capsuleService.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
378
|
+
await this.capsuleService.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
379
|
+
}
|
|
380
|
+
async validateAndStoreEnqueuedNotesAndEventsV2(noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
|
|
381
|
+
const noteValidationRequests = this.ephemeralArrayService.readArrayAt(noteValidationRequestsArrayBaseSlot).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
382
|
+
const eventValidationRequests = this.ephemeralArrayService.readArrayAt(eventValidationRequestsArrayBaseSlot).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
383
|
+
await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
|
|
384
|
+
}
|
|
385
|
+
/**
|
|
386
|
+
* Dispatches note and event validation requests to the service layer.
|
|
387
|
+
*
|
|
388
|
+
* This function is an auxiliary to support legacy (capsule backed) and new (ephemeral array backed) versions of the
|
|
389
|
+
* `validateAndStoreEnqueuedNotesAndEvents` oracle.
|
|
390
|
+
*/ async #processValidationRequests(noteValidationRequests, eventValidationRequests, scope) {
|
|
391
|
+
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
392
|
+
const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash, scope));
|
|
393
|
+
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
394
|
+
const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
|
|
298
395
|
await Promise.all([
|
|
299
396
|
...noteStorePromises,
|
|
300
397
|
...eventStorePromises
|
|
301
398
|
]);
|
|
302
|
-
// Requests are cleared once we're done.
|
|
303
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
304
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
305
399
|
}
|
|
306
|
-
async
|
|
400
|
+
async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
|
|
307
401
|
// TODO(#10727): allow other contracts to process partial notes
|
|
308
402
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
309
403
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
310
404
|
}
|
|
311
405
|
// We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
|
|
312
406
|
// don't need to wait for the network round-trip.
|
|
313
|
-
const logRetrievalRequests = (await this.
|
|
314
|
-
const logService =
|
|
315
|
-
const maybeLogRetrievalResponses = await logService.
|
|
407
|
+
const logRetrievalRequests = (await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
|
|
408
|
+
const logService = this.#createLogService();
|
|
409
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
|
|
316
410
|
// Requests are cleared once we're done.
|
|
317
|
-
await this.
|
|
411
|
+
await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
318
412
|
// The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
|
|
319
|
-
await this.
|
|
413
|
+
await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
|
|
414
|
+
}
|
|
415
|
+
async getLogsByTagV2(requestArrayBaseSlot) {
|
|
416
|
+
const logRetrievalRequests = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot).map(LogRetrievalRequest.fromFields);
|
|
417
|
+
const logService = this.#createLogService();
|
|
418
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
|
|
419
|
+
return this.ephemeralArrayService.newArray(maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption));
|
|
420
|
+
}
|
|
421
|
+
// Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
422
|
+
async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
|
|
423
|
+
try {
|
|
424
|
+
if (!this.contractAddress.equals(contractAddress)) {
|
|
425
|
+
throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
426
|
+
}
|
|
427
|
+
// TODO(@mverzilli): this is a prime example of where using an ephemeral array would make much more sense, we don't
|
|
428
|
+
// need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
|
|
429
|
+
// At the same time, we don't want to allow any global scope access other than where backwards compatibility
|
|
430
|
+
// forces us to. Hence we need the scope here to be artificial.
|
|
431
|
+
const requestCapsules = await this.capsuleService.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
|
|
432
|
+
const txHashes = requestCapsules.map((fields, i)=>{
|
|
433
|
+
if (fields.length !== 1) {
|
|
434
|
+
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
435
|
+
}
|
|
436
|
+
return fields[0];
|
|
437
|
+
});
|
|
438
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
439
|
+
// Leave response in response capsule array.
|
|
440
|
+
await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
|
|
441
|
+
} finally{
|
|
442
|
+
await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
443
|
+
}
|
|
320
444
|
}
|
|
321
|
-
|
|
445
|
+
/** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response slot. */ async getMessageContextsByTxHashV2(requestArrayBaseSlot) {
|
|
446
|
+
const requestFields = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot);
|
|
447
|
+
const txHashes = requestFields.map((fields, i)=>{
|
|
448
|
+
if (fields.length !== 1) {
|
|
449
|
+
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
450
|
+
}
|
|
451
|
+
return fields[0];
|
|
452
|
+
});
|
|
453
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
454
|
+
return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
|
|
455
|
+
}
|
|
456
|
+
setCapsule(contractAddress, slot, capsule, scope) {
|
|
322
457
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
323
458
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
324
459
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
325
460
|
}
|
|
326
|
-
this.
|
|
327
|
-
return Promise.resolve();
|
|
461
|
+
this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
|
|
328
462
|
}
|
|
329
|
-
|
|
463
|
+
getCapsule(contractAddress, slot, scope) {
|
|
330
464
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
331
465
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
332
466
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
333
467
|
}
|
|
334
|
-
return
|
|
335
|
-
this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
|
|
468
|
+
return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
|
|
336
469
|
}
|
|
337
|
-
|
|
470
|
+
deleteCapsule(contractAddress, slot, scope) {
|
|
338
471
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
339
472
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
340
473
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
341
474
|
}
|
|
342
|
-
this.
|
|
343
|
-
return Promise.resolve();
|
|
475
|
+
this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
|
|
344
476
|
}
|
|
345
|
-
|
|
477
|
+
copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
|
|
346
478
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
347
479
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
348
480
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
349
481
|
}
|
|
350
|
-
return this.
|
|
482
|
+
return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
|
|
483
|
+
}
|
|
484
|
+
/**
|
|
485
|
+
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
486
|
+
* stored notes or events are discovered.
|
|
487
|
+
*/ setContractSyncCacheInvalid(contractAddress, scopes) {
|
|
488
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
489
|
+
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
490
|
+
}
|
|
491
|
+
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
|
|
351
492
|
}
|
|
352
493
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
353
|
-
|
|
494
|
+
decryptAes128(ciphertext, iv, symKey) {
|
|
354
495
|
const aes128 = new Aes128();
|
|
355
496
|
return aes128.decryptBufferCBC(ciphertext, iv, symKey);
|
|
356
497
|
}
|
|
357
498
|
/**
|
|
358
|
-
* Retrieves the shared secret for a given address and ephemeral public key.
|
|
499
|
+
* Retrieves the app-siloed shared secret for a given address and ephemeral public key.
|
|
359
500
|
* @param address - The address to get the secret for.
|
|
360
501
|
* @param ephPk - The ephemeral public key to get the secret for.
|
|
361
|
-
* @
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
const recipientCompleteAddress = await this.
|
|
502
|
+
* @param contractAddress - The contract address for app-siloing (validated against execution context).
|
|
503
|
+
* @returns The app-siloed shared secret as a Field.
|
|
504
|
+
*/ async getSharedSecret(address, ephPk, contractAddress) {
|
|
505
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
506
|
+
throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
|
|
507
|
+
}
|
|
508
|
+
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
368
509
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
369
510
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
370
|
-
return
|
|
511
|
+
return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
|
|
512
|
+
}
|
|
513
|
+
pushEphemeral(slot, elements) {
|
|
514
|
+
return this.ephemeralArrayService.push(slot, elements);
|
|
515
|
+
}
|
|
516
|
+
popEphemeral(slot) {
|
|
517
|
+
return this.ephemeralArrayService.pop(slot);
|
|
518
|
+
}
|
|
519
|
+
getEphemeral(slot, index) {
|
|
520
|
+
return this.ephemeralArrayService.get(slot, index);
|
|
521
|
+
}
|
|
522
|
+
setEphemeral(slot, index, elements) {
|
|
523
|
+
this.ephemeralArrayService.set(slot, index, elements);
|
|
524
|
+
}
|
|
525
|
+
getEphemeralLen(slot) {
|
|
526
|
+
return this.ephemeralArrayService.len(slot);
|
|
527
|
+
}
|
|
528
|
+
removeEphemeral(slot, index) {
|
|
529
|
+
this.ephemeralArrayService.remove(slot, index);
|
|
530
|
+
}
|
|
531
|
+
clearEphemeral(slot) {
|
|
532
|
+
this.ephemeralArrayService.clear(slot);
|
|
533
|
+
}
|
|
534
|
+
emitOffchainEffect(data) {
|
|
535
|
+
this.offchainEffects.push({
|
|
536
|
+
data,
|
|
537
|
+
contractAddress: this.contractAddress
|
|
538
|
+
});
|
|
539
|
+
return Promise.resolve();
|
|
540
|
+
}
|
|
541
|
+
/** Returns offchain effects collected during execution. */ getOffchainEffects() {
|
|
542
|
+
return this.offchainEffects;
|
|
543
|
+
}
|
|
544
|
+
/** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
|
|
545
|
+
const [response] = await Promise.all([
|
|
546
|
+
query(),
|
|
547
|
+
(async ()=>{
|
|
548
|
+
const header = await this.aztecNode.getBlockHeader(blockHash);
|
|
549
|
+
if (!header) {
|
|
550
|
+
throw new Error(`Could not find block header for block hash ${blockHash}`);
|
|
551
|
+
}
|
|
552
|
+
if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
|
|
553
|
+
throw new Error(`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()}).`);
|
|
554
|
+
}
|
|
555
|
+
})()
|
|
556
|
+
]);
|
|
557
|
+
return response;
|
|
371
558
|
}
|
|
372
559
|
}
|