@aztec/txe 0.70.0 → 0.71.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.
@@ -10,7 +10,7 @@ import { protocolContractNames } from '@aztec/protocol-contracts';
10
10
  import { getCanonicalProtocolContract } from '@aztec/protocol-contracts/bundle';
11
11
  import { enrichPublicSimulationError } from '@aztec/pxe';
12
12
  import { HashedValuesCache } from '@aztec/simulator/server';
13
- import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
13
+ import { getTelemetryClient } from '@aztec/telemetry-client';
14
14
  import { MerkleTrees } from '@aztec/world-state';
15
15
  import { TXE } from '../oracle/txe_oracle.js';
16
16
  import { addressFromSingle, fromArray, fromSingle, toArray, toForeignCallResult, toSingle, } from '../util/encoding.js';
@@ -23,7 +23,7 @@ export class TXEService {
23
23
  }
24
24
  static async init(logger) {
25
25
  const store = openTmpStore(true);
26
- const trees = await MerkleTrees.new(store, new NoopTelemetryClient(), logger);
26
+ const trees = await MerkleTrees.new(store, getTelemetryClient(), logger);
27
27
  const executionCache = new HashedValuesCache();
28
28
  const keyStore = new KeyStore(store);
29
29
  const txeDatabase = new TXEDatabase(store);
@@ -373,36 +373,31 @@ export class TXEService {
373
373
  await this.typedOracle.syncNotes();
374
374
  return toForeignCallResult([]);
375
375
  }
376
- async store(contract, key, values) {
377
- const processedContract = AztecAddress.fromField(fromSingle(contract));
378
- const processedKey = fromSingle(key);
379
- const processedValues = fromArray(values);
380
- await this.typedOracle.store(processedContract, processedKey, processedValues);
376
+ async dbStore(contractAddress, slot, values) {
377
+ await this.typedOracle.dbStore(AztecAddress.fromField(fromSingle(contractAddress)), fromSingle(slot), fromArray(values));
381
378
  return toForeignCallResult([]);
382
379
  }
383
- /**
384
- * Load data from pxe db.
385
- * @param contract - The contract address.
386
- * @param key - The key to load.
387
- * @param tSize - The size of the serialized object to return.
388
- * @returns The data found flag and the serialized object concatenated in one array.
389
- */
390
- async load(contract, key, tSize) {
391
- const processedContract = AztecAddress.fromField(fromSingle(contract));
392
- const processedKey = fromSingle(key);
393
- const values = await this.typedOracle.load(processedContract, processedKey);
380
+ async dbLoad(contractAddress, slot, tSize) {
381
+ const values = await this.typedOracle.dbLoad(AztecAddress.fromField(fromSingle(contractAddress)), fromSingle(slot));
394
382
  // We are going to return a Noir Option struct to represent the possibility of null values. Options are a struct
395
383
  // with two fields: `some` (a boolean) and `value` (a field array in this case).
396
384
  if (values === null) {
397
385
  // No data was found so we set `some` to 0 and pad `value` with zeros get the correct return size.
398
- const processedTSize = fromSingle(tSize).toNumber();
399
- return toForeignCallResult([toSingle(new Fr(0)), toArray(Array(processedTSize).fill(new Fr(0)))]);
386
+ return toForeignCallResult([toSingle(new Fr(0)), toArray(Array(fromSingle(tSize).toNumber()).fill(new Fr(0)))]);
400
387
  }
401
388
  else {
402
389
  // Data was found so we set `some` to 1 and return it along with `value`.
403
390
  return toForeignCallResult([toSingle(new Fr(1)), toArray(values)]);
404
391
  }
405
392
  }
393
+ async dbDelete(contractAddress, slot) {
394
+ await this.typedOracle.dbDelete(AztecAddress.fromField(fromSingle(contractAddress)), fromSingle(slot));
395
+ return toForeignCallResult([]);
396
+ }
397
+ async dbCopy(contractAddress, srcSlot, dstSlot, numEntries) {
398
+ await this.typedOracle.dbCopy(AztecAddress.fromField(fromSingle(contractAddress)), fromSingle(srcSlot), fromSingle(dstSlot), fromSingle(numEntries).toNumber());
399
+ return toForeignCallResult([]);
400
+ }
406
401
  // AVM opcodes
407
402
  avmOpcodeEmitUnencryptedLog(_message) {
408
403
  // TODO(#8811): Implement
@@ -516,4 +511,4 @@ export class TXEService {
516
511
  return toForeignCallResult([toSingle(new Fr(result.revertCode.isOK()))]);
517
512
  }
518
513
  }
519
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_service.js","sourceRoot":"","sources":["../../src/txe_service/txe_service.ts"],"names":[],"mappings":"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"}
514
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_service.js","sourceRoot":"","sources":["../../src/txe_service/txe_service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/txe",
3
- "version": "0.70.0",
3
+ "version": "0.71.0",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "bin": "./dest/bin/index.js",
@@ -59,19 +59,19 @@
59
59
  ]
60
60
  },
61
61
  "dependencies": {
62
- "@aztec/accounts": "0.70.0",
63
- "@aztec/aztec.js": "0.70.0",
64
- "@aztec/circuit-types": "0.70.0",
65
- "@aztec/circuits.js": "0.70.0",
66
- "@aztec/foundation": "0.70.0",
67
- "@aztec/key-store": "0.70.0",
68
- "@aztec/kv-store": "0.70.0",
69
- "@aztec/protocol-contracts": "0.70.0",
70
- "@aztec/pxe": "0.70.0",
71
- "@aztec/simulator": "0.70.0",
72
- "@aztec/telemetry-client": "0.70.0",
73
- "@aztec/types": "0.70.0",
74
- "@aztec/world-state": "0.70.0",
62
+ "@aztec/accounts": "0.71.0",
63
+ "@aztec/aztec.js": "0.71.0",
64
+ "@aztec/circuit-types": "0.71.0",
65
+ "@aztec/circuits.js": "0.71.0",
66
+ "@aztec/foundation": "0.71.0",
67
+ "@aztec/key-store": "0.71.0",
68
+ "@aztec/kv-store": "0.71.0",
69
+ "@aztec/protocol-contracts": "0.71.0",
70
+ "@aztec/pxe": "0.71.0",
71
+ "@aztec/simulator": "0.71.0",
72
+ "@aztec/telemetry-client": "0.71.0",
73
+ "@aztec/types": "0.71.0",
74
+ "@aztec/world-state": "0.71.0",
75
75
  "zod": "^3.23.8"
76
76
  },
77
77
  "devDependencies": {
@@ -5,6 +5,7 @@ import {
5
5
  type GetUnencryptedLogsResponse,
6
6
  type InBlock,
7
7
  type L2Block,
8
+ L2BlockHash,
8
9
  type L2BlockNumber,
9
10
  type L2Tips,
10
11
  type LogFilter,
@@ -18,7 +19,7 @@ import {
18
19
  type Tx,
19
20
  type TxEffect,
20
21
  TxHash,
21
- type TxReceipt,
22
+ TxReceipt,
22
23
  TxScopedL2Log,
23
24
  type TxValidationResult,
24
25
  type UnencryptedL2Log,
@@ -39,27 +40,32 @@ import {
39
40
  type ProtocolContractAddresses,
40
41
  } from '@aztec/circuits.js';
41
42
  import { type L1ContractAddresses } from '@aztec/ethereum';
43
+ import { poseidon2Hash } from '@aztec/foundation/crypto';
42
44
  import { Fr } from '@aztec/foundation/fields';
45
+ import { MerkleTreeSnapshotOperationsFacade, type MerkleTrees } from '@aztec/world-state';
43
46
 
44
47
  export class TXENode implements AztecNode {
45
48
  #logsByTags = new Map<string, TxScopedL2Log[]>();
46
- #txEffectsByTxHash = new Map<string, InBlock<TxEffect> | undefined>();
49
+ #txEffectsByTxHash = new Map<string, InBlock<TxEffect>>();
50
+ #txReceiptsByTxHash = new Map<string, TxReceipt>();
47
51
  #blockNumberToNullifiers = new Map<number, Fr[]>();
48
52
  #noteIndex = 0;
49
53
 
50
- #blockNumber: number;
51
54
  #logger = createLogger('aztec:txe_node');
52
55
 
53
- constructor(blockNumber: number) {
54
- this.#blockNumber = blockNumber;
55
- }
56
+ constructor(
57
+ private blockNumber: number,
58
+ private version: number,
59
+ private chainId: number,
60
+ private trees: MerkleTrees,
61
+ ) {}
56
62
 
57
63
  /**
58
64
  * Fetches the current block number.
59
65
  * @returns The block number.
60
66
  */
61
67
  getBlockNumber(): Promise<number> {
62
- return Promise.resolve(this.#blockNumber);
68
+ return Promise.resolve(this.blockNumber);
63
69
  }
64
70
 
65
71
  /**
@@ -67,7 +73,7 @@ export class TXENode implements AztecNode {
67
73
  * @param - The block number to set.
68
74
  */
69
75
  setBlockNumber(blockNumber: number) {
70
- this.#blockNumber = blockNumber;
76
+ this.blockNumber = blockNumber;
71
77
  }
72
78
 
73
79
  /**
@@ -76,23 +82,42 @@ export class TXENode implements AztecNode {
76
82
  * @returns The requested tx effect.
77
83
  */
78
84
  getTxEffect(txHash: TxHash): Promise<InBlock<TxEffect> | undefined> {
79
- const txEffect = this.#txEffectsByTxHash.get(new Fr(txHash.toBuffer()).toString());
85
+ const txEffect = this.#txEffectsByTxHash.get(txHash.toString());
80
86
 
81
87
  return Promise.resolve(txEffect);
82
88
  }
83
89
 
84
90
  /**
85
- * Sets a tx effect for a given block number.
91
+ * Sets a tx effect and receipt for a given block number.
86
92
  * @param blockNumber - The block number that this tx effect resides.
87
93
  * @param txHash - The transaction hash of the transaction.
88
94
  * @param effect - The tx effect to set.
89
95
  */
90
96
  setTxEffect(blockNumber: number, txHash: TxHash, effect: TxEffect) {
91
- this.#txEffectsByTxHash.set(new Fr(txHash.toBuffer()).toString(), {
92
- l2BlockHash: blockNumber.toString(),
97
+ // We are not creating real blocks on which membership proofs can be constructed - we instead define its hash as
98
+ // simply the hash of the block number.
99
+ const blockHash = poseidon2Hash([blockNumber]);
100
+
101
+ this.#txEffectsByTxHash.set(txHash.toString(), {
102
+ l2BlockHash: blockHash.toString(),
93
103
  l2BlockNumber: blockNumber,
94
104
  data: effect,
95
105
  });
106
+
107
+ // We also set the receipt since we want to be able to serve `getTxReceipt` - we don't care about most values here,
108
+ // but we do need to be able to retrieve the block number of a given txHash.
109
+ this.#txReceiptsByTxHash.set(
110
+ txHash.toString(),
111
+ new TxReceipt(
112
+ txHash,
113
+ TxReceipt.statusFromRevertCode(effect.revertCode),
114
+ '',
115
+ undefined,
116
+ new L2BlockHash(blockHash.toBuffer()),
117
+ blockNumber,
118
+ undefined,
119
+ ),
120
+ );
96
121
  }
97
122
 
98
123
  /**
@@ -234,12 +259,28 @@ export class TXENode implements AztecNode {
234
259
  * @param leafValue - The values to search for
235
260
  * @returns The indexes of the given leaves in the given tree or undefined if not found.
236
261
  */
237
- findLeavesIndexes(
238
- _blockNumber: L2BlockNumber,
239
- _treeId: MerkleTreeId,
240
- _leafValues: Fr[],
262
+ async findLeavesIndexes(
263
+ blockNumber: L2BlockNumber,
264
+ treeId: MerkleTreeId,
265
+ leafValues: Fr[],
241
266
  ): Promise<(bigint | undefined)[]> {
242
- throw new Error('TXE Node method findLeavesIndexes not implemented');
267
+ // Temporary workaround to be able to respond this query: the trees are currently stored in the TXE oracle, but we
268
+ // hold a reference to them.
269
+ // We should likely migrate this so that the trees are owned by the node.
270
+
271
+ if (blockNumber == 'latest') {
272
+ blockNumber = await this.getBlockNumber();
273
+ }
274
+
275
+ const db =
276
+ blockNumber === (await this.getBlockNumber())
277
+ ? await this.trees.getLatest()
278
+ : new MerkleTreeSnapshotOperationsFacade(this.trees, blockNumber);
279
+
280
+ return await db.findLeafIndices(
281
+ treeId,
282
+ leafValues.map(x => x.toBuffer()),
283
+ );
243
284
  }
244
285
 
245
286
  /**
@@ -420,7 +461,7 @@ export class TXENode implements AztecNode {
420
461
  * @returns The rollup version.
421
462
  */
422
463
  getVersion(): Promise<number> {
423
- throw new Error('TXE Node method getVersion not implemented');
464
+ return Promise.resolve(this.version);
424
465
  }
425
466
 
426
467
  /**
@@ -428,7 +469,7 @@ export class TXENode implements AztecNode {
428
469
  * @returns The chain id.
429
470
  */
430
471
  getChainId(): Promise<number> {
431
- throw new Error('TXE Node method getChainId not implemented');
472
+ return Promise.resolve(this.chainId);
432
473
  }
433
474
 
434
475
  /**
@@ -490,8 +531,13 @@ export class TXENode implements AztecNode {
490
531
  * @param txHash - The transaction hash.
491
532
  * @returns A receipt of the transaction.
492
533
  */
493
- getTxReceipt(_txHash: TxHash): Promise<TxReceipt> {
494
- throw new Error('TXE Node method getTxReceipt not implemented');
534
+ getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
535
+ const txEffect = this.#txReceiptsByTxHash.get(txHash.toString());
536
+ if (!txEffect) {
537
+ throw new Error('Unknown txHash');
538
+ }
539
+
540
+ return Promise.resolve(txEffect);
495
541
  }
496
542
 
497
543
  /**
@@ -84,7 +84,6 @@ import {
84
84
  createSimulationError,
85
85
  resolveAssertionMessageFromError,
86
86
  } from '@aztec/simulator/server';
87
- import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
88
87
  import { MerkleTreeSnapshotOperationsFacade, type MerkleTrees } from '@aztec/world-state';
89
88
 
90
89
  import { TXENode } from '../node/txe_node.js';
@@ -105,9 +104,6 @@ export class TXE implements TypedOracle {
105
104
  private contractDataOracle: ContractDataOracle;
106
105
  private simulatorOracle: SimulatorOracle;
107
106
 
108
- private version: Fr = Fr.ONE;
109
- private chainId: Fr = Fr.ONE;
110
-
111
107
  private uniqueNoteHashesFromPublic: Fr[] = [];
112
108
  private siloedNullifiersFromPublic: Fr[] = [];
113
109
  private privateLogs: PrivateLog[] = [];
@@ -115,7 +111,10 @@ export class TXE implements TypedOracle {
115
111
 
116
112
  private committedBlocks = new Set<number>();
117
113
 
118
- private node = new TXENode(this.blockNumber);
114
+ private VERSION = 1;
115
+ private CHAIN_ID = 1;
116
+
117
+ private node: TXENode;
119
118
 
120
119
  private simulationProvider = new WASMSimulator();
121
120
 
@@ -133,6 +132,9 @@ export class TXE implements TypedOracle {
133
132
  this.noteCache = new ExecutionNoteCache(this.getTxRequestHash());
134
133
  this.contractDataOracle = new ContractDataOracle(txeDatabase);
135
134
  this.contractAddress = AztecAddress.random();
135
+
136
+ this.node = new TXENode(this.blockNumber, this.VERSION, this.CHAIN_ID, this.trees);
137
+
136
138
  // Default msg_sender (for entrypoints) is now Fr.max_value rather than 0 addr (see #7190 & #7404)
137
139
  this.msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE);
138
140
  this.simulatorOracle = new SimulatorOracle(
@@ -156,12 +158,12 @@ export class TXE implements TypedOracle {
156
158
  return db;
157
159
  }
158
160
 
159
- getChainId() {
160
- return Promise.resolve(this.chainId);
161
+ getChainId(): Promise<Fr> {
162
+ return Promise.resolve(this.node.getChainId().then(id => new Fr(id)));
161
163
  }
162
164
 
163
- getVersion() {
164
- return Promise.resolve(this.version);
165
+ getVersion(): Promise<Fr> {
166
+ return Promise.resolve(this.node.getVersion().then(v => new Fr(v)));
165
167
  }
166
168
 
167
169
  getMsgSender() {
@@ -232,8 +234,8 @@ export class TXE implements TypedOracle {
232
234
 
233
235
  const stateReference = await db.getStateReference();
234
236
  const inputs = PrivateContextInputs.empty();
235
- inputs.txContext.chainId = this.chainId;
236
- inputs.txContext.version = this.version;
237
+ inputs.txContext.chainId = new Fr(await this.node.getChainId());
238
+ inputs.txContext.version = new Fr(await this.node.getVersion());
237
239
  inputs.historicalHeader.globalVariables.blockNumber = new Fr(blockNumber);
238
240
  inputs.historicalHeader.state = stateReference;
239
241
  inputs.historicalHeader.lastArchive.root = Fr.fromBuffer(
@@ -406,11 +408,11 @@ export class TXE implements TypedOracle {
406
408
  return [new Fr(index), ...siblingPath.toFields()];
407
409
  }
408
410
 
409
- async getSiblingPath(blockNumber: number, treeId: MerkleTreeId, leafIndex: Fr) {
410
- const committedDb = new MerkleTreeSnapshotOperationsFacade(this.trees, blockNumber);
411
- const result = await committedDb.getSiblingPath(treeId, leafIndex.toBigInt());
412
- return result.toFields();
413
- }
411
+ // async getSiblingPath(blockNumber: number, treeId: MerkleTreeId, leafIndex: Fr) {
412
+ // const committedDb = new MerkleTreeSnapshotOperationsFacade(this.trees, blockNumber);
413
+ // const result = await committedDb.getSiblingPath(treeId, leafIndex.toBigInt());
414
+ // return result.toFields();
415
+ // }
414
416
 
415
417
  async getNullifierMembershipWitness(
416
418
  blockNumber: number,
@@ -810,8 +812,8 @@ export class TXE implements TypedOracle {
810
812
  const worldStateDb = new TXEWorldStateDB(db, new TXEPublicContractDataSource(this));
811
813
 
812
814
  const globalVariables = GlobalVariables.empty();
813
- globalVariables.chainId = this.chainId;
814
- globalVariables.version = this.version;
815
+ globalVariables.chainId = new Fr(await this.node.getChainId());
816
+ globalVariables.version = new Fr(await this.node.getVersion());
815
817
  globalVariables.blockNumber = new Fr(this.blockNumber);
816
818
  globalVariables.gasFees = new GasFees(1, 1);
817
819
 
@@ -830,7 +832,6 @@ export class TXE implements TypedOracle {
830
832
  const simulator = new PublicTxSimulator(
831
833
  db,
832
834
  new TXEWorldStateDB(db, new TXEPublicContractDataSource(this)),
833
- new NoopTelemetryClient(),
834
835
  globalVariables,
835
836
  );
836
837
 
@@ -974,6 +975,19 @@ export class TXE implements TypedOracle {
974
975
  return Promise.resolve();
975
976
  }
976
977
 
978
+ deliverNote(
979
+ _contractAddress: AztecAddress,
980
+ _storageSlot: Fr,
981
+ _nonce: Fr,
982
+ _content: Fr[],
983
+ _noteHash: Fr,
984
+ _nullifier: Fr,
985
+ _txHash: Fr,
986
+ _recipient: AztecAddress,
987
+ ): Promise<void> {
988
+ throw new Error('deliverNote');
989
+ }
990
+
977
991
  // AVM oracles
978
992
 
979
993
  async avmOpcodeCall(targetContractAddress: AztecAddress, args: Fr[], isStaticCall: boolean): Promise<PublicTxResult> {
@@ -1058,36 +1072,35 @@ export class TXE implements TypedOracle {
1058
1072
  return preimage.value;
1059
1073
  }
1060
1074
 
1061
- /**
1062
- * Used by contracts during execution to store arbitrary data in the local PXE database. The data is siloed/scoped
1063
- * to a specific `contract`.
1064
- * @param contract - The contract address to store the data under.
1065
- * @param key - A field element representing the key to store the data under.
1066
- * @param values - An array of field elements representing the data to store.
1067
- */
1068
- store(contract: AztecAddress, key: Fr, values: Fr[]): Promise<void> {
1069
- if (!contract.equals(this.contractAddress)) {
1070
- // TODO(#10727): instead of this check check that this.contractAddress is allowed to process notes for contract
1071
- throw new Error(
1072
- `Contract address ${contract} does not match the oracle's contract address ${this.contractAddress}`,
1073
- );
1075
+ dbStore(contractAddress: AztecAddress, slot: Fr, values: Fr[]): Promise<void> {
1076
+ if (!contractAddress.equals(this.contractAddress)) {
1077
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
1078
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
1074
1079
  }
1075
- return this.txeDatabase.store(this.contractAddress, key, values);
1076
- }
1077
-
1078
- /**
1079
- * Used by contracts during execution to load arbitrary data from the local PXE database. The data is siloed/scoped
1080
- * to a specific `contract`.
1081
- * @param contract - The contract address to load the data from.
1082
- * @param key - A field element representing the key under which to load the data..
1083
- * @returns An array of field elements representing the stored data or `null` if no data is stored under the key.
1084
- */
1085
- load(contract: AztecAddress, key: Fr): Promise<Fr[] | null> {
1086
- if (!contract.equals(this.contractAddress)) {
1087
- // TODO(#10727): instead of this check check that this.contractAddress is allowed to process notes for contract
1088
- this.debug(`Data not found for contract ${contract.toString()} and key ${key.toString()}`);
1089
- return Promise.resolve(null);
1080
+ return this.txeDatabase.dbStore(this.contractAddress, slot, values);
1081
+ }
1082
+
1083
+ dbLoad(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null> {
1084
+ if (!contractAddress.equals(this.contractAddress)) {
1085
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
1086
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
1087
+ }
1088
+ return this.txeDatabase.dbLoad(this.contractAddress, slot);
1089
+ }
1090
+
1091
+ dbDelete(contractAddress: AztecAddress, slot: Fr): Promise<void> {
1092
+ if (!contractAddress.equals(this.contractAddress)) {
1093
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
1094
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
1095
+ }
1096
+ return this.txeDatabase.dbDelete(this.contractAddress, slot);
1097
+ }
1098
+
1099
+ dbCopy(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void> {
1100
+ if (!contractAddress.equals(this.contractAddress)) {
1101
+ // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
1102
+ throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
1090
1103
  }
1091
- return this.txeDatabase.load(this.contractAddress, key);
1104
+ return this.txeDatabase.dbCopy(this.contractAddress, srcSlot, dstSlot, numEntries);
1092
1105
  }
1093
1106
  }