@aztec/aztec-node 0.69.0-devnet → 0.69.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/aztec-node/server.d.ts +3 -3
- package/dest/aztec-node/server.d.ts.map +1 -1
- package/dest/aztec-node/server.js +41 -31
- package/package.json +19 -19
- package/src/aztec-node/server.ts +51 -44
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type AztecNode, type ClientProtocolCircuitVerifier, type EpochProofQuote, type GetUnencryptedLogsResponse, type InBlock, type L1ToL2MessageSource, type L2Block, type L2BlockNumber, type L2BlockSource, type L2LogsSource, type LogFilter, MerkleTreeId, NullifierMembershipWitness, type NullifierWithBlockSource, type ProverConfig, PublicDataWitness, PublicSimulationOutput, type SequencerConfig, type Service, SiblingPath, type Tx, type TxEffect, type TxHash, TxReceipt, type TxScopedL2Log, type WorldStateSynchronizer } from '@aztec/circuit-types';
|
|
1
|
+
import { type AztecNode, type ClientProtocolCircuitVerifier, type EpochProofQuote, type GetUnencryptedLogsResponse, type InBlock, type L1ToL2MessageSource, type L2Block, type L2BlockNumber, type L2BlockSource, type L2LogsSource, type LogFilter, MerkleTreeId, NullifierMembershipWitness, type NullifierWithBlockSource, type ProverConfig, PublicDataWitness, PublicSimulationOutput, type SequencerConfig, type Service, SiblingPath, type Tx, type TxEffect, type TxHash, TxReceipt, type TxScopedL2Log, type TxValidationResult, type WorldStateSynchronizer } from '@aztec/circuit-types';
|
|
2
2
|
import { type ARCHIVE_HEIGHT, type BlockHeader, type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, Fr, type GasFees, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT, type NULLIFIER_TREE_HEIGHT, type NodeInfo, type PUBLIC_DATA_TREE_HEIGHT, type PrivateLog, type ProtocolContractAddresses } from '@aztec/circuits.js';
|
|
3
3
|
import { type L1ContractAddresses } from '@aztec/ethereum';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -270,11 +270,11 @@ export declare class AztecNodeService implements AztecNode, Traceable {
|
|
|
270
270
|
* @param tx - The transaction to simulate.
|
|
271
271
|
**/
|
|
272
272
|
simulatePublicCalls(tx: Tx, enforceFeePayment?: boolean): Promise<PublicSimulationOutput>;
|
|
273
|
-
isValidTx(tx: Tx, isSimulation?: boolean): Promise<
|
|
273
|
+
isValidTx(tx: Tx, isSimulation?: boolean): Promise<TxValidationResult>;
|
|
274
274
|
setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void>;
|
|
275
275
|
getProtocolContractAddresses(): Promise<ProtocolContractAddresses>;
|
|
276
276
|
addContractClass(contractClass: ContractClassPublic): Promise<void>;
|
|
277
|
-
|
|
277
|
+
registerContractFunctionSignatures(_address: AztecAddress, signatures: string[]): Promise<void>;
|
|
278
278
|
flushTxs(): Promise<void>;
|
|
279
279
|
}
|
|
280
280
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,6BAA6B,EAClC,KAAK,eAAe,EACpB,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,YAAY,EACZ,0BAA0B,EAC1B,KAAK,wBAAwB,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@ import { __classPrivateFieldGet, __esDecorate, __runInitializers } from "tslib";
|
|
|
2
2
|
import { createArchiver } from '@aztec/archiver';
|
|
3
3
|
import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
|
|
4
4
|
import { MerkleTreeId, NullifierMembershipWitness, P2PClientType, PublicDataWitness, PublicSimulationOutput, SiblingPath, TxReceipt, TxStatus, tryStop, } from '@aztec/circuit-types';
|
|
5
|
-
import { EthAddress, Fr, INITIAL_L2_BLOCK_NUM, } from '@aztec/circuits.js';
|
|
6
|
-
import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
|
|
5
|
+
import { EthAddress, Fr, INITIAL_L2_BLOCK_NUM, REGISTERER_CONTRACT_ADDRESS, } from '@aztec/circuits.js';
|
|
6
|
+
import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/circuits.js/hash';
|
|
7
7
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
8
8
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
9
9
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -12,9 +12,9 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
12
12
|
import { DateProvider, Timer } from '@aztec/foundation/timer';
|
|
13
13
|
import { openTmpStore } from '@aztec/kv-store/lmdb';
|
|
14
14
|
import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
|
|
15
|
-
import {
|
|
15
|
+
import { createP2PClient } from '@aztec/p2p';
|
|
16
16
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
17
|
-
import { GlobalVariableBuilder, SequencerClient, createSlasherClient } from '@aztec/sequencer-client';
|
|
17
|
+
import { GlobalVariableBuilder, SequencerClient, createSlasherClient, createValidatorForAcceptingTxs, getDefaultAllowedSetupFunctions, } from '@aztec/sequencer-client';
|
|
18
18
|
import { PublicProcessorFactory } from '@aztec/simulator';
|
|
19
19
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
20
20
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
@@ -217,8 +217,23 @@ let AztecNodeService = (() => {
|
|
|
217
217
|
getChainId() {
|
|
218
218
|
return Promise.resolve(this.l1ChainId);
|
|
219
219
|
}
|
|
220
|
-
getContractClass(id) {
|
|
221
|
-
|
|
220
|
+
async getContractClass(id) {
|
|
221
|
+
const klazz = await this.contractDataSource.getContractClass(id);
|
|
222
|
+
// TODO(#10007): Remove this check. This is needed only because we're manually registering
|
|
223
|
+
// some contracts in the archiver so they are available to all nodes (see `registerCommonContracts`
|
|
224
|
+
// in `archiver/src/factory.ts`), but we still want clients to send the registration tx in order
|
|
225
|
+
// to emit the corresponding nullifier, which is now being checked. Note that this method
|
|
226
|
+
// is only called by the PXE to check if a contract is publicly registered.
|
|
227
|
+
if (klazz) {
|
|
228
|
+
const classNullifier = siloNullifier(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS), id);
|
|
229
|
+
const worldState = await __classPrivateFieldGet(this, _AztecNodeService_instances, "m", _AztecNodeService_getWorldState).call(this, 'latest');
|
|
230
|
+
const [index] = await worldState.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [classNullifier.toBuffer()]);
|
|
231
|
+
this.log.debug(`Registration nullifier ${classNullifier} for contract class ${id} found at index ${index}`);
|
|
232
|
+
if (index === undefined) {
|
|
233
|
+
return undefined;
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
return klazz;
|
|
222
237
|
}
|
|
223
238
|
getContract(address) {
|
|
224
239
|
return this.contractDataSource.getContract(address);
|
|
@@ -263,13 +278,19 @@ let AztecNodeService = (() => {
|
|
|
263
278
|
*/
|
|
264
279
|
async sendTx(tx) {
|
|
265
280
|
const timer = new Timer();
|
|
266
|
-
|
|
267
|
-
|
|
281
|
+
const txHash = tx.getTxHash().toString();
|
|
282
|
+
const valid = await this.isValidTx(tx);
|
|
283
|
+
if (valid.result !== 'valid') {
|
|
284
|
+
const reason = valid.reason.join(', ');
|
|
268
285
|
this.metrics.receivedTx(timer.ms(), false);
|
|
286
|
+
this.log.warn(`Invalid tx ${txHash}: ${reason}`, { txHash });
|
|
287
|
+
// TODO(#10967): Throw when receiving an invalid tx instead of just returning
|
|
288
|
+
// throw new Error(`Invalid tx: ${reason}`);
|
|
269
289
|
return;
|
|
270
290
|
}
|
|
271
291
|
await this.p2pClient.sendTx(tx);
|
|
272
292
|
this.metrics.receivedTx(timer.ms(), true);
|
|
293
|
+
this.log.info(`Received tx ${tx.getTxHash()}`, { txHash });
|
|
273
294
|
}
|
|
274
295
|
async getTxReceipt(txHash) {
|
|
275
296
|
let txReceipt = new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
|
|
@@ -594,26 +615,15 @@ let AztecNodeService = (() => {
|
|
|
594
615
|
async isValidTx(tx, isSimulation = false) {
|
|
595
616
|
const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
|
|
596
617
|
const db = this.worldStateSynchronizer.getCommitted();
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
];
|
|
607
|
-
if (!isSimulation) {
|
|
608
|
-
txValidators.push(new TxProofValidator(this.proofVerifier));
|
|
609
|
-
}
|
|
610
|
-
const txValidator = new AggregateTxValidator(...txValidators);
|
|
611
|
-
const [_, invalidTxs] = await txValidator.validateTxs([tx]);
|
|
612
|
-
if (invalidTxs.length > 0) {
|
|
613
|
-
this.log.warn(`Rejecting tx ${tx.getTxHash()} because of validation errors`);
|
|
614
|
-
return false;
|
|
615
|
-
}
|
|
616
|
-
return true;
|
|
618
|
+
const verifier = isSimulation ? undefined : this.proofVerifier;
|
|
619
|
+
const validator = createValidatorForAcceptingTxs(db, this.contractDataSource, verifier, {
|
|
620
|
+
blockNumber,
|
|
621
|
+
l1ChainId: this.l1ChainId,
|
|
622
|
+
enforceFees: !!this.config.enforceFees,
|
|
623
|
+
setupAllowList: this.config.allowedInSetup ?? getDefaultAllowedSetupFunctions(),
|
|
624
|
+
gasFees: await this.getCurrentBaseFees(),
|
|
625
|
+
});
|
|
626
|
+
return await validator.validateTx(tx);
|
|
617
627
|
}
|
|
618
628
|
async setConfig(config) {
|
|
619
629
|
const newConfig = { ...this.config, ...config };
|
|
@@ -636,8 +646,8 @@ let AztecNodeService = (() => {
|
|
|
636
646
|
this.log.info(`Adding contract class via API ${contractClass.id}`);
|
|
637
647
|
return this.contractDataSource.addContractClass(contractClass);
|
|
638
648
|
}
|
|
639
|
-
|
|
640
|
-
return this.contractDataSource.
|
|
649
|
+
registerContractFunctionSignatures(_address, signatures) {
|
|
650
|
+
return this.contractDataSource.registerContractFunctionSignatures(_address, signatures);
|
|
641
651
|
}
|
|
642
652
|
flushTxs() {
|
|
643
653
|
if (!this.sequencer) {
|
|
@@ -699,4 +709,4 @@ let AztecNodeService = (() => {
|
|
|
699
709
|
_a;
|
|
700
710
|
})();
|
|
701
711
|
export { AztecNodeService };
|
|
702
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
712
|
+
//# 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.69.
|
|
3
|
+
"version": "0.69.1",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -62,24 +62,24 @@
|
|
|
62
62
|
]
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@aztec/archiver": "0.69.
|
|
66
|
-
"@aztec/bb-prover": "0.69.
|
|
67
|
-
"@aztec/circuit-types": "0.69.
|
|
68
|
-
"@aztec/circuits.js": "0.69.
|
|
69
|
-
"@aztec/epoch-cache": "0.69.
|
|
70
|
-
"@aztec/ethereum": "0.69.
|
|
71
|
-
"@aztec/foundation": "0.69.
|
|
72
|
-
"@aztec/kv-store": "0.69.
|
|
73
|
-
"@aztec/merkle-tree": "0.69.
|
|
74
|
-
"@aztec/p2p": "0.69.
|
|
75
|
-
"@aztec/protocol-contracts": "0.69.
|
|
76
|
-
"@aztec/prover-client": "0.69.
|
|
77
|
-
"@aztec/sequencer-client": "0.69.
|
|
78
|
-
"@aztec/simulator": "0.69.
|
|
79
|
-
"@aztec/telemetry-client": "0.69.
|
|
80
|
-
"@aztec/types": "0.69.
|
|
81
|
-
"@aztec/validator-client": "0.69.
|
|
82
|
-
"@aztec/world-state": "0.69.
|
|
65
|
+
"@aztec/archiver": "0.69.1",
|
|
66
|
+
"@aztec/bb-prover": "0.69.1",
|
|
67
|
+
"@aztec/circuit-types": "0.69.1",
|
|
68
|
+
"@aztec/circuits.js": "0.69.1",
|
|
69
|
+
"@aztec/epoch-cache": "0.69.1",
|
|
70
|
+
"@aztec/ethereum": "0.69.1",
|
|
71
|
+
"@aztec/foundation": "0.69.1",
|
|
72
|
+
"@aztec/kv-store": "0.69.1",
|
|
73
|
+
"@aztec/merkle-tree": "0.69.1",
|
|
74
|
+
"@aztec/p2p": "0.69.1",
|
|
75
|
+
"@aztec/protocol-contracts": "0.69.1",
|
|
76
|
+
"@aztec/prover-client": "0.69.1",
|
|
77
|
+
"@aztec/sequencer-client": "0.69.1",
|
|
78
|
+
"@aztec/simulator": "0.69.1",
|
|
79
|
+
"@aztec/telemetry-client": "0.69.1",
|
|
80
|
+
"@aztec/types": "0.69.1",
|
|
81
|
+
"@aztec/validator-client": "0.69.1",
|
|
82
|
+
"@aztec/world-state": "0.69.1",
|
|
83
83
|
"koa": "^2.14.2",
|
|
84
84
|
"koa-router": "^12.0.0",
|
|
85
85
|
"tslib": "^2.4.0"
|
package/src/aztec-node/server.ts
CHANGED
|
@@ -16,7 +16,6 @@ import {
|
|
|
16
16
|
NullifierMembershipWitness,
|
|
17
17
|
type NullifierWithBlockSource,
|
|
18
18
|
P2PClientType,
|
|
19
|
-
type ProcessedTx,
|
|
20
19
|
type ProverConfig,
|
|
21
20
|
PublicDataWitness,
|
|
22
21
|
PublicSimulationOutput,
|
|
@@ -29,7 +28,7 @@ import {
|
|
|
29
28
|
TxReceipt,
|
|
30
29
|
type TxScopedL2Log,
|
|
31
30
|
TxStatus,
|
|
32
|
-
type
|
|
31
|
+
type TxValidationResult,
|
|
33
32
|
type WorldStateSynchronizer,
|
|
34
33
|
tryStop,
|
|
35
34
|
} from '@aztec/circuit-types';
|
|
@@ -52,8 +51,9 @@ import {
|
|
|
52
51
|
type PrivateLog,
|
|
53
52
|
type ProtocolContractAddresses,
|
|
54
53
|
type PublicDataTreeLeafPreimage,
|
|
54
|
+
REGISTERER_CONTRACT_ADDRESS,
|
|
55
55
|
} from '@aztec/circuits.js';
|
|
56
|
-
import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
|
|
56
|
+
import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/circuits.js/hash';
|
|
57
57
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
58
58
|
import { type L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
|
|
59
59
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -63,17 +63,16 @@ import { DateProvider, Timer } from '@aztec/foundation/timer';
|
|
|
63
63
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
64
64
|
import { openTmpStore } from '@aztec/kv-store/lmdb';
|
|
65
65
|
import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
|
|
66
|
-
import {
|
|
67
|
-
AggregateTxValidator,
|
|
68
|
-
DataTxValidator,
|
|
69
|
-
DoubleSpendTxValidator,
|
|
70
|
-
MetadataTxValidator,
|
|
71
|
-
type P2P,
|
|
72
|
-
TxProofValidator,
|
|
73
|
-
createP2PClient,
|
|
74
|
-
} from '@aztec/p2p';
|
|
66
|
+
import { type P2P, createP2PClient } from '@aztec/p2p';
|
|
75
67
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
76
|
-
import {
|
|
68
|
+
import {
|
|
69
|
+
GlobalVariableBuilder,
|
|
70
|
+
type L1Publisher,
|
|
71
|
+
SequencerClient,
|
|
72
|
+
createSlasherClient,
|
|
73
|
+
createValidatorForAcceptingTxs,
|
|
74
|
+
getDefaultAllowedSetupFunctions,
|
|
75
|
+
} from '@aztec/sequencer-client';
|
|
77
76
|
import { PublicProcessorFactory } from '@aztec/simulator';
|
|
78
77
|
import { Attributes, type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
|
|
79
78
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
@@ -348,8 +347,25 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
348
347
|
return Promise.resolve(this.l1ChainId);
|
|
349
348
|
}
|
|
350
349
|
|
|
351
|
-
public getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
|
|
352
|
-
|
|
350
|
+
public async getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
|
|
351
|
+
const klazz = await this.contractDataSource.getContractClass(id);
|
|
352
|
+
|
|
353
|
+
// TODO(#10007): Remove this check. This is needed only because we're manually registering
|
|
354
|
+
// some contracts in the archiver so they are available to all nodes (see `registerCommonContracts`
|
|
355
|
+
// in `archiver/src/factory.ts`), but we still want clients to send the registration tx in order
|
|
356
|
+
// to emit the corresponding nullifier, which is now being checked. Note that this method
|
|
357
|
+
// is only called by the PXE to check if a contract is publicly registered.
|
|
358
|
+
if (klazz) {
|
|
359
|
+
const classNullifier = siloNullifier(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS), id);
|
|
360
|
+
const worldState = await this.#getWorldState('latest');
|
|
361
|
+
const [index] = await worldState.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [classNullifier.toBuffer()]);
|
|
362
|
+
this.log.debug(`Registration nullifier ${classNullifier} for contract class ${id} found at index ${index}`);
|
|
363
|
+
if (index === undefined) {
|
|
364
|
+
return undefined;
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
return klazz;
|
|
353
369
|
}
|
|
354
370
|
|
|
355
371
|
public getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
|
|
@@ -400,15 +416,21 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
400
416
|
*/
|
|
401
417
|
public async sendTx(tx: Tx) {
|
|
402
418
|
const timer = new Timer();
|
|
403
|
-
|
|
419
|
+
const txHash = tx.getTxHash().toString();
|
|
404
420
|
|
|
405
|
-
|
|
421
|
+
const valid = await this.isValidTx(tx);
|
|
422
|
+
if (valid.result !== 'valid') {
|
|
423
|
+
const reason = valid.reason.join(', ');
|
|
406
424
|
this.metrics.receivedTx(timer.ms(), false);
|
|
425
|
+
this.log.warn(`Invalid tx ${txHash}: ${reason}`, { txHash });
|
|
426
|
+
// TODO(#10967): Throw when receiving an invalid tx instead of just returning
|
|
427
|
+
// throw new Error(`Invalid tx: ${reason}`);
|
|
407
428
|
return;
|
|
408
429
|
}
|
|
409
430
|
|
|
410
431
|
await this.p2pClient!.sendTx(tx);
|
|
411
432
|
this.metrics.receivedTx(timer.ms(), true);
|
|
433
|
+
this.log.info(`Received tx ${tx.getTxHash()}`, { txHash });
|
|
412
434
|
}
|
|
413
435
|
|
|
414
436
|
public async getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
|
|
@@ -860,34 +882,19 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
860
882
|
}
|
|
861
883
|
}
|
|
862
884
|
|
|
863
|
-
public async isValidTx(tx: Tx, isSimulation: boolean = false): Promise<
|
|
885
|
+
public async isValidTx(tx: Tx, isSimulation: boolean = false): Promise<TxValidationResult> {
|
|
864
886
|
const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
|
|
865
887
|
const db = this.worldStateSynchronizer.getCommitted();
|
|
866
|
-
|
|
867
|
-
|
|
868
|
-
|
|
869
|
-
|
|
870
|
-
|
|
871
|
-
|
|
872
|
-
|
|
873
|
-
|
|
874
|
-
}),
|
|
875
|
-
];
|
|
876
|
-
|
|
877
|
-
if (!isSimulation) {
|
|
878
|
-
txValidators.push(new TxProofValidator(this.proofVerifier));
|
|
879
|
-
}
|
|
880
|
-
|
|
881
|
-
const txValidator = new AggregateTxValidator(...txValidators);
|
|
882
|
-
|
|
883
|
-
const [_, invalidTxs] = await txValidator.validateTxs([tx]);
|
|
884
|
-
if (invalidTxs.length > 0) {
|
|
885
|
-
this.log.warn(`Rejecting tx ${tx.getTxHash()} because of validation errors`);
|
|
886
|
-
|
|
887
|
-
return false;
|
|
888
|
-
}
|
|
888
|
+
const verifier = isSimulation ? undefined : this.proofVerifier;
|
|
889
|
+
const validator = createValidatorForAcceptingTxs(db, this.contractDataSource, verifier, {
|
|
890
|
+
blockNumber,
|
|
891
|
+
l1ChainId: this.l1ChainId,
|
|
892
|
+
enforceFees: !!this.config.enforceFees,
|
|
893
|
+
setupAllowList: this.config.allowedInSetup ?? getDefaultAllowedSetupFunctions(),
|
|
894
|
+
gasFees: await this.getCurrentBaseFees(),
|
|
895
|
+
});
|
|
889
896
|
|
|
890
|
-
return
|
|
897
|
+
return await validator.validateTx(tx);
|
|
891
898
|
}
|
|
892
899
|
|
|
893
900
|
public async setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void> {
|
|
@@ -916,8 +923,8 @@ export class AztecNodeService implements AztecNode, Traceable {
|
|
|
916
923
|
return this.contractDataSource.addContractClass(contractClass);
|
|
917
924
|
}
|
|
918
925
|
|
|
919
|
-
public
|
|
920
|
-
return this.contractDataSource.
|
|
926
|
+
public registerContractFunctionSignatures(_address: AztecAddress, signatures: string[]): Promise<void> {
|
|
927
|
+
return this.contractDataSource.registerContractFunctionSignatures(_address, signatures);
|
|
921
928
|
}
|
|
922
929
|
|
|
923
930
|
public flushTxs(): Promise<void> {
|