Skip to content

Conversation

zguesmi
Copy link
Member

@zguesmi zguesmi commented Jul 26, 2025

Migration steps:

  • Migrate src files (minimal changes)
  • Modify receive and fallback behavior in Diamond.sol
  • Rename all 1538 to 2535 in contracts and rename Module to Facet in contracts names
  • Add unit tests for Diamond.sol
  • Remove ENSIntegration modules/functions
  • Update all facets to use namespaces app storage.
  • Rename only ✔️ feat: Use namespaced storage #236
  • Fix compilation and tests ✔️ fix: Fix build with new storage layout #237
  • Update contracts file tree.
  • Target latest EVM version instead of Berlin
  • Merge feature/diamond in develop
  • Merge PR Update deployment CI #228
  • Set admin in deployment script
  • Update docs (soldoc, diagrams, ...)

Old tree:

image

New tree:

image

@zguesmi zguesmi changed the title Feature/contracts file tree refactor: Adapt contracts file tree Jul 26, 2025
@zguesmi zguesmi self-assigned this Jul 26, 2025
@zguesmi zguesmi requested a review from Copilot July 26, 2025 12:57
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR refactors the contracts file tree by consolidating interface and facet contracts into more organized directories. It moves from a modules/ structure to direct interfaces/ and facets/ directories, and removes outdated interface files that are now relocated.

  • Move interface contracts from modules/interfaces/ to interfaces/
  • Move facet contracts from modules/facets/ to facets/
  • Update import paths throughout the codebase to reflect the new directory structure

Reviewed Changes

Copilot reviewed 54 out of 64 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
test/utils/IexecWrapper.ts Update import path for IexecPoco1__factory
test/byContract/IexecPoco/IexecPoco1.test.ts Update import paths for IexecPoco1 interfaces
slither.config.json Update filter paths to use new interfaces directory
hardhat.config.ts Update exclusion paths and remove legacy interface exclusions
deploy/0_deploy.ts Update comments and variable names from "modules" to "facets"
contracts/tools/testing/slither/*.sol Update import paths to use new facets directory
contracts/tools/testing/*.sol Update import paths for interfaces and facets
contracts/interfaces/*.sol Update relative import paths and add new interface files
contracts/facets/*.sol Update relative import paths and comments referencing modules
contracts/IexecInterface*.sol Remove files relocated to interfaces directory
.solcover.js Update exclusion path to use new facets directory

@zguesmi zguesmi marked this pull request as ready for review July 28, 2025 09:30
Base automatically changed from feature/namespaced-storage-fix-build to feature/diamond July 28, 2025 09:53
Copy link

codecov bot commented Jul 28, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.60%. Comparing base (efa1d22) to head (4741469).
⚠️ Report is 8 commits behind head on feature/diamond.

Additional details and impacted files
@@               Coverage Diff                @@
##           feature/diamond     #238   +/-   ##
================================================
  Coverage            83.60%   83.60%           
================================================
  Files                   38       38           
  Lines                 1214     1214           
  Branches               225      225           
================================================
  Hits                  1015     1015           
  Misses                 199      199           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@zguesmi zguesmi merged commit dffdcc1 into feature/diamond Jul 28, 2025
4 checks passed
@zguesmi zguesmi deleted the feature/contracts-file-tree branch July 28, 2025 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants