@aztec/txe 0.56.0 → 0.58.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.
@@ -1,11 +1,12 @@
1
1
  import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
2
2
  import { L2Block, MerkleTreeId, PublicDataWrite } from '@aztec/circuit-types';
3
- import { Fr, FunctionSelector, Header, KeyValidationRequest, PUBLIC_DATA_SUBTREE_HEIGHT, Point, PublicDataTreeLeaf, computePartialAddress, getContractInstanceFromDeployParams, } from '@aztec/circuits.js';
3
+ import { Fr, FunctionSelector, Header, PUBLIC_DATA_SUBTREE_HEIGHT, PublicDataTreeLeaf, PublicKeys, computePartialAddress, getContractInstanceFromDeployParams, } from '@aztec/circuits.js';
4
4
  import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
5
5
  import { NoteSelector } from '@aztec/foundation/abi';
6
6
  import { AztecAddress } from '@aztec/foundation/aztec-address';
7
7
  import { KeyStore } from '@aztec/key-store';
8
8
  import { openTmpStore } from '@aztec/kv-store/utils';
9
+ import { getCanonicalProtocolContract, protocolContractNames } from '@aztec/protocol-contracts';
9
10
  import { ExecutionNoteCache, PackedValuesCache } from '@aztec/simulator';
10
11
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
11
12
  import { MerkleTrees } from '@aztec/world-state';
@@ -26,6 +27,12 @@ export class TXEService {
26
27
  const noteCache = new ExecutionNoteCache(txHash);
27
28
  const keyStore = new KeyStore(store);
28
29
  const txeDatabase = new TXEDatabase(store);
30
+ // Register protocol contracts.
31
+ for (const name of protocolContractNames) {
32
+ const { contractClass, instance, artifact } = getCanonicalProtocolContract(name);
33
+ await txeDatabase.addContractArtifact(contractClass.id, artifact);
34
+ await txeDatabase.addContractInstance(instance);
35
+ }
29
36
  logger.debug(`TXE service initialized`);
30
37
  const txe = new TXE(logger, trees, packedValuesCache, noteCache, keyStore, txeDatabase);
31
38
  const service = new TXEService(logger, txe);
@@ -76,7 +83,8 @@ export class TXEService {
76
83
  constructorArgs: decodedArgs,
77
84
  skipArgsDecoding: true,
78
85
  salt: Fr.ONE,
79
- publicKeysHash: publicKeysHashFr,
86
+ // TODO: Modify this to allow for passing public keys.
87
+ publicKeys: PublicKeys.empty(),
80
88
  constructorArtifact: initializerStr ? initializerStr : undefined,
81
89
  deployer: AztecAddress.ZERO,
82
90
  });
@@ -89,7 +97,7 @@ export class TXEService {
89
97
  instance.deployer,
90
98
  instance.contractClassId,
91
99
  instance.initializationHash,
92
- instance.publicKeysHash,
100
+ ...instance.publicKeys.toFields(),
93
101
  ]),
94
102
  ]);
95
103
  }
@@ -98,7 +106,7 @@ export class TXEService {
98
106
  const startStorageSlotFr = fromSingle(startStorageSlot);
99
107
  const valuesFr = fromArray(values);
100
108
  const contractAddressFr = fromSingle(contractAddress);
101
- const db = trees.asLatest();
109
+ const db = await trees.getLatest();
102
110
  const publicDataWrites = valuesFr.map((value, i) => {
103
111
  const storageSlot = startStorageSlotFr.add(new Fr(i));
104
112
  this.logger.debug(`Oracle storage write: slot=${storageSlot.toString()} value=${value}`);
@@ -121,13 +129,12 @@ export class TXEService {
121
129
  async addAccount(secret) {
122
130
  const keys = this.typedOracle.deriveKeys(fromSingle(secret));
123
131
  const args = [keys.publicKeys.masterIncomingViewingPublicKey.x, keys.publicKeys.masterIncomingViewingPublicKey.y];
124
- const hash = keys.publicKeys.hash();
125
132
  const artifact = SchnorrAccountContractArtifact;
126
133
  const instance = getContractInstanceFromDeployParams(artifact, {
127
134
  constructorArgs: args,
128
135
  skipArgsDecoding: true,
129
136
  salt: Fr.ONE,
130
- publicKeysHash: hash,
137
+ publicKeys: keys.publicKeys,
131
138
  constructorArtifact: 'constructor',
132
139
  deployer: AztecAddress.ZERO,
133
140
  });
@@ -325,7 +332,7 @@ export class TXEService {
325
332
  instance.deployer,
326
333
  instance.contractClassId,
327
334
  instance.initializationHash,
328
- instance.publicKeysHash,
335
+ ...instance.publicKeys.toFields(),
329
336
  ]),
330
337
  ]);
331
338
  }
@@ -339,7 +346,7 @@ export class TXEService {
339
346
  instance.deployer,
340
347
  instance.contractClassId,
341
348
  instance.initializationHash,
342
- instance.publicKeysHash,
349
+ ...instance.publicKeys.toFields(),
343
350
  ]),
