Skip to content

Commit 0e51949

Browse files
dadadave80dadadave80
authored
Merge pull request #28 from dadadave80/dev
Merge 'dev' changes to 'main'
2 parents 4109375 + fc198ea commit 0e51949

5 files changed

Lines changed: 15 additions & 37 deletions

File tree

‎.github/assets/banner.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<svg viewBox="0 0 1280 400" xmlns="http://www.w3.org/2000/svg" aria-labelledby="banner-title banner-desc"><title id="banner-title">diamond-lib — ERC-2535 Multi-Facet Proxy Library</title><desc id="banner-desc">A banner for the diamond-lib repository, depicting a faceted diamond representing the multi-facet proxy standard EIP-2535, with floating function selectors connected to facets.</desc><defs><linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0%" stop-color="#0a1021"/><stop offset="55%" stop-color="#0d162b"/><stop offset="100%" stop-color="#09101e"/></linearGradient><linearGradient id="facetA" x1="0%" y1="0%" x2="60%" y2="100%"><stop offset="0%" stop-color="#d9fbeb"/><stop offset="55%" stop-color="#7ee3c2"/><stop offset="100%" stop-color="#3db496"/></linearGradient><linearGradient id="facetB" x1="0%" y1="0%" x2="80%" y2="100%"><stop offset="0%" stop-color="#5fc5a8"/><stop offset="100%" stop-color="#1e5f74"/></linearGradient><linearGradient id="facetC" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0%" stop-color="#1e4e6e"/><stop offset="100%" stop-color="#0c243e"/></linearGradient><linearGradient id="facetD" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0%" stop-color="#0d2542"/><stop offset="100%" stop-color="#050f23"/></linearGradient><radialGradient id="diamondGlow" cx="50%" cy="50%" r="50%"><stop offset="0%" stop-color="#1bd9a8" stop-opacity=".3"/><stop offset="45%" stop-color="#1bd9a8" stop-opacity=".08"/><stop offset="100%" stop-color="#1bd9a8" stop-opacity="0"/></radialGradient><pattern id="dots" x="0" y="0" width="24" height="24" patternUnits="userSpaceOnUse"><circle cx="1" cy="1" r=".9" fill="#4d5e80" opacity=".35"/></pattern><filter id="softglow" x="-50%" y="-50%" width="200%" height="200%"><feGaussianBlur in="SourceGraphic" stdDeviation="2.5"/><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter><style>.mono{font-family:ui-monospace,&quot;SF Mono&quot;,Menlo,Consolas,&quot;Courier New&quot;,monospace}.sans{font-family:system-ui,-apple-system,&quot;Segoe UI&quot;,&quot;Helvetica Neue&quot;,Arial,sans-serif}.tag{font-size:17px;fill:#a8b5ca;font-weight:400}.dim,.meta{font-size:10px;letter-spacing:.22em}.meta{fill:#7ddbc0;font-weight:600}.dim,.sel,.seldim{fill:#5a6a85;font-weight:500}.sel,.seldim{font-size:11px;fill:#7ddbc0}.seldim{fill:#7a8aa5}.chip{font-size:10px;letter-spacing:.18em;fill:#a8b5ca;font-weight:600}</style></defs><path fill="url(#bg)" d="M0 0h1280v400H0z"/><path fill="url(#dots)" d="M0 0h1280v400H0z"/><path d="M0 56h1280M0 344h1280" stroke="#fff" opacity=".05"/><path d="M24 40V24h20m1192 0h20v16M24 360v16h20m1192 0h20v-16" stroke="#7ddbc0" stroke-width="1.25" fill="none" opacity=".75"/><g class="mono"><text x="58" y="31" class="meta">EIP / 2535</text><text x="1232" y="31" class="meta" text-anchor="end">STANDARD · FINAL</text><text x="58" y="382" class="dim">◉ STATUS: STABLE</text><text x="1232" y="382" class="dim" text-anchor="end">MIT · © 2026 D.DADA</text></g><ellipse cx="280" cy="205" rx="230" ry="210" fill="url(#diamondGlow)"/><path fill="url(#facetC)" d="m220 96-59 68h59z"/><path fill="url(#facetB)" d="M220 96h60v68h-60z"/><path fill="url(#facetA)" d="M280 96h60v68h-60z"/><path fill="url(#facetB)" d="m340 96 59 68h-59z"/><path fill="url(#facetD)" d="M161 164h59l60 171z"/><path fill="url(#facetC)" d="M220 164h60v171z"/><path fill="url(#facetB)" d="M280 164h60l-60 171z"/><path fill="url(#facetC)" d="M340 164h59L280 335z"/><path d="M220 96h120l59 68-119 171-119-171zm-59 68h238M280 96v239M220 96v68m120-68v68m-120 0 60 171m60-171-60 171" stroke="#8febce" stroke-linejoin="round" fill="none" opacity=".9"/><path stroke="#d5fff1" stroke-width="1.75" opacity=".95" d="M220 96h120"/><path stroke="#fff" stroke-width=".75" opacity=".55" d="M285 102h50"/><g class="mono"><path d="M150 92h25l15 38" stroke="#7ddbc0" stroke-width=".75" fill="none" opacity=".55"/><circle cx="190" cy="130" r="2.25" fill="#7ddbc0"/><text x="28" y="96" class="sel">0x1f931c1c</text><text x="106" y="96" class="seldim">↗ diamondCut</text></g><g class="mono"><path d="m210 310 20-20-8-52" stroke="#7ddbc0" stroke-width=".75" fill="none" opacity=".55"/><circle cx="222" cy="238" r="2.25" fill="#7ddbc0"/><text x="28" y="314" class="sel">0xf2fde38b</text><text x="106" y="314" class="seldim">↗ transferOwnership</text></g><g class="mono"><path d="M410 92h-15l-15 38" stroke="#7ddbc0" stroke-width=".75" fill="none" opacity=".55"/><circle cx="380" cy="130" r="2.25" fill="#7ddbc0"/><text x="418" y="96" class="sel">0x7a0ed627</text><text x="496" y="96" class="seldim">↗ facets</text></g><path stroke="#2a3a58" stroke-dasharray="2 4" opacity=".5" d="M540 128v212"/><text y="140" class="sans" style="font-size:11px;letter-spacing:.26em;fill:#7ddbc0;font-weight:600" transform="translate(560)">ERC-2535 · MULTI-FACET PROXY STANDARD</text><text x="-5" y="220" class="sans" style="font-size:82px;font-weight:800;fill:#f2f6fa;letter-spacing:-.035em" transform="translate(560)">diamond-lib</text><text y="258" class="sans tag" transform="translate(560)">A modular, upgradeable smart contract framework.</text><text y="280" class="sans tag" fill="#7a8aa5" transform="translate(560)">Add · replace · remove functions at runtime — one immutable address.</text><g transform="translate(560 312)"><rect width="78" height="22" rx="2" fill="none" stroke="#2e4263"/><text x="39" y="15" class="sans chip" text-anchor="middle">SOLIDITY</text></g><g transform="translate(648 312)"><rect width="76" height="22" rx="2" fill="none" stroke="#2e4263"/><text x="38" y="15" class="sans chip" text-anchor="middle">FOUNDRY</text></g><g transform="translate(734 312)"><rect width="66" height="22" rx="2" fill="none" stroke="#2e4263"/><text x="33" y="15" class="sans chip" text-anchor="middle">ERC-165</text></g><g transform="translate(810 312)"><rect width="66" height="22" rx="2" fill="none" stroke="#2e4263"/><text x="33" y="15" class="sans chip" text-anchor="middle">ERC-173</text></g><g transform="translate(886 312)"><rect width="142" height="22" rx="2" fill="none" stroke="#1bd9a8" opacity=".9"/><text x="71" y="15" class="sans chip" fill="#1bd9a8" text-anchor="middle">3 FACETS · LOUPE</text></g><text class="mono" style="font-size:13px;fill:#1bd9a8;font-weight:600" transform="translate(560 354)">$</text><text x="16" class="mono" style="font-size:13px;fill:#c6d1e3;font-weight:500" transform="translate(560 354)">forge install dadadave80/diamond-lib</text><path d="M24 200h6m-6-40h4m-4 80h4m1222-40h6m-4-40h4m-4 80h4" stroke="#2e4263" opacity=".7"/></svg>
1+
![](.github/assets/banner.svg)
22

