Merge pull request #21 from BermudaBay/main

fix: nonce stalling by cheat mining an anvil block

Author: mouseless0x

mock-contract-deployer/src/index.ts

@@ -46,6 +46,7 @@ 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";
@@ -507,10 +508,12 @@ const main = async () => {
 
 	let onchainNonce = 0;
 	do {
+		// Mine a new block including all pending txs so the nonce syncs
+		await anvilMine(1);
 		onchainNonce = await client.getTransactionCount({
 			address: walletClient.account.address,
 		});
-		await new Promise((resolve) => setTimeout(resolve, 500));
+		await sleep(500);
 	} while (onchainNonce !== nonce);
 
 	// ==== SETUP KERNEL V0.6 CONTRACTS ==== //

mock-contract-deployer/src/utils.ts

@@ -0,0 +1,20 @@
+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))
+}