@aztec/pxe 0.66.0 → 0.67.1-devnet

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 (100) hide show
  1. package/dest/bin/index.js +5 -6
  2. package/dest/config/index.d.ts +0 -9
  3. package/dest/config/index.d.ts.map +1 -1
  4. package/dest/config/index.js +1 -17
  5. package/dest/config/package_info.d.ts +5 -0
  6. package/dest/config/package_info.d.ts.map +1 -0
  7. package/dest/config/package_info.js +4 -0
  8. package/dest/contract_data_oracle/index.js +2 -2
  9. package/dest/database/incoming_note_dao.d.ts +1 -1
  10. package/dest/database/incoming_note_dao.d.ts.map +1 -1
  11. package/dest/database/incoming_note_dao.js +2 -2
  12. package/dest/database/kv_pxe_database.d.ts +10 -13
  13. package/dest/database/kv_pxe_database.d.ts.map +1 -1
  14. package/dest/database/kv_pxe_database.js +153 -230
  15. package/dest/database/outgoing_note_dao.js +2 -2
  16. package/dest/database/pxe_database.d.ts +7 -25
  17. package/dest/database/pxe_database.d.ts.map +1 -1
  18. package/dest/database/pxe_database_test_suite.d.ts.map +1 -1
  19. package/dest/database/pxe_database_test_suite.js +18 -59
  20. package/dest/index.d.ts +2 -0
  21. package/dest/index.d.ts.map +1 -1
  22. package/dest/index.js +3 -1
  23. package/dest/kernel_oracle/index.d.ts.map +1 -1
  24. package/dest/kernel_oracle/index.js +4 -4
  25. package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.js +2 -2
  26. package/dest/kernel_prover/index.d.ts +1 -0
  27. package/dest/kernel_prover/index.d.ts.map +1 -1
  28. package/dest/kernel_prover/index.js +2 -1
  29. package/dest/kernel_prover/kernel_prover.d.ts +1 -0
  30. package/dest/kernel_prover/kernel_prover.d.ts.map +1 -1
  31. package/dest/kernel_prover/kernel_prover.js +42 -5
  32. package/dest/kernel_prover/test/test_circuit_prover.d.ts +1 -2
  33. package/dest/kernel_prover/test/test_circuit_prover.d.ts.map +1 -1
  34. package/dest/kernel_prover/test/test_circuit_prover.js +7 -13
  35. package/dest/note_decryption_utils/add_public_values_to_payload.js +2 -2
  36. package/dest/note_decryption_utils/brute_force_note_info.d.ts +3 -3
  37. package/dest/note_decryption_utils/brute_force_note_info.d.ts.map +1 -1
  38. package/dest/note_decryption_utils/brute_force_note_info.js +8 -8
  39. package/dest/note_decryption_utils/produce_note_daos.d.ts +3 -6
  40. package/dest/note_decryption_utils/produce_note_daos.d.ts.map +1 -1
  41. package/dest/note_decryption_utils/produce_note_daos.js +5 -19
  42. package/dest/note_decryption_utils/produce_note_daos_for_key.d.ts +1 -1
  43. package/dest/note_decryption_utils/produce_note_daos_for_key.d.ts.map +1 -1
  44. package/dest/pxe_service/error_enriching.d.ts +3 -3
  45. package/dest/pxe_service/error_enriching.d.ts.map +1 -1
  46. package/dest/pxe_service/error_enriching.js +10 -10
  47. package/dest/pxe_service/index.d.ts +0 -1
  48. package/dest/pxe_service/index.d.ts.map +1 -1
  49. package/dest/pxe_service/index.js +1 -2
  50. package/dest/pxe_service/pxe_service.d.ts +2 -16
  51. package/dest/pxe_service/pxe_service.d.ts.map +1 -1
  52. package/dest/pxe_service/pxe_service.js +74 -96
  53. package/dest/pxe_service/test/pxe_test_suite.d.ts.map +1 -1
  54. package/dest/pxe_service/test/pxe_test_suite.js +1 -3
  55. package/dest/simulator/index.d.ts +1 -1
  56. package/dest/simulator/index.d.ts.map +1 -1
  57. package/dest/simulator/index.js +2 -2
  58. package/dest/simulator_oracle/index.d.ts +14 -11
  59. package/dest/simulator_oracle/index.d.ts.map +1 -1
  60. package/dest/simulator_oracle/index.js +170 -140
  61. package/dest/simulator_oracle/tagging_utils.d.ts +15 -0
  62. package/dest/simulator_oracle/tagging_utils.d.ts.map +1 -0
  63. package/dest/simulator_oracle/tagging_utils.js +23 -0
  64. package/dest/synchronizer/synchronizer.d.ts +10 -40
  65. package/dest/synchronizer/synchronizer.d.ts.map +1 -1
  66. package/dest/synchronizer/synchronizer.js +35 -69
  67. package/dest/{pxe_service → utils}/create_pxe_service.d.ts +1 -1
  68. package/dest/utils/create_pxe_service.d.ts.map +1 -0
  69. package/dest/utils/create_pxe_service.js +52 -0
  70. package/package.json +31 -19
  71. package/src/bin/index.ts +4 -5
  72. package/src/config/index.ts +0 -21
  73. package/src/config/package_info.ts +3 -0
  74. package/src/contract_data_oracle/index.ts +1 -1
  75. package/src/database/incoming_note_dao.ts +2 -2
  76. package/src/database/kv_pxe_database.ts +214 -309
  77. package/src/database/outgoing_note_dao.ts +1 -1
  78. package/src/database/pxe_database.ts +7 -28
  79. package/src/database/pxe_database_test_suite.ts +20 -75
  80. package/src/index.ts +2 -0
  81. package/src/kernel_oracle/index.ts +3 -3
  82. package/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts +1 -1
  83. package/src/kernel_prover/index.ts +2 -0
  84. package/src/kernel_prover/kernel_prover.ts +72 -3
  85. package/src/kernel_prover/test/test_circuit_prover.ts +11 -25
  86. package/src/note_decryption_utils/add_public_values_to_payload.ts +1 -1
  87. package/src/note_decryption_utils/brute_force_note_info.ts +9 -9
  88. package/src/note_decryption_utils/produce_note_daos.ts +5 -48
  89. package/src/note_decryption_utils/produce_note_daos_for_key.ts +1 -1
  90. package/src/pxe_service/error_enriching.ts +14 -12
  91. package/src/pxe_service/index.ts +0 -1
  92. package/src/pxe_service/pxe_service.ts +127 -174
  93. package/src/pxe_service/test/pxe_test_suite.ts +0 -3
  94. package/src/simulator/index.ts +1 -1
  95. package/src/simulator_oracle/index.ts +201 -188
  96. package/src/simulator_oracle/tagging_utils.ts +28 -0
  97. package/src/synchronizer/synchronizer.ts +37 -77
  98. package/src/{pxe_service → utils}/create_pxe_service.ts +16 -13
  99. package/dest/pxe_service/create_pxe_service.d.ts.map +0 -1
  100. package/dest/pxe_service/create_pxe_service.js +0 -49
@@ -27,5 +27,6 @@ export declare class KernelProver {
27
27
  */
28
28
  prove(txRequest: TxRequest, executionResult: PrivateExecutionResult, profile?: boolean, dryRun?: boolean): Promise<PrivateKernelSimulateOutput<PrivateKernelTailCircuitPublicInputs>>;
29
29
  private createPrivateCallData;
30
+ private isPrivateOnly;
30
31
  }
31
32
  //# sourceMappingURL=kernel_prover.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"kernel_prover.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAMjC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAUL,KAAK,oCAAoC,EACzC,KAAK,SAAS,EAGf,MAAM,oBAAoB,CAAC;AAiB5B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AASlE;;;;;GAKG;AACH,qBAAa,YAAY;IAGX,OAAO,CAAC,MAAM;IAAqB,OAAO,CAAC,YAAY;IAFnE,OAAO,CAAC,GAAG,CAA4C;gBAEnC,MAAM,EAAE,iBAAiB,EAAU,YAAY,EAAE,mBAAmB;IAExF;;;;;;;;;;;;OAYG;IACG,KAAK,CACT,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,sBAAsB,EACvC,OAAO,GAAE,OAAe,EACxB,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;YAqK/D,qBAAqB;CAoCpC"}
