From 822f4807190d2c6fb28eac730ad434d18efe03ea Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Fri, 21 Feb 2025 19:51:40 +0100
Subject: [PATCH 1/3] Add Arachnid's deployer to the common contracts

---
 hardhat/common-contracts.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hardhat/common-contracts.js b/hardhat/common-contracts.js
index d9a3bd25295..9ea04d8d421 100644
--- a/hardhat/common-contracts.js
+++ b/hardhat/common-contracts.js
@@ -6,6 +6,7 @@ const fs = require('fs');
 const path = require('path');
 
 const INSTANCES = {
+  // Entrypoint v0.7.0
   entrypoint: {
     address: '0x0000000071727De22E5E9d8BAf0edAc6f37da032',
     abi: JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/bin/EntryPoint070.abi'), 'utf-8')),
@@ -16,6 +17,14 @@ const INSTANCES = {
     abi: JSON.parse(fs.readFileSync(path.resolve(__dirname, '../test/bin/SenderCreator070.abi'), 'utf-8')),
     bytecode: fs.readFileSync(path.resolve(__dirname, '../test/bin/SenderCreator070.bytecode'), 'hex'),
   },
+  // Arachnid's deterministic deployment proxy
+  // See: https://github.com/Arachnid/deterministic-deployment-proxy/tree/master
+  arachnidDeployer: {
+    address: '0x4e59b44847b379578588920ca78fbf26c0b4956c',
+    abi: [],
+    bytecode:
+      '0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3',
+  },
 };
 
 task(TASK_TEST_SETUP_TEST_ENVIRONMENT).setAction((_, env, runSuper) =>

From b39bc18a0f344597cb7088445d7e6ff3eb790fac Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Fri, 21 Feb 2025 22:45:24 +0100
Subject: [PATCH 2/3] Add Mocah's deployer

---
 hardhat/common-contracts.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hardhat/common-contracts.js b/hardhat/common-contracts.js
index 9ea04d8d421..9cdeb7ff516 100644
--- a/hardhat/common-contracts.js
+++ b/hardhat/common-contracts.js
@@ -20,11 +20,17 @@ const INSTANCES = {
   // Arachnid's deterministic deployment proxy
   // See: https://github.com/Arachnid/deterministic-deployment-proxy/tree/master
   arachnidDeployer: {
-    address: '0x4e59b44847b379578588920ca78fbf26c0b4956c',
+    address: '0x4e59b44847b379578588920cA78FbF26c0B4956C',
     abi: [],
     bytecode:
       '0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3',
   },
+  // Mocah's deployer
+  mocahDeployer: {
+    address: '0x7A0D94F55792C434d74a40883C6ed8545E406D12',
+    abi: [],
+    bytecode: '0x60003681823780368234f58015156014578182fd5b80825250506014600cf3',
+  },
 };
 
 task(TASK_TEST_SETUP_TEST_ENVIRONMENT).setAction((_, env, runSuper) =>

From f58fdb035722cc388747c3bdb3c1173896312ca5 Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Fri, 21 Feb 2025 22:50:19 +0100
Subject: [PATCH 3/3] Update hardhat/common-contracts.js

---
 hardhat/common-contracts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hardhat/common-contracts.js b/hardhat/common-contracts.js
index 9cdeb7ff516..33248ec9183 100644
--- a/hardhat/common-contracts.js
+++ b/hardhat/common-contracts.js
@@ -25,8 +25,8 @@ const INSTANCES = {
     bytecode:
       '0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3',
   },
-  // Mocah's deployer
-  mocahDeployer: {
+  // Micah's deployer
+  micahDeployer: {
     address: '0x7A0D94F55792C434d74a40883C6ed8545E406D12',
     abi: [],
     bytecode: '0x60003681823780368234f58015156014578182fd5b80825250506014600cf3',