@aztec/txe 0.56.0 → 0.58.0

package/src/oracle/txe_oracle.ts

@@ -1,8 +1,5 @@
 import {
   AuthWitness,
-  Event,
-  L1EventPayload,
-  L1NotePayload,
   MerkleTreeId,
   Note,
   type NoteStatus,
@@ -10,14 +7,15 @@ import {
   PublicDataWitness,
   PublicDataWrite,
   PublicExecutionRequest,
-  TaggedLog,
   type UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import { type CircuitWitnessGenerationStats } from '@aztec/circuit-types/stats';
 import {
   CallContext,
+  CombinedConstantData,
+  type ContractInstance,
+  type ContractInstanceWithAddress,
   Gas,
-  GlobalVariables,
   Header,
   type KeyValidationRequest,
   NULLIFIER_SUBTREE_HEIGHT,
@@ -25,7 +23,7 @@ import {
   type NullifierLeafPreimage,
   PUBLIC_DATA_SUBTREE_HEIGHT,
   type PUBLIC_DATA_TREE_HEIGHT,
-  PrivateCircuitPublicInputs,
+  PUBLIC_DISPATCH_SELECTOR,
   PrivateContextInputs,
   PublicDataTreeLeaf,
   type PublicDataTreeLeafPreimage,
@@ -34,18 +32,17 @@ import {
   deriveKeys,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
-import { Aes128, Schnorr } from '@aztec/circuits.js/barretenberg';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { computePublicDataTreeLeafSlot, siloNoteHash, siloNullifier } from '@aztec/circuits.js/hash';
 import {
   type ContractArtifact,
-  EventSelector,
   type FunctionAbi,
   FunctionSelector,
   type NoteSelector,
   countArgumentsSize,
 } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr, GrumpkinScalar, type Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { type Logger, applyStringFormatting } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { type KeyStore } from '@aztec/key-store';
@@ -62,12 +59,12 @@ import {
   acvm,
   createSimulationError,
   extractCallStack,
+  extractPrivateCircuitPublicInputs,
   pickNotes,
   toACVMWitness,
   witnessMapToFields,
 } from '@aztec/simulator';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
-import { type ContractInstance, type ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { MerkleTreeSnapshotOperationsFacade, type MerkleTrees } from '@aztec/world-state';
 
 import { type TXEDatabase } from '../util/txe_database.js';
@@ -109,7 +106,7 @@ export class TXE implements TypedOracle {
   async #getTreesAt(blockNumber: number) {
     const db =
       blockNumber === (await this.getBlockNumber())
-        ? this.trees.asLatest()
+        ? await this.trees.getLatest()
         : new MerkleTreeSnapshotOperationsFacade(this.trees, blockNumber);
     return db;
   }
@@ -214,20 +211,20 @@ export class TXE implements TypedOracle {
 
   async avmOpcodeNullifierExists(innerNullifier: Fr, targetAddress: AztecAddress): Promise<boolean> {
     const nullifier = siloNullifier(targetAddress, innerNullifier!);
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
     const index = await db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
     return index !== undefined;
   }
 
   async avmOpcodeEmitNullifier(nullifier: Fr) {
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
     const siloedNullifier = siloNullifier(this.contractAddress, nullifier);
     await db.batchInsert(MerkleTreeId.NULLIFIER_TREE, [siloedNullifier.toBuffer()], NULLIFIER_SUBTREE_HEIGHT);
     return Promise.resolve();
   }
 
   async avmOpcodeEmitNoteHash(noteHash: Fr) {
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
     const siloedNoteHash = siloNoteHash(this.contractAddress, noteHash);
     await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, [siloedNoteHash]);
     return Promise.resolve();
@@ -247,14 +244,14 @@ export class TXE implements TypedOracle {
   }
 
   async addNullifiers(contractAddress: AztecAddress, nullifiers: Fr[]) {
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
     const siloedNullifiers = nullifiers.map(nullifier => siloNullifier(contractAddress, nullifier).toBuffer());
 
     await db.batchInsert(MerkleTreeId.NULLIFIER_TREE, siloedNullifiers, NULLIFIER_SUBTREE_HEIGHT);
   }
 
   async addNoteHashes(contractAddress: AztecAddress, noteHashes: Fr[]) {
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
     const siloedNoteHashes = noteHashes.map(noteHash => siloNoteHash(contractAddress, noteHash));
     await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, siloedNoteHashes);
   }
@@ -458,7 +455,7 @@ export class TXE implements TypedOracle {
 
   async checkNullifierExists(innerNullifier: Fr): Promise<boolean> {
     const nullifier = siloNullifier(this.contractAddress, innerNullifier!);
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
     const index = await db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
     return index !== undefined;
   }
@@ -472,7 +469,7 @@ export class TXE implements TypedOracle {
   }
 
   async avmOpcodeStorageRead(slot: Fr) {
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
 
     const leafSlot = computePublicDataTreeLeafSlot(this.contractAddress, slot);
 
@@ -518,7 +515,7 @@ export class TXE implements TypedOracle {
   }
 
   async storageWrite(startStorageSlot: Fr, values: Fr[]): Promise<Fr[]> {
-    const db = this.trees.asLatest();
+    const db = await this.trees.getLatest();
 
     const publicDataWrites = values.map((value, i) => {
       const storageSlot = startStorageSlot.add(new Fr(i));
@@ -543,24 +540,6 @@ export class TXE implements TypedOracle {
     return;
   }
 
-  computeEncryptedNoteLog(
-    contractAddress: AztecAddress,
-    storageSlot: Fr,
-    noteTypeId: NoteSelector,
-    ovKeys: KeyValidationRequest,
-    ivpkM: Point,
-    recipient: AztecAddress,
-    preimage: Fr[],
-  ): Buffer {
-    const note = new Note(preimage);
-    const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
-    const taggedNote = new TaggedLog(l1NotePayload);
-
-    const ephSk = GrumpkinScalar.random();
-
-    return taggedNote.encrypt(ephSk, recipient, ivpkM, ovKeys);
-  }
-
   emitUnencryptedLog(_log: UnencryptedL2Log, counter: number): void {
     this.sideEffectsCounter = counter + 1;
     return;
@@ -579,10 +558,10 @@ export class TXE implements TypedOracle {
     isDelegateCall: boolean,
   ) {
     this.logger.verbose(
-      `Executing external function ${targetContractAddress}:${functionSelector}(${await this.getDebugFunctionName(
+      `Executing external function ${await this.getDebugFunctionName(
         targetContractAddress,
         functionSelector,
-      )}) isStaticCall=${isStaticCall} isDelegateCall=${isDelegateCall}`,
+      )}@${targetContractAddress} isStaticCall=${isStaticCall} isDelegateCall=${isDelegateCall}`,
     );
 
     // Store and modify env
@@ -620,8 +599,7 @@ export class TXE implements TypedOracle {
         throw createSimulationError(execError);
       });
       const duration = timer.ms();
-      const returnWitness = witnessMapToFields(acirExecutionResult.returnWitness);
-      const publicInputs = PrivateCircuitPublicInputs.fromFields(returnWitness);
+      const publicInputs = extractPrivateCircuitPublicInputs(artifact, acirExecutionResult.partialWitness);
 
       const initialWitnessSize = witnessMapToFields(initialWitness).length * Fr.SIZE_IN_BYTES;
       this.logger.debug(`Ran external function ${targetContractAddress.toString()}:${functionSelector}`, {
@@ -708,26 +686,22 @@ export class TXE implements TypedOracle {
     callContext: CallContext,
     counter: number,
   ) {
-    const header = Header.empty();
-    header.state = await this.trees.getStateReference(true);
-    header.globalVariables.blockNumber = new Fr(await this.getBlockNumber());
-
     const executor = new PublicExecutor(
-      new TXEWorldStateDB(this.trees.asLatest(), new TXEPublicContractDataSource(this)),
-      header,
+      new TXEWorldStateDB(await this.trees.getLatest(), new TXEPublicContractDataSource(this)),
       new NoopTelemetryClient(),
     );
     const execution = new PublicExecutionRequest(targetContractAddress, callContext, args);
 
-    return executor.simulate(
+    const executionResult = executor.simulate(
       execution,
-      GlobalVariables.empty(),
+      CombinedConstantData.empty(),
       Gas.test(),
       TxContext.empty(),
       /* pendingNullifiers */ [],
       /* transactionFee */ Fr.ONE,
       counter,
     );
+    return Promise.resolve(executionResult);
   }
 
   async avmOpcodeCall(
@@ -778,7 +752,7 @@ export class TXE implements TypedOracle {
     sideEffectCounter: number,
     isStaticCall: boolean,
     isDelegateCall: boolean,
-  ) {
+  ): Promise<Fr> {
     // Store and modify env
     const currentContractAddress = AztecAddress.fromField(this.contractAddress);
     const currentMessageSender = AztecAddress.fromField(this.msgSender);
@@ -789,12 +763,13 @@ export class TXE implements TypedOracle {
 
     const callContext = CallContext.empty();
     callContext.msgSender = this.msgSender;
-    callContext.functionSelector = this.functionSelector;
+    callContext.functionSelector = FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR));
     callContext.storageContractAddress = targetContractAddress;
     callContext.isStaticCall = isStaticCall;
     callContext.isDelegateCall = isDelegateCall;
 
-    const args = this.packedValuesCache.unpack(argsHash);
+    const args = [this.functionSelector.toField(), ...this.packedValuesCache.unpack(argsHash)];
+    const newArgsHash = this.packedValuesCache.pack(args);
 
     const executionResult = await this.executePublicFunction(
       targetContractAddress,
@@ -812,6 +787,8 @@ export class TXE implements TypedOracle {
     this.setContractAddress(currentContractAddress);
     this.setMsgSender(currentMessageSender);
     this.setFunctionSelector(currentFunctionSelector);
+
+    return newArgsHash;
   }
 
   async setPublicTeardownFunctionCall(
@@ -821,10 +798,10 @@ export class TXE implements TypedOracle {
     sideEffectCounter: number,
     isStaticCall: boolean,
     isDelegateCall: boolean,
-  ) {
+  ): Promise<Fr> {
     // Definitely not right, in that the teardown should always be last.
     // But useful for executing flows.
-    await this.enqueuePublicFunctionCall(
+    return await this.enqueuePublicFunctionCall(
       targetContractAddress,
       functionSelector,
       argsHash,
@@ -838,11 +815,6 @@ export class TXE implements TypedOracle {
     this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
   }
 
-  aes128Encrypt(input: Buffer, initializationVector: Buffer, key: Buffer): Buffer {
-    const aes128 = new Aes128();
-    return aes128.encryptBufferCBC(input, initializationVector, key);
-  }
-
   debugLog(message: string, fields: Fr[]): void {
     this.logger.verbose(`debug_log ${applyStringFormatting(message, fields)}`);
   }
@@ -856,22 +828,4 @@ export class TXE implements TypedOracle {
     this.sideEffectsCounter = counter + 1;
     return;
   }
-
-  computeEncryptedEventLog(
-    contractAddress: AztecAddress,
-    randomness: Fr,
-    eventTypeId: Fr,
-    ovKeys: KeyValidationRequest,
-    ivpkM: Point,
-    recipient: AztecAddress,
-    preimage: Fr[],
-  ): Buffer {
-    const event = new Event(preimage);
-    const l1EventPayload = new L1EventPayload(event, contractAddress, randomness, EventSelector.fromField(eventTypeId));
-    const taggedEvent = new TaggedLog(l1EventPayload);
-
-    const ephSk = GrumpkinScalar.random();
-
-    return taggedEvent.encrypt(ephSk, recipient, ivpkM, ovKeys);
-  }
 }

package/src/txe_service/txe_service.ts

@@ -4,10 +4,9 @@ import {
   Fr,
   FunctionSelector,
   Header,
-  KeyValidationRequest,
   PUBLIC_DATA_SUBTREE_HEIGHT,
-  Point,
   PublicDataTreeLeaf,
+  PublicKeys,
   computePartialAddress,
   getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
@@ -17,6 +16,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Logger } from '@aztec/foundation/log';
 import { KeyStore } from '@aztec/key-store';
 import { openTmpStore } from '@aztec/kv-store/utils';
+import { getCanonicalProtocolContract, protocolContractNames } from '@aztec/protocol-contracts';
 import { ExecutionNoteCache, PackedValuesCache, type TypedOracle } from '@aztec/simulator';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { MerkleTrees } from '@aztec/world-state';
@@ -45,6 +45,12 @@ export class TXEService {
     const noteCache = new ExecutionNoteCache(txHash);
     const keyStore = new KeyStore(store);
     const txeDatabase = new TXEDatabase(store);
+    // Register protocol contracts.
+    for (const name of protocolContractNames) {
+      const { contractClass, instance, artifact } = getCanonicalProtocolContract(name);
+      await txeDatabase.addContractArtifact(contractClass.id, artifact);
+      await txeDatabase.addContractInstance(instance);
+    }
     logger.debug(`TXE service initialized`);
     const txe = new TXE(logger, trees, packedValuesCache, noteCache, keyStore, txeDatabase);
     const service = new TXEService(logger, txe);
@@ -110,7 +116,8 @@ export class TXEService {
       constructorArgs: decodedArgs,
       skipArgsDecoding: true,
       salt: Fr.ONE,
-      publicKeysHash: publicKeysHashFr,
+      // TODO: Modify this to allow for passing public keys.
+      publicKeys: PublicKeys.empty(),
       constructorArtifact: initializerStr ? initializerStr : undefined,
       deployer: AztecAddress.ZERO,
     });
@@ -124,7 +131,7 @@ export class TXEService {
         instance.deployer,
         instance.contractClassId,
         instance.initializationHash,
-        instance.publicKeysHash,
+        ...instance.publicKeys.toFields(),
       ]),
     ]);
   }
@@ -138,7 +145,7 @@ export class TXEService {
     const startStorageSlotFr = fromSingle(startStorageSlot);
     const valuesFr = fromArray(values);
     const contractAddressFr = fromSingle(contractAddress);
-    const db = trees.asLatest();
+    const db = await trees.getLatest();
 
     const publicDataWrites = valuesFr.map((value, i) => {
       const storageSlot = startStorageSlotFr.add(new Fr(i));
@@ -168,13 +175,12 @@ export class TXEService {
   async addAccount(secret: ForeignCallSingle) {
     const keys = (this.typedOracle as TXE).deriveKeys(fromSingle(secret));
     const args = [keys.publicKeys.masterIncomingViewingPublicKey.x, keys.publicKeys.masterIncomingViewingPublicKey.y];
-    const hash = keys.publicKeys.hash();
     const artifact = SchnorrAccountContractArtifact;
     const instance = getContractInstanceFromDeployParams(artifact, {
       constructorArgs: args,
       skipArgsDecoding: true,
       salt: Fr.ONE,
-      publicKeysHash: hash,
+      publicKeys: keys.publicKeys,
       constructorArtifact: 'constructor',
       deployer: AztecAddress.ZERO,
     });
@@ -503,7 +509,7 @@ export class TXEService {
         instance.deployer,
         instance.contractClassId,
         instance.initializationHash,
-        instance.publicKeysHash,
+        ...instance.publicKeys.toFields(),
       ]),
     ]);
   }
@@ -518,7 +524,7 @@ export class TXEService {
         instance.deployer,
         instance.contractClassId,
         instance.initializationHash,
-        instance.publicKeysHash,
+        ...instance.publicKeys.toFields(),
       ]),
     ]);
   }
@@ -614,46 +620,13 @@ export class TXEService {
     return toForeignCallResult([toArray(keyValidationRequest.toFields())]);
   }
 
-  computeEncryptedNoteLog(
-    contractAddress: ForeignCallSingle,
-    storageSlot: ForeignCallSingle,
-    noteTypeId: ForeignCallSingle,
-    ovskApp: ForeignCallSingle,
-    ovpkMX: ForeignCallSingle,
-    ovpkMY: ForeignCallSingle,
-    ovpkMIsInfinite: ForeignCallSingle,
-    ivpkMX: ForeignCallSingle,
-    ivpkMY: ForeignCallSingle,
-    ivpkMIsInfinite: ForeignCallSingle,
-    recipient: ForeignCallSingle,
-    preimage: ForeignCallArray,
-  ) {
-    const ovpkM = new Point(fromSingle(ovpkMX), fromSingle(ovpkMY), !fromSingle(ovpkMIsInfinite).isZero());
-    const ovKeys = new KeyValidationRequest(ovpkM, Fr.fromString(fromSingle(ovskApp).toString()));
-    const ivpkM = new Point(fromSingle(ivpkMX), fromSingle(ivpkMY), !fromSingle(ivpkMIsInfinite).isZero());
-    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),
-    );
-    const bytes: Fr[] = [];
-
-    encLog.forEach(v => {
-      bytes.push(new Fr(v));
-    });
-    return toForeignCallResult([toArray(bytes)]);
-  }
-
   emitEncryptedLog(
     _contractAddress: ForeignCallSingle,
     _randomness: ForeignCallSingle,
     _encryptedLog: ForeignCallSingle,
     _counter: ForeignCallSingle,
   ) {
+    // TODO(#8811): Implement
     return toForeignCallResult([]);
   }
 
@@ -662,10 +635,12 @@ export class TXEService {
     _encryptedNote: ForeignCallArray,
     _counter: ForeignCallSingle,
   ) {
+    // TODO(#8811): Implement
     return toForeignCallResult([]);
   }
 
   emitEncryptedEventLog(_contractAddress: AztecAddress, _randomness: Fr, _encryptedEvent: Buffer, _counter: number) {
+    // TODO(#8811): Implement
     return toForeignCallResult([]);
   }
 
@@ -714,7 +689,7 @@ export class TXEService {
     isStaticCall: ForeignCallSingle,
     isDelegateCall: ForeignCallSingle,
   ) {
-    await this.typedOracle.enqueuePublicFunctionCall(
+    const newArgsHash = await this.typedOracle.enqueuePublicFunctionCall(
       fromSingle(targetContractAddress),
       FunctionSelector.fromField(fromSingle(functionSelector)),
       fromSingle(argsHash),
@@ -722,7 +697,7 @@ export class TXEService {
       fromSingle(isStaticCall).toBool(),
       fromSingle(isDelegateCall).toBool(),
     );
-    return toForeignCallResult([]);
+    return toForeignCallResult([toSingle(newArgsHash)]);
   }
 
   public async setPublicTeardownFunctionCall(
@@ -733,7 +708,7 @@ export class TXEService {
     isStaticCall: ForeignCallSingle,
     isDelegateCall: ForeignCallSingle,
   ) {
-    await this.typedOracle.setPublicTeardownFunctionCall(
+    const newArgsHash = await this.typedOracle.setPublicTeardownFunctionCall(
       fromSingle(targetContractAddress),
       FunctionSelector.fromField(fromSingle(functionSelector)),
       fromSingle(argsHash),
@@ -741,7 +716,7 @@ export class TXEService {
       fromSingle(isStaticCall).toBool(),
       fromSingle(isDelegateCall).toBool(),
     );
-    return toForeignCallResult([]);
+    return toForeignCallResult([toSingle(newArgsHash)]);
   }
 
   public notifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: ForeignCallSingle) {
@@ -786,4 +761,14 @@ export class TXEService {
     }
     return toForeignCallResult([toArray(witness)]);
   }
+
+  emitUnencryptedLog(_contractAddress: ForeignCallSingle, _message: ForeignCallArray, _counter: ForeignCallSingle) {
+    // TODO(#8811): Implement
+    return toForeignCallResult([]);
+  }
+
+  avmOpcodeEmitUnencryptedLog(_message: ForeignCallArray) {
+    // TODO(#8811): Implement
+    return toForeignCallResult([]);
+  }
 }

package/src/util/txe_public_contract_data_source.ts

@@ -1,12 +1,15 @@
-import { type AztecAddress, Fr, type FunctionSelector, unpackBytecode } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { PrivateFunctionsTree } from '@aztec/pxe';
 import {
+  type AztecAddress,
   type ContractClassPublic,
   type ContractDataSource,
   type ContractInstanceWithAddress,
+  Fr,
+  FunctionSelector,
+  PUBLIC_DISPATCH_SELECTOR,
   type PublicFunction,
-} from '@aztec/types/contracts';
+} from '@aztec/circuits.js';
+import { type ContractArtifact } from '@aztec/foundation/abi';
+import { PrivateFunctionsTree } from '@aztec/pxe';
 
 import { type TXE } from '../oracle/txe_oracle.js';
 
@@ -31,11 +34,19 @@ export class TXEPublicContractDataSource implements ContractDataSource {
     const tree = new PrivateFunctionsTree(artifact);
     const privateFunctionsRoot = tree.getFunctionTreeRoot();
 
+    const publicFunctions: PublicFunction[] = [];
+    if (contractClass!.packedBytecode.length > 0) {
+      publicFunctions.push({
+        selector: FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
+        bytecode: contractClass!.packedBytecode,
+      });
+    }
+
     return {
       id,
       artifactHash: contractClass!.artifactHash,
       packedBytecode: contractClass!.packedBytecode,
-      publicFunctions: unpackBytecode(contractClass!.packedBytecode),
+      publicFunctions: publicFunctions,
       privateFunctionsRoot: new Fr(privateFunctionsRoot!.root),
       version: contractClass!.version,
       privateFunctions: [],

package/src/util/txe_world_state_db.ts

@@ -1,6 +1,7 @@
-import { MerkleTreeId, type MerkleTreeOperations } from '@aztec/circuit-types';
+import { MerkleTreeId, type MerkleTreeWriteOperations } from '@aztec/circuit-types';
 import {
   type AztecAddress,
+  type ContractDataSource,
   Fr,
   PUBLIC_DATA_SUBTREE_HEIGHT,
   PublicDataTreeLeaf,
@@ -8,10 +9,9 @@ import {
 } from '@aztec/circuits.js';
 import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import { WorldStateDB } from '@aztec/simulator';
-import { type ContractDataSource } from '@aztec/types/contracts';
 
 export class TXEWorldStateDB extends WorldStateDB {
-  constructor(private merkleDb: MerkleTreeOperations, dataSource: ContractDataSource) {
+  constructor(private merkleDb: MerkleTreeWriteOperations, dataSource: ContractDataSource) {
     super(merkleDb, dataSource);
   }