Skip to content

fix: duplicates selectors fixed #1326

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
merged 4 commits into from
Oct 8, 2025
Merged

fix: duplicates selectors fixed #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cad2a3
fix: duplicates selectors fixed
AlbertoMolinaIoBuilders Oct 6, 2025
f2643f4
fix: package-lock updated
AlbertoMolinaIoBuilders Oct 6, 2025
2baaf02
Merge branch 'develop' into auditIssue/BBND-1170
AlbertoMolinaIoBuilders Oct 6, 2025
1821c96
Merge remote-tracking branch 'origin/develop' into auditIssue/BBND-1170
AlbertoMolinaIoBuilders Oct 8, 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
11 changes: 9 additions & 2 deletions contracts/contracts/resolver/diamondCutManager/DiamondCutManagerWrapper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,15 @@ abstract contract DiamondCutManagerWrapper is IDiamondCutManager, BusinessLogicR
for (uint256 index; index < length; ) {
bytes4 selector = selectors[index];
bytes32 configVersionSelectorHash = _buildHashSelector(_configurationId, _version, selector);
_dcms.facetAddress[configVersionSelectorHash] = selectorAddress;
_dcms.selectorToFacetId[configVersionSelectorHash] = _facetId;

if (_dcms.facetAddress[configVersionSelectorHash] != address(0)) {
address previousFacetAddress = _dcms.facetAddress[configVersionSelectorHash];
if (previousFacetAddress != selectorAddress)
revert SelectorAlreadyRegistered(previousFacetAddress, selectorAddress);
} else {
_dcms.facetAddress[configVersionSelectorHash] = selectorAddress;
_dcms.selectorToFacetId[configVersionSelectorHash] = _facetId;
}
unchecked {
++index;
}
Expand Down
3 changes: 3 additions & 0 deletions contracts/contracts/resolver/interfaces/diamondCutManager/IDiamondCutManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ interface IDiamondCutManager {
/// @notice error that occurs when try to add a selector and the selector is blacklisted
error SelectorBlacklisted(bytes4 selector);

/// @notice error that occurs when trying to assign an already assigned selector to a new facet address
error SelectorAlreadyRegistered(address firstAddress, address secondAddress);

/// @notice error that occurs when defining a configuration with an empty facet array list
error EmptyConfiguration();

Expand Down