@aztec/stdlib 0.0.1-commit.2ed92850 → 0.0.1-commit.3469e52

package/src/tx/block_header.ts

@@ -11,14 +11,13 @@ import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { z } from 'zod';
 
-import { L2BlockHash } from '../block/block_hash.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { GlobalVariables } from './global_variables.js';
 import { StateReference } from './state_reference.js';
 
 /** A header of an L2 block. */
 export class BlockHeader {
-  private _cachedHash?: Promise<L2BlockHash>;
+  private _cachedHash?: Promise<Fr>;
 
   constructor(
     /** Snapshot of archive before the block is applied. */
@@ -162,18 +161,16 @@ export class BlockHeader {
     return BlockHeader.fromBuffer(hexToBuffer(str));
   }
 
-  hash(): Promise<L2BlockHash> {
+  hash(): Promise<Fr> {
     if (!this._cachedHash) {
-      this._cachedHash = poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.BLOCK_HASH).then(fr =>
-        L2BlockHash.fromField(fr),
-      );
+      this._cachedHash = poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.BLOCK_HASH);
     }
     return this._cachedHash;
   }
 
   /** Manually set the hash for this block header if already computed */
   setHash(hashed: Fr) {
-    this._cachedHash = Promise.resolve(L2BlockHash.fromField(hashed));
+    this._cachedHash = Promise.resolve(hashed);
   }
 
   static random(overrides: Partial<FieldsOf<BlockHeader>> & Partial<FieldsOf<GlobalVariables>> = {}): BlockHeader {

package/src/tx/tx_receipt.ts

@@ -1,4 +1,5 @@
 import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
+import type { FieldsOf } from '@aztec/foundation/types';
 
 import { z } from 'zod';
 
@@ -7,28 +8,12 @@ import { L2BlockHash } from '../block/block_hash.js';
 import { type ZodFor, schemas } from '../schemas/schemas.js';
 import { TxHash } from './tx_hash.js';
 
-/** Block inclusion/finalization status. */
+/**
+ * Possible status of a transaction.
+ */
 export enum TxStatus {
   DROPPED = 'dropped',
   PENDING = 'pending',
-  PROPOSED = 'proposed',
-  CHECKPOINTED = 'checkpointed',
-  PROVEN = 'proven',
-  FINALIZED = 'finalized', // TODO(#13569): Implement finalized status properly
-}
-
-/** Tx status sorted by finalization progress. */
-export const SortedTxStatuses: TxStatus[] = [
-  TxStatus.DROPPED,
-  TxStatus.PENDING,
-  TxStatus.PROPOSED,
-  TxStatus.CHECKPOINTED,
-  TxStatus.PROVEN,
-  TxStatus.FINALIZED,
-];
-
-/** Execution result - only set when tx is in a block. */
-export enum TxExecutionResult {
   SUCCESS = 'success',
   APP_LOGIC_REVERTED = 'app_logic_reverted',
   TEARDOWN_REVERTED = 'teardown_reverted',
@@ -45,12 +30,10 @@ export class TxReceipt {
   constructor(
     /** A unique identifier for a transaction. */
     public txHash: TxHash,
-    /** The transaction's block finalization status. */
+    /** The transaction's status. */
     public status: TxStatus,
-    /** The execution result of the transaction, only set when tx is in a block. */
-    public executionResult: TxExecutionResult | undefined,
     /** Description of transaction error, if any. */
-    public error: string | undefined,
+    public error: string,
     /** The transaction fee paid for the transaction. */
     public transactionFee?: bigint,
     /** The hash of the block containing the transaction. */
@@ -59,38 +42,8 @@ export class TxReceipt {
     public blockNumber?: BlockNumber,
   ) {}
 
-  /** Returns true if the transaction was executed successfully. */
-  hasExecutionSucceeded(): boolean {
-    return this.executionResult === TxExecutionResult.SUCCESS;
-  }
-
-  /** Returns true if the transaction execution reverted. */
-  hasExecutionReverted(): boolean {
-    return this.executionResult !== undefined && this.executionResult !== TxExecutionResult.SUCCESS;
-  }
-
-  /** Returns true if the transaction has been included in a block (proposed, checkpointed, proven, or finalized). */
-  isMined(): boolean {
-    return (
-      this.status === TxStatus.PROPOSED ||
-      this.status === TxStatus.CHECKPOINTED ||
-      this.status === TxStatus.PROVEN ||
-      this.status === TxStatus.FINALIZED
-    );
-  }
-
-  /** Returns true if the transaction is pending. */
-  isPending(): boolean {
-    return this.status === TxStatus.PENDING;
-  }
-
-  /** Returns true if the transaction was dropped. */
-  isDropped(): boolean {
-    return this.status === TxStatus.DROPPED;
-  }
-
   static empty() {
-    return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, undefined, undefined);
+    return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, '');
   }
 
   static get schema(): ZodFor<TxReceipt> {
@@ -98,28 +51,18 @@ export class TxReceipt {
       .object({
         txHash: TxHash.schema,
         status: z.nativeEnum(TxStatus),
-        executionResult: z.nativeEnum(TxExecutionResult).optional(),
-        error: z.string().optional(),
+        error: z.string(),
         blockHash: L2BlockHash.schema.optional(),
         blockNumber: BlockNumberSchema.optional(),
         transactionFee: schemas.BigInt.optional(),
       })
-      .transform(fields => TxReceipt.from(fields));
+      .transform(TxReceipt.from);
   }
 
-  static from(fields: {
-    txHash: TxHash;
-    status: TxStatus;
-    executionResult?: TxExecutionResult;
-    error?: string;
-    transactionFee?: bigint;
-    blockHash?: L2BlockHash;
-    blockNumber?: BlockNumber;
-  }) {
+  static from(fields: FieldsOf<TxReceipt>) {
     return new TxReceipt(
       fields.txHash,
       fields.status,
-      fields.executionResult,
       fields.error,
       fields.transactionFee,
       fields.blockHash,
@@ -127,15 +70,15 @@ export class TxReceipt {
     );
   }
 
-  public static executionResultFromRevertCode(revertCode: RevertCode): TxExecutionResult {
+  public static statusFromRevertCode(revertCode: RevertCode) {
     if (revertCode.equals(RevertCode.OK)) {
-      return TxExecutionResult.SUCCESS;
+      return TxStatus.SUCCESS;
     } else if (revertCode.equals(RevertCode.APP_LOGIC_REVERTED)) {
-      return TxExecutionResult.APP_LOGIC_REVERTED;
+      return TxStatus.APP_LOGIC_REVERTED;
     } else if (revertCode.equals(RevertCode.TEARDOWN_REVERTED)) {
-      return TxExecutionResult.TEARDOWN_REVERTED;
+      return TxStatus.TEARDOWN_REVERTED;
     } else if (revertCode.equals(RevertCode.BOTH_REVERTED)) {
-      return TxExecutionResult.BOTH_REVERTED;
+      return TxStatus.BOTH_REVERTED;
     } else {
       throw new Error(`Unknown revert code: ${revertCode.getCode()}`);
     }

package/dest/block/l2_block.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"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"}