Refactor DataProtector deployment process and update related configurations

Author: Le-Caignec

.drone.yml

@@ -86,8 +86,11 @@ steps:
       ENV: prod
     commands:
       - cd environments
-      - KEY=dataprotectorContractAddress VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/address) npm run update-env
-      - KEY=dataprotectorStartBlock VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/block) npm run update-env
+      - |
+        ADDRESS=$(grep -o '"contractAddress":"[^"]*' ../packages/smart-contract/ignition/deployments/chain-134/journal.jsonl | tail -1 | cut -d'"' -f4)
+        BLOCK=$(grep -o '"blockNumber":[0-9]*' ../packages/smart-contract/ignition/deployments/chain-134/journal.jsonl | tail -1 | cut -d':' -f2)
+        KEY=dataprotectorContractAddress VALUE=$ADDRESS npm run update-env
+        KEY=dataprotectorStartBlock VALUE=$BLOCK npm run update-env
       - git add environments.json
       - git commit -m "$DRONE_DEPLOY_TO deployment $DRONE_BUILD_NUMBER $DRONE_COMMIT" --author="drone-product <[email protected]>"
     when:
@@ -100,8 +103,11 @@ steps:
       ENV: staging
     commands:
       - cd environments
-      - KEY=dataprotectorContractAddress VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/address) npm run update-env
-      - KEY=dataprotectorStartBlock VALUE=$(cat ../packages/smart-contract/deployments/DataProtector/block) npm run update-env
+      - |
+        ADDRESS=$(grep -o '"contractAddress":"[^"]*' ../packages/smart-contract/ignition/deployments/chain-134/journal.json | tail -1 | cut -d'"' -f4)
+        BLOCK=$(grep -o '"blockNumber":[0-9]*' ../packages/smart-contract/ignition/deployments/chain-134/journal.json | tail -1 | cut -d':' -f2)
+        KEY=dataprotectorContractAddress VALUE=$ADDRESS npm run update-env
+        KEY=dataprotectorStartBlock VALUE=$BLOCK npm run update-env
       - git add environments.json
       - git commit -m "$DRONE_DEPLOY_TO deployment $DRONE_BUILD_NUMBER $DRONE_COMMIT" --author="drone-product <[email protected]>"
     when:
@@ -120,12 +126,6 @@ steps:
         - smart-contract-deploy-prod
         - smart-contract-deploy-staging
 
-  - name: verify contract
-    image: node:18.19
-    commands:
-      - cd packages/smart-contract
-      - npm run verify -- --network bellecour $(cat deployments/DataProtector/address) $(cat deployments/DataProtector/args)
-
 ---
 # deploy sharing smart contract to prod, staging or dev
 kind: pipeline

.gitignore

@@ -14,5 +14,3 @@ node_modules
 .env
 *.log
 *.env
-
-**/deployments

packages/smart-contract/.gitignore

@@ -10,6 +10,5 @@ typechain-types
 coverage
 coverage.json
 
-#smart contract
-.smart-contract-address
-.constructor-args-params
+# Deployment files
+**/deployments/chain-31337

packages/smart-contract/ignition/modules/DataProtector.ts

@@ -0,0 +1,14 @@
+import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";
+import { DATASET_REGISTRY_ADDRESS as defaultDatasetRegistryAddress } from '../../config/config';
+import { env } from '../../config/env';
+
+export default buildModule("DataProtectorModule", (m) => {
+  // Get registry address from environment or default
+  const DATASET_REGISTRY_ADDRESS = env.DATASET_REGISTRY_ADDRESS || defaultDatasetRegistryAddress;
+  
+  // Deploy DataProtector with the registry address as constructor argument
+  const dataProtector = m.contract("DataProtector", [DATASET_REGISTRY_ADDRESS]);
+
+  // Return the deployed contract
+  return { dataProtector };
+});

packages/smart-contract/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "scripts": {
     "compile": "hardhat compile && npm run artifact-to-abis",
-    "deploy": "hardhat run scripts/deploy.ts",
+    "deploy": "hardhat ignition deploy ignition/modules/DataProtector.ts",
     "verify": "hardhat verify",
     "test": "hardhat test",
     "artifact-to-abis": "node tools/artifacts-to-abis.mjs",

packages/smart-contract/scripts/deploy.ts

@@ -8,7 +8,7 @@
     "skipLibCheck": true,
     "resolveJsonModule": true
   },
-  "include": ["config/**/*", "scripts/**/*", "test/**/*","utils/**/*"],
+  "include": ["config/**/*", "ignition/**/*", "test/**/*","utils/**/*"],
   "exclude": ["node_modules", "typechain-types"],
   "files": ["./hardhat.config.ts"]
 }