Skip to content

Commit

Permalink
executor interface
Browse files Browse the repository at this point in the history
  • Loading branch information
novaknole committed Sep 26, 2024
1 parent b981a6f commit 2f488d9
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion packages/contracts/src/core/dao/DAO.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {ProtocolVersion} from "@aragon/osx-commons-contracts/src/utils/versionin
import {VersionComparisonLib} from "@aragon/osx-commons-contracts/src/utils/versioning/VersionComparisonLib.sol";
import {hasBit, flipBit} from "@aragon/osx-commons-contracts/src/utils/math/BitMap.sol";
import {IDAO} from "@aragon/osx-commons-contracts/src/dao/IDAO.sol";
import {IExecutor} from "@aragon/osx-commons-contracts/src/executors/IExecutor.sol";

import {PermissionManager} from "../permission/PermissionManager.sol";
import {CallbackHandler} from "../utils/CallbackHandler.sol";
Expand All @@ -35,6 +36,7 @@ contract DAO is
IERC1271,
ERC165StorageUpgradeable,
IDAO,
IExecutor,
UUPSUpgradeable,
ProtocolVersion,
PermissionManager,
Expand Down Expand Up @@ -159,6 +161,7 @@ contract DAO is
_reentrancyStatus = _NOT_ENTERED; // added in v1.3.0

_registerInterface(type(IDAO).interfaceId);
_registerInterface(type(IExecutor).interfaceId);
_registerInterface(type(IERC1271).interfaceId);
_registerInterface(type(IEIP4824).interfaceId);
_registerInterface(type(IProtocolVersion).interfaceId); // added in v1.3.0
Expand Down Expand Up @@ -198,6 +201,8 @@ contract DAO is
_who: address(this),
_permissionId: keccak256("SET_SIGNATURE_VALIDATOR_PERMISSION")
});

_registerInterface(type(IExecutor).interfaceId);
}
}

Expand Down Expand Up @@ -246,7 +251,7 @@ contract DAO is
_setMetadata(_metadata);
}

/// @inheritdoc IDAO
/// @inheritdoc IExecutor
function execute(
bytes32 _callId,
Action[] calldata _actions,
Expand Down

0 comments on commit 2f488d9

Please sign in to comment.