@aztec/ethereum 0.0.0-test.0 → 0.0.1-commit.21caa21

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.0.0-test.0",
+  "version": "0.0.1-commit.21caa21",
   "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": {
@@ -20,38 +19,44 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && tsgo -b",
+    "build:dev": "tsgo -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:dev": "concurrently -k \"tsgo -b -w\" \"nodemon --watch dest --exec 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.0",
-    "@aztec/foundation": "0.0.0-test.0",
-    "@aztec/l1-artifacts": "0.0.0-test.0",
+    "@aztec/blob-lib": "0.0.1-commit.21caa21",
+    "@aztec/constants": "0.0.1-commit.21caa21",
+    "@aztec/foundation": "0.0.1-commit.21caa21",
+    "@aztec/l1-artifacts": "0.0.1-commit.21caa21",
     "@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:@aztec/viem@2.38.2",
     "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",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "@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 +95,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;
+}