@aztec/pxe 4.1.2 → 4.2.0-aztecnr-rc.2
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/config/package_info.js +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +9 -3
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +26 -4
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +5 -5
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +17 -9
- 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 +3 -5
- 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 +7 -9
- 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/note_validation_request.d.ts +3 -6
- 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 +5 -10
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +45 -44
- 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 +41 -0
- package/dest/contract_function_simulator/oracle/oracle.d.ts +64 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +187 -97
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +22 -47
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +32 -72
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +54 -38
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +173 -80
- package/dest/contract_logging.d.ts +9 -4
- package/dest/contract_logging.d.ts.map +1 -1
- package/dest/contract_logging.js +21 -6
- package/dest/contract_sync/contract_sync_service.d.ts +7 -4
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
- package/dest/contract_sync/contract_sync_service.js +59 -32
- 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 +7 -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/logs/log_service.d.ts +3 -4
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +16 -25
- 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 +2 -2
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +14 -5
- package/dest/oracle_version.d.ts +2 -2
- package/dest/oracle_version.js +3 -3
- package/dest/pxe.d.ts +6 -3
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +39 -22
- 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 +33 -28
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.d.ts +26 -25
- 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/index.d.ts +2 -2
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +10 -1
- 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 +2 -1
- 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 +24 -11
- package/package.json +16 -16
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +37 -5
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +16 -11
- package/src/contract_function_simulator/index.ts +1 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +8 -8
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +1 -4
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +3 -9
- package/src/contract_function_simulator/oracle/interfaces.ts +59 -53
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +107 -0
- package/src/contract_function_simulator/oracle/oracle.ts +223 -139
- package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +34 -91
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +279 -93
- package/src/contract_logging.ts +18 -5
- package/src/contract_sync/contract_sync_service.ts +89 -49
- package/src/contract_sync/helpers.ts +3 -2
- package/src/events/event_service.ts +17 -4
- package/src/logs/log_service.ts +40 -44
- package/src/messages/message_context_service.ts +44 -0
- package/src/notes/note_service.ts +16 -5
- package/src/oracle_version.ts +3 -3
- package/src/pxe.ts +57 -20
- package/src/storage/capsule_store/capsule_store.ts +34 -26
- package/src/storage/metadata.ts +1 -1
- package/src/storage/tagging_store/sender_tagging_store.ts +182 -135
- package/src/tagging/index.ts +1 -1
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +19 -1
- 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 +19 -9
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { Aes128 } from '@aztec/foundation/crypto/aes128';
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import { LogLevels, createLogger } from '@aztec/foundation/log';
|
|
4
|
+
import { isProtocolContract } from '@aztec/protocol-contracts';
|
|
5
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
6
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
5
7
|
import { computeAddressSecret } from '@aztec/stdlib/keys';
|
|
6
|
-
import {
|
|
8
|
+
import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
|
|
7
9
|
import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
|
|
8
10
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
9
|
-
import { createContractLogger, logContractMessage } from '../../contract_logging.js';
|
|
11
|
+
import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
|
|
10
12
|
import { EventService } from '../../events/event_service.js';
|
|
11
13
|
import { LogService } from '../../logs/log_service.js';
|
|
12
14
|
import { NoteService } from '../../notes/note_service.js';
|
|
@@ -24,6 +26,8 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
24
26
|
isMisc = true;
|
|
25
27
|
isUtility = true;
|
|
26
28
|
contractLogger;
|
|
29
|
+
aztecnrLogger;
|
|
30
|
+
offchainEffects = [];
|
|
27
31
|
contractAddress;
|
|
28
32
|
authWitnesses;
|
|
29
33
|
capsules;
|
|
@@ -37,8 +41,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
37
41
|
senderAddressBookStore;
|
|
38
42
|
capsuleStore;
|
|
39
43
|
privateEventStore;
|
|
44
|
+
messageContextService;
|
|
45
|
+
contractSyncService;
|
|
40
46
|
jobId;
|
|
41
|
-
|
|
47
|
+
logger;
|
|
42
48
|
scopes;
|
|
43
49
|
constructor(args){
|
|
44
50
|
this.contractAddress = args.contractAddress;
|
|
@@ -54,19 +60,35 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
54
60
|
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
55
61
|
this.capsuleStore = args.capsuleStore;
|
|
56
62
|
this.privateEventStore = args.privateEventStore;
|
|
63
|
+
this.messageContextService = args.messageContextService;
|
|
64
|
+
this.contractSyncService = args.contractSyncService;
|
|
57
65
|
this.jobId = args.jobId;
|
|
58
|
-
this.
|
|
66
|
+
this.logger = args.log ?? createLogger('simulator:client_view_context');
|
|
59
67
|
this.scopes = args.scopes;
|
|
60
68
|
}
|
|
61
|
-
|
|
69
|
+
assertCompatibleOracleVersion(version) {
|
|
70
|
+
// TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
|
|
71
|
+
// Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
|
|
72
|
+
// the expected pinned version or the current one. We want to allow for both the pinned and the current versions
|
|
73
|
+
// because we want this code to work with both the pinned and unpinned version since some branches do not have the
|
|
74
|
+
// pinned contracts (like e.g. next)
|
|
75
|
+
const LEGACY_ORACLE_VERSION = 12;
|
|
76
|
+
if (isProtocolContract(this.contractAddress)) {
|
|
77
|
+
if (version !== LEGACY_ORACLE_VERSION && version !== ORACLE_VERSION) {
|
|
78
|
+
const hint = version > ORACLE_VERSION ? '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.';
|
|
79
|
+
throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION}, got ${version})`);
|
|
80
|
+
}
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
62
83
|
if (version !== ORACLE_VERSION) {
|
|
63
|
-
|
|
84
|
+
const hint = version > ORACLE_VERSION ? '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.';
|
|
85
|
+
throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle version ${ORACLE_VERSION}, got ${version})`);
|
|
64
86
|
}
|
|
65
87
|
}
|
|
66
|
-
|
|
88
|
+
getRandomField() {
|
|
67
89
|
return Fr.random();
|
|
68
90
|
}
|
|
69
|
-
|
|
91
|
+
getUtilityContext() {
|
|
70
92
|
return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
|
|
71
93
|
}
|
|
72
94
|
/**
|
|
@@ -75,7 +97,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
75
97
|
* @returns A Promise that resolves to nullifier keys.
|
|
76
98
|
* @throws If the keys are not registered in the key store.
|
|
77
99
|
* @throws If scopes are defined and the account is not in the scopes.
|
|
78
|
-
*/ async
|
|
100
|
+
*/ async getKeyValidationRequest(pkMHash) {
|
|
79
101
|
// If scopes are defined, check that the key belongs to an account in the scopes.
|
|
80
102
|
if (this.scopes !== 'ALL_SCOPES' && this.scopes.length > 0) {
|
|
81
103
|
let hasAccess = false;
|
|
@@ -92,12 +114,12 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
92
114
|
}
|
|
93
115
|
/**
|
|
94
116
|
* Fetches the index and sibling path of a leaf at a given block from the note hash tree.
|
|
95
|
-
* @param
|
|
96
|
-
* witness.
|
|
117
|
+
* @param blockHash - The hash of a block that contains the note hash tree root in which to find the
|
|
118
|
+
* membership witness.
|
|
97
119
|
* @param noteHash - The note hash to find in the note hash tree.
|
|
98
120
|
* @returns The membership witness containing the leaf index and sibling path
|
|
99
|
-
*/
|
|
100
|
-
return this.aztecNode.getNoteHashMembershipWitness(
|
|
121
|
+
*/ getNoteHashMembershipWitness(blockHash, noteHash) {
|
|
122
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
|
|
101
123
|
}
|
|
102
124
|
/**
|
|
103
125
|
* Fetches the index and sibling path of a block hash in the archive tree.
|
|
@@ -105,20 +127,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
105
127
|
* Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
|
|
106
128
|
* its block hash is appended as a new leaf to the archive tree.
|
|
107
129
|
*
|
|
108
|
-
* @param
|
|
130
|
+
* @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
|
|
109
131
|
* witness.
|
|
110
132
|
* @param blockHash - The block hash to find in the archive tree.
|
|
111
133
|
* @returns The membership witness containing the leaf index and sibling path
|
|
112
|
-
*/
|
|
113
|
-
|
|
134
|
+
*/ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
|
|
135
|
+
// Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
|
|
136
|
+
// hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
|
|
137
|
+
// membership witness as there is none.
|
|
138
|
+
return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
|
|
114
139
|
}
|
|
115
140
|
/**
|
|
116
141
|
* Returns a nullifier membership witness for a given nullifier at a given block.
|
|
117
142
|
* @param blockHash - The block hash at which to get the index.
|
|
118
143
|
* @param nullifier - Nullifier we try to find witness for.
|
|
119
144
|
* @returns The nullifier membership witness (if found).
|
|
120
|
-
*/
|
|
121
|
-
return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
|
|
145
|
+
*/ getNullifierMembershipWitness(blockHash, nullifier) {
|
|
146
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
|
|
122
147
|
}
|
|
123
148
|
/**
|
|
124
149
|
* Returns a low nullifier membership witness for a given nullifier at a given block.
|
|
@@ -128,22 +153,22 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
128
153
|
* @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
|
|
129
154
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
130
155
|
* we are trying to prove non-inclusion for.
|
|
131
|
-
*/
|
|
132
|
-
return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
|
|
156
|
+
*/ getLowNullifierMembershipWitness(blockHash, nullifier) {
|
|
157
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
|
|
133
158
|
}
|
|
134
159
|
/**
|
|
135
160
|
* Returns a public data tree witness for a given leaf slot at a given block.
|
|
136
161
|
* @param blockHash - The block hash at which to get the index.
|
|
137
162
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
138
163
|
* @returns - The witness
|
|
139
|
-
*/
|
|
140
|
-
return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
|
|
164
|
+
*/ getPublicDataWitness(blockHash, leafSlot) {
|
|
165
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
|
|
141
166
|
}
|
|
142
167
|
/**
|
|
143
168
|
* Fetches a block header of a given block.
|
|
144
169
|
* @param blockNumber - The number of a block of which to get the block header.
|
|
145
170
|
* @returns Block extracted from a block with block number `blockNumber`.
|
|
146
|
-
*/ async
|
|
171
|
+
*/ async getBlockHeader(blockNumber) {
|
|
147
172
|
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
|
|
148
173
|
if (blockNumber > anchorBlockNumber) {
|
|
149
174
|
throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
|
|
@@ -155,7 +180,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
155
180
|
* Retrieve the public keys and partial address associated to a given address.
|
|
156
181
|
* @param account - The account address.
|
|
157
182
|
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
158
|
-
*/ async
|
|
183
|
+
*/ async getPublicKeysAndPartialAddress(account) {
|
|
159
184
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
160
185
|
if (!completeAddress) {
|
|
161
186
|
return undefined;
|
|
@@ -177,10 +202,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
177
202
|
* Returns a contract instance associated with an address or throws if not found.
|
|
178
203
|
* @param address - Address.
|
|
179
204
|
* @returns A contract instance.
|
|
180
|
-
*/
|
|
181
|
-
return this.getContractInstance(address);
|
|
182
|
-
}
|
|
183
|
-
async getContractInstance(address) {
|
|
205
|
+
*/ async getContractInstance(address) {
|
|
184
206
|
const instance = await this.contractStore.getContractInstance(address);
|
|
185
207
|
if (!instance) {
|
|
186
208
|
throw new Error(`No contract instance found for address ${address.toString()}`);
|
|
@@ -192,7 +214,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
192
214
|
* for this transaction first, and falls back to the local database if not found.
|
|
193
215
|
* @param messageHash - Hash of the message to authenticate.
|
|
194
216
|
* @returns Authentication witness for the requested message hash.
|
|
195
|
-
*/
|
|
217
|
+
*/ getAuthWitness(messageHash) {
|
|
196
218
|
return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
|
|
197
219
|
}
|
|
198
220
|
/**
|
|
@@ -216,7 +238,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
216
238
|
* @param offset - The starting index for pagination.
|
|
217
239
|
* @param status - The status of notes to fetch.
|
|
218
240
|
* @returns Array of note data.
|
|
219
|
-
*/ async
|
|
241
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
220
242
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
221
243
|
const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
|
|
222
244
|
return pickNotes(dbNotes, {
|
|
@@ -245,7 +267,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
245
267
|
* Check if a nullifier exists in the nullifier tree.
|
|
246
268
|
* @param innerNullifier - The inner nullifier.
|
|
247
269
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
248
|
-
*/ async
|
|
270
|
+
*/ async doesNullifierExist(innerNullifier) {
|
|
249
271
|
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
250
272
|
siloNullifier(this.contractAddress, innerNullifier),
|
|
251
273
|
this.anchorBlockHeader.hash()
|
|
@@ -256,14 +278,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
256
278
|
return leafIndex?.data !== undefined;
|
|
257
279
|
}
|
|
258
280
|
/**
|
|
259
|
-
*
|
|
281
|
+
* Returns the membership witness of an un-nullified L1 to L2 message.
|
|
260
282
|
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
261
283
|
* @param messageHash - Hash of the message.
|
|
262
284
|
* @param secret - Secret used to compute a nullifier.
|
|
263
285
|
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
264
286
|
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
265
|
-
*/ async
|
|
266
|
-
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
|
|
287
|
+
*/ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
288
|
+
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
|
|
267
289
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
268
290
|
}
|
|
269
291
|
/**
|
|
@@ -272,34 +294,49 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
272
294
|
* @param contractAddress - The address to read storage from.
|
|
273
295
|
* @param startStorageSlot - The starting storage slot.
|
|
274
296
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
275
|
-
*/
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
297
|
+
*/ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
|
|
298
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
|
|
299
|
+
const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
|
|
300
|
+
const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
|
|
301
|
+
this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
|
|
302
|
+
return values;
|
|
303
|
+
});
|
|
280
304
|
}
|
|
281
305
|
/**
|
|
282
|
-
* Returns a per-contract logger whose output is prefixed with `
|
|
306
|
+
* Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
283
307
|
*/ async #getContractLogger() {
|
|
284
308
|
if (!this.contractLogger) {
|
|
285
309
|
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
286
310
|
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
287
|
-
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
|
|
311
|
+
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
|
|
288
312
|
instanceId: this.jobId
|
|
289
313
|
});
|
|
290
314
|
}
|
|
291
315
|
return this.contractLogger;
|
|
292
316
|
}
|
|
293
|
-
|
|
317
|
+
/**
|
|
318
|
+
* Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
|
|
319
|
+
*/ async #getAztecnrLogger() {
|
|
320
|
+
if (!this.aztecnrLogger) {
|
|
321
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
322
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
323
|
+
this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
|
|
324
|
+
instanceId: this.jobId
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
return this.aztecnrLogger;
|
|
328
|
+
}
|
|
329
|
+
async log(level, message, fields) {
|
|
294
330
|
if (!LogLevels[level]) {
|
|
295
331
|
throw new Error(`Invalid log level: ${level}`);
|
|
296
332
|
}
|
|
297
|
-
const
|
|
298
|
-
|
|
333
|
+
const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
|
|
334
|
+
const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
|
|
335
|
+
logContractMessage(logger, LogLevels[level], strippedMessage, fields);
|
|
299
336
|
}
|
|
300
|
-
async
|
|
301
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.
|
|
302
|
-
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot,
|
|
337
|
+
async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
|
|
338
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
339
|
+
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, scope);
|
|
303
340
|
}
|
|
304
341
|
/**
|
|
305
342
|
* Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
|
|
@@ -310,91 +347,147 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
310
347
|
* @param contractAddress - The address of the contract that the logs are tagged for.
|
|
311
348
|
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
312
349
|
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
313
|
-
*/ async
|
|
350
|
+
*/ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
|
|
314
351
|
// TODO(#10727): allow other contracts to store notes
|
|
315
352
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
316
353
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
317
354
|
}
|
|
318
355
|
// We read all note and event validation requests and process them all concurrently. This makes the process much
|
|
319
356
|
// faster as we don't need to wait for the network round-trip.
|
|
320
|
-
const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map(NoteValidationRequest.fromFields);
|
|
321
|
-
const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map(EventValidationRequest.fromFields);
|
|
357
|
+
const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
358
|
+
const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
322
359
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
323
|
-
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,
|
|
360
|
+
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));
|
|
324
361
|
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
325
|
-
const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash,
|
|
362
|
+
const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
|
|
326
363
|
await Promise.all([
|
|
327
364
|
...noteStorePromises,
|
|
328
365
|
...eventStorePromises
|
|
329
366
|
]);
|
|
330
367
|
// Requests are cleared once we're done.
|
|
331
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
332
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
368
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
369
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
333
370
|
}
|
|
334
|
-
async
|
|
371
|
+
async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
|
|
335
372
|
// TODO(#10727): allow other contracts to process partial notes
|
|
336
373
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
337
374
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
338
375
|
}
|
|
339
376
|
// We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
|
|
340
377
|
// don't need to wait for the network round-trip.
|
|
341
|
-
const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
|
|
342
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.
|
|
343
|
-
const maybeLogRetrievalResponses = await logService.
|
|
378
|
+
const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
|
|
379
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
380
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(logRetrievalRequests);
|
|
344
381
|
// Requests are cleared once we're done.
|
|
345
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
|
|
382
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
346
383
|
// The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
|
|
347
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
|
|
384
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
|
|
385
|
+
}
|
|
386
|
+
async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
|
|
387
|
+
try {
|
|
388
|
+
if (!this.contractAddress.equals(contractAddress)) {
|
|
389
|
+
throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
390
|
+
}
|
|
391
|
+
// TODO(@mverzilli): this is a prime example of where using a volatile array would make much more sense, we don't
|
|
392
|
+
// need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
|
|
393
|
+
// At the same time, we don't want to allow any global scope access other than where backwards compatibility
|
|
394
|
+
// forces us to. Hence we need the scope here to be artificial.
|
|
395
|
+
const requestCapsules = await this.capsuleStore.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
|
|
396
|
+
const txHashes = requestCapsules.map((fields, i)=>{
|
|
397
|
+
if (fields.length !== 1) {
|
|
398
|
+
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
399
|
+
}
|
|
400
|
+
return fields[0];
|
|
401
|
+
});
|
|
402
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
403
|
+
// Leave response in response capsule array.
|
|
404
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
|
|
405
|
+
} finally{
|
|
406
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
407
|
+
}
|
|
348
408
|
}
|
|
349
|
-
|
|
409
|
+
setCapsule(contractAddress, slot, capsule, scope) {
|
|
350
410
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
351
411
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
352
412
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
353
413
|
}
|
|
354
|
-
this.capsuleStore.
|
|
355
|
-
return Promise.resolve();
|
|
414
|
+
this.capsuleStore.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
|
|
356
415
|
}
|
|
357
|
-
async
|
|
416
|
+
async getCapsule(contractAddress, slot, scope) {
|
|
358
417
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
359
418
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
360
419
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
361
420
|
}
|
|
362
|
-
|
|
363
|
-
|
|
421
|
+
const maybeTransientCapsule = this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot) && (c.scope ?? AztecAddress.ZERO).equals(scope))?.data;
|
|
422
|
+
// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
|
|
423
|
+
return maybeTransientCapsule ?? await this.capsuleStore.getCapsule(contractAddress, slot, this.jobId, scope);
|
|
364
424
|
}
|
|
365
|
-
|
|
425
|
+
deleteCapsule(contractAddress, slot, scope) {
|
|
366
426
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
367
427
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
368
428
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
369
429
|
}
|
|
370
|
-
this.capsuleStore.deleteCapsule(
|
|
371
|
-
return Promise.resolve();
|
|
430
|
+
this.capsuleStore.deleteCapsule(contractAddress, slot, this.jobId, scope);
|
|
372
431
|
}
|
|
373
|
-
|
|
432
|
+
copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
|
|
374
433
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
375
434
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
376
435
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
377
436
|
}
|
|
378
|
-
return this.capsuleStore.copyCapsule(
|
|
437
|
+
return this.capsuleStore.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
|
|
438
|
+
}
|
|
439
|
+
/**
|
|
440
|
+
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
441
|
+
* stored notes or events are discovered.
|
|
442
|
+
*/ setContractSyncCacheInvalid(contractAddress, scopes) {
|
|
443
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
444
|
+
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
445
|
+
}
|
|
446
|
+
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
|
|
379
447
|
}
|
|
380
448
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
381
|
-
|
|
449
|
+
decryptAes128(ciphertext, iv, symKey) {
|
|
382
450
|
const aes128 = new Aes128();
|
|
383
451
|
return aes128.decryptBufferCBC(ciphertext, iv, symKey);
|
|
384
452
|
}
|
|
385
453
|
/**
|
|
386
|
-
* Retrieves the shared secret for a given address and ephemeral public key.
|
|
454
|
+
* Retrieves the app-siloed shared secret for a given address and ephemeral public key.
|
|
387
455
|
* @param address - The address to get the secret for.
|
|
388
456
|
* @param ephPk - The ephemeral public key to get the secret for.
|
|
389
|
-
* @
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
457
|
+
* @param contractAddress - The contract address for app-siloing (validated against execution context).
|
|
458
|
+
* @returns The app-siloed shared secret as a Field.
|
|
459
|
+
*/ async getSharedSecret(address, ephPk, contractAddress) {
|
|
460
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
461
|
+
throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
|
|
462
|
+
}
|
|
395
463
|
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
396
464
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
397
465
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
398
|
-
return
|
|
466
|
+
return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
|
|
467
|
+
}
|
|
468
|
+
emitOffchainEffect(data) {
|
|
469
|
+
this.offchainEffects.push({
|
|
470
|
+
data,
|
|
471
|
+
contractAddress: this.contractAddress
|
|
472
|
+
});
|
|
473
|
+
return Promise.resolve();
|
|
474
|
+
}
|
|
475
|
+
/** Returns offchain effects collected during execution. */ getOffchainEffects() {
|
|
476
|
+
return this.offchainEffects;
|
|
477
|
+
}
|
|
478
|
+
/** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
|
|
479
|
+
const [response] = await Promise.all([
|
|
480
|
+
query(),
|
|
481
|
+
(async ()=>{
|
|
482
|
+
const header = await this.aztecNode.getBlockHeader(blockHash);
|
|
483
|
+
if (!header) {
|
|
484
|
+
throw new Error(`Could not find block header for block hash ${blockHash}`);
|
|
485
|
+
}
|
|
486
|
+
if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
|
|
487
|
+
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()}).`);
|
|
488
|
+
}
|
|
489
|
+
})()
|
|
490
|
+
]);
|
|
491
|
+
return response;
|
|
399
492
|
}
|
|
400
493
|
}
|
|
@@ -4,10 +4,11 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
|
4
4
|
import type { DebugLog } from '@aztec/stdlib/logs';
|
|
5
5
|
/** Resolves a contract address to a human-readable name, if available. */
|
|
6
6
|
export type ContractNameResolver = (address: AztecAddress) => Promise<string | undefined>;
|
|
7
|
+
export type CONTRACT_LOG_KIND = 'aztecnr' | 'user';
|
|
7
8
|
/**
|
|
8
|
-
* Creates a logger whose output is prefixed with `
|
|
9
|
+
* Creates a logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
9
10
|
*/
|
|
10
|
-
export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, options?: {
|
|
11
|
+
export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, kind: CONTRACT_LOG_KIND, options?: {
|
|
11
12
|
instanceId?: string;
|
|
12
13
|
}): Promise<Logger>;
|
|
13
14
|
/**
|
|
@@ -16,7 +17,11 @@ export declare function createContractLogger(contractAddress: AztecAddress, getC
|
|
|
16
17
|
export declare function logContractMessage(logger: Logger, level: LogLevel, message: string, fields: Fr[]): void;
|
|
17
18
|
/**
|
|
18
19
|
* Displays debug logs collected during public function simulation,
|
|
19
|
-
* using the `
|
|
20
|
+
* using the `contract:` prefixed logger format.
|
|
20
21
|
*/
|
|
21
22
|
export declare function displayDebugLogs(debugLogs: DebugLog[], getContractName: ContractNameResolver): Promise<void>;
|
|
22
|
-
|
|
23
|
+
export declare function stripAztecnrLogPrefix(message: string): {
|
|
24
|
+
kind: CONTRACT_LOG_KIND;
|
|
25
|
+
message: string;
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfbG9nZ2luZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyYWN0X2xvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUssTUFBTSxFQUF1QyxNQUFNLHVCQUF1QixDQUFDO0FBQ3hHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELDBFQUEwRTtBQUMxRSxNQUFNLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFDMUYsTUFBTSxNQUFNLGlCQUFpQixHQUFHLFNBQVMsR0FBRyxNQUFNLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCx3QkFBc0Isb0JBQW9CLENBQ3hDLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGVBQWUsRUFBRSxvQkFBb0IsRUFDckMsSUFBSSxFQUFFLGlCQUFpQixFQUN2QixPQUFPLENBQUMsRUFBRTtJQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ2hDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FPakI7QUFFRDs7R0FFRztBQUNILHdCQUFnQixrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUV2RztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUUsZUFBZSxFQUFFLG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNbEg7QUFFRCx3QkFBZ0IscUJBQXFCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRztJQUFFLElBQUksRUFBRSxpQkFBaUIsQ0FBQztJQUFDLE9BQU8sRUFBRSxNQUFNLENBQUE7Q0FBRSxDQU1uRyJ9
|
|
@@ -1 +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;
|
|
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;AAC1F,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAAC;AAEnD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,oBAAoB,EACrC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,OAAO,CAAC,MAAM,CAAC,CAOjB;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,CAMlH;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAMnG"}
|
package/dest/contract_logging.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
|
|
2
2
|
/**
|
|
3
|
-
* Creates a logger whose output is prefixed with `
|
|
4
|
-
*/ export async function createContractLogger(contractAddress, getContractName, options) {
|
|
3
|
+
* Creates a logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
4
|
+
*/ export async function createContractLogger(contractAddress, getContractName, kind, options) {
|
|
5
5
|
const addrAbbrev = contractAddress.toString().slice(0, 10);
|
|
6
6
|
const name = await getContractName(contractAddress);
|
|
7
|
-
const
|
|
7
|
+
const prefix = kind == 'aztecnr' ? 'aztecnr' : 'contract';
|
|
8
|
+
const module = name ? `${prefix}:${name}(${addrAbbrev})` : `${prefix}:Unknown(${addrAbbrev})`;
|
|
8
9
|
return createLogger(module, options);
|
|
9
10
|
}
|
|
10
11
|
/**
|
|
@@ -14,10 +15,24 @@ import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
|
|
|
14
15
|
}
|
|
15
16
|
/**
|
|
16
17
|
* Displays debug logs collected during public function simulation,
|
|
17
|
-
* using the `
|
|
18
|
+
* using the `contract:` prefixed logger format.
|
|
18
19
|
*/ export async function displayDebugLogs(debugLogs, getContractName) {
|
|
19
20
|
for (const log of debugLogs){
|
|
20
|
-
const
|
|
21
|
-
|
|
21
|
+
const { kind, message } = stripAztecnrLogPrefix(log.message);
|
|
22
|
+
const logger = await createContractLogger(log.contractAddress, getContractName, kind);
|
|
23
|
+
logContractMessage(logger, log.level, message, log.fields);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export function stripAztecnrLogPrefix(message) {
|
|
27
|
+
if (message.startsWith('[aztec-nr] ')) {
|
|
28
|
+
return {
|
|
29
|
+
kind: 'aztecnr',
|
|
30
|
+
message: message.slice('[aztec-nr] '.length)
|
|
31
|
+
};
|
|
32
|
+
} else {
|
|
33
|
+
return {
|
|
34
|
+
kind: 'user',
|
|
35
|
+
message
|
|
36
|
+
};
|
|
22
37
|
}
|
|
23
38
|
}
|
|
@@ -18,13 +18,14 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
18
18
|
private aztecNode;
|
|
19
19
|
private contractStore;
|
|
20
20
|
private noteStore;
|
|
21
|
+
private getRegisteredAccounts;
|
|
21
22
|
private log;
|
|
22
23
|
readonly storeName = "contract_sync";
|
|
23
24
|
private syncedContracts;
|
|
24
|
-
private
|
|
25
|
-
constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, log: Logger);
|
|
25
|
+
private excludedFromSync;
|
|
26
|
+
constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, getRegisteredAccounts: () => Promise<AztecAddress[]>, log: Logger);
|
|
26
27
|
/** Sets contracts that should be skipped during sync for a specific job. */
|
|
27
|
-
|
|
28
|
+
setExcludedFromSync(jobId: string, addresses: Set<string>): void;
|
|
28
29
|
/**
|
|
29
30
|
* Ensures a contract's private state is synchronized and that the PXE holds the current class artifact.
|
|
30
31
|
* Uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
|
|
@@ -35,9 +36,11 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
35
36
|
* @param scopes - Access scopes to pass through to the utility executor (affects whose account's private state is discovered).
|
|
36
37
|
*/
|
|
37
38
|
ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall, scopes: AccessScopes) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string, scopes: AccessScopes): Promise<void>;
|
|
39
|
+
/** Clears sync cache entries for the given scopes of a contract. Also clears the ALL_SCOPES entry. */
|
|
40
|
+
invalidateContractForScopes(contractAddress: AztecAddress, scopes: AztecAddress[]): void;
|
|
38
41
|
/** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */
|
|
39
42
|
wipe(): void;
|
|
40
43
|
commit(jobId: string): Promise<void>;
|
|
41
44
|
discardStaged(jobId: string): Promise<void>;
|
|
42
45
|
}
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMscUJBQXFCO0lBQzdCLE9BQU8sQ0FBQyxHQUFHO0lBZmIsUUFBUSxDQUFDLFNBQVMsbUJBQW1CO0lBS3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlDO0lBR2hFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBdUM7SUFFL0QsWUFDVSxTQUFTLEVBQUUsU0FBUyxFQUNwQixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsU0FBUyxFQUNwQixxQkFBcUIsRUFBRSxNQUFNLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUNwRCxHQUFHLEVBQUUsTUFBTSxFQUNqQjtJQUVKLDRFQUE0RTtJQUM1RSxtQkFBbUIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUUvRDtJQUVEOzs7Ozs7OztPQVFHO0lBQ0csb0JBQW9CLENBQ3hCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFDM0UsaUJBQWlCLEVBQUUsV0FBVyxFQUM5QixLQUFLLEVBQUUsTUFBTSxFQUNiLE1BQU0sRUFBRSxZQUFZLEdBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FpQmY7SUFFRCxzR0FBc0c7SUFDdEcsMkJBQTJCLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLEdBQUcsSUFBSSxDQU12RjtJQXNDRCxnRkFBZ0Y7SUFDaEYsSUFBSSxJQUFJLElBQUksQ0FHWDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJbkM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTTFDO0NBMkNGIn0=
|
|
@@ -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,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;
|
|
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,qBAAqB;IAC7B,OAAO,CAAC,GAAG;IAfb,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,qBAAqB,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,EACpD,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;IAsCD,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"}
|