@aztec/simulator 0.59.0 → 0.60.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 -0
- package/dest/acvm/acvm.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.d.ts +3 -3
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +7 -7
- package/dest/acvm/oracle/typed_oracle.d.ts +4 -3
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +4 -4
- package/dest/acvm/serialize.d.ts +1 -0
- package/dest/acvm/serialize.d.ts.map +1 -1
- package/dest/avm/avm_context.d.ts +1 -1
- package/dest/avm/avm_context.js +1 -1
- package/dest/avm/avm_execution_environment.d.ts +2 -5
- package/dest/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/avm/avm_execution_environment.js +7 -15
- package/dest/avm/avm_gas.d.ts.map +1 -1
- package/dest/avm/avm_gas.js +1 -8
- package/dest/avm/avm_memory_types.d.ts +1 -0
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_simulator.d.ts +1 -0
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/bytecode_utils.d.ts +1 -0
- package/dest/avm/bytecode_utils.d.ts.map +1 -1
- package/dest/avm/fixtures/index.d.ts +3 -0
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +8 -2
- package/dest/avm/journal/journal.d.ts +14 -13
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +33 -33
- package/dest/avm/journal/nullifiers.d.ts +9 -9
- package/dest/avm/journal/nullifiers.d.ts.map +1 -1
- package/dest/avm/journal/nullifiers.js +24 -24
- package/dest/avm/journal/public_storage.d.ts +10 -10
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.js +21 -21
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +5 -5
- package/dest/avm/opcodes/environment_getters.d.ts +12 -13
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +13 -16
- package/dest/avm/opcodes/hashing.d.ts +2 -26
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +11 -95
- package/dest/avm/opcodes/index.d.ts +0 -1
- package/dest/avm/opcodes/index.d.ts.map +1 -1
- package/dest/avm/opcodes/index.js +1 -2
- package/dest/avm/opcodes/instruction.d.ts +1 -0
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +3 -3
- package/dest/avm/serialization/buffer_cursor.d.ts +1 -0
- package/dest/avm/serialization/buffer_cursor.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.d.ts +1 -0
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +2 -6
- package/dest/avm/serialization/instruction_serialization.d.ts +11 -14
- package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/instruction_serialization.js +11 -15
- package/dest/avm/test_utils.d.ts +1 -0
- package/dest/avm/test_utils.d.ts.map +1 -1
- package/dest/client/client_execution_context.d.ts +9 -10
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +30 -33
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +3 -4
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +3 -3
- package/dest/mocks/fixtures.js +2 -2
- package/dest/providers/acvm_native.d.ts +1 -0
- package/dest/providers/acvm_native.d.ts.map +1 -1
- package/dest/public/db_interfaces.d.ts +1 -0
- package/dest/public/db_interfaces.d.ts.map +1 -1
- package/dest/public/dual_side_effect_trace.d.ts +7 -6
- package/dest/public/dual_side_effect_trace.d.ts.map +1 -1
- package/dest/public/dual_side_effect_trace.js +19 -19
- package/dest/public/enqueued_call_side_effect_trace.d.ts +7 -6
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
- package/dest/public/enqueued_call_side_effect_trace.js +15 -17
- package/dest/public/enqueued_call_simulator.d.ts +1 -1
- package/dest/public/enqueued_call_simulator.d.ts.map +1 -1
- package/dest/public/enqueued_call_simulator.js +11 -12
- package/dest/public/enqueued_calls_processor.d.ts.map +1 -1
- package/dest/public/enqueued_calls_processor.js +2 -2
- package/dest/public/execution.d.ts +1 -0
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +2 -2
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +6 -5
- package/dest/public/public_db_sources.d.ts +1 -0
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/side_effect_trace.d.ts +7 -6
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +14 -15
- package/dest/public/side_effect_trace_interface.d.ts +7 -6
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/package.json +9 -9
- package/src/acvm/oracle/oracle.ts +0 -6
- package/src/acvm/oracle/typed_oracle.ts +0 -3
- package/src/avm/avm_context.ts +1 -1
- package/src/avm/avm_execution_environment.ts +0 -15
- package/src/avm/avm_gas.ts +0 -7
- package/src/avm/fixtures/index.ts +7 -2
- package/src/avm/journal/journal.ts +32 -32
- package/src/avm/journal/nullifiers.ts +23 -23
- package/src/avm/journal/public_storage.ts +20 -20
- package/src/avm/opcodes/accrued_substate.ts +4 -8
- package/src/avm/opcodes/environment_getters.ts +0 -3
- package/src/avm/opcodes/hashing.ts +9 -122
- package/src/avm/opcodes/index.ts +0 -1
- package/src/avm/opcodes/storage.ts +2 -2
- package/src/avm/serialization/bytecode_serialization.ts +0 -7
- package/src/avm/serialization/instruction_serialization.ts +0 -4
- package/src/client/client_execution_context.ts +21 -44
- package/src/client/private_execution.ts +1 -9
- package/src/client/simulator.ts +0 -2
- package/src/mocks/fixtures.ts +1 -1
- package/src/public/dual_side_effect_trace.ts +18 -18
- package/src/public/enqueued_call_side_effect_trace.ts +14 -20
- package/src/public/enqueued_call_simulator.ts +10 -23
- package/src/public/enqueued_calls_processor.ts +1 -3
- package/src/public/execution.ts +1 -1
- package/src/public/executor.ts +11 -5
- package/src/public/side_effect_trace.ts +19 -14
- package/src/public/side_effect_trace_interface.ts +6 -6
- package/dest/avm/opcodes/commitment.d.ts +0 -16
- package/dest/avm/opcodes/commitment.d.ts.map +0 -1
- package/dest/avm/opcodes/commitment.js +0 -51
- package/src/avm/opcodes/commitment.ts +0 -65
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enqueued_call_side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"enqueued_call_side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,29 +47,29 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
47
47
|
incrementSideEffectCounter() {
|
|
48
48
|
this.sideEffectCounter++;
|
|
49
49
|
}
|
|
50
|
-
tracePublicStorageRead(
|
|
50
|
+
tracePublicStorageRead(contractAddress, slot, value, _exists, _cached) {
|
|
51
51
|
// NOTE: exists and cached are unused for now but may be used for optimizations or kernel hints later
|
|
52
52
|
if (this.contractStorageReads.length + this.previousValidationRequestArrayLengths.publicDataReads >=
|
|
53
53
|
MAX_PUBLIC_DATA_READS_PER_TX) {
|
|
54
54
|
throw new SideEffectLimitReachedError('contract storage read', MAX_PUBLIC_DATA_READS_PER_TX);
|
|
55
55
|
}
|
|
56
|
-
this.contractStorageReads.push(new ContractStorageRead(slot, value, this.sideEffectCounter, AztecAddress.fromField(
|
|
56
|
+
this.contractStorageReads.push(new ContractStorageRead(slot, value, this.sideEffectCounter, AztecAddress.fromField(contractAddress)));
|
|
57
57
|
this.avmCircuitHints.storageValues.items.push(new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ value));
|
|
58
58
|
this.log.debug(`SLOAD cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
|
|
59
59
|
this.incrementSideEffectCounter();
|
|
60
60
|
}
|
|
61
|
-
tracePublicStorageWrite(
|
|
61
|
+
tracePublicStorageWrite(contractAddress, slot, value) {
|
|
62
62
|
if (this.contractStorageUpdateRequests.length + this.previousAccumulatedDataArrayLengths.publicDataUpdateRequests >=
|
|
63
63
|
MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
|
|
64
64
|
throw new SideEffectLimitReachedError('contract storage write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
65
65
|
}
|
|
66
|
-
this.contractStorageUpdateRequests.push(new ContractStorageUpdateRequest(slot, value, this.sideEffectCounter,
|
|
66
|
+
this.contractStorageUpdateRequests.push(new ContractStorageUpdateRequest(slot, value, this.sideEffectCounter, contractAddress));
|
|
67
67
|
this.log.debug(`SSTORE cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
|
|
68
68
|
this.incrementSideEffectCounter();
|
|
69
69
|
}
|
|
70
70
|
// TODO(8287): _exists can be removed once we have the vm properly handling the equality check
|
|
71
|
-
traceNoteHashCheck(
|
|
72
|
-
// NOTE:
|
|
71
|
+
traceNoteHashCheck(_contractAddress, noteHash, leafIndex, exists) {
|
|
72
|
+
// NOTE: contractAddress is unused because noteHash is an already-siloed leaf
|
|
73
73
|
if (this.noteHashReadRequests.length + this.previousValidationRequestArrayLengths.noteHashReadRequests >=
|
|
74
74
|
MAX_NOTE_HASH_READ_REQUESTS_PER_TX) {
|
|
75
75
|
throw new SideEffectLimitReachedError('note hash read request', MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
@@ -78,18 +78,18 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
78
78
|
this.avmCircuitHints.noteHashExists.items.push(new AvmKeyValueHint(/*key=*/ new Fr(leafIndex), /*value=*/ exists ? Fr.ONE : Fr.ZERO));
|
|
79
79
|
// NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
|
|
80
80
|
}
|
|
81
|
-
traceNewNoteHash(
|
|
81
|
+
traceNewNoteHash(contractAddress, noteHash) {
|
|
82
82
|
if (this.noteHashes.length + this.previousAccumulatedDataArrayLengths.noteHashes >= MAX_NOTE_HASHES_PER_TX) {
|
|
83
83
|
throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
|
|
84
84
|
}
|
|
85
|
-
this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter).scope(AztecAddress.fromField(
|
|
85
|
+
this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter).scope(AztecAddress.fromField(contractAddress)));
|
|
86
86
|
this.log.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
|
|
87
87
|
this.incrementSideEffectCounter();
|
|
88
88
|
}
|
|
89
|
-
traceNullifierCheck(
|
|
89
|
+
traceNullifierCheck(contractAddress, nullifier, _leafIndex, exists, _isPending) {
|
|
90
90
|
// NOTE: isPending and leafIndex are unused for now but may be used for optimizations or kernel hints later
|
|
91
91
|
this.enforceLimitOnNullifierChecks();
|
|
92
|
-
const readRequest = new ReadRequest(nullifier, this.sideEffectCounter).scope(AztecAddress.fromField(
|
|
92
|
+
const readRequest = new ReadRequest(nullifier, this.sideEffectCounter).scope(AztecAddress.fromField(contractAddress));
|
|
93
93
|
if (exists) {
|
|
94
94
|
this.nullifierReadRequests.push(readRequest);
|
|
95
95
|
}
|
|
@@ -100,11 +100,11 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
100
100
|
this.log.debug(`NULLIFIER_EXISTS cnt: ${this.sideEffectCounter}`);
|
|
101
101
|
this.incrementSideEffectCounter();
|
|
102
102
|
}
|
|
103
|
-
traceNewNullifier(
|
|
103
|
+
traceNewNullifier(contractAddress, nullifier) {
|
|
104
104
|
if (this.nullifiers.length + this.previousAccumulatedDataArrayLengths.nullifiers >= MAX_NULLIFIERS_PER_TX) {
|
|
105
105
|
throw new SideEffectLimitReachedError('nullifier', MAX_NULLIFIERS_PER_TX);
|
|
106
106
|
}
|
|
107
|
-
this.nullifiers.push(new Nullifier(nullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO).scope(AztecAddress.fromField(
|
|
107
|
+
this.nullifiers.push(new Nullifier(nullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO).scope(AztecAddress.fromField(contractAddress)));
|
|
108
108
|
this.log.debug(`NEW_NULLIFIER cnt: ${this.sideEffectCounter}`);
|
|
109
109
|
this.incrementSideEffectCounter();
|
|
110
110
|
}
|
|
@@ -303,12 +303,10 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
303
303
|
function createPublicCallRequest(avmEnvironment) {
|
|
304
304
|
const callContext = CallContext.from({
|
|
305
305
|
msgSender: avmEnvironment.sender,
|
|
306
|
-
|
|
306
|
+
contractAddress: avmEnvironment.address,
|
|
307
307
|
functionSelector: avmEnvironment.functionSelector,
|
|
308
|
-
isDelegateCall: avmEnvironment.isDelegateCall,
|
|
309
308
|
isStaticCall: avmEnvironment.isStaticCall,
|
|
310
309
|
});
|
|
311
|
-
return new PublicCallRequest(
|
|
312
|
-
/*counter=*/ 0);
|
|
310
|
+
return new PublicCallRequest(callContext, computeVarArgsHash(avmEnvironment.calldata), /*counter=*/ 0);
|
|
313
311
|
}
|
|
314
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_side_effect_trace.js","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"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"}
|
|
312
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_side_effect_trace.js","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ export declare class EnqueuedCallSimulator {
|
|
|
37
37
|
* @returns A corresponding PublicCallData object.
|
|
38
38
|
*/
|
|
39
39
|
private getPublicCallData;
|
|
40
|
-
private
|
|
40
|
+
private getPublicCircuitPublicInputs;
|
|
41
41
|
private getBytecodeHash;
|
|
42
42
|
}
|
|
43
43
|
//# sourceMappingURL=enqueued_call_simulator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enqueued_call_simulator.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,yBAAyB,EAEzB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,EAAE,
|
|
1
|
+
{"version":3,"file":"enqueued_call_simulator.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,yBAAyB,EAEzB,KAAK,sBAAsB,EAC3B,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,EAAE,EACF,GAAG,EACH,KAAK,eAAe,EACpB,KAAK,MAAM,EAsBX,KAAK,iBAAiB,EAGtB,KAAK,+BAA+B,EAQpC,qBAAqB,EAGtB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAmBzF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oCAAoC;IACpC,eAAe,EAAE,oBAAoB,EAAE,CAAC;IACxC,+DAA+D;IAC/D,YAAY,EAAE,qBAAqB,CAAC;IACpC,4EAA4E;IAC5E,kBAAkB,EAAE,yBAAyB,CAAC;IAC9C,qDAAqD;IACrD,YAAY,EAAE,yBAAyB,CAAC;IACxC,uDAAuD;IACvD,OAAO,EAAE,GAAG,CAAC;IACb,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,qBAAqB;IAG9B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,gBAAgB;IAN1B,OAAO,CAAC,GAAG,CAAc;gBAEf,EAAE,EAAE,wBAAwB,EAC5B,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM;IAK5B,QAAQ,CACZ,WAAW,EAAE,iBAAiB,EAC9B,gBAAgB,EAAE,sBAAsB,EACxC,EAAE,EAAE,EAAE,EACN,0BAA0B,EAAE,+BAA+B,EAC3D,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,CAAC;YA8DhB,6BAA6B;IAkE3C,yDAAyD;IACzD,OAAO,CAAC,0BAA0B;YAIpB,gBAAgB;IAY9B;;;;;OAKG;YACW,iBAAiB;YAMjB,4BAA4B;IA4D1C,OAAO,CAAC,eAAe;CAMxB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AVM_REQUEST, MerkleTreeId, NestedProcessReturnValues, ProvingRequestType, PublicKernelPhase, UnencryptedFunctionL2Logs, } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecAddress, ContractStorageRead, ContractStorageUpdateRequest, Fr,
|
|
2
|
+
import { AztecAddress, ContractStorageRead, ContractStorageUpdateRequest, Fr, Gas, L2ToL1Message, LogHash, MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL, MAX_L2_GAS_PER_ENQUEUED_CALL, MAX_L2_TO_L1_MSGS_PER_CALL, MAX_NOTE_HASHES_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIERS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_UNENCRYPTED_LOGS_PER_CALL, NESTED_RECURSIVE_PROOF_LENGTH, NoteHash, Nullifier, PublicAccumulatedData, PublicAccumulatedDataArrayLengths, PublicCallData, PublicCircuitPublicInputs, PublicInnerCallRequest, PublicKernelInnerCircuitPrivateInputs, PublicKernelInnerData, PublicValidationRequestArrayLengths, PublicValidationRequests, ReadRequest, RevertCode, TreeLeafReadRequest, VMCircuitPublicInputs, makeEmptyProof, makeEmptyRecursiveProof, } from '@aztec/circuits.js';
|
|
3
3
|
import { computeVarArgsHash } from '@aztec/circuits.js/hash';
|
|
4
4
|
import { makeTuple } from '@aztec/foundation/array';
|
|
5
5
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
@@ -47,7 +47,7 @@ export class EnqueuedCallSimulator {
|
|
|
47
47
|
constants.globalVariables = this.globalVariables;
|
|
48
48
|
const result = await this.publicExecutor.simulate(executionRequest, constants, allocatedGas, tx.data.constants.txContext, pendingNullifiers, transactionFee, startSideEffectCounter, previousValidationRequestArrayLengths, previousAccumulatedDataArrayLengths);
|
|
49
49
|
const callStack = makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicInnerCallRequest.empty);
|
|
50
|
-
callStack[0].item.contractAddress = callRequest.contractAddress;
|
|
50
|
+
callStack[0].item.contractAddress = callRequest.callContext.contractAddress;
|
|
51
51
|
callStack[0].item.callContext = callRequest.callContext;
|
|
52
52
|
callStack[0].item.argsHash = callRequest.argsHash;
|
|
53
53
|
const accumulatedData = PublicAccumulatedData.empty();
|
|
@@ -64,14 +64,14 @@ export class EnqueuedCallSimulator {
|
|
|
64
64
|
for (const result of executionResults) {
|
|
65
65
|
// Accumulate gas used in this enqueued call.
|
|
66
66
|
gasUsed = gasUsed.add(Gas.from(result.startGasLeft).sub(Gas.from(result.endGasLeft)));
|
|
67
|
+
const { contractAddress, functionSelector } = result.executionRequest.callContext;
|
|
67
68
|
// Sanity check for a current upstream assumption.
|
|
68
69
|
// Consumers of the result seem to expect "reverted <=> revertReason !== undefined".
|
|
69
|
-
const functionSelector = result.executionRequest.callContext.functionSelector.toString();
|
|
70
70
|
if (result.reverted && !result.revertReason) {
|
|
71
|
-
throw new Error(`Simulation of ${
|
|
71
|
+
throw new Error(`Simulation of ${contractAddress}:${functionSelector}(${result.functionName}) reverted with no reason.`);
|
|
72
72
|
}
|
|
73
73
|
// Simulate the public kernel circuit.
|
|
74
|
-
this.log.debug(`Running public kernel inner circuit for ${
|
|
74
|
+
this.log.debug(`Running public kernel inner circuit for ${contractAddress}:${functionSelector}(${result.functionName})`);
|
|
75
75
|
const callData = await this.getPublicCallData(result);
|
|
76
76
|
const { inputs, output } = await this.runKernelCircuit(kernelOutput, callData);
|
|
77
77
|
kernelOutput = output;
|
|
@@ -80,7 +80,7 @@ export class EnqueuedCallSimulator {
|
|
|
80
80
|
// Safely return the revert reason and the kernel output (which has had its revertible side effects dropped)
|
|
81
81
|
// TODO(@leila) we shouldn't drop everything when it reverts. The tail kernel needs the data to prove that it's reverted for the correct reason.
|
|
82
82
|
if (result.reverted) {
|
|
83
|
-
this.log.debug(`Reverting on ${
|
|
83
|
+
this.log.debug(`Reverting on ${contractAddress}:${functionSelector}(${result.functionName}) with reason: ${result.revertReason}`);
|
|
84
84
|
// TODO(@spalladino): Check gasUsed is correct. The AVM should take care of setting gasLeft to zero upon a revert.
|
|
85
85
|
return {
|
|
86
86
|
provingRequests,
|
|
@@ -121,13 +121,13 @@ export class EnqueuedCallSimulator {
|
|
|
121
121
|
*/
|
|
122
122
|
async getPublicCallData(result) {
|
|
123
123
|
const bytecodeHash = await this.getBytecodeHash(result);
|
|
124
|
-
const
|
|
125
|
-
return new PublicCallData(
|
|
124
|
+
const publicInputs = await this.getPublicCircuitPublicInputs(result);
|
|
125
|
+
return new PublicCallData(publicInputs, makeEmptyProof(), bytecodeHash);
|
|
126
126
|
}
|
|
127
|
-
async
|
|
127
|
+
async getPublicCircuitPublicInputs(result) {
|
|
128
128
|
const publicDataTreeInfo = await this.db.getTreeInfo(MerkleTreeId.PUBLIC_DATA_TREE);
|
|
129
129
|
this.historicalHeader.state.partial.publicDataTree.root = Fr.fromBuffer(publicDataTreeInfo.root);
|
|
130
|
-
|
|
130
|
+
return PublicCircuitPublicInputs.from({
|
|
131
131
|
callContext: result.executionRequest.callContext,
|
|
132
132
|
proverAddress: AztecAddress.ZERO,
|
|
133
133
|
argsHash: computeVarArgsHash(result.executionRequest.args),
|
|
@@ -153,7 +153,6 @@ export class EnqueuedCallSimulator {
|
|
|
153
153
|
// TODO(@just-mitch): need better mapping from simulator to revert code.
|
|
154
154
|
revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
|
|
155
155
|
});
|
|
156
|
-
return new PublicCallStackItem(result.executionRequest.contractAddress, new FunctionData(result.executionRequest.callContext.functionSelector, false), publicCircuitPublicInputs);
|
|
157
156
|
}
|
|
158
157
|
getBytecodeHash(_result) {
|
|
159
158
|
// TODO: Determine how to calculate bytecode hash. Circuits just check it isn't zero for now.
|
|
@@ -162,4 +161,4 @@ export class EnqueuedCallSimulator {
|
|
|
162
161
|
return Promise.resolve(bytecodeHash);
|
|
163
162
|
}
|
|
164
163
|
}
|
|
165
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_simulator.js","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"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"}
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_simulator.js","sourceRoot":"","sources":["../../src/public/enqueued_call_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAEX,YAAY,EACZ,yBAAyB,EACzB,kBAAkB,EAElB,iBAAiB,EAIjB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,4BAA4B,EAC5B,EAAE,EACF,GAAG,EAGH,aAAa,EACb,OAAO,EACP,uCAAuC,EACvC,4BAA4B,EAC5B,0BAA0B,EAC1B,wBAAwB,EACxB,oCAAoC,EACpC,uBAAuB,EACvB,iDAAiD,EACjD,oCAAoC,EACpC,qCAAqC,EACrC,mCAAmC,EACnC,8BAA8B,EAC9B,wCAAwC,EACxC,6BAA6B,EAC7B,6BAA6B,EAC7B,QAAQ,EACR,SAAS,EACT,qBAAqB,EACrB,iCAAiC,EACjC,cAAc,EAEd,yBAAyB,EACzB,sBAAsB,EAEtB,qCAAqC,EACrC,qBAAqB,EACrB,mCAAmC,EACnC,wBAAwB,EACxB,WAAW,EACX,UAAU,EACV,mBAAmB,EACnB,qBAAqB,EACrB,cAAc,EACd,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAoB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAGzE,OAAO,EAA8B,4BAA4B,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAInH,SAAS,qBAAqB,CAC5B,MAA6C,EAC7C,MAA6B;IAE7B,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAS;QAC1B,QAAQ,EAAE,MAAM,CAAC,eAAe;QAChC,aAAa,EAAE;YACb,IAAI,EAAE,kBAAkB,CAAC,mBAAmB;YAC5C,MAAM;SACP;KACF,CAAC;AACJ,CAAC;AAiBD,MAAM,OAAO,qBAAqB;IAEhC,YACU,EAA4B,EAC5B,cAA8B,EAC9B,qBAAmD,EACnD,eAAgC,EAChC,gBAAwB;QAJxB,OAAE,GAAF,EAAE,CAA0B;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,0BAAqB,GAArB,qBAAqB,CAA8B;QACnD,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAQ;QAEhC,IAAI,CAAC,GAAG,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,WAA8B,EAC9B,gBAAwC,EACxC,EAAM,EACN,0BAA2D,EAC3D,YAAiB,EACjB,cAAkB,EAClB,KAAwB;QAExB,4EAA4E;QAC5E,4EAA4E;QAC5E,MAAM,YAAY,GAAG,IAAI,GAAG;QAC1B,UAAU,CAAC,YAAY,CAAC,KAAK;QAC7B,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,4BAA4B,CAAC,CACtE,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,0BAA0B,CAAC,CAAC;QACtF,MAAM,sBAAsB,GAAG,0BAA0B,CAAC,oBAAoB,GAAG,CAAC,CAAC;QAEnF,MAAM,mBAAmB,GACvB,KAAK,KAAK,iBAAiB,CAAC,KAAK;YAC/B,CAAC,CAAC,0BAA0B,CAAC,oBAAoB;YACjD,CAAC,CAAC,0BAA0B,CAAC,GAAG,CAAC;QACrC,MAAM,qCAAqC,GAAG,mCAAmC,CAAC,GAAG,CACnF,0BAA0B,CAAC,kBAAkB,CAC9C,CAAC;QACF,MAAM,mCAAmC,GAAG,iCAAiC,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAEvG,wEAAwE;QACxE,+CAA+C;QAC/C,MAAM,SAAS,GAAG,0BAA0B,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAC/D,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAC/C,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAC3B,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,qCAAqC,EACrC,mCAAmC,CACpC,CAAC;QAEF,MAAM,SAAS,GAAG,SAAS,CAAC,mCAAmC,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAC/F,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,eAAe,CAAC;QAC5E,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;QACxD,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QAElD,MAAM,eAAe,GAAG,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACtD,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;QAEjD,MAAM,oBAAoB,GAAG,IAAI,qBAAqB,CACpD,0BAA0B,CAAC,SAAS,EACpC,WAAW,EACX,SAAS,EACT,qCAAqC,EACrC,wBAAwB,CAAC,KAAK,EAAE,EAChC,mCAAmC,EACnC,eAAe,EACf,sBAAsB,EACtB,sBAAsB,EACtB,YAAY,EACZ,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,QAAQ,CAChB,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAChF,CAAC;IAEO,KAAK,CAAC,6BAA6B,CACzC,SAAgC,EAChC,oBAA2C;QAE3C,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,eAAe,GAAwB,EAAE,CAAC;QAChD,IAAI,OAAO,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,YAAY,CAAC;QACjB,IAAI,YAAY,GAAG,oBAAoB,CAAC;QAExC,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;YACtC,6CAA6C;YAC7C,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAEtF,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC;YAElF,kDAAkD;YAClD,oFAAoF;YACpF,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CACb,iBAAiB,eAAe,IAAI,gBAAgB,IAAI,MAAM,CAAC,YAAY,4BAA4B,CACxG,CAAC;YACJ,CAAC;YAED,sCAAsC;YACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2CAA2C,eAAe,IAAI,gBAAgB,IAAI,MAAM,CAAC,YAAY,GAAG,CACzG,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACtD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC/E,YAAY,GAAG,MAAM,CAAC;YAEtB,8DAA8D;YAC9D,eAAe,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YAE5D,4GAA4G;YAC5G,gJAAgJ;YAChJ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,gBAAgB,eAAe,IAAI,gBAAgB,IAAI,MAAM,CAAC,YAAY,kBAAkB,MAAM,CAAC,YAAY,EAAE,CAClH,CAAC;gBACF,kHAAkH;gBAElH,OAAO;oBACL,eAAe;oBACf,YAAY;oBACZ,kBAAkB,EAAE,yBAAyB,CAAC,KAAK,EAAE;oBACrD,YAAY,EAAE,yBAAyB,CAAC,KAAK,EAAE;oBAC/C,OAAO;oBACP,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO;YACL,eAAe;YACf,YAAY;YACZ,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;YAChD,YAAY,EAAE,4BAA4B,CAAC,SAAS,CAAC;YACrD,OAAO;YACP,YAAY;SACb,CAAC;IACJ,CAAC;IAED,yDAAyD;IACjD,0BAA0B,CAAC,EAAmC;QACpE,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACjG,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,cAAqC,EACrC,QAAwB;QAExB,sCAAsC;QACtC,MAAM,KAAK,GAAG,uBAAuB,CAAC,6BAA6B,CAAC,CAAC;QACrE,MAAM,EAAE,GAAG,kBAAkB,CAAC,yBAAyB,CAAC;QACxD,MAAM,cAAc,GAAG,IAAI,qBAAqB,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,IAAI,qCAAqC,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACnF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;IAC/F,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,iBAAiB,CAAC,MAA6B;QAC3D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;QACrE,OAAO,IAAI,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,CAAC;IAC1E,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,MAA6B;QACtE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACpF,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEjG,OAAO,yBAAyB,CAAC,IAAI,CAAC;YACpC,WAAW,EAAE,MAAM,CAAC,gBAAgB,CAAC,WAAW;YAChD,aAAa,EAAE,YAAY,CAAC,IAAI;YAChC,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC1D,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,wBAAwB,CAAC;YACtF,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,uBAAuB,CAAC;YACtF,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,KAAK,EAAE,EAAE,0BAA0B,CAAC;YACjG,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;YACrD,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,WAAW,EAAE,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC;YACpD,oBAAoB,EAAE,WAAW,CAC/B,MAAM,CAAC,oBAAoB,EAC3B,mBAAmB,CAAC,KAAK,EAAE,EAC3B,oCAAoC,CACrC;YACD,qBAAqB,EAAE,WAAW,CAChC,MAAM,CAAC,qBAAqB,EAC5B,WAAW,CAAC,KAAK,EAAE,EACnB,oCAAoC,CACrC;YACD,gCAAgC,EAAE,WAAW,CAC3C,MAAM,CAAC,gCAAgC,EACvC,WAAW,CAAC,KAAK,EAAE,EACnB,iDAAiD,CAClD;YACD,qBAAqB,EAAE,WAAW,CAChC,MAAM,CAAC,qBAAqB,EAC5B,mBAAmB,CAAC,KAAK,EAAE,EAC3B,uCAAuC,CACxC;YACD,oBAAoB,EAAE,WAAW,CAC/B,MAAM,CAAC,oBAAoB,EAC3B,mBAAmB,CAAC,KAAK,EAAE,EAC3B,8BAA8B,CAC/B;YACD,6BAA6B,EAAE,WAAW,CACxC,MAAM,CAAC,6BAA6B,EACpC,4BAA4B,CAAC,KAAK,EAAE,EACpC,wCAAwC,CACzC;YACD,kBAAkB,EAAE,WAAW,CAC7B,MAAM,CAAC,kBAAkB,EACzB,sBAAsB,CAAC,KAAK,EAAE,EAC9B,qCAAqC,CACtC;YACD,qBAAqB,EAAE,WAAW,CAAC,MAAM,CAAC,qBAAqB,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,6BAA6B,CAAC;YAChH,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAC3C,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YACvC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,wEAAwE;YACxE,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;SAC5E,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,OAA8B;QACpD,6FAA6F;QAC7F,kEAAkE;QAClE,MAAM,YAAY,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enqueued_calls_processor.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAEhB,KAAK,sBAAsB,EAE3B,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,yBAAyB,EAE9B,KAAK,iBAAiB,EAOvB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAuB9E,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,gDAAgD;IAChD,eAAe,EAAE,oBAAoB,EAAE,CAAC;IACxC,0EAA0E;IAC1E,gBAAgB,EAAE,yBAAyB,CAAC;IAC5C,qDAAqD;IACrD,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,4CAA4C;IAC5C,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,sBAAsB;IAI/B,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,yBAAyB;IAPnC,OAAO,CAAC,GAAG,CAAc;gBAGf,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,qBAAqB,EAC5C,yBAAyB,EAAE,yBAAyB;IAK9D,MAAM,CAAC,MAAM,CACX,EAAE,EAAE,wBAAwB,EAC5B,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,YAAY;IAqB5B,MAAM,CAAC,2BAA2B,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,sBAAsB,EAAE;IAe9F,MAAM,CAAC,sBAAsB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,EAAE;IAe9E,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;YAyErC,YAAY;
|
|
1
|
+
{"version":3,"file":"enqueued_calls_processor.d.ts","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,WAAW,EAEhB,KAAK,sBAAsB,EAE3B,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,EAAE,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,yBAAyB,EAE9B,KAAK,iBAAiB,EAOvB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAuB9E,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,gDAAgD;IAChD,eAAe,EAAE,oBAAoB,EAAE,CAAC;IACxC,0EAA0E;IAC1E,gBAAgB,EAAE,yBAAyB,CAAC;IAC5C,qDAAqD;IACrD,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,4CAA4C;IAC5C,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,4BAA4B;IAC5B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC,CAAC;AAEF,qBAAa,sBAAsB;IAI/B,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB;IAC7B,OAAO,CAAC,yBAAyB;IAPnC,OAAO,CAAC,GAAG,CAAc;gBAGf,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,qBAAqB,EAC5C,yBAAyB,EAAE,yBAAyB;IAK9D,MAAM,CAAC,MAAM,CACX,EAAE,EAAE,wBAAwB,EAC5B,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,4BAA4B,EACnD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,YAAY;IAqB5B,MAAM,CAAC,2BAA2B,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,sBAAsB,EAAE;IAe9F,MAAM,CAAC,sBAAsB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,EAAE;IAe9E,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;YAyErC,YAAY;IAwF1B,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,iBAAiB;YAoBX,qBAAqB;IAuBnC,OAAO,CAAC,qBAAqB;CAa9B"}
|
|
@@ -131,7 +131,7 @@ export class EnqueuedCallsProcessor {
|
|
|
131
131
|
const transactionFee = this.getTransactionFee(tx, publicKernelOutput, phase);
|
|
132
132
|
const enqueuedCallResult = await this.enqueuedCallSimulator.simulate(callRequest, executionRequest, tx, publicKernelOutput, availableGas, transactionFee, phase);
|
|
133
133
|
if (enqueuedCallResult.revertReason && !PhaseIsRevertible[phase]) {
|
|
134
|
-
this.log.debug(`Simulation error on ${executionRequest.contractAddress
|
|
134
|
+
this.log.debug(`Simulation error on ${executionRequest.callContext.contractAddress}:${executionRequest.callContext.functionSelector} with reason: ${enqueuedCallResult.revertReason}`);
|
|
135
135
|
throw enqueuedCallResult.revertReason;
|
|
136
136
|
}
|
|
137
137
|
provingRequests.push(...enqueuedCallResult.provingRequests);
|
|
@@ -213,4 +213,4 @@ export class EnqueuedCallsProcessor {
|
|
|
213
213
|
return new PublicKernelData(previousOutput, proof, vk, vkIndex, siblingPath);
|
|
214
214
|
}
|
|
215
215
|
}
|
|
216
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_calls_processor.js","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"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"}
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_calls_processor.js","sourceRoot":"","sources":["../../src/public/enqueued_calls_processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
3
|
import { NestedProcessReturnValues, type PublicExecutionRequest, type SimulationError, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
|
|
3
4
|
import { type AvmExecutionHints, type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, Gas, type L2ToL1Message, type LogHash, type NoteHash, type Nullifier, PublicInnerCallRequest, type ReadRequest, type TreeLeafReadRequest } from '@aztec/circuits.js';
|
|
4
5
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,yBAAyB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,eAAe,EACpB,KAAK,yBAAyB,EAC/B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,GAAG,EACH,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,SAAS,EAEd,sBAAsB,EACtB,KAAK,WAAW,EAEhB,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAG5B;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,wDAAwD;IACxD,gBAAgB,EAAE,sBAAsB,CAAC;IAEzC,iEAAiE;IACjE,sBAAsB,EAAE,EAAE,CAAC;IAC3B,iEAAiE;IACjE,oBAAoB,EAAE,EAAE,CAAC;IACzB,4DAA4D;IAC5D,YAAY,EAAE,GAAG,CAAC;IAClB,yDAAyD;IACzD,UAAU,EAAE,GAAG,CAAC;IAChB,uCAAuC;IACvC,cAAc,EAAE,EAAE,CAAC;IAEnB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,QAAQ,EAAE,EAAE,EAAE,CAAC;IACf,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,sCAAsC;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB,mDAAmD;IACnD,YAAY,CAAC,EAAE,eAAe,CAAC;IAE/B,4DAA4D;IAC5D,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,sEAAsE;IACtE,6BAA6B,EAAE,4BAA4B,EAAE,CAAC;IAC9D,oEAAoE;IACpE,UAAU,EAAE,QAAQ,EAAE,CAAC;IACvB,wDAAwD;IACxD,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,iEAAiE;IACjE,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,wDAAwD;IACxD,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,2DAA2D;IAC3D,qBAAqB,EAAE,mBAAmB,EAAE,CAAC;IAC7C;;;OAGG;IACH,qBAAqB,EAAE,OAAO,EAAE,CAAC;IACjC;;;OAGG;IACH,eAAe,EAAE,yBAAyB,CAAC;IAC3C;;;OAGG;IACH,kBAAkB,EAAE,yBAAyB,CAAC;IAE9C,+DAA+D;IAC/D,kBAAkB,EAAE,sBAAsB,EAAE,CAAC;IAC7C,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAEzB,uCAAuC;IACvC,eAAe,EAAE,iBAAiB,CAAC;IAEnC,yEAAyE;IACzE,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,eAAe,EAAE,qBAAqB,GAAG,yBAAyB,CAI9G;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,CAE9F;AAED;;;GAGG;AAEH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,QAAQ,EAAE,EACtB,UAAU,EAAE,SAAS,EAAE,EACvB,6BAA6B,EAAE,4BAA4B,EAAE,EAC7D,cAAc,EAAE,aAAa,EAAE,EAC/B,eAAe,EAAE,yBAAyB,QAW3C;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,qBAAqB,0BAatE"}
|
package/dest/public/execution.js
CHANGED
|
@@ -30,9 +30,9 @@ export function checkValidStaticCall(noteHashes, nullifiers, contractStorageUpda
|
|
|
30
30
|
}
|
|
31
31
|
export function resultToPublicCallRequest(result) {
|
|
32
32
|
const request = result.executionRequest;
|
|
33
|
-
const item = new PublicCallStackItemCompressed(request.contractAddress, request.callContext, computeVarArgsHash(request.args), computeVarArgsHash(result.returnValues),
|
|
33
|
+
const item = new PublicCallStackItemCompressed(request.callContext.contractAddress, request.callContext, computeVarArgsHash(request.args), computeVarArgsHash(result.returnValues),
|
|
34
34
|
// TODO(@just-mitch): need better mapping from simulator to revert code.
|
|
35
35
|
result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK, Gas.from(result.startGasLeft), Gas.from(result.endGasLeft));
|
|
36
36
|
return new PublicInnerCallRequest(item, result.startSideEffectCounter.toNumber());
|
|
37
37
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLHlCQUF5QixHQUkxQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFLTCxHQUFHLEVBS0gsNkJBQTZCLEVBQzdCLHNCQUFzQixFQUV0QixVQUFVLEdBRVgsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQTZFN0Q7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsNEJBQTRCLENBQUMsZUFBc0M7SUFDakYsTUFBTSxHQUFHLEdBQUcsSUFBSSx5QkFBeUIsQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDeEUsR0FBRyxDQUFDLE1BQU0sR0FBRyxlQUFlLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsNEJBQTRCLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQztJQUNwSCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUM7QUFFRCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsTUFBNkI7SUFDbkUsT0FBTyxDQUFDLE1BQU0sRUFBRSxHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0FBQ2xGLENBQUM7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLFVBQXNCLEVBQ3RCLFVBQXVCLEVBQ3ZCLDZCQUE2RCxFQUM3RCxjQUErQixFQUMvQixlQUEwQztJQUUxQyxJQUNFLDZCQUE2QixDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hDLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUNyQixVQUFVLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDckIsY0FBYyxDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3pCLGVBQWUsQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsRUFDL0IsQ0FBQztRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsNEVBQTRFLENBQUMsQ0FBQztJQUNoRyxDQUFDO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSx5QkFBeUIsQ0FBQyxNQUE2QjtJQUNyRSxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsZ0JBQWdCLENBQUM7SUFDeEMsTUFBTSxJQUFJLEdBQUcsSUFBSSw2QkFBNkIsQ0FDNUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQ25DLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFDaEMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQztJQUN2Qyx3RUFBd0U7SUFDeEUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsRUFBRSxFQUMvRCxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsRUFDN0IsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQzVCLENBQUM7SUFDRixPQUFPLElBQUksc0JBQXNCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0FBQ3BGLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EACL,KAAK,oBAAoB,EACzB,EAAE,EACF,GAAG,EAEH,KAAK,SAAS,EACd,iCAAiC,EACjC,mCAAmC,EACnC,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAU/D,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D;;GAEG;AACH,qBAAa,cAAc;IAGb,OAAO,CAAC,QAAQ,CAAC,YAAY;IAFzC,OAAO,EAAE,eAAe,CAAC;gBAEI,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe;IAIhF,MAAM,CAAC,QAAQ,CAAC,GAAG,yCAAwD;IAE3E;;;;;;;;;;;;OAYG;IACU,QAAQ,CACnB,gBAAgB,EAAE,sBAAsB,EACxC,SAAS,EAAE,oBAAoB,EAC/B,YAAY,EAAE,GAAG,EACjB,UAAU,EAAE,SAAS,EACrB,uBAAuB,EAAE,SAAS,EAAE,EACpC,cAAc,GAAE,EAAY,EAC5B,sBAAsB,GAAE,MAAU,EAClC,qCAAqC,GAAE,mCAAiF,EACxH,mCAAmC,GAAE,iCAA6E,GACjH,OAAO,CAAC,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EACL,KAAK,oBAAoB,EACzB,EAAE,EACF,GAAG,EAEH,KAAK,SAAS,EACd,iCAAiC,EACjC,mCAAmC,EACnC,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAU/D,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D;;GAEG;AACH,qBAAa,cAAc;IAGb,OAAO,CAAC,QAAQ,CAAC,YAAY;IAFzC,OAAO,EAAE,eAAe,CAAC;gBAEI,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe;IAIhF,MAAM,CAAC,QAAQ,CAAC,GAAG,yCAAwD;IAE3E;;;;;;;;;;;;OAYG;IACU,QAAQ,CACnB,gBAAgB,EAAE,sBAAsB,EACxC,SAAS,EAAE,oBAAoB,EAC/B,YAAY,EAAE,GAAG,EACjB,UAAU,EAAE,SAAS,EACrB,uBAAuB,EAAE,SAAS,EAAE,EACpC,cAAc,GAAE,EAAY,EAC5B,sBAAsB,GAAE,MAAU,EAClC,qCAAqC,GAAE,mCAAiF,EACxH,mCAAmC,GAAE,iCAA6E,GACjH,OAAO,CAAC,qBAAqB,CAAC;CAgFlC"}
|
package/dest/public/executor.js
CHANGED
|
@@ -33,10 +33,10 @@ export class PublicExecutor {
|
|
|
33
33
|
* @returns The result of execution, including the results of all nested calls.
|
|
34
34
|
*/
|
|
35
35
|
async simulate(executionRequest, constants, allocatedGas, _txContext, pendingSiloedNullifiers, transactionFee = Fr.ZERO, startSideEffectCounter = 0, previousValidationRequestArrayLengths = PublicValidationRequestArrayLengths.empty(), previousAccumulatedDataArrayLengths = PublicAccumulatedDataArrayLengths.empty()) {
|
|
36
|
-
const address = executionRequest.contractAddress;
|
|
36
|
+
const address = executionRequest.callContext.contractAddress;
|
|
37
37
|
const selector = executionRequest.callContext.functionSelector;
|
|
38
38
|
const fnName = await getPublicFunctionDebugName(this.worldStateDB, address, selector, executionRequest.args);
|
|
39
|
-
PublicExecutor.log.verbose(`[AVM] Executing public external function ${fnName}@${address}.`);
|
|
39
|
+
PublicExecutor.log.verbose(`[AVM] Executing public external function ${fnName}@${address} with ${allocatedGas.l2Gas} allocated L2 gas.`);
|
|
40
40
|
const timer = new Timer();
|
|
41
41
|
const innerCallTrace = new PublicSideEffectTrace(startSideEffectCounter);
|
|
42
42
|
const enqueuedCallTrace = new PublicEnqueuedCallSideEffectTrace(startSideEffectCounter, previousValidationRequestArrayLengths, previousAccumulatedDataArrayLengths);
|
|
@@ -71,6 +71,7 @@ export class PublicExecutor {
|
|
|
71
71
|
const _vmCircuitPublicInputs = enqueuedCallTrace.toVMCircuitPublicInputs(constants, avmExecutionEnv,
|
|
72
72
|
/*startGasLeft=*/ allocatedGas,
|
|
73
73
|
/*endGasLeft=*/ Gas.from(avmContext.machineState.gasLeft), avmResult);
|
|
74
|
+
PublicExecutor.log.verbose(`[AVM] ${fnName} simulation complete. Reverted=${avmResult.reverted}. Consumed ${allocatedGas.l2Gas - avmContext.machineState.gasLeft.l2Gas} L2 gas, ending with ${avmContext.machineState.gasLeft.l2Gas} L2 gas left.`);
|
|
74
75
|
return publicExecutionResult;
|
|
75
76
|
}
|
|
76
77
|
}
|
|
@@ -83,7 +84,7 @@ PublicExecutor.log = createDebugLogger('aztec:simulator:public_executor');
|
|
|
83
84
|
* @returns
|
|
84
85
|
*/
|
|
85
86
|
function createAvmExecutionEnvironment(executionRequest, globalVariables, transactionFee) {
|
|
86
|
-
return new AvmExecutionEnvironment(executionRequest.
|
|
87
|
-
/*contractCallDepth=*/ Fr.zero(), transactionFee, globalVariables, executionRequest.callContext.isStaticCall, executionRequest.
|
|
87
|
+
return new AvmExecutionEnvironment(executionRequest.callContext.contractAddress, executionRequest.callContext.msgSender, executionRequest.callContext.functionSelector,
|
|
88
|
+
/*contractCallDepth=*/ Fr.zero(), transactionFee, globalVariables, executionRequest.callContext.isStaticCall, executionRequest.args);
|
|
88
89
|
}
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2V4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFFTCxFQUFFLEVBQ0YsR0FBRyxFQUdILGlDQUFpQyxFQUNqQyxtQ0FBbUMsR0FFcEMsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHaEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzlFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDeEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbEUsT0FBTyxFQUFFLGlDQUFpQyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFFekYsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRS9EOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGNBQWM7SUFHekIsWUFBNkIsWUFBMEIsRUFBRSxNQUF1QjtRQUFuRCxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUNyRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksZUFBZSxDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFJRDs7Ozs7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
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
3
|
import { type MerkleTreeReadOperations, type MerkleTreeWriteOperations, NullifierMembershipWitness, type Tx } from '@aztec/circuit-types';
|
|
3
4
|
import { type AztecAddress, type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, Fr, FunctionSelector, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
4
5
|
import { type CommitmentsDB, MessageLoadOracleInputs, type PublicContractsDB, type PublicStateDB } from '@aztec/simulator';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
3
|
import { type ContractInstanceWithAddress, Gas } from '@aztec/circuits.js';
|
|
3
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
4
5
|
import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
|
|
@@ -35,12 +36,12 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
|
|
|
35
36
|
fork(): PublicSideEffectTrace;
|
|
36
37
|
getCounter(): number;
|
|
37
38
|
private incrementSideEffectCounter;
|
|
38
|
-
tracePublicStorageRead(
|
|
39
|
-
tracePublicStorageWrite(
|
|
40
|
-
traceNoteHashCheck(
|
|
41
|
-
traceNewNoteHash(
|
|
42
|
-
traceNullifierCheck(
|
|
43
|
-
traceNewNullifier(
|
|
39
|
+
tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, _exists: boolean, _cached: boolean): void;
|
|
40
|
+
tracePublicStorageWrite(contractAddress: Fr, slot: Fr, value: Fr): void;
|
|
41
|
+
traceNoteHashCheck(_contractAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean): void;
|
|
42
|
+
traceNewNoteHash(_contractAddress: Fr, noteHash: Fr): void;
|
|
43
|
+
traceNullifierCheck(_contractAddress: Fr, nullifier: Fr, _leafIndex: Fr, exists: boolean, _isPending: boolean): void;
|
|
44
|
+
traceNewNullifier(_contractAddress: Fr, nullifier: Fr): void;
|
|
44
45
|
traceL1ToL2MessageCheck(_contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean): void;
|
|
45
46
|
traceNewL2ToL1Message(_contractAddress: Fr, recipient: Fr, content: Fr): void;
|
|
46
47
|
traceUnencryptedLog(contractAddress: Fr, log: Fr[]): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":";;AACA,OAAO,EAOL,KAAK,2BAA2B,EAIhC,GAAG,EAkBJ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAEnF,OAAO,EAAE,KAAK,qBAAqB,EAA6B,MAAM,gBAAgB,CAAC;AAEvF,OAAO,EAAE,KAAK,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAEvF,MAAM,MAAM,sBAAsB,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GAAG,2BAA2B,CAAC;AAEvF,qBAAa,qBAAsB,YAAW,8BAA8B;IA8BxE,qDAAqD;aACrC,sBAAsB,EAAE,MAAM;IA9BzC,MAAM,yCAAuD;IAEpE,uEAAuE;IACvE,OAAO,CAAC,iBAAiB,CAAS;IAElC,OAAO,CAAC,oBAAoB,CAA6B;IACzD,OAAO,CAAC,6BAA6B,CAAsC;IAE3E,OAAO,CAAC,oBAAoB,CAA6B;IACzD,OAAO,CAAC,UAAU,CAAkB;IAEpC,OAAO,CAAC,qBAAqB,CAAqB;IAClD,OAAO,CAAC,gCAAgC,CAAqB;IAC7D,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,qBAAqB,CAA6B;IAC1D,OAAO,CAAC,iBAAiB,CAAuB;IAEhD,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,OAAO,CAAC,kBAAkB,CAAgC;IAE1D,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,OAAO,CAAC,eAAe,CAAoB;;IAGzC,qDAAqD;IACrC,sBAAsB,GAAE,MAAU;IAM7C,IAAI;IAIJ,UAAU;IAIjB,OAAO,CAAC,0BAA0B;IAM3B,sBAAsB,CAAC,eAAe,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;IAenG,uBAAuB,CAAC,eAAe,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE;IAYhE,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO;IAYrF,gBAAgB,CAAC,gBAAgB,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;IASnD,mBAAmB,CACxB,gBAAgB,EAAE,EAAE,EACpB,SAAS,EAAE,EAAE,EACb,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,OAAO;IAoBd,iBAAiB,CAAC,gBAAgB,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;IAWrD,uBAAuB,CAAC,gBAAgB,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO;IAY5F,qBAAqB,CAAC,gBAAgB,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE;IAUtE,mBAAmB,CAAC,eAAe,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;IAkBlD,wBAAwB,CAAC,QAAQ,EAAE,sBAAsB;IAmBhE;;;OAGG;IACI,eAAe;IACpB,oCAAoC;IACpC,eAAe,EAAE,qBAAqB;IACtC,oDAAoD;IACpD,iBAAiB,EAAE,uBAAuB;IAC1C,4DAA4D;IAC5D,YAAY,EAAE,GAAG;IACjB,yDAAyD;IACzD,UAAU,EAAE,GAAG;IACf,wCAAwC;IACxC,QAAQ,EAAE,MAAM;IAChB,yBAAyB;IACzB,cAAc,EAAE,qBAAqB;IACrC,gCAAgC;IAChC,YAAY,GAAE,MAAkB;IAuClC;;OAEG;IACI,uBAAuB;IAC5B,oDAAoD;IACpD,cAAc,EAAE,uBAAuB;IACvC,4DAA4D;IAC5D,YAAY,EAAE,GAAG;IACjB,yDAAyD;IACzD,UAAU,EAAE,GAAG;IACf,wCAAwC;IACxC,QAAQ,EAAE,MAAM;IAChB,yBAAyB;IACzB,cAAc,EAAE,qBAAqB;IACrC,gCAAgC;IAChC,YAAY,GAAE,MAAkB,GAC/B,qBAAqB;IAuCxB,OAAO,CAAC,6BAA6B;CAoBtC"}
|