feat: refactor addModulesToProxy to use new factory classes and validate IexecLibOrders_v5

Author: Le-Caignec

scripts/boost/1_add-modules-to-proxy.ts

@@ -5,8 +5,8 @@ import { time } from '@nomicfoundation/hardhat-network-helpers';
 import { BytesLike, ZeroHash } from 'ethers';
 import { deployments, ethers } from 'hardhat';
 import {
-    IexecPocoBoostAccessors__factory,
-    IexecPocoBoost__factory,
+    IexecPocoBoostAccessorsFacet__factory,
+    IexecPocoBoostFacet__factory,
     TimelockController__factory,
 } from '../../typechain';
 import { Ownable__factory } from '../../typechain/factories/rlc-faucet-contract/contracts';
@@ -24,19 +24,28 @@ import {
     if (!deploymentOptions.DiamondProxy) {
         throw new Error('DiamondProxy is required');
     }
+    if (!deploymentOptions.IexecLibOrders_v5) {
+        throw new Error('IexecLibOrders_v5 is required');
+    }
     const diamondProxyAddress = deploymentOptions.DiamondProxy;
     const iexecPocoBoostFacetAddress = (await deployments.get('IexecPocoBoostFacet')).address; // Bellecour: 0x8425229f979AB3b0dDDe00D475D762cA4d6a5eFc
     const iexecPocoBoostAccessorsFacetAddress = (
         await deployments.get('IexecPocoBoostAccessorsFacet')
     ).address; // Bellecour: 0x56185a2b0dc8b556BBfBAFB702BC971Ed75e868C
     const [account] = await ethers.getSigners();
     const timelockAddress = await Ownable__factory.connect(diamondProxyAddress, account).owner(); // Bellecour: 0x4611B943AA1d656Fc669623b5DA08756A7e288E9
+
+    const iexecLibOrders = {
+        ['contracts/libs/IexecLibOrders_v5.sol:IexecLibOrders_v5']:
+            deploymentOptions.IexecLibOrders_v5,
+    };
+
     const iexecPocoBoostProxyUpdate = encodeModuleProxyUpdate(
-        IexecPocoBoost__factory.createInterface(),
+        new IexecPocoBoostFacet__factory(iexecLibOrders),
         iexecPocoBoostFacetAddress,
     );
     const iexecPocoBoostAccessorsProxyUpdate = encodeModuleProxyUpdate(
-        IexecPocoBoostAccessors__factory.createInterface(),
+        new IexecPocoBoostAccessorsFacet__factory(),
         iexecPocoBoostAccessorsFacetAddress,
     );
     // Salt but must be the same for schedule & execute

scripts/sponsoring/1_add-modules-to-proxy.ts

@@ -32,6 +32,9 @@ export async function addModulesToProxy() {
     if (!deploymentOptions.DiamondProxy) {
         throw new Error('DiamondProxy is required');
     }
+    if (!deploymentOptions.IexecLibOrders_v5) {
+        throw new Error('IexecLibOrders_v5 is required');
+    }
     const diamondProxyAddress = deploymentOptions.DiamondProxy;
     const iexecOrderManagementAddress = (await hre.deployments.get('IexecOrderManagementFacet'))
         .address;
@@ -46,20 +49,26 @@ export async function addModulesToProxy() {
         diamondProxyAddress,
         ethers.provider,
     ).owner();
+
+    const iexecLibOrders = {
+        ['contracts/libs/IexecLibOrders_v5.sol:IexecLibOrders_v5']:
+            deploymentOptions.IexecLibOrders_v5,
+    };
+
     const iexecOrderManagementProxyUpdate = encodeModuleProxyUpdate(
-        IexecOrderManagementFacet__factory.createInterface(),
+        new IexecOrderManagementFacet__factory(iexecLibOrders),
         iexecOrderManagementAddress,
     );
     const iexecPoco1ProxyUpdate = encodeModuleProxyUpdate(
-        IexecPoco1Facet__factory.createInterface(),
+        new IexecPoco1Facet__factory(iexecLibOrders),
         iexecPoco1FacetAddress,
     );
     const iexecPoco2ProxyUpdate = encodeModuleProxyUpdate(
-        IexecPoco2Facet__factory.createInterface(),
+        new IexecPoco2Facet__factory(),
         iexecPoco2FacetAddress,
     );
     const iexecPocoAccessorsProxyUpdate = encodeModuleProxyUpdate(
-        IexecPocoAccessorsFacet__factory.createInterface(),
+        new IexecPocoAccessorsFacet__factory(iexecLibOrders),
         iexecPocoAccessorsFacetAddress,
     );
     // The salt must be the same for a given schedule & execute operation set