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