feat: replace erc1538 naming to diamond proxy naming - part 2 (#230)

* feat: Migrate from delegateSmart contract to facet naming

* feat: Update contract references from delegate to facet naming across multiple files

* feat: Remove DelegateBase and DelegateBase.v8 contracts

* feat: Update contract references from delegate to facet naming in multiple files

* fix: Correct typo in changelog for ERC1538 architecture renaming

* Update comment

---------

Co-authored-by: Zied <[email protected]>

Author: gfournierPro

.solcover.js

@@ -21,7 +21,7 @@ module.exports = {
         'tools/testing/ERC1271Mock.sol',
         'tools/testing/TestClient.sol',
         'tools/testing/TestReceiver.sol',
-        'modules/delegates/SignatureVerifier.sol',
+        'modules/facets/SignatureVerifier.sol',
     ],
     istanbulFolder: BASE_FOLDER,
 };

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## vNEXT
 
 - Migrate proxy to Diamond pattern (ERC-2535):
+  - Rename ERC1538 architure to diamond Proxy architecture(#226, #229, #230)
   - Remove ENS module (#225)
   - Add Diamond contract unit tests (#224)
   - Fix `fallback` and `receive` (#223)

contracts/Store.v8.sol

@@ -92,7 +92,7 @@ abstract contract Store {
     /**
      * @dev EIP-712 domain hash.
      */
-    // Modified in IexecMaintenanceDelegate.updateDomainSeparator
+    // Modified in IexecMaintenanceFacet.updateDomainSeparator
     //slither-disable-next-line constable-states
     bytes32 internal EIP712DOMAIN_SEPARATOR;
 
@@ -125,14 +125,14 @@ abstract contract Store {
     /**
      * @dev Address of a trusted TEE authority that manages enclave challenges.
      */
-    // Modified in IexecMaintenanceDelegate.setTeeBroker
+    // Modified in IexecMaintenanceFacet.setTeeBroker
     //slither-disable-next-line constable-states
     address internal m_teebroker;
 
     /**
      * @dev Max amount of gas to be used with callbacks.
      */
-    // Modified in IexecMaintenanceDelegate.setCallbackGas
+    // Modified in IexecMaintenanceFacet.setCallbackGas
     //slither-disable-next-line constable-states
     uint256 internal m_callbackgas;
 
@@ -142,7 +142,7 @@ abstract contract Store {
     IexecLibCore_v5.Category[] internal m_categories;
 
     // Backward compatibility
-    // Modified in IexecMaintenanceDelegate.configure
+    // Modified in IexecMaintenanceFacet.configure
     //slither-disable-next-line constable-states
     address internal m_v3_iexecHub; // IexecHubInterface
     mapping(address => bool) internal m_v3_scoreImported;

contracts/modules/DelegateBase.sol contracts/modules/FacetBase.solcontracts/modules/DelegateBase.sol renamed to contracts/modules/FacetBase.sol

@@ -9,9 +9,8 @@ import "./interfaces/IOwnable.sol";
 // Functions that were declared in ERC1538Store are re-declared here.
 // TODO clean this (use LibDiamond)
 //      - All calls to `owner()` should use `LibDiamond.contractOwner()`.
-// TODO rename this contract to `FacetBase`.
 
-abstract contract DelegateBase is Store {
+abstract contract FacetBase is Store {
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");
         _;

contracts/modules/DelegateBase.v8.sol contracts/modules/FacetBase.v8.solcontracts/modules/DelegateBase.v8.sol renamed to contracts/modules/FacetBase.v8.sol

@@ -9,13 +9,12 @@ import {Store} from "../Store.v8.sol";
 // Functions that were declared in ERC1538Store are re-declared here.
 // TODO clean this (use LibDiamond)
 //      - All calls to `owner()` should use `LibDiamond.contractOwner()`.
-// TODO rename this contract to `FacetBase`.
 
 /**
- * @title Base contract of all Delegate contracts.
+ * @title Base contract of all Facet contracts.
  * @dev Every module must inherit from this contract.
  */
-abstract contract DelegateBase is Store {
+abstract contract FacetBase is Store {
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");
         _;