fix: dataProtector contract verification (#477)

* fix: Add HARDHAT_IGNITION_CONFIRM_DEPLOYMENT variable to deployment workflows

* fix: Update deployment workflow to include verification step and adjust environment variables

* fix: Update salt value in ignition strategy configuration

* fix: Add verification step for contracts in deployment workflows

* fix: Update salt value in ignition strategy configuration

* chore: save deployment artifacts for arbitrumSepolia dev (16581801531)

* fix: Update salt value in ignition strategy configuration and add TODO for dynamic handling based on environment

* chore: save deployment artifacts for arbitrumSepolia prod (16581922762)

* fix: Remove unused variables from deployment script

* Refactor code structure for improved readability and maintainability

* chore: save deployment artifacts for arbitrumSepolia dev (16582220797)

* fix: update salt value in create2 strategy configuration

* chore: save deployment artifacts for arbitrumSepolia prod (16582270946)

* fix: uncomment build-and-test job in deployment workflow

* fix: update addresses and start blocks for arbitrum-sepolia network

* chore: update devDependencies in smart-contract package.json

- Bump @nomicfoundation/hardhat-toolbox from ^5.0.0 to ^6.1.0
- Downgrade hardhat from ^2.23.0 to ^2.26.1

* fix: update verification script to use ignition for consistency

* Update .github/workflows/core-smart-contract-deploy.yml

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

* fix: update deployment workflow to save artifacts conditionally

* Update packages/smart-contract/hardhat.config.ts

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

* Update packages/sharing-smart-contract/hardhat.config.cjs

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

---------

Co-authored-by: GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Zied Guesmi <[email protected]>

Author: 3 people

.github/workflows/core-smart-contract-deploy.yml

@@ -79,7 +79,7 @@ jobs:
           RPC_URL: ${{ secrets.RPC_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           DATASET_REGISTRY_ADDRESS: ${{ vars.DATASET_REGISTRY_ADDRESS }}
-          HARDHAT_IGNITION_CONFIRM_DEPLOYMENT: ${{ vars.HARDHAT_IGNITION_CONFIRM_DEPLOYMENT }}
+          HARDHAT_IGNITION_CONFIRM_DEPLOYMENT: false
         run: |
           if [ "${{ inputs.network }}" = "hardhat" ]; then
             npm run deploy -- --network ${{ inputs.network }}

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

@@ -101,6 +101,16 @@ jobs:
             DEPLOYMENT_ID="$DEPLOYMENT_ID" \
               npm run deploy -- --network ${{ inputs.network }}
           fi
+          
+      - name: Save deployment artifacts
+        if: inputs.network != 'hardhat'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} ${{ inputs.environment }} (${{ github.run_id }})'
+          file_pattern: 'packages/sharing-smart-contract/ignition/deployments/* packages/sharing-smart-contract/.openzeppelin/*'
+          commit_user_name: 'GitHub Actions Bot'
+          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_author: 'GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>'
 
       - name: Verify contracts
         if: inputs.network != 'hardhat'
@@ -119,13 +129,3 @@ jobs:
           fi
           npm run verify -- "$DEPLOYMENT_ID"
 
-      - name: Save deployment artifacts
-        if: inputs.network != 'hardhat'
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} ${{ inputs.environment }} (${{ github.run_id }})'
-          file_pattern: 'packages/sharing-smart-contract/ignition/deployments/* packages/sharing-smart-contract/.openzeppelin/*'
-          commit_user_name: 'GitHub Actions Bot'
-          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
-          commit_author: 'GitHub Actions Bot <github-actions[bot]@users.noreply.github.com>'
-

packages/sharing-smart-contract/hardhat.config.cjs

@@ -142,7 +142,8 @@ module.exports = {
     strategyConfig: {
         //TODO: Handle salt dynamically depending on the network and the dev/prod environment
       create2: {
-        salt: "0x0100001000010000100010000100000000100001000000000100000000000004",
+        // salt: "0x0100001000010000100010000100000000100001000000000100000000000004", testnet
+        salt: "0x0000000000000000000000000000000000000000000000000000000000000000",
       },
     },
   },

packages/sharing-smart-contract/package-lock.json

@@ -8,8 +8,7 @@
   "scripts": {
     "clean": "hardhat clean",
     "compile": "hardhat clean && hardhat compile && npm run artifact-to-abis",
-    "verify:ignition": "hardhat ignition verify --include-unrelated-contracts",
-    "verify": "hardhat verify",
+    "verify": "hardhat ignition verify --include-unrelated-contracts",
     "deploy": "hardhat run scripts/deploy.js",
     "update-env": "hardhat run ./scripts/updateEnv.js",
     "upgrade": "hardhat run ./scripts/upgrade.js",
@@ -34,13 +33,13 @@
   ],
   "devDependencies": {
     "@nomicfoundation/hardhat-foundry": "^1.1.3",
-    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
+    "@nomicfoundation/hardhat-toolbox": "^6.1.0",
     "@nomiclabs/hardhat-solhint": "^4.0.1",
     "dotenv": "^16.5.0",
     "eslint": "^9.24.0",
     "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-import": "^2.31.0",
-    "hardhat": "^2.23.0",
+    "hardhat": "^2.26.1",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-dependency-compiler": "^1.2.1",
     "prettier": "^3.3.3",

packages/sharing-smart-contract/package.json

@@ -84,7 +84,8 @@ const config: HardhatUserConfig = {
     ignition: {
         strategyConfig: {
             create2: {
-                salt: '0x15687ade6b13dd23b6410e059fce02263e68e1af5ee0cf426798f4616f74f8aa',
+                // salt: '0x15687ade6b13dd23b6410e059fce02263e68e1af5ee0cf426798f4616f74f8aa',
+                salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
             },
         },
     },