@aztec/simulator 0.85.0-alpha-testnet.5 → 0.85.0-alpha-testnet.7

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 (5) hide show
  1. package/dest/public/public_processor/public_processor.d.ts +1 -1
  2. package/dest/public/public_processor/public_processor.d.ts.map +1 -1
  3. package/dest/public/public_processor/public_processor.js +3 -0
  4. package/package.json +14 -14
  5. package/src/public/public_processor/public_processor.ts +4 -2
package/dest/public/public_processor/public_processor.d.ts CHANGED
@@ -57,7 +57,7 @@ export declare class PublicProcessor implements Traceable {
57
57
  nullifierCache?: {
58
58
  addNullifiers: (nullifiers: Buffer[]) => void;
59
59
  };
60
- }): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]>;
60
+ }): Promise<[ProcessedTx[], FailedTx[], Tx[], NestedProcessReturnValues[]]>;
61
61
  private processTx;
62
62
  private doTreeInsertionsForPrivateOnlyTx;
63
63
  /** Processes the given tx within deadline. Returns timeout if deadline is hit. */
package/dest/public/public_processor/public_processor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAMvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EACL,KAAK,QAAQ,EACb,eAAe,EACf,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAA8B,MAAM,iCAAiC,CAAC;AAGrG;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,SAAS,CAAC,eAAe,EAAE,eAAe;gBAFlC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,GAAE,YAAiC,EAC7C,eAAe,GAAE,eAAsC;IAGnE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,GAC1B,eAAe;IAqBlB,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,GAC1B,iBAAiB;CAUrB;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,SAAS,GAAE;QACT,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAoJtD,SAAS;YA2BT,gCAAgC;IAyC9C,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,4BAA4B;YAwB5B,oBAAoB;YA6BpB,wBAAwB;CA8CvC"}
1
+ {"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAMvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EACL,KAAK,QAAQ,EACb,eAAe,EACf,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAA8B,MAAM,iCAAiC,CAAC;AAGrG;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,SAAS,CAAC,eAAe,EAAE,eAAe;gBAFlC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,GAAE,YAAiC,EAC7C,eAAe,GAAE,eAAsC;IAGnE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,GAC1B,eAAe;IAqBlB,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,GAC1B,iBAAiB;CAUrB;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,SAAS,GAAE;QACT,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAsJ5D,SAAS;YA2BT,gCAAgC;IAyC9C,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,4BAA4B;YAwB5B,oBAAoB;YA6BpB,wBAAwB;CA8CvC"}
package/dest/public/public_processor/public_processor.js CHANGED
@@ -87,6 +87,7 @@ class PublicProcessorTimeoutError extends Error {
87
87
  const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
88
88
  const { preprocessValidator, nullifierCache } = validator;
89
89
  const result = [];
90
+ const usedTxs = [];
90
91
  const failed = [];
91
92
  const timer = new Timer();
92
93
  let totalSizeInBytes = 0;
@@ -181,6 +182,7 @@ class PublicProcessorTimeoutError extends Error {
181
182
  }
182
183
  nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map((n)=>n.toBuffer()));
183
184
  result.push(processedTx);
185
+ usedTxs.push(tx);
184
186
  returns = returns.concat(returnValues);
185
187
  totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
186
188
  totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
@@ -219,6 +221,7 @@ class PublicProcessorTimeoutError extends Error {
219
221
  return [
220
222
  result,
221
223
  failed,
224
+ usedTxs,
222
225
  returns
223
226
  ];
224
227
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/simulator",
3
- "version": "0.85.0-alpha-testnet.5",
3
+ "version": "0.85.0-alpha-testnet.7",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./server": "./dest/server.js",
@@ -60,24 +60,24 @@
60
60
  ]
61
61
  },
