github/core
1
1
Fork 0
mirror of https://github.com/lens-protocol/core.git synced 2026-04-22 03:02:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove unused tokenOwner from follow with unwrapped token and fix conditions

Browse Source
This commit is contained in:
donosonaumczuk
2022-11-28 16:46:05 +00:00
parent f0d91b7630
commit 0e14e0d285
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
contracts/core/FollowNFT.sol
View File

@@ -105,14 +105,7 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF
} else if ((tokenOwner = _tokenData[followId].owner) != address(0)) {
_followWithWrappedToken(follower, executor, followId, followerOwner, tokenOwner);
} else if ((currentFollower = _followDataByFollowId[followId].follower) != 0) {
_followWithUnwrappedToken(
follower,
executor,
followId,
followerOwner,
tokenOwner,
currentFollower
);
_followWithUnwrappedToken(follower, executor, followId, followerOwner, currentFollower);
} else if (_followDataByFollowId[followId].recoverableBy == follower) {
_followMintingNewToken(follower, executor, followId, followerOwner);
} else {
@@ -155,7 +148,7 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF
if (
followerOwner == tokenOwner ||
executor == tokenOwner ||
_operatorApprovals[tokenOwner][executor] ||
isApprovedForAll(tokenOwner, executor) ||
(approvedTetFollowerInToken = (_approvedSetFollowerInTokenByFollowId[followId] ==
executor))
) {
@@ -209,15 +202,14 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF
address executor,
uint256 followId,
address followerOwner,
address tokenOwner,
uint256 currentFollower
) internal {
bool tokenApproved;
address currentFollowerOwner = IERC721(HUB).ownerOf(currentFollower);
if (
currentFollowerOwner == executor ||
_operatorApprovals[tokenOwner][executor] ||
(tokenApproved = (_tokenApprovals[followId] == executor))
isApprovedForAll(currentFollowerOwner, executor) ||
(tokenApproved = (getApproved(followId) == executor))
) {
// The executor is allowed to transfer the follow.
if (tokenApproved) {
@@ -267,7 +259,7 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF
unfollowerOwner != executor &&
!ILensHub(HUB).isDelegatedExecutorApproved(unfollowerOwner, executor) &&
tokenOwner != executor &&
!_operatorApprovals[tokenOwner][executor]
!isApprovedForAll(tokenOwner, executor)
) {
revert DoesNotHavePermissions();
}
@@ -424,7 +416,7 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF
if (operator == owner) {
revert Errors.ERC721Time_ApprovalToCurrentOwner();
}
if (msg.sender != owner && !_operatorApprovals[owner][msg.sender]) {
if (msg.sender != owner && !isApprovedForAll(owner, msg.sender)) {
revert Errors.ERC721Time_ApproveCallerNotOwnerOrApprovedForAll();
}
_tokenApprovals[followId] = operator;
@@ -435,6 +427,15 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF
);
}
function getApproved(uint256 followId)
public
view
override(ERC721Time, IERC721)
returns (address)
{
return _tokenApprovals[followId];
}
/// @inheritdoc IFollowNFT
function delegate(uint256 delegatorProfile, address delegatee) external override {
if (_followIdByFollowerId[delegatorProfile] == 0) {