Add support of ERC165 to basic validator

contracts/validators/CredentialAtomicQueryValidator.sol

@@ -2,14 +2,15 @@
 pragma solidity 0.8.16;
 
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {GenesisUtils} from "../lib/GenesisUtils.sol";
 import {ICircuitValidator} from "../interfaces/ICircuitValidator.sol";
 import {ICircuitValidatorExtended} from "../interfaces/ICircuitValidatorExtended.sol";
 import {IVerifier} from "../interfaces/IVerifier.sol";
 import {IState} from "../interfaces/IState.sol";
 import {PoseidonFacade} from "../lib/Poseidon.sol";
 
-abstract contract CredentialAtomicQueryValidator is OwnableUpgradeable, ICircuitValidatorExtended {
+abstract contract CredentialAtomicQueryValidator is OwnableUpgradeable, ICircuitValidatorExtended, ERC165 {
     struct CredentialAtomicQuery {
         uint256 schema;
         uint256 claimPathKey;
@@ -108,6 +109,13 @@ abstract contract CredentialAtomicQueryValidator is OwnableUpgradeable, ICircuit
         return --index; // we save 1-based index, but return 0-based
     }
 
+    /**
+ * @dev See {IERC165-supportsInterface}.
+     */
+    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
+        return interfaceId == type(ICircuitValidatorExtended).interfaceId || super.supportsInterface(interfaceId);
+    }
+
     function _verify(
         uint256[] calldata inputs,
         uint256[2] calldata a,

contracts/verifiers/UniversalVerifier.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {ICircuitValidator} from "../interfaces/ICircuitValidator.sol";
 import {IZKPVerifier} from "../interfaces/IZKPVerifier.sol";
 import {ArrayUtils} from "../lib/ArrayUtils.sol";
@@ -260,8 +261,11 @@ contract UniversalVerifier is OwnableUpgradeable {
         uint256[2] calldata c
     ) public view requestEnabled(requestId) checkValidatorIsSet(requestId) {
         IZKPVerifier.ZKPRequestExtended memory request = _getMainStorage().requests[requestId];
+        require(
+            IERC165(address(request.validator)).supportsInterface(type(ICircuitValidatorExtended).interfaceId),
+            "Validator doesn't support extended interface"
+        );
 
-        // TODO check with standard interface detection here!!!
         request.validator.verifyWithSender(inputs, a, b, c, request.data, _msgSender());
     }