fix(mock-contract-deployer): resolve deployment stalling issues

- Use viem test client with generatePrivateKey for wallet creation

- Seed deployer wallet with ETH before contract deployment

- Replace custom anvilMine with viem's built-in mine method

- Add proper nonce synchronization with sleep interval

- Normalize addresses using getAddress for consistency

- Update TypeScript config with explicit compiler options

Author: mouseless0x

mock-contract-deployer/src/index.ts

@@ -6,8 +6,14 @@ import {
 	createWalletClient,
 	defineChain,
 	parseEther,
+	getAddress,
+	Chain,
 } from "viem";
-import { mnemonicToAccount } from "viem/accounts";
+import {
+	generatePrivateKey,
+	mnemonicToAccount,
+	privateKeyToAccount,
+} from "viem/accounts";
 import { sendTransaction } from "viem/actions";
 import {
 	BICONOMY_ACCOUNT_V2_LOGIC_CREATECALL,
@@ -46,13 +52,19 @@ import {
 	SIMPLE_ACCOUNT_FACTORY_V08_CREATECALL,
 	SIMPLE_7702_ACCOUNT_IMPLEMENTATION_V08_CREATECALL,
 } from "./constants";
-import { anvilMine, sleep } from "./utils"
-
-const DETERMINISTIC_DEPLOYER = "0x4e59b44847b379578588920ca78fbf26c0b4956c";
-const SAFE_SINGLETON_FACTORY = "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7";
-const BICONOMY_SINGLETON_FACTORY = "0x988C135a1049Ce61730724afD342fb7C56CD2776";
-
-async function getChain(): Promise<ReturnType<typeof defineChain>> {
+import { sleep } from "./utils";
+
+const DETERMINISTIC_DEPLOYER = getAddress(
+	"0x4e59b44847b379578588920ca78fbf26c0b4956c",
+);
+const SAFE_SINGLETON_FACTORY = getAddress(
+	"0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+);
+const BICONOMY_SINGLETON_FACTORY = getAddress(
+	"0x988C135a1049Ce61730724afD342fb7C56CD2776",
+);
+
+async function getChain(): Promise<Chain> {
 	const tempClient = createPublicClient({
 		transport: http(process.env.ANVIL_RPC),
 	});
@@ -77,15 +89,9 @@ async function getChain(): Promise<ReturnType<typeof defineChain>> {
 }
 
 const main = async () => {
-	const chain = await getChain();
-	const walletClient = createWalletClient({
-		account: mnemonicToAccount(
-			"test test test test test test test test test test test junk",
-		),
-		chain,
-		transport: http(process.env.ANVIL_RPC),
-	});
+	const chain: Chain = await getChain();
 
+	// Create clients.
 	const anvilClient = createTestClient({
 		transport: http(process.env.ANVIL_RPC),
 		mode: "anvil",
@@ -97,6 +103,18 @@ const main = async () => {
 		chain,
 	});
 
+	const walletClient = createWalletClient({
+		account: privateKeyToAccount(generatePrivateKey()),
+		chain,
+		transport: http(process.env.ANVIL_RPC),
+	});
+
+	// Seed wallet with ETH for deployment.
+	await anvilClient.setBalance({
+		address: walletClient.account.address,
+		value: parseEther("1000"),
+	});
+
 	const verifyDeployed = async (addresses: Address[]) => {
 		for (const address of addresses) {
 			const bytecode = await client.getCode({
@@ -160,7 +178,6 @@ const main = async () => {
 			data: ENTRY_POINT_V08_CREATECALL,
 			gas: 15_000_000n,
 			nonce: nonce++,
-			chain,
 		})
 		.then(() => console.log("[V0.8 CORE] Deploying EntryPoint"));
 
@@ -509,10 +526,14 @@ const main = async () => {
 	let onchainNonce = 0;
 	do {
 		// Mine a new block including all pending txs so the nonce syncs
-		await anvilMine(1);
+		await anvilClient.mine({ blocks: 1 });
+
+		// Update nonce
 		onchainNonce = await client.getTransactionCount({
 			address: walletClient.account.address,
 		});
+
+		// Sleep for a bit to ensure the nonce is updated
 		await sleep(500);
 	} while (onchainNonce !== nonce);
 

mock-contract-deployer/src/utils.ts

@@ -1,20 +1,3 @@
-const url = new URL(process.env.ANVIL_RPC || 'http://anvil:8545');
-
-export async function anvilMine(numBlocks: number = 1, interval?: number) {
-    await fetch(url, {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({
-            jsonrpc: "2.0",
-            id: 1,
-            method: "anvil_mine",
-            params: [ numBlocks, interval ]
-        })
-	}).then(res => {
-		if (!res.ok) throw new Error("anvil_mine failed")
-	})
-}
-
 export async function sleep(ms: number) {
-    return new Promise(resolve => setTimeout(resolve, ms))
-}
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}

mock-contract-deployer/tsconfig.json

@@ -1,6 +1,24 @@
 {
-    "extends": "@tsconfig/node22/tsconfig.json",
-    "include": [
-        "src/**/*.ts"
-    ]
-}
+    "compilerOptions": {
+        "outDir": "esm",
+        "target": "esnext",
+        "module": "ESNext",
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true,
+        "strict": true,
+        "noImplicitReturns": true,
+        "noUnusedLocals": true,
+        "preserveConstEnums": true,
+        "removeComments": false,
+        "resolveJsonModule": true,
+        "sourceMap": true,
+        "skipLibCheck": true,
+        "declaration": true,
+        "declarationMap": true,
+        "moduleResolution": "node"
+    },
+    "tsc-alias": {
+        "resolveFullPaths": true,
+    }
+}
+