@aztec/pxe 0.0.1-commit.cd76b27 → 0.0.1-commit.ce4f8c4f2
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/index.d.ts +2 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.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 +33 -11
- 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 +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 +40 -80
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +57 -39
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +138 -63
- 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 +5 -3
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
- package/dest/contract_sync/contract_sync_service.js +47 -30
- package/dest/entrypoints/client/bundle/index.d.ts +2 -1
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +1 -0
- package/dest/entrypoints/client/lazy/index.d.ts +2 -1
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +1 -0
- package/dest/logs/log_service.d.ts +1 -1
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +4 -4
- 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/oracle_version.d.ts +2 -2
- package/dest/oracle_version.js +3 -3
- 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 +125 -64
- 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 +13 -5
- 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 +8 -4
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +55 -33
- 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/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/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 +3 -3
- 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/config/index.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +51 -20
- 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 +45 -99
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +200 -80
- package/src/contract_logging.ts +39 -0
- package/src/contract_sync/contract_sync_service.ts +67 -38
- package/src/entrypoints/client/bundle/index.ts +1 -0
- package/src/entrypoints/client/lazy/index.ts +1 -0
- package/src/logs/log_service.ts +10 -5
- package/src/messages/message_context_service.ts +45 -0
- package/src/oracle_version.ts +3 -3
- package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +157 -110
- package/src/private_kernel/hints/test_utils.ts +325 -0
- package/src/private_kernel/private_kernel_execution_prover.ts +13 -6
- package/src/private_kernel/private_kernel_oracle.ts +7 -7
- package/src/pxe.ts +74 -34
- package/src/storage/contract_store/contract_store.ts +170 -71
- package/src/storage/metadata.ts +1 -1
- package/src/storage/tagging_store/recipient_tagging_store.ts +9 -5
- package/src/storage/tagging_store/sender_tagging_store.ts +185 -138
- package/src/tagging/index.ts +2 -2
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +3 -6
- 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
|
@@ -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,7 +94,7 @@ 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
|
|
97
|
+
*/ async getKeyValidationRequest(pkMHash) {
|
|
78
98
|
// If scopes are defined, check that the key belongs to an account in the scopes.
|
|
79
99
|
if (this.scopes !== 'ALL_SCOPES' && this.scopes.length > 0) {
|
|
80
100
|
let hasAccess = false;
|
|
@@ -91,12 +111,12 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
91
111
|
}
|
|
92
112
|
/**
|
|
93
113
|
* Fetches the index and sibling path of a leaf at a given block from the note hash tree.
|
|
94
|
-
* @param
|
|
95
|
-
* witness.
|
|
114
|
+
* @param blockHash - The hash of a block that contains the note hash tree root in which to find the
|
|
115
|
+
* membership witness.
|
|
96
116
|
* @param noteHash - The note hash to find in the note hash tree.
|
|
97
117
|
* @returns The membership witness containing the leaf index and sibling path
|
|
98
|
-
*/
|
|
99
|
-
return this.aztecNode.getNoteHashMembershipWitness(
|
|
118
|
+
*/ getNoteHashMembershipWitness(blockHash, noteHash) {
|
|
119
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
|
|
100
120
|
}
|
|
101
121
|
/**
|
|
102
122
|
* Fetches the index and sibling path of a block hash in the archive tree.
|
|
@@ -104,20 +124,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
104
124
|
* Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
|
|
105
125
|
* its block hash is appended as a new leaf to the archive tree.
|
|
106
126
|
*
|
|
107
|
-
* @param
|
|
127
|
+
* @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
|
|
108
128
|
* witness.
|
|
109
129
|
* @param blockHash - The block hash to find in the archive tree.
|
|
110
130
|
* @returns The membership witness containing the leaf index and sibling path
|
|
111
|
-
*/
|
|
112
|
-
|
|
131
|
+
*/ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
|
|
132
|
+
// Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
|
|
133
|
+
// hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
|
|
134
|
+
// membership witness as there is none.
|
|
135
|
+
return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
|
|
113
136
|
}
|
|
114
137
|
/**
|
|
115
138
|
* Returns a nullifier membership witness for a given nullifier at a given block.
|
|
116
139
|
* @param blockHash - The block hash at which to get the index.
|
|
117
140
|
* @param nullifier - Nullifier we try to find witness for.
|
|
118
141
|
* @returns The nullifier membership witness (if found).
|
|
119
|
-
*/
|
|
120
|
-
return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
|
|
142
|
+
*/ getNullifierMembershipWitness(blockHash, nullifier) {
|
|
143
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
|
|
121
144
|
}
|
|
122
145
|
/**
|
|
123
146
|
* Returns a low nullifier membership witness for a given nullifier at a given block.
|
|
@@ -127,22 +150,22 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
127
150
|
* @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
|
|
128
151
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
129
152
|
* we are trying to prove non-inclusion for.
|
|
130
|
-
*/
|
|
131
|
-
return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
|
|
153
|
+
*/ getLowNullifierMembershipWitness(blockHash, nullifier) {
|
|
154
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
|
|
132
155
|
}
|
|
133
156
|
/**
|
|
134
157
|
* Returns a public data tree witness for a given leaf slot at a given block.
|
|
135
158
|
* @param blockHash - The block hash at which to get the index.
|
|
136
159
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
137
160
|
* @returns - The witness
|
|
138
|
-
*/
|
|
139
|
-
return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
|
|
161
|
+
*/ getPublicDataWitness(blockHash, leafSlot) {
|
|
162
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
|
|
140
163
|
}
|
|
141
164
|
/**
|
|
142
165
|
* Fetches a block header of a given block.
|
|
143
166
|
* @param blockNumber - The number of a block of which to get the block header.
|
|
144
167
|
* @returns Block extracted from a block with block number `blockNumber`.
|
|
145
|
-
*/ async
|
|
168
|
+
*/ async getBlockHeader(blockNumber) {
|
|
146
169
|
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
|
|
147
170
|
if (blockNumber > anchorBlockNumber) {
|
|
148
171
|
throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
|
|
@@ -151,11 +174,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
151
174
|
return block?.header;
|
|
152
175
|
}
|
|
153
176
|
/**
|
|
154
|
-
* Retrieve the
|
|
177
|
+
* Retrieve the public keys and partial address associated to a given address.
|
|
155
178
|
* @param account - The account address.
|
|
156
|
-
* @returns
|
|
157
|
-
*/
|
|
158
|
-
|
|
179
|
+
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
180
|
+
*/ async tryGetPublicKeysAndPartialAddress(account) {
|
|
181
|
+
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
182
|
+
if (!completeAddress) {
|
|
183
|
+
return undefined;
|
|
184
|
+
}
|
|
185
|
+
return {
|
|
186
|
+
publicKeys: completeAddress.publicKeys,
|
|
187
|
+
partialAddress: completeAddress.partialAddress
|
|
188
|
+
};
|
|
159
189
|
}
|
|
160
190
|
async getCompleteAddressOrFail(account) {
|
|
161
191
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
@@ -169,10 +199,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
169
199
|
* Returns a contract instance associated with an address or throws if not found.
|
|
170
200
|
* @param address - Address.
|
|
171
201
|
* @returns A contract instance.
|
|
172
|
-
*/
|
|
173
|
-
return this.getContractInstance(address);
|
|
174
|
-
}
|
|
175
|
-
async getContractInstance(address) {
|
|
202
|
+
*/ async getContractInstance(address) {
|
|
176
203
|
const instance = await this.contractStore.getContractInstance(address);
|
|
177
204
|
if (!instance) {
|
|
178
205
|
throw new Error(`No contract instance found for address ${address.toString()}`);
|
|
@@ -184,7 +211,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
184
211
|
* for this transaction first, and falls back to the local database if not found.
|
|
185
212
|
* @param messageHash - Hash of the message to authenticate.
|
|
186
213
|
* @returns Authentication witness for the requested message hash.
|
|
187
|
-
*/
|
|
214
|
+
*/ getAuthWitness(messageHash) {
|
|
188
215
|
return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
|
|
189
216
|
}
|
|
190
217
|
/**
|
|
@@ -208,7 +235,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
208
235
|
* @param offset - The starting index for pagination.
|
|
209
236
|
* @param status - The status of notes to fetch.
|
|
210
237
|
* @returns Array of note data.
|
|
211
|
-
*/ async
|
|
238
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
212
239
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
213
240
|
const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
|
|
214
241
|
return pickNotes(dbNotes, {
|
|
@@ -237,7 +264,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
237
264
|
* Check if a nullifier exists in the nullifier tree.
|
|
238
265
|
* @param innerNullifier - The inner nullifier.
|
|
239
266
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
240
|
-
*/ async
|
|
267
|
+
*/ async checkNullifierExists(innerNullifier) {
|
|
241
268
|
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
242
269
|
siloNullifier(this.contractAddress, innerNullifier),
|
|
243
270
|
this.anchorBlockHeader.hash()
|
|
@@ -248,14 +275,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
248
275
|
return leafIndex?.data !== undefined;
|
|
249
276
|
}
|
|
250
277
|
/**
|
|
251
|
-
*
|
|
278
|
+
* Returns the membership witness of an un-nullified L1 to L2 message.
|
|
252
279
|
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
253
280
|
* @param messageHash - Hash of the message.
|
|
254
281
|
* @param secret - Secret used to compute a nullifier.
|
|
255
282
|
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
256
283
|
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
257
|
-
*/ async
|
|
258
|
-
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
|
|
284
|
+
*/ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
285
|
+
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
|
|
259
286
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
260
287
|
}
|
|
261
288
|
/**
|
|
@@ -264,37 +291,35 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
264
291
|
* @param contractAddress - The address to read storage from.
|
|
265
292
|
* @param startStorageSlot - The starting storage slot.
|
|
266
293
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
267
|
-
*/
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
294
|
+
*/ storageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
|
|
295
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
|
|
296
|
+
const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
|
|
297
|
+
const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
|
|
298
|
+
this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
|
|
299
|
+
return values;
|
|
300
|
+
});
|
|
272
301
|
}
|
|
273
302
|
/**
|
|
274
303
|
* Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
|
|
275
304
|
*/ async #getContractLogger() {
|
|
276
305
|
if (!this.contractLogger) {
|
|
277
|
-
const addrAbbrev = this.contractAddress.toString().slice(0, 10);
|
|
278
|
-
const name = await this.contractStore.getDebugContractName(this.contractAddress);
|
|
279
|
-
const module = name ? `contract_log::${name}(${addrAbbrev})` : `contract_log::${addrAbbrev}`;
|
|
280
306
|
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
281
307
|
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
282
|
-
this.contractLogger =
|
|
308
|
+
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
|
|
283
309
|
instanceId: this.jobId
|
|
284
310
|
});
|
|
285
311
|
}
|
|
286
312
|
return this.contractLogger;
|
|
287
313
|
}
|
|
288
|
-
async
|
|
314
|
+
async log(level, message, fields) {
|
|
289
315
|
if (!LogLevels[level]) {
|
|
290
316
|
throw new Error(`Invalid log level: ${level}`);
|
|
291
317
|
}
|
|
292
|
-
const levelName = LogLevels[level];
|
|
293
318
|
const logger = await this.#getContractLogger();
|
|
294
|
-
logger[
|
|
319
|
+
logContractMessage(logger, LogLevels[level], message, fields);
|
|
295
320
|
}
|
|
296
|
-
async
|
|
297
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.
|
|
321
|
+
async fetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
|
|
322
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
298
323
|
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
|
|
299
324
|
}
|
|
300
325
|
/**
|
|
@@ -306,15 +331,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
306
331
|
* @param contractAddress - The address of the contract that the logs are tagged for.
|
|
307
332
|
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
308
333
|
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
309
|
-
*/ async
|
|
334
|
+
*/ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen) {
|
|
310
335
|
// TODO(#10727): allow other contracts to store notes
|
|
311
336
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
312
337
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
313
338
|
}
|
|
314
339
|
// We read all note and event validation requests and process them all concurrently. This makes the process much
|
|
315
340
|
// faster as we don't need to wait for the network round-trip.
|
|
316
|
-
const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map(NoteValidationRequest.fromFields);
|
|
317
|
-
const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map(EventValidationRequest.fromFields);
|
|
341
|
+
const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
342
|
+
const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
318
343
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
319
344
|
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));
|
|
320
345
|
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
@@ -327,7 +352,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
327
352
|
await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
328
353
|
await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
329
354
|
}
|
|
330
|
-
async
|
|
355
|
+
async bulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
|
|
331
356
|
// TODO(#10727): allow other contracts to process partial notes
|
|
332
357
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
333
358
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
@@ -335,14 +360,33 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
335
360
|
// We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
|
|
336
361
|
// don't need to wait for the network round-trip.
|
|
337
362
|
const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
|
|
338
|
-
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.
|
|
363
|
+
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
339
364
|
const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
|
|
340
365
|
// Requests are cleared once we're done.
|
|
341
366
|
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
|
|
342
367
|
// The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
|
|
343
368
|
await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
|
|
344
369
|
}
|
|
345
|
-
|
|
370
|
+
async utilityResolveMessageContexts(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot) {
|
|
371
|
+
try {
|
|
372
|
+
if (!this.contractAddress.equals(contractAddress)) {
|
|
373
|
+
throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
374
|
+
}
|
|
375
|
+
const requestCapsules = await this.capsuleStore.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId);
|
|
376
|
+
const txHashes = requestCapsules.map((fields, i)=>{
|
|
377
|
+
if (fields.length !== 1) {
|
|
378
|
+
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
379
|
+
}
|
|
380
|
+
return fields[0];
|
|
381
|
+
});
|
|
382
|
+
const maybeMessageContexts = await this.messageContextService.resolveMessageContexts(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
383
|
+
// Leave response in response capsule array.
|
|
384
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageTxContext.toSerializedOption), this.jobId);
|
|
385
|
+
} finally{
|
|
386
|
+
await this.capsuleStore.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId);
|
|
387
|
+
}
|
|
388
|
+
}
|
|
389
|
+
storeCapsule(contractAddress, slot, capsule) {
|
|
346
390
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
347
391
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
348
392
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
@@ -350,7 +394,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
350
394
|
this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
|
|
351
395
|
return Promise.resolve();
|
|
352
396
|
}
|
|
353
|
-
async
|
|
397
|
+
async loadCapsule(contractAddress, slot) {
|
|
354
398
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
355
399
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
356
400
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
@@ -358,7 +402,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
358
402
|
return(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
|
|
359
403
|
this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
|
|
360
404
|
}
|
|
361
|
-
|
|
405
|
+
deleteCapsule(contractAddress, slot) {
|
|
362
406
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
363
407
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
364
408
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
@@ -366,15 +410,24 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
366
410
|
this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
|
|
367
411
|
return Promise.resolve();
|
|
368
412
|
}
|
|
369
|
-
|
|
413
|
+
copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
|
|
370
414
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
371
415
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
372
416
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
373
417
|
}
|
|
374
418
|
return this.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
|
|
375
419
|
}
|
|
420
|
+
/**
|
|
421
|
+
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
422
|
+
* stored notes or events are discovered.
|
|
423
|
+
*/ invalidateContractSyncCache(contractAddress, scopes) {
|
|
424
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
425
|
+
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
426
|
+
}
|
|
427
|
+
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
|
|
428
|
+
}
|
|
376
429
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
377
|
-
|
|
430
|
+
aes128Decrypt(ciphertext, iv, symKey) {
|
|
378
431
|
const aes128 = new Aes128();
|
|
379
432
|
return aes128.decryptBufferCBC(ciphertext, iv, symKey);
|
|
380
433
|
}
|
|
@@ -383,14 +436,36 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
383
436
|
* @param address - The address to get the secret for.
|
|
384
437
|
* @param ephPk - The ephemeral public key to get the secret for.
|
|
385
438
|
* @returns The secret for the given address.
|
|
386
|
-
*/
|
|
387
|
-
return this.getSharedSecret(address, ephPk);
|
|
388
|
-
}
|
|
389
|
-
async getSharedSecret(address, ephPk) {
|
|
439
|
+
*/ async getSharedSecret(address, ephPk) {
|
|
390
440
|
// TODO(#12656): return an app-siloed secret
|
|
391
441
|
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
392
442
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
393
443
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
394
444
|
return deriveEcdhSharedSecret(addressSecret, ephPk);
|
|
395
445
|
}
|
|
446
|
+
emitOffchainEffect(data) {
|
|
447
|
+
this.offchainEffects.push({
|
|
448
|
+
data,
|
|
449
|
+
contractAddress: this.contractAddress
|
|
450
|
+
});
|
|
451
|
+
return Promise.resolve();
|
|
452
|
+
}
|
|
453
|
+
/** Returns offchain effects collected during execution. */ getOffchainEffects() {
|
|
454
|
+
return this.offchainEffects;
|
|
455
|
+
}
|
|
456
|
+
/** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
|
|
457
|
+
const [response] = await Promise.all([
|
|
458
|
+
query(),
|
|
459
|
+
(async ()=>{
|
|
460
|
+
const header = await this.aztecNode.getBlockHeader(blockHash);
|
|
461
|
+
if (!header) {
|
|
462
|
+
throw new Error(`Could not find block header for block hash ${blockHash}`);
|
|
463
|
+
}
|
|
464
|
+
if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
|
|
465
|
+
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()}).`);
|
|
466
|
+
}
|
|
467
|
+
})()
|
|
468
|
+
]);
|
|
469
|
+
return response;
|
|
470
|
+
}
|
|
396
471
|
}
|
|
@@ -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
|
+
}
|
|
@@ -21,10 +21,10 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
21
21
|
private log;
|
|
22
22
|
readonly storeName = "contract_sync";
|
|
23
23
|
private syncedContracts;
|
|
24
|
-
private
|
|
24
|
+
private excludedFromSync;
|
|
25
25
|
constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, log: Logger);
|
|
26
26
|
/** Sets contracts that should be skipped during sync for a specific job. */
|
|
27
|
-
|
|
27
|
+
setExcludedFromSync(jobId: string, addresses: Set<string>): void;
|
|
28
28
|
/**
|
|
29
29
|
* Ensures a contract's private state is synchronized and that the PXE holds the current class artifact.
|
|
30
30
|
* Uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
|
|
@@ -35,9 +35,11 @@ export declare class ContractSyncService implements StagedStore {
|
|
|
35
35
|
* @param scopes - Access scopes to pass through to the utility executor (affects whose account's private state is discovered).
|
|
36
36
|
*/
|
|
37
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;
|
|
38
40
|
/** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */
|
|
39
41
|
wipe(): void;
|
|
40
42
|
commit(jobId: string): Promise<void>;
|
|
41
43
|
discardStaged(jobId: string): Promise<void>;
|
|
42
44
|
}
|
|
43
|
-
//# 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,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,
|
|
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"}
|