@aztec/txe 0.0.1-commit.fce3e4f → 0.0.1-commit.ffe5b04ea

package/src/utils/block_creation.ts

@@ -4,19 +4,19 @@ import {
   NULLIFIER_SUBTREE_HEIGHT,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
 } from '@aztec/constants';
+import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
-import { L2BlockHeader } from '@aztec/stdlib/block';
-import { makeContentCommitment } from '@aztec/stdlib/testing';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Body, L2Block } from '@aztec/stdlib/block';
 import { AppendOnlyTreeSnapshot, MerkleTreeId, type MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
-import { GlobalVariables, TxEffect } from '@aztec/stdlib/tx';
+import { BlockHeader, GlobalVariables, TxEffect } from '@aztec/stdlib/tx';
 
 /**
  * Returns a transaction request hash that is valid for transactions that are the only ones in a block.
  * @param blockNumber The number for the block in which there is a single transaction.
  * @returns The transaction request hash.
  */
-export function getSingleTxBlockRequestHash(blockNumber: number): Fr {
+export function getSingleTxBlockRequestHash(blockNumber: BlockNumber): Fr {
   return new Fr(blockNumber + 9999); // Why does this need to be a high number? Why do small numbered nullifiers already exist?
 }
 
@@ -46,18 +46,52 @@ export async function insertTxEffectIntoWorldTrees(
 export async function makeTXEBlockHeader(
   worldTrees: MerkleTreeWriteOperations,
   globalVariables: GlobalVariables,
-): Promise<L2BlockHeader> {
+): Promise<BlockHeader> {
   const stateReference = await worldTrees.getStateReference();
   const archiveInfo = await worldTrees.getTreeInfo(MerkleTreeId.ARCHIVE);
 
-  return new L2BlockHeader(
-    new AppendOnlyTreeSnapshot(new Fr(archiveInfo.root), Number(archiveInfo.size)),
-    makeContentCommitment(),
-    stateReference,
+  return BlockHeader.from({
+    lastArchive: new AppendOnlyTreeSnapshot(new Fr(archiveInfo.root), Number(archiveInfo.size)),
+    spongeBlobHash: Fr.ZERO,
+    state: stateReference,
     globalVariables,
-    Fr.ZERO,
-    Fr.ZERO,
-    Fr.ZERO,
-    Fr.ZERO,
-  );
+    totalFees: Fr.ZERO,
+    totalManaUsed: Fr.ZERO,
+  });
+}
+
+/**
+ * Creates an L2Block with proper archive chaining.
+ * This function:
+ * 1. Gets the current archive state as lastArchive for the header
+ * 2. Creates the block header
+ * 3. Updates the archive tree with the header hash
+ * 4. Gets the new archive state for the block's archive
+ *
+ * @param worldTrees - The world trees to read/write from
+ * @param globalVariables - Global variables for the block
+ * @param txEffects - Transaction effects to include in the block
+ * @returns The created L2Block with proper archive chaining
+ */
+export async function makeTXEBlock(
+  worldTrees: MerkleTreeWriteOperations,
+  globalVariables: GlobalVariables,
+  txEffects: TxEffect[],
+): Promise<L2Block> {
+  const header = await makeTXEBlockHeader(worldTrees, globalVariables);
+
+  // Update the archive tree with this block's header hash
+  await worldTrees.updateArchive(header);
+
+  // Get the new archive state after updating
+  const newArchiveInfo = await worldTrees.getTreeInfo(MerkleTreeId.ARCHIVE);
+  const newArchive = new AppendOnlyTreeSnapshot(new Fr(newArchiveInfo.root), Number(newArchiveInfo.size));
+
+  // L2Block requires checkpointNumber and indexWithinCheckpoint.
+  // TXE uses 1-block-per-checkpoint for testing simplicity, so we can use block number as checkpoint number.
+  // This uses the deprecated fromBlockNumber method intentionally for the TXE testing environment.
+  const checkpointNumber = CheckpointNumber.fromBlockNumber(globalVariables.blockNumber);
+  const indexWithinCheckpoint = IndexWithinCheckpoint(0);
+
+  return new L2Block(newArchive, header, new Body(txEffects), checkpointNumber, indexWithinCheckpoint);
 }

package/src/utils/tx_effect_creation.ts

@@ -1,18 +1,15 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { ExecutionNoteCache } from '@aztec/pxe/simulator';
 import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash } from '@aztec/stdlib/hash';
 import { TxEffect, TxHash } from '@aztec/stdlib/tx';
 
-export async function makeTxEffect(
-  noteCache: ExecutionNoteCache,
-  protocolNullifier: Fr,
-  txBlockNumber: number,
-): Promise<TxEffect> {
+export async function makeTxEffect(noteCache: ExecutionNoteCache, txBlockNumber: BlockNumber): Promise<TxEffect> {
   const txEffect = TxEffect.empty();
 
-  const { usedProtocolNullifierForNonces } = noteCache.finish();
-  const nonceGenerator = usedProtocolNullifierForNonces ? protocolNullifier : noteCache.getAllNullifiers()[0];
+  noteCache.finish();
 
+  const nonceGenerator = noteCache.getNonceGenerator();
   txEffect.noteHashes = await Promise.all(
     noteCache
       .getAllNotes()
@@ -27,10 +24,6 @@ export async function makeTxEffect(
   // Nullifiers are already siloed
   txEffect.nullifiers = noteCache.getAllNullifiers();
 
-  if (usedProtocolNullifierForNonces) {
-    txEffect.nullifiers.unshift(protocolNullifier);
-  }
-
   txEffect.txHash = new TxHash(new Fr(txBlockNumber));
 
   return txEffect;

package/dest/util/txe_account_data_provider.d.ts

@@ -1,10 +0,0 @@
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { CompleteAddress } from '@aztec/stdlib/contract';
-export declare class TXEAccountDataProvider {
-    #private;
-    constructor(store: AztecAsyncKVStore);
-    getAccount(key: AztecAddress): Promise<CompleteAddress>;
-    setAccount(key: AztecAddress, value: CompleteAddress): Promise<void>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX2FjY291bnRfZGF0YV9wcm92aWRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWwvdHhlX2FjY291bnRfZGF0YV9wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFekQscUJBQWEsc0JBQXNCOztJQUdqQyxZQUFZLEtBQUssRUFBRSxpQkFBaUIsRUFFbkM7SUFFSyxVQUFVLENBQUMsR0FBRyxFQUFFLFlBQVksNEJBTWpDO0lBRUssVUFBVSxDQUFDLEdBQUcsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLGVBQWUsaUJBRXpEO0NBQ0YifQ==

package/dest/util/txe_account_data_provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"txe_account_data_provider.d.ts","sourceRoot":"","sources":["../../src/util/txe_account_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAsB;;IAGjC,YAAY,KAAK,EAAE,iBAAiB,EAEnC;IAEK,UAAU,CAAC,GAAG,EAAE,YAAY,4BAMjC;IAEK,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,iBAEzD;CACF"}

package/dest/util/txe_contract_data_provider.d.ts

@@ -1,12 +0,0 @@
-import type { ContractArtifact } from '@aztec/aztec.js/abi';
-import { Fr } from '@aztec/aztec.js/fields';
-import { ContractDataProvider } from '@aztec/pxe/server';
-export type ContractArtifactWithHash = ContractArtifact & {
-    artifactHash: Fr;
-};
-export declare class TXEContractDataProvider extends ContractDataProvider {
-    #private;
-    addContractArtifact(id: Fr, artifact: ContractArtifact | ContractArtifactWithHash): Promise<void>;
-    getContractArtifact(contractClassId: Fr): Promise<ContractArtifact | ContractArtifactWithHash | undefined>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX2NvbnRyYWN0X2RhdGFfcHJvdmlkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9jb250cmFjdF9kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXpELE1BQU0sTUFBTSx3QkFBd0IsR0FBRyxnQkFBZ0IsR0FBRztJQUFFLFlBQVksRUFBRSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBTy9FLHFCQUFhLHVCQUF3QixTQUFRLG9CQUFvQjs7SUFHekMsbUJBQW1CLENBQ3ZDLEVBQUUsRUFBRSxFQUFFLEVBQ04sUUFBUSxFQUFFLGdCQUFnQixHQUFHLHdCQUF3QixHQUNwRCxPQUFPLENBQUMsSUFBSSxDQUFDLENBS2Y7SUFFcUIsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxFQUFFLEdBQ2xCLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyx3QkFBd0IsR0FBRyxTQUFTLENBQUMsQ0FRbEU7Q0FDRiJ9

package/dest/util/txe_contract_data_provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"txe_contract_data_provider.d.ts","sourceRoot":"","sources":["../../src/util/txe_contract_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GAAG;IAAE,YAAY,EAAE,EAAE,CAAA;CAAE,CAAC;AAO/E,qBAAa,uBAAwB,SAAQ,oBAAoB;;IAGzC,mBAAmB,CACvC,EAAE,EAAE,EAAE,EACN,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,GACpD,OAAO,CAAC,IAAI,CAAC,CAKf;IAEqB,mBAAmB,CACvC,eAAe,EAAE,EAAE,GAClB,OAAO,CAAC,gBAAgB,GAAG,wBAAwB,GAAG,SAAS,CAAC,CAQlE;CACF"}

package/dest/util/txe_contract_data_provider.js

@@ -1,22 +0,0 @@
-import { Fr } from '@aztec/aztec.js/fields';
-import { ContractDataProvider } from '@aztec/pxe/server';
-/*
- * A contract data provider that stores contract artifacts with their hashes. Since
- * TXE typically deploys the same contract again and again for multiple tests, caching
- * the *very* expensive artifact hash computation improves testing speed significantly.
- */ export class TXEContractDataProvider extends ContractDataProvider {
-    #artifactHashes = new Map();
-    async addContractArtifact(id, artifact) {
-        if ('artifactHash' in artifact) {
-            this.#artifactHashes.set(id.toString(), artifact.artifactHash.toBuffer());
-        }
-        await super.addContractArtifact(id, artifact);
-    }
-    async getContractArtifact(contractClassId) {
-        const artifact = await super.getContractArtifact(contractClassId);
-        if (artifact && this.#artifactHashes.has(contractClassId.toString())) {
-            artifact.artifactHash = Fr.fromBuffer(this.#artifactHashes.get(contractClassId.toString()));
-        }
-        return artifact;
-    }
-}

package/src/util/txe_contract_data_provider.ts

@@ -1,36 +0,0 @@
-import type { ContractArtifact } from '@aztec/aztec.js/abi';
-import { Fr } from '@aztec/aztec.js/fields';
-import { ContractDataProvider } from '@aztec/pxe/server';
-
-export type ContractArtifactWithHash = ContractArtifact & { artifactHash: Fr };
-
-/*
- * A contract data provider that stores contract artifacts with their hashes. Since
- * TXE typically deploys the same contract again and again for multiple tests, caching
- * the *very* expensive artifact hash computation improves testing speed significantly.
- */
-export class TXEContractDataProvider extends ContractDataProvider {
-  #artifactHashes: Map<string, Buffer> = new Map();
-
-  public override async addContractArtifact(
-    id: Fr,
-    artifact: ContractArtifact | ContractArtifactWithHash,
-  ): Promise<void> {
-    if ('artifactHash' in artifact) {
-      this.#artifactHashes.set(id.toString(), artifact.artifactHash.toBuffer());
-    }
-    await super.addContractArtifact(id, artifact);
-  }
-
-  public override async getContractArtifact(
-    contractClassId: Fr,
-  ): Promise<ContractArtifact | ContractArtifactWithHash | undefined> {
-    const artifact = await super.getContractArtifact(contractClassId);
-    if (artifact && this.#artifactHashes.has(contractClassId.toString())) {
-      (artifact as ContractArtifactWithHash).artifactHash = Fr.fromBuffer(
-        this.#artifactHashes.get(contractClassId.toString())!,
-      );
-    }
-    return artifact;
-  }
-}