release sdk-v2.0.0-beta.3 (#285)

## [2.0.0-beta.3] A new instance of the DataProtectorSharing smart contract has been deployed. The previous beta version `2.0.0-beta.2` is now deprecated. Use the `2.0.0-beta.3` ### Changed - Use DataProtectorSharing `2.0.0` - Upgraded `iexec` dependency to ^8.8.0
iExecBlockchainComputing · Jun 7, 2024 · 0297827 · 0297827
2 parents dea977f + 6f1e928
commit 0297827
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 89 deletions.
diff --git a/environments/environments.json b/environments/environments.json
@@ -8,12 +8,12 @@
     "workerpoolProdAddress": "prod-v8-bellecour.main.pools.iexec.eth",
     "dataprotectorContractAddress": "0x3a4Ab33F3D605e75b6D00A32A0Fa55C3628F6A59",
     "dataprotectorStartBlock": "25455501",
-    "dataprotectorSharingContractAddress": "0x57c927B8e2E66E13d360D52a740445E7b913a494",
-    "dataprotectorSharingStartBlock": "27988599",
-    "addOnlyAppWhitelistRegistryContractAddress": "0xEa48F54EFD9118f86Ec896569698034d2BA35aB6",
-    "addOnlyAppWhitelistRegistryStartBlock": "27988597",
-    "protectedDataDeliveryWhitelistAddress": "0x334dc0bb08fb32a4e9917197e5e626de4b6b9b87",
-    "protectedDataDeliveryDappAddress": "0xF248000F0E99e9203FdBE509019f008F9c169705",
+    "dataprotectorSharingContractAddress": "0x1390c3c6a545198809F1C7c5Dd2600ef74D60925",
+    "dataprotectorSharingStartBlock": "28566236",
+    "addOnlyAppWhitelistRegistryContractAddress": "0x498D324F711b8998Be81818742e268dEE30347c6",
+    "addOnlyAppWhitelistRegistryStartBlock": "28566234",
+    "protectedDataDeliveryWhitelistAddress": "0x256bcd881c33bdf9df952f2a0148f27d439f2e64",
+    "protectedDataDeliveryDappAddress": "0x1cb7D4F3FFa203F211e57357D759321C6CE49921",
     "protectedDataDeliveryDappEns": "protected-data-delivery.apps.iexec.eth",
     "dataprotectorSubgraphUrl": "https://thegraph-product.iex.ec/subgraphs/name/bellecour/dataprotector-v2"
   },
@@ -26,12 +26,12 @@
     "workerpoolProdAddress": "prod-stagingv8.main.pools.iexec.eth",
     "dataprotectorContractAddress": "0xd3A14A1B7165672036A7A8756390C912dD67B81D",
     "dataprotectorStartBlock": "27752118",
-    "dataprotectorSharingContractAddress": "0x22Af9069c55236249Ca001f49Bd9eE7e799cE1fB",
-    "dataprotectorSharingStartBlock": "27882709",
-    "addOnlyAppWhitelistRegistryContractAddress": "0x24ac187868aBb2567c793C5A6024CbA4062805cb",
-    "addOnlyAppWhitelistRegistryStartBlock": "27882707",
-    "protectedDataDeliveryWhitelistAddress": "0x398aafa0b9338d23e94c4404b341c73e5375e92b",
-    "protectedDataDeliveryDappAddress": "0x94d747f4418bc1B75543b78822065aF9211F4107",
+    "dataprotectorSharingContractAddress": "0x0E9f13A9aF23D1F6D0EBCe4dBcaa1dDa58a6184C",
+    "dataprotectorSharingStartBlock": "28566134",
+    "addOnlyAppWhitelistRegistryContractAddress": "0x9FaB42bCc1EA875dea5f3d5F8155c8D66AF7c869",
+    "addOnlyAppWhitelistRegistryStartBlock": "28566132",
+    "protectedDataDeliveryWhitelistAddress": "0x3da63b3fbeb6e4ad28d91d3d1adc452253f44029",
+    "protectedDataDeliveryDappAddress": "0x295869EF57EA9028DCC208e187bab33D48618259",
     "protectedDataDeliveryDappEns": "protected-data-delivery-staging.apps.iexec.eth",
     "dataprotectorSubgraphUrl": "https://thegraph-product.iex.ec/subgraphs/name/bellecour/staging-dataprotector-v2"
   }

diff --git a/packages/demo/usecase-demo/.env.example b/packages/demo/usecase-demo/.env.example
@@ -1,3 +1,3 @@
 VITE_WALLET_CONNECT_PROJECT_ID=b2e4ce8c8c62a7815f1b264f625182dd
