Code-length check on controller and market deployment

wildcat-finance · Nov 6, 2023 · 3b33a2f · 3b33a2f
1 parent 0cb9228
commit 3b33a2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/WildcatMarketController.sol b/src/WildcatMarketController.sol
@@ -348,7 +348,7 @@ contract WildcatMarketController is IWildcatMarketControllerEventsAndErrors {
 
     bytes32 salt = _deriveSalt(asset, namePrefix, symbolPrefix);
     market = LibStoredInitCode.calculateCreate2Address(ownCreate2Prefix, salt, marketInitCodeHash);
-    if (market.codehash != bytes32(0)) {
+    if (market.code.length != 0) {
       revert MarketAlreadyDeployed();
     }
     LibStoredInitCode.create2WithStoredInitCode(marketInitCodeStorage, salt);

diff --git a/src/WildcatMarketControllerFactory.sol b/src/WildcatMarketControllerFactory.sol
@@ -292,13 +292,7 @@ contract WildcatMarketControllerFactory {
       controllerInitCodeHash
     );
 
-    uint256 controllerCodeSize;
-
-    assembly {
-      controllerCodeSize := extcodesize(controller)
-    }
-
-    if (controllerCodeSize > 0) {
+    if (controller.code.length != 0) {
       revert ControllerAlreadyDeployed();
     }
     LibStoredInitCode.create2WithStoredInitCode(controllerInitCodeStorage, salt);