@aztec/aztec-node 0.55.0 → 0.56.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 (9) hide show
  1. package/dest/aztec-node/server.d.ts +1 -2
  2. package/dest/aztec-node/server.d.ts.map +1 -1
  3. package/dest/aztec-node/server.js +14 -15
  4. package/package.json +20 -19
  5. package/src/aztec-node/server.ts +34 -35
  6. package/dest/aztec-node/tx_validator/tx_proof_validator.d.ts +0 -9
  7. package/dest/aztec-node/tx_validator/tx_proof_validator.d.ts.map +0 -1
  8. package/dest/aztec-node/tx_validator/tx_proof_validator.js +0 -29
  9. package/src/aztec-node/tx_validator/tx_proof_validator.ts +0 -28
package/dest/aztec-node/server.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { type AztecNode, type ClientProtocolCircuitVerifier, type FromLogType, type GetUnencryptedLogsResponse, type L1ToL2MessageSource, type L2Block, type L2BlockL2Logs, type L2BlockNumber, type L2BlockSource, type L2LogsSource, type LogFilter, LogType, MerkleTreeId, NullifierMembershipWitness, type ProverConfig, PublicDataWitness, PublicSimulationOutput, type SequencerConfig, SiblingPath, type Tx, type TxEffect, type TxHash, TxReceipt } from '@aztec/circuit-types';
1
+ import { type AztecNode, type ClientProtocolCircuitVerifier, type FromLogType, type GetUnencryptedLogsResponse, type L1ToL2MessageSource, type L2Block, type L2BlockL2Logs, type L2BlockNumber, type L2BlockSource, type L2LogsSource, type LogFilter, LogType, MerkleTreeId, NullifierMembershipWitness, type ProverConfig, PublicDataWitness, PublicSimulationOutput, type SequencerConfig, SiblingPath, type Tx, type TxEffect, type TxHash, TxReceipt, type WorldStateSynchronizer } from '@aztec/circuit-types';
2
2
  import { type ARCHIVE_HEIGHT, Fr, type Header, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT, type NULLIFIER_TREE_HEIGHT, type PUBLIC_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
3
3
  import { type L1ContractAddresses } from '@aztec/ethereum';
4
4
  import { type ContractArtifact } from '@aztec/foundation/abi';
@@ -7,7 +7,6 @@ import { type P2P } from '@aztec/p2p';
7
7
  import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
8
8
  import { type TelemetryClient } from '@aztec/telemetry-client';
9
9
  import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type ProtocolContractAddresses } from '@aztec/types/contracts';
10
- import { type WorldStateSynchronizer } from '@aztec/world-state';
11
10
  import { type AztecNodeConfig } from './config.js';
12
11
  /**
13
12
  * The aztec node.
package/dest/aztec-node/server.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
package/dest/aztec-node/server.js CHANGED
@@ -12,20 +12,18 @@ import { createDebugLogger } from '@aztec/foundation/log';
12
12
  import { Timer } from '@aztec/foundation/timer';
13
13
  import { openTmpStore } from '@aztec/kv-store/utils';
14
14
  import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
15
- import { InMemoryAttestationPool, createP2PClient } from '@aztec/p2p';
15
+ import { AggregateTxValidator, DataTxValidator, DoubleSpendTxValidator, InMemoryAttestationPool, MetadataTxValidator, TxProofValidator, createP2PClient, } from '@aztec/p2p';
16
16
  import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
17
17
  import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
18
18
  import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
19
- import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
20
19
  import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
21
- import { AggregateTxValidator, DataTxValidator, DoubleSpendTxValidator, GlobalVariableBuilder, MetadataTxValidator, SequencerClient, } from '@aztec/sequencer-client';
20
+ import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
22
21
  import { PublicProcessorFactory, WASMSimulator, WorldStateDB, createSimulationProvider } from '@aztec/simulator';
23
22
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
24
23
  import { createValidatorClient } from '@aztec/validator-client';
25
24
  import { createWorldStateSynchronizer } from '@aztec/world-state';
26
25
  import { getPackageInfo } from './config.js';
27
26
  import { NodeMetrics } from './node_metrics.js';
28
- import { TxProofValidator } from './tx_validator/tx_proof_validator.js';
29
27
  /**
30
28
  * The aztec node.
31
29
  */