33
---
44

55
> [!WARNING]
66
> **Pending Security Audits**
7-
> This library is currently under active development and security review. **Do not use in production** until formal security audits are completed. Breaking changes may occur as we prepare for audit release.
7+
> This library is currently under active development and security review. **Do not use in production** until formal security audits are completed.
88
99
---
1010

‎script/DeployDiamond.s.sol‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ contract DeployDiamond is Script, GetSelectors {
3434
OwnableFacet ownableFacet = new OwnableFacet();
3535

3636
// Deploy initializer contracts
37-
address multiInit = address(new MultiInit());
3837
address diamondInit = address(new DiamondInit());
39-
address erc165Init = address(new ERC165Init());
40-
address ownableInit = address(new OwnableInit());
4138

4239
// Create an array of FacetCut entries for standard facets
4340
FacetCut[] memory cut = new FacetCut[](4);
@@ -70,24 +67,9 @@ contract DeployDiamond is Script, GetSelectors {
7067
functionSelectors: _getSelectors("OwnableFacet")
7168
});
7269

73-
// Build MultiInit arrays for granular initialization
74-
address[] memory initAddresses = new address[](3);
75-
bytes[] memory initData = new bytes[](3);
76-
77-
initAddresses[0] = diamondInit;
78-
initData[0] = abi.encodeWithSignature("init()");
79-
80-
initAddresses[1] = erc165Init;
81-
initData[1] = abi.encodeWithSignature("init()");
82-
83-
initAddresses[2] = ownableInit;
84-
initData[2] = abi.encodeWithSignature("init(address)", ContextLib.msgSender());
85-
8670
// Deploy the Diamond contract with the facets and initialization args
8771
MockDiamond diamond = new MockDiamond();
88-
diamond.initialize(
89-
cut, multiInit, abi.encodeWithSignature("multiInit(address[],bytes[])", initAddresses, initData)
90-
);
72+
diamond.initialize(cut, diamondInit, abi.encodeWithSignature("init(address)", ContextLib.msgSender()));
9173
diamond_ = address(diamond);
9274
vm.stopBroadcast();
9375
}

