@aztec/simulator 0.67.1 → 0.68.1
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/oracle/oracle.d.ts +1 -1
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +3 -3
- package/dest/acvm/oracle/typed_oracle.d.ts +1 -1
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +3 -3
- package/dest/avm/avm_memory_types.d.ts +1 -1
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +45 -38
- package/dest/avm/avm_simulator.d.ts +1 -0
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +38 -18
- package/dest/avm/avm_tree.d.ts +2 -23
- package/dest/avm/avm_tree.d.ts.map +1 -1
- package/dest/avm/avm_tree.js +27 -82
- package/dest/avm/errors.d.ts +8 -1
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +13 -3
- package/dest/avm/fixtures/index.d.ts +2 -0
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +4 -4
- package/dest/avm/journal/journal.d.ts +15 -7
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +30 -22
- package/dest/avm/journal/nullifiers.d.ts +0 -4
- package/dest/avm/journal/nullifiers.d.ts.map +1 -1
- package/dest/avm/journal/nullifiers.js +1 -11
- package/dest/avm/journal/public_storage.d.ts +1 -49
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.js +1 -19
- package/dest/avm/opcodes/addressing_mode.js +3 -3
- package/dest/avm/opcodes/conversion.d.ts +4 -4
- package/dest/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/avm/opcodes/conversion.js +22 -18
- package/dest/avm/opcodes/ec_add.d.ts.map +1 -1
- package/dest/avm/opcodes/ec_add.js +5 -4
- package/dest/avm/opcodes/external_calls.js +2 -2
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +5 -5
- package/dest/avm/opcodes/misc.d.ts.map +1 -1
- package/dest/avm/opcodes/misc.js +3 -3
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +9 -6
- package/dest/avm/test_utils.d.ts +1 -0
- package/dest/avm/test_utils.d.ts.map +1 -1
- package/dest/avm/test_utils.js +4 -1
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +2 -1
- package/dest/client/db_oracle.d.ts +7 -3
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/index.d.ts +1 -0
- package/dest/client/index.d.ts.map +1 -1
- package/dest/client/index.js +2 -1
- package/dest/client/view_data_oracle.d.ts +2 -2
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +5 -4
- package/dest/providers/acvm_wasm.js +2 -2
- package/dest/providers/acvm_wasm_with_blobs.d.ts +7 -0
- package/dest/providers/acvm_wasm_with_blobs.d.ts.map +1 -0
- package/dest/providers/acvm_wasm_with_blobs.js +15 -0
- 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/bytecode_errors.d.ts +4 -0
- package/dest/public/bytecode_errors.d.ts.map +1 -0
- package/dest/public/bytecode_errors.js +7 -0
- package/dest/public/enqueued_call_side_effect_trace.d.ts +10 -4
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
- package/dest/public/enqueued_call_side_effect_trace.js +63 -13
- package/dest/public/execution.d.ts +2 -2
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +1 -1
- package/dest/public/executor_metrics.d.ts +2 -0
- package/dest/public/executor_metrics.d.ts.map +1 -1
- package/dest/public/executor_metrics.js +11 -1
- package/dest/public/fee_payment.d.ts.map +1 -1
- package/dest/public/fee_payment.js +4 -3
- package/dest/public/fixtures/index.d.ts +17 -11
- package/dest/public/fixtures/index.d.ts.map +1 -1
- package/dest/public/fixtures/index.js +103 -35
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +7 -6
- package/dest/public/public_processor.d.ts +15 -7
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +119 -75
- package/dest/public/public_processor_metrics.d.ts +10 -2
- package/dest/public/public_processor_metrics.d.ts.map +1 -1
- package/dest/public/public_processor_metrics.js +49 -2
- package/dest/public/public_tx_context.d.ts +5 -0
- package/dest/public/public_tx_context.d.ts.map +1 -1
- package/dest/public/public_tx_context.js +40 -20
- package/dest/public/public_tx_simulator.d.ts +2 -1
- package/dest/public/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator.js +35 -6
- package/dest/public/side_effect_errors.js +2 -2
- package/dest/public/side_effect_trace_interface.d.ts +2 -1
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/public/transitional_adapters.d.ts.map +1 -1
- package/dest/public/transitional_adapters.js +2 -35
- package/dest/public/unique_class_ids.d.ts +37 -0
- package/dest/public/unique_class_ids.d.ts.map +1 -0
- package/dest/public/unique_class_ids.js +66 -0
- package/package.json +12 -12
- package/src/acvm/oracle/oracle.ts +2 -2
- package/src/acvm/oracle/typed_oracle.ts +2 -2
- package/src/avm/avm_memory_types.ts +56 -38
- package/src/avm/avm_simulator.ts +48 -20
- package/src/avm/avm_tree.ts +35 -92
- package/src/avm/errors.ts +13 -2
- package/src/avm/fixtures/index.ts +4 -2
- package/src/avm/journal/journal.ts +39 -29
- package/src/avm/journal/nullifiers.ts +0 -11
- package/src/avm/journal/public_storage.ts +2 -21
- package/src/avm/opcodes/addressing_mode.ts +2 -2
- package/src/avm/opcodes/conversion.ts +21 -16
- package/src/avm/opcodes/ec_add.ts +4 -3
- package/src/avm/opcodes/external_calls.ts +1 -1
- package/src/avm/opcodes/hashing.ts +6 -4
- package/src/avm/opcodes/misc.ts +4 -3
- package/src/avm/opcodes/multi_scalar_mul.ts +10 -5
- package/src/avm/test_utils.ts +4 -0
- package/src/client/client_execution_context.ts +2 -0
- package/src/client/db_oracle.ts +8 -3
- package/src/client/index.ts +1 -0
- package/src/client/view_data_oracle.ts +6 -3
- package/src/providers/acvm_wasm.ts +1 -1
- package/src/providers/acvm_wasm_with_blobs.ts +25 -0
- package/src/providers/index.ts +1 -1
- package/src/public/bytecode_errors.ts +6 -0
- package/src/public/enqueued_call_side_effect_trace.ts +83 -19
- package/src/public/execution.ts +1 -2
- package/src/public/executor_metrics.ts +13 -0
- package/src/public/fee_payment.ts +3 -2
- package/src/public/fixtures/index.ts +152 -46
- package/src/public/public_db_sources.ts +6 -5
- package/src/public/public_processor.ts +171 -88
- package/src/public/public_processor_metrics.ts +64 -2
- package/src/public/public_tx_context.ts +57 -21
- package/src/public/public_tx_simulator.ts +34 -6
- package/src/public/side_effect_errors.ts +1 -1
- package/src/public/side_effect_trace_interface.ts +2 -1
- package/src/public/transitional_adapters.ts +0 -51
- package/src/public/unique_class_ids.ts +80 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MerkleTreeId, ProvingRequestType, TxExecutionPhase, TxHash, } from '@aztec/circuit-types';
|
|
2
|
-
import {
|
|
2
|
+
import { AvmCircuitInputs, Fr, Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, PublicCircuitPublicInputs, RevertCode, TreeSnapshots, computeTransactionFee, countAccumulatedItems, } from '@aztec/circuits.js';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { strict as assert } from 'assert';
|
|
5
5
|
import { inspect } from 'util';
|
|
@@ -42,13 +42,14 @@ export class PublicTxContext {
|
|
|
42
42
|
const nonRevertibleAccumulatedDataFromPrivate = tx.data.forPublic.nonRevertibleAccumulatedData;
|
|
43
43
|
const previousAccumulatedDataArrayLengths = new SideEffectArrayLengths(
|
|
44
44
|
/*publicDataWrites*/ 0,
|
|
45
|
-
/*protocolPublicDataWrites*/ 0,
|
|
45
|
+
/*protocolPublicDataWrites*/ 0,
|
|
46
|
+
/*noteHashes*/ 0,
|
|
46
47
|
/*nullifiers=*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs),
|
|
47
48
|
/*unencryptedLogsHashes*/ 0);
|
|
48
49
|
const enqueuedCallTrace = new PublicEnqueuedCallSideEffectTrace(
|
|
49
50
|
/*startSideEffectCounter=*/ 0, previousAccumulatedDataArrayLengths);
|
|
50
51
|
// Transaction level state manager that will be forked for revertible phases.
|
|
51
|
-
const txStateManager = await AvmPersistableStateManager.create(worldStateDB, enqueuedCallTrace, doMerkleOperations);
|
|
52
|
+
const txStateManager = await AvmPersistableStateManager.create(worldStateDB, enqueuedCallTrace, doMerkleOperations, fetchTxHash(nonRevertibleAccumulatedDataFromPrivate));
|
|
52
53
|
const gasSettings = tx.data.constants.txContext.gasSettings;
|
|
53
54
|
const gasUsedByPrivate = tx.data.gasUsed;
|
|
54
55
|
// Gas allocated to public is "whatever's left" after private, but with some max applied.
|
|
@@ -112,12 +113,7 @@ export class PublicTxContext {
|
|
|
112
113
|
* @returns The transaction's hash.
|
|
113
114
|
*/
|
|
114
115
|
getTxHash() {
|
|
115
|
-
|
|
116
|
-
const firstNullifier = this.nonRevertibleAccumulatedDataFromPrivate.nullifiers[0];
|
|
117
|
-
if (!firstNullifier || firstNullifier.isZero()) {
|
|
118
|
-
throw new Error(`Cannot get tx hash since first nullifier is missing`);
|
|
119
|
-
}
|
|
120
|
-
return new TxHash(firstNullifier.toBuffer());
|
|
116
|
+
return fetchTxHash(this.nonRevertibleAccumulatedDataFromPrivate);
|
|
121
117
|
}
|
|
122
118
|
/**
|
|
123
119
|
* Are there any call requests for the speciiied phase?
|
|
@@ -202,6 +198,14 @@ export class PublicTxContext {
|
|
|
202
198
|
const teardownGasLimits = requireTeardown ? this.gasSettings.teardownGasLimits : Gas.empty();
|
|
203
199
|
return this.getTotalGasUsed().sub(teardownGasLimits).add(this.teardownGasUsed);
|
|
204
200
|
}
|
|
201
|
+
/**
|
|
202
|
+
* Compute the public gas used using the actual gas used during teardown instead
|
|
203
|
+
* of the teardown gas limit.
|
|
204
|
+
*/
|
|
205
|
+
getActualPublicGasUsed() {
|
|
206
|
+
assert(this.halted, 'Can only compute actual gas used after tx execution ends');
|
|
207
|
+
return this.gasUsedByPublic.add(this.teardownGasUsed);
|
|
208
|
+
}
|
|
205
209
|
/**
|
|
206
210
|
* Get the transaction fee as is available to the specified phase.
|
|
207
211
|
* Only teardown should have access to the actual transaction fee.
|
|
@@ -219,10 +223,11 @@ export class PublicTxContext {
|
|
|
219
223
|
* Should only be called during or after teardown.
|
|
220
224
|
*/
|
|
221
225
|
getTransactionFeeUnsafe() {
|
|
222
|
-
const
|
|
226
|
+
const gasUsed = this.getTotalGasUsed();
|
|
227
|
+
const txFee = computeTransactionFee(this.globalVariables.gasFees, this.gasSettings, gasUsed);
|
|
223
228
|
this.log.debug(`Computed tx fee`, {
|
|
224
229
|
txFee,
|
|
225
|
-
gasUsed: inspect(
|
|
230
|
+
gasUsed: inspect(gasUsed),
|
|
226
231
|
gasFees: inspect(this.globalVariables.gasFees),
|
|
227
232
|
});
|
|
228
233
|
return txFee;
|
|
@@ -232,14 +237,21 @@ export class PublicTxContext {
|
|
|
232
237
|
*/
|
|
233
238
|
generateAvmCircuitPublicInputs(endStateReference) {
|
|
234
239
|
assert(this.halted, 'Can only get AvmCircuitPublicInputs after tx execution ends');
|
|
235
|
-
const ephemeralTrees = this.state.getActiveStateManager().merkleTrees
|
|
236
|
-
const
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
const
|
|
241
|
-
|
|
242
|
-
|
|
240
|
+
const ephemeralTrees = this.state.getActiveStateManager().merkleTrees;
|
|
241
|
+
const noteHashTree = ephemeralTrees.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE);
|
|
242
|
+
const nullifierTree = ephemeralTrees.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
|
|
243
|
+
const publicDataTree = ephemeralTrees.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
|
|
244
|
+
// Pad the note hash and nullifier trees
|
|
245
|
+
const paddedNoteHashTreeSize = this.startStateReference.partial.noteHashTree.nextAvailableLeafIndex + MAX_NOTE_HASHES_PER_TX;
|
|
246
|
+
if (noteHashTree.nextAvailableLeafIndex > paddedNoteHashTreeSize) {
|
|
247
|
+
throw new Error(`Inserted too many leaves in note hash tree: ${noteHashTree.nextAvailableLeafIndex} > ${paddedNoteHashTreeSize}`);
|
|
248
|
+
}
|
|
249
|
+
noteHashTree.nextAvailableLeafIndex = paddedNoteHashTreeSize;
|
|
250
|
+
const paddedNullifierTreeSize = this.startStateReference.partial.nullifierTree.nextAvailableLeafIndex + MAX_NULLIFIERS_PER_TX;
|
|
251
|
+
if (nullifierTree.nextAvailableLeafIndex > paddedNullifierTreeSize) {
|
|
252
|
+
throw new Error(`Inserted too many leaves in nullifier tree: ${nullifierTree.nextAvailableLeafIndex} > ${paddedNullifierTreeSize}`);
|
|
253
|
+
}
|
|
254
|
+
nullifierTree.nextAvailableLeafIndex = paddedNullifierTreeSize;
|
|
243
255
|
const endTreeSnapshots = new TreeSnapshots(endStateReference.l1ToL2MessageTree, noteHashTree, nullifierTree, publicDataTree);
|
|
244
256
|
return generateAvmCircuitPublicInputs(this.trace, this.globalVariables, this.startStateReference,
|
|
245
257
|
/*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests, this.appLogicCallRequests, this.teardownCallRequests, this.nonRevertibleAccumulatedDataFromPrivate, this.revertibleAccumulatedDataFromPrivate, endTreeSnapshots,
|
|
@@ -305,4 +317,12 @@ function applyMaxToAvailableGas(availableGas) {
|
|
|
305
317
|
/*daGas=*/ availableGas.daGas,
|
|
306
318
|
/*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION));
|
|
307
319
|
}
|
|
308
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_context.js","sourceRoot":"","sources":["../../src/public/public_tx_context.ts"],"names":[],"mappings":"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"}
|
|
320
|
+
function fetchTxHash(nonRevertibleAccumulatedData) {
|
|
321
|
+
// Private kernel functions are executed client side and for this reason tx hash is already set as first nullifier
|
|
322
|
+
const firstNullifier = nonRevertibleAccumulatedData.nullifiers[0];
|
|
323
|
+
if (!firstNullifier || firstNullifier.isZero()) {
|
|
324
|
+
throw new Error(`Cannot get tx hash since first nullifier is missing`);
|
|
325
|
+
}
|
|
326
|
+
return new TxHash(firstNullifier.toBuffer());
|
|
327
|
+
}
|
|
328
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_context.js","sourceRoot":"","sources":["../../src/public/public_tx_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,10 @@ export declare class PublicTxSimulator {
|
|
|
25
25
|
private worldStateDB;
|
|
26
26
|
private globalVariables;
|
|
27
27
|
private doMerkleOperations;
|
|
28
|
+
private enforceFeePayment;
|
|
28
29
|
metrics: ExecutorMetrics;
|
|
29
30
|
private log;
|
|
30
|
-
constructor(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, telemetryClient: TelemetryClient, globalVariables: GlobalVariables, doMerkleOperations?: boolean);
|
|
31
|
+
constructor(db: MerkleTreeReadOperations, worldStateDB: WorldStateDB, telemetryClient: TelemetryClient, globalVariables: GlobalVariables, doMerkleOperations?: boolean, enforceFeePayment?: boolean);
|
|
31
32
|
get tracer(): Tracer;
|
|
32
33
|
/**
|
|
33
34
|
* Simulate a transaction's public portion including all of its phases.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,wBAAwB,EAC7B,yBAAyB,EAEzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAqB,KAAK,eAAe,EAA0B,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAItH,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAQnG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;
|
|
1
|
+
{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,wBAAwB,EAC7B,yBAAyB,EAEzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAqB,KAAK,eAAe,EAA0B,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAItH,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAQnG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,gBAAgB,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,iBAAiB;IAV3B,OAAO,EAAE,eAAe,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAGV,EAAE,EAAE,wBAAwB,EAC5B,YAAY,EAAE,YAAY,EAClC,eAAe,EAAE,eAAe,EACxB,eAAe,EAAE,eAAe,EAChC,kBAAkB,GAAE,OAAe,EACnC,iBAAiB,GAAE,OAAc;IAM3C,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAkFtD;;;;OAIG;YACW,kBAAkB;IAIhC;;;;OAIG;YACW,qBAAqB;IAkBnC;;;;OAIG;YACW,qBAAqB;IAoBnC;;;;;OAKG;YACW,aAAa;IA0C3B;;;;;;;OAOG;YAOW,oBAAoB;IAoClC;;;;;;;;;;;;;OAaG;YAOW,4BAA4B;IAgD1C;;OAEG;IACU,+BAA+B,CAAC,OAAO,EAAE,eAAe;IAkBrE;;;OAGG;IACU,4BAA4B,CAAC,OAAO,EAAE,eAAe;YAqBpD,MAAM;CA+BrB"}
|
|
@@ -17,11 +17,12 @@ let PublicTxSimulator = (() => {
|
|
|
17
17
|
let _simulateEnqueuedCall_decorators;
|
|
18
18
|
let _simulateEnqueuedCallInternal_decorators;
|
|
19
19
|
return _a = class PublicTxSimulator {
|
|
20
|
-
constructor(db, worldStateDB, telemetryClient, globalVariables, doMerkleOperations = false) {
|
|
20
|
+
constructor(db, worldStateDB, telemetryClient, globalVariables, doMerkleOperations = false, enforceFeePayment = true) {
|
|
21
21
|
this.db = (__runInitializers(this, _instanceExtraInitializers), db);
|
|
22
22
|
this.worldStateDB = worldStateDB;
|
|
23
23
|
this.globalVariables = globalVariables;
|
|
24
24
|
this.doMerkleOperations = doMerkleOperations;
|
|
25
|
+
this.enforceFeePayment = enforceFeePayment;
|
|
25
26
|
this.log = createLogger(`simulator:public_tx_simulator`);
|
|
26
27
|
this.metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator');
|
|
27
28
|
}
|
|
@@ -45,13 +46,19 @@ let PublicTxSimulator = (() => {
|
|
|
45
46
|
// if so, this should only add contracts that were deployed during private app logic.
|
|
46
47
|
// FIXME: we shouldn't need to directly modify worldStateDb here!
|
|
47
48
|
await this.worldStateDB.addNewContracts(tx);
|
|
49
|
+
const nonRevertStart = process.hrtime.bigint();
|
|
48
50
|
await this.insertNonRevertiblesFromPrivate(context);
|
|
51
|
+
const nonRevertEnd = process.hrtime.bigint();
|
|
52
|
+
this.metrics.recordPrivateEffectsInsertion(Number(nonRevertEnd - nonRevertStart) / 1000, 'non-revertible');
|
|
49
53
|
const processedPhases = [];
|
|
50
54
|
if (context.hasPhase(TxExecutionPhase.SETUP)) {
|
|
51
55
|
const setupResult = await this.simulateSetupPhase(context);
|
|
52
56
|
processedPhases.push(setupResult);
|
|
53
57
|
}
|
|
58
|
+
const revertStart = process.hrtime.bigint();
|
|
54
59
|
await this.insertRevertiblesFromPrivate(context);
|
|
60
|
+
const revertEnd = process.hrtime.bigint();
|
|
61
|
+
this.metrics.recordPrivateEffectsInsertion(Number(revertEnd - revertStart) / 1000, 'revertible');
|
|
55
62
|
if (context.hasPhase(TxExecutionPhase.APP_LOGIC)) {
|
|
56
63
|
const appLogicResult = await this.simulateAppLogicPhase(context);
|
|
57
64
|
processedPhases.push(appLogicResult);
|
|
@@ -79,7 +86,11 @@ let PublicTxSimulator = (() => {
|
|
|
79
86
|
tx.unencryptedLogs.addFunctionLogs([new UnencryptedFunctionL2Logs(context.trace.getUnencryptedLogs())]);
|
|
80
87
|
return {
|
|
81
88
|
avmProvingRequest,
|
|
82
|
-
gasUsed: {
|
|
89
|
+
gasUsed: {
|
|
90
|
+
totalGas: context.getActualGasUsed(),
|
|
91
|
+
teardownGas: context.teardownGasUsed,
|
|
92
|
+
publicGas: context.getActualPublicGasUsed(),
|
|
93
|
+
},
|
|
83
94
|
revertCode,
|
|
84
95
|
revertReason: context.revertReason,
|
|
85
96
|
processedPhases: processedPhases,
|
|
@@ -222,7 +233,7 @@ let PublicTxSimulator = (() => {
|
|
|
222
233
|
const simulator = await AvmSimulator.create(stateManager, address, sender, transactionFee, this.globalVariables, executionRequest.callContext.isStaticCall, executionRequest.args, allocatedGas);
|
|
223
234
|
const avmCallResult = await simulator.execute();
|
|
224
235
|
const result = avmCallResult.finalize();
|
|
225
|
-
this.log.
|
|
236
|
+
this.log.verbose(result.reverted
|
|
226
237
|
? `Simulation of enqueued public call ${fnName} reverted with reason ${result.revertReason}.`
|
|
227
238
|
: `Simulation of enqueued public call ${fnName} completed successfully.`, {
|
|
228
239
|
eventName: 'avm-simulation',
|
|
@@ -250,6 +261,11 @@ let PublicTxSimulator = (() => {
|
|
|
250
261
|
throw new NullifierCollisionError(`Nullifier collision encountered when inserting non-revertible nullifiers from private.\nDetails: ${e.message}\n.Stack:${e.stack}`);
|
|
251
262
|
}
|
|
252
263
|
}
|
|
264
|
+
for (const noteHash of context.nonRevertibleAccumulatedDataFromPrivate.noteHashes) {
|
|
265
|
+
if (!noteHash.isEmpty()) {
|
|
266
|
+
stateManager.writeUniqueNoteHash(noteHash);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
253
269
|
}
|
|
254
270
|
/**
|
|
255
271
|
* Insert the revertible accumulated data from private into the public state.
|
|
@@ -267,6 +283,12 @@ let PublicTxSimulator = (() => {
|
|
|
267
283
|
throw new NullifierCollisionError(`Nullifier collision encountered when inserting revertible nullifiers from private. Details:\n${e.message}\n.Stack:${e.stack}`);
|
|
268
284
|
}
|
|
269
285
|
}
|
|
286
|
+
for (const noteHash of context.revertibleAccumulatedDataFromPrivate.noteHashes) {
|
|
287
|
+
if (!noteHash.isEmpty()) {
|
|
288
|
+
// Revertible note hashes from private are not hashed with nonce, since private can't know their final position, only we can.
|
|
289
|
+
stateManager.writeSiloedNoteHash(noteHash);
|
|
290
|
+
}
|
|
291
|
+
}
|
|
270
292
|
}
|
|
271
293
|
async payFee(context) {
|
|
272
294
|
const txFee = context.getTransactionFee(TxExecutionPhase.TEARDOWN);
|
|
@@ -278,9 +300,16 @@ let PublicTxSimulator = (() => {
|
|
|
278
300
|
const balanceSlot = computeFeePayerBalanceStorageSlot(context.feePayer);
|
|
279
301
|
this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${context.feePayer}`);
|
|
280
302
|
const stateManager = context.state.getActiveStateManager();
|
|
281
|
-
|
|
303
|
+
let currentBalance = await stateManager.readStorage(feeJuiceAddress, balanceSlot);
|
|
304
|
+
// We allow to fake the balance of the fee payer to allow fee estimation
|
|
305
|
+
// When mocking the balance of the fee payer, the circuit should not be able to prove the simulation
|
|
282
306
|
if (currentBalance.lt(txFee)) {
|
|
283
|
-
|
|
307
|
+
if (this.enforceFeePayment) {
|
|
308
|
+
throw new Error(`Not enough balance for fee payer to pay for transaction (got ${currentBalance.toBigInt()} needs ${txFee.toBigInt()})`);
|
|
309
|
+
}
|
|
310
|
+
else {
|
|
311
|
+
currentBalance = txFee;
|
|
312
|
+
}
|
|
284
313
|
}
|
|
285
314
|
const updatedBalance = currentBalance.sub(txFee);
|
|
286
315
|
await stateManager.writeStorage(feeJuiceAddress, balanceSlot, updatedBalance, true);
|
|
@@ -304,4 +333,4 @@ let PublicTxSimulator = (() => {
|
|
|
304
333
|
_a;
|
|
305
334
|
})();
|
|
306
335
|
export { PublicTxSimulator };
|
|
307
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}
|
|
336
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_simulator.js","sourceRoot":"","sources":["../../src/public/public_tx_simulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export class SideEffectLimitReachedError extends Error {
|
|
2
2
|
constructor(sideEffectType, limit) {
|
|
3
|
-
super(`Reached the limit on number of '${sideEffectType}'
|
|
3
|
+
super(`Reached the limit (${limit}) on number of '${sideEffectType}' per tx`);
|
|
4
4
|
this.name = 'SideEffectLimitReachedError';
|
|
5
5
|
}
|
|
6
6
|
}
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lkZV9lZmZlY3RfZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9zaWRlX2VmZmVjdF9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLDJCQUE0QixTQUFRLEtBQUs7SUFDcEQsWUFBWSxjQUFzQixFQUFFLEtBQWE7UUFDL0MsS0FBSyxDQUFDLHNCQUFzQixLQUFLLG1CQUFtQixjQUFjLFVBQVUsQ0FBQyxDQUFDO1FBQzlFLElBQUksQ0FBQyxJQUFJLEdBQUcsNkJBQTZCLENBQUM7SUFDNUMsQ0FBQztDQUNGIn0=
|
|
@@ -15,7 +15,8 @@ export interface PublicSideEffectTraceInterface {
|
|
|
15
15
|
tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, // This is the storage slot not the computed leaf slot
|
|
16
16
|
value: Fr, protocolWrite: boolean, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): void;
|
|
17
17
|
traceNoteHashCheck(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean, path?: Fr[]): void;
|
|
18
|
-
traceNewNoteHash(
|
|
18
|
+
traceNewNoteHash(uniqueNoteHash: Fr, leafIndex?: Fr, path?: Fr[]): void;
|
|
19
|
+
getNoteHashCount(): number;
|
|
19
20
|
traceNullifierCheck(siloedNullifier: Fr, exists: boolean, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[]): void;
|
|
20
21
|
traceNewNullifier(siloedNullifier: Fr, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], insertionPath?: Fr[]): void;
|
|
21
22
|
traceL1ToL2MessageCheck(contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean, path?: Fr[]): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,GAAG,EACR,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,0BAA0B,EAC/B,KAAK,4BAA4B,EAClC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,KAAK,gDAAgD,EAAE,KAAK,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAEtH,MAAM,WAAW,8BAA8B;IAC7C,IAAI,IAAI,8BAA8B,CAAC;IACvC,KAAK,CAAC,WAAW,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7E,UAAU,IAAI,MAAM,CAAC;IAErB,sBAAsB,CACpB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,EAAE,EACR,KAAK,EAAE,EAAE,EACT,YAAY,CAAC,EAAE,0BAA0B,EACzC,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,CAAC,EAAE,EAAE,EAAE,GACV,IAAI,CAAC;IACR,uBAAuB,CACrB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,EAAE,EAAE,sDAAsD;IAChE,KAAK,EAAE,EAAE,EACT,aAAa,EAAE,OAAO,EACtB,eAAe,CAAC,EAAE,0BAA0B,EAC5C,YAAY,CAAC,EAAE,EAAE,EACjB,WAAW,CAAC,EAAE,EAAE,EAAE,EAClB,eAAe,CAAC,EAAE,0BAA0B,EAC5C,aAAa,CAAC,EAAE,EAAE,EAAE,GACnB,IAAI,CAAC;IACR,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IACnH,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transitional_adapters.d.ts","sourceRoot":"","sources":["../../src/public/transitional_adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,YAAY,EACjB,EAAE,EACF,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"transitional_adapters.d.ts","sourceRoot":"","sources":["../../src/public/transitional_adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,YAAY,EACjB,EAAE,EACF,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,eAAe,EAKpB,KAAK,8BAA8B,EACnC,iBAAiB,EAEjB,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,aAAa,EAGd,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAE9F,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,iCAAiC,EACxC,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,cAAc,EACnC,YAAY,EAAE,GAAG,EACjB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,YAAY,EACtB,iBAAiB,EAAE,iBAAiB,EAAE,EACtC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,oBAAoB,EAAE,iBAAiB,EAAE,EACzC,uCAAuC,EAAE,8BAA8B,EACvE,oCAAoC,EAAE,8BAA8B,EACpE,gBAAgB,EAAE,aAAa,EAC/B,UAAU,EAAE,GAAG,EACf,cAAc,EAAE,EAAE,EAClB,UAAU,EAAE,UAAU,GACrB,sBAAsB,CAuExB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { Fr, MAX_L2_TO_L1_MSGS_PER_TX,
|
|
2
|
-
import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
|
|
1
|
+
import { Fr, MAX_L2_TO_L1_MSGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataWrite, TreeSnapshots, countAccumulatedItems, mergeAccumulatedData, } from '@aztec/circuits.js';
|
|
3
2
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
4
3
|
import { assertLength } from '@aztec/foundation/serialize';
|
|
5
4
|
export function generateAvmCircuitPublicInputs(trace, globalVariables, startStateReference, startGasUsed, gasSettings, feePayer, setupCallRequests, appLogicCallRequests, teardownCallRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, endTreeSnapshots, endGasUsed, transactionFee, revertCode) {
|
|
@@ -12,38 +11,6 @@ export function generateAvmCircuitPublicInputs(trace, globalVariables, startStat
|
|
|
12
11
|
avmCircuitPublicInputs.previousRevertibleAccumulatedDataArrayLengths = getArrayLengths(revertibleAccumulatedDataFromPrivate);
|
|
13
12
|
avmCircuitPublicInputs.previousNonRevertibleAccumulatedData = convertAccumulatedData(nonRevertibleAccumulatedDataFromPrivate);
|
|
14
13
|
avmCircuitPublicInputs.previousRevertibleAccumulatedData = convertAccumulatedData(revertibleAccumulatedDataFromPrivate);
|
|
15
|
-
const txHash = avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.nullifiers[0];
|
|
16
|
-
// Add nonces to revertible note hashes from private. These don't have nonces since we don't know
|
|
17
|
-
// the final position in the tx until the AVM has executed.
|
|
18
|
-
// TODO: Use the final position in the tx
|
|
19
|
-
for (let revertibleIndex = 0; revertibleIndex < avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes.length; revertibleIndex++) {
|
|
20
|
-
const noteHash = avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes[revertibleIndex];
|
|
21
|
-
if (noteHash.isZero()) {
|
|
22
|
-
continue;
|
|
23
|
-
}
|
|
24
|
-
const indexInTx = revertibleIndex + avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths.noteHashes;
|
|
25
|
-
const nonce = computeNoteHashNonce(txHash, indexInTx);
|
|
26
|
-
const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
|
|
27
|
-
avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes[revertibleIndex] = uniqueNoteHash;
|
|
28
|
-
}
|
|
29
|
-
// merge all revertible & non-revertible side effects into output accumulated data
|
|
30
|
-
const noteHashesFromPrivate = revertCode.isOK()
|
|
31
|
-
? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.noteHashes, avmCircuitPublicInputs.previousRevertibleAccumulatedData.noteHashes)
|
|
32
|
-
: avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.noteHashes;
|
|
33
|
-
avmCircuitPublicInputs.accumulatedData.noteHashes = assertLength(mergeAccumulatedData(noteHashesFromPrivate, avmCircuitPublicInputs.accumulatedData.noteHashes), MAX_NOTE_HASHES_PER_TX);
|
|
34
|
-
// Silo and add nonces for note hashes emitted by the AVM
|
|
35
|
-
const scopedNoteHashesFromPublic = trace.getSideEffects().noteHashes;
|
|
36
|
-
for (let i = 0; i < scopedNoteHashesFromPublic.length; i++) {
|
|
37
|
-
const scopedNoteHash = scopedNoteHashesFromPublic[i];
|
|
38
|
-
const noteHash = scopedNoteHash.value;
|
|
39
|
-
if (!noteHash.isZero()) {
|
|
40
|
-
const noteHashIndexInTx = i + countAccumulatedItems(noteHashesFromPrivate);
|
|
41
|
-
const nonce = computeNoteHashNonce(txHash, noteHashIndexInTx);
|
|
42
|
-
const siloedNoteHash = siloNoteHash(scopedNoteHash.contractAddress, noteHash);
|
|
43
|
-
const uniqueNoteHash = computeUniqueNoteHash(nonce, siloedNoteHash);
|
|
44
|
-
avmCircuitPublicInputs.accumulatedData.noteHashes[noteHashIndexInTx] = uniqueNoteHash;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
14
|
const msgsFromPrivate = revertCode.isOK()
|
|
48
15
|
? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs, avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs)
|
|
49
16
|
: avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
|
|
@@ -59,4 +26,4 @@ export function generateAvmCircuitPublicInputs(trace, globalVariables, startStat
|
|
|
59
26
|
//console.log(`AvmCircuitPublicInputs:\n${inspect(avmCircuitPublicInputs)}`);
|
|
60
27
|
return avmCircuitPublicInputs;
|
|
61
28
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbmFsX2FkYXB0ZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90cmFuc2l0aW9uYWxfYWRhcHRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLEVBQUUsRUFJRix3QkFBd0IsRUFDeEIsNENBQTRDLEVBQzVDLDJCQUEyQixFQUMzQix1Q0FBdUMsRUFFdkMsaUJBQWlCLEVBQ2pCLGVBQWUsRUFHZixhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLG9CQUFvQixHQUNyQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFJM0QsTUFBTSxVQUFVLDhCQUE4QixDQUM1QyxLQUF3QyxFQUN4QyxlQUFnQyxFQUNoQyxtQkFBbUMsRUFDbkMsWUFBaUIsRUFDakIsV0FBd0IsRUFDeEIsUUFBc0IsRUFDdEIsaUJBQXNDLEVBQ3RDLG9CQUF5QyxFQUN6QyxvQkFBeUMsRUFDekMsdUNBQXVFLEVBQ3ZFLG9DQUFvRSxFQUNwRSxnQkFBK0IsRUFDL0IsVUFBZSxFQUNmLGNBQWtCLEVBQ2xCLFVBQXNCO0lBRXRCLE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxhQUFhLENBQzFDLG1CQUFtQixDQUFDLGlCQUFpQixFQUNyQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUN4QyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsYUFBYSxFQUN6QyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUMzQyxDQUFDO0lBRUYsTUFBTSxzQkFBc0IsR0FBRyxLQUFLLENBQUMsd0JBQXdCLENBQzNELGVBQWUsRUFDZixrQkFBa0IsRUFDbEIsWUFBWSxFQUNaLFdBQVcsRUFDWCxRQUFRLEVBQ1IsaUJBQWlCLEVBQ2pCLG9CQUFvQixFQUNwQixvQkFBb0IsQ0FBQyxNQUFNLENB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
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A class manage a de-duplicated set of class IDs that errors if you try to add a duplicate.
|
|
3
|
+
* Useful for bytecode retrieval hints to avoid duplicates in parent trace & grandparent trace....
|
|
4
|
+
*/
|
|
5
|
+
export declare class UniqueClassIds {
|
|
6
|
+
private readonly parent?;
|
|
7
|
+
private readonly classIds;
|
|
8
|
+
constructor(parent?: UniqueClassIds | undefined);
|
|
9
|
+
/**
|
|
10
|
+
* Create a fork that references this one as its parent
|
|
11
|
+
*/
|
|
12
|
+
fork(): UniqueClassIds;
|
|
13
|
+
/**
|
|
14
|
+
* Check for a class ID here or in parent's (recursively).
|
|
15
|
+
*
|
|
16
|
+
* @param classId - the contract class ID (as a string) to check
|
|
17
|
+
* @returns boolean: whether the class ID is here
|
|
18
|
+
*/
|
|
19
|
+
has(classId: string): boolean;
|
|
20
|
+
/**
|
|
21
|
+
* Get the total number of classIds
|
|
22
|
+
*/
|
|
23
|
+
size(): number;
|
|
24
|
+
/**
|
|
25
|
+
* Add a class ID (if not already present) to the set.
|
|
26
|
+
*
|
|
27
|
+
* @param classId - the contract class ID (as a string)
|
|
28
|
+
*/
|
|
29
|
+
add(classId: string): void;
|
|
30
|
+
/**
|
|
31
|
+
* Merge in another set of unique class IDs into this one, but fail on duplicates.
|
|
32
|
+
*
|
|
33
|
+
* @param incoming: other unique class IDs
|
|
34
|
+
*/
|
|
35
|
+
acceptAndMerge(incoming: UniqueClassIds): void;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=unique_class_ids.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unique_class_ids.d.ts","sourceRoot":"","sources":["../../src/public/unique_class_ids.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,qBAAa,cAAc;IAGb,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAFpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;gBAEtB,MAAM,CAAC,4BAAgB;IAEpD;;OAEG;IACI,IAAI;IAIX;;;;;OAKG;IACI,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAWpC;;OAEG;IACI,IAAI,IAAI,MAAM;IAIrB;;;;OAIG;IACI,GAAG,CAAC,OAAO,EAAE,MAAM;IAW1B;;;;OAIG;IACI,cAAc,CAAC,QAAQ,EAAE,cAAc;CAc/C"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS } from '@aztec/circuits.js';
|
|
2
|
+
import { strict as assert } from 'assert';
|
|
3
|
+
/**
|
|
4
|
+
* A class manage a de-duplicated set of class IDs that errors if you try to add a duplicate.
|
|
5
|
+
* Useful for bytecode retrieval hints to avoid duplicates in parent trace & grandparent trace....
|
|
6
|
+
*/
|
|
7
|
+
export class UniqueClassIds {
|
|
8
|
+
constructor(parent) {
|
|
9
|
+
this.parent = parent;
|
|
10
|
+
this.classIds = new Set();
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Create a fork that references this one as its parent
|
|
14
|
+
*/
|
|
15
|
+
fork() {
|
|
16
|
+
return new UniqueClassIds(/*parent=*/ this);
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Check for a class ID here or in parent's (recursively).
|
|
20
|
+
*
|
|
21
|
+
* @param classId - the contract class ID (as a string) to check
|
|
22
|
+
* @returns boolean: whether the class ID is here
|
|
23
|
+
*/
|
|
24
|
+
has(classId) {
|
|
25
|
+
// First try check this' classIds
|
|
26
|
+
let here = this.classIds.has(classId);
|
|
27
|
+
// Then try parent's
|
|
28
|
+
if (!here && this.parent) {
|
|
29
|
+
// Note: this will recurse to grandparent/etc until we reach top or find it
|
|
30
|
+
here = this.parent.has(classId);
|
|
31
|
+
}
|
|
32
|
+
return here;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Get the total number of classIds
|
|
36
|
+
*/
|
|
37
|
+
size() {
|
|
38
|
+
return this.classIds.size + (this.parent ? this.parent.size() : 0);
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Add a class ID (if not already present) to the set.
|
|
42
|
+
*
|
|
43
|
+
* @param classId - the contract class ID (as a string)
|
|
44
|
+
*/
|
|
45
|
+
add(classId) {
|
|
46
|
+
assert(!this.has(classId), `Bug! Tried to add duplicate classId ${classId} to set of unique classIds.`);
|
|
47
|
+
if (!this.has(classId)) {
|
|
48
|
+
this.classIds.add(classId);
|
|
49
|
+
assert(this.size() <= MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, `Bug! Surpassed limit (${MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS}) of unique contract class IDs used for bytecode retrievals.`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Merge in another set of unique class IDs into this one, but fail on duplicates.
|
|
54
|
+
*
|
|
55
|
+
* @param incoming: other unique class IDs
|
|
56
|
+
*/
|
|
57
|
+
acceptAndMerge(incoming) {
|
|
58
|
+
for (const classId of incoming.classIds.keys()) {
|
|
59
|
+
assert(!this.has(classId), `Bug! Cannot merge classId ${classId} into set of unique classIds as it already exists.`);
|
|
60
|
+
this.classIds.add(classId);
|
|
61
|
+
}
|
|
62
|
+
// since set() has an assertion, and size() always checks parent, this should be impossible
|
|
63
|
+
assert(this.size() <= MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, `Bug! Merging unique class Ids should never exceed the limit of ${MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS}.`);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pcXVlX2NsYXNzX2lkcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvdW5pcXVlX2NsYXNzX2lkcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsNkNBQTZDLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVuRixPQUFPLEVBQUUsTUFBTSxJQUFJLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sY0FBYztJQUd6QixZQUE2QixNQUF1QjtRQUF2QixXQUFNLEdBQU4sTUFBTSxDQUFpQjtRQUZuQyxhQUFRLEdBQWdCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFSSxDQUFDO0lBRXhEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxjQUFjLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLEdBQUcsQ0FBQyxPQUFlO1FBQ3hCLGlDQUFpQztRQUNqQyxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN0QyxvQkFBb0I7UUFDcEIsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDekIsMkVBQTJFO1lBQzNFLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsQyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxJQUFJO1FBQ1QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksR0FBRyxDQUFDLE9BQWU7UUFDeEIsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSx1Q0FBdUMsT0FBTyw2QkFBNkIsQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDdkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDM0IsTUFBTSxDQUNKLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSw2Q0FBNkMsRUFDNUQseUJBQXlCLDZDQUE2Qyw4REFBOEQsQ0FDckksQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLGNBQWMsQ0FBQyxRQUF3QjtRQUM1QyxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQztZQUMvQyxNQUFNLENBQ0osQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUNsQiw2QkFBNkIsT0FBTyxvREFBb0QsQ0FDekYsQ0FBQztZQUNGLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdCLENBQUM7UUFDRCwyRkFBMkY7UUFDM0YsTUFBTSxDQUNKLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSw2Q0FBNkMsRUFDNUQsa0VBQWtFLDZDQUE2QyxHQUFHLENBQ25ILENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
|