62
62
  "dependencies": {
63
- "@aztec/constants": "0.85.0-alpha-testnet.5",
64
- "@aztec/foundation": "0.85.0-alpha-testnet.5",
65
- "@aztec/noir-acvm_js": "0.85.0-alpha-testnet.5",
66
- "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.5",
67
- "@aztec/noir-protocol-circuits-types": "0.85.0-alpha-testnet.5",
68
- "@aztec/noir-types": "0.85.0-alpha-testnet.5",
69
- "@aztec/protocol-contracts": "0.85.0-alpha-testnet.5",
70
- "@aztec/stdlib": "0.85.0-alpha-testnet.5",
71
- "@aztec/telemetry-client": "0.85.0-alpha-testnet.5",
72
- "@aztec/world-state": "0.85.0-alpha-testnet.5",
63
+ "@aztec/constants": "0.85.0-alpha-testnet.7",
64
+ "@aztec/foundation": "0.85.0-alpha-testnet.7",
65
+ "@aztec/noir-acvm_js": "0.85.0-alpha-testnet.7",
66
+ "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.7",
67
+ "@aztec/noir-protocol-circuits-types": "0.85.0-alpha-testnet.7",
68
+ "@aztec/noir-types": "0.85.0-alpha-testnet.7",
69
+ "@aztec/protocol-contracts": "0.85.0-alpha-testnet.7",
70
+ "@aztec/stdlib": "0.85.0-alpha-testnet.7",
71
+ "@aztec/telemetry-client": "0.85.0-alpha-testnet.7",
72
+ "@aztec/world-state": "0.85.0-alpha-testnet.7",
73
73
  "lodash.clonedeep": "^4.5.0",
74
74
  "lodash.merge": "^4.6.2",
75
75
  "tslib": "^2.4.0"
76
76
  },
77
77
  "devDependencies": {
78
- "@aztec/kv-store": "0.85.0-alpha-testnet.5",
79
- "@aztec/merkle-tree": "0.85.0-alpha-testnet.5",
80
- "@aztec/noir-contracts.js": "0.85.0-alpha-testnet.5",
78
+ "@aztec/kv-store": "0.85.0-alpha-testnet.7",
79
+ "@aztec/merkle-tree": "0.85.0-alpha-testnet.7",
80
+ "@aztec/noir-contracts.js": "0.85.0-alpha-testnet.7",
81
81
  "@jest/globals": "^29.5.0",
82
82
  "@types/jest": "^29.5.0",
83
83
  "@types/lodash.clonedeep": "^4.5.7",
package/src/public/public_processor/public_processor.ts CHANGED
@@ -145,10 +145,11 @@ export class PublicProcessor implements Traceable {
145
145
  preprocessValidator?: TxValidator<Tx>;
146
146
  nullifierCache?: { addNullifiers: (nullifiers: Buffer[]) => void };
147
147
  } = {},
148
- ): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]> {
148
+ ): Promise<[ProcessedTx[], FailedTx[], Tx[], NestedProcessReturnValues[]]> {
149
149
  const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
150
150
  const { preprocessValidator, nullifierCache } = validator;
151
151
  const result: ProcessedTx[] = [];
152
+ const usedTxs: Tx[] = [];
152
153
  const failed: FailedTx[] = [];
153
154
  const timer = new Timer();
154
155
 
@@ -252,6 +253,7 @@ export class PublicProcessor implements Traceable {
252
253
 
253
254
  nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map(n => n.toBuffer()));
254
255
  result.push(processedTx);
256
+ usedTxs.push(tx);
255
257
  returns = returns.concat(returnValues);
256
258
 
257
259
  totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
@@ -289,7 +291,7 @@ export class PublicProcessor implements Traceable {
289
291
  totalSizeInBytes,
290
292
  });
291
293
 
292
- return [result, failed, returns];
294
+ return [result, failed, usedTxs, returns];
293
295
  }
294
296
 
295
297
  @trackSpan('PublicProcessor.processTx', async tx => ({ [Attributes.TX_HASH]: (await tx.getTxHash()).toString() }))