Remove result proxy address from sharing contract

Author: zguesmi

packages/sharing-smart-contract/contracts/DataProtectorSharing.sol

@@ -72,7 +72,7 @@ contract DataProtectorSharing is
         __AccessControl_init();
         _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
 
-        updateEnv("ipfs", "https://result.v8-bellecour.iex.ec");
+        updateEnv("ipfs");
     }
 
     /***************************************************************************
@@ -261,11 +261,9 @@ contract DataProtectorSharing is
      *                         Admin                                           *
      **************************************************************************/
     function updateEnv(
-        string memory iexecResultStorageProvider_,
-        string memory iexecResultStorageProxy_
+        string memory iexecResultStorageProvider_
     ) public onlyRole(DEFAULT_ADMIN_ROLE) {
         _iexecResultStorageProvider = iexecResultStorageProvider_;
-        _iexecResultStorageProxy = iexecResultStorageProxy_;
     }
 
     /***************************************************************************

packages/sharing-smart-contract/contracts/ManageOrders.sol

@@ -38,6 +38,9 @@ abstract contract ManageOrders {
         0x0000000000000000000000000000000000000000000000000000000000000003; // [tee,scone]
     uint256 internal constant TRUST = 0; // No replication
     string internal _iexecResultStorageProvider;
+    // This value is not used anymore but it is kept
+    // as a placeholder to not break storage of the proxy
+    // deployed on Bellecour.
     string internal _iexecResultStorageProxy;
     uint256 private _salt;
 
@@ -166,8 +169,6 @@ abstract contract ManageOrders {
                 '{"iexec_result_encryption":true', // solhint-disable-line quotes
                 ',"iexec_result_storage_provider":"', // solhint-disable-line quotes
                 _iexecResultStorageProvider,
-                '","iexec_result_storage_proxy":"', // solhint-disable-line quotes
-                _iexecResultStorageProxy,
                 '"}' // solhint-disable-line quotes
             );
     }

packages/sharing-smart-contract/scripts/updateEnv.js

@@ -7,11 +7,14 @@ const { ethers } = pkg;
 async function main() {
     const { ENV } = env;
     console.log(`using ENV: ${ENV}`);
-    const { dataprotectorSharingContractAddress, resultProxyUrl } = getEnvironment(ENV);
+    const { dataprotectorSharingContractAddress } = getEnvironment(ENV);
 
-    const newEnv = ['ipfs', resultProxyUrl];
+    const newResultStorageProvider = 'ipfs';
 
-    console.log(`UpdateEnv Contract at ${dataprotectorSharingContractAddress} with [${newEnv}]`);
+    console.log(
+        `UpdateEnv contract at ${dataprotectorSharingContractAddress} ` +
+            `[newResultStorageProvider=${newResultStorageProvider}]`,
+    );
     const [admin] = await ethers.getSigners();
     console.log(`using wallet ${admin.address}`);
 
@@ -20,7 +23,7 @@ async function main() {
         dataprotectorSharingContractAddress,
     );
 
-    const updateEnvTx = await dataProtectorSharingContract.updateEnv(...newEnv);
+    const updateEnvTx = await dataProtectorSharingContract.updateEnv(newResultStorageProvider);
     console.log(`tx: ${updateEnvTx.hash}`);
 
     await updateEnvTx.wait();