Skip to content

Chore/updates and fixes #21

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
dadadave80 merged 3 commits into from
Apr 3, 2026
Merged

Chore/updates and fixes #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10f0a78
Use forge inspect via FFI for selector extraction
dadadave80 Apr 3, 2026
a6731b2
Add extensive diamond test coverage
dadadave80 Apr 3, 2026
4a64dd8
Remove memory-variant diamond cut functions
dadadave80 Apr 3, 2026
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 foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ remappings = [
]
optimizer_runs = 1_000_000
via_ir = false
ffi = true

[profile.ci]
optimizer_runs = 1_000_000
Expand Down
2 changes: 1 addition & 1 deletion src/Diamond.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ abstract contract Diamond {
bytes32 s = InitializableLib.initializableSlot();
InitializableLib.preInitializer(s);

DiamondLib.diamondCutCalldata(_facetCuts, _init, _calldata);
DiamondLib.diamondCut(_facetCuts, _init, _calldata);

InitializableLib.postInitializer(s);
}
Expand Down
2 changes: 1 addition & 1 deletion src/facets/DiamondCutFacet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ contract DiamondCutFacet is IDiamondCut {
// Check that the caller is the owner
OwnableRolesLib.checkOwner();
// Call the diamond cut function from the library
DiamondLib.diamondCutCalldata(_diamondCut, _init, _calldata);
DiamondLib.diamondCut(_diamondCut, _init, _calldata);
}
}
137 changes: 6 additions & 131 deletions src/libraries/DiamondLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ library DiamondLib {
/// @param _facetCuts Contains the facet addresses, cut actions and function selectors.
/// @param _init The address of the contract or facet to execute `data`.
/// @param _calldata A function call, including function selector and arguments.
function diamondCut(FacetCut[] memory _facetCuts, address _init, bytes memory _calldata) internal {
function diamondCut(FacetCut[] calldata _facetCuts, address _init, bytes calldata _calldata) internal {
DiamondStorage storage ds = diamondStorage();
uint256 facetCutsLength = _facetCuts.length;
for (uint256 i; i < facetCutsLength; ++i) {
Expand All @@ -179,7 +179,7 @@ library DiamondLib {
/// @dev Add functions to the diamond.
/// @param _facetAddress The address of the facet to add functions to.
/// @param _functionSelectors The function selectors to add to the facet.
function addFunctions(DiamondStorage storage _ds, address _facetAddress, bytes4[] memory _functionSelectors)
function addFunctions(DiamondStorage storage _ds, address _facetAddress, bytes4[] calldata _functionSelectors)
internal
{
uint256 functionSelectorsLength = _functionSelectors.length;
Expand All @@ -204,7 +204,7 @@ library DiamondLib {
/// @dev Replace functions in the diamond.
/// @param _facetAddress The address of the facet to replace functions from.
/// @param _functionSelectors The function selectors to replace in the facet.
function replaceFunctions(DiamondStorage storage _ds, address _facetAddress, bytes4[] memory _functionSelectors)
function replaceFunctions(DiamondStorage storage _ds, address _facetAddress, bytes4[] calldata _functionSelectors)
internal
{
uint256 functionSelectorsLength = _functionSelectors.length;
Expand All @@ -230,112 +230,9 @@ library DiamondLib {
/// @dev Remove functions from the diamond.
/// @param _facetAddress The address of the facet to remove functions from.
/// @param _functionSelectors The function selectors to remove from the facet.
function removeFunctions(DiamondStorage storage _ds, address _facetAddress, bytes4[] memory _functionSelectors)
function removeFunctions(DiamondStorage storage _ds, address _facetAddress, bytes4[] calldata _functionSelectors)
internal
{
uint256 functionSelectorsLength = _functionSelectors.length;
if (_facetAddress != address(0)) {
revert RemoveFacetAddressMustBeZeroAddress(_facetAddress);
}
if (functionSelectorsLength == 0) {
revert NoSelectorsProvidedForFacetCut(_facetAddress);
}
for (uint256 i; i < functionSelectorsLength; ++i) {
bytes4 selector = _functionSelectors[i];
address oldFacetAddress = selectorToFacet(_ds, selector);
removeFunction(_ds, oldFacetAddress, selector);
}
}

//*//////////////////////////////////////////////////////////////////////////
// CALLDATA DIAMOND CUT
//////////////////////////////////////////////////////////////////////////*//

/// @dev Add/replace/remove any number of functions and optionally execute
/// a function with delegatecall.
/// @param _facetCuts Contains the facet addresses, cut actions and function selectors.
/// @param _init The address of the contract or facet to execute `data`.
/// @param _calldata A function call, including function selector and arguments.
function diamondCutCalldata(FacetCut[] calldata _facetCuts, address _init, bytes calldata _calldata) internal {
DiamondStorage storage ds = diamondStorage();
uint256 facetCutsLength = _facetCuts.length;
for (uint256 i; i < facetCutsLength; ++i) {
if (_facetCuts[i].action == FacetCutAction.Add) {
addFunctionsCalldata(ds, _facetCuts[i].facetAddress, _facetCuts[i].functionSelectors);
} else if (_facetCuts[i].action == FacetCutAction.Replace) {
replaceFunctionsCalldata(ds, _facetCuts[i].facetAddress, _facetCuts[i].functionSelectors);
} else {
removeFunctionsCalldata(ds, _facetCuts[i].facetAddress, _facetCuts[i].functionSelectors);
}
}

initializeDiamondCutCalldata(_init, _calldata);
emit DiamondCut(_facetCuts, _init, _calldata);
}

/// @dev Add functions to the diamond.
/// @param _facetAddress The address of the facet to add functions to.
/// @param _functionSelectors The function selectors to add to the facet.
function addFunctionsCalldata(
DiamondStorage storage _ds,
address _facetAddress,
bytes4[] calldata _functionSelectors
) internal {
uint256 functionSelectorsLength = _functionSelectors.length;
if (functionSelectorsLength == 0) revert NoSelectorsGivenToAdd();
if (_facetAddress == address(0)) {
revert CannotAddSelectorsToZeroAddress(_functionSelectors);
}
uint96 selectorPosition = uint96(facetToSelectors(_ds, _facetAddress).length);
// Add new facet address if it does not exist
if (selectorPosition == 0) addFacet(_ds, _facetAddress);
for (uint256 i; i < functionSelectorsLength; ++i) {
bytes4 selector = _functionSelectors[i];
address oldFacetAddress = selectorToFacet(_ds, selector);
if (oldFacetAddress != address(0)) {
revert CannotAddFunctionToDiamondThatAlreadyExists(selector);
}
addFunction(_ds, selector, selectorPosition, _facetAddress);
++selectorPosition;
}
}

/// @dev Replace functions in the diamond.
/// @param _facetAddress The address of the facet to replace functions from.
/// @param _functionSelectors The function selectors to replace in the facet.
function replaceFunctionsCalldata(
DiamondStorage storage _ds,
address _facetAddress,
bytes4[] calldata _functionSelectors
) internal {
uint256 functionSelectorsLength = _functionSelectors.length;
if (functionSelectorsLength == 0) revert NoSelectorsGivenToAdd();
if (_facetAddress == address(0)) {
revert CannotAddSelectorsToZeroAddress(_functionSelectors);
}
uint96 selectorPosition = uint96(facetToSelectors(_ds, _facetAddress).length);
// add new facet address if it does not exist
if (selectorPosition == 0) addFacet(_ds, _facetAddress);
for (uint256 i; i < functionSelectorsLength; ++i) {
bytes4 selector = _functionSelectors[i];
address oldFacetAddress = selectorToFacet(_ds, selector);
if (oldFacetAddress == _facetAddress) {
revert CannotReplaceFunctionWithTheSameFunctionFromTheSameFacet(selector);
}
removeFunction(_ds, oldFacetAddress, selector);
addFunction(_ds, selector, selectorPosition, _facetAddress);
++selectorPosition;
}
}

/// @dev Remove functions from the diamond.
/// @param _facetAddress The address of the facet to remove functions from.
/// @param _functionSelectors The function selectors to remove from the facet.
function removeFunctionsCalldata(
DiamondStorage storage _ds,
address _facetAddress,
bytes4[] calldata _functionSelectors
) internal {
if (_facetAddress != address(0)) {
revert RemoveFacetAddressMustBeZeroAddress(_facetAddress);
}
Expand Down Expand Up @@ -460,36 +357,14 @@ library DiamondLib {
/// @dev Initialize the diamond cut.
/// @param _init The address of the contract or facet to execute `data`.
/// @param _calldata A function call, including function selector and arguments.
function initializeDiamondCut(address _init, bytes memory _calldata) internal {
if (_init == address(0)) return;
_enforceHasContractCode(_init);
(bool success, bytes memory err) = _init.delegatecall(_calldata);
if (!success) {
if (err.length > 0) {
// bubble up error
/// @solidity memory-safe-assembly
assembly {
let returndata_size := mload(err)
revert(add(32, err), returndata_size)
}
} else {
revert InitializeDiamondCutReverted(_init, _calldata);
}
}
}

/// @dev Initialize the diamond cut.
/// @param _init The address of the contract or facet to execute `data`.
/// @param _calldata A function call, including function selector and arguments.
function initializeDiamondCutCalldata(address _init, bytes calldata _calldata) internal {
function initializeDiamondCut(address _init, bytes calldata _calldata) internal {
if (_init == address(0)) return;
_enforceHasContractCode(_init);
(bool success, bytes memory err) = _init.delegatecall(_calldata);
if (!success) {
if (err.length > 0) {
// bubble up error
/// @solidity memory-safe-assembly
assembly {
assembly ("memory-safe") {
let returndata_size := mload(err)
revert(add(32, err), returndata_size)
}
Expand Down
Loading
Loading