‎src/initializers/DiamondInit.sol‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,19 @@
22
pragma solidity ^0.8.20;
33

44
import {DiamondLib} from "@diamond/libraries/DiamondLib.sol";
5+
import {ERC165Lib} from "@diamond/libraries/ERC165Lib.sol";
6+
import {OwnableLib} from "@diamond/libraries/OwnableLib.sol";
57

68
/// @title DiamondInit
79
/// @notice Provides an initializer to set up the Diamond with ERC-165 support
10+
/// and ownership management
811
contract DiamondInit {
9-
function init() public {
12+
/// @dev This function is called during the diamond cut process to set up the owner.
13+
/// @param _owner The address to set as the contract owner.
14+
function init(address _owner) public {
15+
OwnableLib.initializeOwner(_owner);
16+
ERC165Lib.registerInterface();
17+
OwnableLib.registerInterface();
1018
DiamondLib.registerInterface();
1119
}
1220
}

‎test/InitializableTester.t.sol‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -244,20 +244,7 @@ contract InitializableTester is GetSelectors {
244244
facetCuts_[i] = cuts[i];
245245
}
246246

247-
// Build MultiInit arrays for granular initialization
248-
address[] memory initAddresses = new address[](3);
249-
bytes[] memory initData = new bytes[](3);
250-
251-
initAddresses[0] = address(diamondInit);
252-
initData[0] = abi.encodeWithSignature("init()");
253-
254-
initAddresses[1] = address(erc165Init);
255-
initData[1] = abi.encodeWithSignature("init()");
256-
257-
initAddresses[2] = address(ownableInit);
258-
initData[2] = abi.encodeWithSignature("init(address)", _owner);
259-
260-
init_ = address(multiInit);
261-
initCalldata_ = abi.encodeWithSignature("multiInit(address[],bytes[])", initAddresses, initData);
247+
init_ = address(diamondInit);
248+
initCalldata_ = abi.encodeWithSignature("init(address)", _owner);
262249
}
263250
}

0 commit comments

Comments
 (0)