diff --git a/src/badge/examples/ScrollBadgePermissionless.sol b/src/badge/examples/ScrollBadgePermissionless.sol index 6660251..f21d497 100644 --- a/src/badge/examples/ScrollBadgePermissionless.sol +++ b/src/badge/examples/ScrollBadgePermissionless.sol @@ -6,11 +6,12 @@ import {Attestation} from "@eas/contracts/IEAS.sol"; import {ScrollBadge} from "../ScrollBadge.sol"; import {ScrollBadgeSelfAttest} from "../extensions/ScrollBadgeSelfAttest.sol"; +import {ScrollBadgeEligibilityCheck} from "../extensions/ScrollBadgeEligibilityCheck.sol"; import {ScrollBadgeSingleton} from "../extensions/ScrollBadgeSingleton.sol"; /// @title ScrollBadgePermissionless /// @notice A simple badge that anyone can mint in a permissionless manner. -contract ScrollBadgePermissionless is ScrollBadgeSelfAttest, ScrollBadgeSingleton { +contract ScrollBadgePermissionless is ScrollBadgeSelfAttest, ScrollBadgeEligibilityCheck, ScrollBadgeSingleton { constructor(address resolver_) ScrollBadge(resolver_) { // empty } @@ -19,7 +20,7 @@ contract ScrollBadgePermissionless is ScrollBadgeSelfAttest, ScrollBadgeSingleto function onIssueBadge(Attestation calldata attestation) internal virtual - override (ScrollBadgeSelfAttest, ScrollBadgeSingleton) + override (ScrollBadge, ScrollBadgeSelfAttest, ScrollBadgeSingleton) returns (bool) { return super.onIssueBadge(attestation); @@ -29,7 +30,7 @@ contract ScrollBadgePermissionless is ScrollBadgeSelfAttest, ScrollBadgeSingleto function onRevokeBadge(Attestation calldata attestation) internal virtual - override (ScrollBadgeSelfAttest, ScrollBadgeSingleton) + override (ScrollBadge, ScrollBadgeSelfAttest, ScrollBadgeSingleton) returns (bool) { return super.onRevokeBadge(attestation); @@ -39,4 +40,9 @@ contract ScrollBadgePermissionless is ScrollBadgeSelfAttest, ScrollBadgeSingleto function badgeTokenURI(bytes32 /*uid*/ ) public pure override returns (string memory) { return ""; } + + /// @inheritdoc ScrollBadgeEligibilityCheck + function isEligible(address) external view virtual override returns (bool) { + return true; + } } diff --git a/src/badge/examples/ScrollBadgeWhale.sol b/src/badge/examples/ScrollBadgeWhale.sol index 65a7af5..7c21697 100644 --- a/src/badge/examples/ScrollBadgeWhale.sol +++ b/src/badge/examples/ScrollBadgeWhale.sol @@ -11,17 +11,13 @@ import {Unauthorized} from "../../Errors.sol"; /// @title ScrollBadgeWhale /// @notice A badge that shows that the user had 1000 ETH or more at the time of minting. -contract ScrollBadgeWhale is ScrollBadgePermissionless, ScrollBadgeEligibilityCheck { +contract ScrollBadgeWhale is ScrollBadgePermissionless { constructor(address resolver_) ScrollBadgePermissionless(resolver_) { // empty } /// @inheritdoc ScrollBadge - function onIssueBadge(Attestation calldata attestation) - internal - override (ScrollBadge, ScrollBadgePermissionless) - returns (bool) - { + function onIssueBadge(Attestation calldata attestation) internal override returns (bool) { if (!super.onIssueBadge(attestation)) { return false; } @@ -34,11 +30,7 @@ contract ScrollBadgeWhale is ScrollBadgePermissionless, ScrollBadgeEligibilityCh } /// @inheritdoc ScrollBadge - function onRevokeBadge(Attestation calldata attestation) - internal - override (ScrollBadge, ScrollBadgePermissionless) - returns (bool) - { + function onRevokeBadge(Attestation calldata attestation) internal override returns (bool) { if (!super.onRevokeBadge(attestation)) { return false; }