feat: add admin private key support for deployment and configuration

Author: gfournierPro

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

@@ -84,6 +84,7 @@ jobs:
           # For Deployment
           RPC_URL: ${{ secrets.RPC_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
+          ADMIN_PRIVATE_KEY: ${{ secrets.ADMIN_PRIVATE_KEY }}
           POCO_ADDRESS: ${{ vars.POCO_ADDRESS }}
           DATASET_REGISTRY_ADDRESS: ${{ vars.DATASET_REGISTRY_ADDRESS }}
           # For Verification

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

@@ -15,6 +15,13 @@ const envSchema = z.object({
         .optional()
         .or(z.literal('')),
 
+    // Private key of the admin wallet used for proxy admin ownership
+    ADMIN_PRIVATE_KEY: z
+        .string()
+        .regex(privateKeyRegex, 'Invalid private key format')
+        .optional()
+        .or(z.literal('')),
+
     // environment to use for configuration (prod/staging)
     ENV: z.enum(['prod', 'staging'], 'ENV must be either "prod" or "staging"').default('prod'),
 

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

@@ -14,6 +14,18 @@ const bellecourBase = {
   hardfork: 'berlin',
 };
 
+// Helper function to get accounts array with both deployer and admin keys
+function getAccounts() {
+  const accounts = [];
+  if (env.DEPLOYER_PRIVATE_KEY) {
+    accounts.push(env.DEPLOYER_PRIVATE_KEY);
+  }
+  if (env.ADMIN_PRIVATE_KEY && env.ADMIN_PRIVATE_KEY !== env.DEPLOYER_PRIVATE_KEY) {
+    accounts.push(env.ADMIN_PRIVATE_KEY);
+  }
+  return accounts.length > 0 ? accounts : [];
+}
+
 /**
  * @type import('hardhat/config').HardhatUserConfig
  */
@@ -35,30 +47,24 @@ module.exports = {
     bellecour: {
       ...bellecourBase,
       url: 'https://bellecour.iex.ec',
-      accounts: env.DEPLOYER_PRIVATE_KEY ? [env.DEPLOYER_PRIVATE_KEY] : [],
+      accounts: getAccounts(),
     },
     avalancheFujiTestnet: {
       chainId: 43113,
       url: env.RPC_URL || 'https://api.avax-test.network/ext/bc/C/rpc',
-      accounts: [
-        env.DEPLOYER_PRIVATE_KEY ||
-          '0x0000000000000000000000000000000000000000000000000000000000000000',
-      ],
+      accounts: getAccounts(),
       blockGasLimit: 8_000_000,
     },
     arbitrumSepolia: {
       chainId: 421614,
       url: env.RPC_URL || 'https://sepolia-rollup.arbitrum.io/rpc',
-      accounts: [
-        env.DEPLOYER_PRIVATE_KEY ||
-          '0x0000000000000000000000000000000000000000000000000000000000000000',
-      ],
+      accounts: getAccounts(),
       blockGasLimit: 30_000_000,
     },
     arbitrum: {
       chainId: 42161,
       url: env.RPC_URL || 'https://arb1.arbitrum.io/rpc',
-      accounts: env.DEPLOYER_PRIVATE_KEY ? [env.DEPLOYER_PRIVATE_KEY] : [],
+      accounts: getAccounts(),
       blockGasLimit: 30_000_000,
     },
     // poco-chain native config

packages/sharing-smart-contract/ignition/modules/DataProtectorSharingModule.cjs

@@ -11,7 +11,10 @@ const env = require('../../config/env.cjs');
 
 // @ts-ignore
 module.exports = buildModule('DataProtectorSharingModule', (m) => {
-    const proxyAdminOwner = m.getAccount(0);
+    // Use admin private key if provided, otherwise fall back to the first account
+    const proxyAdminOwner = env.ADMIN_PRIVATE_KEY 
+        ? m.getAccount(env.ADMIN_PRIVATE_KEY) 
+        : m.getAccount(0);
     const pocoAddress = env.POCO_ADDRESS || defaultPocoAddress;
     const datasetRegistryAddress = env.DATASET_REGISTRY_ADDRESS || defaultDatasetRegistryAddress;
 

packages/sharing-smart-contract/package.json

@@ -10,7 +10,7 @@
     "compile": "hardhat clean && hardhat compile && npm run artifact-to-abis",
     "verify:ignition": "hardhat ignition verify --include-unrelated-contracts",
     "verify": "hardhat verify",
-    "deploy": "hardhat ignition deploy ignition/modules/DataProtectorSharingModule.cjs --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/scripts/deploy.js

@@ -49,7 +49,7 @@ async function main() {
         },
     );
     await upgrades.forceImport(
-        await dataProtectorSharing.getAddress(),
+        dpsProxyAddress,
         await ethers.getContractFactory('DataProtectorSharing'),
         {
             kind: 'transparent',