1
+ {"version":3,"file":"kernel_prover.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAMjC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAUL,KAAK,oCAAoC,EAGzC,KAAK,SAAS,EAGf,MAAM,oBAAoB,CAAC;AAmB5B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AA8ClE;;;;;GAKG;AACH,qBAAa,YAAY;IAGX,OAAO,CAAC,MAAM;IAAqB,OAAO,CAAC,YAAY;IAFnE,OAAO,CAAC,GAAG,CAAqC;gBAE5B,MAAM,EAAE,iBAAiB,EAAU,YAAY,EAAE,mBAAmB;IAExF;;;;;;;;;;;;OAYG;IACG,KAAK,CACT,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,sBAAsB,EACvC,OAAO,GAAE,OAAe,EACxB,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;YAuL/D,qBAAqB;IAqCnC,OAAO,CAAC,aAAa;CAStB"}
@@ -3,12 +3,34 @@ import { CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS, Fr, PROTOCOL_CONTRACT_TRE
3
3
  import { hashVK } from '@aztec/circuits.js/hash';
4
4
  import { makeTuple } from '@aztec/foundation/array';
5
5
  import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto';
6
- import { createDebugLogger } from '@aztec/foundation/log';
6
+ import { createLogger } from '@aztec/foundation/log';
7
7
  import { assertLength } from '@aztec/foundation/serialize';
8
8
  import { pushTestData } from '@aztec/foundation/testing';
9
- import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
9
+ import { Timer } from '@aztec/foundation/timer';
10
+ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/client';
10
11
  import { getProtocolContractSiblingPath, isProtocolContract, protocolContractTreeRoot, } from '@aztec/protocol-contracts';
12
+ import { strict as assert } from 'assert';
11
13
  import { PrivateKernelResetPrivateInputsBuilder } from './hints/build_private_kernel_reset_private_inputs.js';
14
+ // TODO(#10592): Temporary workaround to check that the private logs are correctly split into non-revertible set and revertible set.
15
+ // This should be done in TailToPublicOutputValidator in private kernel tail.
16
+ function checkPrivateLogs(privateLogs, nonRevertiblePrivateLogs, revertiblePrivateLogs, splitCounter) {
17
+ let numNonRevertible = 0;
18
+ let numRevertible = 0;
19
+ privateLogs
20
+ .filter(privateLog => privateLog.inner.counter !== 0)
21
+ .forEach(privateLog => {
22
+ if (privateLog.inner.counter < splitCounter) {
23
+ assert(privateLog.inner.log.toBuffer().equals(nonRevertiblePrivateLogs[numNonRevertible].toBuffer()), `mismatch non-revertible private logs at index ${numNonRevertible}`);
24
+ numNonRevertible++;
25
+ }
26
+ else {
27
+ assert(privateLog.inner.log.toBuffer().equals(revertiblePrivateLogs[numRevertible].toBuffer()), `mismatch revertible private logs at index ${numRevertible}`);
28
+ numRevertible++;
29
+ }
30
+ });
31
+ assert(nonRevertiblePrivateLogs.slice(numNonRevertible).every(l => l.isEmpty()), 'Unexpected non-empty private log in non-revertible set.');
32
+ assert(revertiblePrivateLogs.slice(numRevertible).every(l => l.isEmpty()), 'Unexpected non-empty private log in revertible set.');
33
+ }
12
34
  const NULL_PROVE_OUTPUT = {
13
35
  publicInputs: PrivateKernelCircuitPublicInputs.empty(),
14
36
  verificationKey: VerificationKeyAsFields.makeEmpty(CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS),
@@ -25,7 +47,7 @@ export class KernelProver {
25
47
  constructor(oracle, proofCreator) {
26
48
  this.oracle = oracle;
27
49
  this.proofCreator = proofCreator;
28
- this.log = createDebugLogger('aztec:kernel-prover');
50
+ this.log = createLogger('pxe:kernel-prover');
29
51
  }
30
52
  /**
31
53
  * Generate a proof for a given transaction request and execution result.
@@ -41,6 +63,8 @@ export class KernelProver {
41
63
  * TODO(#7368) this should be refactored to not recreate the ACIR bytecode now that it operates on a program stack
42
64
  */
43
65
  async prove(txRequest, executionResult, profile = false, dryRun = false) {
66
+ const timer = new Timer();
67
+ const isPrivateOnlyTx = this.isPrivateOnly(executionResult);
44
68
  const executionStack = [executionResult];
45
69
  let firstIteration = true;
46
70
  let output = NULL_PROVE_OUTPUT;
@@ -85,7 +109,7 @@ export class KernelProver {
85
109
  }
86
110
  const privateCallData = await this.createPrivateCallData(currentExecution);
87
111
  if (firstIteration) {
88
- const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, getVKTreeRoot(), protocolContractTreeRoot, privateCallData);
112
+ const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, getVKTreeRoot(), protocolContractTreeRoot, privateCallData, isPrivateOnlyTx);
89
113
  pushTestData('private-kernel-inputs-init', proofInput);
90
114
  output = await this.proofCreator.simulateProofInit(proofInput);
91
115
  acirs.push(output.bytecode);
@@ -127,12 +151,19 @@ export class KernelProver {
127
151
  const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData);
128
152
  pushTestData('private-kernel-inputs-ordering', privateInputs);
129
153
  const tailOutput = await this.proofCreator.simulateProofTail(privateInputs);
154
+ if (tailOutput.publicInputs.forPublic) {
155
+ const privateLogs = privateInputs.previousKernel.publicInputs.end.privateLogs;
156
+ const nonRevertiblePrivateLogs = tailOutput.publicInputs.forPublic.nonRevertibleAccumulatedData.privateLogs;
157
+ const revertiblePrivateLogs = tailOutput.publicInputs.forPublic.revertibleAccumulatedData.privateLogs;
158
+ checkPrivateLogs(privateLogs, nonRevertiblePrivateLogs, revertiblePrivateLogs, validationRequestsSplitCounter);
159
+ }
130
160
  acirs.push(tailOutput.bytecode);
131
161
  witnessStack.push(tailOutput.outputWitness);
132
162
  if (profile) {
133
163
  await addGateCount('private_kernel_tail', tailOutput.bytecode);
134
164
  tailOutput.profileResult = { gateCounts };
135
165
  }
166
+ this.log.info(`Witness generation took ${timer.ms()}ms`);
136
167
  // TODO(#7368) how do we 'bincode' encode these inputs?
137
168
  if (!dryRun) {
138
169
  const ivcProof = await this.proofCreator.createClientIvcProof(acirs, witnessStack);
@@ -165,5 +196,11 @@ export class KernelProver {
165
196
  acirHash,
166
197
  });
167
198
  }
199
+ isPrivateOnly(executionResult) {
200
+ const makesPublicCalls = executionResult.enqueuedPublicFunctionCalls.some(enqueuedCall => !enqueuedCall.isEmpty()) ||
201
+ !executionResult.publicTeardownFunctionCall.isEmpty();
202
+ return (!makesPublicCalls &&
203
+ executionResult.nestedExecutions.every(nestedExecution => this.isPrivateOnly(nestedExecution)));
204
+ }
168
205
  }
169
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kernel_prover.js","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kCAAkC,EAClC,2BAA2B,EAC3B,kCAAkC,EAClC,iCAAiC,EACjC,sCAAsC,GACvC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4CAA4C,EAC5C,EAAE,EACF,6BAA6B,EAC7B,eAAe,EACf,gCAAgC,EAChC,iBAAiB,EACjB,qCAAqC,EACrC,sCAAsC,EACtC,qCAAqC,EAGrC,cAAc,EACd,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EACL,8BAA8B,EAC9B,kBAAkB,EAClB,wBAAwB,GACzB,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,sCAAsC,EAAE,MAAM,sDAAsD,CAAC;AAG9G,MAAM,iBAAiB,GAAkE;IACvF,YAAY,EAAE,gCAAgC,CAAC,KAAK,EAAE;IACtD,eAAe,EAAE,uBAAuB,CAAC,SAAS,CAAC,4CAA4C,CAAC;IAChG,aAAa,EAAE,IAAI,GAAG,EAAE;IACxB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;CAC1B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,OAAO,YAAY;IAGvB,YAAoB,MAAyB,EAAU,YAAiC;QAApE,WAAM,GAAN,MAAM,CAAmB;QAAU,iBAAY,GAAZ,YAAY,CAAqB;QAFhF,QAAG,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;IAEoC,CAAC;IAE5F;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,KAAK,CACT,SAAoB,EACpB,eAAuC,EACvC,UAAmB,KAAK,EACxB,SAAkB,KAAK;QAEvB,MAAM,cAAc,GAAG,CAAC,eAAe,CAAC,CAAC;QACzC,IAAI,cAAc,GAAG,IAAI,CAAC;QAE1B,IAAI,MAAM,GAAG,iBAAiB,CAAC;QAE/B,MAAM,UAAU,GAAiD,EAAE,CAAC;QACpE,MAAM,YAAY,GAAG,KAAK,EAAE,WAAmB,EAAE,QAAgB,EAAE,EAAE;YACnE,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAW,CAAC;YACxG,UAAU,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;YAE5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,kBAAkB,WAAW,MAAM,SAAS,EAAE,CAAC,CAAC;QACtF,CAAC,CAAC;QAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,eAAe,CAAC,CAAC;QAC1E,MAAM,2BAA2B,GAAG,kCAAkC,CAAC,eAAe,CAAC,CAAC;QACxF,MAAM,uBAAuB,GAAG,kCAAkC,CAAC,eAAe,CAAC,CAAC;QACpF,MAAM,cAAc,GAClB,uBAAuB,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC;QACtG,MAAM,8BAA8B,GAAG,cAAc,CAAC,CAAC,CAAC,sCAAsC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpH,kCAAkC;QAClC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAiB,EAAE,CAAC;QAEtC,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;YAC7B,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,IAAI,YAAY,GAAG,IAAI,sCAAsC,CAC3D,MAAM,EACN,cAAc,EACd,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;gBACF,OAAO,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC;oBACjC,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;oBAClF,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;oBACnE,mEAAmE;oBACnE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBACxC,IAAI,OAAO,EAAE,CAAC;wBACZ,MAAM,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC9D,CAAC;oBAED,YAAY,GAAG,IAAI,sCAAsC,CACvD,MAAM,EACN,cAAc,EACd,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,EAAG,CAAC;YAE/C,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAEzE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,oBAAoB,CACzD,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,eAAe,EACzD,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAC3D,CAAC;YAEF,oEAAoE;YACpE,qEAAqE;YACrE,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAClC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACnD,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,YAAY,CAAC,YAAsB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;YAE3E,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,UAAU,GAAG,IAAI,qCAAqC,CAC1D,SAAS,EACT,aAAa,EAAE,EACf,wBAAwB,EACxB,eAAe,CAChB,CAAC;gBACF,YAAY,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC;gBACvD,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBAE/D,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBACxC,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,YAAY,CAAC,qBAAqB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBACrG,MAAM,kBAAkB,GAAG,IAAI,iBAAiB,CAC9C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,EAC7C,YAAY,CAA4B,2BAA2B,CAAC,WAAW,EAAE,cAAc,CAAC,CACjG,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,sCAAsC,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;gBACnG,YAAY,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAC;gBACxD,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;gBAEhE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBACxC,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YACD,cAAc,GAAG,KAAK,CAAC;QACzB,CAAC;QAED,SAAS;QACT,IAAI,YAAY,GAAG,IAAI,sCAAsC,CAC3D,MAAM,EACN,EAAE,EACF,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;QACF,OAAO,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC;YACjC,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;YAClF,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAEnE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC9D,CAAC;YAED,YAAY,GAAG,IAAI,sCAAsC,CACvD,MAAM,EACN,EAAE,EACF,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;QACJ,CAAC;QAED,gBAAgB;QAChB,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACrG,MAAM,kBAAkB,GAAG,IAAI,iBAAiB,CAC9C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,EAC7C,YAAY,CAA4B,2BAA2B,CAAC,WAAW,EAAE,cAAc,CAAC,CACjG,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,wCAAwC,kBAAkB,CAAC,YAAY,CAAC,8BAA8B,EAAE,CACzG,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,qCAAqC,CAAC,kBAAkB,CAAC,CAAC;QAEpF,YAAY,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAE5E,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC5C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,YAAY,CAAC,qBAAqB,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC/D,UAAU,CAAC,aAAa,GAAG,EAAE,UAAU,EAAE,CAAC;QAC5C,CAAC;QAED,uDAAuD;QACvD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YACnF,UAAU,CAAC,cAAc,GAAG,QAAQ,CAAC;QACvC,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAA0B;QAC1F,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC;QAEvE,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,EAAE,GAAG,IAAI,uBAAuB,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAEvE,MAAM,6BAA6B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAClF,eAAe,EACf,gBAAgB,CACjB,CAAC;QACF,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,wBAAwB,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAC5G,eAAe,CAChB,CAAC;QACF,MAAM,EAAE,YAAY,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,qCAAqC,EAAE,GAChH,MAAM,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;QAEhE,iCAAiC;QACjC,4DAA4D;QAC5D,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpD,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,eAAe,CAAC;YACrE,CAAC,CAAC,8BAA8B,CAAC,eAAe,CAAC;YACjD,CAAC,CAAC,SAAS,CAAC,6BAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAEtD,OAAO,eAAe,CAAC,IAAI,CAAC;YAC1B,YAAY;YACZ,EAAE;YACF,UAAU;YACV,yBAAyB;YACzB,qCAAqC;YACrC,wBAAwB;YACxB,6BAA6B;YAC7B,2BAA2B;YAC3B,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;CACF"}
206
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kernel_prover.js","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kCAAkC,EAClC,2BAA2B,EAC3B,kCAAkC,EAClC,iCAAiC,EACjC,sCAAsC,GACvC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4CAA4C,EAC5C,EAAE,EACF,6BAA6B,EAC7B,eAAe,EACf,gCAAgC,EAChC,iBAAiB,EACjB,qCAAqC,EACrC,sCAAsC,EACtC,qCAAqC,EAKrC,cAAc,EACd,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAC3E,OAAO,EACL,8BAA8B,EAC9B,kBAAkB,EAClB,wBAAwB,GACzB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,sCAAsC,EAAE,MAAM,sDAAsD,CAAC;AAG9G,oIAAoI;AACpI,6EAA6E;AAC7E,SAAS,gBAAgB,CACvB,WAAmC,EACnC,wBAAsC,EACtC,qBAAmC,EACnC,YAAoB;IAEpB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,WAAW;SACR,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;SACpD,OAAO,CAAC,UAAU,CAAC,EAAE;QACpB,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,GAAG,YAAY,EAAE,CAAC;YAC5C,MAAM,CACJ,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,EAC7F,iDAAiD,gBAAgB,EAAE,CACpE,CAAC;YACF,gBAAgB,EAAE,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,MAAM,CACJ,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,EACvF,6CAA6C,aAAa,EAAE,CAC7D,CAAC;YACF,aAAa,EAAE,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IACL,MAAM,CACJ,wBAAwB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EACxE,yDAAyD,CAC1D,CAAC;IACF,MAAM,CACJ,qBAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAClE,qDAAqD,CACtD,CAAC;AACJ,CAAC;AAED,MAAM,iBAAiB,GAAkE;IACvF,YAAY,EAAE,gCAAgC,CAAC,KAAK,EAAE;IACtD,eAAe,EAAE,uBAAuB,CAAC,SAAS,CAAC,4CAA4C,CAAC;IAChG,aAAa,EAAE,IAAI,GAAG,EAAE;IACxB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;CAC1B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,OAAO,YAAY;IAGvB,YAAoB,MAAyB,EAAU,YAAiC;QAApE,WAAM,GAAN,MAAM,CAAmB;QAAU,iBAAY,GAAZ,YAAY,CAAqB;QAFhF,QAAG,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;IAE2C,CAAC;IAE5F;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,KAAK,CACT,SAAoB,EACpB,eAAuC,EACvC,UAAmB,KAAK,EACxB,SAAkB,KAAK;QAEvB,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAE1B,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAE5D,MAAM,cAAc,GAAG,CAAC,eAAe,CAAC,CAAC;QACzC,IAAI,cAAc,GAAG,IAAI,CAAC;QAE1B,IAAI,MAAM,GAAG,iBAAiB,CAAC;QAE/B,MAAM,UAAU,GAAiD,EAAE,CAAC;QACpE,MAAM,YAAY,GAAG,KAAK,EAAE,WAAmB,EAAE,QAAgB,EAAE,EAAE;YACnE,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAW,CAAC;YACxG,UAAU,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;YAE5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,kBAAkB,WAAW,MAAM,SAAS,EAAE,CAAC,CAAC;QACtF,CAAC,CAAC;QAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,eAAe,CAAC,CAAC;QAC1E,MAAM,2BAA2B,GAAG,kCAAkC,CAAC,eAAe,CAAC,CAAC;QACxF,MAAM,uBAAuB,GAAG,kCAAkC,CAAC,eAAe,CAAC,CAAC;QACpF,MAAM,cAAc,GAClB,uBAAuB,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC;QACtG,MAAM,8BAA8B,GAAG,cAAc,CAAC,CAAC,CAAC,sCAAsC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpH,kCAAkC;QAClC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAiB,EAAE,CAAC;QAEtC,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;YAC7B,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,IAAI,YAAY,GAAG,IAAI,sCAAsC,CAC3D,MAAM,EACN,cAAc,EACd,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;gBACF,OAAO,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC;oBACjC,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;oBAClF,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;oBACnE,mEAAmE;oBACnE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBACxC,IAAI,OAAO,EAAE,CAAC;wBACZ,MAAM,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC9D,CAAC;oBAED,YAAY,GAAG,IAAI,sCAAsC,CACvD,MAAM,EACN,cAAc,EACd,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,EAAG,CAAC;YAE/C,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAEzE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,oBAAoB,CACzD,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,eAAe,EACzD,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAC3D,CAAC;YAEF,oEAAoE;YACpE,qEAAqE;YACrE,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAClC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACnD,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,YAAY,CAAC,YAAsB,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;YAE3E,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,UAAU,GAAG,IAAI,qCAAqC,CAC1D,SAAS,EACT,aAAa,EAAE,EACf,wBAAwB,EACxB,eAAe,EACf,eAAe,CAChB,CAAC;gBAEF,YAAY,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC;gBAEvD,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBAE/D,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBACxC,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,YAAY,CAAC,qBAAqB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBACrG,MAAM,kBAAkB,GAAG,IAAI,iBAAiB,CAC9C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,EAC7C,YAAY,CAA4B,2BAA2B,CAAC,WAAW,EAAE,cAAc,CAAC,CACjG,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,sCAAsC,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;gBAEnG,YAAY,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAC;gBAExD,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;gBAEhE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBACxC,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YACD,cAAc,GAAG,KAAK,CAAC;QACzB,CAAC;QAED,SAAS;QACT,IAAI,YAAY,GAAG,IAAI,sCAAsC,CAC3D,MAAM,EACN,EAAE,EACF,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;QACF,OAAO,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC;YACjC,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;YAClF,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAEnE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC9D,CAAC;YAED,YAAY,GAAG,IAAI,sCAAsC,CACvD,MAAM,EACN,EAAE,EACF,2BAA2B,EAC3B,8BAA8B,CAC/B,CAAC;QACJ,CAAC;QAED,gBAAgB;QAChB,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACrG,MAAM,kBAAkB,GAAG,IAAI,iBAAiB,CAC9C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,EAC7C,YAAY,CAA4B,2BAA2B,CAAC,WAAW,EAAE,cAAc,CAAC,CACjG,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,wCAAwC,kBAAkB,CAAC,YAAY,CAAC,8BAA8B,EAAE,CACzG,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,qCAAqC,CAAC,kBAAkB,CAAC,CAAC;QAEpF,YAAY,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAE9D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAC5E,IAAI,UAAU,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC;YACtC,MAAM,WAAW,GAAG,aAAa,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC;YAC9E,MAAM,wBAAwB,GAAG,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,4BAA4B,CAAC,WAAW,CAAC;YAC5G,MAAM,qBAAqB,GAAG,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,yBAAyB,CAAC,WAAW,CAAC;YACtG,gBAAgB,CAAC,WAAW,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,8BAA8B,CAAC,CAAC;QACjH,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC5C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,YAAY,CAAC,qBAAqB,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC/D,UAAU,CAAC,aAAa,GAAG,EAAE,UAAU,EAAE,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAEzD,uDAAuD;QACvD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YACnF,UAAU,CAAC,cAAc,GAAG,QAAQ,CAAC;QACvC,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAA0B;QAC1F,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC;QAEvE,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,EAAE,GAAG,IAAI,uBAAuB,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAEvE,MAAM,6BAA6B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAClF,eAAe,EACf,gBAAgB,CACjB,CAAC;QACF,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,wBAAwB,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAC5G,eAAe,CAChB,CAAC;QACF,MAAM,EAAE,YAAY,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,qCAAqC,EAAE,GAChH,MAAM,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;QAEhE,iCAAiC;QACjC,4DAA4D;QAC5D,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpD,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,eAAe,CAAC;YACrE,CAAC,CAAC,8BAA8B,CAAC,eAAe,CAAC;YACjD,CAAC,CAAC,SAAS,CAAC,6BAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAEtD,OAAO,eAAe,CAAC,IAAI,CAAC;YAC1B,YAAY;YACZ,EAAE;YACF,UAAU;YACV,yBAAyB;YACzB,qCAAqC;YACrC,wBAAwB;YACxB,6BAA6B;YAC7B,2BAA2B;YAC3B,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,eAAuC;QAC3D,MAAM,gBAAgB,GACpB,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YACzF,CAAC,eAAe,CAAC,0BAA0B,CAAC,OAAO,EAAE,CAAC;QACxD,OAAO,CACL,CAAC,gBAAgB;YACjB,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAC/F,CAAC;IACJ,CAAC;CACF"}
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
2
  /// <reference types="node" resolution-mode="require"/>
3
- import { type AppCircuitSimulateOutput, type PrivateKernelProver, type PrivateKernelSimulateOutput } from '@aztec/circuit-types';
3
+ import { type PrivateKernelProver, type PrivateKernelSimulateOutput } from '@aztec/circuit-types';
4
4
  import { ClientIvcProof, type PrivateKernelCircuitPublicInputs, type PrivateKernelInitCircuitPrivateInputs, type PrivateKernelInnerCircuitPrivateInputs, type PrivateKernelResetCircuitPrivateInputs, type PrivateKernelTailCircuitPrivateInputs, type PrivateKernelTailCircuitPublicInputs } from '@aztec/circuits.js';
5
5
  import { type WitnessMap } from '@noir-lang/types';
6
6
  /**
@@ -15,7 +15,6 @@ export declare class TestPrivateKernelProver implements PrivateKernelProver {
15
15
  simulateProofReset(privateInputs: PrivateKernelResetCircuitPrivateInputs): Promise<PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>>;
16
16
  simulateProofTail(privateInputs: PrivateKernelTailCircuitPrivateInputs): Promise<PrivateKernelSimulateOutput<PrivateKernelTailCircuitPublicInputs>>;
17
17
  computeGateCountForCircuit(_bytecode: Buffer, _circuitName: string): Promise<number>;
18
- computeAppCircuitVerificationKey(_bytecode: Buffer, _appCircuitName?: string | undefined): Promise<AppCircuitSimulateOutput>;
19
18
  private makeEmptyKernelSimulateOutput;
20
19
  }
21
20
  //# sourceMappingURL=test_circuit_prover.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"test_circuit_prover.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/test/test_circuit_prover.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EACjC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,cAAc,EACd,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,sCAAsC,EAC3C,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EAE1C,MAAM,oBAAoB,CAAC;AAe5B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IACrD,OAAO,CAAC,GAAG;gBAAH,GAAG,yCAAgD;IAEvE,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAI/E,iBAAiB,CAC5B,aAAa,EAAE,qCAAqC,GACnD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAY5D,kBAAkB,CAC7B,aAAa,EAAE,sCAAsC,GACpD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAY5D,kBAAkB,CAC7B,aAAa,EAAE,sCAAsC,GACpD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAgB5D,iBAAiB,CAC5B,aAAa,EAAE,qCAAqC,GACnD,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;IAkBtE,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK3F,gCAAgC,CAC9B,SAAS,EAAE,MAAM,EACjB,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,GACnC,OAAO,CAAC,wBAAwB,CAAC;IAOpC,OAAO,CAAC,6BAA6B;CAWtC"}
1
+ {"version":3,"file":"test_circuit_prover.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/test/test_circuit_prover.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAElG,OAAO,EACL,cAAc,EACd,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAC1C,KAAK,sCAAsC,EAC3C,KAAK,sCAAsC,EAC3C,KAAK,qCAAqC,EAC1C,KAAK,oCAAoC,EAC1C,MAAM,oBAAoB,CAAC;AAe5B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IACrD,OAAO,CAAC,GAAG;gBAAH,GAAG,yCAAyC;IAEhE,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAI/E,iBAAiB,CAC5B,aAAa,EAAE,qCAAqC,GACnD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAY5D,kBAAkB,CAC7B,aAAa,EAAE,sCAAsC,GACpD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAY5D,kBAAkB,CAC7B,aAAa,EAAE,sCAAsC,GACpD,OAAO,CAAC,2BAA2B,CAAC,gCAAgC,CAAC,CAAC;IAkB5D,iBAAiB,CAC5B,aAAa,EAAE,qCAAqC,GACnD,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;IAkBtE,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK3F,OAAO,CAAC,6BAA6B;CAWtC"}
@@ -1,12 +1,12 @@
1
- import { CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS, ClientIvcProof, VerificationKeyAsFields, } from '@aztec/circuits.js';
2
- import { createDebugLogger } from '@aztec/foundation/log';
1
+ import { ClientIvcProof, } from '@aztec/circuits.js';
2
+ import { createLogger } from '@aztec/foundation/log';
3
3
  import { elapsed } from '@aztec/foundation/timer';
4
- import { ProtocolCircuitVks, executeInit, executeInner, executeReset, executeTail, executeTailForPublic, getPrivateKernelResetArtifactName, maxPrivateKernelResetDimensions, } from '@aztec/noir-protocol-circuits-types';
4
+ import { ClientCircuitVks, executeInit, executeInner, executeReset, executeTail, executeTailForPublic, getPrivateKernelResetArtifactName, maxPrivateKernelResetDimensions, } from '@aztec/noir-protocol-circuits-types/client';
5
5
  /**
6
6
  * Test Proof Creator executes circuit simulations and provides fake proofs.
7
7
  */
8
8
  export class TestPrivateKernelProver {
9
- constructor(log = createDebugLogger('aztec:test_proof_creator')) {
9
+ constructor(log = createLogger('pxe:test_proof_creator')) {
10
10
  this.log = log;
11
11
  }
12
12
  createClientIvcProof(_acirs, _witnessStack) {
@@ -36,7 +36,7 @@ export class TestPrivateKernelProver {
36
36
  }
37
37
  async simulateProofReset(privateInputs) {
38
38
  const variantPrivateInputs = privateInputs.trimToSizes();
39
- const [duration, result] = await elapsed(() => executeReset(variantPrivateInputs, privateInputs.dimensions));
39
+ const [duration, result] = await elapsed(() => executeReset(variantPrivateInputs, privateInputs.dimensions, privateInputs));
40
40
  this.log.debug(`Simulated private kernel reset`, {
41
41
  eventName: 'circuit-simulation',
42
42
  circuitName: 'private-kernel-reset',
@@ -62,20 +62,14 @@ export class TestPrivateKernelProver {
62
62
  // No gates in test prover
63
63
  return Promise.resolve(0);
64
64
  }
65
- computeAppCircuitVerificationKey(_bytecode, _appCircuitName) {
66
- const appCircuitProofOutput = {
67
- verificationKey: VerificationKeyAsFields.makeEmpty(CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS),
68
- };
69
- return Promise.resolve(appCircuitProofOutput);
70
- }
71
65
  makeEmptyKernelSimulateOutput(publicInputs, circuitType) {
72
66
  const kernelProofOutput = {
73
67
  publicInputs,
74
- verificationKey: ProtocolCircuitVks[circuitType].keyAsFields,
68
+ verificationKey: ClientCircuitVks[circuitType].keyAsFields,
75
69
  outputWitness: new Map(),
76
70
  bytecode: Buffer.from([]),
77
71
  };
78
72
  return kernelProofOutput;
79
73
  }
80
74
  }
81
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jaXJjdWl0X3Byb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL3Rlc3QvdGVzdF9jaXJjdWl0X3Byb3Zlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxPQUFPLEVBQ0wsNENBQTRDLEVBQzVDLGNBQWMsRUFPZCx1QkFBdUIsR0FDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUVMLGtCQUFrQixFQUNsQixXQUFXLEVBQ1gsWUFBWSxFQUNaLFlBQVksRUFDWixXQUFXLEVBQ1gsb0JBQW9CLEVBQ3BCLGlDQUFpQyxFQUNqQywrQkFBK0IsR0FDaEMsTUFBTSxxQ0FBcUMsQ0FBQztBQUk3Qzs7R0FFRztBQUNILE1BQU0sT0FBTyx1QkFBdUI7SUFDbEMsWUFBb0IsTUFBTSxpQkFBaUIsQ0FBQywwQkFBMEIsQ0FBQztRQUFuRCxRQUFHLEdBQUgsR0FBRyxDQUFnRDtJQUFHLENBQUM7SUFFM0Usb0JBQW9CLENBQUMsTUFBZ0IsRUFBRSxhQUEyQjtRQUNoRSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVNLEtBQUssQ0FBQyxpQkFBaUIsQ0FDNUIsYUFBb0Q7UUFFcEQsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUMzRSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQywrQkFBK0IsRUFBRTtZQUM5QyxTQUFTLEVBQUUsb0JBQW9CO1lBQy9CLFdBQVcsRUFBRSxxQkFBcUI7WUFDbEMsUUFBUTtZQUNSLFNB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
75
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jaXJjdWl0X3Byb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL3Rlc3QvdGVzdF9jaXJjdWl0X3Byb3Zlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQ0wsY0FBYyxHQU9mLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRCxPQUFPLEVBQ0wsZ0JBQWdCLEVBRWhCLFdBQVcsRUFDWCxZQUFZLEVBQ1osWUFBWSxFQUNaLFdBQVcsRUFDWCxvQkFBb0IsRUFDcEIsaUNBQWlDLEVBQ2pDLCtCQUErQixHQUNoQyxNQUFNLDRDQUE0QyxDQUFDO0FBSXBEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHVCQUF1QjtJQUNsQyxZQUFvQixNQUFNLFlBQVksQ0FBQyx3QkFBd0IsQ0FBQztRQUE1QyxRQUFHLEdBQUgsR0FBRyxDQUF5QztJQUFHLENBQUM7SUFFcEUsb0JBQW9CLENBQUMsTUFBZ0IsRUFBRSxhQUEyQjtRQUNoRSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVNLEtBQUssQ0FBQyxpQkFBaUIsQ0FDNUIsYUFBb0Q7UUFFcEQsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUMzRSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQywrQkFBK0IsRUFBRTtZQUM5QyxTQUFTLEVBQUUsb0JBQW9CO1lBQy9CLFdBQVcsRUFBRSxxQkFBcUI7WUFDbEMsUUFBUTtZQUNSLFNBQVMsRUFBRSxhQUFhLENBQUMsUUFBUSxFQUFFLENB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
@@ -1,5 +1,5 @@
1
1
  import { Note } from '@aztec/circuit-types';
2
- import { ContractNotFoundError } from '@aztec/simulator';
2
+ import { ContractNotFoundError } from '@aztec/simulator/client';
3
3
  /**
4
4
  * Merges privately and publicly delivered note values.
5
5
  * @param db - PXE database used to fetch contract instance and artifact.
@@ -45,4 +45,4 @@ export async function getOrderedNoteItems(db, { contractAddress, noteTypeId, pri
45
45
  }
46
46
  return new Note(modifiedNoteItems);
47
47
  }
48
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkX3B1YmxpY192YWx1ZXNfdG9fcGF5bG9hZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlX2RlY3J5cHRpb25fdXRpbHMvYWRkX3B1YmxpY192YWx1ZXNfdG9fcGF5bG9hZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXNCLElBQUksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBSXpEOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxtQkFBbUIsQ0FDdkMsRUFBZSxFQUNmLEVBQUUsZUFBZSxFQUFFLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxnQkFBZ0IsRUFBaUI7SUFFbkYsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDbEMsT0FBTyxJQUFJLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCxNQUFNLFFBQVEsR0FBRyxNQUFNLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMvRCxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUkscUJBQXFCLENBQzdCLCtCQUErQixlQUFlLENBQUMsUUFBUSxFQUFFLDRHQUE0RyxDQUN0SyxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sUUFBUSxHQUFHLE1BQU0sRUFBRSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUN4RSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksS0FBSyxDQUNiLDhDQUE4QyxRQUFRLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSw0R0FBNEcsQ0FDOUwsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVsRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsVUFBVSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN4RixDQUFDO0lBRUQsMEVBQTBFO0lBQzFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUU3Qyx5RkFBeUY7SUFDekYsTUFBTSxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQztJQUM1QyxJQUFJLG1CQUFtQixHQUFHLENBQUMsQ0FBQztJQUM1QixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsVUFBVSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQzNDLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNoQyxJQUFJLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN2QixJQUFJLENBQUMsSUFBSSxVQUFVLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUMvQixnR0FBZ0c7Z0JBQ2hHLGlCQUFpQixDQUFDLElBQUksQ0FBQyxHQUFHLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7WUFDekUsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE1BQU0sZUFBZSxHQUFHLFVBQVUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUM7Z0JBQ2xFLE1BQU0sb0JBQW9CLEdBQUcsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLG1CQUFtQixFQUFFLG1CQUFtQixHQUFHLGVBQWUsQ0FBQyxDQUFDO2dCQUNoSCxtQkFBbUIsSUFBSSxlQUFlLENBQUM7Z0JBQ3ZDLDBEQUEwRDtnQkFDMUQsaUJBQWlCLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztZQUN4RSxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLElBQUksSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7QUFDckMsQ0FBQyJ9
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkX3B1YmxpY192YWx1ZXNfdG9fcGF5bG9hZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlX2RlY3J5cHRpb25fdXRpbHMvYWRkX3B1YmxpY192YWx1ZXNfdG9fcGF5bG9hZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXNCLElBQUksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSWhFOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxtQkFBbUIsQ0FDdkMsRUFBZSxFQUNmLEVBQUUsZUFBZSxFQUFFLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxnQkFBZ0IsRUFBaUI7SUFFbkYsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDbEMsT0FBTyxJQUFJLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCxNQUFNLFFBQVEsR0FBRyxNQUFNLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMvRCxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUkscUJBQXFCLENBQzdCLCtCQUErQixlQUFlLENBQUMsUUFBUSxFQUFFLDRHQUE0RyxDQUN0SyxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sUUFBUSxHQUFHLE1BQU0sRUFBRSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUN4RSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksS0FBSyxDQUNiLDhDQUE4QyxRQUFRLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSw0R0FBNEcsQ0FDOUwsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVsRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsVUFBVSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN4RixDQUFDO0lBRUQsMEVBQTBFO0lBQzFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUU3Qyx5RkFBeUY7SUFDekYsTUFBTSxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQztJQUM1QyxJQUFJLG1CQUFtQixHQUFHLENBQUMsQ0FBQztJQUM1QixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsVUFBVSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQzNDLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNoQyxJQUFJLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN2QixJQUFJLENBQUMsSUFBSSxVQUFVLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUMvQixnR0FBZ0c7Z0JBQ2hHLGlCQUFpQixDQUFDLElBQUksQ0FBQyxHQUFHLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7WUFDekUsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE1BQU0sZUFBZSxHQUFHLFVBQVUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUM7Z0JBQ2xFLE1BQU0sb0JBQW9CLEdBQUcsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLG1CQUFtQixFQUFFLG1CQUFtQixHQUFHLGVBQWUsQ0FBQyxDQUFDO2dCQUNoSCxtQkFBbUIsSUFBSSxlQUFlLENBQUM7Z0JBQ3ZDLDBEQUEwRDtnQkFDMUQsaUJBQWlCLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztZQUN4RSxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLElBQUksSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7QUFDckMsQ0FBQyJ9
@@ -2,7 +2,7 @@ import { type Note, type TxHash } from '@aztec/circuit-types';
2
2
  import { type AztecAddress } from '@aztec/circuits.js';
3
3
  import { type NoteSelector } from '@aztec/foundation/abi';
4
4
  import { Fr } from '@aztec/foundation/fields';
5
- import { type AcirSimulator } from '@aztec/simulator';
5
+ import { type AcirSimulator } from '@aztec/simulator/client';
6
6
  export interface NoteInfo {
7
7
  noteHashIndex: number;
8
8
  nonce: Fr;
@@ -15,7 +15,7 @@ export interface NoteInfo {
15
15
  * @dev Finds the index in the note hash tree by computing the note hash with different nonce and see which hash for
16
16
  * the current tx matches this value.
17
17
  * @remarks This method assists in identifying spent notes in the note hash tree.
18
- * @param siloedNoteHashes - Note hashes in the tx. One of them should correspond to the note we are looking for
18
+ * @param uniqueNoteHashes - Note hashes in the tx. One of them should correspond to the note we are looking for
19
19
  * @param txHash - Hash of a tx the note was emitted in.
20
20
  * @param contractAddress - Address of the contract the note was emitted in.
21
21
  * @param storageSlot - Storage slot of the note.
@@ -27,5 +27,5 @@ export interface NoteInfo {
27
27
  * @returns Nonce, index, inner hash and siloed nullifier for a given note.
28
28
  * @throws If cannot find the nonce for the note.
29
29
  */
30
- export declare function bruteForceNoteInfo(simulator: AcirSimulator, siloedNoteHashes: Fr[], txHash: TxHash, contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: NoteSelector, note: Note, excludedIndices: Set<number>, computeNullifier: boolean): Promise<NoteInfo>;
30
+ export declare function bruteForceNoteInfo(simulator: AcirSimulator, uniqueNoteHashes: Fr[], txHash: TxHash, contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: NoteSelector, note: Note, excludedIndices: Set<number>, computeNullifier: boolean): Promise<NoteInfo>;
31
31
  //# sourceMappingURL=brute_force_note_info.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"brute_force_note_info.d.ts","sourceRoot":"","sources":["../../src/note_decryption_utils/brute_force_note_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,EAAE,CAAC;IACV,QAAQ,EAAE,EAAE,CAAC;IACb,eAAe,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,aAAa,EACxB,gBAAgB,EAAE,EAAE,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,YAAY,EACxB,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,QAAQ,CAAC,CA+CnB"}
1
+ {"version":3,"file":"brute_force_note_info.d.ts","sourceRoot":"","sources":["../../src/note_decryption_utils/brute_force_note_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,EAAE,CAAC;IACV,QAAQ,EAAE,EAAE,CAAC;IACb,eAAe,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,aAAa,EACxB,gBAAgB,EAAE,EAAE,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,YAAY,EACxB,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,QAAQ,CAAC,CA+CnB"}
@@ -5,7 +5,7 @@ import { Fr } from '@aztec/foundation/fields';
5
5
  * @dev Finds the index in the note hash tree by computing the note hash with different nonce and see which hash for
6
6
  * the current tx matches this value.
7
7
  * @remarks This method assists in identifying spent notes in the note hash tree.
8
- * @param siloedNoteHashes - Note hashes in the tx. One of them should correspond to the note we are looking for
8
+ * @param uniqueNoteHashes - Note hashes in the tx. One of them should correspond to the note we are looking for
9
9
  * @param txHash - Hash of a tx the note was emitted in.
10
10
  * @param contractAddress - Address of the contract the note was emitted in.
11
11
  * @param storageSlot - Storage slot of the note.
@@ -17,24 +17,24 @@ import { Fr } from '@aztec/foundation/fields';
17
17
  * @returns Nonce, index, inner hash and siloed nullifier for a given note.
18
18
  * @throws If cannot find the nonce for the note.
19
19
  */
20
- export async function bruteForceNoteInfo(simulator, siloedNoteHashes, txHash, contractAddress, storageSlot, noteTypeId, note, excludedIndices, computeNullifier) {
20
+ export async function bruteForceNoteInfo(simulator, uniqueNoteHashes, txHash, contractAddress, storageSlot, noteTypeId, note, excludedIndices, computeNullifier) {
21
21
  let noteHashIndex = 0;
22
22
  let nonce;
23
23
  let noteHash;
24
- let siloedNoteHash;
24
+ let uniqueNoteHash;
25
25
  let innerNullifier;
26
26
  const firstNullifier = Fr.fromBuffer(txHash.toBuffer());
27
- for (; noteHashIndex < siloedNoteHashes.length; ++noteHashIndex) {
27
+ for (; noteHashIndex < uniqueNoteHashes.length; ++noteHashIndex) {
28
28
  if (excludedIndices.has(noteHashIndex)) {
29
29
  continue;
30
30
  }
31
- const siloedNoteHashFromTxEffect = siloedNoteHashes[noteHashIndex];
32
- if (siloedNoteHashFromTxEffect.equals(Fr.ZERO)) {
31
+ const uniqueNoteHashFromTxEffect = uniqueNoteHashes[noteHashIndex];
32
+ if (uniqueNoteHashFromTxEffect.equals(Fr.ZERO)) {
33
33
  break;
34
34
  }
35
35
  const expectedNonce = computeNoteHashNonce(firstNullifier, noteHashIndex);
36
- ({ noteHash, siloedNoteHash, innerNullifier } = await simulator.computeNoteHashAndOptionallyANullifier(contractAddress, expectedNonce, storageSlot, noteTypeId, computeNullifier, note));
37
- if (siloedNoteHashFromTxEffect.equals(siloedNoteHash)) {
36
+ ({ noteHash, uniqueNoteHash, innerNullifier } = await simulator.computeNoteHashAndOptionallyANullifier(contractAddress, expectedNonce, storageSlot, noteTypeId, computeNullifier, note));
37
+ if (uniqueNoteHashFromTxEffect.equals(uniqueNoteHash)) {
38
38
  nonce = expectedNonce;
39
39
  break;
40
40
  }
@@ -1,9 +1,8 @@
1
1
  import { type L1NotePayload, type PublicKey, type TxHash } from '@aztec/circuit-types';
2
2
  import { type Fr } from '@aztec/foundation/fields';
3
3
  import { type Logger } from '@aztec/foundation/log';
4
- import { type AcirSimulator } from '@aztec/simulator';
4
+ import { type AcirSimulator } from '@aztec/simulator/client';
5
5
  import { IncomingNoteDao } from '../database/incoming_note_dao.js';
6
- import { OutgoingNoteDao } from '../database/outgoing_note_dao.js';
7
6
  import { type PxeDatabase } from '../database/pxe_database.js';
8
7
  /**
9
8
  * Decodes a note from a transaction that we know was intended for us.
@@ -14,7 +13,6 @@ import { type PxeDatabase } from '../database/pxe_database.js';
14
13
  * @param simulator - An instance of AcirSimulator.
15
14
  * @param db - An instance of PxeDatabase.
16
15
  * @param addressPoint - The public counterpart to the address secret, which is used in the decryption of incoming note logs.
17
- * @param ovpkM - The public counterpart to the secret key to be used in the decryption of outgoing note logs.
18
16
  * @param payload - An instance of l1NotePayload.
19
17
  * @param txHash - The hash of the transaction that created the note. Equivalent to the first nullifier of the transaction.
20
18
  * @param noteHashes - New note hashes in this transaction, one of which belongs to this note.
@@ -22,10 +20,9 @@ import { type PxeDatabase } from '../database/pxe_database.js';
22
20
  * @param excludedIndices - Indices that have been assigned a note in the same tx. Notes in a tx can have the same l1NotePayload, we need to find a different index for each replicate.
23
21
  * @param logger - An instance of Logger.
24
22
  * @param unencryptedLogs - Unencrypted logs for the transaction (used to complete partial notes).
25
- * @returns An object containing the incoming, outgoing, and deferred notes.
23
+ * @returns An object containing the incoming notes.
26
24
  */
27
- export declare function produceNoteDaos(simulator: AcirSimulator, db: PxeDatabase, addressPoint: PublicKey | undefined, ovpkM: PublicKey | undefined, payload: L1NotePayload, txHash: TxHash, l2BlockNumber: number, l2BlockHash: string, noteHashes: Fr[], dataStartIndexForTx: number, excludedIndices: Set<number>, logger: Logger): Promise<{
25
+ export declare function produceNoteDaos(simulator: AcirSimulator, db: PxeDatabase, addressPoint: PublicKey | undefined, payload: L1NotePayload, txHash: TxHash, l2BlockNumber: number, l2BlockHash: string, noteHashes: Fr[], dataStartIndexForTx: number, excludedIndices: Set<number>, logger: Logger): Promise<{
28
26
  incomingNote: IncomingNoteDao | undefined;
29
- outgoingNote: OutgoingNoteDao | undefined;
30
27
  }>;
31
28
  //# sourceMappingURL=produce_note_daos.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"produce_note_daos.d.ts","sourceRoot":"","sources":["../../src/note_decryption_utils/produce_note_daos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG/D;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,aAAa,EACxB,EAAE,EAAE,WAAW,EACf,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,KAAK,EAAE,SAAS,GAAG,SAAS,EAC5B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,EAAE,EAAE,EAChB,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IACT,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;IAC1C,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC;CAC3C,CAAC,CAgED"}
1
+ {"version":3,"file":"produce_note_daos.d.ts","sourceRoot":"","sources":["../../src/note_decryption_utils/produce_note_daos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG/D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,aAAa,EACxB,EAAE,EAAE,WAAW,EACf,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,EAAE,EAAE,EAChB,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,YAAY,EAAE,eAAe,GAAG,SAAS,CAAA;CAAE,CAAC,CA2BxD"}
@@ -1,5 +1,4 @@
1
1
  import { IncomingNoteDao } from '../database/incoming_note_dao.js';
2
- import { OutgoingNoteDao } from '../database/outgoing_note_dao.js';
3
2
  import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
4
3
  /**
5
4
  * Decodes a note from a transaction that we know was intended for us.
@@ -10,7 +9,6 @@ import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
10
9
  * @param simulator - An instance of AcirSimulator.
11
10
  * @param db - An instance of PxeDatabase.
12
11
  * @param addressPoint - The public counterpart to the address secret, which is used in the decryption of incoming note logs.
13
- * @param ovpkM - The public counterpart to the secret key to be used in the decryption of outgoing note logs.
14
12
  * @param payload - An instance of l1NotePayload.
15
13
  * @param txHash - The hash of the transaction that created the note. Equivalent to the first nullifier of the transaction.
16
14
  * @param noteHashes - New note hashes in this transaction, one of which belongs to this note.
@@ -18,30 +16,18 @@ import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
18
16
  * @param excludedIndices - Indices that have been assigned a note in the same tx. Notes in a tx can have the same l1NotePayload, we need to find a different index for each replicate.
19
17
  * @param logger - An instance of Logger.
20
18
  * @param unencryptedLogs - Unencrypted logs for the transaction (used to complete partial notes).
21
- * @returns An object containing the incoming, outgoing, and deferred notes.
19
+ * @returns An object containing the incoming notes.
22
20
  */
23
- export async function produceNoteDaos(simulator, db, addressPoint, ovpkM, payload, txHash, l2BlockNumber, l2BlockHash, noteHashes, dataStartIndexForTx, excludedIndices, logger) {
24
- if (!addressPoint && !ovpkM) {
25
- throw new Error('Both addressPoint and ovpkM are undefined. Cannot create note.');
21
+ export async function produceNoteDaos(simulator, db, addressPoint, payload, txHash, l2BlockNumber, l2BlockHash, noteHashes, dataStartIndexForTx, excludedIndices, logger) {
22
+ if (!addressPoint) {
23
+ throw new Error('addressPoint is undefined. Cannot create note.');
26
24
  }
27
25
  let incomingNote;
28
- let outgoingNote;
29
26
  if (addressPoint) {
30
27
  incomingNote = await produceNoteDaosForKey(simulator, db, addressPoint, payload, txHash, l2BlockNumber, l2BlockHash, noteHashes, dataStartIndexForTx, excludedIndices, logger, IncomingNoteDao.fromPayloadAndNoteInfo);
31
28
  }
32
- if (ovpkM) {
33
- if (incomingNote) {
34
- // Incoming note is defined meaning that this PXE has both the incoming and outgoing keys. We can skip computing
35
- // note hash and note index since we already have them in the incoming note.
36
- outgoingNote = new OutgoingNoteDao(incomingNote.note, incomingNote.contractAddress, incomingNote.storageSlot, incomingNote.noteTypeId, incomingNote.txHash, incomingNote.l2BlockNumber, incomingNote.l2BlockHash, incomingNote.nonce, incomingNote.noteHash, incomingNote.index, ovpkM);
37
- }
38
- else {
39
- outgoingNote = await produceNoteDaosForKey(simulator, db, ovpkM, payload, txHash, l2BlockNumber, l2BlockHash, noteHashes, dataStartIndexForTx, excludedIndices, logger, OutgoingNoteDao.fromPayloadAndNoteInfo);
40
- }
41
- }
42
29
  return {
43
30
  incomingNote,
44
- outgoingNote,
45
31
  };
46
32
  }
47
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZHVjZV9ub3RlX2Rhb3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZV9kZWNyeXB0aW9uX3V0aWxzL3Byb2R1Y2Vfbm90ZV9kYW9zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNuRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbkUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFdkU7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsZUFBZSxDQUNuQyxTQUF3QixFQUN4QixFQUFlLEVBQ2YsWUFBbUMsRUFDbkMsS0FBNEIsRUFDNUIsT0FBc0IsRUFDdEIsTUFBYyxFQUNkLGFBQXFCLEVBQ3JCLFdBQW1CLEVBQ25CLFVBQWdCLEVBQ2hCLG1CQUEyQixFQUMzQixlQUE0QixFQUM1QixNQUFjO0lBS2QsSUFBSSxDQUFDLFlBQVksSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzVCLE1BQU0sSUFBSSxLQUFLLENBQUMsZ0VBQWdFLENBQUMsQ0FBQztJQUNwRixDQUFDO0lBRUQsSUFBSSxZQUF5QyxDQUFDO0lBQzlDLElBQUksWUFBeUMsQ0FBQztJQUU5QyxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ2pCLFlBQVksR0FBRyxNQUFNLHFCQUFxQixDQUN4QyxTQUFTLEVBQ1QsRUFBRSxFQUNGLFlBQVksRUFDWixPQUFPLEVBQ1AsTUFBTSxFQUNOLGFBQWEsRUFDYixXQUFXLEVBQ1gsVUFBVSxFQUNWLG1CQUFtQixFQUNuQixlQUFlLEVBQ2YsTUFBTSxFQUNOLGVBQWUsQ0FBQyxzQkFBc0IsQ0FDdkMsQ0FBQztJQUNKLENBQUM7SUFFRCxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQ1YsSUFBSSxZQUFZLEVBQUUsQ0FBQztZQUNqQixnSEFBZ0g7WUFDaEgsNEVBQTRFO1lBQzVFLFlBQVksR0FBRyxJQUFJLGVBQWUsQ0FDaEMsWUFBWSxDQUFDLElBQUksRUFDakIsWUFBWSxDQUFDLGVBQWUsRUFDNUIsWUFBWSxDQUFDLFdBQVcsRUFDeEIsWUFBWSxDQUFDLFVBQVUsRUFDdkIsWUFBWSxDQUFDLE1BQU0sRUFDbkIsWUFBWSxDQUFDLGFBQWEsRUFDMUIsWUFBWSxDQUFDLFdBQVcsRUFDeEIsWUFBWSxDQUFDLEtBQUssRUFDbEIsWUFBWSxDQUFDLFFBQVEsRUFDckIsWUFBWSxDQUFDLEtBQUssRUFDbEIsS0FBSyxDQUNOLENBQUM7UUFDSixDQUFDO2FBQU0sQ0FBQztZQUNOLFlBQVksR0FBRyxNQUFNLHFCQUFxQixDQUN4QyxTQUFTLEVBQ1QsRUFBRSxFQUNGLEtBQUssRUFDTCxPQUFPLEVBQ1AsTUFBTSxFQUNOLGFBQWEsRUFDYixXQUFXLEVBQ1gsVUFBVSxFQUNWLG1CQUFtQixFQUNuQixlQUFlLEVBQ2YsTUFBTSxFQUNOLGVBQWUsQ0FBQyxzQkFBc0IsQ0FDdkMsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBRUQsT0FBTztRQUNMLFlBQVk7UUFDWixZQUFZO0tBQ2IsQ0FBQztBQUNKLENBQUMifQ==
33
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZHVjZV9ub3RlX2Rhb3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZV9kZWNyeXB0aW9uX3V0aWxzL3Byb2R1Y2Vfbm90ZV9kYW9zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUVuRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV2RTs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGVBQWUsQ0FDbkMsU0FBd0IsRUFDeEIsRUFBZSxFQUNmLFlBQW1DLEVBQ25DLE9BQXNCLEVBQ3RCLE1BQWMsRUFDZCxhQUFxQixFQUNyQixXQUFtQixFQUNuQixVQUFnQixFQUNoQixtQkFBMkIsRUFDM0IsZUFBNEIsRUFDNUIsTUFBYztJQUVkLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUNsQixNQUFNLElBQUksS0FBSyxDQUFDLGdEQUFnRCxDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUVELElBQUksWUFBeUMsQ0FBQztJQUU5QyxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ2pCLFlBQVksR0FBRyxNQUFNLHFCQUFxQixDQUN4QyxTQUFTLEVBQ1QsRUFBRSxFQUNGLFlBQVksRUFDWixPQUFPLEVBQ1AsTUFBTSxFQUNOLGFBQWEsRUFDYixXQUFXLEVBQ1gsVUFBVSxFQUNWLG1CQUFtQixFQUNuQixlQUFlLEVBQ2YsTUFBTSxFQUNOLGVBQWUsQ0FBQyxzQkFBc0IsQ0FDdkMsQ0FBQztJQUNKLENBQUM7SUFFRCxPQUFPO1FBQ0wsWUFBWTtLQUNiLENBQUM7QUFDSixDQUFDIn0=
@@ -1,7 +1,7 @@
1
1
  import { type L1NotePayload, type Note, type TxHash } from '@aztec/circuit-types';
2
2
  import { type Fr, type PublicKey } from '@aztec/circuits.js';
3
3
  import { type Logger } from '@aztec/foundation/log';
4
- import { type AcirSimulator } from '@aztec/simulator';
4
+ import { type AcirSimulator } from '@aztec/simulator/client';
5
5
  import { type PxeDatabase } from '../database/pxe_database.js';
6
6
  import { type NoteInfo } from './brute_force_note_info.js';
7
7
  export declare function produceNoteDaosForKey<T>(simulator: AcirSimulator, db: PxeDatabase, pkM: PublicKey, payload: L1NotePayload, txHash: TxHash, l2BlockNumber: number, l2BlockHash: string, noteHashes: Fr[], dataStartIndexForTx: number, excludedIndices: Set<number>, logger: Logger, daoConstructor: (note: Note, payload: L1NotePayload, noteInfo: NoteInfo, l2BlockNumber: number, l2BlockHash: string, dataStartIndexForTx: number, pkM: PublicKey) => T): Promise<T | undefined>;
@@ -1 +1 @@
1
- {"version":3,"file":"produce_note_daos_for_key.d.ts","sourceRoot":"","sources":["../../src/note_decryption_utils/produce_note_daos_for_key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,KAAK,QAAQ,EAAsB,MAAM,4BAA4B,CAAC;AAE/E,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,SAAS,EAAE,aAAa,EACxB,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,EAAE,EAAE,EAChB,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,CACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,EAC3B,GAAG,EAAE,SAAS,KACX,CAAC,GACL,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CA0BxB"}
1
+ {"version":3,"file":"produce_note_daos_for_key.d.ts","sourceRoot":"","sources":["../../src/note_decryption_utils/produce_note_daos_for_key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,KAAK,QAAQ,EAAsB,MAAM,4BAA4B,CAAC;AAE/E,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,SAAS,EAAE,aAAa,EACxB,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,EAAE,EAAE,EAChB,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,CACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,EAC3B,GAAG,EAAE,SAAS,KACX,CAAC,GACL,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CA0BxB"}
@@ -1,11 +1,11 @@
1
1
  import { type SimulationError } from '@aztec/circuit-types';
2
- import { type DebugLogger } from '@aztec/foundation/log';
2
+ import { type Logger } from '@aztec/foundation/log';
3
3
  import { type ContractDataOracle, type PxeDatabase } from '../index.js';
4
4
  /**
5
5
  * Adds contract and function names to a simulation error, if they
6
6
  * can be found in the PXE database
7
7
  * @param err - The error to enrich.
8
8
  */
9
- export declare function enrichSimulationError(err: SimulationError, db: PxeDatabase, logger: DebugLogger): Promise<void>;
10
- export declare function enrichPublicSimulationError(err: SimulationError, contractDataOracle: ContractDataOracle, db: PxeDatabase, logger: DebugLogger): Promise<void>;
9
+ export declare function enrichSimulationError(err: SimulationError, db: PxeDatabase, logger: Logger): Promise<void>;
10
+ export declare function enrichPublicSimulationError(err: SimulationError, contractDataOracle: ContractDataOracle, db: PxeDatabase, logger: Logger): Promise<void>;
11
11
  //# sourceMappingURL=error_enriching.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"error_enriching.d.ts","sourceRoot":"","sources":["../../src/pxe_service/error_enriching.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAA6B,MAAM,sBAAsB,CAAC;AAEvF,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAExE;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,iBAwCrG;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,eAAe,EACpB,kBAAkB,EAAE,kBAAkB,EACtC,EAAE,EAAE,WAAW,EACf,MAAM,EAAE,WAAW,iBAuCpB"}
1
+ {"version":3,"file":"error_enriching.d.ts","sourceRoot":"","sources":["../../src/pxe_service/error_enriching.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAA6B,MAAM,sBAAsB,CAAC;AAEvF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAExE;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,iBAwChG;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,eAAe,EACpB,kBAAkB,EAAE,kBAAkB,EACtC,EAAE,EAAE,WAAW,EACf,MAAM,EAAE,MAAM,iBAyCf"}
@@ -1,34 +1,34 @@
1
1
  import { isNoirCallStackUnresolved } from '@aztec/circuit-types';
2
2
  import { AztecAddress, Fr, FunctionSelector, PUBLIC_DISPATCH_SELECTOR } from '@aztec/circuits.js';
3
- import { resolveAssertionMessageFromRevertData, resolveOpcodeLocations } from '@aztec/simulator';
3
+ import { resolveAssertionMessageFromRevertData, resolveOpcodeLocations } from '@aztec/simulator/errors';
4
4
  /**
5
5
  * Adds contract and function names to a simulation error, if they
6
6
  * can be found in the PXE database
7
7
  * @param err - The error to enrich.
8
8
  */
9
9
  export async function enrichSimulationError(err, db, logger) {
10
- // Maps contract addresses to the set of functions selectors that were in error.
10
+ // Maps contract addresses to the set of function names that were in error.
11
11
  // Map and Set do reference equality for their keys instead of value equality, so we store the string
12
12
  // representation to get e.g. different contract address objects with the same address value to match.
13
13
  const mentionedFunctions = new Map();
14
- err.getCallStack().forEach(({ contractAddress, functionSelector }) => {
14
+ err.getCallStack().forEach(({ contractAddress, functionName }) => {
15
15
  if (!mentionedFunctions.has(contractAddress.toString())) {
16
16
  mentionedFunctions.set(contractAddress.toString(), new Set());
17
17
  }
18
- mentionedFunctions.get(contractAddress.toString()).add(functionSelector.toString());
18
+ mentionedFunctions.get(contractAddress.toString()).add(functionName?.toString() ?? '');
19
19
  });
20
- await Promise.all([...mentionedFunctions.entries()].map(async ([contractAddress, selectors]) => {
20
+ await Promise.all([...mentionedFunctions.entries()].map(async ([contractAddress, fnNames]) => {
21
21
  const parsedContractAddress = AztecAddress.fromString(contractAddress);
22
22
  const contract = await db.getContract(parsedContractAddress);
23
23
  if (contract) {
24
24
  err.enrichWithContractName(parsedContractAddress, contract.name);
25
- selectors.forEach(selector => {
26
- const functionArtifact = contract.functions.find(f => FunctionSelector.fromString(selector).equals(f));
25
+ fnNames.forEach(fnName => {
26
+ const functionArtifact = contract.functions.find(f => fnName === f.name);
27
27
  if (functionArtifact) {
28
28
  err.enrichWithFunctionName(parsedContractAddress, FunctionSelector.fromNameAndParameters(functionArtifact), functionArtifact.name);
29
29
  }
30
30
  else {
31
- logger.warn(`Could not function artifact in contract ${contract.name} for selector ${selector} when enriching error callstack`);
31
+ logger.warn(`Could not function artifact in contract ${contract.name} for function '${fnName}' when enriching error callstack`);
32
32
  }
33
33
  });
34
34
  }
@@ -60,10 +60,10 @@ export async function enrichPublicSimulationError(err, contractDataOracle, db, l
60
60
  err.setNoirCallStack(parsedCallStack);
61
61
  }
62
62
  catch (err) {
63
- logger.warn(`Could not resolve noir call stack for ${originalFailingFunction.contractAddress.toString()}:${originalFailingFunction.functionSelector.toString()}: ${err}`);
63
+ logger.warn(`Could not resolve noir call stack for ${originalFailingFunction.contractAddress.toString()}:${originalFailingFunction.functionName?.toString() ?? ''}: ${err}`);
64
64
  }
65
65
  }
66
66
  await enrichSimulationError(err, db, logger);
67
67
  }
68
68
  }
69
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JfZW5yaWNoaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B4ZV9zZXJ2aWNlL2Vycm9yX2VucmljaGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXdCLHlCQUF5QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkYsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsZ0JBQWdCLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVsRyxPQUFPLEVBQUUscUNBQXFDLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUlqRzs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxxQkFBcUIsQ0FBQyxHQUFvQixFQUFFLEVBQWUsRUFBRSxNQUFtQjtJQUNwRyxnRkFBZ0Y7SUFDaEYscUdBQXFHO0lBQ3JHLHNHQUFzRztJQUN0RyxNQUFNLGtCQUFrQixHQUE2QixJQUFJLEdBQUcsRUFBRSxDQUFDO0lBRS9ELEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxFQUFFLEVBQUU7UUFDbkUsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ3hELGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7UUFDRCxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxDQUFFLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDdkYsQ0FBQyxDQUFDLENBQUM7SUFFSCxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2YsQ0FBQyxHQUFHLGtCQUFrQixDQUFDLE9BQU8sRUFB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
69
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JfZW5yaWNoaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B4ZV9zZXJ2aWNlL2Vycm9yX2VucmljaGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXdCLHlCQUF5QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkYsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsZ0JBQWdCLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVsRyxPQUFPLEVBQUUscUNBQXFDLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUl4Rzs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxxQkFBcUIsQ0FBQyxHQUFvQixFQUFFLEVBQWUsRUFBRSxNQUFjO0lBQy9GLDJFQUEyRTtJQUMzRSxxR0FBcUc7SUFDckcsc0dBQXNHO0lBQ3RHLE1BQU0sa0JBQWtCLEdBQTZCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFL0QsR0FBRyxDQUFDLFlBQVksRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsZUFBZSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUU7UUFDL0QsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ3hELGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7UUFDRCxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxDQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUMxRixDQUFDLENBQUMsQ0FBQztJQUVILE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDZixDQUFDLEdBQUcsa0JBQWtCLENBQUMsT0FB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
@@ -1,5 +1,4 @@
1
1
  export * from './pxe_service.js';
2
- export * from './create_pxe_service.js';
3
2
  export { enrichPublicSimulationError } from './error_enriching.js';
4
3
  export { pxeTestSuite } from './test/pxe_test_suite.js';
5
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/pxe_service/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/pxe_service/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC"}
@@ -1,5 +1,4 @@
1
1
  export * from './pxe_service.js';
2
- export * from './create_pxe_service.js';
3
2
  export { enrichPublicSimulationError } from './error_enriching.js';
4
3
  export { pxeTestSuite } from './test/pxe_test_suite.js';
5
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHhlX3NlcnZpY2UvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ25FLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQyJ9
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHhlX3NlcnZpY2UvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNuRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMEJBQTBCLENBQUMifQ==