chore: Remove unused submodule and update passkey module creation logic

abstraction-hq · Jun 26, 2024 · a47df92 · a47df92
1 parent f1f21c2
commit a47df92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,6 +10,3 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/openzeppelin/openzeppelin-contracts
-[submodule "lib/webauthn-sol"]
-	path = lib/webauthn-sol
-	url = https://github.com/base-org/webauthn-sol
diff --git a/lib/webauthn-sol b/lib/webauthn-sol
diff --git a/src/WalletFactory.sol b/src/WalletFactory.sol
@@ -34,12 +34,8 @@ contract WalletFactory is IWalletFactory {
         return Wallet(walletAddress);
     }
 
+    // Only create new passkey module not return exited module
     function _createPasskeyModule(uint256 x, uint256 y, bytes32 salt) internal returns (PasskeyModule) {
-        address passkeyModuleAddress = getPasskeyAddress(salt);
-        if (passkeyModuleAddress.code.length > 0) {
-            return PasskeyModule(passkeyModuleAddress);
-        }
-
         PasskeyModule passkeyModule = new PasskeyModule{salt: salt}();
         passkeyModule.initialize(x, y);
         return passkeyModule;
@@ -79,7 +75,7 @@ contract WalletFactory is IWalletFactory {
         return payable(
             Create2.computeAddress(
                 salt,
-                keccak256(type(CustomERC1967).creationCode)
+                getWalletCreationCodeHash()
             )
         );
     }
@@ -88,7 +84,7 @@ contract WalletFactory is IWalletFactory {
         return payable(
             Create2.computeAddress(
                 salt,
-                keccak256(type(PasskeyModule).creationCode)
+                getPasskeyModuleCreationCodeHash()
             )
         );
     }