344
351
  ]);
345
352
  }
@@ -396,24 +403,16 @@ export class TXEService {
396
403
  const keyValidationRequest = await this.typedOracle.getKeyValidationRequest(fromSingle(pkMHash));
397
404
  return toForeignCallResult([toArray(keyValidationRequest.toFields())]);
398
405
  }
399
- computeEncryptedNoteLog(contractAddress, storageSlot, noteTypeId, ovskApp, ovpkMX, ovpkMY, ovpkMIsInfinite, ivpkMX, ivpkMY, ivpkMIsInfinite, recipient, preimage) {
400
- const ovpkM = new Point(fromSingle(ovpkMX), fromSingle(ovpkMY), !fromSingle(ovpkMIsInfinite).isZero());
401
- const ovKeys = new KeyValidationRequest(ovpkM, Fr.fromString(fromSingle(ovskApp).toString()));
402
- const ivpkM = new Point(fromSingle(ivpkMX), fromSingle(ivpkMY), !fromSingle(ivpkMIsInfinite).isZero());
403
- const encLog = this.typedOracle.computeEncryptedNoteLog(AztecAddress.fromString(fromSingle(contractAddress).toString()), Fr.fromString(fromSingle(storageSlot).toString()), NoteSelector.fromField(Fr.fromString(fromSingle(noteTypeId).toString())), ovKeys, ivpkM, AztecAddress.fromString(fromSingle(recipient).toString()), fromArray(preimage));
404
- const bytes = [];
405
- encLog.forEach(v => {
406
- bytes.push(new Fr(v));
407
- });
408
- return toForeignCallResult([toArray(bytes)]);
409
- }
410
406
  emitEncryptedLog(_contractAddress, _randomness, _encryptedLog, _counter) {
407
+ // TODO(#8811): Implement
411
408
  return toForeignCallResult([]);
412
409
  }
413
410
  emitEncryptedNoteLog(_noteHashCounter, _encryptedNote, _counter) {
411
+ // TODO(#8811): Implement
414
412
  return toForeignCallResult([]);
415
413
  }
416
414
  emitEncryptedEventLog(_contractAddress, _randomness, _encryptedEvent, _counter) {
415
+ // TODO(#8811): Implement
417
416
  return toForeignCallResult([]);
418
417
  }
419
418
  async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, isDelegateCall) {
@@ -437,12 +436,12 @@ export class TXEService {
437
436
  return toForeignCallResult([toArray(authWitness)]);
438
437
  }
439
438
  async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, isDelegateCall) {
440
- await this.typedOracle.enqueuePublicFunctionCall(fromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool(), fromSingle(isDelegateCall).toBool());
441
- return toForeignCallResult([]);
439
+ const newArgsHash = await this.typedOracle.enqueuePublicFunctionCall(fromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool(), fromSingle(isDelegateCall).toBool());
440
+ return toForeignCallResult([toSingle(newArgsHash)]);
442
441
  }
443
442
  async setPublicTeardownFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, isDelegateCall) {
444
- await this.typedOracle.setPublicTeardownFunctionCall(fromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool(), fromSingle(isDelegateCall).toBool());
445
- return toForeignCallResult([]);
443
+ const newArgsHash = await this.typedOracle.setPublicTeardownFunctionCall(fromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool(), fromSingle(isDelegateCall).toBool());
444
+ return toForeignCallResult([toSingle(newArgsHash)]);
446
445
  }
