@aztec/simulator 0.69.1-devnet → 0.70.0
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/acvm/acvm.d.ts +1 -2
- package/dest/acvm/acvm.d.ts.map +1 -1
- package/dest/acvm/index.d.ts +1 -1
- package/dest/acvm/index.d.ts.map +1 -1
- package/dest/acvm/index.js +2 -2
- package/dest/acvm/oracle/oracle.d.ts +4 -4
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +14 -14
- package/dest/acvm/oracle/typed_oracle.d.ts +6 -16
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +10 -20
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +7 -2
- package/dest/avm/fixtures/index.d.ts +1 -1
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +2 -2
- package/dest/avm/journal/nullifiers.d.ts +1 -1
- package/dest/avm/journal/nullifiers.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.d.ts +1 -1
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/client/client_execution_context.d.ts +29 -18
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +42 -29
- package/dest/client/execution_note_cache.d.ts +27 -4
- package/dest/client/execution_note_cache.d.ts.map +1 -1
- package/dest/client/execution_note_cache.js +62 -12
- package/dest/client/index.d.ts +11 -3
- package/dest/client/index.d.ts.map +1 -1
- package/dest/client/index.js +11 -4
- package/dest/client/private_execution.d.ts +3 -2
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +9 -7
- package/dest/client/simulator.d.ts +4 -2
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +13 -8
- package/dest/client/unconstrained_execution.d.ts +2 -1
- package/dest/client/unconstrained_execution.d.ts.map +1 -1
- package/dest/client/unconstrained_execution.js +6 -4
- package/dest/client/view_data_oracle.d.ts +1 -1
- package/dest/common/hashed_values_cache.d.ts +28 -0
- package/dest/common/hashed_values_cache.d.ts.map +1 -0
- package/dest/common/{packed_values_cache.js → hashed_values_cache.js} +22 -22
- package/dest/common/index.d.ts +1 -1
- package/dest/common/index.js +1 -1
- package/dest/common/message_load_oracle_inputs.d.ts +15 -0
- package/dest/common/message_load_oracle_inputs.d.ts.map +1 -0
- package/dest/common/message_load_oracle_inputs.js +15 -0
- package/dest/common/simulation_provider.d.ts +19 -0
- package/dest/common/simulation_provider.d.ts.map +1 -0
- package/dest/common/simulation_provider.js +27 -0
- package/dest/common.d.ts +2 -0
- package/dest/common.d.ts.map +1 -0
- package/dest/common.js +2 -0
- package/dest/providers/acvm_native.d.ts +5 -2
- package/dest/providers/acvm_native.d.ts.map +1 -1
- package/dest/providers/acvm_native.js +5 -2
- package/dest/providers/acvm_wasm.d.ts +8 -2
- package/dest/providers/acvm_wasm.d.ts.map +1 -1
- package/dest/providers/acvm_wasm.js +31 -5
- package/dest/providers/acvm_wasm_with_blobs.d.ts +14 -2
- package/dest/providers/acvm_wasm_with_blobs.d.ts.map +1 -1
- package/dest/providers/acvm_wasm_with_blobs.js +24 -4
- package/dest/providers/factory.d.ts +1 -1
- package/dest/providers/factory.d.ts.map +1 -1
- package/dest/providers/factory.js +1 -1
- package/dest/providers/index.d.ts +1 -1
- package/dest/providers/index.d.ts.map +1 -1
- package/dest/providers/index.js +2 -2
- package/dest/public/db_interfaces.d.ts +1 -1
- package/dest/public/db_interfaces.d.ts.map +1 -1
- package/dest/public/fixtures/index.d.ts +3 -3
- package/dest/public/fixtures/index.d.ts.map +1 -1
- package/dest/public/fixtures/index.js +48 -18
- package/dest/public/public_db_sources.d.ts +2 -1
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +2 -2
- package/dest/public/public_tx_simulator.js +2 -2
- package/{src/index.ts → dest/server.d.ts} +1 -2
- package/dest/server.d.ts.map +1 -0
- package/dest/server.js +6 -0
- package/package.json +11 -12
- package/src/acvm/acvm.ts +1 -1
- package/src/acvm/index.ts +1 -1
- package/src/acvm/oracle/oracle.ts +14 -14
- package/src/acvm/oracle/typed_oracle.ts +12 -20
- package/src/avm/avm_simulator.ts +6 -1
- package/src/avm/fixtures/index.ts +2 -1
- package/src/avm/journal/nullifiers.ts +1 -1
- package/src/avm/journal/public_storage.ts +1 -1
- package/src/client/client_execution_context.ts +47 -30
- package/src/client/execution_note_cache.ts +67 -14
- package/src/client/index.ts +11 -3
- package/src/client/private_execution.ts +21 -17
- package/src/client/simulator.ts +20 -7
- package/src/client/unconstrained_execution.ts +17 -13
- package/src/common/hashed_values_cache.ts +55 -0
- package/src/common/index.ts +1 -1
- package/src/common/message_load_oracle_inputs.ts +15 -0
- package/src/common/simulation_provider.ts +45 -0
- package/src/common.ts +1 -0
- package/src/providers/acvm_native.ts +12 -2
- package/src/providers/acvm_wasm.ts +36 -9
- package/src/providers/acvm_wasm_with_blobs.ts +34 -9
- package/src/providers/factory.ts +1 -1
- package/src/providers/index.ts +1 -1
- package/src/public/db_interfaces.ts +1 -1
- package/src/public/fixtures/index.ts +62 -26
- package/src/public/public_db_sources.ts +3 -6
- package/src/public/public_tx_simulator.ts +1 -1
- package/{dest/index.d.ts → src/server.ts} +0 -3
- package/dest/common/packed_values_cache.d.ts +0 -28
- package/dest/common/packed_values_cache.d.ts.map +0 -1
- package/dest/index.d.ts.map +0 -1
- package/dest/index.js +0 -8
- package/dest/providers/simulation_provider.d.ts +0 -9
- package/dest/providers/simulation_provider.d.ts.map +0 -1
- package/dest/providers/simulation_provider.js +0 -2
- package/src/common/packed_values_cache.ts +0 -55
- package/src/providers/simulation_provider.ts +0 -10
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { type AuthWitness, type AztecNode, CountedContractClassLog, CountedPublicExecutionRequest, NoteAndSlot, type NoteStatus, type
|
|
1
|
+
import { type AuthWitness, type AztecNode, CountedContractClassLog, CountedPublicExecutionRequest, NoteAndSlot, type NoteStatus, type PrivateCallExecutionResult, PublicExecutionRequest, type UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
2
|
import { type BlockHeader, CallContext, FunctionSelector, type TxContext } from '@aztec/circuits.js';
|
|
3
3
|
import { type FunctionAbi, type NoteSelector } from '@aztec/foundation/abi';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
6
|
import { type NoteData } from '../acvm/index.js';
|
|
7
|
-
import { type
|
|
7
|
+
import { type HashedValuesCache } from '../common/hashed_values_cache.js';
|
|
8
|
+
import { type SimulationProvider } from '../server.js';
|
|
8
9
|
import { type DBOracle } from './db_oracle.js';
|
|
9
10
|
import { type ExecutionNoteCache } from './execution_note_cache.js';
|
|
10
11
|
import { ViewDataOracle } from './view_data_oracle.js';
|
|
@@ -18,9 +19,10 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
18
19
|
private readonly callContext;
|
|
19
20
|
/** Header of a block whose state is used during private execution (not the block the transaction is included in). */
|
|
20
21
|
protected readonly historicalHeader: BlockHeader;
|
|
21
|
-
private readonly
|
|
22
|
+
private readonly executionCache;
|
|
22
23
|
private readonly noteCache;
|
|
23
24
|
private node;
|
|
25
|
+
private provider;
|
|
24
26
|
protected sideEffectCounter: number;
|
|
25
27
|
/**
|
|
26
28
|
* New notes created during this execution.
|
|
@@ -49,7 +51,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
49
51
|
/** Header of a block whose state is used during private execution (not the block the transaction is included in). */
|
|
50
52
|
historicalHeader: BlockHeader,
|
|
51
53
|
/** List of transient auth witnesses to be used during this simulation */
|
|
52
|
-
authWitnesses: AuthWitness[],
|
|
54
|
+
authWitnesses: AuthWitness[], executionCache: HashedValuesCache, noteCache: ExecutionNoteCache, db: DBOracle, node: AztecNode, provider: SimulationProvider, sideEffectCounter?: number, log?: import("@aztec/foundation/log").Logger, scopes?: AztecAddress[]);
|
|
53
55
|
/**
|
|
54
56
|
* Writes the function inputs to the initial witness.
|
|
55
57
|
* @param abi - The function ABI.
|
|
@@ -73,7 +75,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
73
75
|
/**
|
|
74
76
|
* Return the nested execution results during this execution.
|
|
75
77
|
*/
|
|
76
|
-
getNestedExecutions():
|
|
78
|
+
getNestedExecutions(): PrivateCallExecutionResult[];
|
|
77
79
|
/**
|
|
78
80
|
* Return the enqueued public function calls during this execution.
|
|
79
81
|
*/
|
|
@@ -83,20 +85,22 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
83
85
|
*/
|
|
84
86
|
getPublicTeardownFunctionCall(): PublicExecutionRequest;
|
|
85
87
|
/**
|
|
86
|
-
*
|
|
87
|
-
* @param
|
|
88
|
+
* Store values in the execution cache.
|
|
89
|
+
* @param values - Values to store.
|
|
88
90
|
*/
|
|
89
|
-
|
|
91
|
+
storeArrayInExecutionCache(args: Fr[]): Promise<Fr>;
|
|
90
92
|
/**
|
|
91
|
-
*
|
|
92
|
-
* @param
|
|
93
|
+
* Store values in the execution cache.
|
|
94
|
+
* @param values - Values to store.
|
|
95
|
+
* @returns The hash of the values.
|
|
93
96
|
*/
|
|
94
|
-
|
|
97
|
+
storeInExecutionCache(values: Fr[]): Promise<Fr>;
|
|
95
98
|
/**
|
|
96
|
-
*
|
|
97
|
-
* @param
|
|
99
|
+
* Gets values from the execution cache.
|
|
100
|
+
* @param hash - Hash of the values.
|
|
101
|
+
* @returns The values.
|
|
98
102
|
*/
|
|
99
|
-
|
|
103
|
+
loadFromExecutionCache(hash: Fr): Promise<Fr[]>;
|
|
100
104
|
/**
|
|
101
105
|
* Gets some notes for a storage slot.
|
|
102
106
|
*
|
|
@@ -136,6 +140,13 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
136
140
|
* @param noteHash - A hash of the new note.
|
|
137
141
|
*/
|
|
138
142
|
notifyNullifiedNote(innerNullifier: Fr, noteHash: Fr, counter: number): Promise<void>;
|
|
143
|
+
/**
|
|
144
|
+
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
145
|
+
* within the current transaction/execution.
|
|
146
|
+
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
147
|
+
* @param noteHash - A hash of the new note.
|
|
148
|
+
*/
|
|
149
|
+
notifyCreatedNullifier(innerNullifier: Fr): Promise<void>;
|
|
139
150
|
/**
|
|
140
151
|
* Emit a contract class unencrypted log.
|
|
141
152
|
* This fn exists because sha hashing the preimage
|
|
@@ -148,7 +159,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
148
159
|
* Calls a private function as a nested execution.
|
|
149
160
|
* @param targetContractAddress - The address of the contract to call.
|
|
150
161
|
* @param functionSelector - The function selector of the function to call.
|
|
151
|
-
* @param argsHash - The
|
|
162
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
152
163
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
153
164
|
* @param isStaticCall - Whether the call is a static call.
|
|
154
165
|
* @returns The execution result.
|
|
@@ -161,7 +172,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
161
172
|
* Creates a PublicExecutionRequest object representing the request to call a public function.
|
|
162
173
|
* @param targetContractAddress - The address of the contract to call.
|
|
163
174
|
* @param functionSelector - The function selector of the function to call.
|
|
164
|
-
* @param argsHash - The
|
|
175
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
165
176
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
166
177
|
* @param isStaticCall - Whether the call is a static call.
|
|
167
178
|
* @returns The public call stack item with the request information.
|
|
@@ -173,7 +184,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
173
184
|
* of the execution are empty.
|
|
174
185
|
* @param targetContractAddress - The address of the contract to call.
|
|
175
186
|
* @param functionSelector - The function selector of the function to call.
|
|
176
|
-
* @param argsHash - The
|
|
187
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
177
188
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
178
189
|
* @param isStaticCall - Whether the call is a static call.
|
|
179
190
|
* @returns The public call stack item with the request information.
|
|
@@ -185,7 +196,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
185
196
|
* of the execution are empty.
|
|
186
197
|
* @param targetContractAddress - The address of the contract to call.
|
|
187
198
|
* @param functionSelector - The function selector of the function to call.
|
|
188
|
-
* @param argsHash - The
|
|
199
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
189
200
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
190
201
|
* @param isStaticCall - Whether the call is a static call.
|
|
191
202
|
* @returns The public call stack item with the request information.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_execution_context.d.ts","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,uBAAuB,EACvB,6BAA6B,EAE7B,WAAW,EACX,KAAK,UAAU,EACf,KAAK,
|
|
1
|
+
{"version":3,"file":"client_execution_context.d.ts","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,16 +19,17 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
19
19
|
/** Header of a block whose state is used during private execution (not the block the transaction is included in). */
|
|
20
20
|
historicalHeader,
|
|
21
21
|
/** List of transient auth witnesses to be used during this simulation */
|
|
22
|
-
authWitnesses,
|
|
22
|
+
authWitnesses, executionCache, noteCache, db, node, provider, sideEffectCounter = 0, log = createLogger('simulator:client_execution_context'), scopes) {
|
|
23
23
|
super(callContext.contractAddress, authWitnesses, db, node, log, scopes);
|
|
24
24
|
_ClientExecutionContext_instances.add(this);
|
|
25
25
|
this.argsHash = argsHash;
|
|
26
26
|
this.txContext = txContext;
|
|
27
27
|
this.callContext = callContext;
|
|
28
28
|
this.historicalHeader = historicalHeader;
|
|
29
|
-
this.
|
|
29
|
+
this.executionCache = executionCache;
|
|
30
30
|
this.noteCache = noteCache;
|
|
31
31
|
this.node = node;
|
|
32
|
+
this.provider = provider;
|
|
32
33
|
this.sideEffectCounter = sideEffectCounter;
|
|
33
34
|
/**
|
|
34
35
|
* New notes created during this execution.
|
|
@@ -63,7 +64,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
63
64
|
*/
|
|
64
65
|
getInitialWitness(abi) {
|
|
65
66
|
const argumentsSize = countArgumentsSize(abi);
|
|
66
|
-
const args = this.
|
|
67
|
+
const args = this.executionCache.getPreimage(this.argsHash);
|
|
67
68
|
if (args.length !== argumentsSize) {
|
|
68
69
|
throw new Error('Invalid arguments size');
|
|
69
70
|
}
|
|
@@ -116,25 +117,27 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
116
117
|
return this.publicTeardownFunctionCall;
|
|
117
118
|
}
|
|
118
119
|
/**
|
|
119
|
-
*
|
|
120
|
-
* @param
|
|
120
|
+
* Store values in the execution cache.
|
|
121
|
+
* @param values - Values to store.
|
|
121
122
|
*/
|
|
122
|
-
|
|
123
|
-
return Promise.resolve(this.
|
|
123
|
+
storeArrayInExecutionCache(args) {
|
|
124
|
+
return Promise.resolve(this.executionCache.store(args));
|
|
124
125
|
}
|
|
125
126
|
/**
|
|
126
|
-
*
|
|
127
|
-
* @param
|
|
127
|
+
* Store values in the execution cache.
|
|
128
|
+
* @param values - Values to store.
|
|
129
|
+
* @returns The hash of the values.
|
|
128
130
|
*/
|
|
129
|
-
|
|
130
|
-
return Promise.resolve(this.
|
|
131
|
+
storeInExecutionCache(values) {
|
|
132
|
+
return Promise.resolve(this.executionCache.store(values));
|
|
131
133
|
}
|
|
132
134
|
/**
|
|
133
|
-
*
|
|
134
|
-
* @param
|
|
135
|
+
* Gets values from the execution cache.
|
|
136
|
+
* @param hash - Hash of the values.
|
|
137
|
+
* @returns The values.
|
|
135
138
|
*/
|
|
136
|
-
|
|
137
|
-
return Promise.resolve(this.
|
|
139
|
+
loadFromExecutionCache(hash) {
|
|
140
|
+
return Promise.resolve(this.executionCache.getPreimage(hash));
|
|
138
141
|
}
|
|
139
142
|
/**
|
|
140
143
|
* Gets some notes for a storage slot.
|
|
@@ -222,6 +225,16 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
222
225
|
}
|
|
223
226
|
return Promise.resolve();
|
|
224
227
|
}
|
|
228
|
+
/**
|
|
229
|
+
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
230
|
+
* within the current transaction/execution.
|
|
231
|
+
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
232
|
+
* @param noteHash - A hash of the new note.
|
|
233
|
+
*/
|
|
234
|
+
notifyCreatedNullifier(innerNullifier) {
|
|
235
|
+
this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
|
|
236
|
+
return Promise.resolve();
|
|
237
|
+
}
|
|
225
238
|
/**
|
|
226
239
|
* Emit a contract class unencrypted log.
|
|
227
240
|
* This fn exists because sha hashing the preimage
|
|
@@ -239,7 +252,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
239
252
|
* Calls a private function as a nested execution.
|
|
240
253
|
* @param targetContractAddress - The address of the contract to call.
|
|
241
254
|
* @param functionSelector - The function selector of the function to call.
|
|
242
|
-
* @param argsHash - The
|
|
255
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
243
256
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
244
257
|
* @param isStaticCall - Whether the call is a static call.
|
|
245
258
|
* @returns The execution result.
|
|
@@ -250,8 +263,8 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
250
263
|
const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
|
|
251
264
|
const derivedTxContext = this.txContext.clone();
|
|
252
265
|
const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
|
|
253
|
-
const context = new ClientExecutionContext(argsHash, derivedTxContext, derivedCallContext, this.historicalHeader, this.authWitnesses, this.
|
|
254
|
-
const childExecutionResult = await executePrivateFunction(context, targetArtifact, targetContractAddress, functionSelector);
|
|
266
|
+
const context = new ClientExecutionContext(argsHash, derivedTxContext, derivedCallContext, this.historicalHeader, this.authWitnesses, this.executionCache, this.noteCache, this.db, this.node, this.provider, sideEffectCounter, this.log, this.scopes);
|
|
267
|
+
const childExecutionResult = await executePrivateFunction(this.provider, context, targetArtifact, targetContractAddress, functionSelector);
|
|
255
268
|
if (isStaticCall) {
|
|
256
269
|
__classPrivateFieldGet(this, _ClientExecutionContext_instances, "m", _ClientExecutionContext_checkValidStaticCall).call(this, childExecutionResult);
|
|
257
270
|
}
|
|
@@ -266,7 +279,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
266
279
|
* Creates a PublicExecutionRequest object representing the request to call a public function.
|
|
267
280
|
* @param targetContractAddress - The address of the contract to call.
|
|
268
281
|
* @param functionSelector - The function selector of the function to call.
|
|
269
|
-
* @param argsHash - The
|
|
282
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
270
283
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
271
284
|
* @param isStaticCall - Whether the call is a static call.
|
|
272
285
|
* @returns The public call stack item with the request information.
|
|
@@ -274,7 +287,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
274
287
|
async createPublicExecutionRequest(callType, targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
275
288
|
const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
|
|
276
289
|
const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
|
|
277
|
-
const args = this.
|
|
290
|
+
const args = this.executionCache.getPreimage(argsHash);
|
|
278
291
|
this.log.verbose(`Created ${callType} public execution request to ${targetArtifact.name}@${targetContractAddress}`, {
|
|
279
292
|
sideEffectCounter,
|
|
280
293
|
isStaticCall,
|
|
@@ -299,7 +312,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
299
312
|
* of the execution are empty.
|
|
300
313
|
* @param targetContractAddress - The address of the contract to call.
|
|
301
314
|
* @param functionSelector - The function selector of the function to call.
|
|
302
|
-
* @param argsHash - The
|
|
315
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
303
316
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
304
317
|
* @param isStaticCall - Whether the call is a static call.
|
|
305
318
|
* @returns The public call stack item with the request information.
|
|
@@ -307,13 +320,13 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
307
320
|
async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
308
321
|
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
|
|
309
322
|
// WARNING: This is insecure and should be temporary!
|
|
310
|
-
// The oracle
|
|
323
|
+
// The oracle re-hashes the arguments and returns a new args_hash.
|
|
311
324
|
// new_args = [selector, ...old_args], so as to make it suitable to call the public dispatch function.
|
|
312
325
|
// We don't validate or compute it in the circuit because a) it's harder to do with slices, and
|
|
313
326
|
// b) this is only temporary.
|
|
314
|
-
const newArgsHash = this.
|
|
327
|
+
const newArgsHash = this.executionCache.store([
|
|
315
328
|
functionSelector.toField(),
|
|
316
|
-
...this.
|
|
329
|
+
...this.executionCache.getPreimage(argsHash),
|
|
317
330
|
]);
|
|
318
331
|
await this.createPublicExecutionRequest('enqueued', targetContractAddress, FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)), newArgsHash, sideEffectCounter, isStaticCall);
|
|
319
332
|
return newArgsHash;
|
|
@@ -324,7 +337,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
324
337
|
* of the execution are empty.
|
|
325
338
|
* @param targetContractAddress - The address of the contract to call.
|
|
326
339
|
* @param functionSelector - The function selector of the function to call.
|
|
327
|
-
* @param argsHash - The
|
|
340
|
+
* @param argsHash - The arguments hash to pass to the function.
|
|
328
341
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
329
342
|
* @param isStaticCall - Whether the call is a static call.
|
|
330
343
|
* @returns The public call stack item with the request information.
|
|
@@ -332,13 +345,13 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
332
345
|
async setPublicTeardownFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
333
346
|
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
|
|
334
347
|
// WARNING: This is insecure and should be temporary!
|
|
335
|
-
// The oracle
|
|
348
|
+
// The oracle rehashes the arguments and returns a new args_hash.
|
|
336
349
|
// new_args = [selector, ...old_args], so as to make it suitable to call the public dispatch function.
|
|
337
350
|
// We don't validate or compute it in the circuit because a) it's harder to do with slices, and
|
|
338
351
|
// b) this is only temporary.
|
|
339
|
-
const newArgsHash = this.
|
|
352
|
+
const newArgsHash = this.executionCache.store([
|
|
340
353
|
functionSelector.toField(),
|
|
341
|
-
...this.
|
|
354
|
+
...this.executionCache.getPreimage(argsHash),
|
|
342
355
|
]);
|
|
343
356
|
await this.createPublicExecutionRequest('teardown', targetContractAddress, FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)), newArgsHash, sideEffectCounter, isStaticCall);
|
|
344
357
|
return newArgsHash;
|
|
@@ -379,4 +392,4 @@ _ClientExecutionContext_instances = new WeakSet(), _ClientExecutionContext_check
|
|
|
379
392
|
throw new Error(`Static call cannot update the state, emit L2->L1 messages or generate logs`);
|
|
380
393
|
}
|
|
381
394
|
};
|
|
382
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":";;AAAA,OAAO,EAGL,uBAAuB,EACvB,6BAA6B,EAC7B,IAAI,EACJ,WAAW,EAGX,sBAAsB,GAEvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,WAAW,EACX,gBAAgB,EAChB,6BAA6B,EAC7B,wBAAwB,EACxB,oBAAoB,GAErB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAA8D,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACvH,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAiB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIhE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;GAEG;AACH,MAAM,OAAO,sBAAuB,SAAQ,cAAc;IAyBxD,YACmB,QAAY,EACZ,SAAoB,EACpB,WAAwB;IACzC,qHAAqH;IAClG,gBAA6B;IAChD,yEAAyE;IACzE,aAA4B,EACX,iBAAoC,EACpC,SAA6B,EAC9C,EAAY,EACJ,IAAe,EACb,oBAA4B,CAAC,EACvC,GAAG,GAAG,YAAY,CAAC,oCAAoC,CAAC,EACxD,MAAuB;QAEvB,KAAK,CAAC,WAAW,CAAC,eAAe,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;;QAfxD,aAAQ,GAAR,QAAQ,CAAI;QACZ,cAAS,GAAT,SAAS,CAAW;QACpB,gBAAW,GAAX,WAAW,CAAa;QAEtB,qBAAgB,GAAhB,gBAAgB,CAAa;QAG/B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAoB;QAEtC,SAAI,GAAJ,IAAI,CAAW;QACb,sBAAiB,GAAjB,iBAAiB,CAAY;QApCzC;;;;;;WAMG;QACK,aAAQ,GAAkB,EAAE,CAAC;QACrC;;;;;;;;WAQG;QACK,yBAAoB,GAAwB,IAAI,GAAG,EAAE,CAAC;QACtD,gCAA2B,GAAwB,IAAI,GAAG,EAAE,CAAC;QAC7D,sBAAiB,GAA8B,EAAE,CAAC;QAClD,qBAAgB,GAA6B,EAAE,CAAC;QAChD,gCAA2B,GAAoC,EAAE,CAAC;QAClE,+BAA0B,GAA2B,sBAAsB,CAAC,KAAK,EAAE,CAAC;IAmB5F,CAAC;IAED,iGAAiG;IACjG,8FAA8F;IAC9F;;;;OAIG;IACI,iBAAiB,CAAC,GAAgB;QACvC,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE1D,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,CACnD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,iBAAiB,CACvB,CAAC;QACF,MAAM,4BAA4B,GAAG,oBAAoB,CAAC,QAAQ,EAAE,CAAC;QACrE,IAAI,4BAA4B,CAAC,MAAM,KAAK,6BAA6B,EAAE,CAAC;YAC1E,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,GAAG,4BAA4B,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1D,OAAO,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,uBAAuB;QAC5B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACnC,CAAC;IAED;;OAEG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,8BAA8B;QACnC,OAAO,IAAI,CAAC,2BAA2B,CAAC;IAC1C,CAAC;IAED;;OAEG;IACI,oBAAoB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;OAEG;IACI,mBAAmB;QACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;OAEG;IACI,8BAA8B;QACnC,OAAO,IAAI,CAAC,2BAA2B,CAAC;IAC1C,CAAC;IAED;;OAEG;IACI,6BAA6B;QAClC,OAAO,IAAI,CAAC,0BAA0B,CAAC;IACzC,CAAC;IAED;;;OAGG;IACa,kBAAkB,CAAC,IAAU;QAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;OAGG;IACa,WAAW,CAAC,OAAa;QACvC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACa,aAAa,CAAC,WAAe;QAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IACrE,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACa,KAAK,CAAC,QAAQ,CAC5B,WAAe,EACf,UAAkB,EAClB,eAAyB,EACzB,eAAyB,EACzB,eAAyB,EACzB,YAAkB,EAClB,iBAA2B,EAC3B,aAAuB,EACvB,aAAuB,EACvB,aAAuB,EACvB,SAAmB,EACnB,KAAa,EACb,MAAc,EACd,MAAkB;QAElB,6DAA6D;QAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QAE5F,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACzF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3G,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAE,CAAC,CAAC,eAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;QAErG,MAAM,KAAK,GAAG,SAAS,CAAW,CAAC,GAAG,eAAe,EAAE,GAAG,YAAY,CAAC,EAAE;YACvE,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC/D,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE;gBAC3E,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC;gBACtB,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;aACjC,CAAC,CAAC;YACH,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACtC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE;gBACvE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;aACpB,CAAC,CAAC;YACH,KAAK;YACL,MAAM;SACP,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,aAAa,KAAK,CAAC,MAAM,cAAc,IAAI,CAAC,WAAW,CAAC,eAAe,OAAO,WAAW,KAAK,KAAK;aAChG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;aACpF,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;QAEF,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAChB,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACnE,MAAM,cAAc,GAAG,qBAAqB,CAAC,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;gBAEtE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;;OASG;IACa,iBAAiB,CAC/B,WAAe,EACf,UAAwB,EACxB,SAAe,EACf,QAAY,EACZ,OAAe;QAEf,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,UAAU,CACvB;YACE,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,eAAe;YACjD,WAAW;YACX,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,kDAAkD;YAClE,IAAI;YACJ,eAAe,EAAE,SAAS,EAAE,2DAA2D;YACvF,QAAQ;SACT,EACD,OAAO,CACR,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IACrE,CAAC;IAED;;;;;OAKG;IACa,mBAAmB,CAAC,cAAkB,EAAE,QAAY,EAAE,OAAe;QACnF,MAAM,wBAAwB,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CACzD,IAAI,CAAC,WAAW,CAAC,eAAe,EAChC,cAAc,EACd,QAAQ,CACT,CAAC;QACF,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;;;;OAMG;IACa,oBAAoB,CAAC,GAAqB,EAAE,OAAe;QACzE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,8CAA8C,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CACvG,CAAC;QACF,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;IAcD;;;;;;;;OAQG;IACM,KAAK,CAAC,mBAAmB,CAChC,qBAAmC,EACnC,gBAAkC,EAClC,QAAY,EACZ,iBAAyB,EACzB,YAAqB;QAErB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4BAA4B,IAAI,CAAC,eAAe,IAAI,gBAAgB,SAAS,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAChH,CAAC;QAEF,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;QAE7D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;QAElG,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAEhD,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAEvG,MAAM,OAAO,GAAG,IAAI,sBAAsB,CACxC,QAAQ,EACR,gBAAgB,EAChB,kBAAkB,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,IAAI,EACT,iBAAiB,EACjB,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,MAAM,CACZ,CAAC;QAEF,MAAM,oBAAoB,GAAG,MAAM,sBAAsB,CACvD,OAAO,EACP,cAAc,EACd,qBAAqB,EACrB,gBAAgB,CACjB,CAAC;QAEF,IAAI,YAAY,EAAE,CAAC;YACjB,uBAAA,IAAI,uFAAsB,MAA1B,IAAI,EAAuB,oBAAoB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEjD,MAAM,YAAY,GAAG,oBAAoB,CAAC,YAAY,CAAC;QACvD,OAAO;YACL,oBAAoB,EAAE,YAAY,CAAC,oBAAoB;YACvD,WAAW,EAAE,YAAY,CAAC,WAAW;SACtC,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACO,KAAK,CAAC,4BAA4B,CAC1C,QAAiC,EACjC,qBAAmC,EACnC,gBAAkC,EAClC,QAAY,EACZ,iBAAyB,EACzB,YAAqB;QAErB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;QAClG,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QACvG,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,WAAW,QAAQ,gCAAgC,cAAc,CAAC,IAAI,IAAI,qBAAqB,EAAE,EACjG;YACE,iBAAiB;YACjB,YAAY;YACZ,gBAAgB;YAChB,qBAAqB;YACrB,QAAQ;SACT,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,sBAAsB,CAAC,IAAI,CAAC;YAC1C,IAAI;YACJ,WAAW,EAAE,kBAAkB;SAChC,CAAC,CAAC;QAEH,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YAC5B,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,6BAA6B,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACvG,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,0BAA0B,GAAG,OAAO,CAAC;QAC5C,CAAC;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACa,KAAK,CAAC,yBAAyB,CAC7C,qBAAmC,EACnC,gBAAkC,EAClC,QAAY,EACZ,iBAAyB,EACzB,YAAqB;QAErB,+EAA+E;QAC/E,qDAAqD;QACrD,gEAAgE;QAChE,sGAAsG;QACtG,+FAA+F;QAC/F,6BAA6B;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;YAC9C,gBAAgB,CAAC,OAAO,EAAE;YAC1B,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC3C,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,4BAA4B,CACrC,UAAU,EACV,qBAAqB,EACrB,gBAAgB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,wBAAwB,CAAC,CAAC,EAC5D,WAAW,EACX,iBAAiB,EACjB,YAAY,CACb,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;;;;;;;;OAUG;IACa,KAAK,CAAC,6BAA6B,CACjD,qBAAmC,EACnC,gBAAkC,EAClC,QAAY,EACZ,iBAAyB,EACzB,YAAqB;QAErB,+EAA+E;QAC/E,qDAAqD;QACrD,gEAAgE;QAChE,sGAAsG;QACtG,+FAA+F;QAC/F,6BAA6B;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;YAC9C,gBAAgB,CAAC,OAAO,EAAE;YAC1B,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC3C,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,4BAA4B,CACrC,UAAU,EACV,qBAAqB,EACrB,gBAAgB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,wBAAwB,CAAC,CAAC,EAC5D,WAAW,EACX,iBAAiB,EACjB,YAAY,CACb,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;IAEe,uCAAuC,CAAC,8BAAsC;QAC5F,IAAI,CAAC,SAAS,CAAC,iCAAiC,CAAC,8BAA8B,CAAC,CAAC;IACnF,CAAC;IAED;;;;;;OAMG;IACK,iBAAiB,CACvB,qBAAmC,EACnC,cAAgC,EAChC,YAAY,GAAG,KAAK;QAEpB,OAAO,IAAI,WAAW,CACpB,IAAI,CAAC,eAAe,EACpB,qBAAqB,EACrB,gBAAgB,CAAC,qBAAqB,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,EACtF,YAAY,CACb,CAAC;IACJ,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAC/F,CAAC;IAEe,KAAK,CAAC,sCAAsC,CAAC,MAAoB,EAAE,SAAuB;QACxG,MAAM,IAAI,CAAC,EAAE,CAAC,sCAAsC,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAChG,CAAC;IAEe,KAAK,CAAC,SAAS;QAC7B,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CACxD,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,EAC5D,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,qBAAqB,CAAC,OAAO,EAAE,EAAE,CAAC;YACtE,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAClF,CAAC;QAED,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC3D,CAAC;CACF;wJAjPuB,oBAA4C;IAChE,IACE,oBAAoB,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1E,oBAAoB,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1E,oBAAoB,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1E,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3E,oBAAoB,CAAC,YAAY,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EACvF,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;IAChG,CAAC;AACH,CAAC"}
|
|
395
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ interface PendingNote {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare class ExecutionNoteCache {
|
|
13
13
|
#private;
|
|
14
|
-
private readonly
|
|
14
|
+
private readonly txRequestHash;
|
|
15
15
|
/**
|
|
16
16
|
* New notes created in this transaction.
|
|
17
17
|
* They are pushed to this array in the same order as they are emitted.
|
|
@@ -22,15 +22,31 @@ export declare class ExecutionNoteCache {
|
|
|
22
22
|
*/
|
|
23
23
|
private noteMap;
|
|
24
24
|
/**
|
|
25
|
-
*
|
|
26
|
-
* This mapping maps from a contract address to the nullifiers emitted from the contract.
|
|
25
|
+
* This maps from a contract address to the nullifiers emitted from the contract.
|
|
27
26
|
* The note which is nullified might be new or not (i.e., was generated in a previous transaction).
|
|
28
27
|
* Note that their value (bigint representation) is used because Frs cannot be looked up in Sets.
|
|
29
28
|
*/
|
|
30
29
|
private nullifierMap;
|
|
30
|
+
/**
|
|
31
|
+
* All nullifiers emitted in this transaction.
|
|
32
|
+
*/
|
|
33
|
+
private allNullifiers;
|
|
31
34
|
private minRevertibleSideEffectCounter;
|
|
32
|
-
|
|
35
|
+
private inRevertiblePhase;
|
|
36
|
+
/**
|
|
37
|
+
* We don't need to use the tx request hash for nonces if another non revertible nullifier is emitted.
|
|
38
|
+
* In that case we disable injecting the tx request hash as a nullifier.
|
|
39
|
+
*/
|
|
40
|
+
private usedTxRequestHashForNonces;
|
|
41
|
+
constructor(txRequestHash: Fr);
|
|
42
|
+
/**
|
|
43
|
+
* Enters the revertible phase of the transaction.
|
|
44
|
+
* @param minRevertibleSideEffectCounter - The counter at which the transaction enters the revertible phase.
|
|
45
|
+
*/
|
|
33
46
|
setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: number): void;
|
|
47
|
+
finish(): {
|
|
48
|
+
usedTxRequestHashForNonces: boolean;
|
|
49
|
+
};
|
|
34
50
|
/**
|
|
35
51
|
* Add a new note to cache.
|
|
36
52
|
* @param note - New note created during execution.
|
|
@@ -44,6 +60,12 @@ export declare class ExecutionNoteCache {
|
|
|
44
60
|
* transaction (and thus not a new note).
|
|
45
61
|
*/
|
|
46
62
|
nullifyNote(contractAddress: AztecAddress, innerNullifier: Fr, noteHash: Fr): number | undefined;
|
|
63
|
+
/**
|
|
64
|
+
* Adds a nullifier to the cache. Note cache needs to track all nullifiers to decide which nullifier to use for note siloing.
|
|
65
|
+
* @param contractAddress - Contract address that emitted the nullifier.
|
|
66
|
+
* @param innerNullifier
|
|
67
|
+
*/
|
|
68
|
+
nullifierCreated(contractAddress: AztecAddress, innerNullifier: Fr): void;
|
|
47
69
|
/**
|
|
48
70
|
* Return notes created up to current point in execution.
|
|
49
71
|
* If a nullifier for a note in this list is emitted, the note will be deleted.
|
|
@@ -65,6 +87,7 @@ export declare class ExecutionNoteCache {
|
|
|
65
87
|
getNullifiers(contractAddress: AztecAddress): Set<bigint>;
|
|
66
88
|
getAllNotes(): PendingNote[];
|
|
67
89
|
getAllNullifiers(): Fr[];
|
|
90
|
+
recordNullifier(contractAddress: AztecAddress, siloedNullifier: Fr): void;
|
|
68
91
|
}
|
|
69
92
|
export {};
|
|
70
93
|
//# sourceMappingURL=execution_note_cache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution_note_cache.d.ts","sourceRoot":"","sources":["../../src/client/execution_note_cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,UAAU,WAAW;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;;
|
|
1
|
+
{"version":3,"file":"execution_note_cache.d.ts","sourceRoot":"","sources":["../../src/client/execution_note_cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,UAAU,WAAW;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;;IAiCjB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAhC1C;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAqB;IAClC;;OAEG;IACH,OAAO,CAAC,OAAO,CAAyC;IAExD;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAuC;IAE3D;;OAEG;IACH,OAAO,CAAC,aAAa,CAA0B;IAE/C,OAAO,CAAC,8BAA8B,CAAK;IAE3C,OAAO,CAAC,iBAAiB,CAAS;IAElC;;;OAGG;IACH,OAAO,CAAC,0BAA0B,CAAQ;gBAEb,aAAa,EAAE,EAAE;IAE9C;;;OAGG;IACI,iCAAiC,CAAC,8BAA8B,EAAE,MAAM;IAmCxE,MAAM;;;IAWb;;;OAGG;IACI,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;IAWjD;;;;;;OAMG;IACI,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;IA2BlF;;;;OAIG;IACI,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;IAKzE;;;;;QAKI;IACG,QAAQ,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE;IAK9D;;;;;QAKI;IACG,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE;IAKlE;;;OAGG;IACI,aAAa,CAAC,eAAe,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;IAYhE,WAAW,IAAI,WAAW,EAAE;IAI5B,gBAAgB,IAAI,EAAE,EAAE;IAIxB,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,EAAE;CAMnE"}
|
|
@@ -6,9 +6,9 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
6
6
|
* Data that's accessible by all the function calls in an execution.
|
|
7
7
|
*/
|
|
8
8
|
export class ExecutionNoteCache {
|
|
9
|
-
constructor(
|
|
9
|
+
constructor(txRequestHash) {
|
|
10
10
|
_ExecutionNoteCache_instances.add(this);
|
|
11
|
-
this.
|
|
11
|
+
this.txRequestHash = txRequestHash;
|
|
12
12
|
/**
|
|
13
13
|
* New notes created in this transaction.
|
|
14
14
|
* They are pushed to this array in the same order as they are emitted.
|
|
@@ -19,25 +19,45 @@ export class ExecutionNoteCache {
|
|
|
19
19
|
*/
|
|
20
20
|
this.noteMap = new Map();
|
|
21
21
|
/**
|
|
22
|
-
*
|
|
23
|
-
* This mapping maps from a contract address to the nullifiers emitted from the contract.
|
|
22
|
+
* This maps from a contract address to the nullifiers emitted from the contract.
|
|
24
23
|
* The note which is nullified might be new or not (i.e., was generated in a previous transaction).
|
|
25
24
|
* Note that their value (bigint representation) is used because Frs cannot be looked up in Sets.
|
|
26
25
|
*/
|
|
27
26
|
this.nullifierMap = new Map();
|
|
27
|
+
/**
|
|
28
|
+
* All nullifiers emitted in this transaction.
|
|
29
|
+
*/
|
|
30
|
+
this.allNullifiers = new Set();
|
|
28
31
|
this.minRevertibleSideEffectCounter = 0;
|
|
32
|
+
this.inRevertiblePhase = false;
|
|
33
|
+
/**
|
|
34
|
+
* We don't need to use the tx request hash for nonces if another non revertible nullifier is emitted.
|
|
35
|
+
* In that case we disable injecting the tx request hash as a nullifier.
|
|
36
|
+
*/
|
|
37
|
+
this.usedTxRequestHashForNonces = true;
|
|
29
38
|
}
|
|
39
|
+
/**
|
|
40
|
+
* Enters the revertible phase of the transaction.
|
|
41
|
+
* @param minRevertibleSideEffectCounter - The counter at which the transaction enters the revertible phase.
|
|
42
|
+
*/
|
|
30
43
|
setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter) {
|
|
31
|
-
if (this.
|
|
32
|
-
throw new Error(`Cannot
|
|
44
|
+
if (this.inRevertiblePhase) {
|
|
45
|
+
throw new Error(`Cannot enter the revertible phase twice. Current counter: ${minRevertibleSideEffectCounter}. Previous enter counter: ${this.minRevertibleSideEffectCounter}`);
|
|
33
46
|
}
|
|
47
|
+
this.inRevertiblePhase = true;
|
|
34
48
|
this.minRevertibleSideEffectCounter = minRevertibleSideEffectCounter;
|
|
49
|
+
let nonceGenerator = this.txRequestHash;
|
|
50
|
+
const nullifiers = this.getAllNullifiers();
|
|
51
|
+
if (nullifiers.length > 0) {
|
|
52
|
+
nonceGenerator = new Fr(nullifiers[0]);
|
|
53
|
+
this.usedTxRequestHashForNonces = false;
|
|
54
|
+
}
|
|
35
55
|
// The existing pending notes are all non-revertible.
|
|
36
56
|
// They cannot be squashed by nullifiers emitted after minRevertibleSideEffectCounter is set.
|
|
37
57
|
// Their indexes in the tx are known at this point and won't change. So we can assign a nonce to each one of them.
|
|
38
58
|
// The nonces will be used to create the "complete" nullifier.
|
|
39
59
|
const updatedNotes = this.notes.map(({ note, counter }, i) => {
|
|
40
|
-
const nonce = computeNoteHashNonce(
|
|
60
|
+
const nonce = computeNoteHashNonce(nonceGenerator, i);
|
|
41
61
|
const uniqueNoteHash = computeUniqueNoteHash(nonce, siloNoteHash(note.contractAddress, note.noteHash));
|
|
42
62
|
return {
|
|
43
63
|
counter,
|
|
@@ -50,6 +70,16 @@ export class ExecutionNoteCache {
|
|
|
50
70
|
this.noteMap = new Map();
|
|
51
71
|
updatedNotes.forEach(n => __classPrivateFieldGet(this, _ExecutionNoteCache_instances, "m", _ExecutionNoteCache_addNote).call(this, n));
|
|
52
72
|
}
|
|
73
|
+
finish() {
|
|
74
|
+
// If we never entered the revertible phase, we need to use the tx request hash as a nonce for the notes if no nullifiers have been emitted.
|
|
75
|
+
if (!this.inRevertiblePhase) {
|
|
76
|
+
this.usedTxRequestHashForNonces = this.getAllNullifiers().length === 0;
|
|
77
|
+
}
|
|
78
|
+
// If we entered the revertible phase, the nonce generator was decided based on wether or not a nullifier was emitted before entering.
|
|
79
|
+
return {
|
|
80
|
+
usedTxRequestHashForNonces: this.usedTxRequestHashForNonces,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
53
83
|
/**
|
|
54
84
|
* Add a new note to cache.
|
|
55
85
|
* @param note - New note created during execution.
|
|
@@ -70,9 +100,6 @@ export class ExecutionNoteCache {
|
|
|
70
100
|
*/
|
|
71
101
|
nullifyNote(contractAddress, innerNullifier, noteHash) {
|
|
72
102
|
const siloedNullifier = siloNullifier(contractAddress, innerNullifier);
|
|
73
|
-
const nullifiers = this.getNullifiers(contractAddress);
|
|
74
|
-
nullifiers.add(siloedNullifier.value);
|
|
75
|
-
this.nullifierMap.set(contractAddress.toBigInt(), nullifiers);
|
|
76
103
|
let nullifiedNoteHashCounter = undefined;
|
|
77
104
|
// Find and remove the matching new note and log(s) if the emitted noteHash is not empty.
|
|
78
105
|
if (!noteHash.isEmpty()) {
|
|
@@ -85,9 +112,26 @@ export class ExecutionNoteCache {
|
|
|
85
112
|
nullifiedNoteHashCounter = note.counter;
|
|
86
113
|
this.noteMap.set(contractAddress.toBigInt(), notesInContract);
|
|
87
114
|
this.notes = this.notes.filter(n => n.counter !== note.counter);
|
|
115
|
+
// If the note is non revertible and the nullifier was emitted in the revertible phase, both the note hash and the nullifier will be emitted
|
|
116
|
+
if (this.inRevertiblePhase && note.counter < this.minRevertibleSideEffectCounter) {
|
|
117
|
+
this.recordNullifier(contractAddress, siloedNullifier);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
// If the note being nullified comes from a previous tx the nullifier will be emitted.
|
|
122
|
+
this.recordNullifier(contractAddress, siloedNullifier);
|
|
88
123
|
}
|
|
89
124
|
return nullifiedNoteHashCounter;
|
|
90
125
|
}
|
|
126
|
+
/**
|
|
127
|
+
* Adds a nullifier to the cache. Note cache needs to track all nullifiers to decide which nullifier to use for note siloing.
|
|
128
|
+
* @param contractAddress - Contract address that emitted the nullifier.
|
|
129
|
+
* @param innerNullifier
|
|
130
|
+
*/
|
|
131
|
+
nullifierCreated(contractAddress, innerNullifier) {
|
|
132
|
+
const siloedNullifier = siloNullifier(contractAddress, innerNullifier);
|
|
133
|
+
this.recordNullifier(contractAddress, siloedNullifier);
|
|
134
|
+
}
|
|
91
135
|
/**
|
|
92
136
|
* Return notes created up to current point in execution.
|
|
93
137
|
* If a nullifier for a note in this list is emitted, the note will be deleted.
|
|
@@ -119,7 +163,13 @@ export class ExecutionNoteCache {
|
|
|
119
163
|
return this.notes;
|
|
120
164
|
}
|
|
121
165
|
getAllNullifiers() {
|
|
122
|
-
return [...this.
|
|
166
|
+
return [...this.allNullifiers].map(n => new Fr(n));
|
|
167
|
+
}
|
|
168
|
+
recordNullifier(contractAddress, siloedNullifier) {
|
|
169
|
+
const nullifiers = this.getNullifiers(contractAddress);
|
|
170
|
+
nullifiers.add(siloedNullifier.toBigInt());
|
|
171
|
+
this.nullifierMap.set(contractAddress.toBigInt(), nullifiers);
|
|
172
|
+
this.allNullifiers.add(siloedNullifier.toBigInt());
|
|
123
173
|
}
|
|
124
174
|
}
|
|
125
175
|
_ExecutionNoteCache_instances = new WeakSet(), _ExecutionNoteCache_addNote = function _ExecutionNoteCache_addNote(note) {
|
|
@@ -128,4 +178,4 @@ _ExecutionNoteCache_instances = new WeakSet(), _ExecutionNoteCache_addNote = fun
|
|
|
128
178
|
notes.push(note);
|
|
129
179
|
this.noteMap.set(note.note.contractAddress.toBigInt(), notes);
|
|
130
180
|
};
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uX25vdGVfY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L2V4ZWN1dGlvbl9ub3RlX2NhY2hlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuSCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFVOUM7O0dBRUc7QUFDSCxNQUFNLE9BQU8sa0JBQWtCO0lBaUM3QixZQUE2QixhQUFpQjs7UUFBakIsa0JBQWEsR0FBYixhQUFhLENBQUk7UUFoQzlDOzs7V0FHRztRQUNLLFVBQUssR0FBa0IsRUFBRSxDQUFDO1FBQ2xDOztXQUVHO1FBQ0ssWUFBTyxHQUErQixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBRXhEOzs7O1dBSUc7UUFDSyxpQkFBWSxHQUE2QixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBRTNEOztXQUVHO1FBQ0ssa0JBQWEsR0FBZ0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUV2QyxtQ0FBOEIsR0FBRyxDQUFDLENBQUM7UUFFbkMsc0JBQWlCLEdBQUcsS0FBSyxDQUFDO1FBRWxDOzs7V0FHRztRQUNLLCtCQUEwQixHQUFHLElBQUksQ0FBQztJQUVPLENBQUM7SUFFbEQ7OztPQUdHO0lBQ0ksaUNBQWlDLENBQUMsOEJBQXNDO1FBQzdFLElBQUksSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7WUFDM0IsTUFBTSxJQUFJLEtBQUssQ0FDYiw2REFBNkQsOEJBQThCLDZCQUE2QixJQUFJLENBQUMsOEJBQThCLEVBQUUsQ0FDOUosQ0FBQztRQUNKLENBQUM7UUFDRCxJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDO1FBQzlCLElBQUksQ0FBQyw4QkFBOEIsR0FBRyw4QkFBOEIsQ0FBQztRQUVyRSxJQUFJLGNBQWMsR0FBRyxJ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
|