Skip to content

EYT-01M: Inexistent Requirement of Successful Operation #461

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

Merged
Parent: v1.1.0 Migration + Simulation
merged 2 commits into from
May 12, 2025
Merged

EYT-01M: Inexistent Requirement of Successful Operation #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc2f68
feat: revert on no op tx when no entity has been removed
0xlucian May 2, 2025
290408f
refactor: address PR comments
0xlucian May 2, 2025
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
1 change: 1 addition & 0 deletions contracts/protocol/domain/Errors.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ interface EntityErrors {
uint256 sellerId,
uint256 associatedEntityId
);
error NoEntitiesModified(FermionTypes.AssociatedRole associatedRole, uint256 sellerId);
error AccountAlreadyExists(address account);
error NewAccountSameAsOld();
}
Expand Down
15 changes: 13 additions & 2 deletions contracts/protocol/facets/Entity.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,7 @@ contract EntityFacet is Context, EntityErrors, Access, IEntityEvents {
) = getAssociatedLookups(_sellerId, _associatedRole, pl);

mapping(uint256 => FermionTypes.EntityData) storage entityData = FermionStorage.protocolEntities().entityData;
bool found;
for (uint256 i; i < _associatedEntitiesIds.length; ++i) {
uint256 associatedEntityId = _associatedEntitiesIds[i];
if (_add) {
Expand All @@ -740,15 +741,25 @@ contract EntityFacet is Context, EntityErrors, Access, IEntityEvents {
if (j != facilitatorsLength - 1)
associatedEntities[j] = associatedEntities[facilitatorsLength - 1];
associatedEntities.pop();

emit AssociatedEntityRemoved(_associatedRole, _sellerId, associatedEntityId);
found = true;
// stack too deep workaround
_emitAssociatedEntityRemoved(_associatedRole, _sellerId, associatedEntityId);
break;
}
}
}

isAssociatedRole[associatedEntityId] = _add;
}
if (!_add && !found) revert NoEntitiesModified(_associatedRole, _sellerId);
}

function _emitAssociatedEntityRemoved(
FermionTypes.AssociatedRole _associatedRole,
uint256 _sellerId,
uint256 _associatedEntityId
) private {
emit AssociatedEntityRemoved(_associatedRole, _sellerId, _associatedEntityId);
}

/** Returns the storage pointers to associated entities and the mapping of the associated role.
Expand Down
14 changes: 6 additions & 8 deletions test/protocol/entityFacet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,10 +1122,9 @@ describe("Entity", function () {
});

it("Removing a facilitator that was not added", async function () {
await expect(entityFacet.removeFacilitators(sellerId, [6])).to.not.emit(
entityFacet,
"AssociatedEntityRemoved",
);
await expect(entityFacet.removeFacilitators(sellerId, [6]))
.to.be.revertedWithCustomError(fermionErrors, "NoEntitiesModified")
.withArgs(AssociatedRole.Facilitator, sellerId);

// verify state
expect(await entityFacet.getSellersFacilitators(sellerId)).to.eql([
Expand Down Expand Up @@ -1384,10 +1383,9 @@ describe("Entity", function () {
});

it("Removing a royaltyRecipient that was not added", async function () {
await expect(entityFacet.removeRoyaltyRecipients(sellerId, [6])).to.not.emit(
entityFacet,
"AssociatedEntityRemoved",
);
await expect(entityFacet.removeRoyaltyRecipients(sellerId, [6]))
.to.be.revertedWithCustomError(fermionErrors, "NoEntitiesModified")
.withArgs(AssociatedRole.RoyaltyRecipient, sellerId);

// verify state
expect(await entityFacet.getSellersRoyaltyRecipients(sellerId)).to.eql([
Expand Down