feat: add createX preinstall

defi-wonderland · Aug 21, 2024 · 3e363ad · 3e363ad
1 parent 185fb80
commit 3e363ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/packages/contracts-bedrock/scripts/L2Genesis.s.sol b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
@@ -517,6 +517,7 @@ contract L2Genesis is Deployer {
         _setPreinstallCode(Preinstalls.SenderCreator_v070); // ERC 4337 v0.7.0
         _setPreinstallCode(Preinstalls.EntryPoint_v070); // ERC 4337 v0.7.0
         _setPreinstallCode(Preinstalls.BeaconBlockRoots);
+        _setPreinstallCode(Preinstalls.CreateXDeployer);
         // 4788 sender nonce must be incremented, since it's part of later upgrade-transactions.
         // For the upgrade-tx to not create a contract that conflicts with an already-existing copy,
         // the nonce must be bumped.

diff --git a/packages/contracts-bedrock/src/libraries/Preinstalls.sol b/packages/contracts-bedrock/src/libraries/Preinstalls.sol
diff --git a/packages/contracts-bedrock/test/L2Genesis.t.sol b/packages/contracts-bedrock/test/L2Genesis.t.sol
@@ -188,7 +188,7 @@ contract L2GenesisTest is Test {
         expected += 2048 - 2; // predeploy proxies
         expected += 21; // predeploy implementations (excl. legacy erc20-style eth and legacy message sender)
         expected += 256; // precompiles
-        expected += 12; // preinstalls
+        expected += 13; // preinstalls
         expected += 1; // 4788 deployer account
         // 16 prefunded dev accounts are excluded
         assertEq(expected, getJSONKeyCount(_path), "key count check");

diff --git a/packages/contracts-bedrock/test/Preinstalls.t.sol b/packages/contracts-bedrock/test/Preinstalls.t.sol
@@ -118,4 +118,8 @@ contract PreinstallsTest is CommonTest {
         assertPreinstall(Preinstalls.BeaconBlockRoots, Preinstalls.BeaconBlockRootsCode);
         assertEq(vm.getNonce(Preinstalls.BeaconBlockRootsSender), 1, "4788 sender must have nonce=1");
     }
+
+    function test_preinstall_createXDeployer_succeeds() external view {
+        assertPreinstall(Preinstalls.CreateXDeployer, Preinstalls.CreateXDeployerCode);
+    }
 }
diff --git a/packages/contracts-bedrock/test/setup/Setup.sol b/packages/contracts-bedrock/test/setup/Setup.sol
@@ -233,6 +233,7 @@ contract Setup {
         labelPreinstall(Preinstalls.SenderCreator_v070);
         labelPreinstall(Preinstalls.EntryPoint_v070);
         labelPreinstall(Preinstalls.BeaconBlockRoots);
+        labelPreinstall(Preinstalls.CreateXDeployer);
 
         console.log("Setup: completed L2 genesis");
     }