@aztec/pxe 0.0.1-commit.023c3e5 → 0.0.1-commit.08c5969dc
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/block_synchronizer/block_synchronizer.d.ts +4 -2
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +7 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +52 -27
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +169 -63
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +3 -3
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.d.ts +3 -3
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +23 -11
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +35 -35
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +73 -20
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +34 -15
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +64 -44
- package/dest/contract_sync/contract_sync_service.d.ts +42 -0
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
- package/dest/contract_sync/contract_sync_service.js +97 -0
- package/dest/contract_sync/helpers.d.ts +28 -0
- package/dest/contract_sync/helpers.d.ts.map +1 -0
- package/dest/contract_sync/{index.js → helpers.js} +13 -12
- package/dest/debug/pxe_debug_utils.d.ts +12 -9
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/debug/pxe_debug_utils.js +16 -15
- package/dest/entrypoints/client/bundle/utils.d.ts +1 -1
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +9 -1
- package/dest/entrypoints/client/lazy/utils.d.ts +1 -1
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +9 -1
- package/dest/entrypoints/server/index.d.ts +2 -2
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +1 -1
- package/dest/entrypoints/server/utils.js +9 -1
- package/dest/logs/log_service.d.ts +2 -2
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +6 -13
- package/dest/oracle_version.d.ts +2 -2
- package/dest/oracle_version.js +2 -2
- package/dest/pxe.d.ts +68 -23
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +68 -42
- package/dest/storage/contract_store/contract_store.js +5 -5
- package/dest/storage/note_store/note_store.d.ts +1 -2
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +4 -2
- package/package.json +25 -16
- package/src/block_synchronizer/block_synchronizer.ts +6 -0
- package/src/contract_function_simulator/contract_function_simulator.ts +315 -119
- package/src/contract_function_simulator/oracle/interfaces.ts +2 -2
- package/src/contract_function_simulator/oracle/oracle.ts +14 -7
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +95 -96
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +105 -44
- package/src/contract_sync/contract_sync_service.ts +145 -0
- package/src/contract_sync/{index.ts → helpers.ts} +15 -20
- package/src/debug/pxe_debug_utils.ts +46 -17
- package/src/entrypoints/client/bundle/utils.ts +9 -1
- package/src/entrypoints/client/lazy/utils.ts +9 -1
- package/src/entrypoints/server/index.ts +1 -1
- package/src/entrypoints/server/utils.ts +7 -7
- package/src/logs/log_service.ts +6 -15
- package/src/oracle_version.ts +2 -2
- package/src/pxe.ts +146 -83
- package/src/storage/contract_store/contract_store.ts +4 -4
- package/src/storage/note_store/note_store.ts +5 -2
- package/dest/contract_sync/index.d.ts +0 -23
- package/dest/contract_sync/index.d.ts.map +0 -1
|
@@ -2,6 +2,7 @@ import type { ARCHIVE_HEIGHT, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
|
|
|
2
2
|
import type { BlockNumber } from '@aztec/foundation/branded-types';
|
|
3
3
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
4
|
import { Point } from '@aztec/foundation/curves/grumpkin';
|
|
5
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
5
6
|
import type { MembershipWitness } from '@aztec/foundation/trees';
|
|
6
7
|
import type { KeyStore } from '@aztec/key-store';
|
|
7
8
|
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
@@ -23,12 +24,35 @@ import type { SenderAddressBookStore } from '../../storage/tagging_store/sender_
|
|
|
23
24
|
import { UtilityContext } from '../noir-structs/utility_context.js';
|
|
24
25
|
import type { IMiscOracle, IUtilityExecutionOracle, NoteData } from './interfaces.js';
|
|
25
26
|
import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
27
|
+
/** Args for UtilityExecutionOracle constructor. */
|
|
28
|
+
export type UtilityExecutionOracleArgs = {
|
|
29
|
+
contractAddress: AztecAddress;
|
|
30
|
+
/** List of transient auth witnesses to be used during this simulation */
|
|
31
|
+
authWitnesses: AuthWitness[];
|
|
32
|
+
capsules: Capsule[];
|
|
33
|
+
anchorBlockHeader: BlockHeader;
|
|
34
|
+
contractStore: ContractStore;
|
|
35
|
+
noteStore: NoteStore;
|
|
36
|
+
keyStore: KeyStore;
|
|
37
|
+
addressStore: AddressStore;
|
|
38
|
+
aztecNode: AztecNode;
|
|
39
|
+
recipientTaggingStore: RecipientTaggingStore;
|
|
40
|
+
senderAddressBookStore: SenderAddressBookStore;
|
|
41
|
+
capsuleStore: CapsuleStore;
|
|
42
|
+
privateEventStore: PrivateEventStore;
|
|
43
|
+
jobId: string;
|
|
44
|
+
log?: ReturnType<typeof createLogger>;
|
|
45
|
+
scopes?: AztecAddress[];
|
|
46
|
+
};
|
|
26
47
|
/**
|
|
27
48
|
* The oracle for an execution of utility contract functions.
|
|
28
49
|
*/
|
|
29
50
|
export declare class UtilityExecutionOracle implements IMiscOracle, IUtilityExecutionOracle {
|
|
51
|
+
#private;
|
|
52
|
+
isMisc: true;
|
|
53
|
+
isUtility: true;
|
|
54
|
+
private contractLogger;
|
|
30
55
|
protected readonly contractAddress: AztecAddress;
|
|
31
|
-
/** List of transient auth witnesses to be used during this simulation */
|
|
32
56
|
protected readonly authWitnesses: AuthWitness[];
|
|
33
57
|
protected readonly capsules: Capsule[];
|
|
34
58
|
protected readonly anchorBlockHeader: BlockHeader;
|
|
@@ -42,14 +66,9 @@ export declare class UtilityExecutionOracle implements IMiscOracle, IUtilityExec
|
|
|
42
66
|
protected readonly capsuleStore: CapsuleStore;
|
|
43
67
|
protected readonly privateEventStore: PrivateEventStore;
|
|
44
68
|
protected readonly jobId: string;
|
|
45
|
-
protected log:
|
|
46
|
-
protected readonly scopes?: AztecAddress[]
|
|
47
|
-
|
|
48
|
-
isUtility: true;
|
|
49
|
-
private aztecNrDebugLog;
|
|
50
|
-
constructor(contractAddress: AztecAddress,
|
|
51
|
-
/** List of transient auth witnesses to be used during this simulation */
|
|
52
|
-
authWitnesses: AuthWitness[], capsules: Capsule[], anchorBlockHeader: BlockHeader, contractStore: ContractStore, noteStore: NoteStore, keyStore: KeyStore, addressStore: AddressStore, aztecNode: AztecNode, recipientTaggingStore: RecipientTaggingStore, senderAddressBookStore: SenderAddressBookStore, capsuleStore: CapsuleStore, privateEventStore: PrivateEventStore, jobId: string, log?: import("@aztec/foundation/log").Logger, scopes?: AztecAddress[] | undefined);
|
|
69
|
+
protected log: ReturnType<typeof createLogger>;
|
|
70
|
+
protected readonly scopes?: AztecAddress[];
|
|
71
|
+
constructor(args: UtilityExecutionOracleArgs);
|
|
53
72
|
utilityAssertCompatibleOracleVersion(version: number): void;
|
|
54
73
|
utilityGetRandomField(): Fr;
|
|
55
74
|
utilityGetUtilityContext(): UtilityContext;
|
|
@@ -58,6 +77,7 @@ export declare class UtilityExecutionOracle implements IMiscOracle, IUtilityExec
|
|
|
58
77
|
* @param pkMHash - The master public key hash.
|
|
59
78
|
* @returns A Promise that resolves to nullifier keys.
|
|
60
79
|
* @throws If the keys are not registered in the key store.
|
|
80
|
+
* @throws If scopes are defined and the account is not in the scopes.
|
|
61
81
|
*/
|
|
62
82
|
utilityGetKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest>;
|
|
63
83
|
/**
|
|
@@ -113,11 +133,10 @@ export declare class UtilityExecutionOracle implements IMiscOracle, IUtilityExec
|
|
|
113
133
|
/**
|
|
114
134
|
* Retrieve the complete address associated to a given address.
|
|
115
135
|
* @param account - The account address.
|
|
116
|
-
* @returns A complete address associated with the input address.
|
|
117
|
-
* @throws An error if the account is not registered in the database.
|
|
136
|
+
* @returns A complete address associated with the input address, or `undefined` if not registered.
|
|
118
137
|
*/
|
|
119
|
-
|
|
120
|
-
protected
|
|
138
|
+
utilityTryGetPublicKeysAndPartialAddress(account: AztecAddress): Promise<CompleteAddress | undefined>;
|
|
139
|
+
protected getCompleteAddressOrFail(account: AztecAddress): Promise<CompleteAddress>;
|
|
121
140
|
/**
|
|
122
141
|
* Returns a contract instance associated with an address or throws if not found.
|
|
123
142
|
* @param address - Address.
|
|
@@ -178,7 +197,7 @@ export declare class UtilityExecutionOracle implements IMiscOracle, IUtilityExec
|
|
|
178
197
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
179
198
|
*/
|
|
180
199
|
utilityStorageRead(blockHash: BlockHash, contractAddress: AztecAddress, startStorageSlot: Fr, numberOfElements: number): Promise<Fr[]>;
|
|
181
|
-
|
|
200
|
+
utilityLog(level: number, message: string, fields: Fr[]): Promise<void>;
|
|
182
201
|
utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot: Fr): Promise<void>;
|
|
183
202
|
/**
|
|
184
203
|
* Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
|
|
@@ -206,4 +225,4 @@ export declare class UtilityExecutionOracle implements IMiscOracle, IUtilityExec
|
|
|
206
225
|
utilityGetSharedSecret(address: AztecAddress, ephPk: Point): Promise<Point>;
|
|
207
226
|
protected getSharedSecret(address: AztecAddress, ephPk: Point): Promise<Point>;
|
|
208
227
|
}
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbGl0eV9leGVjdXRpb25fb3JhY2xlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL29yYWNsZS91dGlsaXR5X2V4ZWN1dGlvbl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMxRCxPQUFPLEVBQWlELFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDakQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVoRixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSWpFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3JELE9BQU8sRUFBZ0IsS0FBSywwQkFBMEIsRUFBRSxpQkFBaUIsRUFB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/utility_execution_oracle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"utility_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/utility_execution_oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,9 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
20
20
|
/**
|
|
21
21
|
* The oracle for an execution of utility contract functions.
|
|
22
22
|
*/ export class UtilityExecutionOracle {
|
|
23
|
+
isMisc = true;
|
|
24
|
+
isUtility = true;
|
|
25
|
+
contractLogger;
|
|
23
26
|
contractAddress;
|
|
24
27
|
authWitnesses;
|
|
25
28
|
capsules;
|
|
@@ -36,29 +39,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
36
39
|
jobId;
|
|
37
40
|
log;
|
|
38
41
|
scopes;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
this.
|
|
44
|
-
this.
|
|
45
|
-
this.
|
|
46
|
-
this.
|
|
47
|
-
this.
|
|
48
|
-
this.
|
|
49
|
-
this.
|
|
50
|
-
this.
|
|
51
|
-
this.
|
|
52
|
-
this.
|
|
53
|
-
this.
|
|
54
|
-
this.
|
|
55
|
-
this.
|
|
56
|
-
this.jobId = jobId;
|
|
57
|
-
this.log = log;
|
|
58
|
-
this.scopes = scopes;
|
|
59
|
-
this.isMisc = true;
|
|
60
|
-
this.isUtility = true;
|
|
61
|
-
this.aztecNrDebugLog = createLogger('aztec-nr:debug_log');
|
|
42
|
+
constructor(args){
|
|
43
|
+
this.contractAddress = args.contractAddress;
|
|
44
|
+
this.authWitnesses = args.authWitnesses;
|
|
45
|
+
this.capsules = args.capsules;
|
|
46
|
+
this.anchorBlockHeader = args.anchorBlockHeader;
|
|
47
|
+
this.contractStore = args.contractStore;
|
|
48
|
+
this.noteStore = args.noteStore;
|
|
49
|
+
this.keyStore = args.keyStore;
|
|
50
|
+
this.addressStore = args.addressStore;
|
|
51
|
+
this.aztecNode = args.aztecNode;
|
|
52
|
+
this.recipientTaggingStore = args.recipientTaggingStore;
|
|
53
|
+
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
54
|
+
this.capsuleStore = args.capsuleStore;
|
|
55
|
+
this.privateEventStore = args.privateEventStore;
|
|
56
|
+
this.jobId = args.jobId;
|
|
57
|
+
this.log = args.log ?? createLogger('simulator:client_view_context');
|
|
58
|
+
this.scopes = args.scopes;
|
|
62
59
|
}
|
|
63
60
|
utilityAssertCompatibleOracleVersion(version) {
|
|
64
61
|
if (version !== ORACLE_VERSION) {
|
|
@@ -76,7 +73,20 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
76
73
|
* @param pkMHash - The master public key hash.
|
|
77
74
|
* @returns A Promise that resolves to nullifier keys.
|
|
78
75
|
* @throws If the keys are not registered in the key store.
|
|
79
|
-
|
|
76
|
+
* @throws If scopes are defined and the account is not in the scopes.
|
|
77
|
+
*/ async utilityGetKeyValidationRequest(pkMHash) {
|
|
78
|
+
// If scopes are defined, check that the key belongs to an account in the scopes.
|
|
79
|
+
if (this.scopes && this.scopes.length > 0) {
|
|
80
|
+
let hasAccess = false;
|
|
81
|
+
for(let i = 0; i < this.scopes.length && !hasAccess; i++){
|
|
82
|
+
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
83
|
+
hasAccess = true;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
if (!hasAccess) {
|
|
87
|
+
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
80
90
|
return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
|
|
81
91
|
}
|
|
82
92
|
/**
|
|
@@ -143,12 +153,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
143
153
|
/**
|
|
144
154
|
* Retrieve the complete address associated to a given address.
|
|
145
155
|
* @param account - The account address.
|
|
146
|
-
* @returns A complete address associated with the input address.
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
return this.getCompleteAddress(account);
|
|
156
|
+
* @returns A complete address associated with the input address, or `undefined` if not registered.
|
|
157
|
+
*/ utilityTryGetPublicKeysAndPartialAddress(account) {
|
|
158
|
+
return this.addressStore.getCompleteAddress(account);
|
|
150
159
|
}
|
|
151
|
-
async
|
|
160
|
+
async getCompleteAddressOrFail(account) {
|
|
152
161
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
153
162
|
if (!completeAddress) {
|
|
154
163
|
throw new Error(`No public key registered for address ${account}.
|
|
@@ -229,8 +238,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
229
238
|
* @param innerNullifier - The inner nullifier.
|
|
230
239
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
231
240
|
*/ async utilityCheckNullifierExists(innerNullifier) {
|
|
232
|
-
const nullifier = await
|
|
233
|
-
|
|
241
|
+
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
242
|
+
siloNullifier(this.contractAddress, innerNullifier),
|
|
243
|
+
this.anchorBlockHeader.hash()
|
|
244
|
+
]);
|
|
245
|
+
const [leafIndex] = await this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
|
|
234
246
|
nullifier
|
|
235
247
|
]);
|
|
236
248
|
return leafIndex?.data !== undefined;
|
|
@@ -258,24 +270,32 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
258
270
|
this.log.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
|
|
259
271
|
return values;
|
|
260
272
|
}
|
|
261
|
-
|
|
273
|
+
/**
|
|
274
|
+
* Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
|
|
275
|
+
*/ async #getContractLogger() {
|
|
276
|
+
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
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
281
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
282
|
+
this.contractLogger = createLogger(module, {
|
|
283
|
+
instanceId: this.jobId
|
|
284
|
+
});
|
|
285
|
+
}
|
|
286
|
+
return this.contractLogger;
|
|
287
|
+
}
|
|
288
|
+
async utilityLog(level, message, fields) {
|
|
262
289
|
if (!LogLevels[level]) {
|
|
263
|
-
throw new Error(`Invalid
|
|
290
|
+
throw new Error(`Invalid log level: ${level}`);
|
|
264
291
|
}
|
|
265
292
|
const levelName = LogLevels[level];
|
|
266
|
-
this
|
|
293
|
+
const logger = await this.#getContractLogger();
|
|
294
|
+
logger[levelName](`${applyStringFormatting(message, fields)}`);
|
|
267
295
|
}
|
|
268
296
|
async utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
|
|
269
297
|
const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
|
|
270
|
-
|
|
271
|
-
// It is acceptable to run the following operations in parallel for several reasons:
|
|
272
|
-
// 1. syncTaggedLogs does not write to the note store — it only stores the pending tagged logs in a capsule array,
|
|
273
|
-
// which is then processed in Noir after this handler returns.
|
|
274
|
-
// 2. Even if syncTaggedLogs did write to the note store, it would not cause inconsistent state.
|
|
275
|
-
await Promise.all([
|
|
276
|
-
logService.syncTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes),
|
|
277
|
-
noteService.syncNoteNullifiers(this.contractAddress)
|
|
278
|
-
]);
|
|
298
|
+
await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
|
|
279
299
|
}
|
|
280
300
|
/**
|
|
281
301
|
* Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
|
|
@@ -368,7 +388,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
368
388
|
}
|
|
369
389
|
async getSharedSecret(address, ephPk) {
|
|
370
390
|
// TODO(#12656): return an app-siloed secret
|
|
371
|
-
const recipientCompleteAddress = await this.
|
|
391
|
+
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
372
392
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
373
393
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
374
394
|
return deriveEcdhSharedSecret(addressSecret, ephPk);
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
+
import type { FunctionCall, FunctionSelector } from '@aztec/stdlib/abi';
|
|
3
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
|
+
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
5
|
+
import type { BlockHeader } from '@aztec/stdlib/tx';
|
|
6
|
+
import type { StagedStore } from '../job_coordinator/job_coordinator.js';
|
|
7
|
+
import type { ContractStore } from '../storage/contract_store/contract_store.js';
|
|
8
|
+
import type { NoteStore } from '../storage/note_store/note_store.js';
|
|
9
|
+
/**
|
|
10
|
+
* Service for syncing the private state of contracts and verifying that the PXE holds the current class artifact.
|
|
11
|
+
* It uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
|
|
12
|
+
*
|
|
13
|
+
* TODO: The StagedStore naming is broken here. Figure out a better name.
|
|
14
|
+
*/
|
|
15
|
+
export declare class ContractSyncService implements StagedStore {
|
|
16
|
+
#private;
|
|
17
|
+
private aztecNode;
|
|
18
|
+
private contractStore;
|
|
19
|
+
private noteStore;
|
|
20
|
+
private log;
|
|
21
|
+
readonly storeName = "contract_sync";
|
|
22
|
+
private syncedContracts;
|
|
23
|
+
private overriddenContracts;
|
|
24
|
+
constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, log: Logger);
|
|
25
|
+
/** Sets contracts that should be skipped during sync for a specific job. */
|
|
26
|
+
setOverriddenContracts(jobId: string, addresses: Set<string>): void;
|
|
27
|
+
/**
|
|
28
|
+
* Ensures a contract's private state is synchronized and that the PXE holds the current class artifact.
|
|
29
|
+
* Uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
|
|
30
|
+
* @param contractAddress - The address of the contract to sync.
|
|
31
|
+
* @param functionToInvokeAfterSync - The function selector that will be called after sync (used to validate it's
|
|
32
|
+
* not sync_state itself).
|
|
33
|
+
* @param utilityExecutor - Executor function for running the sync_state utility function.
|
|
34
|
+
* @param scopes - Scopes to pass through to the utility executor (affects which notes are discovered).
|
|
35
|
+
*/
|
|
36
|
+
ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall, scopes: undefined | AztecAddress[]) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string, scopes: undefined | AztecAddress[]): Promise<void>;
|
|
37
|
+
/** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */
|
|
38
|
+
wipe(): void;
|
|
39
|
+
commit(jobId: string): Promise<void>;
|
|
40
|
+
discardStaged(jobId: string): Promise<void>;
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsR0FBRztJQWRiLFFBQVEsQ0FBQyxTQUFTLG1CQUFtQjtJQUtyQyxPQUFPLENBQUMsZUFBZSxDQUF5QztJQUdoRSxPQUFPLENBQUMsbUJBQW1CLENBQXVDO0lBRWxFLFlBQ1UsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsR0FBRyxFQUFFLE1BQU0sRUFDakI7SUFFSiw0RUFBNEU7SUFDNUUsc0JBQXNCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FFbEU7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG9CQUFvQixDQUN4QixlQUFlLEVBQUUsWUFBWSxFQUM3Qix5QkFBeUIsRUFBRSxnQkFBZ0IsR0FBRyxJQUFJLEVBQ2xELGVBQWUsRUFBRSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFNBQVMsR0FBRyxZQUFZLEVBQUUsS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQ3pGLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDYixNQUFNLEVBQUUsU0FBUyxHQUFHLFlBQVksRUFBRSxHQUNqQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBbUNmO0lBMEJELGdGQUFnRjtJQUNoRixJQUFJLElBQUksSUFBSSxDQUdYO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUluQztJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNMUM7Q0FDRiJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contract_sync_service.d.ts","sourceRoot":"","sources":["../../src/contract_sync/contract_sync_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAGrE;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,WAAW;;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,mBAAmB,CAAuC;IAElE,YACU,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,EACjB;IAEJ,4EAA4E;IAC5E,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAElE;IAED;;;;;;;;OAQG;IACG,oBAAoB,CACxB,eAAe,EAAE,YAAY,EAC7B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,GAAG,YAAY,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EACzF,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,GAAG,YAAY,EAAE,GACjC,OAAO,CAAC,IAAI,CAAC,CAmCf;IA0BD,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;CACF"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { syncState, verifyCurrentClassId } from './helpers.js';
|
|
2
|
+
/**
|
|
3
|
+
* Service for syncing the private state of contracts and verifying that the PXE holds the current class artifact.
|
|
4
|
+
* It uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
|
|
5
|
+
*
|
|
6
|
+
* TODO: The StagedStore naming is broken here. Figure out a better name.
|
|
7
|
+
*/ export class ContractSyncService {
|
|
8
|
+
aztecNode;
|
|
9
|
+
contractStore;
|
|
10
|
+
noteStore;
|
|
11
|
+
log;
|
|
12
|
+
storeName;
|
|
13
|
+
// Tracks contracts synced since last wipe. The cache is keyed per individual scope address
|
|
14
|
+
// (`contractAddress:scopeAddress`), or `contractAddress:*` for undefined scopes (all accounts).
|
|
15
|
+
// The value is a promise that resolves when the contract is synced.
|
|
16
|
+
syncedContracts;
|
|
17
|
+
// Per-job overridden contract addresses - these contracts should not be synced.
|
|
18
|
+
overriddenContracts;
|
|
19
|
+
constructor(aztecNode, contractStore, noteStore, log){
|
|
20
|
+
this.aztecNode = aztecNode;
|
|
21
|
+
this.contractStore = contractStore;
|
|
22
|
+
this.noteStore = noteStore;
|
|
23
|
+
this.log = log;
|
|
24
|
+
this.storeName = 'contract_sync';
|
|
25
|
+
this.syncedContracts = new Map();
|
|
26
|
+
this.overriddenContracts = new Map();
|
|
27
|
+
}
|
|
28
|
+
/** Sets contracts that should be skipped during sync for a specific job. */ setOverriddenContracts(jobId, addresses) {
|
|
29
|
+
this.overriddenContracts.set(jobId, addresses);
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Ensures a contract's private state is synchronized and that the PXE holds the current class artifact.
|
|
33
|
+
* Uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
|
|
34
|
+
* @param contractAddress - The address of the contract to sync.
|
|
35
|
+
* @param functionToInvokeAfterSync - The function selector that will be called after sync (used to validate it's
|
|
36
|
+
* not sync_state itself).
|
|
37
|
+
* @param utilityExecutor - Executor function for running the sync_state utility function.
|
|
38
|
+
* @param scopes - Scopes to pass through to the utility executor (affects which notes are discovered).
|
|
39
|
+
*/ async ensureContractSynced(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId, scopes) {
|
|
40
|
+
// Skip sync if this contract has an override for this job (overrides are keyed by contract address only)
|
|
41
|
+
const overrides = this.overriddenContracts.get(jobId);
|
|
42
|
+
if (overrides?.has(contractAddress.toString())) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
// Skip sync if we already synced for "all scopes", or if we have an empty list of scopes
|
|
46
|
+
const allScopesKey = toKey(contractAddress, undefined);
|
|
47
|
+
const allScopesExisting = this.syncedContracts.get(allScopesKey);
|
|
48
|
+
if (allScopesExisting || scopes && scopes.length == 0) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
const unsyncedScopes = scopes?.filter((scope)=>!this.syncedContracts.has(toKey(contractAddress, scope)));
|
|
52
|
+
const unsyncedScopesKeys = toKeys(contractAddress, unsyncedScopes);
|
|
53
|
+
if (unsyncedScopesKeys.length > 0) {
|
|
54
|
+
// Start sync and store the promise for all unsynced scopes
|
|
55
|
+
const promise = this.#doSync(contractAddress, functionToInvokeAfterSync, (call)=>utilityExecutor(call, unsyncedScopes), anchorBlockHeader, jobId).catch((err)=>{
|
|
56
|
+
// There was an error syncing the contract, so we remove it from the cache so that it can be retried.
|
|
57
|
+
unsyncedScopesKeys.forEach((key)=>this.syncedContracts.delete(key));
|
|
58
|
+
throw err;
|
|
59
|
+
});
|
|
60
|
+
unsyncedScopesKeys.forEach((key)=>this.syncedContracts.set(key, promise));
|
|
61
|
+
}
|
|
62
|
+
const promises = toKeys(contractAddress, scopes).map((key)=>this.syncedContracts.get(key));
|
|
63
|
+
await Promise.all(promises);
|
|
64
|
+
}
|
|
65
|
+
async #doSync(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId) {
|
|
66
|
+
this.log.debug(`Syncing contract ${contractAddress}`);
|
|
67
|
+
await Promise.all([
|
|
68
|
+
syncState(contractAddress, this.contractStore, functionToInvokeAfterSync, utilityExecutor, this.noteStore, this.aztecNode, anchorBlockHeader, jobId),
|
|
69
|
+
verifyCurrentClassId(contractAddress, this.aztecNode, this.contractStore, anchorBlockHeader)
|
|
70
|
+
]);
|
|
71
|
+
this.log.debug(`Contract ${contractAddress} synced`);
|
|
72
|
+
}
|
|
73
|
+
/** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */ wipe() {
|
|
74
|
+
this.log.debug(`Wiping contract sync cache (${this.syncedContracts.size} entries)`);
|
|
75
|
+
this.syncedContracts.clear();
|
|
76
|
+
}
|
|
77
|
+
commit(jobId) {
|
|
78
|
+
// Clear overridden contracts for this job
|
|
79
|
+
this.overriddenContracts.delete(jobId);
|
|
80
|
+
return Promise.resolve();
|
|
81
|
+
}
|
|
82
|
+
discardStaged(jobId) {
|
|
83
|
+
// We clear the synced contracts cache here because, when the job is discarded, any associated database writes from
|
|
84
|
+
// the sync are also undone.
|
|
85
|
+
this.syncedContracts.clear();
|
|
86
|
+
this.overriddenContracts.delete(jobId);
|
|
87
|
+
return Promise.resolve();
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
function toKeys(contract, scopes) {
|
|
91
|
+
return scopes === undefined ? [
|
|
92
|
+
toKey(contract, undefined)
|
|
93
|
+
] : scopes.map((scope)=>toKey(contract, scope));
|
|
94
|
+
}
|
|
95
|
+
function toKey(contract, scope) {
|
|
96
|
+
return scope === undefined ? `${contract.toString()}:*` : `${contract.toString()}:${scope.toString()}`;
|
|
97
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { FunctionCall, FunctionSelector } from '@aztec/stdlib/abi';
|
|
2
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
3
|
+
import type { ContractInstance } from '@aztec/stdlib/contract';
|
|
4
|
+
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
5
|
+
import type { BlockHeader } from '@aztec/stdlib/tx';
|
|
6
|
+
import type { ContractStore } from '../storage/contract_store/contract_store.js';
|
|
7
|
+
import type { NoteStore } from '../storage/note_store/note_store.js';
|
|
8
|
+
/**
|
|
9
|
+
* Read the current class id of a contract from the execution data provider or AztecNode. If not found, class id
|
|
10
|
+
* from the instance is used.
|
|
11
|
+
* @param contractAddress - The address of the contract to read the class id for.
|
|
12
|
+
* @param instance - The instance of the contract.
|
|
13
|
+
* @param aztecNode - The Aztec node to query for storage.
|
|
14
|
+
* @param header - The header of the block at which to load the DelayedPublicMutable storing the class id.
|
|
15
|
+
* @returns The current class id.
|
|
16
|
+
*/
|
|
17
|
+
export declare function readCurrentClassId(contractAddress: AztecAddress, instance: ContractInstance, aztecNode: AztecNode, header: BlockHeader): Promise<import("@aztec/foundation/schemas").Fr>;
|
|
18
|
+
export declare function syncState(contractAddress: AztecAddress, contractStore: ContractStore, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (privateSyncCall: FunctionCall) => Promise<any>, noteStore: NoteStore, aztecNode: AztecNode, anchorBlockHeader: BlockHeader, jobId: string): Promise<void>;
|
|
19
|
+
/**
|
|
20
|
+
* Verify that the current class id of a contract obtained from AztecNode is the same as the one in contract data
|
|
21
|
+
* provider (i.e. PXE's own storage).
|
|
22
|
+
* @param contractAddress - The address of the contract to verify.
|
|
23
|
+
* @param aztecNode - The Aztec node to query for storage.
|
|
24
|
+
* @param contractStore - The contract store to fetch the local instance from.
|
|
25
|
+
* @param header - The header of the block at which to verify the current class id.
|
|
26
|
+
*/
|
|
27
|
+
export declare function verifyCurrentClassId(contractAddress: AztecAddress, aztecNode: AztecNode, contractStore: ContractStore, header: BlockHeader): Promise<void>;
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X3N5bmMvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJFOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUN0QyxlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxXQUFXLG1EQWFwQjtBQUVELHdCQUFzQixTQUFTLENBQzdCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsZUFBZSxFQUFFLFlBQVksS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQ2hFLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0saUJBaUJkO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixvQkFBb0IsQ0FDeEMsZUFBZSxFQUFFLFlBQVksRUFDN0IsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsTUFBTSxFQUFFLFdBQVcsaUJBYXBCIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/contract_sync/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,WAAW,mDAapB;AAED,wBAAsB,SAAS,CAC7B,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,eAAe,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EAChE,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,iBAiBd;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,WAAW,iBAapB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ProtocolContractAddress, isProtocolContract } from '@aztec/protocol-contracts';
|
|
2
2
|
import { DelayedPublicMutableValues, DelayedPublicMutableValuesWithHash } from '@aztec/stdlib/delayed-public-mutable';
|
|
3
|
+
import { NoteService } from '../notes/note_service.js';
|
|
3
4
|
/**
|
|
4
5
|
* Read the current class id of a contract from the execution data provider or AztecNode. If not found, class id
|
|
5
6
|
* from the instance is used.
|
|
@@ -19,21 +20,30 @@ import { DelayedPublicMutableValues, DelayedPublicMutableValuesWithHash } from '
|
|
|
19
20
|
}
|
|
20
21
|
return currentClassId;
|
|
21
22
|
}
|
|
22
|
-
export async function syncState(contractAddress, contractStore, functionToInvokeAfterSync, utilityExecutor) {
|
|
23
|
+
export async function syncState(contractAddress, contractStore, functionToInvokeAfterSync, utilityExecutor, noteStore, aztecNode, anchorBlockHeader, jobId) {
|
|
23
24
|
// Protocol contracts don't have private state to sync
|
|
24
25
|
if (!isProtocolContract(contractAddress)) {
|
|
25
26
|
const syncStateFunctionCall = await contractStore.getFunctionCall('sync_state', [], contractAddress);
|
|
26
27
|
if (functionToInvokeAfterSync && functionToInvokeAfterSync.equals(syncStateFunctionCall.selector)) {
|
|
27
28
|
throw new Error('Forbidden `sync_state` invocation. `sync_state` can only be invoked by PXE, manual execution can lead to inconsistencies.');
|
|
28
29
|
}
|
|
29
|
-
|
|
30
|
+
const noteService = new NoteService(noteStore, aztecNode, anchorBlockHeader, jobId);
|
|
31
|
+
// Both sync_state and syncNoteNullifiers interact with the note store, but running them in parallel is safe
|
|
32
|
+
// because note store is designed to handle concurrent operations.
|
|
33
|
+
await Promise.all([
|
|
34
|
+
utilityExecutor(syncStateFunctionCall),
|
|
35
|
+
noteService.syncNoteNullifiers(contractAddress)
|
|
36
|
+
]);
|
|
30
37
|
}
|
|
31
38
|
}
|
|
32
39
|
/**
|
|
33
40
|
* Verify that the current class id of a contract obtained from AztecNode is the same as the one in contract data
|
|
34
41
|
* provider (i.e. PXE's own storage).
|
|
42
|
+
* @param contractAddress - The address of the contract to verify.
|
|
43
|
+
* @param aztecNode - The Aztec node to query for storage.
|
|
44
|
+
* @param contractStore - The contract store to fetch the local instance from.
|
|
35
45
|
* @param header - The header of the block at which to verify the current class id.
|
|
36
|
-
*/ async function verifyCurrentClassId(contractAddress, aztecNode, contractStore, header) {
|
|
46
|
+
*/ export async function verifyCurrentClassId(contractAddress, aztecNode, contractStore, header) {
|
|
37
47
|
const instance = await contractStore.getContractInstance(contractAddress);
|
|
38
48
|
if (!instance) {
|
|
39
49
|
throw new Error(`No contract instance found for address ${contractAddress.toString()}`);
|
|
@@ -43,12 +53,3 @@ export async function syncState(contractAddress, contractStore, functionToInvoke
|
|
|
43
53
|
throw new Error(`Contract ${contractAddress} is outdated, current class id is ${currentClassId}, local class id is ${instance.currentContractClassId}`);
|
|
44
54
|
}
|
|
45
55
|
}
|
|
46
|
-
/**
|
|
47
|
-
* Ensures the contract's private state is synchronized and that the PXE holds the current class artifact for
|
|
48
|
-
* the contract.
|
|
49
|
-
*/ export async function ensureContractSynced(contractAddress, functionToInvokeAfterSync, utilityExecutor, aztecNode, contractStore, header) {
|
|
50
|
-
await Promise.all([
|
|
51
|
-
syncState(contractAddress, contractStore, functionToInvokeAfterSync, utilityExecutor),
|
|
52
|
-
verifyCurrentClassId(contractAddress, aztecNode, contractStore, header)
|
|
53
|
-
]);
|
|
54
|
-
}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import type { FunctionCall } from '@aztec/stdlib/abi';
|
|
2
|
+
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
3
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
1
4
|
import type { NoteDao, NotesFilter } from '@aztec/stdlib/note';
|
|
2
|
-
import type {
|
|
5
|
+
import type { ContractOverrides } from '@aztec/stdlib/tx';
|
|
3
6
|
import type { BlockSynchronizer } from '../block_synchronizer/block_synchronizer.js';
|
|
4
|
-
import type {
|
|
5
|
-
import type {
|
|
7
|
+
import type { ContractFunctionSimulator } from '../contract_function_simulator/contract_function_simulator.js';
|
|
8
|
+
import type { ContractSyncService } from '../contract_sync/contract_sync_service.js';
|
|
6
9
|
import type { AnchorBlockStore } from '../storage/index.js';
|
|
7
10
|
import type { NoteStore } from '../storage/note_store/note_store.js';
|
|
8
11
|
/**
|
|
@@ -11,13 +14,15 @@ import type { NoteStore } from '../storage/note_store/note_store.js';
|
|
|
11
14
|
*/
|
|
12
15
|
export declare class PXEDebugUtils {
|
|
13
16
|
#private;
|
|
14
|
-
private
|
|
17
|
+
private contractSyncService;
|
|
15
18
|
private noteStore;
|
|
16
19
|
private blockStateSynchronizer;
|
|
17
20
|
private anchorBlockStore;
|
|
18
|
-
constructor(
|
|
21
|
+
constructor(contractSyncService: ContractSyncService, noteStore: NoteStore, blockStateSynchronizer: BlockSynchronizer, anchorBlockStore: AnchorBlockStore);
|
|
19
22
|
/** Not injected through constructor since they're are co-dependant */
|
|
20
|
-
|
|
23
|
+
setPXEHelpers(putJobInQueue: <T>(job: (jobId: string) => Promise<T>) => Promise<T>, getSimulatorForTx: (overrides?: {
|
|
24
|
+
contracts?: ContractOverrides;
|
|
25
|
+
}) => ContractFunctionSimulator, simulateUtility: (contractFunctionSimulator: ContractFunctionSimulator, call: FunctionCall, authWitnesses: AuthWitness[] | undefined, scopes: AztecAddress[] | undefined, jobId: string) => Promise<any>): void;
|
|
21
26
|
/**
|
|
22
27
|
* A debugging utility to get notes based on the provided filter.
|
|
23
28
|
*
|
|
@@ -30,12 +35,10 @@ export declare class PXEDebugUtils {
|
|
|
30
35
|
* @returns The requested notes.
|
|
31
36
|
*/
|
|
32
37
|
getNotes(filter: NotesFilter): Promise<NoteDao[]>;
|
|
33
|
-
/** Returns the block header up to which the PXE has synced. */
|
|
34
|
-
getSyncedBlockHeader(): Promise<BlockHeader>;
|
|
35
38
|
/**
|
|
36
39
|
* Triggers a sync of the PXE with the node.
|
|
37
40
|
* Blocks until the sync is complete.
|
|
38
41
|
*/
|
|
39
42
|
sync(): Promise<void>;
|
|
40
43
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2RlYnVnX3V0aWxzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGVidWcvcHhlX2RlYnVnX3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDckYsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSwrREFBK0QsQ0FBQztBQUMvRyxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFckU7OztHQUdHO0FBQ0gscUJBQWEsYUFBYTs7SUFZdEIsT0FBTyxDQUFDLG1CQUFtQjtJQUMzQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsc0JBQXNCO0lBQzlCLE9BQU8sQ0FBQyxnQkFBZ0I7SUFKMUIsWUFDVSxtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsU0FBUyxFQUFFLFNBQVMsRUFDcEIsc0JBQXNCLEVBQUUsaUJBQWlCLEVBQ3pDLGdCQUFnQixFQUFFLGdCQUFnQixFQUN4QztJQUVKLHNFQUFzRTtJQUMvRCxhQUFhLENBQ2xCLGFBQWEsRUFBRSxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQ3BFLGlCQUFpQixFQUFFLENBQUMsU0FBUyxDQUFDLEVBQUU7UUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsQ0FBQTtLQUFFLEtBQUsseUJBQXlCLEVBQy9GLGVBQWUsRUFBRSxDQUNmLHlCQUF5QixFQUFFLHlCQUF5QixFQUNwRCxJQUFJLEVBQUUsWUFBWSxFQUNsQixhQUFhLEVBQUUsV0FBVyxFQUFFLEdBQUcsU0FBUyxFQUN4QyxNQUFNLEVBQUUsWUFBWSxFQUFFLEdBQUcsU0FBUyxFQUNsQyxLQUFLLEVBQUUsTUFBTSxLQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFLbEI7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0ksUUFBUSxDQUFDLE1BQU0sRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBb0J2RDtJQUVEOzs7T0FHRztJQUNJLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRTNCO0NBQ0YifQ==
|