feat: replace erc1538 naming to diamond proxy naming - part 1 - #229
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR updates naming throughout the codebase to replace "ERC1538" references with "Diamond proxy" terminology, reflecting a migration from ERC1538 proxy pattern to Diamond proxy pattern. This appears to be part 1 of a larger refactoring effort.
- Replace all occurrences of "ERC1538" with "Diamond" or "DiamondProxy" in variable names, comments, and configuration
- Update deployment and configuration scripts to use new Diamond proxy naming
- Maintain backward compatibility by keeping deprecated ERC1538Proxy config field
Reviewed Changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| utils/proxy-tools.ts | Update comments to reference Diamond proxy instead of ERC1538 |
| utils/config.ts | Add DiamondProxy config field while keeping deprecated ERC1538Proxy |
| test/utils/hardhat-fixture-deployer.ts | Replace ERC1538Proxy references with DiamondProxy in test setup |
| test/utils/fixture-helpers.ts | Update ownership transfer functions to use DiamondProxy |
| scripts/upgrades/upgrade-helper.ts | Rename variables and comments from erc1538 to diamond terminology |
| scripts/tools/update-config.ts | Update deployment getter to use DiamondProxy instead of ERC1538Proxy |
| scripts/sponsoring/1_add-modules-to-proxy.ts | Replace ERC1538Proxy variables with DiamondProxy throughout |
| scripts/set-callback-gas.ts | Update deployment getter to use DiamondProxy |
| scripts/boost/1_add-modules-to-proxy.ts | Replace ERC1538Proxy references with DiamondProxy |
| deploy/0_deploy.ts | Update variable names and comments from erc1538 to diamond terminology |
| config/config.json | Replace ERC1538Proxy key with DiamondProxy in configuration |
| .github/workflows/deploy-smart-contracts.yml | Update workflow comment to reference Diamond proxy |
Comments suppressed due to low confidence (1)
scripts/upgrades/upgrade-helper.ts:33
- [nitpick] The variable name 'diamondQueryInstance' suggests it should be a Diamond-related type, but it's still using 'ERC1538Query'. Consider updating the type name to match the Diamond pattern or using a more generic name like 'queryInstance'.
const diamondQueryInstance: ERC1538Query = ERC1538Query__factory.connect(
zguesmi
reviewed
Jul 25, 2025
Co-authored-by: Zied Guesmi <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## feature/diamond #229 +/- ##
================================================
Coverage 83.85% 83.85%
================================================
Files 36 36
Lines 1109 1109
Branches 225 225
================================================
Hits 930 930
Misses 179 179 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Le-Caignec
approved these changes
Jul 25, 2025
Co-authored-by: Robin Le Caignec <[email protected]>
zguesmi
approved these changes
Jul 25, 2025
7 tasks
This was referenced Sep 24, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Split de la PR #226 : #226 en 3