@aztec/pxe 0.0.1-commit.3d8f95d → 0.0.1-commit.3fd054f6
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/access_scopes.d.ts +9 -0
- package/dest/access_scopes.d.ts.map +1 -0
- package/dest/access_scopes.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 +1 -1
- package/dest/config/package_info.js +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +15 -7
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +137 -45
- 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 +2 -3
- 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 +5 -4
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +1 -1
- 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 +1 -3
- package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts +16 -0
- package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts.map +1 -0
- package/dest/contract_function_simulator/noir-structs/message_tx_context.js +57 -0
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +2 -4
- 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 +3 -5
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +50 -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 +42 -0
- package/dest/contract_function_simulator/oracle/oracle.d.ts +45 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +163 -94
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +24 -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 +39 -71
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +56 -37
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +115 -55
- package/dest/contract_logging.d.ts +22 -0
- package/dest/contract_logging.d.ts.map +1 -0
- package/dest/contract_logging.js +23 -0
- package/dest/contract_sync/contract_sync_service.d.ts +8 -4
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
- package/dest/contract_sync/contract_sync_service.js +61 -29
- package/dest/contract_sync/helpers.d.ts +3 -2
- package/dest/contract_sync/helpers.d.ts.map +1 -1
- package/dest/contract_sync/helpers.js +3 -3
- package/dest/debug/pxe_debug_utils.d.ts +5 -4
- 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 +4 -1
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +3 -0
- package/dest/entrypoints/client/lazy/index.d.ts +4 -1
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +3 -0
- package/dest/entrypoints/server/index.d.ts +3 -1
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +2 -0
- package/dest/logs/log_service.d.ts +3 -2
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +9 -14
- 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 -3
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +3 -2
- package/dest/notes_filter.d.ts +25 -0
- package/dest/notes_filter.d.ts.map +1 -0
- package/dest/notes_filter.js +4 -0
- package/dest/oracle_version.d.ts +2 -2
- package/dest/oracle_version.js +3 -3
- 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 +19 -11
- 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 +78 -53
- 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 +140 -64
- 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/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 -7
- 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/access_scopes.ts +9 -0
- package/src/config/index.ts +1 -1
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +254 -65
- 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 +8 -5
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +1 -4
- package/src/contract_function_simulator/noir-structs/message_tx_context.ts +55 -0
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +3 -6
- package/src/contract_function_simulator/oracle/interfaces.ts +54 -54
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +135 -0
- package/src/contract_function_simulator/oracle/oracle.ts +176 -138
- package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +47 -90
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +157 -67
- package/src/contract_logging.ts +39 -0
- package/src/contract_sync/contract_sync_service.ts +87 -35
- package/src/contract_sync/helpers.ts +7 -2
- package/src/debug/pxe_debug_utils.ts +11 -9
- package/src/entrypoints/client/bundle/index.ts +3 -0
- package/src/entrypoints/client/lazy/index.ts +3 -0
- package/src/entrypoints/server/index.ts +2 -0
- package/src/logs/log_service.ts +17 -24
- package/src/messages/message_context_service.ts +45 -0
- package/src/notes/note_service.ts +4 -3
- package/src/notes_filter.ts +26 -0
- package/src/oracle_version.ts +3 -3
- 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 +19 -12
- package/src/private_kernel/private_kernel_oracle.ts +7 -7
- package/src/pxe.ts +117 -71
- package/src/storage/contract_store/contract_store.ts +170 -71
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +8 -5
- 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 +7 -10
- 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,11 +1,13 @@
|
|
|
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
7
|
import { deriveEcdhSharedSecret } from '@aztec/stdlib/logs';
|
|
7
8
|
import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
|
|
8
9
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
10
|
+
import { createContractLogger, logContractMessage } 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';
|
|
@@ -13,6 +15,7 @@ import { ORACLE_VERSION } from '../../oracle_version.js';
|
|
|
13
15
|
import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
|
|
14
16
|
import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
|
|
15
17
|
import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
|
|
18
|
+
import { MessageTxContext } from '../noir-structs/message_tx_context.js';
|
|
16
19
|
import { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
|
|
17
20
|
import { UtilityContext } from '../noir-structs/utility_context.js';
|
|
18
21
|
import { pickNotes } from '../pick_notes.js';
|
|
@@ -23,6 +26,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
23
26
|
isMisc = true;
|
|
24
27
|
isUtility = true;
|
|
25
28
|
contractLogger;
|
|
29
|
+
offchainEffects = [];
|
|
26
30
|
contractAddress;
|
|
27
31
|
authWitnesses;
|
|
28
32
|
capsules;
|
|
@@ -36,8 +40,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
36
40
|
senderAddressBookStore;
|
|
37
41
|
capsuleStore;
|
|
38
42
|
privateEventStore;
|
|
43
|
+
messageContextService;
|
|
44
|
+
contractSyncService;
|
|
39
45
|
jobId;
|
|
40
|
-
|
|
46
|
+
logger;
|
|
41
47
|
scopes;
|
|
42
48
|
constructor(args){
|
|
43
49
|
this.contractAddress = args.contractAddress;
|
|
@@ -53,19 +59,33 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
53
59
|
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
54
60
|
this.capsuleStore = args.capsuleStore;
|
|
55
61
|
this.privateEventStore = args.privateEventStore;
|
|
62
|
+
this.messageContextService = args.messageContextService;
|
|
63
|
+
this.contractSyncService = args.contractSyncService;
|
|
56
64
|
this.jobId = args.jobId;
|
|
57
|
-
this.
|
|
65
|
+
this.logger = args.log ?? createLogger('simulator:client_view_context');
|
|
58
66
|
this.scopes = args.scopes;
|
|
59
67
|
}
|
|
60
|
-
|
|
68
|
+
assertCompatibleOracleVersion(version) {
|
|
69
|
+
// TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
|
|
70
|
+
// Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
|
|
71
|
+
// the expected pinned version or the current one. We want to allow for both the pinned and the current versions
|
|
72
|
+
// because we want this code to work with both the pinned and unpinned version since some branches do not have the
|
|
73
|
+
// pinned contracts (like e.g. next)
|
|
74
|
+
const LEGACY_ORACLE_VERSION = 12;
|
|
75
|
+
if (isProtocolContract(this.contractAddress)) {
|
|
76
|
+
if (version !== LEGACY_ORACLE_VERSION && version !== ORACLE_VERSION) {
|
|
77
|
+
throw new Error(`Expected legacy oracle version ${LEGACY_ORACLE_VERSION} or current oracle version ${ORACLE_VERSION} for alpha payload contract at ${this.contractAddress}, got ${version}.`);
|
|
78
|
+
}
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
61
81
|
if (version !== ORACLE_VERSION) {
|
|
62
82
|
throw new Error(`Incompatible oracle version. Expected version ${ORACLE_VERSION}, got ${version}.`);
|
|
63
83
|
}
|
|
64
84
|
}
|
|
65
|
-
|
|
85
|
+
getRandomField() {
|
|
66
86
|
return Fr.random();
|
|
67
87
|
}
|
|
68
|
-
|
|
88
|
+
getUtilityContext() {
|
|
69
89
|
return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
|
|
70
90
|
}
|
|
71
91
|
/**
|
|
@@ -74,12 +94,17 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
74
94
|
* @returns A Promise that resolves to nullifier keys.
|
|
75
95
|
* @throws If the keys are not registered in the key store.
|
|
76
96
|
* @throws If scopes are defined and the account is not in the scopes.
|
|
77
|
-
*/ async
|
|
78
|
-
// If scopes are defined, check that the key belongs to an account in the scopes
|
|
79
|
-
if (this.scopes && this.scopes.length > 0) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
97
|
+
*/ async getKeyValidationRequest(pkMHash) {
|
|
98
|
+
// If scopes are defined, check that the key belongs to an account in the scopes.
|
|
99
|
+
if (this.scopes !== 'ALL_SCOPES' && this.scopes.length > 0) {
|
|
100
|
+
let hasAccess = false;
|
|
101
|
+
for(let i = 0; i < this.scopes.length && !hasAccess; i++){
|
|
102
|
+
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
103
|
+
hasAccess = true;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
if (!hasAccess) {
|
|
107
|
+
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
83
108
|
}
|
|
84
109
|
}
|
|
85
110
|
return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
|
|
@@ -90,7 +115,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
90
115
|
* witness.
|
|
91
116
|
* @param noteHash - The note hash to find in the note hash tree.
|
|
92
117
|
* @returns The membership witness containing the leaf index and sibling path
|
|
93
|
-
*/
|
|
118
|
+
*/ getNoteHashMembershipWitness(anchorBlockHash, noteHash) {
|
|
94
119
|
return this.aztecNode.getNoteHashMembershipWitness(anchorBlockHash, noteHash);
|
|
95
120
|
}
|
|
96
121
|
/**
|
|
@@ -103,7 +128,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
103
128
|
* witness.
|
|
104
129
|
* @param blockHash - The block hash to find in the archive tree.
|
|
105
130
|
* @returns The membership witness containing the leaf index and sibling path
|
|
106
|
-
*/
|
|
131
|
+
*/ getBlockHashMembershipWitness(anchorBlockHash, blockHash) {
|
|
107
132
|
return this.aztecNode.getBlockHashMembershipWitness(anchorBlockHash, blockHash);
|
|
108
133
|
}
|
|
109
134
|
/**
|
|
@@ -111,7 +136,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
111
136
|
* @param blockHash - The block hash at which to get the index.
|
|
112
137
|
* @param nullifier - Nullifier we try to find witness for.
|
|
113
138
|
* @returns The nullifier membership witness (if found).
|
|
114
|
-
*/
|
|
139
|
+
*/ getNullifierMembershipWitness(blockHash, nullifier) {
|
|
115
140
|
return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
|
|
116
141
|
}
|
|
117
142
|
/**
|
|
@@ -122,7 +147,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
122
147
|
* @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
|
|
123
148
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
124
149
|
* we are trying to prove non-inclusion for.
|
|
125
|
-
*/
|
|
150
|
+
*/ getLowNullifierMembershipWitness(blockHash, nullifier) {
|
|
126
151
|
return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
|
|
127
152
|
}
|
|
128
153
|
/**
|
|
@@ -130,14 +155,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
130
155
|
* @param blockHash - The block hash at which to get the index.
|
|
131
156
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
132
157
|
* @returns - The witness
|
|
133
|
-
*/
|
|
158
|
+
*/ getPublicDataWitness(blockHash, leafSlot) {
|
|
134
159
|
return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
|
|
135
160
|
}
|
|
136
161
|
/**
|
|
137
162
|
* Fetches a block header of a given block.
|
|
138
163
|
* @param blockNumber - The number of a block of which to get the block header.
|
|
139
164
|
* @returns Block extracted from a block with block number `blockNumber`.
|
|
140
|
-
*/ async
|
|
165
|
+
*/ async getBlockHeader(blockNumber) {
|
|
141
166
|
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
|
|
142
167
|
if (blockNumber > anchorBlockNumber) {
|
|
143
168
|
throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
|
|
@@ -146,11 +171,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
146
171
|
return block?.header;
|
|
147
172
|
}
|
|
148
173
|
/**
|
|
149
|
-
* Retrieve the
|
|
174
|
+
* Retrieve the public keys and partial address associated to a given address.
|
|
150
175
|
* @param account - The account address.
|
|
151
|
-
* @returns
|
|
152
|
-
*/
|
|
153
|
-
|
|
176
|
+
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
177
|
+
*/ async tryGetPublicKeysAndPartialAddress(account) {
|
|
178
|
+
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
179
|
+
if (!completeAddress) {
|
|
180
|
+
return undefined;
|
|
181
|
+
}
|
|
182
|
+
return {
|
|
183
|
+
publicKeys: completeAddress.publicKeys,
|
|
184
|
+
partialAddress: completeAddress.partialAddress
|
|
185
|
+
};
|
|
154
186
|
}
|
|
155
187
|
async getCompleteAddressOrFail(account) {
|
|
156
188
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
@@ -164,10 +196,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
164
196
|
* Returns a contract instance associated with an address or throws if not found.
|
|
165
197
|
* @param address - Address.
|
|
166
198
|
* @returns A contract instance.
|
|
167
|
-
*/
|
|
168
|
-
return this.getContractInstance(address);
|
|
169
|
-
}
|
|
170
|
-
async getContractInstance(address) {
|
|
199
|
+
*/ async getContractInstance(address) {
|
|
171
200
|
const instance = await this.contractStore.getContractInstance(address);
|
|
172
201
|
if (!instance) {
|
|
173
202
|
throw new Error(`No contract instance found for address ${address.toString()}`);
|
|
@@ -179,7 +208,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
179
208
|
* for this transaction first, and falls back to the local database if not found.
|
|
180
209
|
* @param messageHash - Hash of the message to authenticate.
|
|
181
210
|
* @returns Authentication witness for the requested message hash.
|
|
182
|
-
*/
|
|
211
|
+
*/ getAuthWitness(messageHash) {
|
|
183
212
|
return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
|
|
184
213
|
}
|
|
185
214
|
/**
|
|
@@ -203,7 +232,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
203
232
|
* @param offset - The starting index for pagination.
|
|
204
233
|
* @param status - The status of notes to fetch.
|
|
205
234
|
* @returns Array of note data.
|
|
206
|
-
*/ async
|
|
235
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
207
236
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
208
237
|
const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
|
|
209
238
|
return pickNotes(dbNotes, {
|
|
@@ -232,7 +261,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
232
261
|
* Check if a nullifier exists in the nullifier tree.
|
|
233
262
|
* @param innerNullifier - The inner nullifier.
|
|
234
263
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
235
|
-
*/ async
|
|
264
|
+
*/ async checkNullifierExists(innerNullifier) {
|
|
236
265
|
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
237
266
|
siloNullifier(this.contractAddress, innerNullifier),
|
|
238
267
|
this.anchorBlockHeader.hash()
|
|
@@ -249,7 +278,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
249
278
|
* @param secret - Secret used to compute a nullifier.
|
|
250
279
|
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
251
280
|
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
252
|
-
*/ async
|
|
281
|
+
*/ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
253
282
|
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
|
|
254
283
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
255
284
|
}
|
|
@@ -259,37 +288,33 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
259
288
|
* @param contractAddress - The address to read storage from.
|
|
260
289
|
* @param startStorageSlot - The starting storage slot.
|
|
261
290
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
262
|
-
*/ async
|
|
291
|
+
*/ async storageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
|
|
263
292
|
const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
|
|
264
293
|
const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
|
|
265
|
-
this.
|
|
294
|
+
this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
|
|
266
295
|
return values;
|
|
267
296
|
}
|
|
268
297
|
/**
|
|
269
298
|
* Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
|
|
270
299
|
*/ async #getContractLogger() {
|
|
271
300
|
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
301
|
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
276
302
|
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
277
|
-
this.contractLogger =
|
|
303
|
+
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
|
|
278
304
|
instanceId: this.jobId
|
|
279
305
|
});
|
|
280
306
|
}
|
|
281
307
|
return this.contractLogger;
|
|
282
308
|
}
|
|
283
|
-
async
|
|
309
|
+
async log(level, message, fields) {
|
|
284
310
|
if (!LogLevels[level]) {
|
|
285
311
|
throw new Error(`Invalid log level: ${level}`);
|
|
286
312
|
}
|
|
287
|
-
const levelName = LogLevels[level];
|
|
288
313
|
const logger = await this.#getContractLogger();
|
|
289
|
-
logger[
|
|
314
|
+
logContractMessage(logger, LogLevels[level], message, fields);
|
|
290
315
|
}
|
|
291
|
-
async
|
|
292
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.
|
|
316
|
+
async fetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
|
|
317
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
293
318
|
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
|
|
294
319
|
}
|
|
295
320
|
/**
|
|
@@ -301,15 +326,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
301
326
|
* @param contractAddress - The address of the contract that the logs are tagged for.
|
|
302
327
|
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
303
328
|
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
304
|
-
*/ async
|
|
329
|
+
*/ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen) {
|
|
305
330
|
// TODO(#10727): allow other contracts to store notes
|
|
306
331
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
307
332
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
308
333
|
}
|
|
309
334
|
// We read all note and event validation requests and process them all concurrently. This makes the process much
|
|
310
335
|
// faster as we don't need to wait for the network round-trip.
|
|
311
|
-
const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map(NoteValidationRequest.fromFields);
|
|
312
|
-
const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map(EventValidationRequest.fromFields);
|
|
336
|
+
const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
337
|
+
const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
313
338
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
314
339
|
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, request.recipient));
|
|
315
340
|
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
@@ -322,7 +347,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
322
347
|
await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
323
348
|
await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
324
349
|
}
|
|
325
|
-
async
|
|
350
|
+
async bulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
|
|
326
351
|
// TODO(#10727): allow other contracts to process partial notes
|
|
327
352
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
328
353
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
@@ -330,14 +355,33 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
330
355
|
// We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
|
|
331
356
|
// don't need to wait for the network round-trip.
|
|
332
357
|
const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
|
|
333
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.
|
|
358
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
334
359
|
const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
|
|
335
360
|
// Requests are cleared once we're done.
|
|
336
361
|
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
|
|
337
362
|
// The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
|
|
338
363
|
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
|
|
339
364
|
}
|
|
340
|
-
|
|
365
|
+
async utilityResolveMessageContexts(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot) {
|
|
366
|
+
try {
|
|
367
|
+
if (!this.contractAddress.equals(contractAddress)) {
|
|
368
|
+
throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
369
|
+
}
|
|
370
|
+
const requestCapsules = await this.capsuleStore.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId);
|
|
371
|
+
const txHashes = requestCapsules.map((fields, i)=>{
|
|
372
|
+
if (fields.length !== 1) {
|
|
373
|
+
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
374
|
+
}
|
|
375
|
+
return fields[0];
|
|
376
|
+
});
|
|
377
|
+
const maybeMessageContexts = await this.messageContextService.resolveMessageContexts(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
378
|
+
// Leave response in response capsule array.
|
|
379
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageTxContext.toSerializedOption), this.jobId);
|
|
380
|
+
} finally{
|
|
381
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId);
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
storeCapsule(contractAddress, slot, capsule) {
|
|
341
385
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
342
386
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
343
387
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
@@ -345,7 +389,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
345
389
|
this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
|
|
346
390
|
return Promise.resolve();
|
|
347
391
|
}
|
|
348
|
-
async
|
|
392
|
+
async loadCapsule(contractAddress, slot) {
|
|
349
393
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
350
394
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
351
395
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
@@ -353,7 +397,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
353
397
|
return(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
|
|
354
398
|
this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
|
|
355
399
|
}
|
|
356
|
-
|
|
400
|
+
deleteCapsule(contractAddress, slot) {
|
|
357
401
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
358
402
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
359
403
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
@@ -361,15 +405,24 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
361
405
|
this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
|
|
362
406
|
return Promise.resolve();
|
|
363
407
|
}
|
|
364
|
-
|
|
408
|
+
copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
|
|
365
409
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
366
410
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
367
411
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
368
412
|
}
|
|
369
413
|
return this.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
|
|
370
414
|
}
|
|
415
|
+
/**
|
|
416
|
+
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
417
|
+
* stored notes or events are discovered.
|
|
418
|
+
*/ invalidateContractSyncCache(contractAddress, scopes) {
|
|
419
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
420
|
+
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
421
|
+
}
|
|
422
|
+
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
|
|
423
|
+
}
|
|
371
424
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
372
|
-
|
|
425
|
+
aes128Decrypt(ciphertext, iv, symKey) {
|
|
373
426
|
const aes128 = new Aes128();
|
|
374
427
|
return aes128.decryptBufferCBC(ciphertext, iv, symKey);
|
|
375
428
|
}
|
|
@@ -378,14 +431,21 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
378
431
|
* @param address - The address to get the secret for.
|
|
379
432
|
* @param ephPk - The ephemeral public key to get the secret for.
|
|
380
433
|
* @returns The secret for the given address.
|
|
381
|
-
*/
|
|
382
|
-
return this.getSharedSecret(address, ephPk);
|
|
383
|
-
}
|
|
384
|
-
async getSharedSecret(address, ephPk) {
|
|
434
|
+
*/ async getSharedSecret(address, ephPk) {
|
|
385
435
|
// TODO(#12656): return an app-siloed secret
|
|
386
436
|
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
387
437
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
388
438
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
389
439
|
return deriveEcdhSharedSecret(addressSecret, ephPk);
|
|
390
440
|
}
|
|
441
|
+
emitOffchainEffect(data) {
|
|
442
|
+
this.offchainEffects.push({
|
|
443
|
+
data,
|
|
444
|
+
contractAddress: this.contractAddress
|
|
445
|
+
});
|
|
446
|
+
return Promise.resolve();
|
|
447
|
+
}
|
|
448
|
+
/** Returns offchain effects collected during execution. */ getOffchainEffects() {
|
|
449
|
+
return this.offchainEffects;
|
|
450
|
+
}
|
|
391
451
|
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
import { type LogLevel, type Logger } from '@aztec/foundation/log';
|
|
3
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
|
+
import type { DebugLog } from '@aztec/stdlib/logs';
|
|
5
|
+
/** Resolves a contract address to a human-readable name, if available. */
|
|
6
|
+
export type ContractNameResolver = (address: AztecAddress) => Promise<string | undefined>;
|
|
7
|
+
/**
|
|
8
|
+
* Creates a logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
|
|
9
|
+
*/
|
|
10
|
+
export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, options?: {
|
|
11
|
+
instanceId?: string;
|
|
12
|
+
}): Promise<Logger>;
|
|
13
|
+
/**
|
|
14
|
+
* Formats and emits a single contract log message through the given logger.
|
|
15
|
+
*/
|
|
16
|
+
export declare function logContractMessage(logger: Logger, level: LogLevel, message: string, fields: Fr[]): void;
|
|
17
|
+
/**
|
|
18
|
+
* Displays debug logs collected during public function simulation,
|
|
19
|
+
* using the `contract_log::` prefixed logger format.
|
|
20
|
+
*/
|
|
21
|
+
export declare function displayDebugLogs(debugLogs: DebugLog[], getContractName: ContractNameResolver): Promise<void>;
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfbG9nZ2luZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyYWN0X2xvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUssTUFBTSxFQUF1QyxNQUFNLHVCQUF1QixDQUFDO0FBQ3hHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELDBFQUEwRTtBQUMxRSxNQUFNLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFFMUY7O0dBRUc7QUFDSCx3QkFBc0Isb0JBQW9CLENBQ3hDLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGVBQWUsRUFBRSxvQkFBb0IsRUFDckMsT0FBTyxDQUFDLEVBQUU7SUFBRSxVQUFVLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FBRSxHQUNoQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBS2pCO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0Isa0JBQWtCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FFdkc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxFQUFFLGVBQWUsRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBS2xIIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contract_logging.d.ts","sourceRoot":"","sources":["../src/contract_logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAuC,MAAM,uBAAuB,CAAC;AACxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAE1F;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,oBAAoB,EACrC,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAEvG;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,eAAe,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlH"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
|
|
2
|
+
/**
|
|
3
|
+
* Creates a logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
|
|
4
|
+
*/ export async function createContractLogger(contractAddress, getContractName, options) {
|
|
5
|
+
const addrAbbrev = contractAddress.toString().slice(0, 10);
|
|
6
|
+
const name = await getContractName(contractAddress);
|
|
7
|
+
const module = name ? `contract_log::${name}(${addrAbbrev})` : `contract_log::Unknown(${addrAbbrev})`;
|
|
8
|
+
return createLogger(module, options);
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* Formats and emits a single contract log message through the given logger.
|
|
12
|
+
*/ export function logContractMessage(logger, level, message, fields) {
|
|
13
|
+
logger[level](applyStringFormatting(message, fields));
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Displays debug logs collected during public function simulation,
|
|
17
|
+
* using the `contract_log::` prefixed logger format.
|
|
18
|
+
*/ export async function displayDebugLogs(debugLogs, getContractName) {
|
|
19
|
+
for (const log of debugLogs){
|
|
20
|
+
const logger = await createContractLogger(log.contractAddress, getContractName);
|
|
21
|
+
logContractMessage(logger, log.level, log.message, log.fields);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
@@ -3,6 +3,7 @@ import type { FunctionCall, FunctionSelector } from '@aztec/stdlib/abi';
|
|
|
3
3
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
4
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
5
5
|
import type { BlockHeader } from '@aztec/stdlib/tx';
|
|
6
|
+
import type { AccessScopes } from '../access_scopes.js';
|
|
6
7
|
import type { StagedStore } from '../job_coordinator/job_coordinator.js';
|
|
7
8
|
import type { ContractStore } from '../storage/contract_store/contract_store.js';
|
|
8
9
|
import type { NoteStore } from '../storage/note_store/note_store.js';
|
|
@@ -20,10 +21,10 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
20
21
|
private log;
|
|
21
22
|
readonly storeName = "contract_sync";
|
|
22
23
|
private syncedContracts;
|
|
23
|
-
private
|
|
24
|
+
private excludedFromSync;
|
|
24
25
|
constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, log: Logger);
|
|
25
26
|
/** Sets contracts that should be skipped during sync for a specific job. */
|
|
26
|
-
|
|
27
|
+
setExcludedFromSync(jobId: string, addresses: Set<string>): void;
|
|
27
28
|
/**
|
|
28
29
|
* Ensures a contract's private state is synchronized and that the PXE holds the current class artifact.
|
|
29
30
|
* Uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
|
|
@@ -31,11 +32,14 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
31
32
|
* @param functionToInvokeAfterSync - The function selector that will be called after sync (used to validate it's
|
|
32
33
|
* not sync_state itself).
|
|
33
34
|
* @param utilityExecutor - Executor function for running the sync_state utility function.
|
|
35
|
+
* @param scopes - Access scopes to pass through to the utility executor (affects whose account's private state is discovered).
|
|
34
36
|
*/
|
|
35
|
-
ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string): Promise<void>;
|
|
37
|
+
ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall, scopes: AccessScopes) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string, scopes: AccessScopes): Promise<void>;
|
|
38
|
+
/** Clears sync cache entries for the given scopes of a contract. Also clears the ALL_SCOPES entry. */
|
|
39
|
+
invalidateContractForScopes(contractAddress: AztecAddress, scopes: AztecAddress[]): void;
|
|
36
40
|
/** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */
|
|
37
41
|
wipe(): void;
|
|
38
42
|
commit(jobId: string): Promise<void>;
|
|
39
43
|
discardStaged(jobId: string): Promise<void>;
|
|
40
44
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsR0FBRztJQWRiLFFBQVEsQ0FBQyxTQUFTLG1CQUFtQjtJQUtyQyxPQUFPLENBQUMsZUFBZSxDQUF5QztJQUdoRSxPQUFPLENBQUMsZ0JBQWdCLENBQXVDO0lBRS9ELFlBQ1UsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsR0FBRyxFQUFFLE1BQU0sRUFDakI7SUFFSiw0RUFBNEU7SUFDNUUsbUJBQW1CLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FFL0Q7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG9CQUFvQixDQUN4QixlQUFlLEVBQUUsWUFBWSxFQUM3Qix5QkFBeUIsRUFBRSxnQkFBZ0IsR0FBRyxJQUFJLEVBQ2xELGVBQWUsRUFBRSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQzNFLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDYixNQUFNLEVBQUUsWUFBWSxHQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBaUJmO0lBRUQsc0dBQXNHO0lBQ3RHLDJCQUEyQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxHQUFHLElBQUksQ0FNdkY7SUE0QkQsZ0ZBQWdGO0lBQ2hGLElBQUksSUFBSSxJQUFJLENBR1g7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSW5DO0lBRUQsYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU0xQztDQTJDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract_sync_service.d.ts","sourceRoot":"","sources":["../../src/contract_sync/contract_sync_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAGrE;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,WAAW;;
|
|
1
|
+
{"version":3,"file":"contract_sync_service.d.ts","sourceRoot":"","sources":["../../src/contract_sync/contract_sync_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAGrE;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,WAAW;;IAYnD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAdb,QAAQ,CAAC,SAAS,mBAAmB;IAKrC,OAAO,CAAC,eAAe,CAAyC;IAGhE,OAAO,CAAC,gBAAgB,CAAuC;IAE/D,YACU,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,EACjB;IAEJ,4EAA4E;IAC5E,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAE/D;IAED;;;;;;;;OAQG;IACG,oBAAoB,CACxB,eAAe,EAAE,YAAY,EAC7B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EAC3E,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAiBf;IAED,sGAAsG;IACtG,2BAA2B,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAMvF;IA4BD,gFAAgF;IAChF,IAAI,IAAI,IAAI,CAGX;IAED,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAInC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1C;CA2CF"}
|