chore: Merge branch 'main' into feat/serializer--clean-drone-config

Author: zguesmi

.github/workflows/sharing-smart-contracts-ci.yml

@@ -88,6 +88,9 @@ jobs:
 
       - name: Upgrade test
         working-directory: packages/sharing-smart-contract
+        env:
+          DATA_PROTECTOR_SHARING_ADDRESS: 0x1390c3c6a545198809F1C7c5Dd2600ef74D60925
+          ADD_ONLY_APP_WHITELIST_REGISTRY_ADDRESS: 0x498D324F711b8998Be81818742e268dEE30347c6
         run: npm run upgrade-local-fork -- --network local-bellecour-fork
 
         # TODO check why the CI does not fail when the following error occurs

environments/README.md

@@ -4,15 +4,18 @@ DEPLOYER_PRIVATE_KEY=...
 # wallet used for admin operations
 ADMIN_PRIVATE_KEY=...
 
-# environment to use for configuration (prod/staging). The default is prod.
-ENV=...
-
 # IExec PoCo contract address override (deploy script only)
 POCO_ADDRESS=...
 
 # DatasetRegistry contract address override (deploy script only)
 DATASET_REGISTRY_ADDRESS=...
 
+# DataProtectorSharing contract address
+DATA_PROTECTOR_SHARING_ADDRESS=...
+
+# AddOnlyAppWhitelistRegistry contract address
+ADD_ONLY_APP_WHITELIST_REGISTRY_ADDRESS=...
+
 ## RPC URL for the network
 RPC_URL=
 

environments/common/utils.js

@@ -22,9 +22,6 @@ const envSchema = z.object({
         .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'),
-
     // Address of the PoCo contract
     POCO_ADDRESS: z
         .string()
@@ -38,6 +35,20 @@ const envSchema = z.object({
         .regex(addressRegex, 'Invalid Ethereum address format')
         .optional()
         .or(z.literal('')),
+    
+    // Address of the DataProtectorSharing contract
+    DATA_PROTECTOR_SHARING_ADDRESS: z
+        .string()
+        .regex(addressRegex, 'Invalid Ethereum address format')
+        .optional()
+        .or(z.literal('')),
+    
+    // Address of the AddOnlyAppWhitelistRegistry contract
+    ADD_ONLY_APP_WHITELIST_REGISTRY_ADDRESS: z
+        .string()
+        .regex(addressRegex, 'Invalid Ethereum address format')
+        .optional()
+        .or(z.literal('')),
 
     // URL of the RPC used for network connection
     RPC_URL: z.string().url('RPC_URL must be a valid URL').optional().or(z.literal('')),