@aztec/simulator 0.63.0 → 0.64.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/avm/avm_contract_call_result.d.ts +18 -1
- package/dest/avm/avm_contract_call_result.d.ts.map +1 -1
- package/dest/avm/avm_contract_call_result.js +30 -3
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +7 -11
- package/dest/avm/avm_simulator.d.ts +6 -1
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +29 -8
- package/dest/avm/avm_tree.d.ts +4 -18
- package/dest/avm/avm_tree.d.ts.map +1 -1
- package/dest/avm/avm_tree.js +71 -53
- package/dest/avm/errors.d.ts +7 -0
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +11 -1
- package/dest/avm/fixtures/index.d.ts +2 -2
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +1 -1
- package/dest/avm/index.d.ts +1 -0
- package/dest/avm/index.d.ts.map +1 -1
- package/dest/avm/index.js +2 -1
- 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 +81 -68
- package/dest/avm/journal/public_storage.d.ts +0 -1
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.js +6 -6
- package/dest/avm/opcodes/accrued_substate.js +2 -2
- package/dest/avm/opcodes/addressing_mode.d.ts.map +1 -1
- package/dest/avm/opcodes/addressing_mode.js +8 -2
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +2 -4
- package/dest/avm/opcodes/instruction.d.ts +1 -1
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +1 -1
- package/dest/index.d.ts +0 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -2
- package/dest/public/dual_side_effect_trace.d.ts +3 -9
- package/dest/public/dual_side_effect_trace.d.ts.map +1 -1
- package/dest/public/dual_side_effect_trace.js +5 -11
- package/dest/public/enqueued_call_side_effect_trace.d.ts +4 -10
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
- package/dest/public/enqueued_call_side_effect_trace.js +6 -15
- package/dest/public/executor_metrics.d.ts +1 -2
- package/dest/public/executor_metrics.d.ts.map +1 -1
- package/dest/public/executor_metrics.js +2 -8
- package/dest/public/fixtures/index.d.ts +14 -0
- package/dest/public/fixtures/index.d.ts.map +1 -0
- package/dest/public/fixtures/index.js +100 -0
- package/dest/public/index.d.ts +1 -2
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +1 -2
- package/dest/public/public_processor.d.ts +0 -2
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +5 -12
- package/dest/public/public_tx_context.d.ts +6 -4
- package/dest/public/public_tx_context.d.ts.map +1 -1
- package/dest/public/public_tx_context.js +11 -7
- package/dest/public/public_tx_simulator.d.ts +56 -5
- package/dest/public/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator.js +106 -26
- package/dest/public/side_effect_trace.d.ts +4 -10
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +6 -15
- package/dest/public/side_effect_trace_interface.d.ts +3 -9
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/public/transitional_adapters.d.ts +1 -2
- package/dest/public/transitional_adapters.d.ts.map +1 -1
- package/dest/public/transitional_adapters.js +8 -10
- package/package.json +10 -10
- package/src/avm/avm_contract_call_result.ts +39 -2
- package/src/avm/avm_memory_types.ts +6 -10
- package/src/avm/avm_simulator.ts +58 -8
- package/src/avm/avm_tree.ts +88 -64
- package/src/avm/errors.ts +11 -0
- package/src/avm/fixtures/index.ts +4 -3
- package/src/avm/index.ts +1 -0
- package/src/avm/journal/journal.ts +118 -126
- package/src/avm/journal/public_storage.ts +5 -6
- package/src/avm/opcodes/accrued_substate.ts +1 -1
- package/src/avm/opcodes/addressing_mode.ts +7 -2
- package/src/avm/opcodes/external_calls.ts +1 -3
- package/src/avm/opcodes/instruction.ts +1 -1
- package/src/index.ts +0 -1
- package/src/public/dual_side_effect_trace.ts +4 -13
- package/src/public/enqueued_call_side_effect_trace.ts +14 -17
- package/src/public/executor_metrics.ts +1 -9
- package/src/public/fixtures/index.ts +158 -0
- package/src/public/index.ts +1 -5
- package/src/public/public_processor.ts +5 -27
- package/src/public/public_tx_context.ts +13 -8
- package/src/public/public_tx_simulator.ts +182 -50
- package/src/public/side_effect_trace.ts +9 -19
- package/src/public/side_effect_trace_interface.ts +3 -9
- package/src/public/transitional_adapters.ts +12 -12
- package/dest/mocks/fixtures.d.ts +0 -28
- package/dest/mocks/fixtures.d.ts.map +0 -1
- package/dest/mocks/fixtures.js +0 -48
- package/dest/mocks/index.d.ts +0 -2
- package/dest/mocks/index.d.ts.map +0 -1
- package/dest/mocks/index.js +0 -2
- package/dest/public/executor.d.ts +0 -47
- package/dest/public/executor.d.ts.map +0 -1
- package/dest/public/executor.js +0 -90
- package/src/mocks/fixtures.ts +0 -72
- package/src/mocks/index.ts +0 -1
- package/src/public/executor.ts +0 -154
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Fr, FunctionSelector, Gas, PUBLIC_DISPATCH_SELECTOR } from '@aztec/circuits.js';
|
|
2
|
-
import { gasLeftToGas } from '../avm_gas.js';
|
|
3
2
|
import { TypeTag, Uint1 } from '../avm_memory_types.js';
|
|
4
3
|
import { AvmSimulator } from '../avm_simulator.js';
|
|
5
4
|
import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
|
|
@@ -61,7 +60,7 @@ class ExternalCall extends Instruction {
|
|
|
61
60
|
// Write our success flag into memory.
|
|
62
61
|
memory.set(successOffset, new Uint1(success ? 1 : 0));
|
|
63
62
|
// Refund unused gas
|
|
64
|
-
context.machineState.refundGas(
|
|
63
|
+
context.machineState.refundGas(nestedCallResults.gasLeft);
|
|
65
64
|
// Merge nested call's state and trace based on whether it succeeded.
|
|
66
65
|
if (success) {
|
|
67
66
|
context.persistableState.merge(nestedContext.persistableState);
|
|
@@ -73,7 +72,6 @@ class ExternalCall extends Instruction {
|
|
|
73
72
|
/*nestedState=*/ nestedContext.persistableState,
|
|
74
73
|
/*nestedEnvironment=*/ nestedContext.environment,
|
|
75
74
|
/*startGasLeft=*/ Gas.from(allocatedGas),
|
|
76
|
-
/*endGasLeft=*/ Gas.from(nestedContext.machineState.gasLeft),
|
|
77
75
|
/*bytecode=*/ simulator.getBytecode(),
|
|
78
76
|
/*avmCallResults=*/ nestedCallResults);
|
|
79
77
|
memory.assert({ reads: calldataSize + 4, writes: 1, addressing });
|
|
@@ -178,4 +176,4 @@ Revert.wireFormat16 = [
|
|
|
178
176
|
function BigIntMin(a, b) {
|
|
179
177
|
return a < b ? a : b;
|
|
180
178
|
}
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
179
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"external_calls.js","sourceRoot":"","sources":["../../../src/avm/opcodes/external_calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ export declare abstract class Instruction {
|
|
|
54
54
|
* Computes gas cost for the instruction based on its base cost and memory operations.
|
|
55
55
|
* @returns Gas cost.
|
|
56
56
|
*/
|
|
57
|
-
|
|
57
|
+
gasCost(dynMultiplier?: number): Gas;
|
|
58
58
|
/**
|
|
59
59
|
* Returns the stringified type of the instruction.
|
|
60
60
|
* Instruction sub-classes should have a static `type` property.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/instruction.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,GAAG,EAAqD,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,KAAK,WAAW,EAA4B,MAAM,+CAA+C,CAAC;AAEnH,KAAK,sBAAsB,GAAG;IAC5B,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;CACnC,CAAC;AAEF;;;GAGG;AACH,8BAAsB,WAAW;IAC/B;;;;OAIG;aACa,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;OAEG;IACI,SAAS,IAAI,OAAO;IAI3B;;;;OAIG;IACI,QAAQ,IAAI,MAAM;WAUX,WAAW,CACvB,IAAI,EAAE,sBAAsB,GAAG;QAAE,UAAU,EAAE,WAAW,EAAE,CAAC;QAAC,EAAE,EAAE,GAAG,CAAA;KAAE,EACrE,GAAG,EAAE,YAAY,GAAG,MAAM,GACzB,WAAW;IAKP,SAAS,IAAI,MAAM;IAO1B;;;;;OAKG;IACI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,WAAW,GAAG,YAAY;IAShF;;;;;OAKG;WACW,EAAE,CAAC,IAAI,EAAE,sBAAsB,EAAE,UAAU,EAAE,WAAW,EAAE;2BAEjD,YAAY,GAAG,MAAM,KAAG,WAAW;;IAQ1D;;;OAGG;
|
|
1
|
+
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/instruction.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,GAAG,EAAqD,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,KAAK,WAAW,EAA4B,MAAM,+CAA+C,CAAC;AAEnH,KAAK,sBAAsB,GAAG;IAC5B,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;CACnC,CAAC;AAEF;;;GAGG;AACH,8BAAsB,WAAW;IAC/B;;;;OAIG;aACa,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;OAEG;IACI,SAAS,IAAI,OAAO;IAI3B;;;;OAIG;IACI,QAAQ,IAAI,MAAM;WAUX,WAAW,CACvB,IAAI,EAAE,sBAAsB,GAAG;QAAE,UAAU,EAAE,WAAW,EAAE,CAAC;QAAC,EAAE,EAAE,GAAG,CAAA;KAAE,EACrE,GAAG,EAAE,YAAY,GAAG,MAAM,GACzB,WAAW;IAKP,SAAS,IAAI,MAAM;IAO1B;;;;;OAKG;IACI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,WAAW,GAAG,YAAY;IAShF;;;;;OAKG;WACW,EAAE,CAAC,IAAI,EAAE,sBAAsB,EAAE,UAAU,EAAE,WAAW,EAAE;2BAEjD,YAAY,GAAG,MAAM,KAAG,WAAW;;IAQ1D;;;OAGG;IACI,OAAO,CAAC,aAAa,GAAE,MAAU,GAAG,GAAG;IAM9C;;;OAGG;IACH,IAAW,IAAI,IAAI,MAAM,CAMxB;IAED;;;OAGG;IACH,IAAW,MAAM,IAAI,MAAM,CAM1B;CACF"}
|
|
@@ -97,4 +97,4 @@ export class Instruction {
|
|
|
97
97
|
return opcode;
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1Y3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL29wY29kZXMvaW5zdHJ1Y3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sSUFBSSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFHMUMsT0FBTyxFQUFZLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRzVGLE9BQU8sRUFBRSxNQUFNLEVBQW9CLFdBQVcsRUFBRSxXQUFXLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQU1uSDs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLFdBQVc7SUFRL0I7O09BRUc7SUFDSSxTQUFTO1FBQ2QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLFFBQVE7UUFDYixJQUFJLGNBQWMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDbEQsb0RBQW9EO1FBQ3BELEtBQUssTUFBTSxJQUFJLElBQUksTUFBTSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBMEIsRUFBRSxDQUFDO1lBQzdFLGNBQWMsSUFBSSxHQUFHLElBQUksSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQztRQUN6RCxDQUFDO1FBQ0QsT0FBTyxjQUFjLENBQUM7SUFDeEIsQ0FBQztJQUVELHdFQUF3RTtJQUNqRSxNQUFNLENBQUMsV0FBVyxDQUV2QixHQUEwQjtRQUUxQixPQUFPLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsc0VBQXNFO0lBQy9ELFNBQVM7UUFDZCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsV0FBa0IsQ0FBQztRQUN0QyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sS0FBSyxTQUFTLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxJQUFJLENBQUMsQ0FBQztRQUM1RCxNQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsS0FBSyxTQUFTLElBQUksS0FBSyxDQUFDLFVBQVUsS0FBSyxJQUFJLENBQUMsQ0FBQztRQUNwRSxPQUFPLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDN0QsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ksRUFBRSxDQUFDLE1BQWMsRUFBRSxVQUF5QjtRQUNqRCxPQUFPLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRTtZQUM5QyxLQUFLLEVBQUUsR0FBVyxFQUFFO2dCQUNsQixPQUFPLFdBQVcsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQy9DLENBQUM7WUFDRCxVQUFVLEVBQUUsS0FBSztTQUNsQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxNQUFNLENBQUMsRUFBRSxDQUErQixVQUF5QjtRQUN0RSxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1lBQ3pCLFdBQVcsRUFBRSxDQUFDLEdBQTBCLEVBQWUsRUFBRTtnQkFDdkQsTUFBTSxHQUFHLEdBQUcsV0FBVyxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQztnQkFDekMsTUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLGlCQUFpQjtnQkFDNUMsT0FBTyxJQUFJLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDO1lBQzNCLENBQUM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksT0FBTyxDQUFDLGdCQUF3QixDQUFDO1FBQ3RDLE1BQU0sV0FBVyxHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDaEQsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUN6RSxPQUFPLE1BQU0sQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUVEOzs7T0FHRztJQUNILElBQVcsSUFBSTtRQUNiLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxJQUFJLENBQUMsV0FBVyxJQUFLLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBZSxDQUFDO1FBQzdFLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNWLE1BQU0sSUFBSSxLQUFLLENBQUMscUJBQXFCLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxrREFBa0QsQ0FBQyxDQUFDO1FBQ2hILENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7O09BR0c7SUFDSCxJQUFXLE1BQU07UUFDZixNQUFNLE1BQU0sR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFpQixDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDOUYsSUFBSSxNQUFNLEtBQUssU0FBUyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN6RCxNQUFNLElBQUksS0FBSyxDQUFDLHFCQUFxQixJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksb0RBQW9ELENBQUMsQ0FBQztRQUNsSCxDQUFDO1FBQ0QsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztDQUNGIn0=
|
package/dest/index.d.ts
CHANGED
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -4,6 +4,5 @@ export * from './client/index.js';
|
|
|
4
4
|
export * from './common/index.js';
|
|
5
5
|
export * from './public/index.js';
|
|
6
6
|
export * from './providers/index.js';
|
|
7
|
-
export * from './mocks/index.js';
|
|
8
7
|
export * from './stats/index.js';
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxrQkFBa0IsQ0FBQyJ9
|
|
@@ -4,7 +4,7 @@ import { type UnencryptedL2Log } from '@aztec/circuit-types';
|
|
|
4
4
|
import { type ContractClassIdPreimage, type Gas, type NullifierLeafPreimage, type PublicCallRequest, type PublicDataTreeLeafPreimage, type SerializableContractInstance } from '@aztec/circuits.js';
|
|
5
5
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
6
6
|
import { type Fr } from '@aztec/foundation/fields';
|
|
7
|
-
import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
|
|
7
|
+
import { type AvmContractCallResult, type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
|
|
8
8
|
import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
|
|
9
9
|
import { type PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
|
|
10
10
|
import { type EnqueuedPublicCallExecutionResultWithSideEffects, type PublicFunctionCallResult } from './execution.js';
|
|
@@ -39,8 +39,6 @@ export declare class DualSideEffectTrace implements PublicSideEffectTraceInterfa
|
|
|
39
39
|
nestedEnvironment: AvmExecutionEnvironment,
|
|
40
40
|
/** How much gas was available for this public execution. */
|
|
41
41
|
startGasLeft: Gas,
|
|
42
|
-
/** How much gas was left after this public execution. */
|
|
43
|
-
endGasLeft: Gas,
|
|
44
42
|
/** Bytecode used for this execution. */
|
|
45
43
|
bytecode: Buffer,
|
|
46
44
|
/** The call's results */
|
|
@@ -58,10 +56,8 @@ export declare class DualSideEffectTrace implements PublicSideEffectTraceInterfa
|
|
|
58
56
|
* Convert this trace to a PublicExecutionResult for use externally to the simulator.
|
|
59
57
|
*/
|
|
60
58
|
toPublicEnqueuedCallExecutionResult(
|
|
61
|
-
/** How much gas was left after this public execution. */
|
|
62
|
-
endGasLeft: Gas,
|
|
63
59
|
/** The call's results */
|
|
64
|
-
avmCallResults:
|
|
60
|
+
avmCallResults: AvmFinalizedCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
|
|
65
61
|
/**
|
|
66
62
|
* Convert this trace to a PublicExecutionResult for use externally to the simulator.
|
|
67
63
|
*/
|
|
@@ -70,12 +66,10 @@ export declare class DualSideEffectTrace implements PublicSideEffectTraceInterfa
|
|
|
70
66
|
avmEnvironment: AvmExecutionEnvironment,
|
|
71
67
|
/** How much gas was available for this public execution. */
|
|
72
68
|
startGasLeft: Gas,
|
|
73
|
-
/** How much gas was left after this public execution. */
|
|
74
|
-
endGasLeft: Gas,
|
|
75
69
|
/** Bytecode used for this execution. */
|
|
76
70
|
bytecode: Buffer,
|
|
77
71
|
/** The call's results */
|
|
78
|
-
avmCallResults:
|
|
72
|
+
avmCallResults: AvmFinalizedCallResult,
|
|
79
73
|
/** Function name for logging */
|
|
80
74
|
functionName?: string): PublicFunctionCallResult;
|
|
81
75
|
getUnencryptedLogs(): UnencryptedL2Log[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dual_side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/dual_side_effect_trace.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;AAInD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"dual_side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/dual_side_effect_trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,16 +70,14 @@ export class DualSideEffectTrace {
|
|
|
70
70
|
nestedEnvironment,
|
|
71
71
|
/** How much gas was available for this public execution. */
|
|
72
72
|
startGasLeft,
|
|
73
|
-
/** How much gas was left after this public execution. */
|
|
74
|
-
endGasLeft,
|
|
75
73
|
/** Bytecode used for this execution. */
|
|
76
74
|
bytecode,
|
|
77
75
|
/** The call's results */
|
|
78
76
|
avmCallResults,
|
|
79
77
|
/** Function name for logging */
|
|
80
78
|
functionName = 'unknown') {
|
|
81
|
-
this.innerCallTrace.traceNestedCall(nestedCallTrace.innerCallTrace, nestedEnvironment, startGasLeft,
|
|
82
|
-
this.enqueuedCallTrace.traceNestedCall(nestedCallTrace.enqueuedCallTrace, nestedEnvironment, startGasLeft,
|
|
79
|
+
this.innerCallTrace.traceNestedCall(nestedCallTrace.innerCallTrace, nestedEnvironment, startGasLeft, bytecode, avmCallResults, functionName);
|
|
80
|
+
this.enqueuedCallTrace.traceNestedCall(nestedCallTrace.enqueuedCallTrace, nestedEnvironment, startGasLeft, bytecode, avmCallResults, functionName);
|
|
83
81
|
}
|
|
84
82
|
traceEnqueuedCall(
|
|
85
83
|
/** The call request from private that enqueued this call. */
|
|
@@ -94,11 +92,9 @@ export class DualSideEffectTrace {
|
|
|
94
92
|
* Convert this trace to a PublicExecutionResult for use externally to the simulator.
|
|
95
93
|
*/
|
|
96
94
|
toPublicEnqueuedCallExecutionResult(
|
|
97
|
-
/** How much gas was left after this public execution. */
|
|
98
|
-
endGasLeft,
|
|
99
95
|
/** The call's results */
|
|
100
96
|
avmCallResults) {
|
|
101
|
-
return this.enqueuedCallTrace.toPublicEnqueuedCallExecutionResult(
|
|
97
|
+
return this.enqueuedCallTrace.toPublicEnqueuedCallExecutionResult(avmCallResults);
|
|
102
98
|
}
|
|
103
99
|
/**
|
|
104
100
|
* Convert this trace to a PublicExecutionResult for use externally to the simulator.
|
|
@@ -108,18 +104,16 @@ export class DualSideEffectTrace {
|
|
|
108
104
|
avmEnvironment,
|
|
109
105
|
/** How much gas was available for this public execution. */
|
|
110
106
|
startGasLeft,
|
|
111
|
-
/** How much gas was left after this public execution. */
|
|
112
|
-
endGasLeft,
|
|
113
107
|
/** Bytecode used for this execution. */
|
|
114
108
|
bytecode,
|
|
115
109
|
/** The call's results */
|
|
116
110
|
avmCallResults,
|
|
117
111
|
/** Function name for logging */
|
|
118
112
|
functionName = 'unknown') {
|
|
119
|
-
return this.innerCallTrace.toPublicFunctionCallResult(avmEnvironment, startGasLeft,
|
|
113
|
+
return this.innerCallTrace.toPublicFunctionCallResult(avmEnvironment, startGasLeft, bytecode, avmCallResults, functionName);
|
|
120
114
|
}
|
|
121
115
|
getUnencryptedLogs() {
|
|
122
116
|
return this.enqueuedCallTrace.getUnencryptedLogs();
|
|
123
117
|
}
|
|
124
118
|
}
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHVhbF9zaWRlX2VmZmVjdF90cmFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvZHVhbF9zaWRlX2VmZmVjdF90cmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFZQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBU2pDLE1BQU0sT0FBTyxtQkFBbUI7SUFDOUIsWUFDa0IsY0FBcUMsRUFDckMsaUJBQW9EO1FBRHBELG1CQUFjLEdBQWQsY0FBYyxDQUF1QjtRQUNyQyxzQkFBaUIsR0FBakIsaUJBQWlCLENBQW1DO0lBQ25FLENBQUM7SUFFRyxJQUFJO1FBQ1QsT0FBTyxJQUFJLG1CQUFtQixDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7SUFDNUYsQ0FBQztJQUVNLEtBQUssQ0FBQyxXQUFpQixFQUFFLFdBQW9CLEtBQUs7UUFDdkQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsaUJBQWlCLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVNLFVBQVU7UUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxVQUFVLEVBQUUsSUFBSSxJQUFJLENBQUMsaUJBQWlCLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQztRQUNoRixPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDMUMsQ0FBQztJQUVNLHNCQUFzQixDQUMzQixlQUE2QixFQUM3QixJQUFRLEVBQ1IsS0FBUyxFQUNULFlBQXdDLEVBQ3hDLFNBQWEsRUFDYixJQUFVO1FBRVYsSUFBSSxDQUFDLGNBQWMsQ0FBQyxzQkFBc0IsQ0FBQyxlQUFlLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxzQkFBc0IsQ0FBQyxlQUFlLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdHLENBQUM7SUFFTSx1QkFBdUIsQ0FDNUIsZUFBNkIsRUFDN0IsSUFBUSxFQUNSLEtBQVMsRUFDVCxlQUEyQyxFQUMzQyxZQUFnQixFQUNoQixXQUFpQixFQUNqQixlQUEyQyxFQUMzQyxhQUFtQjtRQUVuQixJQUFJLENBQUMsY0FBYyxDQUFDLHVCQUF1QixDQUN6QyxlQUFlLEVBQ2YsSUFBSSxFQUNKLEtBQUssRUFDTCxlQUFlLEVBQ2YsWUFBWSxFQUNaLFdBQVcsRUFDWCxlQUFlLEVBQ2YsYUFBYSxDQUNkLENBQUM7UUFDRixJQUFJLENBQUMsaUJBQWlCLENBQUMsdUJBQXVCLENBQzVDLGVBQWUsRUFDZixJQUFJLEVBQ0osS0FBSyxFQUNMLGVBQWUsRUFDZixZQUFZLEVBQ1osV0FBVyxFQUNYLGVBQWUsRUFDZixhQUFhLENBQ2QsQ0FBQztJQUNKLENBQUM7SUFFRCw4RkFBOEY7SUFDdkYsa0JBQWtCLENBQUMsZUFBNkIsRUFBRSxRQUFZLEVBQUUsU0FBYSxFQUFFLE1BQWUsRUFBRSxJQUFVO1FBQy9HLElBQUksQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZUFBZSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzNGLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDaEcsQ0FBQztJQUVNLGdCQUFnQixDQUFDLGVBQTZCLEVBQUUsUUFBWSxFQUFFLFNBQWEsRUFBRSxJQUFVO1FBQzVGLElBQUksQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDakYsSUFBSSxDQUFDLGlCQUFpQixDQUFDLGdCQUFnQixDQUFDLGVBQWUsRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3RGLENBQUM7SUFFTSxtQkFBbUIsQ0FDeEIsZUFBNkIsRUFDN0IsU0FBYSxFQUNiLE1BQWUsRUFDZixlQUFzQyxFQUN0QyxZQUFnQixFQUNoQixXQUFpQjtRQUVqQixJQUFJLENBQUMsY0FBYyxDQUFDLG1CQUFtQixDQUNyQyxlQUFlLEVBQ2YsU0FBUyxFQUNULE1BQU0sRUFDTixlQUFlLEVBQ2YsWUFBWSxFQUNaLFdBQVcsQ0FDWixDQUFDO1FBQ0YsSUFBSSxDQUFDLGlCQUFpQixDQUFDLG1CQUFtQixDQUN4QyxlQUFlLEVBQ2YsU0FBUyxFQUNULE1BQU0sRUFDTixlQUFlLEVBQ2YsWUFBWSxFQUNaLFdBQVcsQ0FDWixDQUFDO0lBQ0osQ0FBQztJQUVNLGlCQUFpQixDQUN0QixlQUE2QixFQUM3QixTQUFhLEVBQ2IsZUFBc0MsRUFDdEMsWUFBZ0IsRUFDaEIsV0FBaUIsRUFDakIsYUFBbUI7UUFFbkIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxpQkFBaUIsQ0FDbkMsZUFBZSxFQUNmLFNBQVMsRUFDVCxlQUFlLEVBQ2YsWUFBWSxFQUNaLFdBQVcsRUFDWCxhQUFhLENBQ2QsQ0FBQztRQUNGLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxpQkFBaUIsQ0FDdEMsZUFBZSxFQUNmLFNBQVMsRUFDVCxlQUFlLEVBQ2YsWUFBWSxFQUNaLFdBQVcsRUFDWCxhQUFhLENBQ2QsQ0FBQztJQUNKLENBQUM7SUFFRCx1QkFBdUIsQ0FBQyxlQUE2QixFQUFFLE9BQVcsRUFBRSxZQUFnQixFQUFFLE1BQWUsRUFBRSxJQUFVO1FBQy9HLElBQUksQ0FBQyxjQUFjLENBQUMsdUJBQXVCLENBQUMsZUFBZSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyx1QkFBdUIsQ0FBQyxlQUFlLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDdkcsQ0FBQztJQUVNLHFCQUFxQixDQUFDLGVBQTZCLEVBQUUsU0FBYSxFQUFFLE9BQVc7UUFDcEYsSUFBSSxDQUFDLGNBQWMsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLEVBQUUsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQy9FLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLEVBQUUsU0FBUyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ3BGLENBQUM7SUFFTSxtQkFBbUIsQ0FBQyxlQUE2QixFQUFFLEdBQVM7UUFDakUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDOUQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRU0sd0JBQXdCLENBQzdCLGVBQTZCLEVBQzdCLE1BQWUsRUFDZixRQUFrRDtRQUVsRCxJQUFJLENBQUMsY0FBYyxDQUFDLHdCQUF3QixDQUFDLGVBQWUsRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDaEYsSUFBSSxDQUFDLGlCQUFpQixDQUFDLHdCQUF3QixDQUFDLGVBQWUsRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDckYsQ0FBQztJQUVNLGdCQUFnQixDQUNyQixlQUE2QixFQUM3QixNQUFlLEVBQ2YsUUFBZ0IsRUFDaEIsZ0JBQTBELEVBQzFELGFBQWtEO1FBRWxELElBQUksQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsZ0JBQWdCLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFDekcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLGdCQUFnQixDQUFDLGVBQWUsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBQzlHLENBQUM7SUFFRDs7O09BR0c7SUFDSSxlQUFlO0lBQ3BCLG9DQUFvQztJQUNwQyxlQUFxQjtJQUNyQixvREFBb0Q7SUFDcEQsaUJBQTBDO0lBQzFDLDREQUE0RDtJQUM1RCxZQUFpQjtJQUNqQix3Q0FBd0M7SUFDeEMsUUFBZ0I7SUFDaEIseUJBQXlCO0lBQ3pCLGNBQXFDO0lBQ3JDLGdDQUFnQztJQUNoQyxlQUF1QixTQUFTO1FBRWhDLElBQUksQ0FBQyxjQUFjLENBQUMsZUFBZSxDQUNqQyxlQUFlLENBQUMsY0FBYyxFQUM5QixpQkFBaUIsRUFDakIsWUFBWSxFQUNaLFFBQVEsRUFDUixjQUFjLEVBQ2QsWUFBWSxDQUNiLENBQUM7UUFDRixJQUFJLENBQUMsaUJBQWlCLENBQUMsZUFBZSxDQUNwQyxlQUFlLENBQUMsaUJBQWlCLEVBQ2pDLGlCQUFpQixFQUNqQixZQUFZLEVBQ1osUUFBUSxFQUNSLGNBQWMsRUFDZCxZQUFZLENBQ2IsQ0FBQztJQUNKLENBQUM7SUFFTSxpQkFBaUI7SUFDdEIsNkRBQTZEO0lBQzdELGlCQUFvQztJQUNwQywwQkFBMEI7SUFDMUIsUUFBYztJQUNkLDJCQUEyQjtJQUMzQixRQUFpQjtRQUVqQixJQUFJLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFFRDs7T0FFRztJQUNJLG1DQUFtQztJQUN4Qyx5QkFBeUI7SUFDekIsY0FBc0M7UUFFdEMsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsbUNBQW1DLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDcEYsQ0FBQztJQUNEOztPQUVHO0lBQ0ksMEJBQTBCO0lBQy9CLG9EQUFvRDtJQUNwRCxjQUF1QztJQUN2Qyw0REFBNEQ7SUFDNUQsWUFBaUI7SUFDakIsd0NBQXdDO0lBQ3hDLFFBQWdCO0lBQ2hCLHlCQUF5QjtJQUN6QixjQUFzQztJQUN0QyxnQ0FBZ0M7SUFDaEMsZUFBdUIsU0FBUztRQUVoQyxPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsMEJBQTBCLENBQ25ELGNBQWMsRUFDZCxZQUFZLEVBQ1osUUFBUSxFQUNSLGNBQWMsRUFDZCxZQUFZLENBQ2IsQ0FBQztJQUNKLENBQUM7SUFFTSxrQkFBa0I7UUFDdkIsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztJQUNyRCxDQUFDO0NBQ0YifQ==
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { UnencryptedL2Log } from '@aztec/circuit-types';
|
|
4
4
|
import { AvmCircuitPublicInputs, AvmExecutionHints, type AztecAddress, type ContractClassIdPreimage, Gas, type GasSettings, type GlobalVariables, Nullifier, NullifierLeafPreimage, PublicCallRequest, PublicDataRead, PublicDataTreeLeafPreimage, PublicDataUpdateRequest, ScopedL2ToL1Message, ScopedLogHash, type ScopedNoteHash, type ScopedReadRequest, SerializableContractInstance, TreeLeafReadRequest, type TreeSnapshots } from '@aztec/circuits.js';
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
|
-
import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
|
|
6
|
+
import { type AvmContractCallResult, type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
|
|
7
7
|
import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
|
|
8
8
|
import { type EnqueuedPublicCallExecutionResultWithSideEffects, type PublicFunctionCallResult } from './execution.js';
|
|
9
9
|
import { type PublicSideEffectTraceInterface } from './side_effect_trace_interface.js';
|
|
@@ -82,7 +82,7 @@ export declare class PublicEnqueuedCallSideEffectTrace implements PublicSideEffe
|
|
|
82
82
|
tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, leafPreimage?: PublicDataTreeLeafPreimage, leafIndex?: Fr, path?: Fr[]): void;
|
|
83
83
|
tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, value: Fr, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): void;
|
|
84
84
|
traceNoteHashCheck(_contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean, path?: Fr[]): void;
|
|
85
|
-
traceNewNoteHash(contractAddress: AztecAddress, noteHash: Fr, leafIndex
|
|
85
|
+
traceNewNoteHash(contractAddress: AztecAddress, noteHash: Fr, leafIndex?: Fr, path?: Fr[]): void;
|
|
86
86
|
traceNullifierCheck(contractAddress: AztecAddress, nullifier: Fr, exists: boolean, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[]): void;
|
|
87
87
|
traceNewNullifier(contractAddress: AztecAddress, nullifier: Fr, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], insertionPath?: Fr[]): void;
|
|
88
88
|
traceL1ToL2MessageCheck(_contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean, path?: Fr[]): void;
|
|
@@ -101,8 +101,6 @@ export declare class PublicEnqueuedCallSideEffectTrace implements PublicSideEffe
|
|
|
101
101
|
nestedEnvironment: AvmExecutionEnvironment,
|
|
102
102
|
/** How much gas was available for this public execution. */
|
|
103
103
|
startGasLeft: Gas,
|
|
104
|
-
/** How much gas was left after this public execution. */
|
|
105
|
-
endGasLeft: Gas,
|
|
106
104
|
/** Bytecode used for this execution. */
|
|
107
105
|
_bytecode: Buffer,
|
|
108
106
|
/** The call's results */
|
|
@@ -125,10 +123,8 @@ export declare class PublicEnqueuedCallSideEffectTrace implements PublicSideEffe
|
|
|
125
123
|
* Get the results of public execution.
|
|
126
124
|
*/
|
|
127
125
|
toPublicEnqueuedCallExecutionResult(
|
|
128
|
-
/** How much gas was left after this public execution. */
|
|
129
|
-
endGasLeft: Gas,
|
|
130
126
|
/** The call's results */
|
|
131
|
-
avmCallResults:
|
|
127
|
+
avmCallResults: AvmFinalizedCallResult): EnqueuedPublicCallExecutionResultWithSideEffects;
|
|
132
128
|
toAvmCircuitPublicInputs(
|
|
133
129
|
/** Globals. */
|
|
134
130
|
globalVariables: GlobalVariables,
|
|
@@ -160,12 +156,10 @@ export declare class PublicEnqueuedCallSideEffectTrace implements PublicSideEffe
|
|
|
160
156
|
_avmEnvironment: AvmExecutionEnvironment,
|
|
161
157
|
/** How much gas was available for this public execution. */
|
|
162
158
|
_startGasLeft: Gas,
|
|
163
|
-
/** How much gas was left after this public execution. */
|
|
164
|
-
_endGasLeft: Gas,
|
|
165
159
|
/** Bytecode used for this execution. */
|
|
166
160
|
_bytecode: Buffer,
|
|
167
161
|
/** The call's results */
|
|
168
|
-
_avmCallResults:
|
|
162
|
+
_avmCallResults: AvmFinalizedCallResult,
|
|
169
163
|
/** Function name for logging */
|
|
170
164
|
_functionName?: string): PublicFunctionCallResult;
|
|
171
165
|
getUnencryptedLogs(): UnencryptedL2Log[];
|
|
@@ -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":";;AAAA,OAAO,EAA6B,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAGL,sBAAsB,EAItB,iBAAiB,EAOjB,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE5B,GAAG,EACH,KAAK,WAAW,EAChB,KAAK,eAAe,EAkBpB,SAAS,EACT,qBAAqB,EAIrB,iBAAiB,EACjB,cAAc,EACd,0BAA0B,EAC1B,uBAAuB,EAGvB,mBAAmB,EACnB,aAAa,EACb,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,4BAA4B,EAC5B,mBAAmB,EACnB,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;
|
|
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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"}
|
|
@@ -5,7 +5,6 @@ import { padArrayEnd } from '@aztec/foundation/collection';
|
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
7
|
import { assert } from 'console';
|
|
8
|
-
import { createSimulationError } from '../common/errors.js';
|
|
9
8
|
import { SideEffectLimitReachedError } from './side_effect_errors.js';
|
|
10
9
|
const emptyPublicDataPath = () => new Array(PUBLIC_DATA_TREE_HEIGHT).fill(Fr.zero());
|
|
11
10
|
const emptyNoteHashPath = () => new Array(NOTE_HASH_TREE_HEIGHT).fill(Fr.zero());
|
|
@@ -66,7 +65,7 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
66
65
|
}
|
|
67
66
|
merge(forkedTrace, reverted = false) {
|
|
68
67
|
// sanity check to avoid merging the same forked trace twice
|
|
69
|
-
assert(!
|
|
68
|
+
assert(!forkedTrace.alreadyMergedIntoParent, 'Cannot merge a forked trace that has already been merged into its parent!');
|
|
70
69
|
forkedTrace.alreadyMergedIntoParent = true;
|
|
71
70
|
// TODO(dbanks12): accept & merge forked trace's hints!
|
|
72
71
|
this.sideEffectCounter = forkedTrace.sideEffectCounter;
|
|
@@ -139,7 +138,7 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
139
138
|
this.avmCircuitHints.noteHashReadRequest.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
|
|
140
139
|
// NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
|
|
141
140
|
}
|
|
142
|
-
traceNewNoteHash(contractAddress, noteHash, leafIndex, path = emptyNoteHashPath()) {
|
|
141
|
+
traceNewNoteHash(contractAddress, noteHash, leafIndex = Fr.zero(), path = emptyNoteHashPath()) {
|
|
143
142
|
if (this.noteHashes.length + this.previousSideEffectArrayLengths.noteHashes >= MAX_NOTE_HASHES_PER_TX) {
|
|
144
143
|
throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
|
|
145
144
|
}
|
|
@@ -246,8 +245,6 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
246
245
|
nestedEnvironment,
|
|
247
246
|
/** How much gas was available for this public execution. */
|
|
248
247
|
startGasLeft,
|
|
249
|
-
/** How much gas was left after this public execution. */
|
|
250
|
-
endGasLeft,
|
|
251
248
|
/** Bytecode used for this execution. */
|
|
252
249
|
_bytecode,
|
|
253
250
|
/** The call's results */
|
|
@@ -258,7 +255,7 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
258
255
|
//
|
|
259
256
|
// Store end side effect counter before it gets updated by absorbing nested call trace
|
|
260
257
|
const endSideEffectCounter = new Fr(this.sideEffectCounter);
|
|
261
|
-
const gasUsed = new Gas(startGasLeft.daGas -
|
|
258
|
+
const gasUsed = new Gas(startGasLeft.daGas - avmCallResults.gasLeft.daGas, startGasLeft.l2Gas - avmCallResults.gasLeft.l2Gas);
|
|
262
259
|
this.avmCircuitHints.externalCalls.items.push(new AvmExternalCallHint(
|
|
263
260
|
/*success=*/ new Fr(avmCallResults.reverted ? 0 : 1), avmCallResults.output, gasUsed, endSideEffectCounter, nestedEnvironment.address));
|
|
264
261
|
}
|
|
@@ -298,18 +295,14 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
298
295
|
* Get the results of public execution.
|
|
299
296
|
*/
|
|
300
297
|
toPublicEnqueuedCallExecutionResult(
|
|
301
|
-
/** How much gas was left after this public execution. */
|
|
302
|
-
endGasLeft,
|
|
303
298
|
/** The call's results */
|
|
304
299
|
avmCallResults) {
|
|
305
300
|
return {
|
|
306
|
-
endGasLeft,
|
|
301
|
+
endGasLeft: Gas.from(avmCallResults.gasLeft),
|
|
307
302
|
endSideEffectCounter: new Fr(this.sideEffectCounter),
|
|
308
303
|
returnValues: avmCallResults.output,
|
|
309
304
|
reverted: avmCallResults.reverted,
|
|
310
|
-
revertReason: avmCallResults.revertReason
|
|
311
|
-
? createSimulationError(avmCallResults.revertReason, avmCallResults.output)
|
|
312
|
-
: undefined,
|
|
305
|
+
revertReason: avmCallResults.revertReason,
|
|
313
306
|
sideEffects: {
|
|
314
307
|
publicDataWrites: this.publicDataWrites,
|
|
315
308
|
noteHashes: this.noteHashes,
|
|
@@ -358,8 +351,6 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
358
351
|
_avmEnvironment,
|
|
359
352
|
/** How much gas was available for this public execution. */
|
|
360
353
|
_startGasLeft,
|
|
361
|
-
/** How much gas was left after this public execution. */
|
|
362
|
-
_endGasLeft,
|
|
363
354
|
/** Bytecode used for this execution. */
|
|
364
355
|
_bytecode,
|
|
365
356
|
/** The call's results */
|
|
@@ -395,4 +386,4 @@ export class PublicEnqueuedCallSideEffectTrace {
|
|
|
395
386
|
}
|
|
396
387
|
}
|
|
397
388
|
}
|
|
398
|
-
//# 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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"}
|
|
389
|
+
//# 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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"}
|
|
@@ -2,9 +2,8 @@ import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
|
2
2
|
export declare class ExecutorMetrics {
|
|
3
3
|
private fnCount;
|
|
4
4
|
private fnDuration;
|
|
5
|
-
private bytecodeSize;
|
|
6
5
|
constructor(client: TelemetryClient, name?: string);
|
|
7
|
-
recordFunctionSimulation(
|
|
6
|
+
recordFunctionSimulation(durationMs: number): void;
|
|
8
7
|
recordFunctionSimulationFailure(): void;
|
|
9
8
|
}
|
|
10
9
|
//# sourceMappingURL=executor_metrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/executor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;
|
|
1
|
+
{"version":3,"file":"executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/executor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;gBAElB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAmB;IAc5D,wBAAwB,CAAC,UAAU,EAAE,MAAM;IAO3C,+BAA+B;CAKhC"}
|
|
@@ -10,17 +10,11 @@ export class ExecutorMetrics {
|
|
|
10
10
|
unit: 'ms',
|
|
11
11
|
valueType: ValueType.INT,
|
|
12
12
|
});
|
|
13
|
-
this.bytecodeSize = meter.createHistogram(Metrics.PUBLIC_EXECUTION_SIMULATION_BYTECODE_SIZE, {
|
|
14
|
-
description: 'Size of the function bytecode',
|
|
15
|
-
unit: 'By',
|
|
16
|
-
valueType: ValueType.INT,
|
|
17
|
-
});
|
|
18
13
|
}
|
|
19
|
-
recordFunctionSimulation(
|
|
14
|
+
recordFunctionSimulation(durationMs) {
|
|
20
15
|
this.fnCount.add(1, {
|
|
21
16
|
[Attributes.OK]: true,
|
|
22
17
|
});
|
|
23
|
-
this.bytecodeSize.record(bytecodeSize);
|
|
24
18
|
this.fnDuration.record(Math.ceil(durationMs));
|
|
25
19
|
}
|
|
26
20
|
recordFunctionSimulationFailure() {
|
|
@@ -29,4 +23,4 @@ export class ExecutorMetrics {
|
|
|
29
23
|
});
|
|
30
24
|
}
|
|
31
25
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3JfbWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvZXhlY3V0b3JfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUVWLE9BQU8sRUFHUCxTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxNQUFNLE9BQU8sZUFBZTtJQUkxQixZQUFZLE1BQXVCLEVBQUUsSUFBSSxHQUFHLGdCQUFnQjtRQUMxRCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRXBDLElBQUksQ0FBQyxPQUFPLEdBQUcsS0FBSyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxnQ0FBZ0MsRUFBRTtZQUNqRixXQUFXLEVBQUUsOEJBQThCO1NBQzVDLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxVQUFVLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsbUNBQW1DLEVBQUU7WUFDbkYsV0FBVyxFQUFFLHlDQUF5QztZQUN0RCxJQUFJLEVBQUUsSUFBSTtZQUNWLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FBRztTQUN6QixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsd0JBQXdCLENBQUMsVUFBa0I7UUFDekMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO1lBQ2xCLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxFQUFFLElBQUk7U0FDdEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFRCwrQkFBK0I7UUFDN0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO1lBQ2xCLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxFQUFFLEtBQUs7U0FDdkIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { PublicExecutionRequest, Tx } from '@aztec/circuit-types';
|
|
2
|
+
import { type AvmCircuitInputs, Gas } from '@aztec/circuits.js';
|
|
3
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
4
|
+
/**
|
|
5
|
+
* If assertionErrString is set, we expect a (non exceptional halting) revert due to a failing assertion and
|
|
6
|
+
* we check that the revert reason error contains this string. However, the circuit must correctly prove the
|
|
7
|
+
* execution.
|
|
8
|
+
*/
|
|
9
|
+
export declare function simulateAvmTestContractGenerateCircuitInputs(functionName: string, calldata?: Fr[], assertionErrString?: string): Promise<AvmCircuitInputs>;
|
|
10
|
+
/**
|
|
11
|
+
* Craft a carrier transaction for a public call for simulation by PublicTxSimulator.
|
|
12
|
+
*/
|
|
13
|
+
export declare function createTxForPublicCall(executionRequest: PublicExecutionRequest, gasUsedByPrivate?: Gas, isTeardown?: boolean): Tx;
|
|
14
|
+
//# sourceMappingURL=index.d.ts.map
|