447
446
  notifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter) {
448
447
  this.typedOracle.notifySetMinRevertibleSideEffectCounter(fromSingle(minRevertibleSideEffectCounter).toNumber());
@@ -478,5 +477,13 @@ export class TXEService {
478
477
  }
479
478
  return toForeignCallResult([toArray(witness)]);
480
479
  }
480
+ emitUnencryptedLog(_contractAddress, _message, _counter) {
481
+ // TODO(#8811): Implement
482
+ return toForeignCallResult([]);
483
+ }
484
+ avmOpcodeEmitUnencryptedLog(_message) {
485
+ // TODO(#8811): Implement
486
+ return toForeignCallResult([]);
487
+ }
481
488
  }
482
- //# 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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"}
489
+ //# 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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"}
@@ -1,6 +1,5 @@
1
- import { type AztecAddress, Fr, type FunctionSelector } from '@aztec/circuits.js';
1
+ import { type AztecAddress, type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, Fr, FunctionSelector, type PublicFunction } from '@aztec/circuits.js';
2
2
  import { type ContractArtifact } from '@aztec/foundation/abi';
3
- import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type PublicFunction } from '@aztec/types/contracts';
4
3
  import { type TXE } from '../oracle/txe_oracle.js';
5
4
  export declare class TXEPublicContractDataSource implements ContractDataSource {
6
5
  private txeOracle;
@@ -1 +1 @@
1
- {"version":3,"file":"txe_public_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/util/txe_public_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAE,KAAK,gBAAgB,EAAkB,MAAM,oBAAoB,CAAC;AAClG,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,2BAA4B,YAAW,kBAAkB;IACxD,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,GAAG;IAE5B,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAQ/G,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3B,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAkBlE,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAK1F,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAI9B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKvF,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGtF"}
1
+ {"version":3,"file":"txe_public_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/util/txe_public_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,EAAE,EACF,gBAAgB,EAEhB,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,2BAA4B,YAAW,kBAAkB;IACxD,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,GAAG;IAE5B,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAQ/G,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3B,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IA0BlE,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAK1F,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAI9B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKvF,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGtF"}
@@ -1,4 +1,4 @@
1
- import { Fr, unpackBytecode } from '@aztec/circuits.js';
1
+ import { Fr, FunctionSelector, PUBLIC_DISPATCH_SELECTOR, } from '@aztec/circuits.js';
2
2
  import { PrivateFunctionsTree } from '@aztec/pxe';
3
3
  export class TXEPublicContractDataSource {
4
4
  constructor(txeOracle) {
@@ -19,11 +19,18 @@ export class TXEPublicContractDataSource {
19
19
  const artifact = await this.txeOracle.getContractDataOracle().getContractArtifact(id);
20
20
  const tree = new PrivateFunctionsTree(artifact);
21
21
  const privateFunctionsRoot = tree.getFunctionTreeRoot();
22
+ const publicFunctions = [];
23
+ if (contractClass.packedBytecode.length > 0) {
24
+ publicFunctions.push({
25
+ selector: FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
26
+ bytecode: contractClass.packedBytecode,
27
+ });
28
+ }
22
29
  return {
23
30
  id,
24
31
  artifactHash: contractClass.artifactHash,
25
32
  packedBytecode: contractClass.packedBytecode,
26
- publicFunctions: unpackBytecode(contractClass.packedBytecode),
33
+ publicFunctions: publicFunctions,
27
34
  privateFunctionsRoot: new Fr(privateFunctionsRoot.root),
28
35
  version: contractClass.version,
29
36
  privateFunctions: [],
@@ -45,4 +52,4 @@ export class TXEPublicContractDataSource {
45
52
  return this.txeOracle.addContractArtifact(contract);
46
53
  }
47
54
  }
48
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19jb250cmFjdF9kYXRhX3NvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9wdWJsaWNfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFxQixFQUFFLEVBQXlCLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxHLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQVVsRCxNQUFNLE9BQU8sMkJBQTJCO0lBQ3RDLFlBQW9CLFNBQWM7UUFBZCxjQUFTLEdBQVQsU0FBUyxDQUFLO0lBQUcsQ0FBQztJQUV0QyxLQUFLLENBQUMsaUJBQWlCLENBQUMsT0FBcUIsRUFBRSxRQUEwQjtRQUN2RSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQzdGLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7UUFDRCxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFRCxjQUFjO1FBQ1osT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsRUFBTTtRQUMzQixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN4RixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0RixNQUFNLElBQUksR0FBRyxJQUFJLG9CQUFvQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2hELE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFFeEQsT0FBTztZQUNMLEVBQUU7WUFDRixZQUFZLEVBQUUsYUFBYyxDQUFDLFlBQVk7WUFDekMsY0FBYyxFQUFFLGFBQWMsQ0FBQyxjQUFjO1lBQzdDLGVBQWUsRUFBRSxjQUFjLENBQUMsYUFBYyxDQUFDLGNBQWMsQ0FBQztZQUM5RCxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxvQkFBcUIsQ0FBQyxJQUFJLENBQUM7WUFDeEQsT0FBTyxFQUFFLGFBQWMsQ0FBQyxPQUFPO1lBQy9CLGdCQUFnQixFQUFFLEVBQUU7WUFDcEIsc0JBQXNCLEVBQUUsRUFBRTtTQUMzQixDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBcUI7UUFDckMsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0YsT0FBTyxFQUFFLEdBQUcsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ2xDLENBQUM7SUFFRCxtQkFBbUI7UUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBcUI7UUFDN0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxPQUFxQixFQUFFLFFBQTBCO1FBQ25FLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN0RCxDQUFDO0NBQ0YifQ==
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19jb250cmFjdF9kYXRhX3NvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9wdWJsaWNfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUtMLEVBQUUsRUFDRixnQkFBZ0IsRUFDaEIsd0JBQXdCLEdBRXpCLE1BQU0sb0JBQW9CLENBQUM7QUFFNUIsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBSWxELE1BQU0sT0FBTywyQkFBMkI7SUFDdEMsWUFBb0IsU0FBYztRQUFkLGNBQVMsR0FBVCxTQUFTLENBQUs7SUFBRyxDQUFDO0lBRXRDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxPQUFxQixFQUFFLFFBQTBCO1FBQ3ZFLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDN0YsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2QsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQztRQUNELE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLENBQUM7SUFDaEMsQ0FBQztJQUVELGNBQWM7UUFDWixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxFQUFFLENBQUM7SUFDekMsQ0FBQztJQUVELEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFNO1FBQzNCLE1BQU0sYUFBYSxHQUFHLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3hGLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLG1CQUFtQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3RGLE1BQU0sSUFBSSxHQUFHLElBQUksb0JBQW9CLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDaEQsTUFBTSxvQkFBb0IsR0FBRyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztRQUV4RCxNQUFNLGVBQWUsR0FBcUIsRUFBRSxDQUFDO1FBQzdDLElBQUksYUFBYyxDQUFDLGNBQWMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDN0MsZUFBZSxDQUFDLElBQUksQ0FBQztnQkFDbkIsUUFBUSxFQUFFLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO2dCQUN0RSxRQUFRLEVBQUUsYUFBYyxDQUFDLGNBQWM7YUFDeEMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUVELE9BQU87WUFDTCxFQUFFO1lBQ0YsWUFBWSxFQUFFLGFBQWMsQ0FBQyxZQUFZO1lBQ3pDLGNBQWMsRUFBRSxhQUFjLENBQUMsY0FBYztZQUM3QyxlQUFlLEVBQUUsZUFBZTtZQUNoQyxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxvQkFBcUIsQ0FBQyxJQUFJLENBQUM7WUFDeEQsT0FBTyxFQUFFLGFBQWMsQ0FBQyxPQUFPO1lBQy9CLGdCQUFnQixFQUFFLEVBQUU7WUFDcEIsc0JBQXNCLEVBQUUsRUFBRTtTQUMzQixDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBcUI7UUFDckMsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0YsT0FBTyxFQUFFLEdBQUcsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDO0lBQ2xDLENBQUM7SUFFRCxtQkFBbUI7UUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBcUI7UUFDN0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxtQkFBbUIsQ0FBQyxPQUFxQixFQUFFLFFBQTBCO1FBQ25FLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN0RCxDQUFDO0NBQ0YifQ==
@@ -1,10 +1,9 @@
1
- import { type MerkleTreeOperations } from '@aztec/circuit-types';
2
- import { type AztecAddress, Fr } from '@aztec/circuits.js';
1
+ import { type MerkleTreeWriteOperations } from '@aztec/circuit-types';
2
+ import { type AztecAddress, type ContractDataSource, Fr } from '@aztec/circuits.js';
3
3
  import { WorldStateDB } from '@aztec/simulator';
4
- import { type ContractDataSource } from '@aztec/types/contracts';
5
4
  export declare class TXEWorldStateDB extends WorldStateDB {
6
5
  private merkleDb;
7
- constructor(merkleDb: MerkleTreeOperations, dataSource: ContractDataSource);
6
+ constructor(merkleDb: MerkleTreeWriteOperations, dataSource: ContractDataSource);
8
7
  storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
9
8
  storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint>;
10
9
  checkpoint(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"txe_world_state_db.d.ts","sourceRoot":"","sources":["../../src/util/txe_world_state_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EACL,KAAK,YAAY,EACjB,EAAE,EAIH,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,qBAAa,eAAgB,SAAQ,YAAY;IACnC,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,oBAAoB,EAAE,UAAU,EAAE,kBAAkB;IAInE,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAgB1D,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IASnF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGrC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAG3C"}
1
+ {"version":3,"file":"txe_world_state_db.d.ts","sourceRoot":"","sources":["../../src/util/txe_world_state_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,EAAE,EAIH,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBAAa,eAAgB,SAAQ,YAAY;IACnC,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,yBAAyB,EAAE,UAAU,EAAE,kBAAkB;IAIxE,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAgB1D,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IASnF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGrC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAG3C"}
@@ -34,4 +34,4 @@ export class TXEWorldStateDB extends WorldStateDB {
34
34
  throw new Error('Cannot rollback');
35
35
  }
36
36
  }
37
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3dvcmxkX3N0YXRlX2RiLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWwvdHhlX3dvcmxkX3N0YXRlX2RiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQTZCLE1BQU0sc0JBQXNCLENBQUM7QUFDL0UsT0FBTyxFQUVMLEVBQUUsRUFDRiwwQkFBMEIsRUFDMUIsa0JBQWtCLEdBRW5CLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR2hELE1BQU0sT0FBTyxlQUFnQixTQUFRLFlBQVk7SUFDL0MsWUFBb0IsUUFBOEIsRUFBRSxVQUE4QjtRQUNoRixLQUFLLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRFYsYUFBUSxHQUFSLFFBQVEsQ0FBc0I7SUFFbEQsQ0FBQztJQUVRLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBc0IsRUFBRSxJQUFRO1FBQ3pELE1BQU0sUUFBUSxHQUFHLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUUxRSxNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsWUFBWSxDQUFDLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBRXpHLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7UUFDcEIsSUFBSSxhQUFhLElBQUksYUFBYSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ2xELE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FDbkQsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixhQUFhLENBQUMsS0FBSyxDQUNwQixDQUErQixDQUFDO1lBQ2pDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDO1FBQ3pCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFUSxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQXNCLEVBQUUsSUFBUSxFQUFFLFFBQVk7UUFDeEUsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FDN0IsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixDQUFDLElBQUksa0JBQWtCLENBQUMsNkJBQTZCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxFQUFFLFFBQVEsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLEVBQzVGLDBCQUEwQixDQUMzQixDQUFDO1FBQ0YsT0FBTyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVRLFVBQVU7UUFDakIsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUNRLG9CQUFvQjtRQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDckMsQ0FBQztJQUNRLE1BQU07UUFDYixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBQ1EsZ0JBQWdCO1FBQ3ZCLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNyQyxDQUFDO0NBQ0YifQ==
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3dvcmxkX3N0YXRlX2RiLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWwvdHhlX3dvcmxkX3N0YXRlX2RiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQWtDLE1BQU0sc0JBQXNCLENBQUM7QUFDcEYsT0FBTyxFQUdMLEVBQUUsRUFDRiwwQkFBMEIsRUFDMUIsa0JBQWtCLEdBRW5CLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWhELE1BQU0sT0FBTyxlQUFnQixTQUFRLFlBQVk7SUFDL0MsWUFBb0IsUUFBbUMsRUFBRSxVQUE4QjtRQUNyRixLQUFLLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRFYsYUFBUSxHQUFSLFFBQVEsQ0FBMkI7SUFFdkQsQ0FBQztJQUVRLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBc0IsRUFBRSxJQUFRO1FBQ3pELE1BQU0sUUFBUSxHQUFHLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUUxRSxNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsWUFBWSxDQUFDLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBRXpHLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7UUFDcEIsSUFBSSxhQUFhLElBQUksYUFBYSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ2xELE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FDbkQsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixhQUFhLENBQUMsS0FBSyxDQUNwQixDQUErQixDQUFDO1lBQ2pDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDO1FBQ3pCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFUSxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQXNCLEVBQUUsSUFBUSxFQUFFLFFBQVk7UUFDeEUsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FDN0IsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixDQUFDLElBQUksa0JBQWtCLENBQUMsNkJBQTZCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxFQUFFLFFBQVEsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLEVBQzVGLDBCQUEwQixDQUMzQixDQUFDO1FBQ0YsT0FBTyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVRLFVBQVU7UUFDakIsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUNRLG9CQUFvQjtRQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDckMsQ0FBQztJQUNRLE1BQU07UUFDYixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBQ1EsZ0JBQWdCO1FBQ3ZCLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNyQyxDQUFDO0NBQ0YifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/txe",
3
- "version": "0.56.0",
3
+ "version": "0.58.0",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "bin": "./dest/bin/index.js",
@@ -39,6 +39,9 @@
39
39
  "parser": {
40
40
  "syntax": "typescript",
41
41
  "decorators": true
42
+ },
43
+ "transform": {
44
+ "decoratorVersion": "2022-03"
42
45
  }
43
46
  }
44
47
  }
@@ -57,19 +60,20 @@
57
60
  ]
58
61
  },
59
62
  "dependencies": {
60
- "@aztec/accounts": "0.56.0",
61
- "@aztec/archiver": "0.56.0",
62
- "@aztec/aztec.js": "0.56.0",
63
- "@aztec/circuit-types": "0.56.0",
64
- "@aztec/circuits.js": "0.56.0",
65
- "@aztec/foundation": "0.56.0",
66
- "@aztec/key-store": "0.56.0",
67
- "@aztec/kv-store": "0.56.0",
68
- "@aztec/pxe": "0.56.0",
69
- "@aztec/simulator": "0.56.0",
70
- "@aztec/telemetry-client": "0.56.0",
71
- "@aztec/types": "0.56.0",
72
- "@aztec/world-state": "0.56.0"
63
+ "@aztec/accounts": "0.58.0",
64
+ "@aztec/archiver": "0.58.0",
65
+ "@aztec/aztec.js": "0.58.0",
66
+ "@aztec/circuit-types": "0.58.0",
67
+ "@aztec/circuits.js": "0.58.0",
68
+ "@aztec/foundation": "0.58.0",
69
+ "@aztec/key-store": "0.58.0",
70
+ "@aztec/kv-store": "0.58.0",
71
+ "@aztec/protocol-contracts": "0.58.0",
72
+ "@aztec/pxe": "0.58.0",
73
+ "@aztec/simulator": "0.58.0",
74
+ "@aztec/telemetry-client": "0.58.0",
75
+ "@aztec/types": "0.58.0",
76
+ "@aztec/world-state": "0.58.0"
73
77
  },
74
78
  "devDependencies": {
75
79
  "@jest/globals": "^29.5.0",
package/src/bin/index.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
2
  import { createDebugLogger } from '@aztec/aztec.js';
3
+ import { createStatusRouter } from '@aztec/foundation/json-rpc/server';
3
4
 
4
5
  import http from 'http';
5
6
 
@@ -16,6 +17,10 @@ function main() {
16
17
 
17
18
  const txeServer = createTXERpcServer(logger);
18
19
  const app = txeServer.getApp();
20
+ // add status route
21
+ const statusRouter = createStatusRouter();
22
+ app.use(statusRouter.routes()).use(statusRouter.allowedMethods());
23
+
19
24
  const httpServer = http.createServer(app.callback());
20
25
  httpServer.timeout = 1e3 * 60 * 5; // 5 minutes
21
26
  httpServer.listen(TXE_PORT);