@aztec/simulator 0.44.0 → 0.45.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.
Files changed (110) hide show
  1. package/dest/acvm/oracle/oracle.d.ts +1 -1
  2. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  3. package/dest/acvm/oracle/oracle.js +3 -3
  4. package/dest/acvm/oracle/typed_oracle.d.ts +1 -1
  5. package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
  6. package/dest/acvm/oracle/typed_oracle.js +2 -2
  7. package/dest/avm/avm_context.d.ts +1 -1
  8. package/dest/avm/avm_context.d.ts.map +1 -1
  9. package/dest/avm/avm_context.js +3 -3
  10. package/dest/avm/{avm_message_call_result.d.ts → avm_contract_call_result.d.ts} +2 -2
  11. package/dest/avm/avm_contract_call_result.d.ts.map +1 -0
  12. package/dest/avm/avm_contract_call_result.js +18 -0
  13. package/dest/avm/avm_execution_environment.d.ts +7 -11
  14. package/dest/avm/avm_execution_environment.d.ts.map +1 -1
  15. package/dest/avm/avm_execution_environment.js +11 -20
  16. package/dest/avm/avm_gas.js +2 -2
  17. package/dest/avm/avm_simulator.d.ts +4 -4
  18. package/dest/avm/avm_simulator.d.ts.map +1 -1
  19. package/dest/avm/avm_simulator.js +7 -7
  20. package/dest/avm/bytecode_utils.d.ts +5 -0
  21. package/dest/avm/bytecode_utils.d.ts.map +1 -0
  22. package/dest/avm/bytecode_utils.js +29 -0
  23. package/dest/avm/errors.js +2 -2
  24. package/dest/avm/fixtures/index.d.ts.map +1 -1
  25. package/dest/avm/fixtures/index.js +3 -3
  26. package/dest/avm/journal/journal.d.ts +5 -5
  27. package/dest/avm/journal/journal.d.ts.map +1 -1
  28. package/dest/avm/journal/journal.js +9 -7
  29. package/dest/avm/journal/public_storage.d.ts +1 -1
  30. package/dest/avm/journal/public_storage.d.ts.map +1 -1
  31. package/dest/avm/journal/public_storage.js +2 -2
  32. package/dest/avm/opcodes/accrued_substate.d.ts +1 -2
  33. package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
  34. package/dest/avm/opcodes/accrued_substate.js +6 -15
  35. package/dest/avm/opcodes/environment_getters.d.ts +13 -8
  36. package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
  37. package/dest/avm/opcodes/environment_getters.js +20 -13
  38. package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
  39. package/dest/avm/opcodes/external_calls.js +1 -2
  40. package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
  41. package/dest/avm/serialization/bytecode_serialization.js +5 -5
  42. package/dest/avm/serialization/instruction_serialization.d.ts +9 -9
  43. package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
  44. package/dest/avm/serialization/instruction_serialization.js +10 -10
  45. package/dest/client/client_execution_context.d.ts +3 -1
  46. package/dest/client/client_execution_context.d.ts.map +1 -1
  47. package/dest/client/client_execution_context.js +6 -4
  48. package/dest/client/view_data_oracle.d.ts +3 -1
  49. package/dest/client/view_data_oracle.d.ts.map +1 -1
  50. package/dest/client/view_data_oracle.js +6 -4
  51. package/dest/mocks/fixtures.d.ts +3 -3
  52. package/dest/mocks/fixtures.d.ts.map +1 -1
  53. package/dest/mocks/fixtures.js +4 -4
  54. package/dest/public/abstract_phase_manager.js +12 -12
  55. package/dest/public/execution.d.ts +6 -5
  56. package/dest/public/execution.d.ts.map +1 -1
  57. package/dest/public/execution.js +2 -2
  58. package/dest/public/executor.d.ts +4 -4
  59. package/dest/public/executor.d.ts.map +1 -1
  60. package/dest/public/executor.js +19 -14
  61. package/dest/public/hints_builder.d.ts +1 -1
  62. package/dest/public/index.d.ts +1 -1
  63. package/dest/public/index.d.ts.map +1 -1
  64. package/dest/public/index.js +1 -1
  65. package/dest/public/public_kernel.d.ts +1 -1
  66. package/dest/public/public_kernel.d.ts.map +1 -1
  67. package/dest/public/public_kernel.js +2 -2
  68. package/dest/public/side_effect_trace.d.ts +5 -4
  69. package/dest/public/side_effect_trace.d.ts.map +1 -1
  70. package/dest/public/side_effect_trace.js +23 -9
  71. package/dest/public/side_effect_trace_interface.d.ts +3 -3
  72. package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
  73. package/dest/rollup/rollup.d.ts +1 -1
  74. package/dest/rollup/rollup.d.ts.map +1 -1
  75. package/dest/rollup/rollup.js +2 -2
  76. package/package.json +9 -9
  77. package/src/acvm/oracle/oracle.ts +12 -2
  78. package/src/acvm/oracle/typed_oracle.ts +6 -1
  79. package/src/avm/avm_context.ts +2 -2
  80. package/src/avm/{avm_message_call_result.ts → avm_contract_call_result.ts} +1 -1
  81. package/src/avm/avm_execution_environment.ts +10 -27
  82. package/src/avm/avm_gas.ts +1 -1
  83. package/src/avm/avm_simulator.ts +9 -11
  84. package/src/avm/bytecode_utils.ts +32 -0
  85. package/src/avm/errors.ts +1 -1
  86. package/src/avm/fixtures/index.ts +3 -6
  87. package/src/avm/journal/journal.ts +14 -11
  88. package/src/avm/journal/public_storage.ts +2 -2
  89. package/src/avm/opcodes/accrued_substate.ts +6 -19
  90. package/src/avm/opcodes/environment_getters.ts +23 -14
  91. package/src/avm/opcodes/external_calls.ts +2 -3
  92. package/src/avm/serialization/bytecode_serialization.ts +4 -3
  93. package/src/avm/serialization/instruction_serialization.ts +3 -3
  94. package/src/client/client_execution_context.ts +12 -3
  95. package/src/client/view_data_oracle.ts +12 -3
  96. package/src/mocks/fixtures.ts +5 -5
  97. package/src/public/abstract_phase_manager.ts +15 -15
  98. package/src/public/execution.ts +10 -6
  99. package/src/public/executor.ts +35 -20
  100. package/src/public/index.ts +1 -1
  101. package/src/public/public_kernel.ts +2 -1
  102. package/src/public/side_effect_trace.ts +31 -13
  103. package/src/public/side_effect_trace_interface.ts +3 -3
  104. package/src/rollup/rollup.ts +3 -1
  105. package/dest/avm/avm_message_call_result.d.ts.map +0 -1
  106. package/dest/avm/avm_message_call_result.js +0 -18
  107. package/dest/public/transitional_adaptors.d.ts +0 -17
  108. package/dest/public/transitional_adaptors.d.ts.map +0 -1
  109. package/dest/public/transitional_adaptors.js +0 -42
  110. package/src/public/transitional_adaptors.ts +0 -70
