Import deployments in OZ upgrades

Author: zguesmi

.github/workflows/sharing-smart-contract-test.yml

@@ -83,6 +83,10 @@ jobs:
           echo "Error: Anvil did not start within the timeout period."
           exit 1
 
+      - name: Test deployment script
+        working-directory: packages/sharing-smart-contract
+        run: npm run deploy -- --network local-bellecour-fork
+
       - name: Upgrade test
         working-directory: packages/sharing-smart-contract
         run: npm run upgrade-local-fork -- --network local-bellecour-fork

…n/modules/DataProtectorSharingModule.cts …n/modules/DataProtectorSharingModule.cjspackages/sharing-smart-contract/ignition/modules/DataProtectorSharingModule.cts renamed to packages/sharing-smart-contract/ignition/modules/DataProtectorSharingModule.cjs packages/sharing-smart-contract/ignition/modules/DataProtectorSharingModule.cts renamed to packages/sharing-smart-contract/ignition/modules/DataProtectorSharingModule.cjs

@@ -9,7 +9,7 @@
     "clean": "hardhat clean",
     "compile": "hardhat clean && hardhat compile && npm run artifact-to-abis",
     "verify": "hardhat verify",
-    "deploy": "hardhat ignition deploy ignition/modules/DataProtectorSharingModule.cts --strategy create2",
+    "deploy": "hardhat run scripts/deploy.js",
     "update-env": "hardhat run ./scripts/updateEnv.js",
     "upgrade": "hardhat run ./scripts/upgrade.js",
     "upgrade-local-fork": "mkdir -p .openzeppelin/local-fork && cp -r .openzeppelin/prod/. .openzeppelin/local-fork && MANIFEST_DEFAULT_DIR=.openzeppelin/local-fork ENV=prod hardhat run ./scripts/upgrade-local-fork.js",

packages/sharing-smart-contract/package.json

@@ -0,0 +1,59 @@
+import hre from 'hardhat';
+import DataProtectorSharingModule from '../ignition/modules/DataProtectorSharingModule.cjs';
+import { env } from "../config/env.js";
+
+const { ethers } = hre;
+
+async function main() {
+    const pocoAddress = env.POCO_ADDRESS;
+    const datasetRegistryAddress = env.DATASET_REGISTRY_ADDRESS;
+    if (!pocoAddress || !datasetRegistryAddress) {
+        throw new Error('POCO_ADDRESS and DATASET_REGISTRY_ADDRESS are required.');
+    }
+    console.log('Deploying DataProtectorSharingModule...');
+    console.log('PoCo address:', pocoAddress);
+    console.log('DatasetRegistry address:', datasetRegistryAddress);
+    // Check if the CreateX factory is supported on the current network.
+    const isCreatexSupported = await isCreatexFactorySupported();
+    if (isCreatexSupported) {
+        console.log('CreateX factory is supported.');
+    } else {
+        console.log('⚠️  CreateX factory is NOT supported.');
+    }
+    // Deploy contracts using Ignition module.
+    const {
+        addOnlyAppWhitelistRegistry,
+        dataProtectorSharing,
+    } = await hre.ignition.deploy(DataProtectorSharingModule, {
+        ...(isCreatexSupported && {
+            strategy: 'create2',
+            strategyConfig: hre.userConfig.ignition.strategyConfig.create2,
+        }),
+        displayUi: true, // for logs.
+    });
+    // Import proxies in OZ `upgrades` plugin for future upgrades.
+    console.log(`Importing proxy contracts in OZ upgrades...`);
+    const whitelistProxyAddress = await addOnlyAppWhitelistRegistry.getAddress();
+    await upgrades.forceImport(
+        whitelistProxyAddress,
+        await ethers.getContractFactory('AddOnlyAppWhitelistRegistry'),
+        {
+            kind: 'transparent',
+        },
+    );
+    await upgrades.forceImport(
+        await dataProtectorSharing.getAddress(),
+        await ethers.getContractFactory('DataProtectorSharing'),
+        {
+            kind: 'transparent',
+            constructorArgs: [pocoAddress, datasetRegistryAddress, whitelistProxyAddress],
+        },
+    );
+}
+
+async function isCreatexFactorySupported() {
+const code = await ethers.provider.getCode('0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed');
+    return code !== '0x';
+}
+
+main().catch(console.error);