refactor: remove ADMIN_ADDRESS references from deployment and configuration files

Author: gfournierPro

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

@@ -85,7 +85,6 @@ jobs:
           RPC_URL: ${{ secrets.RPC_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           ADMIN_PRIVATE_KEY: ${{ secrets.ADMIN_PRIVATE_KEY }}
-          ADMIN_ADDRESS: ${{ vars.ADMIN_ADDRESS }}
           POCO_ADDRESS: ${{ vars.POCO_ADDRESS }}
           DATASET_REGISTRY_ADDRESS: ${{ vars.DATASET_REGISTRY_ADDRESS }}
         run: |

packages/sharing-smart-contract/.env.template

@@ -4,8 +4,6 @@ DEPLOYER_PRIVATE_KEY=...
 # wallet used for admin operations
 ADMIN_PRIVATE_KEY=...
 
-ADMIN_ADDRESS=...
-
 # environment to use for configuration (prod/staging). The default is prod.
 ENV=...
 

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

@@ -22,13 +22,6 @@ const envSchema = z.object({
         .optional()
         .or(z.literal('')),
 
-    // Address of the admin wallet (alternative to ADMIN_PRIVATE_KEY)
-    ADMIN_ADDRESS: z
-        .string()
-        .regex(addressRegex, 'Invalid address 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/ignition/modules/DataProtectorSharingModule.cjs

@@ -17,17 +17,6 @@ module.exports = buildModule('DataProtectorSharingModule', (m) => {
         `Using proxy admin owner: ${proxyAdminOwner} (index: ${env.ADMIN_PRIVATE_KEY ? 1 : 0})`,
     );
 
-    // Determine the admin address for initialization
-    // Priority: ADMIN_ADDRESS env var > admin account from private key > deployer account
-    let adminAddress;
-    if (env.ADMIN_ADDRESS) {
-        adminAddress = env.ADMIN_ADDRESS;
-        console.log(`Using admin address from env: ${adminAddress}`);
-    } else {
-        adminAddress = proxyAdminOwner;
-        console.log(`Using admin address from account: ${adminAddress}`);
-    }
-    
     const pocoAddress = env.POCO_ADDRESS || defaultPocoAddress;
     const datasetRegistryAddress = env.DATASET_REGISTRY_ADDRESS || defaultDatasetRegistryAddress;
 
@@ -64,7 +53,7 @@ module.exports = buildModule('DataProtectorSharingModule', (m) => {
         [
             dataProtectorSharingImpl,
             proxyAdminOwner,
-            m.encodeFunctionCall(dataProtectorSharingImpl, 'initialize', [adminAddress]),
+            m.encodeFunctionCall(dataProtectorSharingImpl, 'initialize', [proxyAdminOwner]),
         ],
         {
             id: 'DataProtectorSharingProxy',