Make schedule and cancel noops when not authorized

Author: ernestognw

contracts/account/modules/ERC7579DelayedExecutor.sol

@@ -91,12 +91,6 @@ abstract contract ERC7579DelayedExecutor is ERC7579Executor {
         bytes32 allowedStates
     );
 
-    /// @dev The operation is not authorized to be canceled.
-    error ERC7579ExecutorUnauthorizedCancellation();
-
-    /// @dev The operation is not authorized to be scheduled.
-    error ERC7579ExecutorUnauthorizedSchedule();
-
     mapping(address account => ExecutionConfig) private _config;
     mapping(bytes32 operationId => Schedule) private _schedules;
 
@@ -227,19 +221,19 @@ abstract contract ERC7579DelayedExecutor is ERC7579Executor {
      * See {_validateSchedule} for authorization checks.
      */
     function schedule(address account, bytes32 salt, bytes32 mode, bytes calldata data) public virtual {
-        bool allowed = _validateSchedule(account, salt, mode, data);
-        _schedule(account, salt, mode, data); // Prioritize errors thrown in _schedule
-        require(allowed, ERC7579ExecutorUnauthorizedSchedule());
+        if (_validateSchedule(account, salt, mode, data)) {
+            _schedule(account, salt, mode, data);
+        } // else no-op
     }
 
     /**
      * @dev Cancels a previously scheduled operation. Can only be called by the account that
      * scheduled the operation. See {_cancel}.
      */
     function cancel(address account, bytes32 salt, bytes32 mode, bytes calldata data) public virtual {
-        bool allowed = _validateCancel(account, salt, mode, data);
-        _cancel(account, mode, data, salt); // Prioritize errors thrown in _cancel
-        require(allowed, ERC7579ExecutorUnauthorizedCancellation());
+        if (_validateCancel(account, salt, mode, data)) {
+            _cancel(account, mode, data, salt);
+        } // else no-op
     }
 
     /**
@@ -325,7 +319,7 @@ abstract contract ERC7579DelayedExecutor is ERC7579Executor {
         bytes32 /* mode */,
         bytes calldata /* data */
     ) internal view virtual returns (bool) {
-        return account == msg.sender;
+        return _config[account].installed && account == msg.sender;
     }
 
     /**

test/account/modules/ERC7579DelayedExecutor.test.js

@@ -12,6 +12,7 @@ const {
   encodeSingle,
 } = require('@openzeppelin/contracts/test/helpers/erc7579');
 const { shouldBehaveLikeERC7579Module } = require('./ERC7579Module.behavior');
+const { OperationState, ProposalState } = require('../../helpers/enums');
 
 async function fixture() {
   // Deploy ERC-7579 validator module
@@ -155,10 +156,14 @@ describe('ERC7579DelayedExecutor', function () {
       ).to.eventually.deep.equal([now, now + this.delay, now + this.delay + this.expiration]);
     });
 
-    it('reverts with ERC7579ExecutorUnauthorizedSchedule if called by other account', async function () {
+    it('no-ops if called by other account', async function () {
+      await this.mock.schedule(this.mockAccount.address, salt, this.mode, this.calldata); // not revert
       await expect(
-        this.mock.schedule(this.mockAccount.address, salt, this.mode, this.calldata),
-      ).to.be.revertedWithCustomError(this.mock, 'ERC7579ExecutorUnauthorizedSchedule');
+        this.mock.getSchedule(this.mockAccount.address, salt, this.mode, this.calldata),
+      ).to.eventually.deep.equal([0n, 0n, 0n]);
+      await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.equal(
+        OperationState.Unknown,
+      );
     });
   });
 
@@ -232,9 +237,12 @@ describe('ERC7579DelayedExecutor', function () {
     });
 
     it('reverts with ERC7579ExecutorUnauthorizedCancellation if called by other account', async function () {
-      await expect(
-        this.mock.cancel(this.mockAccount.address, salt, this.mode, this.calldata),
-      ).to.be.revertedWithCustomError(this.mock, 'ERC7579ExecutorUnauthorizedCancellation');
+      const previousState = await this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata);
+      expect(previousState).to.not.eq(ProposalState.Canceled);
+      await this.mock.cancel(this.mockAccount.address, salt, this.mode, this.calldata); // not revert
+      await expect(this.mock.state(this.mockAccount.address, salt, this.mode, this.calldata)).to.eventually.equal(
+        previousState,
+      );
     });
   });
 });

test/helpers/enums.js

@@ -11,4 +11,5 @@ module.exports = {
     'EmailProof',
   ),
   Case: enums.EnumTyped('CHECKSUM', 'LOWERCASE', 'UPPERCASE', 'ANY'),
+  OperationState: enums.Enum('Unknown', 'Scheduled', 'Ready', 'Expired', 'Executed'),
 };