@aztec/pxe 0.0.1-commit.c949de6bc → 0.0.1-commit.cbf2c2d5d
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 +28 -6
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +5 -5
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +17 -9
- package/dest/contract_function_simulator/index.d.ts +2 -1
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +1 -0
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +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 +30 -62
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +53 -35
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +101 -43
- 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/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/pxe.d.ts +8 -4
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +39 -22
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.d.ts +26 -25
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +141 -115
- package/dest/tagging/index.d.ts +2 -2
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +10 -1
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +2 -1
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +24 -11
- package/package.json +16 -16
- package/src/config/index.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +39 -7
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +16 -11
- package/src/contract_function_simulator/index.ts +1 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +8 -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 +32 -80
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +136 -53
- package/src/contract_sync/contract_sync_service.ts +67 -38
- package/src/messages/message_context_service.ts +45 -0
- package/src/oracle_version.ts +3 -3
- package/src/pxe.ts +57 -21
- package/src/storage/metadata.ts +1 -1
- package/src/storage/tagging_store/sender_tagging_store.ts +182 -135
- package/src/tagging/index.ts +1 -1
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +19 -1
- package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +19 -9
|
@@ -3,12 +3,11 @@ import { type CircuitSimulator } from '@aztec/simulator/client';
|
|
|
3
3
|
import { type FunctionAbi, type FunctionCall, FunctionSelector, type NoteSelector } from '@aztec/stdlib/abi';
|
|
4
4
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
5
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
6
|
-
import { type ContractClassLog, type
|
|
6
|
+
import { type ContractClassLog, type TaggingIndexRange } from '@aztec/stdlib/logs';
|
|
7
7
|
import { Tag } from '@aztec/stdlib/logs';
|
|
8
8
|
import { type NoteStatus } from '@aztec/stdlib/note';
|
|
9
9
|
import { CallContext, CountedContractClassLog, NoteAndSlot, PrivateCallExecutionResult, type TxContext } from '@aztec/stdlib/tx';
|
|
10
10
|
import type { AccessScopes } from '../../access_scopes.js';
|
|
11
|
-
import type { ContractSyncService } from '../../contract_sync/contract_sync_service.js';
|
|
12
11
|
import type { SenderTaggingStore } from '../../storage/tagging_store/sender_tagging_store.js';
|
|
13
12
|
import type { ExecutionNoteCache } from '../execution_note_cache.js';
|
|
14
13
|
import { ExecutionTaggingIndexCache } from '../execution_tagging_index_cache.js';
|
|
@@ -26,7 +25,6 @@ export type PrivateExecutionOracleArgs = Omit<UtilityExecutionOracleArgs, 'contr
|
|
|
26
25
|
noteCache: ExecutionNoteCache;
|
|
27
26
|
taggingIndexCache: ExecutionTaggingIndexCache;
|
|
28
27
|
senderTaggingStore: SenderTaggingStore;
|
|
29
|
-
contractSyncService: ContractSyncService;
|
|
30
28
|
totalPublicCalldataCount?: number;
|
|
31
29
|
sideEffectCounter?: number;
|
|
32
30
|
senderForTags?: AztecAddress;
|
|
@@ -49,7 +47,6 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
49
47
|
private newNotes;
|
|
50
48
|
private noteHashNullifierCounterMap;
|
|
51
49
|
private contractClassLogs;
|
|
52
|
-
private offchainEffects;
|
|
53
50
|
private nestedExecutionResults;
|
|
54
51
|
private readonly argsHash;
|
|
55
52
|
private readonly txContext;
|
|
@@ -59,7 +56,6 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
59
56
|
private readonly noteCache;
|
|
60
57
|
private readonly taggingIndexCache;
|
|
61
58
|
private readonly senderTaggingStore;
|
|
62
|
-
private readonly contractSyncService;
|
|
63
59
|
private totalPublicCalldataCount;
|
|
64
60
|
protected sideEffectCounter: number;
|
|
65
61
|
private senderForTags?;
|
|
@@ -82,15 +78,9 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
82
78
|
*/
|
|
83
79
|
getContractClassLogs(): CountedContractClassLog[];
|
|
84
80
|
/**
|
|
85
|
-
*
|
|
81
|
+
* Returns the tagging index ranges that were used in this execution (and that need to be stored in the db).
|
|
86
82
|
*/
|
|
87
|
-
|
|
88
|
-
data: Fr[];
|
|
89
|
-
}[];
|
|
90
|
-
/**
|
|
91
|
-
* Returns the pre-tags that were used in this execution (and that need to be stored in the db).
|
|
92
|
-
*/
|
|
93
|
-
getUsedPreTags(): PreTag[];
|
|
83
|
+
getUsedTaggingIndexRanges(): TaggingIndexRange[];
|
|
94
84
|
/**
|
|
95
85
|
* Return the nested execution results during this execution.
|
|
96
86
|
*/
|
|
@@ -105,7 +95,7 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
105
95
|
* The value persists through nested calls, meaning all calls down the stack will use the same
|
|
106
96
|
* 'senderForTags' value (unless it is replaced).
|
|
107
97
|
*/
|
|
108
|
-
|
|
98
|
+
getSenderForTags(): Promise<AztecAddress | undefined>;
|
|
109
99
|
/**
|
|
110
100
|
* Set the sender for tags.
|
|
111
101
|
*
|
|
@@ -117,27 +107,27 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
117
107
|
* through nested calls, meaning all calls down the stack will use the same 'senderForTags'
|
|
118
108
|
* value (unless it is replaced by another call to this setter).
|
|
119
109
|
*/
|
|
120
|
-
|
|
110
|
+
setSenderForTags(senderForTags: AztecAddress): Promise<void>;
|
|
121
111
|
/**
|
|
122
112
|
* Returns the next app tag for a given sender and recipient pair.
|
|
123
113
|
* @param sender - The address sending the log
|
|
124
114
|
* @param recipient - The address receiving the log
|
|
125
115
|
* @returns An app tag to be used in a log.
|
|
126
116
|
*/
|
|
127
|
-
|
|
117
|
+
getNextAppTagAsSender(sender: AztecAddress, recipient: AztecAddress): Promise<Tag>;
|
|
128
118
|
/**
|
|
129
119
|
* Store values in the execution cache.
|
|
130
120
|
* @param values - Values to store.
|
|
131
121
|
* @returns The hash of the values.
|
|
132
122
|
*/
|
|
133
|
-
|
|
123
|
+
storeInExecutionCache(values: Fr[], hash: Fr): void;
|
|
134
124
|
/**
|
|
135
125
|
* Gets values from the execution cache.
|
|
136
126
|
* @param hash - Hash of the values.
|
|
137
127
|
* @returns The values.
|
|
138
128
|
*/
|
|
139
|
-
|
|
140
|
-
|
|
129
|
+
loadFromExecutionCache(hash: Fr): Promise<Fr[]>;
|
|
130
|
+
checkNullifierExists(innerNullifier: Fr): Promise<boolean>;
|
|
141
131
|
/**
|
|
142
132
|
* Gets some notes for a storage slot.
|
|
143
133
|
*
|
|
@@ -159,7 +149,7 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
159
149
|
* @param status - The status of notes to fetch.
|
|
160
150
|
* @returns Array of note data.
|
|
161
151
|
*/
|
|
162
|
-
|
|
152
|
+
getNotes(owner: AztecAddress | undefined, storageSlot: Fr, numSelects: number, selectByIndexes: number[], selectByOffsets: number[], selectByLengths: number[], selectValues: Fr[], selectComparators: number[], sortByIndexes: number[], sortByOffsets: number[], sortByLengths: number[], sortOrder: number[], limit: number, offset: number, status: NoteStatus): Promise<NoteData[]>;
|
|
163
153
|
/**
|
|
164
154
|
* Keep track of the new note created during execution.
|
|
165
155
|
* It can be used in subsequent calls (or transactions when chaining txs is possible).
|
|
@@ -171,29 +161,29 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
171
161
|
* @param noteHash - A hash of the new note.
|
|
172
162
|
* @returns
|
|
173
163
|
*/
|
|
174
|
-
|
|
164
|
+
notifyCreatedNote(owner: AztecAddress, storageSlot: Fr, randomness: Fr, noteTypeId: NoteSelector, noteItems: Fr[], noteHash: Fr, counter: number): void;
|
|
175
165
|
/**
|
|
176
166
|
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
177
167
|
* within the current transaction/execution.
|
|
178
168
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
179
169
|
* @param noteHash - A hash of the new note.
|
|
180
170
|
*/
|
|
181
|
-
|
|
171
|
+
notifyNullifiedNote(innerNullifier: Fr, noteHash: Fr, counter: number): Promise<void>;
|
|
182
172
|
/**
|
|
183
173
|
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
184
174
|
* within the current transaction/execution.
|
|
185
175
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
186
176
|
* @param noteHash - A hash of the new note.
|
|
187
177
|
*/
|
|
188
|
-
|
|
178
|
+
notifyCreatedNullifier(innerNullifier: Fr): Promise<void>;
|
|
189
179
|
/**
|
|
190
|
-
* Check if a nullifier has been emitted in the same transaction, i.e. if
|
|
180
|
+
* Check if a nullifier has been emitted in the same transaction, i.e. if notifyCreatedNullifier has been
|
|
191
181
|
* called for this inner nullifier from the contract with the specified address.
|
|
192
182
|
* @param innerNullifier - The inner nullifier to check.
|
|
193
183
|
* @param contractAddress - Address of the contract that emitted the nullifier.
|
|
194
184
|
* @returns A boolean indicating whether the nullifier is pending or not.
|
|
195
185
|
*/
|
|
196
|
-
|
|
186
|
+
isNullifierPending(innerNullifier: Fr, contractAddress: AztecAddress): Promise<boolean>;
|
|
197
187
|
/**
|
|
198
188
|
* Emit a contract class log.
|
|
199
189
|
* This fn exists because we only carry a poseidon hash through the kernels, and need to
|
|
@@ -201,7 +191,7 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
201
191
|
* @param log - The contract class log to be emitted.
|
|
202
192
|
* @param counter - The contract class log's counter.
|
|
203
193
|
*/
|
|
204
|
-
|
|
194
|
+
notifyCreatedContractClassLog(log: ContractClassLog, counter: number): void;
|
|
205
195
|
/**
|
|
206
196
|
* Calls a private function as a nested execution.
|
|
207
197
|
* @param targetContractAddress - The address of the contract to call.
|
|
@@ -211,30 +201,15 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
211
201
|
* @param isStaticCall - Whether the call is a static call.
|
|
212
202
|
* @returns The execution result.
|
|
213
203
|
*/
|
|
214
|
-
|
|
204
|
+
callPrivateFunction(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, argsHash: Fr, sideEffectCounter: number, isStaticCall: boolean): Promise<{
|
|
215
205
|
endSideEffectCounter: Fr;
|
|
216
206
|
returnsHash: Fr;
|
|
217
207
|
}>;
|
|
218
|
-
/**
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
223
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
224
|
-
*/
|
|
225
|
-
privateNotifyEnqueuedPublicFunctionCall(_targetContractAddress: AztecAddress, calldataHash: Fr, _sideEffectCounter: number, _isStaticCall: boolean): Promise<void>;
|
|
226
|
-
/**
|
|
227
|
-
* Verify relevant information when a public teardown function is set.
|
|
228
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
229
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
230
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
231
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
232
|
-
*/
|
|
233
|
-
privateNotifySetPublicTeardownFunctionCall(_targetContractAddress: AztecAddress, calldataHash: Fr, _sideEffectCounter: number, _isStaticCall: boolean): Promise<void>;
|
|
234
|
-
privateNotifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: number): Promise<void>;
|
|
235
|
-
privateIsSideEffectCounterRevertible(sideEffectCounter: number): Promise<boolean>;
|
|
208
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */
|
|
209
|
+
validatePublicCalldata(calldataHash: Fr): Promise<void>;
|
|
210
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter: number): Promise<void>;
|
|
211
|
+
inRevertiblePhase(sideEffectCounter: number): Promise<boolean>;
|
|
236
212
|
private deriveCallContext;
|
|
237
213
|
getDebugFunctionName(): Promise<string>;
|
|
238
|
-
utilityEmitOffchainEffect(data: Fr[]): Promise<void>;
|
|
239
214
|
}
|
|
240
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb25fb3JhY2xlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL29yYWNsZS9wcml2YXRlX2V4ZWN1dGlvbl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR3BELE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUFpQixNQUFNLHlCQUF5QixDQUFDO0FBQy9FLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFFaEIsS0FBSyxZQUFZLEVBQ2pCLGdCQUFnQixFQUNoQixLQUFLLFlBQVksRUFFbEIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQXVDLEtBQUssaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN4SCxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekMsT0FBTyxFQUFRLEtBQUssVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUNMLFdBQVcsRUFDWCx1QkFBdUIsRUFDdkIsV0FBVyxFQUNYLDBCQUEwQixFQUMxQixLQUFLLFNBQVMsRUFDZixNQUFNLGtCQUFrQixDQUFDO0FBRTFCLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTNELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scURBQXFELENBQUM7QUFFOUYsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRW5FLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXpFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxLQUFLLDBCQUEwQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFeEcsbURBQW1EO0FBQ25ELE1BQU0sTUFBTSwwQkFBMEIsR0FBRyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsaUJBQWlCLENBQUMsR0FBRztJQUM3RixRQUFRLEVBQUUsRUFBRSxDQUFDO0lBQ2IsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLHFFQUFxRTtJQUNyRSxlQUFlLEVBQUUsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEtBQUssT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzdFLGNBQWMsRUFBRSxpQkFBaUIsQ0FBQztJQUNsQyxTQUFTLEVBQUUsa0JBQWtCLENBQUM7SUFDOUIsaUJBQWlCLEVBQUUsMEJBQTBCLENBQUM7SUFDOUMsa0JBQWtCLEVBQUUsa0JBQWtCLENBQUM7SUFDdkMsd0JBQXdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEMsaUJBQWlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDM0IsYUFBYSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzdCLFNBQVMsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0NBQzlCLENBQUM7QUFFRjs7R0FFRztBQUNILHFCQUFhLHNCQUF1QixTQUFRLHNCQUF1QixZQUFXLHVCQUF1Qjs7SUFDbkcsU0FBUyxPQUFpQjtJQUUxQjs7Ozs7OztPQU9HO0lBQ0gsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFDckMsT0FBTyxDQUFDLDJCQUEyQixDQUFrQztJQUNyRSxPQUFPLENBQUMsaUJBQWlCLENBQWlDO0lBQzFELE9BQU8sQ0FBQyxzQkFBc0IsQ0FBb0M7SUFFbEUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUs7SUFDOUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQVk7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQWM7SUFDMUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQThEO0lBQzlGLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFvQjtJQUNuRCxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBcUI7SUFDL0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBNkI7SUFDL0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBcUI7SUFDeEQsT0FBTyxDQUFDLHdCQUF3QixDQUFTO0lBQ3pDLFNBQVMsQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDcEMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFlO0lBQ3JDLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQW1CO0lBRTlDLFlBQVksSUFBSSxFQUFFLDBCQUEwQixFQWtCM0M7SUFFTSx1QkFBdUIsSUFBSSxvQkFBb0IsQ0FFckQ7SUFJRDs7OztPQUlHO0lBQ0ksaUJBQWlCLENBQUMsR0FBRyxFQUFFLFdBQVcsdUJBZ0J4QztJQUVEOztPQUVHO0lBQ0ksV0FBVyxJQUFJLFdBQVcsRUFBRSxDQUVsQztJQUVNLDhCQUE4Qix3QkFFcEM7SUFFRDs7T0FFRztJQUNJLG9CQUFvQiw4QkFFMUI7SUFFRDs7T0FFRztJQUNJLHlCQUF5QixJQUFJLGlCQUFpQixFQUFFLENBRXREO0lBRUQ7O09BRUc7SUFDSSx5QkFBeUIsaUNBRS9CO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0ksZ0JBQWdCLElBQUksT0FBTyxDQUFDLFlBQVksR0FBRyxTQUFTLENBQUMsQ0FFM0Q7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0ksZ0JBQWdCLENBQUMsYUFBYSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2xFO0lBRUQ7Ozs7O09BS0c7SUFDVSxxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQWM5RjtJQTJDRDs7OztPQUlHO0lBQ0kscUJBQXFCLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFFLFFBRWxEO0lBRUQ7Ozs7T0FJRztJQUNJLHNCQUFzQixDQUFDLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBTXJEO0lBRWMsb0JBQW9CLENBQUMsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBZXhFO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09Bb0JHO0lBQ21CLFFBQVEsQ0FDNUIsS0FBSyxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQy9CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsVUFBVSxFQUFFLE1BQU0sRUFDbEIsZUFBZSxFQUFFLE1BQU0sRUFBRSxFQUN6QixlQUFlLEVBQUUsTUFBTSxFQUFFLEVBQ3pCLGVBQWUsRUFBRSxNQUFNLEVBQUUsRUFDekIsWUFBWSxFQUFFLEVBQUUsRUFBRSxFQUNsQixpQkFBaUIsRUFBRSxNQUFNLEVBQUUsRUFDM0IsYUFBYSxFQUFFLE1BQU0sRUFBRSxFQUN2QixhQUFhLEVBQUUsTUFBTSxFQUFFLEVBQ3ZCLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFDdkIsU0FBUyxFQUFFLE1BQU0sRUFBRSxFQUNuQixLQUFLLEVBQUUsTUFBTSxFQUNiLE1BQU0sRUFBRSxNQUFNLEVBQ2QsTUFBTSxFQUFFLFVBQVUsR0FDakIsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBcUNyQjtJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSSxpQkFBaUIsQ0FDdEIsS0FBSyxFQUFFLFlBQVksRUFDbkIsV0FBVyxFQUFFLEVBQUUsRUFDZixVQUFVLEVBQUUsRUFBRSxFQUNkLFVBQVUsRUFBRSxZQUFZLEVBQ3hCLFNBQVMsRUFBRSxFQUFFLEVBQUUsRUFDZixRQUFRLEVBQUUsRUFBRSxFQUNaLE9BQU8sRUFBRSxNQUFNLFFBMEJoQjtJQUVEOzs7OztPQUtHO0lBQ1UsbUJBQW1CLENBQUMsY0FBYyxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxNQUFNLGlCQVNqRjtJQUVEOzs7OztPQUtHO0lBQ0ksc0JBQXNCLENBQUMsY0FBYyxFQUFFLEVBQUUsaUJBRy9DO0lBRUQ7Ozs7OztPQU1HO0lBQ1Usa0JBQWtCLENBQUMsY0FBYyxFQUFFLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FJbkc7SUFFRDs7Ozs7O09BTUc7SUFDSSw2QkFBNkIsQ0FBQyxHQUFHLEVBQUUsZ0JBQWdCLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFNMUU7SUFjRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUN2QixxQkFBcUIsRUFBRSxZQUFZLEVBQ25DLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxRQUFRLEVBQUUsRUFBRSxFQUNaLGlCQUFpQixFQUFFLE1BQU0sRUFDekIsWUFBWSxFQUFFLE9BQU87OztPQTRGdEI7SUFFRCxnSEFBZ0g7SUFDekcsc0JBQXNCLENBQUMsWUFBWSxFQUFFLEVBQUUsaUJBVzdDO0lBRU0sMEJBQTBCLENBQUMsOEJBQThCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFdkY7SUFFTSxpQkFBaUIsQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUVwRTtZQVNhLGlCQUFpQjtJQWF4QixvQkFBb0Isb0JBRTFCO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution_oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,EAAE,KAAK,gBAAgB,EAAiB,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,YAAY,EACjB,gBAAgB,EAChB,KAAK,YAAY,EAElB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,KAAK,gBAAgB,EAAuC,KAAK,
|
|
1
|
+
{"version":3,"file":"private_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution_oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,6 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
29
29
|
*/ newNotes = [];
|
|
30
30
|
noteHashNullifierCounterMap = new Map();
|
|
31
31
|
contractClassLogs = [];
|
|
32
|
-
offchainEffects = [];
|
|
33
32
|
nestedExecutionResults = [];
|
|
34
33
|
argsHash;
|
|
35
34
|
txContext;
|
|
@@ -39,7 +38,6 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
39
38
|
noteCache;
|
|
40
39
|
taggingIndexCache;
|
|
41
40
|
senderTaggingStore;
|
|
42
|
-
contractSyncService;
|
|
43
41
|
totalPublicCalldataCount;
|
|
44
42
|
sideEffectCounter;
|
|
45
43
|
senderForTags;
|
|
@@ -58,7 +56,6 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
58
56
|
this.noteCache = args.noteCache;
|
|
59
57
|
this.taggingIndexCache = args.taggingIndexCache;
|
|
60
58
|
this.senderTaggingStore = args.senderTaggingStore;
|
|
61
|
-
this.contractSyncService = args.contractSyncService;
|
|
62
59
|
this.totalPublicCalldataCount = args.totalPublicCalldataCount ?? 0;
|
|
63
60
|
this.sideEffectCounter = args.sideEffectCounter ?? 0;
|
|
64
61
|
this.senderForTags = args.senderForTags;
|
|
@@ -103,14 +100,9 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
103
100
|
return this.contractClassLogs;
|
|
104
101
|
}
|
|
105
102
|
/**
|
|
106
|
-
*
|
|
107
|
-
*/
|
|
108
|
-
return this.
|
|
109
|
-
}
|
|
110
|
-
/**
|
|
111
|
-
* Returns the pre-tags that were used in this execution (and that need to be stored in the db).
|
|
112
|
-
*/ getUsedPreTags() {
|
|
113
|
-
return this.taggingIndexCache.getUsedPreTags();
|
|
103
|
+
* Returns the tagging index ranges that were used in this execution (and that need to be stored in the db).
|
|
104
|
+
*/ getUsedTaggingIndexRanges() {
|
|
105
|
+
return this.taggingIndexCache.getUsedTaggingIndexRanges();
|
|
114
106
|
}
|
|
115
107
|
/**
|
|
116
108
|
* Return the nested execution results during this execution.
|
|
@@ -126,7 +118,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
126
118
|
*
|
|
127
119
|
* The value persists through nested calls, meaning all calls down the stack will use the same
|
|
128
120
|
* 'senderForTags' value (unless it is replaced).
|
|
129
|
-
*/
|
|
121
|
+
*/ getSenderForTags() {
|
|
130
122
|
return Promise.resolve(this.senderForTags);
|
|
131
123
|
}
|
|
132
124
|
/**
|
|
@@ -139,7 +131,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
139
131
|
* Account contracts typically set this value before calling other contracts. The value persists
|
|
140
132
|
* through nested calls, meaning all calls down the stack will use the same 'senderForTags'
|
|
141
133
|
* value (unless it is replaced by another call to this setter).
|
|
142
|
-
*/
|
|
134
|
+
*/ setSenderForTags(senderForTags) {
|
|
143
135
|
this.senderForTags = senderForTags;
|
|
144
136
|
return Promise.resolve();
|
|
145
137
|
}
|
|
@@ -148,10 +140,10 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
148
140
|
* @param sender - The address sending the log
|
|
149
141
|
* @param recipient - The address receiving the log
|
|
150
142
|
* @returns An app tag to be used in a log.
|
|
151
|
-
*/ async
|
|
143
|
+
*/ async getNextAppTagAsSender(sender, recipient) {
|
|
152
144
|
const extendedSecret = await this.#calculateExtendedDirectionalAppTaggingSecret(this.contractAddress, sender, recipient);
|
|
153
145
|
const index = await this.#getIndexToUseForSecret(extendedSecret);
|
|
154
|
-
this.
|
|
146
|
+
this.logger.debug(`Incrementing tagging index for sender: ${sender}, recipient: ${recipient}, contract: ${this.contractAddress} to ${index}`);
|
|
155
147
|
this.taggingIndexCache.setLastUsedIndex(extendedSecret, index);
|
|
156
148
|
return Tag.compute({
|
|
157
149
|
extendedSecret,
|
|
@@ -183,29 +175,29 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
183
175
|
* Store values in the execution cache.
|
|
184
176
|
* @param values - Values to store.
|
|
185
177
|
* @returns The hash of the values.
|
|
186
|
-
*/
|
|
178
|
+
*/ storeInExecutionCache(values, hash) {
|
|
187
179
|
return this.executionCache.store(values, hash);
|
|
188
180
|
}
|
|
189
181
|
/**
|
|
190
182
|
* Gets values from the execution cache.
|
|
191
183
|
* @param hash - Hash of the values.
|
|
192
184
|
* @returns The values.
|
|
193
|
-
*/
|
|
185
|
+
*/ loadFromExecutionCache(hash) {
|
|
194
186
|
const preimage = this.executionCache.getPreimage(hash);
|
|
195
187
|
if (!preimage) {
|
|
196
188
|
throw new Error(`Preimage for hash ${hash.toString()} not found in cache`);
|
|
197
189
|
}
|
|
198
190
|
return Promise.resolve(preimage);
|
|
199
191
|
}
|
|
200
|
-
async
|
|
192
|
+
async checkNullifierExists(innerNullifier) {
|
|
201
193
|
// This oracle must be overridden because while utility execution can only meaningfully check if a nullifier exists
|
|
202
194
|
// in the synched block, during private execution there's also the possibility of it being pending, i.e. created
|
|
203
195
|
// in the current transaction.
|
|
204
|
-
this.
|
|
196
|
+
this.logger.debug(`Checking existence of inner nullifier ${innerNullifier}`, {
|
|
205
197
|
contractAddress: this.contractAddress
|
|
206
198
|
});
|
|
207
199
|
const nullifier = (await siloNullifier(this.contractAddress, innerNullifier)).toBigInt();
|
|
208
|
-
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.
|
|
200
|
+
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.checkNullifierExists(innerNullifier);
|
|
209
201
|
}
|
|
210
202
|
/**
|
|
211
203
|
* Gets some notes for a storage slot.
|
|
@@ -227,7 +219,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
227
219
|
* @param offset - The starting index for pagination.
|
|
228
220
|
* @param status - The status of notes to fetch.
|
|
229
221
|
* @returns Array of note data.
|
|
230
|
-
*/ async
|
|
222
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
231
223
|
// Nullified pending notes are already removed from the list.
|
|
232
224
|
const pendingNotes = this.noteCache.getNotes(this.callContext.contractAddress, owner, storageSlot);
|
|
233
225
|
const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
|
|
@@ -258,7 +250,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
258
250
|
limit,
|
|
259
251
|
offset
|
|
260
252
|
});
|
|
261
|
-
this.
|
|
253
|
+
this.logger.debug(`Returning ${notes.length} notes for ${this.callContext.contractAddress} at ${storageSlot}: ${notes.map((n)=>`${n.noteNonce.toString()}:[${n.note.items.map((i)=>i.toString()).join(',')}]`).join(', ')}`);
|
|
262
254
|
return notes;
|
|
263
255
|
}
|
|
264
256
|
/**
|
|
@@ -271,8 +263,8 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
271
263
|
* @param noteItems - The items to be included in a Note.
|
|
272
264
|
* @param noteHash - A hash of the new note.
|
|
273
265
|
* @returns
|
|
274
|
-
*/
|
|
275
|
-
this.
|
|
266
|
+
*/ notifyCreatedNote(owner, storageSlot, randomness, noteTypeId, noteItems, noteHash, counter) {
|
|
267
|
+
this.logger.debug(`Notified of new note with inner hash ${noteHash}`, {
|
|
276
268
|
contractAddress: this.callContext.contractAddress,
|
|
277
269
|
storageSlot,
|
|
278
270
|
randomness,
|
|
@@ -303,7 +295,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
303
295
|
* within the current transaction/execution.
|
|
304
296
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
305
297
|
* @param noteHash - A hash of the new note.
|
|
306
|
-
*/ async
|
|
298
|
+
*/ async notifyNullifiedNote(innerNullifier, noteHash, counter) {
|
|
307
299
|
const nullifiedNoteHashCounter = await this.noteCache.nullifyNote(this.callContext.contractAddress, innerNullifier, noteHash);
|
|
308
300
|
if (nullifiedNoteHashCounter !== undefined) {
|
|
309
301
|
this.noteHashNullifierCounterMap.set(nullifiedNoteHashCounter, counter);
|
|
@@ -314,19 +306,19 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
314
306
|
* within the current transaction/execution.
|
|
315
307
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
316
308
|
* @param noteHash - A hash of the new note.
|
|
317
|
-
*/
|
|
318
|
-
this.
|
|
309
|
+
*/ notifyCreatedNullifier(innerNullifier) {
|
|
310
|
+
this.logger.debug(`Notified of new inner nullifier ${innerNullifier}`, {
|
|
319
311
|
contractAddress: this.contractAddress
|
|
320
312
|
});
|
|
321
313
|
return this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
|
|
322
314
|
}
|
|
323
315
|
/**
|
|
324
|
-
* Check if a nullifier has been emitted in the same transaction, i.e. if
|
|
316
|
+
* Check if a nullifier has been emitted in the same transaction, i.e. if notifyCreatedNullifier has been
|
|
325
317
|
* called for this inner nullifier from the contract with the specified address.
|
|
326
318
|
* @param innerNullifier - The inner nullifier to check.
|
|
327
319
|
* @param contractAddress - Address of the contract that emitted the nullifier.
|
|
328
320
|
* @returns A boolean indicating whether the nullifier is pending or not.
|
|
329
|
-
*/ async
|
|
321
|
+
*/ async isNullifierPending(innerNullifier, contractAddress) {
|
|
330
322
|
const siloedNullifier = await siloNullifier(contractAddress, innerNullifier);
|
|
331
323
|
const isNullifierPending = this.noteCache.getNullifiers(contractAddress).has(siloedNullifier.toBigInt());
|
|
332
324
|
return Promise.resolve(isNullifierPending);
|
|
@@ -337,10 +329,10 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
337
329
|
* keep the preimage in ts for later.
|
|
338
330
|
* @param log - The contract class log to be emitted.
|
|
339
331
|
* @param counter - The contract class log's counter.
|
|
340
|
-
*/
|
|
332
|
+
*/ notifyCreatedContractClassLog(log, counter) {
|
|
341
333
|
this.contractClassLogs.push(new CountedContractClassLog(log, counter));
|
|
342
334
|
const text = log.toBuffer().toString('hex');
|
|
343
|
-
this.
|
|
335
|
+
this.logger.verbose(`Emitted log from ContractClassRegistry: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`);
|
|
344
336
|
}
|
|
345
337
|
#checkValidStaticCall(childExecutionResult) {
|
|
346
338
|
if (childExecutionResult.publicInputs.noteHashes.claimedLength > 0 || childExecutionResult.publicInputs.nullifiers.claimedLength > 0 || childExecutionResult.publicInputs.l2ToL1Msgs.claimedLength > 0 || childExecutionResult.publicInputs.privateLogs.claimedLength > 0 || childExecutionResult.publicInputs.contractClassLogsHashes.claimedLength > 0) {
|
|
@@ -355,14 +347,14 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
355
347
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
356
348
|
* @param isStaticCall - Whether the call is a static call.
|
|
357
349
|
* @returns The execution result.
|
|
358
|
-
*/ async
|
|
350
|
+
*/ async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
359
351
|
if (!this.simulator) {
|
|
360
352
|
// In practice it is only when creating inline private contexts in a Noir test using TXE that we create an
|
|
361
353
|
// instance of this class without a simulator.
|
|
362
354
|
throw new Error('No simulator provided, cannot perform a nested private call');
|
|
363
355
|
}
|
|
364
356
|
const simulatorSetupTimer = new Timer();
|
|
365
|
-
this.
|
|
357
|
+
this.logger.debug(`Calling private function ${targetContractAddress}:${functionSelector} from ${this.callContext.contractAddress}`);
|
|
366
358
|
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
367
359
|
await this.contractSyncService.ensureContractSynced(targetContractAddress, functionSelector, this.utilityExecutor, this.anchorBlockHeader, this.jobId, this.scopes);
|
|
368
360
|
const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(targetContractAddress, functionSelector);
|
|
@@ -389,11 +381,12 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
389
381
|
senderAddressBookStore: this.senderAddressBookStore,
|
|
390
382
|
capsuleStore: this.capsuleStore,
|
|
391
383
|
privateEventStore: this.privateEventStore,
|
|
384
|
+
messageContextService: this.messageContextService,
|
|
392
385
|
contractSyncService: this.contractSyncService,
|
|
393
386
|
jobId: this.jobId,
|
|
394
387
|
totalPublicCalldataCount: this.totalPublicCalldataCount,
|
|
395
388
|
sideEffectCounter,
|
|
396
|
-
log: this.
|
|
389
|
+
log: this.logger,
|
|
397
390
|
scopes: this.scopes,
|
|
398
391
|
senderForTags: this.senderForTags,
|
|
399
392
|
simulator: this.simulator
|
|
@@ -414,7 +407,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
414
407
|
returnsHash: publicInputs.returnsHash
|
|
415
408
|
};
|
|
416
409
|
}
|
|
417
|
-
|
|
410
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */ validatePublicCalldata(calldataHash) {
|
|
418
411
|
const calldata = this.executionCache.getPreimage(calldataHash);
|
|
419
412
|
if (!calldata) {
|
|
420
413
|
throw new Error('Calldata for public call not found in cache');
|
|
@@ -423,31 +416,12 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
423
416
|
if (this.totalPublicCalldataCount > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
|
|
424
417
|
throw new Error(`Too many total args to all enqueued public calls! (> ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS})`);
|
|
425
418
|
}
|
|
426
|
-
}
|
|
427
|
-
/**
|
|
428
|
-
* Verify relevant information when a public function is enqueued.
|
|
429
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
430
|
-
* @param calldataHash - The hash of the function selector and arguments.
|
|
431
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
432
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
433
|
-
*/ privateNotifyEnqueuedPublicFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
434
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
435
419
|
return Promise.resolve();
|
|
436
420
|
}
|
|
437
|
-
|
|
438
|
-
* Verify relevant information when a public teardown function is set.
|
|
439
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
440
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
441
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
442
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
443
|
-
*/ privateNotifySetPublicTeardownFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
444
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
445
|
-
return Promise.resolve();
|
|
446
|
-
}
|
|
447
|
-
privateNotifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter) {
|
|
421
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter) {
|
|
448
422
|
return this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
|
|
449
423
|
}
|
|
450
|
-
|
|
424
|
+
inRevertiblePhase(sideEffectCounter) {
|
|
451
425
|
return Promise.resolve(this.noteCache.isSideEffectCounterRevertible(sideEffectCounter));
|
|
452
426
|
}
|
|
453
427
|
/**
|
|
@@ -462,10 +436,4 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
462
436
|
getDebugFunctionName() {
|
|
463
437
|
return this.contractStore.getDebugFunctionName(this.contractAddress, this.callContext.functionSelector);
|
|
464
438
|
}
|
|
465
|
-
utilityEmitOffchainEffect(data) {
|
|
466
|
-
this.offchainEffects.push({
|
|
467
|
-
data
|
|
468
|
-
});
|
|
469
|
-
return Promise.resolve();
|
|
470
|
-
}
|
|
471
439
|
}
|