From c7f0d544e98b7e030c3f088aeff1eeb04c306e49 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 18 Nov 2024 16:13:18 -0500 Subject: [PATCH] chore: cleanup unused code --- src/account/ModularAccountBase.sol | 3 --- src/libraries/ValidationLocatorLib.sol | 19 ------------------- 2 files changed, 22 deletions(-) diff --git a/src/account/ModularAccountBase.sol b/src/account/ModularAccountBase.sol index 4af9f6de..4ee33a66 100644 --- a/src/account/ModularAccountBase.sol +++ b/src/account/ModularAccountBase.sol @@ -94,9 +94,6 @@ abstract contract ModularAccountBase is bytes4 internal constant _1271_MAGIC_VALUE = 0x1626ba7e; bytes4 internal constant _1271_INVALID = 0xffffffff; - uint8 internal constant _IS_GLOBAL_VALIDATION_BIT = 1; - uint8 internal constant _HAS_DEFERRED_ACTION_BIT = 2; - address internal immutable _EXECUTION_INSTALL_DELEGATE; event DeferredActionNonceInvalidated(uint256 nonce); diff --git a/src/libraries/ValidationLocatorLib.sol b/src/libraries/ValidationLocatorLib.sol index ed7aee09..63a977e9 100644 --- a/src/libraries/ValidationLocatorLib.sol +++ b/src/libraries/ValidationLocatorLib.sol @@ -210,25 +210,6 @@ library ValidationLocatorLib { result = ValidationLookupKey.wrap(uint168(uint160(directCallValidation)) << 8 | _IS_DIRECT_CALL_VALIDATION); } - // function getFromModuleEntity(ModuleEntity _moduleEntity) internal pure returns (ValidationLocator result) { - // (address module, uint32 entityId) = ModuleEntityLib.unpack(_moduleEntity); - // if (entityId == DIRECT_CALL_VALIDATION_ENTITYID) { - // result = ValidationLocator.wrap(uint168(uint160(module)) << 8 | _IS_DIRECT_CALL_VALIDATION); - // } else { - // result = ValidationLocator.wrap(uint168(uint160(entityId)) << 8); - // } - // } - - // function moduleEntity(ValidationLocator locator, address module) internal pure returns (ModuleEntity result) - // { - // if (ValidationLocator.unwrap(locator) & _IS_DIRECT_CALL_VALIDATION != 0) { - // result = ModuleEntityLib.pack(module, DIRECT_CALL_VALIDATION_ENTITYID); - // } else { - // uint32 entityId = uint32(ValidationLocator.unwrap(locator) >> 8); - // result = ModuleEntityLib.pack(module, entityId); - // } - // } - function lookupKey(ValidationLocator locator) internal pure returns (ValidationLookupKey result) { assembly ("memory-safe") { result := and(locator, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF04)