From 95630a36c82f26a5fcbf7aea6956c81d13d018ab Mon Sep 17 00:00:00 2001 From: Le-Caignec Date: Fri, 25 Jul 2025 18:43:15 +0200 Subject: [PATCH 1/3] feat: replace IexecMaintenance with IexecConfiguration and related updates --- contracts/IexecInterfaceNative.sol | 4 +-- contracts/IexecInterfaceNativeABILegacy.sol | 4 +-- contracts/IexecInterfaceToken.sol | 4 +-- contracts/IexecInterfaceTokenABILegacy.sol | 4 +-- contracts/Store.v8.sol | 8 +++--- ...t.sol => IexecConfigurationExtraFacet.sol} | 4 +-- ...eFacet.sol => IexecConfigurationFacet.sol} | 4 +-- ...Maintenance.sol => IexecConfiguration.sol} | 25 ++++++++++++------- ...eExtra.sol => IexecConfigurationExtra.sol} | 6 ++--- deploy/0_deploy.ts | 10 ++++---- scripts/set-callback-gas.ts | 4 +-- .../IexecMaintenance/IexecMaintenance.test.ts | 13 +++++----- .../IexecPocoBoost/IexecPocoBoost.test.ts | 8 +++--- test/utils/IexecWrapper.ts | 4 +-- 14 files changed, 53 insertions(+), 49 deletions(-) rename contracts/modules/facets/{IexecMaintenanceExtraFacet.sol => IexecConfigurationExtraFacet.sol} (92%) rename contracts/modules/facets/{IexecMaintenanceFacet.sol => IexecConfigurationFacet.sol} (95%) rename contracts/modules/interfaces/{IexecMaintenance.sol => IexecConfiguration.sol} (73%) rename contracts/modules/interfaces/{IexecMaintenanceExtra.sol => IexecConfigurationExtra.sol} (92%) diff --git a/contracts/IexecInterfaceNative.sol b/contracts/IexecInterfaceNative.sol index 8ed2d3d79..32fb8678e 100644 --- a/contracts/IexecInterfaceNative.sol +++ b/contracts/IexecInterfaceNative.sol @@ -24,7 +24,7 @@ import "./modules/interfaces/IexecAccessors.sol"; import "./modules/interfaces/IexecCategoryManager.sol"; import "./modules/interfaces/IexecERC20.sol"; import "./modules/interfaces/IexecEscrowNative.sol"; -import "./modules/interfaces/IexecMaintenance.sol"; +import "./modules/interfaces/IexecConfiguration.sol"; import "./modules/interfaces/IexecOrderManagement.sol"; import "./modules/interfaces/IexecPoco1.sol"; import "./modules/interfaces/IexecPoco2.sol"; @@ -37,7 +37,7 @@ interface IexecInterfaceNative is IexecCategoryManager, IexecERC20, IexecEscrowNative, - IexecMaintenance, + IexecConfiguration, IexecOrderManagement, IexecPoco1, IexecPoco2, diff --git a/contracts/IexecInterfaceNativeABILegacy.sol b/contracts/IexecInterfaceNativeABILegacy.sol index 0a266ccaa..56afd802f 100644 --- a/contracts/IexecInterfaceNativeABILegacy.sol +++ b/contracts/IexecInterfaceNativeABILegacy.sol @@ -25,7 +25,7 @@ import "./modules/interfaces/IexecAccessorsABILegacy.sol"; import "./modules/interfaces/IexecCategoryManager.sol"; import "./modules/interfaces/IexecERC20.sol"; import "./modules/interfaces/IexecEscrowNative.sol"; -import "./modules/interfaces/IexecMaintenance.sol"; +import "./modules/interfaces/IexecConfiguration.sol"; import "./modules/interfaces/IexecOrderManagement.sol"; import "./modules/interfaces/IexecPoco1.sol"; import "./modules/interfaces/IexecPoco2.sol"; @@ -39,7 +39,7 @@ interface IexecInterfaceNativeABILegacy is IexecCategoryManager, IexecERC20, IexecEscrowNative, - IexecMaintenance, + IexecConfiguration, IexecOrderManagement, IexecPoco1, IexecPoco2, diff --git a/contracts/IexecInterfaceToken.sol b/contracts/IexecInterfaceToken.sol index 59c2a99d2..56b55c580 100644 --- a/contracts/IexecInterfaceToken.sol +++ b/contracts/IexecInterfaceToken.sol @@ -25,7 +25,7 @@ import "./modules/interfaces/IexecCategoryManager.sol"; import "./modules/interfaces/IexecERC20.sol"; import "./modules/interfaces/IexecEscrowToken.sol"; import "./modules/interfaces/IexecEscrowTokenSwap.sol"; -import "./modules/interfaces/IexecMaintenance.sol"; +import "./modules/interfaces/IexecConfiguration.sol"; import "./modules/interfaces/IexecOrderManagement.sol"; import "./modules/interfaces/IexecPoco1.sol"; import "./modules/interfaces/IexecPoco2.sol"; @@ -39,7 +39,7 @@ interface IexecInterfaceToken is IexecERC20, IexecEscrowToken, IexecEscrowTokenSwap, - IexecMaintenance, + IexecConfiguration, IexecOrderManagement, IexecPoco1, IexecPoco2, diff --git a/contracts/IexecInterfaceTokenABILegacy.sol b/contracts/IexecInterfaceTokenABILegacy.sol index d9dd25308..1b87f4337 100644 --- a/contracts/IexecInterfaceTokenABILegacy.sol +++ b/contracts/IexecInterfaceTokenABILegacy.sol @@ -26,7 +26,7 @@ import "./modules/interfaces/IexecCategoryManager.sol"; import "./modules/interfaces/IexecERC20.sol"; import "./modules/interfaces/IexecEscrowToken.sol"; import "./modules/interfaces/IexecEscrowTokenSwap.sol"; -import "./modules/interfaces/IexecMaintenance.sol"; +import "./modules/interfaces/IexecConfiguration.sol"; import "./modules/interfaces/IexecOrderManagement.sol"; import "./modules/interfaces/IexecPoco1.sol"; import "./modules/interfaces/IexecPoco2.sol"; @@ -41,7 +41,7 @@ interface IexecInterfaceTokenABILegacy is IexecERC20, IexecEscrowToken, IexecEscrowTokenSwap, - IexecMaintenance, + IexecConfiguration, IexecOrderManagement, IexecPoco1, IexecPoco2, diff --git a/contracts/Store.v8.sol b/contracts/Store.v8.sol index 479acc1ff..ffb576b64 100644 --- a/contracts/Store.v8.sol +++ b/contracts/Store.v8.sol @@ -92,7 +92,7 @@ abstract contract Store { /** * @dev EIP-712 domain hash. */ - // Modified in IexecMaintenanceFacet.updateDomainSeparator + // Modified in IexecConfigurationFacet.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 IexecMaintenanceFacet.setTeeBroker + // Modified in IexecConfigurationFacet.setTeeBroker //slither-disable-next-line constable-states address internal m_teebroker; /** * @dev Max amount of gas to be used with callbacks. */ - // Modified in IexecMaintenanceFacet.setCallbackGas + // Modified in IexecConfigurationFacet.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 IexecMaintenanceFacet.configure + // Modified in IexecConfigurationFacet.configure //slither-disable-next-line constable-states address internal m_v3_iexecHub; // IexecHubInterface mapping(address => bool) internal m_v3_scoreImported; diff --git a/contracts/modules/facets/IexecMaintenanceExtraFacet.sol b/contracts/modules/facets/IexecConfigurationExtraFacet.sol similarity index 92% rename from contracts/modules/facets/IexecMaintenanceExtraFacet.sol rename to contracts/modules/facets/IexecConfigurationExtraFacet.sol index da617f4ee..112be1590 100644 --- a/contracts/modules/facets/IexecMaintenanceExtraFacet.sol +++ b/contracts/modules/facets/IexecConfigurationExtraFacet.sol @@ -20,9 +20,9 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; import "../FacetBase.sol"; -import "../interfaces/IexecMaintenanceExtra.sol"; +import "../interfaces/IexecConfigurationExtra.sol"; -contract IexecMaintenanceExtraFacet is IexecMaintenanceExtra, FacetBase { +contract IexecConfigurationExtraFacet is IexecConfigurationExtra, FacetBase { function changeRegistries( address _appregistryAddress, address _datasetregistryAddress, diff --git a/contracts/modules/facets/IexecMaintenanceFacet.sol b/contracts/modules/facets/IexecConfigurationFacet.sol similarity index 95% rename from contracts/modules/facets/IexecMaintenanceFacet.sol rename to contracts/modules/facets/IexecConfigurationFacet.sol index ec611f478..4f113f963 100644 --- a/contracts/modules/facets/IexecMaintenanceFacet.sol +++ b/contracts/modules/facets/IexecConfigurationFacet.sol @@ -7,9 +7,9 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../FacetBase.sol"; -import "../interfaces/IexecMaintenance.sol"; +import "../interfaces/IexecConfiguration.sol"; -contract IexecMaintenanceFacet is IexecMaintenance, FacetBase { +contract IexecConfigurationFacet is IexecConfiguration, FacetBase { using SafeMathExtended for uint256; using IexecLibOrders_v5 for IexecLibOrders_v5.EIP712Domain; diff --git a/contracts/modules/interfaces/IexecMaintenance.sol b/contracts/modules/interfaces/IexecConfiguration.sol similarity index 73% rename from contracts/modules/interfaces/IexecMaintenance.sol rename to contracts/modules/interfaces/IexecConfiguration.sol index 5f907ef4d..65d2ece4e 100644 --- a/contracts/modules/interfaces/IexecMaintenance.sol +++ b/contracts/modules/interfaces/IexecConfiguration.sol @@ -21,13 +21,20 @@ pragma experimental ABIEncoderV2; import "../../libs/IexecLibOrders_v5.sol"; - -interface IexecMaintenance -{ - function configure(address,string calldata,string calldata,uint8,address,address,address,address) external; - function domain() external view returns (IexecLibOrders_v5.EIP712Domain memory); - function updateDomainSeparator() external; - function importScore(address) external; - function setTeeBroker(address) external; - function setCallbackGas(uint256) external; +interface IexecConfiguration { + function configure( + address, + string calldata, + string calldata, + uint8, + address, + address, + address, + address + ) external; + function domain() external view returns (IexecLibOrders_v5.EIP712Domain memory); + function updateDomainSeparator() external; + function importScore(address) external; + function setTeeBroker(address) external; + function setCallbackGas(uint256) external; } diff --git a/contracts/modules/interfaces/IexecMaintenanceExtra.sol b/contracts/modules/interfaces/IexecConfigurationExtra.sol similarity index 92% rename from contracts/modules/interfaces/IexecMaintenanceExtra.sol rename to contracts/modules/interfaces/IexecConfigurationExtra.sol index 53b228002..43320e3ef 100644 --- a/contracts/modules/interfaces/IexecMaintenanceExtra.sol +++ b/contracts/modules/interfaces/IexecConfigurationExtra.sol @@ -19,8 +19,6 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; - -interface IexecMaintenanceExtra -{ - function changeRegistries(address,address,address) external; +interface IexecConfigurationExtra { + function changeRegistries(address, address, address) external; } diff --git a/deploy/0_deploy.ts b/deploy/0_deploy.ts index 7bf2e5e5b..77f4150e9 100644 --- a/deploy/0_deploy.ts +++ b/deploy/0_deploy.ts @@ -18,12 +18,12 @@ import { IexecAccessors__factory, IexecCategoryManagerFacet__factory, IexecCategoryManager__factory, + IexecConfigurationExtraFacet__factory, + IexecConfigurationFacet__factory, IexecERC20Facet__factory, IexecEscrowNativeFacet__factory, IexecEscrowTokenFacet__factory, IexecLibOrders_v5__factory, - IexecMaintenanceExtraFacet__factory, - IexecMaintenanceFacet__factory, IexecOrderManagementFacet__factory, IexecPoco1Facet__factory, IexecPoco2Facet__factory, @@ -89,12 +89,12 @@ export default async function deploy() { new IexecCategoryManagerFacet__factory(), new IexecERC20Facet__factory(), isTokenMode ? new IexecEscrowTokenFacet__factory() : new IexecEscrowNativeFacet__factory(), - new IexecMaintenanceFacet__factory(iexecLibOrders), + new IexecConfigurationFacet__factory(iexecLibOrders), new IexecOrderManagementFacet__factory(iexecLibOrders), new IexecPoco1Facet__factory(iexecLibOrders), new IexecPoco2Facet__factory(), new IexecRelayFacet__factory(), - new IexecMaintenanceExtraFacet__factory(), + new IexecConfigurationExtraFacet__factory(), new IexecPocoAccessorsFacet__factory(iexecLibOrders), new IexecPocoBoostFacet__factory(iexecLibOrders), new IexecPocoBoostAccessorsFacet__factory(), @@ -176,7 +176,7 @@ export default async function deploy() { const iexecInitialized = (await iexecAccessorsInstance.eip712domain_separator()) != ZeroHash; if (!iexecInitialized) { // TODO replace this with DiamondInit.init(). - await IexecMaintenanceFacet__factory.connect(diamondProxyAddress, owner) + await IexecConfigurationFacet__factory.connect(diamondProxyAddress, owner) .configure( rlcInstanceAddress, 'Staked RLC', diff --git a/scripts/set-callback-gas.ts b/scripts/set-callback-gas.ts index 86610387a..6ef0d5a07 100644 --- a/scripts/set-callback-gas.ts +++ b/scripts/set-callback-gas.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import { deployments, ethers } from 'hardhat'; -import { IexecAccessors__factory, IexecMaintenanceFacet__factory } from '../typechain'; +import { IexecAccessors__factory, IexecConfigurationFacet__factory } from '../typechain'; (async () => { const requestedCallbackGas = Number(process.env.CALLBACK_GAS); @@ -18,7 +18,7 @@ import { IexecAccessors__factory, IexecMaintenanceFacet__factory } from '../type .toNumber() .toLocaleString(); const callbackGasBefore = await viewCallbackGas(); - await IexecMaintenanceFacet__factory.connect(diamondProxyAddress, owner) + await IexecConfigurationFacet__factory.connect(diamondProxyAddress, owner) .setCallbackGas(requestedCallbackGas) .then((tx) => tx.wait()); console.log(`Changed callback-gas from ${callbackGasBefore} to ${await viewCallbackGas()}`); diff --git a/test/byContract/IexecMaintenance/IexecMaintenance.test.ts b/test/byContract/IexecMaintenance/IexecMaintenance.test.ts index 00d694eea..22577db72 100644 --- a/test/byContract/IexecMaintenance/IexecMaintenance.test.ts +++ b/test/byContract/IexecMaintenance/IexecMaintenance.test.ts @@ -4,14 +4,13 @@ import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers'; import { loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers'; import { expect } from 'chai'; -import { TypedDataEncoder, ZeroHash } from 'ethers'; +import { ZeroHash } from 'ethers'; import { ethers } from 'hardhat'; import { + IexecConfigurationExtra, + IexecConfigurationExtra__factory, IexecInterfaceNative, IexecInterfaceNative__factory, - IexecLibOrders_v5, - IexecMaintenanceExtra, - IexecMaintenanceExtra__factory, } from '../../../typechain'; import { getIexecAccounts } from '../../../utils/poco-tools'; import { loadHardhatFixtureDeployment } from '../../utils/hardhat-fixture-deployer'; @@ -40,10 +39,10 @@ const configureArgs = Object.values(configureParams) as [ ]; const someDomainSeparator = '0x0000000000000000000000000000000000000000000000000000000000000001'; -describe('IexecMaintenance', async () => { +describe('IexecConfiguration', async () => { let proxyAddress: string; let [iexecPoco, iexecPocoAsAdmin]: IexecInterfaceNative[] = []; - let iexecMaintenanceExtra: IexecMaintenanceExtra; + let iexecMaintenanceExtra: IexecConfigurationExtra; let [iexecAdmin, worker, anyone]: SignerWithAddress[] = []; beforeEach('Deploy', async () => { @@ -56,7 +55,7 @@ describe('IexecMaintenance', async () => { ({ iexecAdmin, worker, anyone } = accounts); iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone); iexecPocoAsAdmin = iexecPoco.connect(iexecAdmin); - iexecMaintenanceExtra = IexecMaintenanceExtra__factory.connect(proxyAddress, anyone); + iexecMaintenanceExtra = IexecConfigurationExtra__factory.connect(proxyAddress, anyone); } describe('Configure', () => { diff --git a/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts b/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts index bbfb6e763..41f3889d0 100644 --- a/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts +++ b/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts @@ -16,8 +16,8 @@ import { IOracleConsumer__factory, IexecAccessors, IexecAccessors__factory, - IexecMaintenance, - IexecMaintenance__factory, + IexecConfiguration, + IexecConfiguration__factory, IexecOrderManagement__factory, IexecPoco2__factory, IexecPocoAccessors__factory, @@ -73,7 +73,7 @@ const randomEOAAddress = ethers.Wallet.createRandom().address; let proxyAddress: string; let iexecPocoBoostInstance: IexecPocoBoostFacet; -let iexecMaintenanceAsAdmin: IexecMaintenance; +let iexecMaintenanceAsAdmin: IexecConfiguration; let iexecAccessor: IexecAccessors; let oracleConsumerInstance: TestClient; let gasWasterClientInstance: GasWasterClient; @@ -125,7 +125,7 @@ describe('IexecPocoBoost', function () { domain = iexecWrapper.getDomain(); ({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets()); iexecPocoBoostInstance = IexecPocoBoostFacet__factory.connect(proxyAddress, anyone); - iexecMaintenanceAsAdmin = IexecMaintenance__factory.connect( + iexecMaintenanceAsAdmin = IexecConfiguration__factory.connect( proxyAddress, accounts.iexecAdmin, ); diff --git a/test/utils/IexecWrapper.ts b/test/utils/IexecWrapper.ts index 63843cda5..7cdad6630 100644 --- a/test/utils/IexecWrapper.ts +++ b/test/utils/IexecWrapper.ts @@ -19,9 +19,9 @@ import { DatasetRegistry, DatasetRegistry__factory, IexecAccessors__factory, + IexecConfigurationFacet__factory, IexecInterfaceNative__factory, IexecLibOrders_v5, - IexecMaintenanceFacet__factory, IexecPoco2__factory, IexecPocoAccessors__factory, IexecPocoBoostAccessors__factory, @@ -176,7 +176,7 @@ export class IexecWrapper { } async setTeeBroker(brokerAddress: string) { - await IexecMaintenanceFacet__factory.connect(this.proxyAddress, this.accounts.iexecAdmin) + await IexecConfigurationFacet__factory.connect(this.proxyAddress, this.accounts.iexecAdmin) .setTeeBroker(brokerAddress) .then((tx) => tx.wait()); } From 3ed285dbf08749203b4bf627bd98e8d5e4f84a70 Mon Sep 17 00:00:00 2001 From: Le-Caignec Date: Fri, 25 Jul 2025 18:52:55 +0200 Subject: [PATCH 2/3] feat: replace FacetBase with BaseFacet in multiple contracts --- contracts/modules/{FacetBase.sol => BaseFacet.sol} | 2 +- contracts/modules/{FacetBase.v8.sol => BaseFacet.v8.sol} | 2 +- contracts/modules/facets/IexecAccessorsABILegacyFacet.sol | 4 ++-- contracts/modules/facets/IexecAccessorsFacet.sol | 4 ++-- contracts/modules/facets/IexecCategoryManagerFacet.sol | 4 ++-- contracts/modules/facets/IexecConfigurationExtraFacet.sol | 4 ++-- contracts/modules/facets/IexecConfigurationFacet.sol | 4 ++-- contracts/modules/facets/IexecERC20Core.sol | 4 ++-- contracts/modules/facets/IexecERC20Facet.sol | 4 ++-- contracts/modules/facets/IexecEscrow.v8.sol | 4 ++-- contracts/modules/facets/IexecEscrowNativeFacet.sol | 4 ++-- contracts/modules/facets/IexecEscrowTokenFacet.sol | 4 ++-- contracts/modules/facets/IexecEscrowTokenSwapFacet.sol | 4 ++-- contracts/modules/facets/IexecOrderManagementFacet.sol | 4 ++-- contracts/modules/facets/IexecPoco1Facet.sol | 4 ++-- contracts/modules/facets/IexecPoco2Facet.sol | 4 ++-- contracts/modules/facets/IexecPocoAccessorsFacet.sol | 4 ++-- contracts/modules/facets/IexecPocoBoostAccessorsFacet.sol | 4 ++-- contracts/modules/facets/IexecPocoBoostFacet.sol | 4 ++-- contracts/modules/facets/IexecPocoCommonFacet.sol | 4 ++-- contracts/modules/facets/IexecRelayFacet.sol | 4 ++-- contracts/modules/facets/SignatureVerifier.sol | 4 ++-- contracts/modules/facets/SignatureVerifier.v8.sol | 4 ++-- 23 files changed, 44 insertions(+), 44 deletions(-) rename contracts/modules/{FacetBase.sol => BaseFacet.sol} (94%) rename contracts/modules/{FacetBase.v8.sol => BaseFacet.v8.sol} (96%) diff --git a/contracts/modules/FacetBase.sol b/contracts/modules/BaseFacet.sol similarity index 94% rename from contracts/modules/FacetBase.sol rename to contracts/modules/BaseFacet.sol index 56e3c7535..c08896095 100644 --- a/contracts/modules/FacetBase.sol +++ b/contracts/modules/BaseFacet.sol @@ -10,7 +10,7 @@ import "./interfaces/IOwnable.sol"; // TODO clean this (use LibDiamond) // - All calls to `owner()` should use `LibDiamond.contractOwner()`. -abstract contract FacetBase is Store { +abstract contract BaseFacet is Store { modifier onlyOwner() { require(_msgSender() == owner(), "Ownable: caller is not the owner"); _; diff --git a/contracts/modules/FacetBase.v8.sol b/contracts/modules/BaseFacet.v8.sol similarity index 96% rename from contracts/modules/FacetBase.v8.sol rename to contracts/modules/BaseFacet.v8.sol index 23b43b5d9..7243c44e3 100644 --- a/contracts/modules/FacetBase.v8.sol +++ b/contracts/modules/BaseFacet.v8.sol @@ -14,7 +14,7 @@ import {Store} from "../Store.v8.sol"; * @title Base contract of all Facet contracts. * @dev Every module must inherit from this contract. */ -abstract contract FacetBase is Store { +abstract contract BaseFacet is Store { modifier onlyOwner() { require(_msgSender() == owner(), "Ownable: caller is not the owner"); _; diff --git a/contracts/modules/facets/IexecAccessorsABILegacyFacet.sol b/contracts/modules/facets/IexecAccessorsABILegacyFacet.sol index 116614cf7..9c32e7c40 100644 --- a/contracts/modules/facets/IexecAccessorsABILegacyFacet.sol +++ b/contracts/modules/facets/IexecAccessorsABILegacyFacet.sol @@ -19,10 +19,10 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecAccessorsABILegacy.sol"; -contract IexecAccessorsABILegacyFacet is IexecAccessorsABILegacy, FacetBase { +contract IexecAccessorsABILegacyFacet is IexecAccessorsABILegacy, BaseFacet { function viewDealABILegacy_pt1( bytes32 _id ) diff --git a/contracts/modules/facets/IexecAccessorsFacet.sol b/contracts/modules/facets/IexecAccessorsFacet.sol index d3f653e54..8aa7b9300 100644 --- a/contracts/modules/facets/IexecAccessorsFacet.sol +++ b/contracts/modules/facets/IexecAccessorsFacet.sol @@ -19,10 +19,10 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecAccessors.sol"; -contract IexecAccessorsFacet is IexecAccessors, FacetBase { +contract IexecAccessorsFacet is IexecAccessors, BaseFacet { function name() external view override returns (string memory) { return m_name; } diff --git a/contracts/modules/facets/IexecCategoryManagerFacet.sol b/contracts/modules/facets/IexecCategoryManagerFacet.sol index ae028dea6..626d0e519 100644 --- a/contracts/modules/facets/IexecCategoryManagerFacet.sol +++ b/contracts/modules/facets/IexecCategoryManagerFacet.sol @@ -19,10 +19,10 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecCategoryManager.sol"; -contract IexecCategoryManagerFacet is IexecCategoryManager, FacetBase { +contract IexecCategoryManagerFacet is IexecCategoryManager, BaseFacet { /** * Methods */ diff --git a/contracts/modules/facets/IexecConfigurationExtraFacet.sol b/contracts/modules/facets/IexecConfigurationExtraFacet.sol index 112be1590..992663a1f 100644 --- a/contracts/modules/facets/IexecConfigurationExtraFacet.sol +++ b/contracts/modules/facets/IexecConfigurationExtraFacet.sol @@ -19,10 +19,10 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecConfigurationExtra.sol"; -contract IexecConfigurationExtraFacet is IexecConfigurationExtra, FacetBase { +contract IexecConfigurationExtraFacet is IexecConfigurationExtra, BaseFacet { function changeRegistries( address _appregistryAddress, address _datasetregistryAddress, diff --git a/contracts/modules/facets/IexecConfigurationFacet.sol b/contracts/modules/facets/IexecConfigurationFacet.sol index 4f113f963..be0bd9952 100644 --- a/contracts/modules/facets/IexecConfigurationFacet.sol +++ b/contracts/modules/facets/IexecConfigurationFacet.sol @@ -6,10 +6,10 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecConfiguration.sol"; -contract IexecConfigurationFacet is IexecConfiguration, FacetBase { +contract IexecConfigurationFacet is IexecConfiguration, BaseFacet { using SafeMathExtended for uint256; using IexecLibOrders_v5 for IexecLibOrders_v5.EIP712Domain; diff --git a/contracts/modules/facets/IexecERC20Core.sol b/contracts/modules/facets/IexecERC20Core.sol index 59a461f7b..e55253e64 100644 --- a/contracts/modules/facets/IexecERC20Core.sol +++ b/contracts/modules/facets/IexecERC20Core.sol @@ -4,9 +4,9 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; -contract IexecERC20Core is FacetBase { +contract IexecERC20Core is BaseFacet { using SafeMathExtended for uint256; event Transfer(address indexed from, address indexed to, uint256 value); diff --git a/contracts/modules/facets/IexecERC20Facet.sol b/contracts/modules/facets/IexecERC20Facet.sol index 6bd9c6c7a..e79fa3557 100644 --- a/contracts/modules/facets/IexecERC20Facet.sol +++ b/contracts/modules/facets/IexecERC20Facet.sol @@ -20,11 +20,11 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; import "./IexecERC20Core.sol"; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecERC20.sol"; import "../interfaces/IexecTokenSpender.sol"; -contract IexecERC20Facet is IexecERC20, FacetBase, IexecERC20Core { +contract IexecERC20Facet is IexecERC20, BaseFacet, IexecERC20Core { function transfer(address recipient, uint256 amount) external override returns (bool) { _transfer(_msgSender(), recipient, amount); return true; diff --git a/contracts/modules/facets/IexecEscrow.v8.sol b/contracts/modules/facets/IexecEscrow.v8.sol index 9018742d2..8597d7de8 100644 --- a/contracts/modules/facets/IexecEscrow.v8.sol +++ b/contracts/modules/facets/IexecEscrow.v8.sol @@ -3,12 +3,12 @@ pragma solidity ^0.8.0; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; /** * @title Manage (lock/unlock/reward/seize) user funds. */ -contract IexecEscrow is FacetBase { +contract IexecEscrow is BaseFacet { event Transfer(address indexed from, address indexed to, uint256 value); event Lock(address owner, uint256 amount); event Unlock(address owner, uint256 amount); diff --git a/contracts/modules/facets/IexecEscrowNativeFacet.sol b/contracts/modules/facets/IexecEscrowNativeFacet.sol index c2afe779e..908411c9c 100644 --- a/contracts/modules/facets/IexecEscrowNativeFacet.sol +++ b/contracts/modules/facets/IexecEscrowNativeFacet.sol @@ -20,10 +20,10 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; import "./IexecERC20Core.sol"; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecEscrowNative.sol"; -contract IexecEscrowNativeFacet is IexecEscrowNative, FacetBase, IexecERC20Core { +contract IexecEscrowNativeFacet is IexecEscrowNative, BaseFacet, IexecERC20Core { using SafeMathExtended for uint256; uint256 internal constant nRLCtoWei = 10 ** 9; diff --git a/contracts/modules/facets/IexecEscrowTokenFacet.sol b/contracts/modules/facets/IexecEscrowTokenFacet.sol index f8368e834..fc1a4e5a2 100644 --- a/contracts/modules/facets/IexecEscrowTokenFacet.sol +++ b/contracts/modules/facets/IexecEscrowTokenFacet.sol @@ -20,11 +20,11 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; import "./IexecERC20Core.sol"; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecEscrowToken.sol"; import "../interfaces/IexecTokenSpender.sol"; -contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase, IexecERC20Core { +contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, BaseFacet, IexecERC20Core { using SafeMathExtended for uint256; /*************************************************************************** diff --git a/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol b/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol index cf2b0cb91..d41636819 100644 --- a/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol +++ b/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol @@ -21,13 +21,13 @@ pragma experimental ABIEncoderV2; import "./IexecERC20Core.sol"; import "./SignatureVerifier.sol"; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecEscrowTokenSwap.sol"; import "../interfaces/IexecPoco1.sol"; contract IexecEscrowTokenSwapFacet is IexecEscrowTokenSwap, - FacetBase, + BaseFacet, IexecERC20Core, SignatureVerifier { diff --git a/contracts/modules/facets/IexecOrderManagementFacet.sol b/contracts/modules/facets/IexecOrderManagementFacet.sol index c95c74d79..2de6ca5c2 100644 --- a/contracts/modules/facets/IexecOrderManagementFacet.sol +++ b/contracts/modules/facets/IexecOrderManagementFacet.sol @@ -5,11 +5,11 @@ pragma solidity ^0.8.0; import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol"; import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.v8.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; -contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase, SignatureVerifier { +contract IexecOrderManagementFacet is IexecOrderManagement, BaseFacet, SignatureVerifier { using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder; using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder; using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder; diff --git a/contracts/modules/facets/IexecPoco1Facet.sol b/contracts/modules/facets/IexecPoco1Facet.sol index db7880f02..b9c48a585 100644 --- a/contracts/modules/facets/IexecPoco1Facet.sol +++ b/contracts/modules/facets/IexecPoco1Facet.sol @@ -9,7 +9,7 @@ import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; import {IWorkerpool} from "../../registries/workerpools/IWorkerpool.v8.sol"; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecPoco1} from "../interfaces/IexecPoco1.v8.sol"; import {IexecEscrow} from "./IexecEscrow.v8.sol"; import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol"; @@ -28,7 +28,7 @@ struct Matching { contract IexecPoco1Facet is IexecPoco1, - FacetBase, + BaseFacet, IexecEscrow, SignatureVerifier, IexecPocoCommonFacet diff --git a/contracts/modules/facets/IexecPoco2Facet.sol b/contracts/modules/facets/IexecPoco2Facet.sol index 22a5e7ca4..08bdc7115 100644 --- a/contracts/modules/facets/IexecPoco2Facet.sol +++ b/contracts/modules/facets/IexecPoco2Facet.sol @@ -7,14 +7,14 @@ import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; import {IOracleConsumer} from "../../external/interfaces/IOracleConsumer.sol"; import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecPoco2} from "../interfaces/IexecPoco2.v8.sol"; import {IexecEscrow} from "./IexecEscrow.v8.sol"; import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; // TODO: Revert with custom errors -contract IexecPoco2Facet is IexecPoco2, FacetBase, IexecEscrow, SignatureVerifier { +contract IexecPoco2Facet is IexecPoco2, BaseFacet, IexecEscrow, SignatureVerifier { modifier onlyScheduler(bytes32 _taskId) { require(_msgSender() == m_deals[m_tasks[_taskId].dealid].workerpool.owner); _; diff --git a/contracts/modules/facets/IexecPocoAccessorsFacet.sol b/contracts/modules/facets/IexecPocoAccessorsFacet.sol index fbc35dcb0..ca20b4320 100644 --- a/contracts/modules/facets/IexecPocoAccessorsFacet.sol +++ b/contracts/modules/facets/IexecPocoAccessorsFacet.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; import {IexecPocoAccessors} from "../interfaces/IexecPocoAccessors.sol"; @@ -15,7 +15,7 @@ import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; */ contract IexecPocoAccessorsFacet is IexecPocoAccessors, - FacetBase, + BaseFacet, SignatureVerifier, IexecPocoCommonFacet { diff --git a/contracts/modules/facets/IexecPocoBoostAccessorsFacet.sol b/contracts/modules/facets/IexecPocoBoostAccessorsFacet.sol index 91136bf2c..1c4c4ea81 100644 --- a/contracts/modules/facets/IexecPocoBoostAccessorsFacet.sol +++ b/contracts/modules/facets/IexecPocoBoostAccessorsFacet.sol @@ -4,14 +4,14 @@ pragma solidity ^0.8.0; import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol"; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecPocoBoostAccessors} from "../interfaces/IexecPocoBoostAccessors.sol"; /** * @title Getters contract for PoCo Boost module. * @notice Access to PoCo Boost tasks must be done with PoCo Classic `IexecAccessors`. */ -contract IexecPocoBoostAccessorsFacet is IexecPocoBoostAccessors, FacetBase { +contract IexecPocoBoostAccessorsFacet is IexecPocoBoostAccessors, BaseFacet { /** * Get a deal created by PoCo Boost module. * @param id The ID of the deal. diff --git a/contracts/modules/facets/IexecPocoBoostFacet.sol b/contracts/modules/facets/IexecPocoBoostFacet.sol index 37731fac3..2b01df289 100644 --- a/contracts/modules/facets/IexecPocoBoostFacet.sol +++ b/contracts/modules/facets/IexecPocoBoostFacet.sol @@ -13,7 +13,7 @@ import {IOracleConsumer} from "../../external/interfaces/IOracleConsumer.sol"; import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; import {IWorkerpool} from "../../registries/workerpools/IWorkerpool.v8.sol"; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol"; import {IexecEscrow} from "./IexecEscrow.v8.sol"; import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol"; @@ -25,7 +25,7 @@ import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; */ contract IexecPocoBoostFacet is IexecPocoBoost, - FacetBase, + BaseFacet, IexecEscrow, SignatureVerifier, IexecPocoCommonFacet diff --git a/contracts/modules/facets/IexecPocoCommonFacet.sol b/contracts/modules/facets/IexecPocoCommonFacet.sol index 9f55cc338..b54d45824 100644 --- a/contracts/modules/facets/IexecPocoCommonFacet.sol +++ b/contracts/modules/facets/IexecPocoCommonFacet.sol @@ -6,9 +6,9 @@ pragma solidity ^0.8.0; import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; -contract IexecPocoCommonFacet is FacetBase { +contract IexecPocoCommonFacet is BaseFacet { using Math for uint256; using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder; using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder; diff --git a/contracts/modules/facets/IexecRelayFacet.sol b/contracts/modules/facets/IexecRelayFacet.sol index 39e2d5176..29ff35fcc 100644 --- a/contracts/modules/facets/IexecRelayFacet.sol +++ b/contracts/modules/facets/IexecRelayFacet.sol @@ -19,10 +19,10 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; import "../interfaces/IexecRelay.sol"; -contract IexecRelayFacet is IexecRelay, FacetBase { +contract IexecRelayFacet is IexecRelay, BaseFacet { function broadcastAppOrder(IexecLibOrders_v5.AppOrder calldata _apporder) external override { emit BroadcastAppOrder(_apporder); } diff --git a/contracts/modules/facets/SignatureVerifier.sol b/contracts/modules/facets/SignatureVerifier.sol index 79eef1f34..91b270ac7 100644 --- a/contracts/modules/facets/SignatureVerifier.sol +++ b/contracts/modules/facets/SignatureVerifier.sol @@ -22,9 +22,9 @@ pragma experimental ABIEncoderV2; import "@iexec/solidity/contracts/ERC734/IERC734.sol"; import "@iexec/solidity/contracts/ERC1271/IERC1271.sol"; import "@iexec/solidity/contracts/ERC1654/IERC1654.sol"; -import "../FacetBase.sol"; +import "../BaseFacet.sol"; -contract SignatureVerifier is FacetBase { +contract SignatureVerifier is BaseFacet { /** * Prepare message/structure predicat used for signing */ diff --git a/contracts/modules/facets/SignatureVerifier.v8.sol b/contracts/modules/facets/SignatureVerifier.v8.sol index c537f280a..95c20a26a 100644 --- a/contracts/modules/facets/SignatureVerifier.v8.sol +++ b/contracts/modules/facets/SignatureVerifier.v8.sol @@ -7,9 +7,9 @@ import {IERC1271} from "@openzeppelin/contracts-v5/interfaces/IERC1271.sol"; import {ECDSA} from "@openzeppelin/contracts-v5/utils/cryptography/ECDSA.sol"; import {MessageHashUtils} from "@openzeppelin/contracts-v5/utils/cryptography/MessageHashUtils.sol"; import {IERC734} from "../../external/interfaces/IERC734.sol"; -import {FacetBase} from "../FacetBase.v8.sol"; +import {BaseFacet} from "../BaseFacet.v8.sol"; -contract SignatureVerifier is FacetBase { +contract SignatureVerifier is BaseFacet { using ECDSA for bytes32; /** From 4b80c5e89ee991e7e26c716428485a0c8db71092 Mon Sep 17 00:00:00 2001 From: Le-Caignec Date: Fri, 25 Jul 2025 18:57:28 +0200 Subject: [PATCH 3/3] feat: rename SignatureVerifier to SignatureVerifierFacet and update imports across contracts --- .solcover.js | 2 +- contracts/modules/facets/IexecEscrowTokenSwapFacet.sol | 4 ++-- contracts/modules/facets/IexecOrderManagementFacet.sol | 4 ++-- contracts/modules/facets/IexecPoco1Facet.sol | 4 ++-- contracts/modules/facets/IexecPoco2Facet.sol | 4 ++-- contracts/modules/facets/IexecPocoAccessorsFacet.sol | 4 ++-- contracts/modules/facets/IexecPocoBoostFacet.sol | 4 ++-- .../{SignatureVerifier.sol => SignatureVerifierFacet.sol} | 2 +- ...SignatureVerifier.v8.sol => SignatureVerifierFacet.v8.sol} | 2 +- hardhat.config.ts | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) rename contracts/modules/facets/{SignatureVerifier.sol => SignatureVerifierFacet.sol} (99%) rename contracts/modules/facets/{SignatureVerifier.v8.sol => SignatureVerifierFacet.v8.sol} (99%) diff --git a/.solcover.js b/.solcover.js index e29903654..9578275c7 100644 --- a/.solcover.js +++ b/.solcover.js @@ -21,7 +21,7 @@ module.exports = { 'tools/testing/ERC1271Mock.sol', 'tools/testing/TestClient.sol', 'tools/testing/TestReceiver.sol', - 'modules/facets/SignatureVerifier.sol', + 'modules/facets/SignatureVerifierFacet.sol', ], istanbulFolder: BASE_FOLDER, }; diff --git a/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol b/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol index d41636819..e6ebbf8fd 100644 --- a/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol +++ b/contracts/modules/facets/IexecEscrowTokenSwapFacet.sol @@ -20,7 +20,7 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; import "./IexecERC20Core.sol"; -import "./SignatureVerifier.sol"; +import "./SignatureVerifierFacet.sol"; import "../BaseFacet.sol"; import "../interfaces/IexecEscrowTokenSwap.sol"; import "../interfaces/IexecPoco1.sol"; @@ -29,7 +29,7 @@ contract IexecEscrowTokenSwapFacet is IexecEscrowTokenSwap, BaseFacet, IexecERC20Core, - SignatureVerifier + SignatureVerifierFacet { using SafeMathExtended for uint256; using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder; diff --git a/contracts/modules/facets/IexecOrderManagementFacet.sol b/contracts/modules/facets/IexecOrderManagementFacet.sol index 2de6ca5c2..5520792ca 100644 --- a/contracts/modules/facets/IexecOrderManagementFacet.sol +++ b/contracts/modules/facets/IexecOrderManagementFacet.sol @@ -4,12 +4,12 @@ pragma solidity ^0.8.0; import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol"; -import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; +import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol"; import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.v8.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; -contract IexecOrderManagementFacet is IexecOrderManagement, BaseFacet, SignatureVerifier { +contract IexecOrderManagementFacet is IexecOrderManagement, BaseFacet, SignatureVerifierFacet { using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder; using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder; using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder; diff --git a/contracts/modules/facets/IexecPoco1Facet.sol b/contracts/modules/facets/IexecPoco1Facet.sol index b9c48a585..d3eb3428b 100644 --- a/contracts/modules/facets/IexecPoco1Facet.sol +++ b/contracts/modules/facets/IexecPoco1Facet.sol @@ -13,7 +13,7 @@ import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecPoco1} from "../interfaces/IexecPoco1.v8.sol"; import {IexecEscrow} from "./IexecEscrow.v8.sol"; import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol"; -import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; +import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol"; struct Matching { bytes32 apporderHash; @@ -30,7 +30,7 @@ contract IexecPoco1Facet is IexecPoco1, BaseFacet, IexecEscrow, - SignatureVerifier, + SignatureVerifierFacet, IexecPocoCommonFacet { using Math for uint256; diff --git a/contracts/modules/facets/IexecPoco2Facet.sol b/contracts/modules/facets/IexecPoco2Facet.sol index 08bdc7115..057265331 100644 --- a/contracts/modules/facets/IexecPoco2Facet.sol +++ b/contracts/modules/facets/IexecPoco2Facet.sol @@ -10,11 +10,11 @@ import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecPoco2} from "../interfaces/IexecPoco2.v8.sol"; import {IexecEscrow} from "./IexecEscrow.v8.sol"; -import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; +import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol"; // TODO: Revert with custom errors -contract IexecPoco2Facet is IexecPoco2, BaseFacet, IexecEscrow, SignatureVerifier { +contract IexecPoco2Facet is IexecPoco2, BaseFacet, IexecEscrow, SignatureVerifierFacet { modifier onlyScheduler(bytes32 _taskId) { require(_msgSender() == m_deals[m_tasks[_taskId].dealid].workerpool.owner); _; diff --git a/contracts/modules/facets/IexecPocoAccessorsFacet.sol b/contracts/modules/facets/IexecPocoAccessorsFacet.sol index ca20b4320..b5e4edf98 100644 --- a/contracts/modules/facets/IexecPocoAccessorsFacet.sol +++ b/contracts/modules/facets/IexecPocoAccessorsFacet.sol @@ -8,7 +8,7 @@ import {IexecLibCore_v5} from "../../libs/IexecLibCore_v5.sol"; import {IexecLibOrders_v5} from "../../libs/IexecLibOrders_v5.sol"; import {IexecPocoAccessors} from "../interfaces/IexecPocoAccessors.sol"; import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol"; -import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; +import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol"; /** * @title Getters contract for PoCo module. @@ -16,7 +16,7 @@ import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; contract IexecPocoAccessorsFacet is IexecPocoAccessors, BaseFacet, - SignatureVerifier, + SignatureVerifierFacet, IexecPocoCommonFacet { using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder; diff --git a/contracts/modules/facets/IexecPocoBoostFacet.sol b/contracts/modules/facets/IexecPocoBoostFacet.sol index 2b01df289..5272ffccb 100644 --- a/contracts/modules/facets/IexecPocoBoostFacet.sol +++ b/contracts/modules/facets/IexecPocoBoostFacet.sol @@ -17,7 +17,7 @@ import {BaseFacet} from "../BaseFacet.v8.sol"; import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol"; import {IexecEscrow} from "./IexecEscrow.v8.sol"; import {IexecPocoCommonFacet} from "./IexecPocoCommonFacet.sol"; -import {SignatureVerifier} from "./SignatureVerifier.v8.sol"; +import {SignatureVerifierFacet} from "./SignatureVerifierFacet.v8.sol"; /** * @title PoCo Boost to reduce latency and increase throughput of deals. @@ -27,7 +27,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, BaseFacet, IexecEscrow, - SignatureVerifier, + SignatureVerifierFacet, IexecPocoCommonFacet { using ECDSA for bytes32; diff --git a/contracts/modules/facets/SignatureVerifier.sol b/contracts/modules/facets/SignatureVerifierFacet.sol similarity index 99% rename from contracts/modules/facets/SignatureVerifier.sol rename to contracts/modules/facets/SignatureVerifierFacet.sol index 91b270ac7..c4ed464ef 100644 --- a/contracts/modules/facets/SignatureVerifier.sol +++ b/contracts/modules/facets/SignatureVerifierFacet.sol @@ -24,7 +24,7 @@ import "@iexec/solidity/contracts/ERC1271/IERC1271.sol"; import "@iexec/solidity/contracts/ERC1654/IERC1654.sol"; import "../BaseFacet.sol"; -contract SignatureVerifier is BaseFacet { +contract SignatureVerifierFacet is BaseFacet { /** * Prepare message/structure predicat used for signing */ diff --git a/contracts/modules/facets/SignatureVerifier.v8.sol b/contracts/modules/facets/SignatureVerifierFacet.v8.sol similarity index 99% rename from contracts/modules/facets/SignatureVerifier.v8.sol rename to contracts/modules/facets/SignatureVerifierFacet.v8.sol index 95c20a26a..ec4fefcf7 100644 --- a/contracts/modules/facets/SignatureVerifier.v8.sol +++ b/contracts/modules/facets/SignatureVerifierFacet.v8.sol @@ -9,7 +9,7 @@ import {MessageHashUtils} from "@openzeppelin/contracts-v5/utils/cryptography/Me import {IERC734} from "../../external/interfaces/IERC734.sol"; import {BaseFacet} from "../BaseFacet.v8.sol"; -contract SignatureVerifier is BaseFacet { +contract SignatureVerifierFacet is BaseFacet { using ECDSA for bytes32; /** diff --git a/hardhat.config.ts b/hardhat.config.ts index c2e63676c..63a67b397 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -274,8 +274,8 @@ const config: HardhatUserConfig = { 'external', 'modules/facets/IexecAccessorsABILegacyFacet.sol', // not relevant 'modules/facets/IexecEscrowTokenSwapFacet.sol', // not relevant - 'modules/facets/SignatureVerifier.sol', // contains only internal/private - 'modules/facets/SignatureVerifier.v8.sol', + 'modules/facets/SignatureVerifierFacet.sol', // contains only internal/private + 'modules/facets/SignatureVerifierFacet.v8.sol', 'modules/interfaces', // interesting for events but too much doc duplication if enabled 'registries', // ignore them for now 'tools',