-VITE_PROTECTED_DATA_DELIVERY_WHITELIST_ADDRESS=0xEa48F54EFD9118f86Ec896569698034d2BA35aB6
-VITE_PROTECTED_DATA_DELIVERY_DAPP_ADDRESS=0xF248000F0E99e9203FdBE509019f008F9c169705
+VITE_PROTECTED_DATA_DELIVERY_WHITELIST_ADDRESS=0x256bcd881c33bdf9df952f2a0148f27d439f2e64
+VITE_PROTECTED_DATA_DELIVERY_DAPP_ADDRESS=0x1cb7D4F3FFa203F211e57357D759321C6CE49921
diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -2,12 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.0.0] (2024-06-03)
+## [2.0.0-beta.3] (2024-06-07)
 
-This is the new major version, you can safely update to this version: `npm install @iexec/dataprotector@latest`
+A new instance of the DataProtectorSharing smart contract has been deployed. The previous beta version `2.0.0-beta.2` is now deprecated. Use the `2.0.0-beta.3`
 
 ### Changed
 
+- Use DataProtectorSharing `2.0.0`
 - Upgraded `iexec` dependency to ^8.8.0
 
 ## [2.0.0-beta.2] (2024-05-24)
@@ -23,9 +24,9 @@ This is the new major version, you can safely update to this version: `npm insta
 
 - Make the `ethProvider` constructor parameter optional, enabling access to read functions without requiring a wallet.
 - `addToCollection()`: Fix issue when the DataProtectorSharing contract is previously approved for the protected data
-- `processProtectedData()`: A new return type was created: `ProcessProtectedDataResponse`.
+- `processProtectedData()`: A new return type was created: `ProcessProtectedDataResponse`
 - `getProtectedData()`: Still accept legacy types `"boolean"` and `"number"` in `requiredSchema`
-- Type of `collectionId` returned by the read functions has been updated from hexadecimal to decimal.
+- Type of `collectionId` returned by the read functions has been updated from hexadecimal to decimal
 - `consumeProtectedData()`: Remove "CONSUME_TASK_ACTIVE", "CONSUME_TASK_ERROR" and "CONSUME_TASK_COMPLETED" statuses, just use a "CONSUME_TASK" status with `isDone` parameter
 
 ## [2.0.0-beta.1] (2024-05-02)
@@ -42,16 +43,16 @@ This is the new major version, you can safely update to this version: `npm insta
 ### Changed
 
 - [breaking] Migration to modules: two different ways to instantiate this SDK:
-  - instantiate one of the desired module: `IExecDataProtector` or `IExecDataProtectorSharing`.
-  - instantiate whole `IExecDataProtector` and access to both modules.
-- [breaking] Revise the naming of the fetch function to designate them as "get" instead.
+  - instantiate one of the desired module: `IExecDataProtector` or `IExecDataProtectorSharing`
+  - instantiate whole `IExecDataProtector` and access to both modules
+- [breaking] Revise the naming of the fetch function to designate them as "get" instead
 - [breaking] Changed serialization of protected data to support more non binary data
 - [breaking] Changed data types in schema (`bool`, `f64`, `i128`, `string`)
 
 ### Removed
 
-- [breaking] Removed `protectDataObservable` method. You can now use `protectData` and pass it an `onStatusUpdate` callback to get similar "events" at each step of the process.
-- [breaking] Removed `revokeAllAccessObservable` method. You can now use `revokeAllAccess` and pass it an `onStatusUpdate` callback to get similar "events" at each step of the process.
+- [breaking] Removed `protectDataObservable` method. You can now use `protectData` and pass it an `onStatusUpdate` callback to get similar "events" at each step of the process
+- [breaking] Removed `revokeAllAccessObservable` method. You can now use `revokeAllAccess` and pass it an `onStatusUpdate` callback to get similar "events" at each step of the process
 
 ## [1.0.0] (2024-05-02)
 
@@ -123,7 +124,7 @@ This is a major version but there is NO breaking change compared to `v0.5.3`, yo
 
 ### Changed
 
-- Changed `fetchGrantedAccess` response: Previously a list of `GrantedAccess` was returned, now an object is returned containing the list of `GrantedAccess` and `count` properties.
+- Changed `fetchGrantedAccess` response: Previously a list of `GrantedAccess` was returned, now an object is returned containing the list of `GrantedAccess` and `count` properties
 
 ## [0.2.0] (2023-09-20)
 
@@ -137,7 +138,7 @@ This is a major version but there is NO breaking change compared to `v0.5.3`, yo
 
 - Added method `processProtectedData` to the sdk that triggers the execution of an iExec dapp to process a created data.
 
