diff --git a/contracts/modules/socialRecovery/base/BaseSocialRecovery.sol b/contracts/modules/socialRecovery/base/BaseSocialRecovery.sol index f71f2a2..537ce14 100644 --- a/contracts/modules/socialRecovery/base/BaseSocialRecovery.sol +++ b/contracts/modules/socialRecovery/base/BaseSocialRecovery.sol @@ -28,7 +28,7 @@ abstract contract BaseSocialRecovery is ISocialRecovery, EIP712 { uint256 internal constant _DONE_TIMESTAMP = uint256(1); bytes32 private constant _TYPE_HASH_SOCIAL_RECOVERY = - keccak256("SocialRecovery(address wallet,uint256 nonce, bytes32[] newOwner)"); + keccak256("SocialRecovery(address wallet,uint256 nonce,bytes32[] newOwner)"); function walletNonce(address wallet) public view override returns (uint256 _nonce) { return socialRecoveryInfo[wallet].nonce; @@ -88,21 +88,6 @@ abstract contract BaseSocialRecovery is ISocialRecovery, EIP712 { emit DelayPeriodSet(wallet, newDelay); } - function cancelRecovery(bytes32 recoveryId) external { - address wallet = _msgSender(); - if (!isOperationPending(wallet, recoveryId)) { - revert UNEXPECTED_OPERATION_STATE( - wallet, - recoveryId, - _encodeStateBitmap(OperationState.Waiting) | _encodeStateBitmap(OperationState.Ready) - ); - } - - delete socialRecoveryInfo[wallet].operationValidAt[recoveryId]; - _increaseNonce(wallet); - emit RecoveryCancelled(wallet, recoveryId); - } - function cancelAllRecovery() external { address wallet = _msgSender(); _increaseNonce(wallet); diff --git a/contracts/modules/socialRecovery/interfaces/ISocialRecovery.sol b/contracts/modules/socialRecovery/interfaces/ISocialRecovery.sol index 81fdcc5..dcd6369 100644 --- a/contracts/modules/socialRecovery/interfaces/ISocialRecovery.sol +++ b/contracts/modules/socialRecovery/interfaces/ISocialRecovery.sol @@ -37,7 +37,6 @@ interface ISocialRecovery { function setGuardian(bytes32 newGuardianHash) external; function setDelayPeriod(uint256 newDelay) external; - function cancelRecovery(bytes32 recoveryId) external; enum OperationState { Unset, diff --git a/test/modules/socialRecovery/SocialRecoveryModule.t.sol b/test/modules/socialRecovery/SocialRecoveryModule.t.sol index 2eed8a5..e28bb17 100644 --- a/test/modules/socialRecovery/SocialRecoveryModule.t.sol +++ b/test/modules/socialRecovery/SocialRecoveryModule.t.sol @@ -30,7 +30,7 @@ contract SocialRecoveryModuleTest is Test { uint256 delayTime; bytes32 private constant _TYPE_HASH_SOCIAL_RECOVERY = - keccak256("SocialRecovery(address wallet,uint256 nonce, bytes32[] newOwner)"); + keccak256("SocialRecovery(address wallet,uint256 nonce,bytes32[] newOwner)"); bytes32 private constant _TYPEHASH = keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"); bytes32 private DOMAIN_SEPARATOR;