@@ -72,13 +70,13 @@ export class AztecNodeService {
72
70
  // we identify the P2P transaction protocol by using the rollup contract address.
73
71
  // this may well change in future
74
72
  config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
75
- // create the tx pool and the p2p client, which will need the l2 block source
76
- const p2pClient = await createP2PClient(config, new InMemoryAttestationPool(), archiver, telemetry);
77
73
  // now create the merkle trees and the world state synchronizer
78
74
  const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, telemetry);
75
+ const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
76
+ // create the tx pool and the p2p client, which will need the l2 block source
77
+ const p2pClient = await createP2PClient(config, new InMemoryAttestationPool(), archiver, proofVerifier, worldStateSynchronizer, telemetry);
79
78
  // start both and wait for them to sync from the block source
80
79
  await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
81
- const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
82
80
  const simulationProvider = await createSimulationProvider(config, log);
83
81
  const validatorClient = createValidatorClient(config, p2pClient);
84
82
  // now create the sequencer
@@ -333,10 +331,13 @@ export class AztecNodeService {
333
331
  if (indexOfMsgTx === -1) {
334
332
  throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
335
333
  }
334
+ const tempStores = [];
336
335
  // Construct message subtrees
337
336
  const l2toL1Subtrees = await Promise.all(l2ToL1Messages.map(async (msgs, i) => {
337
+ const store = openTmpStore(true);
338
+ tempStores.push(store);
338
339
  const treeHeight = msgs.length <= 1 ? 1 : Math.ceil(Math.log2(msgs.length));
339
- const tree = new StandardTree(openTmpStore(true), new SHA256Trunc(), `temp_msgs_subtrees_${i}`, treeHeight, 0n, Fr);
340
+ const tree = new StandardTree(store, new SHA256Trunc(), `temp_msgs_subtrees_${i}`, treeHeight, 0n, Fr);
340
341
  await tree.appendLeaves(msgs);
341
342
  return tree;
342
343
  }));
@@ -357,6 +358,8 @@ export class AztecNodeService {
357
358
  const mergedIndex = parseInt(indexOfMsgTx
358
359
  .toString(2)
359
360
  .concat(indexOfMsgInSubtree.toString(2).padStart(l2toL1Subtrees[indexOfMsgTx].getDepth(), '0')), 2);
361
+ // clear the tmp stores
362
+ await Promise.all(tempStores.map(store => store.delete()));
360
363
  return [BigInt(mergedIndex), new SiblingPath(mergedPath.length, mergedPath)];
361
364
  }
362
365
  /**
@@ -499,16 +502,13 @@ export class AztecNodeService {
499
502
  }
500
503
  async isValidTx(tx, isSimulation = false) {
501
504
  const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
502
- const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(new Fr(blockNumber),
503
- // We only need chainId and block number, thus coinbase and fee recipient can be set to 0.
504
- EthAddress.ZERO, AztecAddress.ZERO);
505
505
  // These validators are taken from the sequencer, and should match.
506
506
  // The reason why `phases` and `gas` tx validator is in the sequencer and not here is because
507
507
  // those tx validators are customizable by the sequencer.
508
508
  const txValidators = [
509
509
  new DataTxValidator(),
510
- new MetadataTxValidator(newGlobalVariables),
511
- new DoubleSpendTxValidator(new WorldStateDB(this.worldStateSynchronizer.getLatest())),
510
+ new MetadataTxValidator(new Fr(this.l1ChainId), new Fr(blockNumber)),
511
+ new DoubleSpendTxValidator(new WorldStateDB(this.worldStateSynchronizer.getLatest(), this.contractDataSource)),
512
512
  ];
513
513
  if (!isSimulation) {
514
514
  txValidators.push(new TxProofValidator(this.proofVerifier));
@@ -534,7 +534,6 @@ export class AztecNodeService {
534
534
  classRegisterer: getCanonicalClassRegisterer().address,
535
535
  feeJuice: getCanonicalFeeJuice().address,
536
536
  instanceDeployer: getCanonicalInstanceDeployer().address,
537
- keyRegistry: getCanonicalKeyRegistryAddress(),
538
537
  multiCallEntrypoint: getCanonicalMultiCallEntrypointAddress(),
539
538
  });
540
539
  }
@@ -588,4 +587,4 @@ async function _AztecNodeService_syncWorldState() {
588
587
  const blockSourceHeight = await this.blockSource.getBlockNumber();
589
588
  return this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
590
589
  };
591
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
590
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/aztec-node",
3
- "version": "0.55.0",
3
+ "version": "0.56.0",
4
4
  "main": "dest/index.js",
5
5
  "type": "module",
6
6
  "exports": "./dest/index.js",
@@ -14,6 +14,7 @@
14
14
  },
15
15
  "scripts": {
16
16
  "start": "node --no-warnings ./dest/bin",
17
+ "start:debug": "node --no-warnings --inspect ./dest/bin",
17
18
  "build": "yarn clean && tsc -b",
18
19
  "build:dev": "tsc -b --watch",
19
20
  "clean": "rm -rf ./dest .tsbuildinfo",
@@ -56,24 +57,24 @@
56
57
  ]
57
58
  },
58
59
  "dependencies": {
59
- "@aztec/archiver": "0.55.0",
60
- "@aztec/bb-prover": "0.55.0",
61
- "@aztec/circuit-types": "0.55.0",
62
- "@aztec/circuits.js": "0.55.0",
63
- "@aztec/ethereum": "0.55.0",
64
- "@aztec/foundation": "0.55.0",
65
- "@aztec/kv-store": "0.55.0",
66
- "@aztec/l1-artifacts": "0.55.0",
67
- "@aztec/merkle-tree": "0.55.0",
68
- "@aztec/p2p": "0.55.0",
69
- "@aztec/protocol-contracts": "0.55.0",
70
- "@aztec/prover-client": "0.55.0",
71
- "@aztec/sequencer-client": "0.55.0",
72
- "@aztec/simulator": "0.55.0",
73
- "@aztec/telemetry-client": "0.55.0",
74
- "@aztec/types": "0.55.0",
75
- "@aztec/validator-client": "0.55.0",
76
- "@aztec/world-state": "0.55.0",
60
+ "@aztec/archiver": "0.56.0",
61
+ "@aztec/bb-prover": "0.56.0",
62
+ "@aztec/circuit-types": "0.56.0",
63
+ "@aztec/circuits.js": "0.56.0",
64
+ "@aztec/ethereum": "0.56.0",
65
+ "@aztec/foundation": "0.56.0",
66
+ "@aztec/kv-store": "0.56.0",
67
+ "@aztec/l1-artifacts": "0.56.0",
68
+ "@aztec/merkle-tree": "0.56.0",
69
+ "@aztec/p2p": "0.56.0",
70
+ "@aztec/protocol-contracts": "0.56.0",
71
+ "@aztec/prover-client": "0.56.0",
72
+ "@aztec/sequencer-client": "0.56.0",
73
+ "@aztec/simulator": "0.56.0",
74
+ "@aztec/telemetry-client": "0.56.0",
75
+ "@aztec/types": "0.56.0",
76
+ "@aztec/validator-client": "0.56.0",
77
+ "@aztec/world-state": "0.56.0",
77
78
  "koa": "^2.14.2",
78
79
  "koa-router": "^12.0.0",
79
80
  "tslib": "^2.4.0"
package/src/aztec-node/server.ts CHANGED
@@ -27,6 +27,7 @@ import {
27
27
  TxReceipt,
28
28
  TxStatus,
29
29
  type TxValidator,
30
+ type WorldStateSynchronizer,
30
31
  partitionReverts,
31
32
  } from '@aztec/circuit-types';
32
33
  import {
@@ -50,22 +51,24 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
50
51
  import { padArrayEnd } from '@aztec/foundation/collection';
51
52
  import { createDebugLogger } from '@aztec/foundation/log';
52
53
  import { Timer } from '@aztec/foundation/timer';
54
+ import { type AztecKVStore } from '@aztec/kv-store';
53
55
  import { openTmpStore } from '@aztec/kv-store/utils';
54
56
  import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
55
- import { InMemoryAttestationPool, type P2P, createP2PClient } from '@aztec/p2p';
56
- import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
57
- import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
58
- import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
59
- import { getCanonicalKeyRegistryAddress } from '@aztec/protocol-contracts/key-registry';
60
- import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
61
57
  import {
62
58
  AggregateTxValidator,
63
59
  DataTxValidator,
64
60
  DoubleSpendTxValidator,
65
- GlobalVariableBuilder,
61
+ InMemoryAttestationPool,
66
62
  MetadataTxValidator,
67
- SequencerClient,
68
- } from '@aztec/sequencer-client';
63
+ type P2P,
64
+ TxProofValidator,
65
+ createP2PClient,
66
+ } from '@aztec/p2p';
67
+ import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
68
+ import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
69
+ import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
70
+ import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
71
+ import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
69
72
  import { PublicProcessorFactory, WASMSimulator, WorldStateDB, createSimulationProvider } from '@aztec/simulator';
70
73
  import { type TelemetryClient } from '@aztec/telemetry-client';
71
74
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
@@ -76,11 +79,10 @@ import {
76
79
  type ProtocolContractAddresses,
77
80
  } from '@aztec/types/contracts';
78
81
  import { createValidatorClient } from '@aztec/validator-client';
79
- import { type WorldStateSynchronizer, createWorldStateSynchronizer } from '@aztec/world-state';
82
+ import { createWorldStateSynchronizer } from '@aztec/world-state';
80
83
 
81
84
  import { type AztecNodeConfig, getPackageInfo } from './config.js';
82
85
  import { NodeMetrics } from './node_metrics.js';
83
- import { TxProofValidator } from './tx_validator/tx_proof_validator.js';
84
86
 
85
87
  /**
86
88
  * The aztec node.
@@ -144,17 +146,23 @@ export class AztecNodeService implements AztecNode {
144
146
  // this may well change in future
145
147
  config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
146
148
 
147
- // create the tx pool and the p2p client, which will need the l2 block source
148
- const p2pClient = await createP2PClient(config, new InMemoryAttestationPool(), archiver, telemetry);
149
-
150
149
  // now create the merkle trees and the world state synchronizer
151
150
  const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, telemetry);
151
+ const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
152
+
153
+ // create the tx pool and the p2p client, which will need the l2 block source
154
+ const p2pClient = await createP2PClient(
155
+ config,
156
+ new InMemoryAttestationPool(),
157
+ archiver,
158
+ proofVerifier,
159
+ worldStateSynchronizer,
160
+ telemetry,
161
+ );
152
162
 
153
163
  // start both and wait for them to sync from the block source
154
164
  await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
155
165
 
156
- const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
157
-
158
166
  const simulationProvider = await createSimulationProvider(config, log);
159
167
 
160
168
  const validatorClient = createValidatorClient(config, p2pClient);
@@ -501,18 +509,15 @@ export class AztecNodeService implements AztecNode {
501
509
  throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
502
510
  }
503
511
 
512
+ const tempStores: AztecKVStore[] = [];
513
+
504
514
  // Construct message subtrees
505
515
  const l2toL1Subtrees = await Promise.all(
506
516
  l2ToL1Messages.map(async (msgs, i) => {
517
+ const store = openTmpStore(true);
518
+ tempStores.push(store);
507
519
  const treeHeight = msgs.length <= 1 ? 1 : Math.ceil(Math.log2(msgs.length));
508
- const tree = new StandardTree(
509
- openTmpStore(true),
510
- new SHA256Trunc(),
511
- `temp_msgs_subtrees_${i}`,
512
- treeHeight,
513
- 0n,
514
- Fr,
515
- );
520
+ const tree = new StandardTree(store, new SHA256Trunc(), `temp_msgs_subtrees_${i}`, treeHeight, 0n, Fr);
516
521
  await tree.appendLeaves(msgs);
517
522
  return tree;
518
523
  }),
@@ -544,6 +549,9 @@ export class AztecNodeService implements AztecNode {
544
549
  2,
545
550
  );
546
551
 
552
+ // clear the tmp stores
553
+ await Promise.all(tempStores.map(store => store.delete()));
554
+
547
555
  return [BigInt(mergedIndex), new SiblingPath(mergedPath.length, mergedPath)];
548
556
  }
549
557
 
@@ -748,21 +756,13 @@ export class AztecNodeService implements AztecNode {
748
756
 
749
757
  public async isValidTx(tx: Tx, isSimulation: boolean = false): Promise<boolean> {
750
758
  const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
751
-
752
- const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(
753
- new Fr(blockNumber),
754
- // We only need chainId and block number, thus coinbase and fee recipient can be set to 0.
755
- EthAddress.ZERO,
756
- AztecAddress.ZERO,
757
- );
758
-
759
759
  // These validators are taken from the sequencer, and should match.
760
760
  // The reason why `phases` and `gas` tx validator is in the sequencer and not here is because
761
761
  // those tx validators are customizable by the sequencer.
762
762
  const txValidators: TxValidator<Tx | ProcessedTx>[] = [
763
763
  new DataTxValidator(),
764
- new MetadataTxValidator(newGlobalVariables),
765
- new DoubleSpendTxValidator(new WorldStateDB(this.worldStateSynchronizer.getLatest())),
764
+ new MetadataTxValidator(new Fr(this.l1ChainId), new Fr(blockNumber)),
765
+ new DoubleSpendTxValidator(new WorldStateDB(this.worldStateSynchronizer.getLatest(), this.contractDataSource)),
766
766
  ];
767
767
 
768
768
  if (!isSimulation) {
@@ -797,7 +797,6 @@ export class AztecNodeService implements AztecNode {
797
797
  classRegisterer: getCanonicalClassRegisterer().address,
798
798
  feeJuice: getCanonicalFeeJuice().address,
799
799
  instanceDeployer: getCanonicalInstanceDeployer().address,
800
- keyRegistry: getCanonicalKeyRegistryAddress(),
801
800
  multiCallEntrypoint: getCanonicalMultiCallEntrypointAddress(),
802
801
  });
803
802
  }
package/dest/aztec-node/tx_validator/tx_proof_validator.d.ts DELETED
@@ -1,9 +0,0 @@
1
- import { type ClientProtocolCircuitVerifier, Tx, type TxValidator } from '@aztec/circuit-types';
2
- export declare class TxProofValidator implements TxValidator<Tx> {
3
- #private;
4
- private verifier;
5
- constructor(verifier: ClientProtocolCircuitVerifier);
6
- validateTxs(txs: Tx[]): Promise<[validTxs: Tx[], invalidTxs: Tx[]]>;
7
- validateTx(tx: Tx): Promise<boolean>;
8
- }
9
- //# sourceMappingURL=tx_proof_validator.d.ts.map
package/dest/aztec-node/tx_validator/tx_proof_validator.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"tx_proof_validator.d.ts","sourceRoot":"","sources":["../../../src/aztec-node/tx_validator/tx_proof_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,6BAA6B,EAAE,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGhG,qBAAa,gBAAiB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAG1C,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,6BAA6B;IAErD,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAgBzE,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGrC"}
package/dest/aztec-node/tx_validator/tx_proof_validator.js DELETED
@@ -1,29 +0,0 @@
1
- var _TxProofValidator_log;
2
- import { __classPrivateFieldGet } from "tslib";
3
- import { Tx } from '@aztec/circuit-types';
4
- import { createDebugLogger } from '@aztec/foundation/log';
5
- export class TxProofValidator {
6
- constructor(verifier) {
7
- this.verifier = verifier;
8
- _TxProofValidator_log.set(this, createDebugLogger('aztec:sequencer:tx_validator:private_proof'));
9
- }
10
- async validateTxs(txs) {
11
- const validTxs = [];
12
- const invalidTxs = [];
13
- for (const tx of txs) {
14
- if (await this.verifier.verifyProof(tx)) {
15
- validTxs.push(tx);
16
- }
17
- else {
18
- __classPrivateFieldGet(this, _TxProofValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} for invalid proof`);
19
- invalidTxs.push(tx);
20
- }
21
- }
22
- return [validTxs, invalidTxs];
23
- }
24
- validateTx(tx) {
25
- return this.verifier.verifyProof(tx);
26
- }
27
- }
28
- _TxProofValidator_log = new WeakMap();
29
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcHJvb2ZfdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F6dGVjLW5vZGUvdHhfdmFsaWRhdG9yL3R4X3Byb29mX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBc0MsRUFBRSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQ2hHLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTFELE1BQU0sT0FBTyxnQkFBZ0I7SUFHM0IsWUFBb0IsUUFBdUM7UUFBdkMsYUFBUSxHQUFSLFFBQVEsQ0FBK0I7UUFGM0QsZ0NBQU8saUJBQWlCLENBQUMsNENBQTRDLENBQUMsRUFBQztJQUVULENBQUM7SUFFL0QsS0FBSyxDQUFDLFdBQVcsQ0FBQyxHQUFTO1FBQ3pCLE1BQU0sUUFBUSxHQUFTLEVBQUUsQ0FBQztRQUMxQixNQUFNLFVBQVUsR0FBUyxFQUFFLENBQUM7UUFFNUIsS0FBSyxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNyQixJQUFJLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQztnQkFDeEMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNwQixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sdUJBQUEsSUFBSSw2QkFBSyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsQ0FBQztnQkFDbkUsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN0QixDQUFDO1FBQ0gsQ0FBQztRQUVELE9BQU8sQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVELFVBQVUsQ0FBQyxFQUFNO1FBQ2YsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2QyxDQUFDO0NBQ0YifQ==
package/src/aztec-node/tx_validator/tx_proof_validator.ts DELETED
@@ -1,28 +0,0 @@
1
- import { type ClientProtocolCircuitVerifier, Tx, type TxValidator } from '@aztec/circuit-types';
2
- import { createDebugLogger } from '@aztec/foundation/log';
3
-
4
- export class TxProofValidator implements TxValidator<Tx> {
5
- #log = createDebugLogger('aztec:sequencer:tx_validator:private_proof');
6
-
7
- constructor(private verifier: ClientProtocolCircuitVerifier) {}
8
-
9
- async validateTxs(txs: Tx[]): Promise<[validTxs: Tx[], invalidTxs: Tx[]]> {
10
- const validTxs: Tx[] = [];
11
- const invalidTxs: Tx[] = [];
12
-
13
- for (const tx of txs) {
14
- if (await this.verifier.verifyProof(tx)) {
15
- validTxs.push(tx);
16
- } else {
17
- this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for invalid proof`);
18
- invalidTxs.push(tx);
19
- }
20
- }
21
-
22
- return [validTxs, invalidTxs];
23
- }
24
-
25
- validateTx(tx: Tx): Promise<boolean> {
26
- return this.verifier.verifyProof(tx);
27
- }
28
- }