@aztec/ethereum 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/test/upgrade_utils.js

@@ -1,21 +1,22 @@
-import { TestERC20Abi as FeeJuiceAbi } from '@aztec/l1-artifacts';
+import { DateProvider } from '@aztec/foundation/timer';
 import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
+import { TestERC20Abi as StakingAssetAbi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { getContract } from 'viem';
-import { EthCheatCodes } from '../eth_cheat_codes.js';
-export async function executeGovernanceProposal(proposalId, governance, voteAmount, privateKey, publicClient, walletClient, rpcUrls, logger) {
+import { extractProposalIdFromLogs } from '../contracts/governance.js';
+import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils/index.js';
+import { EthCheatCodes } from './eth_cheat_codes.js';
+export async function executeGovernanceProposal(proposalId, governance, voteAmount, privateKey, l1Client, rpcUrls, logger) {
     const proposal = await governance.read.getProposal([
         proposalId
     ]);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client);
     const waitL1Block = async ()=>{
-        await publicClient.waitForTransactionReceipt({
-            hash: await walletClient.sendTransaction({
-                to: privateKey.address,
-                value: 1n,
-                account: privateKey
-            })
+        await l1TxUtils.sendAndMonitorTransaction({
+            to: l1Client.account.address,
+            value: 1n
         });
     };
-    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}`);
     await cheatCodes.warp(Number(timeToActive + 1n));
@@ -29,7 +30,7 @@ export async function executeGovernanceProposal(proposalId, governance, voteAmou
     ], {
         account: privateKey
     });
-    await publicClient.waitForTransactionReceipt({
+    await l1Client.waitForTransactionReceipt({
         hash: voteTx
     });
     logger.info(`Voted`);
@@ -43,15 +44,15 @@ export async function executeGovernanceProposal(proposalId, governance, voteAmou
     ], {
         account: privateKey
     });
-    await publicClient.waitForTransactionReceipt({
+    await l1Client.waitForTransactionReceipt({
         hash: executeTx
     });
     logger.info(`Executed proposal`);
 }
 export async function createGovernanceProposal(payloadAddress, addresses, privateKey, publicClient, logger) {
     const token = getContract({
-        address: addresses.feeJuiceAddress.toString(),
-        abi: FeeJuiceAbi,
+        address: addresses.stakingAssetAddress.toString(),
+        abi: StakingAssetAbi,
         client: publicClient
     });
     const governance = getContract({
@@ -91,14 +92,20 @@ export async function createGovernanceProposal(payloadAddress, addresses, privat
         hash: depositTx
     });
     logger.info(`Deposited tokens`);
-    await governance.write.proposeWithLock([
+    const proposeTx = await governance.write.proposeWithLock([
         payloadAddress,
         privateKey.address
     ], {
         account: privateKey
     });
+    const receipt = await publicClient.waitForTransactionReceipt({
+        hash: proposeTx
+    });
+    logger.info(`Proposed upgrade`);
+    const proposalId = extractProposalIdFromLogs(receipt.logs);
     return {
         governance,
-        voteAmount
+        voteAmount,
+        proposalId
     };
 }

package/dest/types.d.ts

@@ -1,14 +1,13 @@
-import type { Account, Chain, Client, FallbackTransport, HttpTransport, PublicActions, PublicClient, PublicRpcSchema, WalletActions, WalletClient, WalletRpcSchema } from 'viem';
+import type { Abi, Account, Chain, Client, FallbackTransport, GetContractReturnType, HttpTransport, PublicActions, PublicClient, PublicRpcSchema, WalletActions, WalletRpcSchema } from 'viem';
 /** Type for a viem public client */
 export type ViemPublicClient = PublicClient<FallbackTransport<HttpTransport[]>, Chain>;
-export type SimpleViemWalletClient = WalletClient<FallbackTransport<HttpTransport[]>, Chain, Account>;
 export type ExtendedViemWalletClient = Client<FallbackTransport<readonly HttpTransport[]>, Chain, Account, [
     ...PublicRpcSchema,
     ...WalletRpcSchema
 ], PublicActions<FallbackTransport<readonly HttpTransport[]>, Chain> & WalletActions<Chain, Account>>;
-export type ViemWalletClient = SimpleViemWalletClient | ExtendedViemWalletClient;
-export type L1Clients = {
-    publicClient: ViemPublicClient;
-    walletClient: ExtendedViemWalletClient;
-};
+/** Type for a viem client that can be either public or extended with wallet capabilities */
+export type ViemClient = ViemPublicClient | ExtendedViemWalletClient;
+/** Type for a viem contract that can be used with an extended viem client */
+export type ViemContract<TAbi extends Abi> = GetContractReturnType<TAbi, ExtendedViemWalletClient>;
+export declare function isExtendedClient(client: ViemClient): client is ExtendedViemWalletClient;
 //# sourceMappingURL=types.d.ts.map

package/dest/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,KAAK,EACL,MAAM,EACN,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,eAAe,EACf,aAAa,EACb,YAAY,EACZ,eAAe,EAChB,MAAM,MAAM,CAAC;AAEd,oCAAoC;AACpC,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAEvF,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAEtG,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAC3C,KAAK,EACL,OAAO,EACP;IAAC,GAAG,eAAe;IAAE,GAAG,eAAe;CAAC,EACxC,aAAa,CAAC,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAClG,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GAAG,wBAAwB,CAAC;AAEjF,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,wBAAwB,CAAC;CACxC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,OAAO,EACP,KAAK,EACL,MAAM,EACN,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,MAAM,CAAC;AAEd,oCAAoC;AACpC,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AAEvF,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAC3C,KAAK,EACL,OAAO,EACP;IAAC,GAAG,eAAe;IAAE,GAAG,eAAe;CAAC,EACxC,aAAa,CAAC,iBAAiB,CAAC,SAAS,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAClG,CAAC;AAEF,4FAA4F;AAC5F,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,wBAAwB,CAAC;AAErE,6EAA6E;AAC7E,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,GAAG,IAAI,qBAAqB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAEnG,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,IAAI,wBAAwB,CAEvF"}

package/dest/types.js

@@ -1 +1,3 @@
-export { };
+export function isExtendedClient(client) {
+    return 'account' in client && client.account !== undefined;
+}

package/dest/utils.d.ts

@@ -12,6 +12,7 @@ export declare class FormattedViemError extends Error {
     constructor(message: string, metaMessages?: any[]);
 }
 export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType;
+export declare function tryExtractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType | undefined;
 export declare function prettyLogViemErrorMsg(err: any): any;
 /**
  * Formats a Viem error into a FormattedViemError instance.

package/dest/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;gBAET,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE;CAKlD;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AA+BD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwIpF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;gBAET,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE;CAKlD;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwEpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C"}

package/dest/utils.js

@@ -1,4 +1,4 @@
-import { ErrorsAbi } from '@aztec/l1-artifacts';
+import { ErrorsAbi } from '@aztec/l1-artifacts/ErrorsAbi';
 import { BaseError, ContractFunctionRevertedError, decodeErrorResult, decodeEventLog } from 'viem';
 export class FormattedViemError extends Error {
     metaMessages;
@@ -15,7 +15,7 @@ export function extractEvent(logs, address, abi, eventName, filter, logger) {
     }
     return event;
 }
-function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
+export function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
     for (const log of logs){
         if (log.address.toLowerCase() === address.toLowerCase()) {
             try {
@@ -101,97 +101,52 @@ function getNestedErrorData(error) {
                 return new FormattedViemError(`${errorName}${args}`, error?.metaMessages);
             }
         }
-    } catch (decodeErr) {
+    } catch  {
     // If decoding fails, we fall back to the original formatting
     }
+    // Strip ABI from the error object before formatting
+    if (error && typeof error === 'object') {
+        // Create a clone to avoid modifying the original
+        const errorClone = structuredClone(error);
+        // Helper function to recursively remove ABI properties
+        // Strip ABIs from the clone
+        stripAbis(errorClone);
+        // Use the cleaned clone for further processing
+        error = errorClone;
+    }
     // If it's a regular Error instance, return it with its message
     if (error instanceof Error) {
-        return error;
+        return new FormattedViemError(error.message, error?.metaMessages);
     }
-    // Original formatting logic for non-custom errors
-    const truncateHex = (hex, length = 100)=>{
-        if (!hex || typeof hex !== 'string') {
-            return hex;
-        }
-        if (!hex.startsWith('0x')) {
-            return hex;
-        }
-        if (hex.length <= length * 2) {
-            return hex;
-        }
-        return `${hex.slice(0, length)}...${hex.slice(-length)}`;
-    };
-    const formatRequestBody = (body)=>{
-        try {
-            const parsed = JSON.parse(body);
-            // Recursively process all parameters that might contain hex strings
-            const processParams = (obj)=>{
-                if (Array.isArray(obj)) {
-                    return obj.map((item)=>processParams(item));
-                }
-                if (typeof obj === 'object' && obj !== null) {
-                    const result = {};
-                    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;
-            };
-            // Process the entire request body
-            const processed = processParams(parsed);
-            return JSON.stringify(processed, null, 2);
-        } catch  {
-            return body;
+    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) {
+    if (!obj || typeof obj !== 'object') {
+        return;
+    }
+    // Delete ABI property at current level
+    if ('abi' in obj) {
+        delete obj.abi;
+    }
+    // Process cause property
+    if (obj.cause) {
+        stripAbis(obj.cause);
+    }
+    // Process arrays and objects
+    Object.values(obj).forEach((value)=>{
+        if (value && typeof value === 'object') {
+            stripAbis(value);
         }
-    };
-    const truncateHexStringsInText = (text)=>{
-        const hexRegex = /\b0x[a-fA-F0-9]{10,}/g;
-        return text.replace(hexRegex, (hex)=>truncateHex(hex));
-    };
-    const extractAndFormatRequestBody = (message)=>{
-        // 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 hexMatches = content.match(/0x[a-fA-F0-9]+/g) || [];
-                        let processedContent = content;
-                        hexMatches.forEach((hex)=>{
-                            processedContent = processedContent.replace(hex, truncateHex(hex));
-                        });
-                        return `${prefix} ${processedContent}`;
-                    }
-                }
-                return line;
-            });
-            return processedLines.join('\n');
-        });
-        // Finally, catch any remaining hex strings in the message
-        result = truncateHexStringsInText(result);
-        return result;
-    };
-    const formattedRes = extractAndFormatRequestBody(error?.message || String(error));
-    return new FormattedViemError(formattedRes.replace(/\\n/g, '\n'), error?.metaMessages);
+    });
 }
 export function tryGetCustomErrorName(err) {
     try {
@@ -203,7 +158,7 @@ export function tryGetCustomErrorName(err) {
                 return revertError.data?.errorName;
             }
         }
-    } catch (_e) {
+    } catch  {
         return undefined;
     }
 }

package/dest/zkPassportVerifierAddress.d.ts

@@ -0,0 +1,15 @@
+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 declare const ZK_PASSPORT_VERIFIER_ADDRESS: EthAddress;
+/**
+ * The default domain of the zk passport site
+ */
+export declare const ZK_PASSPORT_DOMAIN = "testnet.aztec.network";
+/**
+ * The default scope of the zk passport proofs
+ */
+export declare const ZK_PASSPORT_SCOPE = "personhood";
+//# sourceMappingURL=zkPassportVerifierAddress.d.ts.map

package/dest/zkPassportVerifierAddress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zkPassportVerifierAddress.d.ts","sourceRoot":"","sources":["../src/zkPassportVerifierAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;GAGG;AACH,eAAO,MAAM,4BAA4B,YAAsE,CAAC;AAChH;;GAEG;AACH,eAAO,MAAM,kBAAkB,0BAA0B,CAAC;AAC1D;;GAEG;AACH,eAAO,MAAM,iBAAiB,eAAe,CAAC"}

package/dest/zkPassportVerifierAddress.js

@@ -0,0 +1,11 @@
+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('0x3101Bad9eA5fACadA5554844a1a88F7Fe48D4DE0');
+/**
+ * The default domain of the zk passport site
+ */ export const ZK_PASSPORT_DOMAIN = 'testnet.aztec.network';
+/**
+ * The default scope of the zk passport proofs
+ */ export const ZK_PASSPORT_SCOPE = 'personhood';

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.b655e406",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./eth-cheatcodes": "./dest/eth_cheat_codes.js",
     "./test": "./dest/test/index.js",
     "./contracts": "./dest/contracts/index.js",
     "./deploy-l1-contracts": "./dest/deploy_l1_contracts.js",
     "./l1-contract-addresses": "./dest/l1_contract_addresses.js",
-    "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils_with_blobs.js",
+    "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils/l1_tx_utils_with_blobs.js",
     "./utils": "./dest/utils.js"
   },
   "typedocOptions": {
@@ -23,35 +22,40 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
     "start": "node ./dest/index.js",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
+    "proposer-address": "node ./dest/cli/forwarder_address.js"
   },
   "inherits": [
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/l1-artifacts": "0.0.0-test.1",
+    "@aztec/blob-lib": "0.0.1-commit.b655e406",
+    "@aztec/constants": "0.0.1-commit.b655e406",
+    "@aztec/foundation": "0.0.1-commit.b655e406",
+    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
+    "lodash.chunk": "^4.2.0",
+    "lodash.pickby": "^4.5.0",
     "tslib": "^2.4.0",
-    "viem": "2.22.8",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.14.6",
+    "@jest/globals": "^30.0.0",
+    "@noble/curves": "=1.7.0",
+    "@types/jest": "^30.0.0",
+    "@types/lodash.pickby": "^4",
+    "@types/node": "^22.15.17",
     "@viem/anvil": "^0.0.10",
     "get-port": "^7.1.0",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
     "lodash.omit": "^4.5.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -90,9 +94,13 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/account.ts

@@ -0,0 +1,5 @@
+import { privateKeyToAccount } from 'viem/accounts';
+
+export function getAddressFromPrivateKey(privateKey: `0x${string}`): `0x${string}` {
+  return privateKeyToAccount(privateKey).address;
+}

package/src/client.ts

@@ -1,13 +1,25 @@
 import type { Logger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 
-import { createPublicClient, fallback, http } from 'viem';
+import {
+  type Chain,
+  type HDAccount,
+  type LocalAccount,
+  type PrivateKeyAccount,
+  createPublicClient,
+  createWalletClient,
+  fallback,
+  http,
+  publicActions,
+} from 'viem';
+import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { foundry } from 'viem/chains';
 
 import { createEthereumChain } from './chain.js';
-import type { ViemPublicClient } from './types.js';
+import type { ExtendedViemWalletClient, ViemPublicClient } from './types.js';
 
 type Config = {
-  /** The RPC Url of the ethereum host. */
+  /** List of URLs of Ethereum RPC nodes that services will connect to (comma separated). */
   l1RpcUrls: string[];
   /** The chain ID of the ethereum host. */
   l1ChainId: number;
@@ -15,6 +27,8 @@ type Config = {
   viemPollingIntervalMS?: number;
 };
 
+export type { Config as EthereumClientConfig };
+
 // TODO: Use these methods to abstract the creation of viem clients.
 
 /** Returns a viem public client given the L1 config. */
@@ -40,7 +54,7 @@ async function waitForRpc(client: ViemPublicClient, config: Config, logger?: Log
       let chainId = 0;
       try {
         chainId = await client.getChainId();
-      } catch (err) {
+      } catch {
         logger?.warn(`Failed to connect to Ethereum node at ${config.l1RpcUrls.join(', ')}. Retrying...`);
       }
       return chainId;
@@ -56,3 +70,27 @@ async function waitForRpc(client: ViemPublicClient, config: Config, logger?: Log
     );
   }
 }
+
+export function createExtendedL1Client(
+  rpcUrls: string[],
+  mnemonicOrPrivateKeyOrHdAccount: string | HDAccount | PrivateKeyAccount | LocalAccount,
+  chain: Chain = foundry,
+  pollingIntervalMS?: number,
+  addressIndex?: number,
+): ExtendedViemWalletClient {
+  const hdAccount =
+    typeof mnemonicOrPrivateKeyOrHdAccount === 'string'
+      ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x')
+        ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount as `0x${string}`)
+        : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount, { addressIndex })
+      : mnemonicOrPrivateKeyOrHdAccount;
+
+  const extendedClient = createWalletClient({
+    account: hdAccount,
+    chain,
+    transport: fallback(rpcUrls.map(url => http(url))),
+    pollingInterval: pollingIntervalMS,
+  }).extend(publicActions);
+
+  return extendedClient;
+}