-- Added method `transferOwnership` to the sdk that sets a new owner of the protected.
+- Added method `transferOwnership` to the sdk that sets a new owner of the protected
 
 ## [0.1.2] (2023-09-20)
 

diff --git a/packages/sdk/package-lock.json b/packages/sdk/package-lock.json
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iexec/dataprotector",
-  "version": "2.0.0",
+  "version": "2.0.0-beta.3",
   "description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
   "type": "module",
   "types": "dist/src/index.d.ts",

diff --git a/packages/sdk/src/config/config.ts b/packages/sdk/src/config/config.ts
@@ -18,7 +18,7 @@ export const POCO_APP_REGISTRY_CONTRACT_ADDRESS =
   '0xB1C52075b276f87b1834919167312221d50c9D16'.toLowerCase();
 
 export const DEFAULT_SHARING_CONTRACT_ADDRESS =
-  '0x57c927B8e2E66E13d360D52a740445E7b913a494'.toLowerCase();
+  '0x1390c3c6a545198809F1C7c5Dd2600ef74D60925'.toLowerCase();
 
 export const DEFAULT_SUBGRAPH_URL =
   'https://thegraph-product.iex.ec/subgraphs/name/bellecour/dataprotector-v2';

diff --git a/packages/sharing-smart-contract/.openzeppelin/prod/unknown-134.json b/packages/sharing-smart-contract/.openzeppelin/prod/unknown-134.json
@@ -2,28 +2,28 @@
   "manifestVersion": "3.2",
   "proxies": [
     {
-      "address": "0xEa48F54EFD9118f86Ec896569698034d2BA35aB6",
-      "txHash": "0xee062bb56812d9c493f1e110bb2402242e04748dbab65af856c699c641361de0",
+      "address": "0x498D324F711b8998Be81818742e268dEE30347c6",
+      "txHash": "0x436bd09f78135a543090a4e7bc07281460c3b7d67eccc6576ac1c66151e0e44b",
       "kind": "transparent"
     },
     {
-      "address": "0x57c927B8e2E66E13d360D52a740445E7b913a494",
-      "txHash": "0xdba1d79e3138872955acf226b310002a40538fbb43ea298bc64c2c8edfaf9010",
+      "address": "0x1390c3c6a545198809F1C7c5Dd2600ef74D60925",
+      "txHash": "0x7a5a5ee5dba4c5904e05ea71a79604083bae82cf9a4d4d15b9b80e17b9e5afb3",
       "kind": "transparent"
     }
   ],
   "impls": {
     "35555c0200b0e5fece232c28643ef256994b81e16cfccd8809eb4d6022fc0839": {
-      "address": "0x32Ce648E40847B040dDd55E609E5d0b4715407dB",
-      "txHash": "0x9bfe9d9edae4df2c1c736dbdfd2813644867604262b41780c2b7f58d8a45c51e",
+      "address": "0x8D88d0AEB8227813fc5ad57594c557693eF023bB",
+      "txHash": "0x2b5e1559def163883565bc12e04580f8445fe545d4ce31fbe20ad147d4b12013",
       "layout": {
         "solcVersion": "0.8.24",
         "storage": [
           {
             "label": "_implementationAddress",
             "offset": 0,
             "slot": "0",
-            "type": "t_contract(AddOnlyAppWhitelist)7099",
+            "type": "t_contract(AddOnlyAppWhitelist)7112",
             "contract": "AddOnlyAppWhitelistRegistry",
             "src": "contracts/registry/AddOnlyAppWhitelistRegistry.sol:29"
           }
@@ -125,7 +125,7 @@
             "label": "uint64",
             "numberOfBytes": "8"
           },
-          "t_contract(AddOnlyAppWhitelist)7099": {
+          "t_contract(AddOnlyAppWhitelist)7112": {
             "label": "contract AddOnlyAppWhitelist",
             "numberOfBytes": "20"
           }
@@ -202,9 +202,9 @@
         }
       }
     },
-    "e398f19f3ea9162f36eef6ce14c029a31128423b07477dbe19baddd4049035d2": {
-      "address": "0xF9045E5B8fb851E7d4340b4996a5666986833931",
-      "txHash": "0xba9f90f35aa84180d29da458e32f32faa9719099d3655725f6b496581425a865",
+    "0f2aad8a806104b99344811545c3f71d647010e9b8efdff6d05db627839dafd0": {
+      "address": "0x3618fE85d7b8457f6F506b17c51f69a967f19e60",
+      "txHash": "0x676937b3666c9b390a135e346ffe91f50037f8e2f80bdc495252adbe92996064",
       "layout": {
         "solcVersion": "0.8.24",
         "storage": [
@@ -252,15 +252,15 @@
             "label": "protectedDataDetails",
             "offset": 0,
             "slot": "5",
-            "type": "t_mapping(t_address,t_struct(ProtectedDataDetails)6359_storage)",
+            "type": "t_mapping(t_address,t_struct(ProtectedDataDetails)6365_storage)",
             "contract": "DataProtectorSharing",
             "src": "contracts/DataProtectorSharing.sol:51"
           },
           {
             "label": "collectionDetails",
             "offset": 0,
             "slot": "6",
-            "type": "t_mapping(t_uint256,t_struct(CollectionDetails)6338_storage)",
+            "type": "t_mapping(t_uint256,t_struct(CollectionDetails)6344_storage)",
             "contract": "DataProtectorSharing",
             "src": "contracts/DataProtectorSharing.sol:53"
           }
@@ -400,23 +400,23 @@
             "label": "uint64",
             "numberOfBytes": "8"
           },
-          "t_contract(IAddOnlyAppWhitelist)6162": {
+          "t_contract(IAddOnlyAppWhitelist)6168": {
             "label": "contract IAddOnlyAppWhitelist",
             "numberOfBytes": "20"
           },
-          "t_mapping(t_address,t_struct(ProtectedDataDetails)6359_storage)": {
+          "t_mapping(t_address,t_struct(ProtectedDataDetails)6365_storage)": {
             "label": "mapping(address => struct IDataProtectorSharing.ProtectedDataDetails)",
             "numberOfBytes": "32"
           },
           "t_mapping(t_address,t_uint48)": {
             "label": "mapping(address => uint48)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(CollectionDetails)6338_storage)": {
+          "t_mapping(t_uint256,t_struct(CollectionDetails)6344_storage)": {
             "label": "mapping(uint256 => struct IDataProtectorSharing.CollectionDetails)",
             "numberOfBytes": "32"
           },
-          "t_struct(CollectionDetails)6338_storage": {
+          "t_struct(CollectionDetails)6344_storage": {
             "label": "struct IDataProtectorSharing.CollectionDetails",
             "members": [
               {
@@ -433,7 +433,7 @@
               },
               {
                 "label": "subscriptionParams",
-                "type": "t_struct(SubscriptionParams)6756_storage",
+                "type": "t_struct(SubscriptionParams)6769_storage",
                 "offset": 0,
                 "slot": "2"
               },
@@ -446,7 +446,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(ProtectedDataDetails)6359_storage": {
+          "t_struct(ProtectedDataDetails)6365_storage": {
             "label": "struct IDataProtectorSharing.ProtectedDataDetails",
             "members": [
               {
@@ -457,7 +457,7 @@
               },
               {
                 "label": "addOnlyAppWhitelist",
-                "type": "t_contract(IAddOnlyAppWhitelist)6162",
+                "type": "t_contract(IAddOnlyAppWhitelist)6168",
                 "offset": 0,
                 "slot": "1"
               },
@@ -475,7 +475,7 @@
               },
               {
                 "label": "rentingParams",
-                "type": "t_struct(RentingParams)6591_storage",
+                "type": "t_struct(RentingParams)6604_storage",
                 "offset": 0,
                 "slot": "2"
               },
@@ -487,14 +487,14 @@
               },
               {
                 "label": "sellingParams",
-                "type": "t_struct(SellingParams)6671_storage",
+                "type": "t_struct(SellingParams)6684_storage",
                 "offset": 0,
                 "slot": "4"
               }
             ],
             "numberOfBytes": "160"
           },
-          "t_struct(RentingParams)6591_storage": {
+          "t_struct(RentingParams)6604_storage": {
             "label": "struct IRental.RentingParams",
             "members": [
               {
@@ -505,14 +505,14 @@
               },
               {
                 "label": "duration",
-                "type": "t_uint48",
+                "type": "t_uint40",
                 "offset": 9,
                 "slot": "0"
               }
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(SellingParams)6671_storage": {
+          "t_struct(SellingParams)6684_storage": {
             "label": "struct ISale.SellingParams",
             "members": [
               {
@@ -530,7 +530,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(SubscriptionParams)6756_storage": {
+          "t_struct(SubscriptionParams)6769_storage": {
             "label": "struct ISubscription.SubscriptionParams",
             "members": [
               {
@@ -541,13 +541,17 @@
               },
               {
                 "label": "duration",
-                "type": "t_uint48",
+                "type": "t_uint40",
                 "offset": 9,
                 "slot": "0"
               }
             ],
             "numberOfBytes": "32"
           },
+          "t_uint40": {
+            "label": "uint40",
+            "numberOfBytes": "5"
+          },
           "t_uint48": {
             "label": "uint48",
             "numberOfBytes": "6"