@aztec/ethereum 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/src/test/upgrade_utils.ts

@@ -1,4 +1,5 @@
 import type { Logger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
 import { TestERC20Abi as StakingAssetAbi } from '@aztec/l1-artifacts/TestERC20Abi';
 
@@ -6,7 +7,7 @@ import { type GetContractReturnType, type PrivateKeyAccount, getContract } from
 
 import { extractProposalIdFromLogs } from '../contracts/governance.js';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils.js';
+import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils/index.js';
 import type { ExtendedViemWalletClient, ViemPublicClient } from '../types.js';
 import { EthCheatCodes } from './eth_cheat_codes.js';
 
@@ -30,7 +31,7 @@ export async function executeGovernanceProposal(
     });
   };
 
-  const cheatCodes = new EthCheatCodes(rpcUrls, logger);
+  const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), logger);
 
   const timeToActive = proposal.creation + proposal.config.votingDelay;
   logger.info(`Warping to ${timeToActive + 1n}`);

package/src/utils.ts

@@ -181,41 +181,19 @@ export function formatViemError(error: any, abi: Abi = ErrorsAbi): FormattedViem
     return new FormattedViemError(error.message, (error as any)?.metaMessages);
   }
 
-  // Extract the actual error message and highlight it for clarity
-  let formattedRes = extractAndFormatRequestBody(error?.message || String(error));
-
-  let errorDetail = '';
-  // Look for specific details in known locations
-  if (error) {
-    // Check for details property which often has the most specific error message
-    if (typeof error.details === 'string' && error.details) {
-      errorDetail = error.details;
-    }
-    // Check for shortMessage which is often available in Viem errors
-    else if (typeof error.shortMessage === 'string' && error.shortMessage) {
-      errorDetail = error.shortMessage;
-    }
-  }
-
-  // If we found a specific error detail, format it clearly
-  if (errorDetail) {
-    // Look for key sections of the formatted result to replace with highlighted error
-    let replaced = false;
-
-    // Try to find the Details: section
-    const detailsMatch = formattedRes.match(/Details: ([^\n]+)/);
-    if (detailsMatch) {
-      formattedRes = formattedRes.replace(detailsMatch[0], `Details: *${errorDetail}*`);
-      replaced = true;
-    }
-
-    // If we didn't find a Details section, add the error at the beginning
-    if (!replaced) {
-      formattedRes = `Error: *${errorDetail}*\n\n${formattedRes}`;
-    }
-  }
-
-  return new FormattedViemError(formattedRes.replace(/\\n/g, '\n'), error?.metaMessages);
+  const body = String(error);
+  const length = body.length;
+  // LogExplorer can only render up to 2500 characters in it's summary view. Try to keep the whole message below this number
+  // Limit the error to 2000 chacaters in order to allow code higher up to decorate this error with extra details (up to 500 characters)
+  if (length > 2000) {
+    const chunk = 950;
+    const truncated = length - 2 * chunk;
+    return new FormattedViemError(
+      body.slice(0, chunk) + `...${truncated} characters truncated...` + body.slice(-1 * chunk),
+    );
+  }
+
+  return new FormattedViemError(body);
 }
 
 function stripAbis(obj: any) {
@@ -241,156 +219,6 @@ function stripAbis(obj: any) {
   });
 }
 
