Skip to content

refactor(LensSeaDropCollection): use ActionRestricted inheritance instead of custom modifier #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeVikingMark wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(LensSeaDropCollection): use ActionRestricted inheritance instead of custom modifier #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions contracts/modules/act/seadrop/LensSeaDropCollection.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,20 @@ import {ERC721SeaDropCloneable} from '@seadrop/clones/ERC721SeaDropCloneable.sol
import {ISeaDrop} from '@seadrop/interfaces/ISeaDrop.sol';
import {PublicDrop} from '@seadrop/lib/SeaDropStructs.sol';
import {ILensHub} from 'contracts/interfaces/ILensHub.sol';
import {ActionRestricted} from 'contracts/modules/ActionRestricted.sol';

contract LensSeaDropCollection is ERC721SeaDropCloneable {
error OnlySeaDropActionModule();
contract LensSeaDropCollection is ERC721SeaDropCloneable, ActionRestricted {
error FeesDoNotCoverLensTreasury();
error InvalidParams();

uint16 private constant ROYALTIES_BPS = 1_000;

address immutable HUB;

address immutable SEADROP_ACTION_MODULE;

address immutable DEFAULT_SEADROP;

// TODO: Might use the ActionRestricted inheritance instead.
modifier onlySeaDropActionModule() {
if (msg.sender != SEADROP_ACTION_MODULE) {
revert OnlySeaDropActionModule();
}
_;
}

constructor(address lensHub, address seaDropActionModule, address defaultSeaDrop) {
constructor(address lensHub, address seaDropActionModule, address defaultSeaDrop) ActionRestricted(seaDropActionModule) {
HUB = lensHub;
SEADROP_ACTION_MODULE = seaDropActionModule;
DEFAULT_SEADROP = defaultSeaDrop;
}

Expand All @@ -39,7 +28,7 @@ contract LensSeaDropCollection is ERC721SeaDropCloneable {
string calldata symbol,
address[] calldata allowedSeaDrops,
MultiConfigureStruct calldata config
) external onlySeaDropActionModule {
) external onlyActionModule {
_validateInitializationData(allowedSeaDrops, config);
super.initialize({
__name: name,
Expand All @@ -61,11 +50,11 @@ contract LensSeaDropCollection is ERC721SeaDropCloneable {
revert InvalidParams();
}
// Makes sure that the SeaDropMintPublicationAction is allowed as a fee recipient.
if (config.allowedFeeRecipients.length == 0 || config.allowedFeeRecipients[0] != SEADROP_ACTION_MODULE) {
if (config.allowedFeeRecipients.length == 0 || config.allowedFeeRecipients[0] != ACTION_MODULE) {
revert InvalidParams();
}
// Makes sure that the SeaDropMintPublicationAction is allowed as a payer.
if (config.allowedPayers.length == 0 || config.allowedPayers[0] != SEADROP_ACTION_MODULE) {
if (config.allowedPayers.length == 0 || config.allowedPayers[0] != ACTION_MODULE) {
revert InvalidParams();
}
// NOTE: Validations of fee BPS, disallowed fee recipients or payers are done in the respective overridden
Expand Down Expand Up @@ -124,7 +113,7 @@ contract LensSeaDropCollection is ERC721SeaDropCloneable {
bool allowed
) external virtual override {
// We only enforce the SeaDropMintPublicationAction to be used as a fee recipient when using the default SeaDrop.
if (seaDropImpl == DEFAULT_SEADROP && !allowed && feeRecipient == SEADROP_ACTION_MODULE) {
if (seaDropImpl == DEFAULT_SEADROP && !allowed && feeRecipient == ACTION_MODULE) {
revert InvalidParams();
}
// Ensure the sender is only the owner or this contract itself.
Expand All @@ -147,7 +136,7 @@ contract LensSeaDropCollection is ERC721SeaDropCloneable {
*/
function updatePayer(address seaDropImpl, address payer, bool allowed) external virtual override {
// We only enforce the SeaDropMintPublicationAction to be enabled as a payer when using the default SeaDrop.
if (seaDropImpl == DEFAULT_SEADROP && !allowed && payer == SEADROP_ACTION_MODULE) {
if (seaDropImpl == DEFAULT_SEADROP && !allowed && payer == ACTION_MODULE) {
revert InvalidParams();
}
// Ensure the sender is only the owner or this contract itself.
Expand Down