@@ -4,14 +4,14 @@ import { makeAztecAddress, makeSelector } from '@aztec/circuits.js/testing';
4
4
  import { FunctionType } from '@aztec/foundation/abi';
5
5
  import { padArrayEnd } from '@aztec/foundation/collection';
6
6
  export class PublicExecutionResultBuilder {
7
- constructor(execution) {
7
+ constructor(executionRequest) {
8
8
  this._nestedExecutions = [];
9
9
  this._contractStorageUpdateRequests = [];
10
10
  this._contractStorageReads = [];
11
11
  this._returnValues = [];
12
12
  this._reverted = false;
13
13
  this._revertReason = undefined;
14
- this._execution = execution;
14
+ this._executionRequest = executionRequest;
15
15
  }
16
16
  static fromPublicCallRequest({ request, returnValues = [new Fr(1n)], nestedExecutions = [], contractStorageUpdateRequests = [], contractStorageReads = [], revertReason = undefined, }) {
17
17
  const builder = new PublicExecutionResultBuilder(request);
@@ -63,7 +63,7 @@ export class PublicExecutionResultBuilder {
63
63
  }
64
64
  build(overrides = {}) {
65
65
  return {
66
- execution: this._execution,
66
+ executionRequest: this._executionRequest,
67
67
  nestedExecutions: this._nestedExecutions,
68
68
  noteHashReadRequests: [],
69
69
  nullifierReadRequests: [],
@@ -93,4 +93,4 @@ export class PublicExecutionResultBuilder {
93
93
  }
94
94
  }
95
95
  export const makeFunctionCall = (name = 'function', to = makeAztecAddress(30), selector = makeSelector(5), type = FunctionType.PUBLIC, args = new Array(ARGS_LENGTH).fill(Fr.ZERO), isStatic = false, returnTypes = []) => ({ name, to, selector, type, args, isStatic, returnTypes });
96
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9ja3MvZml4dHVyZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUEyQyx5QkFBeUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFHLE9BQU8sRUFDTCxXQUFXLEVBQ1gsaUJBQWlCLEVBRWpCLFdBQVcsRUFHWCxFQUFFLEVBQ0YsR0FBRyxHQUVKLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzVFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFJM0QsTUFBTSxPQUFPLDRCQUE0QjtJQVN2QyxZQUFZLFNBQTBCO1FBUDlCLHNCQUFpQixHQUE0QixFQUFFLENBQUM7UUFDaEQsbUNBQThCLEdBQW1DLEVBQUUsQ0FBQztRQUNwRSwwQkFBcUIsR0FBMEIsRUFBRSxDQUFDO1FBQ2xELGtCQUFhLEdBQVMsRUFBRSxDQUFDO1FBQ3pCLGNBQVMsR0FBRyxLQUFLLENBQUM7UUFDbEIsa0JBQWEsR0FBZ0MsU0FBUyxDQUFDO1FBRzdELElBQUksQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDO0lBQzlCLENBQUM7SUFFRCxNQUFNLENBQUMscUJBQXFCLENBQUMsRUFDM0IsT0FBTyxFQUNQLFlBQVksR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQzNCLGdCQUFnQixHQUFHLEVBQUUsRUFDckIsNkJBQTZCLEdBQUcsRUFBRSxFQUNsQyxvQkFBb0IsR0FBRyxFQUFFLEVBQ3pCLFlBQVksR0FBRyxTQUFTLEdBUXpCO1FBQ0MsTUFBTSxPQUFPLEdBQUcsSUFBSSw0QkFBNEIsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUUxRCxPQUFPLENBQUMsb0JBQW9C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QUFxQixFQUFFLEVBQUU7WUFDekIsNkJBQTZCLEVBQUUsSUFBSSxDQUFDLDhCQUE4QjtZQUNsRSxZQUFZLEVBQUUsV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSx3REFBd0Q7WUFDbkgsYUFBYSxFQUFFLEVBQUU7WUFDakIsYUFBYSxFQUFFLEVBQUU7WUFDakIsaUJBQWlCLEVBQUUsRUFBRTtZQUNyQixvQkFBb0IsRUFBRSxFQUFFO1lBQ3hCLHFCQUFxQixFQUFFLEVBQUU7WUFDekIsZUFBZSxFQUFFLHlCQUF5QixDQUFDLEtBQUssRUFBRTtZQUNsRCxrQkFBa0IsRUFBRSx5QkFBeUIsQ0FBQyxLQUFLLEVBQUU7WUFDckQsc0JBQXNCLEVBQUUsRUFBRSxDQUFDLElBQUk7WUFDL0Isb0JBQW9CLEVBQUUsRUFBRSxDQUFDLElBQUk7WUFDN0IsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTO1lBQ3hCLFlBQVksRUFBRSxJQUFJLENBQUMsYUFBYTtZQUNoQyxZQUFZLEVBQUUsR0FBRyxDQUFDLElBQUksRUFBRTtZQUN4QixVQUFVLEVBQUUsR0FBRyxDQUFDLElBQUksRUFBRTtZQUN0QixjQUFjLEVBQUUsRUFBRSxDQUFDLElBQUk7WUFDdkIsUUFBUSxFQUFFLEVBQUU7WUFDWixlQUFlLEVBQUUsaUJBQWlCLENBQUMsS0FBSyxFQUFFO1lBQzFDLFlBQVksRUFBRSxTQUFTO1lBQ3ZCLEdBQUcsU0FBUztTQUNiLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFFRCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxDQUM5QixJQUFJLEdBQUcsVUFBVSxFQUNqQixFQUFFLEdBQUcsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLEVBQ3pCLFFBQVEsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQzFCLElBQUksR0FBRyxZQUFZLENBQUMsTUFBTSxFQUMxQixJQUFJLEdBQUcsSUFBSSxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFDM0MsUUFBUSxHQUFHLEtBQUssRUFDaEIsV0FBVyxHQUFHLEVBQUUsRUFDaEIsRUFBRSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsQ0FBQyxDQUFDIn0=
96
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9ja3MvZml4dHVyZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUEyQyx5QkFBeUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFHLE9BQU8sRUFDTCxXQUFXLEVBQ1gsaUJBQWlCLEVBRWpCLFdBQVcsRUFHWCxFQUFFLEVBQ0YsR0FBRyxHQUVKLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzVFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFJM0QsTUFBTSxPQUFPLDRCQUE0QjtJQVN2QyxZQUFZLGdCQUF3QztRQVA1QyxzQkFBaUIsR0FBNEIsRUFBRSxDQUFDO1FBQ2hELG1DQUE4QixHQUFtQyxFQUFFLENBQUM7UUFDcEUsMEJBQXFCLEdBQTBCLEVBQUUsQ0FBQztRQUNsRCxrQkFBYSxHQUFTLEVBQUUsQ0FBQztRQUN6QixjQUFTLEdBQUcsS0FBSyxDQUFDO1FBQ2xCLGtCQUFhLEdBQWdDLFNBQVMsQ0FBQztRQUc3RCxJQUFJLENBQUMsaUJBQWlCLEdBQUcsZ0JBQWdCLENBQUM7SUFDNUMsQ0FBQztJQUVELE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxFQUMzQixPQUFPLEVBQ1AsWUFBWSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFDM0IsZ0JBQWdCLEdBQUcsRUFBRSxFQUNyQiw2QkFBNkIsR0FBRyxFQUFFLEVBQ2xDLG9CQUFvQixHQUFHLEVBQUUsRUFDekIsWUFBWSxHQUFHLFNBQVMsR0FRekI7UUFDQyxNQUFNLE9BQU8sR0FBRyxJQUFJLDRCQUE0QixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRTFELE9BQU8sQ0FBQyxv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O1lBQ3BDLHFCQUFxQixFQUFFLEVBQUU7WUFDekIsNkJBQTZCLEVBQUUsSUFBSSxDQUFDLDhCQUE4QjtZQUNsRSxZQUFZLEVBQUUsV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSx3REFBd0Q7WUFDbkgsYUFBYSxFQUFFLEVBQUU7WUFDakIsYUFBYSxFQUFFLEVBQUU7WUFDakIsaUJBQWlCLEVBQUUsRUFBRTtZQUNyQixvQkFBb0IsRUFBRSxFQUFFO1lBQ3hCLHFCQUFxQixFQUFFLEVBQUU7WUFDekIsZUFBZSxFQUFFLHlCQUF5QixDQUFDLEtBQUssRUFBRTtZQUNsRCxrQkFBa0IsRUFBRSx5QkFBeUIsQ0FBQyxLQUFLLEVBQUU7WUFDckQsc0JBQXNCLEVBQUUsRUFBRSxDQUFDLElBQUk7WUFDL0Isb0JBQW9CLEVBQUUsRUFBRSxDQUFDLElBQUk7WUFDN0IsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTO1lBQ3hCLFlBQVksRUFBRSxJQUFJLENBQUMsYUFBYTtZQUNoQyxZQUFZLEVBQUUsR0FBRyxDQUFDLElBQUksRUFBRTtZQUN4QixVQUFVLEVBQUUsR0FBRyxDQUFDLElBQUksRUFBRTtZQUN0QixjQUFjLEVBQUUsRUFBRSxDQUFDLElBQUk7WUFDdkIsUUFBUSxFQUFFLEVBQUU7WUFDWixlQUFlLEVBQUUsaUJBQWlCLENBQUMsS0FBSyxFQUFFO1lBQzFDLFlBQVksRUFBRSxTQUFTO1lBQ3ZCLEdBQUcsU0FBUztTQUNiLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFFRCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxDQUM5QixJQUFJLEdBQUcsVUFBVSxFQUNqQixFQUFFLEdBQUcsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLEVBQ3pCLFFBQVEsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQzFCLElBQUksR0FBRyxZQUFZLENBQUMsTUFBTSxFQUMxQixJQUFJLEdBQUcsSUFBSSxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFDM0MsUUFBUSxHQUFHLEtBQUssRUFDaEIsV0FBVyxHQUFHLEVBQUUsRUFDaEIsRUFBRSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsQ0FBQyxDQUFDIn0=
@@ -57,18 +57,18 @@ export class AbstractPhaseManager {
57
57
  // TODO mitch left a question about whether this is only needed when unit testing
58
58
  // with mock data
59
59
  call => revertibleCallStack.find(p => p.equals(call)) || nonRevertibleCallStack.find(p => p.equals(call)));
60
+ const teardownCallStack = tx.publicTeardownFunctionCall.isEmpty() ? [] : [tx.publicTeardownFunctionCall];
60
61
  if (callRequestsStack.length === 0) {
61
62
  return {
62
63
  [PublicKernelType.NON_PUBLIC]: [],
63
64
  [PublicKernelType.SETUP]: [],
64
65
  [PublicKernelType.APP_LOGIC]: [],
65
- [PublicKernelType.TEARDOWN]: [],
66
+ [PublicKernelType.TEARDOWN]: teardownCallStack,
66
67
  [PublicKernelType.TAIL]: [],
67
68
  };
68
69
  }
69
70
  // find the first call that is revertible
70
71
  const firstRevertibleCallIndex = callRequestsStack.findIndex(c => revertibleCallStack.findIndex(p => p.equals(c)) !== -1);
71
- const teardownCallStack = tx.publicTeardownFunctionCall.isEmpty() ? [] : [tx.publicTeardownFunctionCall];
72
72
  if (firstRevertibleCallIndex === 0) {
73
73
  return {
74
74
  [PublicKernelType.NON_PUBLIC]: [],
@@ -141,12 +141,12 @@ export class AbstractPhaseManager {
141
141
  gasUsed = gasUsed.add(Gas.from(result.startGasLeft).sub(Gas.from(result.endGasLeft)));
142
142
  // Sanity check for a current upstream assumption.
143
143
  // Consumers of the result seem to expect "reverted <=> revertReason !== undefined".
144
- const functionSelector = result.execution.functionSelector.toString();
144
+ const functionSelector = result.executionRequest.functionSelector.toString();
145
145
  if (result.reverted && !result.revertReason) {
146
- throw new Error(`Simulation of ${result.execution.contractAddress.toString()}:${functionSelector}(${result.functionName}) reverted with no reason.`);
146
+ throw new Error(`Simulation of ${result.executionRequest.contractAddress.toString()}:${functionSelector}(${result.functionName}) reverted with no reason.`);
147
147
  }
148
148
  if (result.reverted && !PhaseIsRevertible[this.phase]) {
149
- this.log.debug(`Simulation error on ${result.execution.contractAddress.toString()}:${functionSelector}(${result.functionName}) with reason: ${result.revertReason}`);
149
+ this.log.debug(`Simulation error on ${result.executionRequest.contractAddress.toString()}:${functionSelector}(${result.functionName}) with reason: ${result.revertReason}`);
150
150
  throw result.revertReason;
151
151
  }
152
152
  if (isExecutionRequest) {
@@ -154,7 +154,7 @@ export class AbstractPhaseManager {
154
154
  }
155
155
  executionStack.push(...result.nestedExecutions);
156
156
  // Simulate the public kernel circuit.
157
- this.log.debug(`Running public kernel circuit for ${result.execution.contractAddress.toString()}:${functionSelector}(${result.functionName})`);
157
+ this.log.debug(`Running public kernel circuit for ${result.executionRequest.contractAddress.toString()}:${functionSelector}(${result.functionName})`);
158
158
  const callData = await this.getPublicCallData(result, isExecutionRequest);
159
159
  const [privateInputs, publicInputs] = await this.runKernelCircuit(kernelPublicOutput, callData);
160
160
  kernelPublicOutput = publicInputs;
@@ -171,12 +171,12 @@ export class AbstractPhaseManager {
171
171
  // if the simulator reverts in app logic, it "resets" and result.reverted will be false when we run teardown,
172
172
  // but the kernel carries the reverted flag forward. But if the simulator reverts, so should the kernel.
173
173
  if (result.reverted && kernelPublicOutput.revertCode.isOK()) {
174
- throw new Error(`Public kernel circuit did not revert on ${result.execution.contractAddress.toString()}:${functionSelector}(${result.functionName}), but simulator did.`);
174
+ throw new Error(`Public kernel circuit did not revert on ${result.executionRequest.contractAddress.toString()}:${functionSelector}(${result.functionName}), but simulator did.`);
175
175
  }
176
176
  // We know the phase is revertible due to the above check.
177
177
  // So safely return the revert reason and the kernel output (which has had its revertible side effects dropped)
178
178
  if (result.reverted) {
179
- this.log.debug(`Reverting on ${result.execution.contractAddress.toString()}:${functionSelector}(${result.functionName}) with reason: ${result.revertReason}`);
179
+ this.log.debug(`Reverting on ${result.executionRequest.contractAddress.toString()}:${functionSelector}(${result.functionName}) with reason: ${result.revertReason}`);
180
180
  // TODO(@spalladino): Check gasUsed is correct. The AVM should take care of setting gasLeft to zero upon a revert.
181
181
  return {
182
182
  publicProvingInformation: [],
@@ -243,9 +243,9 @@ export class AbstractPhaseManager {
243
243
  const callStackPreimages = await this.getPublicCallStackPreimages(result);
244
244
  const publicCallStackHashes = padArrayEnd(callStackPreimages.map(c => c.hash()), Fr.ZERO, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
245
245
  const publicCircuitPublicInputs = PublicCircuitPublicInputs.from({
246
- callContext: result.execution.callContext,
246
+ callContext: result.executionRequest.callContext,
247
247
  proverAddress: AztecAddress.ZERO,
248
- argsHash: computeVarArgsHash(result.execution.args),
248
+ argsHash: computeVarArgsHash(result.executionRequest.args),
249
249
  newNoteHashes: padArrayEnd(result.newNoteHashes, NoteHash.empty(), MAX_NEW_NOTE_HASHES_PER_CALL),
250
250
  newNullifiers: padArrayEnd(result.newNullifiers, Nullifier.empty(), MAX_NEW_NULLIFIERS_PER_CALL),
251
251
  newL2ToL1Msgs: padArrayEnd(result.newL2ToL1Messages, L2ToL1Message.empty(), MAX_NEW_L2_TO_L1_MSGS_PER_CALL),
@@ -268,7 +268,7 @@ export class AbstractPhaseManager {
268
268
  // TODO(@just-mitch): need better mapping from simulator to revert code.
269
269
  revertCode: result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK,
270
270
  });
271
- return new PublicCallStackItem(result.execution.contractAddress, new FunctionData(result.execution.functionSelector, false), publicCircuitPublicInputs, isExecutionRequest);
271
+ return new PublicCallStackItem(result.executionRequest.contractAddress, new FunctionData(result.executionRequest.functionSelector, false), publicCircuitPublicInputs, isExecutionRequest);
272
272
  }
273
273
  async getPublicCallStackPreimages(result) {
274
274
  const nested = result.nestedExecutions;
@@ -336,4 +336,4 @@ export class AbstractPhaseManager {
336
336
  return new PublicCallData(callStackItem, publicCallStack, makeEmptyProof(), bytecodeHash);
337
337
  }
338
338
  }
339
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/public/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
339
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/public/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
@@ -6,8 +6,8 @@ import { type Gas } from '../avm/avm_gas.js';
6
6
  * The public function execution result.
7
7
  */
8
8
  export interface PublicExecutionResult {
9
- /** The execution that triggered this result. */
10
- execution: PublicExecution;
9
+ /** The execution request that triggered this result. */
10
+ executionRequest: PublicExecutionRequest;
11
11
  /** The side effect counter at the start of the function call. */
12
12
  startSideEffectCounter: Fr;
13
13
  /** The side effect counter after executing this function call */
@@ -69,15 +69,16 @@ export interface PublicExecutionResult {
69
69
  functionName: string;
70
70
  }
71
71
  /**
72
- * The execution of a public function.
72
+ * The execution request of a public function.
73
+ * A subset of PublicCallRequest
73
74
  */
74
- export type PublicExecution = Pick<PublicCallRequest, 'contractAddress' | 'functionSelector' | 'callContext' | 'args'>;
75
+ export type PublicExecutionRequest = Pick<PublicCallRequest, 'contractAddress' | 'functionSelector' | 'callContext' | 'args'>;
75
76
  /**
76
77
  * Returns if the input is a public execution result and not just a public execution.
77
78
  * @param input - Public execution or public execution result.
78
79
  * @returns Whether the input is a public execution result and not just a public execution.
79
80
  */
80
- export declare function isPublicExecutionResult(input: PublicExecution | PublicExecutionResult): input is PublicExecutionResult;
81
+ export declare function isPublicExecutionResult(input: PublicExecutionRequest | PublicExecutionResult): input is PublicExecutionResult;
81
82
  /**
82
83
  * Checks whether the child execution result is valid for a static call (no state modifications).
83
84
  * @param executionResult - The execution result of a public function
@@ -1 +1 @@
1
- {"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,SAAS,EAAE,eAAe,CAAC;IAE3B,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,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,wDAAwD;IACxD,iBAAiB,EAAE,aAAa,EAAE,CAAC;IACnC,iEAAiE;IACjE,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,wDAAwD;IACxD,oBAAoB,EAAE,WAAW,EAAE,CAAC;IACpC,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,2DAA2D;IAC3D,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC;;;OAGG;IACH,qBAAqB,EAAE,OAAO,EAAE,CAAC;IACjC;;;OAGG;IACH,eAAe,EAAE,yBAAyB,CAAC;IAC3C;;;OAGG;IACH,kBAAkB,EAAE,yBAAyB,CAAC;IAI9C,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAEzB,uCAAuC;IACvC,eAAe,EAAE,iBAAiB,CAAC;IAEnC,yEAAyE;IACzE,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;AAEvH;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,eAAe,GAAG,qBAAqB,GAC7C,KAAK,IAAI,qBAAqB,CAEhC;AAED;;;GAGG;AAEH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,QAAQ,EAAE,EACzB,aAAa,EAAE,SAAS,EAAE,EAC1B,6BAA6B,EAAE,4BAA4B,EAAE,EAC7D,iBAAiB,EAAE,aAAa,EAAE,EAClC,eAAe,EAAE,yBAAyB,QAW3C"}
1
+ {"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;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,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,wDAAwD;IACxD,iBAAiB,EAAE,aAAa,EAAE,CAAC;IACnC,iEAAiE;IACjE,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,wDAAwD;IACxD,oBAAoB,EAAE,WAAW,EAAE,CAAC;IACpC,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,2DAA2D;IAC3D,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC;;;OAGG;IACH,qBAAqB,EAAE,OAAO,EAAE,CAAC;IACjC;;;OAGG;IACH,eAAe,EAAE,yBAAyB,CAAC;IAC3C;;;OAGG;IACH,kBAAkB,EAAE,yBAAyB,CAAC;IAI9C,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAEzB,uCAAuC;IACvC,eAAe,EAAE,iBAAiB,CAAC;IAEnC,yEAAyE;IACzE,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,iBAAiB,EACjB,iBAAiB,GAAG,kBAAkB,GAAG,aAAa,GAAG,MAAM,CAChE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,sBAAsB,GAAG,qBAAqB,GACpD,KAAK,IAAI,qBAAqB,CAEhC;AAED;;;GAGG;AAEH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,QAAQ,EAAE,EACzB,aAAa,EAAE,SAAS,EAAE,EAC1B,6BAA6B,EAAE,4BAA4B,EAAE,EAC7D,iBAAiB,EAAE,aAAa,EAAE,EAClC,eAAe,EAAE,yBAAyB,QAW3C"}
@@ -4,7 +4,7 @@
4
4
  * @returns Whether the input is a public execution result and not just a public execution.
5
5
  */
6
6
  export function isPublicExecutionResult(input) {
7
- return 'execution' in input && input.execution !== undefined;
7
+ return 'executionRequest' in input && input.executionRequest !== undefined;
8
8
  }
9
9
  /**
10
10
  * Checks whether the child execution result is valid for a static call (no state modifications).
@@ -19,4 +19,4 @@ export function checkValidStaticCall(newNoteHashes, newNullifiers, contractStora
19
19
  throw new Error('Static call cannot update the state, emit L2->L1 messages or generate logs');
20
20
  }
21
21
  }
22
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0dBOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQ3JDLEtBQThDO0lBRTlDLE9BQU8sV0FBVyxJQUFJLEtBQUssSUFBSSxLQUFLLENBQUMsU0FBUyxLQUFLLFNBQVMsQ0FBQztBQUMvRCxDQUFDO0FBRUQ7OztHQUdHO0FBRUgsTUFBTSxVQUFVLG9CQUFvQixDQUNsQyxhQUF5QixFQUN6QixhQUEwQixFQUMxQiw2QkFBNkQsRUFDN0QsaUJBQWtDLEVBQ2xDLGVBQTBDO0lBRTFDLElBQ0UsNkJBQTZCLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEMsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hCLGFBQWEsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUN4QixpQkFBaUIsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUM1QixlQUFlLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQy9CLENBQUM7UUFDRCxNQUFNLElBQUksS0FBSyxDQUFDLDRFQUE0RSxDQUFDLENBQUM7SUFDaEcsQ0FBQztBQUNILENBQUMifQ==
22
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBb0dBOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQ3JDLEtBQXFEO0lBRXJELE9BQU8sa0JBQWtCLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxnQkFBZ0IsS0FBSyxTQUFTLENBQUM7QUFDN0UsQ0FBQztBQUVEOzs7R0FHRztBQUVILE1BQU0sVUFBVSxvQkFBb0IsQ0FDbEMsYUFBeUIsRUFDekIsYUFBMEIsRUFDMUIsNkJBQTZELEVBQzdELGlCQUFrQyxFQUNsQyxlQUEwQztJQUUxQyxJQUNFLDZCQUE2QixDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hDLGFBQWEsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUN4QixhQUFhLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEIsaUJBQWlCLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDNUIsZUFBZSxDQUFDLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUMvQixDQUFDO1FBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyw0RUFBNEUsQ0FBQyxDQUFDO0lBQ2hHLENBQUM7QUFDSCxDQUFDIn0=
@@ -1,15 +1,15 @@
1
1
  import { Fr, Gas, type GlobalVariables, type Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
2
2
  import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db_interfaces.js';
3
- import { type PublicExecution, type PublicExecutionResult } from './execution.js';
3
+ import { type PublicExecutionRequest, type PublicExecutionResult } from './execution.js';
4
4
  /**
5
5
  * Handles execution of public functions.
6
6
  */
7
7
  export declare class PublicExecutor {
8
- private readonly stateDb;
8
+ private readonly publicStorageDB;
9
9
  private readonly contractsDb;
10
10
  private readonly commitmentsDb;
11
11
  private readonly header;
12
- constructor(stateDb: PublicStateDB, contractsDb: PublicContractsDB, commitmentsDb: CommitmentsDB, header: Header);
12
+ constructor(publicStorageDB: PublicStateDB, contractsDb: PublicContractsDB, commitmentsDb: CommitmentsDB, header: Header);
13
13
  static readonly log: import("@aztec/foundation/log").Logger;
14
14
  /**
15
15
  * Executes a public execution request.
@@ -22,6 +22,6 @@ export declare class PublicExecutor {
22
22
  * @param startSideEffectCounter - The counter of the first side-effect generated by this simulation.
23
23
  * @returns The result of execution, including the results of all nested calls.
24
24
  */
25
- simulate(executionRequest: PublicExecution, globalVariables: GlobalVariables, availableGas: Gas, txContext: TxContext, pendingSiloedNullifiers: Nullifier[], transactionFee?: Fr, startSideEffectCounter?: number): Promise<PublicExecutionResult>;
25
+ simulate(executionRequest: PublicExecutionRequest, globalVariables: GlobalVariables, availableGas: Gas, _txContext: TxContext, pendingSiloedNullifiers: Nullifier[], transactionFee?: Fr, startSideEffectCounter?: number): Promise<PublicExecutionResult>;
26
26
  }
27
27
  //# sourceMappingURL=executor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAShH,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAwB,MAAM,gBAAgB,CAAC;AAIxG;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM;IAGjC,MAAM,CAAC,QAAQ,CAAC,GAAG,yCAAwD;IAE3E;;;;;;;;;;OAUG;IACU,QAAQ,CACnB,gBAAgB,EAAE,eAAe,EACjC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,GAAG,EACjB,SAAS,EAAE,SAAS,EACpB,uBAAuB,EAAE,SAAS,EAAE,EACpC,cAAc,GAAE,EAAY,EAC5B,sBAAsB,GAAE,MAAU,GACjC,OAAO,CAAC,qBAAqB,CAAC;CA0ElC"}
1
+ {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAUhH,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAGzF;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,eAAe,EAAE,aAAa,EAC9B,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM;IAGjC,MAAM,CAAC,QAAQ,CAAC,GAAG,yCAAwD;IAE3E;;;;;;;;;;OAUG;IACU,QAAQ,CACnB,gBAAgB,EAAE,sBAAsB,EACxC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,GAAG,EACjB,UAAU,EAAE,SAAS,EACrB,uBAAuB,EAAE,SAAS,EAAE,EACpC,cAAc,GAAE,EAAY,EAC5B,sBAAsB,GAAE,MAAU,GACjC,OAAO,CAAC,qBAAqB,CAAC;CA6DlC"}
@@ -2,19 +2,18 @@ import { Fr, Gas } from '@aztec/circuits.js';
2
2
  import { createDebugLogger } from '@aztec/foundation/log';
3
3
  import { Timer } from '@aztec/foundation/timer';
4
4
  import { AvmContext } from '../avm/avm_context.js';
5
+ import { AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
5
6
  import { AvmMachineState } from '../avm/avm_machine_state.js';
6
7
  import { AvmSimulator } from '../avm/avm_simulator.js';
7
8
  import { HostStorage } from '../avm/journal/host_storage.js';
8
9
  import { AvmPersistableStateManager } from '../avm/journal/index.js';
9
- import { checkValidStaticCall } from './execution.js';
10
10
  import { PublicSideEffectTrace } from './side_effect_trace.js';
11
- import { createAvmExecutionEnvironment } from './transitional_adaptors.js';
12
11
  /**
13
12
  * Handles execution of public functions.
14
13
  */
15
14
  export class PublicExecutor {
16
- constructor(stateDb, contractsDb, commitmentsDb, header) {
17
- this.stateDb = stateDb;
15
+ constructor(publicStorageDB, contractsDb, commitmentsDb, header) {
16
+ this.publicStorageDB = publicStorageDB;
18
17
  this.contractsDb = contractsDb;
19
18
  this.commitmentsDb = commitmentsDb;
20
19
  this.header = header;
@@ -30,22 +29,22 @@ export class PublicExecutor {
30
29
  * @param startSideEffectCounter - The counter of the first side-effect generated by this simulation.
31
30
  * @returns The result of execution, including the results of all nested calls.
32
31
  */
33
- async simulate(executionRequest, globalVariables, availableGas, txContext, pendingSiloedNullifiers, transactionFee = Fr.ZERO, startSideEffectCounter = 0) {
32
+ async simulate(executionRequest, globalVariables, availableGas, _txContext, pendingSiloedNullifiers, transactionFee = Fr.ZERO, startSideEffectCounter = 0) {
34
33
  const address = executionRequest.contractAddress;
35
34
  const selector = executionRequest.functionSelector;
36
35
  const fnName = (await this.contractsDb.getDebugFunctionName(address, selector)) ?? `${address}:${selector}`;
37
36
  PublicExecutor.log.verbose(`[AVM] Executing public external function ${fnName}.`);
38
37
  const timer = new Timer();
39
- const hostStorage = new HostStorage(this.stateDb, this.contractsDb, this.commitmentsDb);
38
+ const hostStorage = new HostStorage(this.publicStorageDB, this.contractsDb, this.commitmentsDb);
40
39
  const trace = new PublicSideEffectTrace(startSideEffectCounter);
41
40
  const avmPersistableState = AvmPersistableStateManager.newWithPendingSiloedNullifiers(hostStorage, trace, pendingSiloedNullifiers.map(n => n.value));
42
- const avmExecutionEnv = createAvmExecutionEnvironment(executionRequest, this.header, globalVariables, txContext.gasSettings, transactionFee);
41
+ const avmExecutionEnv = createAvmExecutionEnvironment(executionRequest, this.header, globalVariables, transactionFee);
43
42
  const avmMachineState = new AvmMachineState(availableGas);
44
43
  const avmContext = new AvmContext(avmPersistableState, avmExecutionEnv, avmMachineState);
45
44
  const simulator = new AvmSimulator(avmContext);
46
45
  const avmResult = await simulator.execute();
47
46
  const bytecode = simulator.getBytecode();
48
- // Commit the journals state to the DBs since this is a top-level execution.
47
+ // Commit the public storage state to the DBs since this is a top-level execution.
49
48
  // Observe that this will write all the state changes to the DBs, not only the latest for each slot.
50
49
  // However, the underlying DB keep a cache and will only write the latest state to disk.
51
50
  // TODO(dbanks12): this should be unnecessary here or should be exposed by state manager
@@ -60,13 +59,19 @@ export class PublicExecutor {
60
59
  /*startGasLeft=*/ availableGas,
61
60
  /*endGasLeft=*/ Gas.from(avmContext.machineState.gasLeft), bytecode, avmResult, fnName,
62
61
  /*requestSideEffectCounter=*/ executionRequest.callContext.sideEffectCounter);
63
- // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): is this really needed?
64
- // should already be handled in simulation.
65
- if (executionRequest.callContext.isStaticCall) {
66
- checkValidStaticCall(publicExecutionResult.newNoteHashes, publicExecutionResult.newNullifiers, publicExecutionResult.contractStorageUpdateRequests, publicExecutionResult.newL2ToL1Messages, publicExecutionResult.unencryptedLogs);
67
- }
68
62
  return publicExecutionResult;
69
63
  }
70
64
  }
71
65
  PublicExecutor.log = createDebugLogger('aztec:simulator:public_executor');
72
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2V4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFxRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hILE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzlELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFckUsT0FBTyxFQUFvRCxvQkFBb0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hHLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTNFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGNBQWM7SUFDekIsWUFDbUIsT0FBc0IsRUFDdEIsV0FBOEIsRUFDOUIsYUFBNEIsRUFDNUIsTUFBYztRQUhkLFlBQU8sR0FBUCxPQUFPLENBQWU7UUFDdEIsZ0JBQVcsR0FBWCxXQUFXLENBQW1CO1FBQzlCLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQzVCLFdBQU0sR0FBTixNQUFNLENBQVE7SUFDOUIsQ0FBQztJQUlKOzs7Ozs7Ozs7O09BVUc7SUFDSSxLQUFLLENBQUMsUUFBUSxDQUNuQixnQkFBaUMsRUFDakMsZUFBZ0MsRUFDaEMsWUFBaUIsRUFDakIsU0FBb0Is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
66
+ /**
67
+ * Convert a PublicExecutionRequest object to an AvmExecutionEnvironment
68
+ *
69
+ * @param executionRequest
70
+ * @param globalVariables
71
+ * @returns
72
+ */
73
+ function createAvmExecutionEnvironment(executionRequest, header, globalVariables, transactionFee) {
74
+ return new AvmExecutionEnvironment(executionRequest.contractAddress, executionRequest.callContext.storageContractAddress, executionRequest.callContext.msgSender, executionRequest.functionSelector,
75
+ /*contractCallDepth=*/ Fr.zero(), transactionFee, header, globalVariables, executionRequest.callContext.isStaticCall, executionRequest.callContext.isDelegateCall, executionRequest.args);
76
+ }
77
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2V4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFxRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hILE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDOUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzlELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHckUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFL0Q7O0dBRUc7QUFDSCxNQUFNLE9BQU8sY0FBYztJQUN6QixZQUNtQixlQUE4QixFQUM5QixXQUE4QixFQUM5QixhQUE0QixFQUM1QixNQUFjO1FBSGQsb0JBQWUsR0FBZixlQUFlLENBQWU7UUFDOUIsZ0JBQVcsR0FBWCxXQUFXLENBQW1CO1FBQzlCLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQzVCLFdBQU0sR0FBTixNQUFNLENBQVE7SUFDOUIsQ0FBQztJQUlKOzs7Ozs7Ozs7O09BVUc7SUFDSSxLQUFLLENBQUMsUUFBUSxDQUNuQixnQkFBd0MsRUFDeEMsZUFBZ0MsRUFDaEMsWUFBaUIsRUFDakIsVUFBcUIsRUFDckIsdUJBQW9DLEVBQ3BDLGlCQUFxQixFQUFFLENBQUMsSUFBSSxFQUM1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
@@ -4,7 +4,7 @@ import { type MerkleTreeOperations } from '@aztec/world-state';
4
4
  export declare class HintsBuilder {
5
5
  private db;
6
6
  constructor(db: MerkleTreeOperations);
7
- getNullifierReadRequestHints(nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints<128, 128>>;
7
+ getNullifierReadRequestHints(nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints<64, 64>>;
8
8
  getNullifierNonExistentReadRequestHints(nullifierNonExistentReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierNonExistentReadRequestHints>;
9
9
  getPublicDataHints(publicDataReads: Tuple<PublicDataRead, typeof MAX_PUBLIC_DATA_READS_PER_TX>, publicDataUpdateRequests: Tuple<PublicDataUpdateRequest, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>): Promise<[PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint]>;
10
10
  getPublicDataHint(dataAction: PublicDataRead | PublicDataUpdateRequest | bigint): Promise<PublicDataHint>;
@@ -1,6 +1,6 @@
1
1
  export * from './abstract_phase_manager.js';
2
2
  export * from './db_interfaces.js';
3
- export { isPublicExecutionResult, type PublicExecution, type PublicExecutionResult } from './execution.js';
3
+ export { isPublicExecutionResult, type PublicExecutionRequest, type PublicExecutionResult } from './execution.js';
4
4
  export { PublicExecutor } from './executor.js';
5
5
  export * from './fee_payment.js';
6
6
  export { HintsBuilder } from './hints_builder.js';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,uBAAuB,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC3G,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sCAAsC,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,uBAAuB,EAAE,KAAK,sBAAsB,EAAE,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAClH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sCAAsC,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC"}
@@ -8,4 +8,4 @@ export * from './public_db_sources.js';
8
8
  export * from './public_kernel.js';
9
9
  export * from './public_kernel_circuit_simulator.js';
10
10
  export { PublicProcessor, PublicProcessorFactory } from './public_processor.js';
11
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxPQUFPLEVBQUUsdUJBQXVCLEVBQW9ELE1BQU0sZ0JBQWdCLENBQUM7QUFDM0csT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMvQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxPQUFPLEVBQUUsZUFBZSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUJBQXVCLENBQUMifQ==
11
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxPQUFPLEVBQUUsdUJBQXVCLEVBQTJELE1BQU0sZ0JBQWdCLENBQUM7QUFDbEgsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMvQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxPQUFPLEVBQUUsZUFBZSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUJBQXVCLENBQUMifQ==
@@ -1,5 +1,5 @@
1
1
  import { type KernelCircuitPublicInputs, type PublicKernelCircuitPrivateInputs, type PublicKernelCircuitPublicInputs, type PublicKernelTailCircuitPrivateInputs } from '@aztec/circuits.js';
2
- import { type SimulationProvider } from '@aztec/simulator';
2
+ import { type SimulationProvider } from '../providers/simulation_provider.js';
3
3
  import { type PublicKernelCircuitSimulator } from './public_kernel_circuit_simulator.js';
4
4
  /**
5
5
  * Implements the PublicKernelCircuitSimulator.
@@ -1 +1 @@
1
- {"version":3,"file":"public_kernel.d.ts","sourceRoot":"","sources":["../../src/public/public_kernel.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,gCAAgC,EACrC,KAAK,+BAA+B,EACpC,KAAK,oCAAoC,EAC1C,MAAM,oBAAoB,CAAC;AAiB5B,OAAO,EAAE,KAAK,kBAAkB,EAAiB,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;GAEG;AACH,qBAAa,gCAAiC,YAAW,4BAA4B;IAMvE,OAAO,CAAC,SAAS;IAL7B,OAAO,CAAC,GAAG,CAAsD;IAGjE,OAAO,CAAC,aAAa,CAAsC;gBAEvC,SAAS,EAAE,kBAAkB;IAEjD;;;;OAIG;IACU,wBAAwB,CACnC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,2BAA2B,CACtC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,2BAA2B,CACtC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,uBAAuB,CAClC,KAAK,EAAE,oCAAoC,GAC1C,OAAO,CAAC,yBAAyB,CAAC;CAetC"}
1
+ {"version":3,"file":"public_kernel.d.ts","sourceRoot":"","sources":["../../src/public/public_kernel.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,gCAAgC,EACrC,KAAK,+BAA+B,EACpC,KAAK,oCAAoC,EAC1C,MAAM,oBAAoB,CAAC;AAmB5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEzF;;GAEG;AACH,qBAAa,gCAAiC,YAAW,4BAA4B;IAMvE,OAAO,CAAC,SAAS;IAL7B,OAAO,CAAC,GAAG,CAAsD;IAGjE,OAAO,CAAC,aAAa,CAAsC;gBAEvC,SAAS,EAAE,kBAAkB;IAEjD;;;;OAIG;IACU,wBAAwB,CACnC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,2BAA2B,CACtC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,2BAA2B,CACtC,KAAK,EAAE,gCAAgC,GACtC,OAAO,CAAC,+BAA+B,CAAC;IAmB3C;;;;OAIG;IACU,uBAAuB,CAClC,KAAK,EAAE,oCAAoC,GAC1C,OAAO,CAAC,yBAAyB,CAAC;CAetC"}
@@ -1,7 +1,7 @@
1
1
  import { createDebugLogger } from '@aztec/foundation/log';
2
2
  import { elapsed } from '@aztec/foundation/timer';
3
3
  import { SimulatedPublicKernelAppLogicArtifact, SimulatedPublicKernelSetupArtifact, SimulatedPublicKernelTailArtifact, SimulatedPublicKernelTeardownArtifact, convertSimulatedPublicInnerInputsToWitnessMap, convertSimulatedPublicInnerOutputFromWitnessMap, convertSimulatedPublicSetupInputsToWitnessMap, convertSimulatedPublicSetupOutputFromWitnessMap, convertSimulatedPublicTailInputsToWitnessMap, convertSimulatedPublicTailOutputFromWitnessMap, convertSimulatedPublicTeardownInputsToWitnessMap, convertSimulatedPublicTeardownOutputFromWitnessMap, } from '@aztec/noir-protocol-circuits-types';
4
- import { WASMSimulator } from '@aztec/simulator';
4
+ import { WASMSimulator } from '../providers/acvm_wasm.js';
5
5
  /**
6
6
  * Implements the PublicKernelCircuitSimulator.
7
7
  */
@@ -94,4 +94,4 @@ export class RealPublicKernelCircuitSimulator {
94
94
  return result;
95
95
  }
96
96
  }
97
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tlcm5lbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvcHVibGljX2tlcm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUNMLHFDQUFxQyxFQUNyQyxrQ0FBa0MsRUFDbEMsaUNBQWlDLEVBQ2pDLHFDQUFxQyxFQUNyQyw2Q0FBNkMsRUFDN0MsK0NBQStDLEVBQy9DLDZDQUE2QyxFQUM3QywrQ0FBK0MsRUFDL0MsNENBQTRDLEVBQzVDLDhDQUE4QyxFQUM5QyxnREFBZ0QsRUFDaEQsa0RBQWtELEdBQ25ELE1BQU0scUNBQXFDLENBQUM7QUFDN0MsT0FBTyxFQUEyQixhQUFhLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUkxRTs7R0FFRztBQUNILE1BQU0sT0FBTyxnQ0FBZ0M7SUFNM0MsWUFBb0IsU0FBNkI7UUFBN0IsY0FBUyxHQUFULFNBQVMsQ0FBb0I7UUFMekMsUUFBRyxHQUFHLGlCQUFpQixDQUFDLCtCQUErQixDQUFDLENBQUM7UUFFakUsc0RBQXNEO1FBQzlDLGtCQUFhLEdBQWtCLElBQUksYUFBYSxFQUFFLENBQUM7SUFFUCxDQUFDO0lBRXJEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsd0JBQXdCLENBQ25DLEtBQXVDO1FBRXZDLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNsRCxNQUFNLElBQUksS0FBSyxDQUFDLCtDQUErQyxDQUFDLENBQUM7UUFDbkUsQ0FBQztRQUNELE1BQU0sWUFBWSxHQUFHLDZDQUE2QyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FB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
97
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2tlcm5lbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvcHVibGljX2tlcm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUNMLHFDQUFxQyxFQUNyQyxrQ0FBa0MsRUFDbEMsaUNBQWlDLEVBQ2pDLHFDQUFxQyxFQUNyQyw2Q0FBNkMsRUFDN0MsK0NBQStDLEVBQy9DLDZDQUE2QyxFQUM3QywrQ0FBK0MsRUFDL0MsNENBQTRDLEVBQzVDLDhDQUE4QyxFQUM5QyxnREFBZ0QsRUFDaEQsa0RBQWtELEdBQ25ELE1BQU0scUNBQXFDLENBQUM7QUFFN0MsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTFEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGdDQUFnQztJQU0zQyxZQUFvQixTQUE2QjtRQUE3QixjQUFTLEdBQVQsU0FBUyxDQUFvQjtRQUx6QyxRQUFHLEdBQUcsaUJBQWlCLENBQUMsK0JBQStCLENBQUMsQ0FBQztRQUVqRSxzREFBc0Q7UUFDOUMsa0JBQWEsR0FBa0IsSUFBSSxhQUFhLEVBQUUsQ0FBQztJQUVQLENBQUM7SUFFckQ7Ozs7T0FJRztJQUNJLEtBQUssQ0FBQyx3QkFBd0IsQ0FDbkMsS0FBdUM7UUFFdkMsSUFBSSxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQUMsK0NBQStDLENBQUMsQ0FBQztRQUNuRSxDQUFDO1FBQ0QsTUFBTSxZQUFZLEdBQUcsNkNBQTZDLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFH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
@@ -2,8 +2,8 @@
2
2
  import { Gas } from '@aztec/circuits.js';
3
3
  import { Fr } from '@aztec/foundation/fields';
4
4
  import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
5
+ import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
5
6
  import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
6
- import { type AvmContractCallResults } from '../avm/avm_message_call_result.js';
7
7
  import { type PublicExecutionResult } from './execution.js';
8
8
  import { type PublicSideEffectTraceInterface } from './side_effect_trace_interface.js';
9
9
  export type TracedContractInstance = {
@@ -12,6 +12,7 @@ export type TracedContractInstance = {
12
12
  export declare class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
13
13
  /** The counter of this trace's first side effect. */
14
14
  readonly startSideEffectCounter: number;
15
+ logger: import("@aztec/foundation/log").Logger;
15
16
  /** The side effect counter increments with every call to the trace. */
16
17
  private sideEffectCounter;
17
18
  private contractStorageReads;
@@ -43,7 +44,7 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
43
44
  traceNewNullifier(_storageAddress: Fr, nullifier: Fr): void;
44
45
  traceL1ToL2MessageCheck(_contractAddress: Fr, msgHash: Fr, _msgLeafIndex: Fr, exists: boolean): void;
45
46
  traceNewL2ToL1Message(recipient: Fr, content: Fr): void;
46
- traceUnencryptedLog(contractAddress: Fr, event: Fr, log: Fr[]): void;
47
+ traceUnencryptedLog(contractAddress: Fr, log: Fr[]): void;
47
48
  traceGetContractInstance(instance: TracedContractInstance): void;
48
49
  /**
49
50
  * Trace a nested call.
@@ -61,7 +62,7 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
61
62
  /** Bytecode used for this execution. */
62
63
  bytecode: Buffer,
63
64
  /** The call's results */
64
- avmCallResults: AvmContractCallResults,
65
+ avmCallResults: AvmContractCallResult,
65
66
  /** Function name for logging */
66
67
  functionName?: string): void;
67
68
  /**
@@ -77,7 +78,7 @@ export declare class PublicSideEffectTrace implements PublicSideEffectTraceInter
77
78
  /** Bytecode used for this execution. */
78
79
  bytecode: Buffer,
79
80
  /** The call's results */
80
- avmCallResults: AvmContractCallResults,
81
+ avmCallResults: AvmContractCallResult,
81
82
  /** Function name for logging */
82
83
  functionName?: string,
83
84
  /** The side effect counter of the execution request itself */
@@ -1 +1 @@
1
- {"version":3,"file":"side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":";AACA,OAAO,EAUL,GAAG,EAMJ,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAEnF,OAAO,EAA+B,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACzF,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,CAAqB;IACjD,OAAO,CAAC,aAAa,CAAkB;IAEvC,OAAO,CAAC,qBAAqB,CAAqB;IAClD,OAAO,CAAC,gCAAgC,CAAqB;IAC7D,OAAO,CAAC,aAAa,CAAmB;IAExC,OAAO,CAAC,qBAAqB,CAAqB;IAClD,OAAO,CAAC,iBAAiB,CAAuB;IAEhD,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,OAAO,CAAC,oBAAoB,CAAqC;IAEjE,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,OAAO,CAAC,eAAe,CAAoB;;IAGzC,qDAAqD;IACrC,sBAAsB,GAAE,MAAU;IAM7C,IAAI;IAIJ,UAAU;IAIjB,OAAO,CAAC,0BAA0B;IAI3B,sBAAsB,CAAC,cAAc,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;IAclG,uBAAuB,CAAC,cAAc,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE;IAU/D,kBAAkB,CAAC,eAAe,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO;IAarF,gBAAgB,CAAC,eAAe,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;IAYlD,mBAAmB,CAAC,eAAe,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO;IAiB5G,iBAAiB,CAAC,eAAe,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;IAQpD,uBAAuB,CAAC,gBAAgB,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO;IAa7F,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE;IAQhD,mBAAmB,CAAC,eAAe,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;IAiBlD,wBAAwB,CAAC,QAAQ,EAAE,sBAAsB;IAkBhE;;;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;IA+BlC;;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;IAChC,8DAA8D;IAC9D,wBAAwB,GAAE,MAAoC,GAC7D,qBAAqB;CAuCzB"}