-function extractAndFormatRequestBody(message: string): string {
-  // First check if message is extremely large and contains very large hex strings
-  if (message.length > 50000) {
-    message = replaceHexStrings(message, { minLength: 10000, truncateLength: 200 });
-  }
-
-  // Add a specific check for RPC calls with large params
-  if (message.includes('"method":"eth_sendRawTransaction"')) {
-    message = replaceHexStrings(message, {
-      pattern: /"params":\s*\[\s*"(0x[a-fA-F0-9]{1000,})"\s*\]/g,
-      transform: hex => `"params":["${truncateHex(hex, 200)}"]`,
-    });
-  }
-
-  // First handle Request body JSON
-  const requestBodyRegex = /Request body: ({[\s\S]*?})\n/g;
-  let result = message.replace(requestBodyRegex, (match, body) => {
-    return `Request body: ${formatRequestBody(body)}\n`;
-  });
-
-  // Then handle Arguments section
-  const argsRegex = /((?:Request |Estimate Gas )?Arguments:[\s\S]*?(?=\n\n|$))/g;
-  result = result.replace(argsRegex, section => {
-    const lines = section.split('\n');
-    const processedLines = lines.map(line => {
-      // Check if line contains a colon followed by content
-      const colonIndex = line.indexOf(':');
-      if (colonIndex !== -1) {
-        const [prefix, content] = [line.slice(0, colonIndex + 1), line.slice(colonIndex + 1).trim()];
-        // If content contains a hex string, truncate it
-        if (content.includes('0x')) {
-          const processedContent = replaceHexStrings(content);
-          return `${prefix} ${processedContent}`;
-        }
-      }
-      return line;
-    });
-    return processedLines.join('\n');
-  });
-
-  // Finally, catch any remaining hex strings in the message
-  result = replaceHexStrings(result);
-
-  return result;
-}
-
-function truncateHex(hex: string, length = 100) {
-  if (!hex || typeof hex !== 'string') {
-    return hex;
-  }
-  if (!hex.startsWith('0x')) {
-    return hex;
-  }
-  if (hex.length <= length * 2) {
-    return hex;
-  }
-  // For extremely large hex strings, use more aggressive truncation
-  if (hex.length > 10000) {
-    return `${hex.slice(0, length)}...<${hex.length - length * 2} chars omitted>...${hex.slice(-length)}`;
-  }
-  return `${hex.slice(0, length)}...${hex.slice(-length)}`;
-}
-
-function replaceHexStrings(
-  text: string,
-  options: {
-    minLength?: number;
-    maxLength?: number;
-    truncateLength?: number;
-    pattern?: RegExp;
-    transform?: (hex: string) => string;
-  } = {},
-): string {
-  const {
-    minLength = 10,
-    maxLength = Infinity,
-    truncateLength = 100,
-    pattern,
-    transform = hex => truncateHex(hex, truncateLength),
-  } = options;
-
-  const hexRegex = pattern ?? new RegExp(`(0x[a-fA-F0-9]{${minLength},${maxLength}})`, 'g');
-  return text.replace(hexRegex, match => transform(match));
-}
-
-function formatRequestBody(body: string) {
-  try {
-    // Special handling for eth_sendRawTransaction
-    if (body.includes('"method":"eth_sendRawTransaction"')) {
-      try {
-        const parsed = JSON.parse(body);
-        if (parsed.params && Array.isArray(parsed.params) && parsed.params.length > 0) {
-          // These are likely large transaction hex strings
-          parsed.params = parsed.params.map((param: any) => {
-            if (typeof param === 'string' && param.startsWith('0x') && param.length > 1000) {
-              return truncateHex(param, 200);
-            }
-            return param;
-          });
-        }
-        return JSON.stringify(parsed, null, 2);
-      } catch {
-        // If specific parsing fails, fall back to regex-based truncation
-        return replaceHexStrings(body, {
-          pattern: /"params":\s*\[\s*"(0x[a-fA-F0-9]{1000,})"\s*\]/g,
-          transform: hex => `"params":["${truncateHex(hex, 200)}"]`,
-        });
-      }
-    }
-
-    // For extremely large request bodies, use simple truncation instead of parsing
-    if (body.length > 50000) {
-      const jsonStart = body.indexOf('{');
-      const jsonEnd = body.lastIndexOf('}');
-      if (jsonStart >= 0 && jsonEnd > jsonStart) {
-        return replaceHexStrings(body, { minLength: 10000, truncateLength: 200 });
-      }
-    }
-
-    const parsed = JSON.parse(body);
-
-    // Process the entire request body
-    const processed = processParams(parsed);
-    return JSON.stringify(processed, null, 2);
-  } catch {
-    // If JSON parsing fails, do a simple truncation of any large hex strings
-    return replaceHexStrings(body, { minLength: 1000, truncateLength: 150 });
-  }
-}
-
-// Recursively process all parameters that might contain hex strings
-function processParams(obj: any): any {
-  if (Array.isArray(obj)) {
-    return obj.map(item => processParams(item));
-  }
-  if (typeof obj === 'object' && obj !== null) {
-    const result: any = {};
-    for (const [key, value] of Object.entries(obj)) {
-      result[key] = processParams(value);
-    }
-    return result;
-  }
-  if (typeof obj === 'string') {
-    if (obj.startsWith('0x')) {
-      return truncateHex(obj);
-    }
-  }
-  return obj;
-}
-
 export function tryGetCustomErrorName(err: any) {
   try {
     // See https://viem.sh/docs/contract/simulateContract#handling-custom-errors

package/src/zkPassportVerifierAddress.ts

@@ -4,7 +4,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
  * The address of the zk passport verifier on sepolia
  * get address from: ROOT/l1-contracts/lib/circuits/src/solidity/deployments/deployment-11155111.json
  */
-export const ZK_PASSPORT_VERIFIER_ADDRESS = EthAddress.fromString('0x62e33cC35e29130e135341586e8Cf9C2BAbFB3eE');
+export const ZK_PASSPORT_VERIFIER_ADDRESS = EthAddress.fromString('0x3101Bad9eA5fACadA5554844a1a88F7Fe48D4DE0');
 /**
  * The default domain of the zk passport site
  */

package/dest/l1_tx_utils.d.ts

@@ -1,250 +0,0 @@
-import { type ConfigMappingsType } from '@aztec/foundation/config';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import type { ViemTransactionSignature } from '@aztec/foundation/eth-signature';
-import { type Logger } from '@aztec/foundation/log';
-import { DateProvider } from '@aztec/foundation/timer';
-import { type Abi, type Account, type Address, type BlockOverrides, type ContractFunctionExecutionError, type Hex, type PrepareTransactionRequestRequest, type StateOverride, type TransactionReceipt, type TransactionSerializable, type WalletClient } from 'viem';
-import type { EthSigner } from './eth-signer/eth-signer.js';
-import type { ExtendedViemWalletClient, ViemClient } from './types.js';
-export interface L1TxUtilsConfig {
-    /**
-     * How much to increase calculated gas limit.
-     */
-    gasLimitBufferPercentage?: number;
-    /**
-     * Maximum gas price in gwei
-     */
-    maxGwei?: bigint;
-    /**
-     * Maximum blob fee per gas in gwei
-     */
-    maxBlobGwei?: bigint;
-    /**
-     * Priority fee bump percentage
-     */
-    priorityFeeBumpPercentage?: number;
-    /**
-     * How much to increase priority fee by each attempt (percentage)
-     */
-    priorityFeeRetryBumpPercentage?: number;
-    /**
-     * Fixed priority fee per gas in Gwei. Overrides any priority fee bump percentage config
-     */
-    fixedPriorityFeePerGas?: number;
-    /**
-     * Maximum number of speed-up attempts
-     */
-    maxAttempts?: number;
-    /**
-     * How often to check tx status
-     */
-    checkIntervalMs?: number;
-    /**
-     * How long before considering tx stalled
-     */
-    stallTimeMs?: number;
-    /**
-     * How long to wait for a tx to be mined before giving up
-     */
-    txTimeoutMs?: number;
-    /**
-     * How many attempts will be done to get a tx after it was sent?
-     * First attempt is done at 1s, second at 2s, third at 3s, etc.
-     */
-    txPropagationMaxQueryAttempts?: number;
-    /**
-     * Whether to attempt to cancel a tx if it's not mined after txTimeoutMs
-     */
-    cancelTxOnTimeout?: boolean;
-}
-export declare const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig>;
-export declare const defaultL1TxUtilsConfig: L1TxUtilsConfig;
-export declare function getL1TxUtilsConfigEnvVars(): L1TxUtilsConfig;
-export interface L1TxRequest {
-    to: Address | null;
-    data?: Hex;
-    value?: bigint;
-    abi?: Abi;
-}
-export type L1GasConfig = Partial<L1TxUtilsConfig> & {
-    gasLimit?: bigint;
-    txTimeoutAt?: Date;
-};
-export interface L1BlobInputs {
-    blobs: Uint8Array[];
-    kzg: any;
-    maxFeePerBlobGas?: bigint;
-}
-export interface GasPrice {
-    maxFeePerGas: bigint;
-    maxPriorityFeePerGas: bigint;
-    maxFeePerBlobGas?: bigint;
-}
-export type TransactionStats = {
-    /** Address of the sender. */
-    sender: string;
-    /** Hash of the transaction. */
-    transactionHash: string;
-    /** Size in bytes of the tx calldata */
-    calldataSize: number;
-    /** Gas required to pay for the calldata inclusion (depends on size and number of zeros)  */
-    calldataGas: number;
-};
-export declare enum TxUtilsState {
-    IDLE = 0,
-    SENT = 1,
-    SPEED_UP = 2,
-    CANCELLED = 3,
-    NOT_MINED = 4,
-    MINED = 5
-}
-export declare class ReadOnlyL1TxUtils {
-    client: ViemClient;
-    protected logger: Logger;
-    readonly dateProvider: DateProvider;
-    protected debugMaxGasLimit: boolean;
-    readonly config: L1TxUtilsConfig;
-    protected interrupted: boolean;
-    constructor(client: ViemClient, logger: Logger | undefined, dateProvider: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean);
-    interrupt(): void;
-    restart(): void;
-    getBlock(): Promise<{
-        number: bigint;
-        hash: `0x${string}`;
-        nonce: `0x${string}`;
-        logsBloom: `0x${string}`;
-        baseFeePerGas: bigint | null;
-        blobGasUsed: bigint;
-        difficulty: bigint;
-        excessBlobGas: bigint;
-        extraData: Hex;
-        gasLimit: bigint;
-        gasUsed: bigint;
-        miner: Address;
-        mixHash: import("viem").Hash;
-        parentBeaconBlockRoot?: `0x${string}` | undefined;
-        parentHash: import("viem").Hash;
-        receiptsRoot: Hex;
-        sealFields: Hex[];
-        sha3Uncles: import("viem").Hash;
-        size: bigint;
-        stateRoot: import("viem").Hash;
-        timestamp: bigint;
-        totalDifficulty: bigint | null;
-        transactionsRoot: import("viem").Hash;
-        uncles: import("viem").Hash[];
-        withdrawals?: import("viem").Withdrawal[] | undefined | undefined;
-        withdrawalsRoot?: `0x${string}` | undefined;
-        transactions: `0x${string}`[];
-    }>;
-    getBlockNumber(): Promise<bigint>;
-    /**
-     * Gets the current gas price with bounds checking
-     */
-    getGasPrice(_gasConfig?: L1TxUtilsConfig, isBlobTx?: boolean, attempt?: number, previousGasPrice?: typeof attempt extends 0 ? never : GasPrice): Promise<GasPrice>;
-    /**
-     * Estimates gas and adds buffer
-     */
-    estimateGas(account: Account | Hex, request: L1TxRequest, _gasConfig?: L1TxUtilsConfig, _blobInputs?: L1BlobInputs): Promise<bigint>;
-    getTransactionStats(txHash: string): Promise<TransactionStats | undefined>;
-    tryGetErrorFromRevertedTx(data: Hex, args: {
-        args: readonly any[];
-        functionName: string;
-        abi: Abi;
-        address: Hex;
-    }, blobInputs: (L1BlobInputs & {
-        maxFeePerBlobGas: bigint;
-    }) | undefined, stateOverride?: StateOverride): Promise<string | undefined>;
-    simulate(request: L1TxRequest & {
-        gas?: bigint;
-        from?: Hex;
-    }, blockOverrides?: BlockOverrides<bigint, number>, stateOverrides?: StateOverride, abi?: Abi, _gasConfig?: L1TxUtilsConfig & {
-        fallbackGasEstimate?: bigint;
-    }): Promise<{
-        gasUsed: bigint;
-        result: `0x${string}`;
-    }>;
-    protected _simulate(call: any, blockOverrides: BlockOverrides<bigint, number> | undefined, stateOverrides: StateOverride | undefined, gasConfig: L1TxUtilsConfig & {
-        fallbackGasEstimate?: bigint;
-    }, abi: Abi): Promise<{
-        gasUsed: bigint;
-        result: `0x${string}`;
-    }>;
-    bumpGasLimit(gasLimit: bigint, _gasConfig?: L1TxUtilsConfig): bigint;
-}
-export type SigningCallback = (transaction: TransactionSerializable, signingAddress: EthAddress) => Promise<ViemTransactionSignature>;
-export declare class L1TxUtils extends ReadOnlyL1TxUtils {
-    client: ViemClient;
-    address: EthAddress;
-    private signer;
-    protected logger: Logger;
-    private txUtilsState;
-    private lastMinedBlockNumber;
-    private nonceManager;
-    constructor(client: ViemClient, address: EthAddress, signer: SigningCallback, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean);
-    get state(): TxUtilsState;
-    get lastMinedAtBlockNumber(): bigint | undefined;
-    private set lastMinedAtBlockNumber(value);
-    private set state(value);
-    getSenderAddress(): EthAddress;
-    getSenderBalance(): Promise<bigint>;
-    private signTransaction;
-    protected prepareSignedTransaction(txData: PrepareTransactionRequestRequest): Promise<`0x${string}`>;
-    /**
-     * Sends a transaction with gas estimation and pricing
-     * @param request - The transaction request (to, data, value)
-     * @param gasConfig - Optional gas configuration
-     * @returns The transaction hash and parameters used
-     */
-    sendTransaction(request: L1TxRequest, _gasConfig?: L1GasConfig, blobInputs?: L1BlobInputs, stateChange?: TxUtilsState): Promise<{
-        txHash: Hex;
-        gasLimit: bigint;
-        gasPrice: GasPrice;
-    }>;
-    /**
-     * Monitors a transaction until completion, handling speed-ups if needed
-     * @param request - Original transaction request (needed for speed-ups)
-     * @param initialTxHash - Hash of the initial transaction
-     * @param params - Parameters used in the initial transaction
-     * @param gasConfig - Optional gas configuration
-     */
-    monitorTransaction(request: L1TxRequest, initialTxHash: Hex, params: {
-        gasLimit: bigint;
-    }, _gasConfig?: Partial<L1TxUtilsConfig> & {
-        txTimeoutAt?: Date;
-    }, _blobInputs?: L1BlobInputs, isCancelTx?: boolean): Promise<TransactionReceipt>;
-    /**
-     * Sends a transaction and monitors it until completion
-     * @param request - The transaction request (to, data, value)
-     * @param gasConfig - Optional gas configuration
-     * @returns The receipt of the successful transaction
-     */
-    sendAndMonitorTransaction(request: L1TxRequest, gasConfig?: L1GasConfig, blobInputs?: L1BlobInputs): Promise<{
-        receipt: TransactionReceipt;
-        gasPrice: GasPrice;
-    }>;
-    simulate(request: L1TxRequest & {
-        gas?: bigint;
-        from?: Hex;
-    }, _blockOverrides?: BlockOverrides<bigint, number>, stateOverrides?: StateOverride, abi?: Abi, _gasConfig?: L1TxUtilsConfig & {
-        fallbackGasEstimate?: bigint;
-        ignoreBlockGasLimit?: boolean;
-    }): Promise<{
-        gasUsed: bigint;
-        result: `0x${string}`;
-    }>;
-    /**
-     * Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
-     * @param nonce - The nonce of the transaction to cancel
-     * @param previousGasPrice - The gas price of the previous transaction
-     * @param attempts - The number of attempts to cancel the transaction
-     * @returns The hash of the cancellation transaction
-     */
-    protected attemptTxCancellation(currentTxHash: Hex, nonce: number, isBlobTx?: boolean, previousGasPrice?: GasPrice, attempts?: number): Promise<`0x${string}`>;
-}
-export declare function createViemSigner(client: WalletClient): SigningCallback;
-export declare function createL1TxUtilsFromViemWallet(client: ExtendedViemWalletClient, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtils;
-export declare function createL1TxUtilsFromEthSigner(client: ViemClient, signer: EthSigner, logger?: Logger, dateProvider?: DateProvider, config?: Partial<L1TxUtilsConfig>, debugMaxGasLimit?: boolean): L1TxUtils;
-export declare function tryGetCustomErrorNameContractFunction(err: ContractFunctionExecutionError): string;
-export declare function getCalldataGasUsage(data: Uint8Array): number;
-//# sourceMappingURL=l1_tx_utils.d.ts.map

package/dest/l1_tx_utils.d.ts.map

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