service-registry: make the contract upgradeable

Author: abarmat

contracts/discovery/ServiceRegistry.sol

@@ -4,19 +4,17 @@ pragma solidity ^0.7.3;
 pragma experimental ABIEncoderV2;
 
 import "../governance/Managed.sol";
+import "../upgrades/GraphUpgradeable.sol";
 
+import "./ServiceRegistryStorage.sol";
 import "./IServiceRegistry.sol";
 
 /**
  * @title ServiceRegistry contract
  * @dev This contract supports the service discovery process by allowing indexers to
  * register their service url and any other relevant information.
  */
-contract ServiceRegistry is Managed, IServiceRegistry {
-    // -- State --
-
-    mapping(address => IndexerService) public services;
-
+contract ServiceRegistry is ServiceRegistryV1Storage, GraphUpgradeable, IServiceRegistry {
     // -- Events --
 
     event ServiceRegistered(address indexed indexer, string url, string geohash);
@@ -30,10 +28,9 @@ contract ServiceRegistry is Managed, IServiceRegistry {
     }
 
     /**
-     * @dev Contract Constructor.
-     * @param _controller Controller address
+     * @dev Initialize this contract.
      */
-    constructor(address _controller) {
+    function initialize(address _controller) external onlyImpl {
         Managed._initialize(_controller);
     }
 

contracts/discovery/ServiceRegistryStorage.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: UNLICENSED
+
+pragma solidity ^0.7.3;
+
+import "../governance/Managed.sol";
+
+import "./IServiceRegistry.sol";
+
+contract ServiceRegistryV1Storage is Managed {
+    // -- State --
+
+    mapping(address => IServiceRegistry.IndexerService) public services;
+}

graph.config.yml

@@ -26,6 +26,7 @@ contracts:
         id: "0x45fc200c7e4544e457d3c5709bfe0d520442c30bbcbdaede89e8d4a4bbc19247" # keccak256('GraphToken')
         contractAddress: "${{GraphToken.address}}"
   ServiceRegistry:
+    proxy: true
     init:
       controller: "${{Controller.address}}"
   EpochManager:

test/lib/deployment.ts

@@ -196,10 +196,16 @@ export async function deployEthereumDIDRegistry(deployer: Signer): Promise<Ether
 export async function deployServiceRegistry(
   deployer: Signer,
   controller: string,
+  proxyAdmin: GraphProxyAdmin,
 ): Promise<ServiceRegistry> {
-  return (deployContract('ServiceRegistry', deployer, controller) as unknown) as Promise<
-    ServiceRegistry
-  >
+  // Deploy
+  return (network.deployContractWithProxy(
+    proxyAdmin,
+    'ServiceRegistry',
+    [controller],
+    deployer,
+    false,
+  ) as unknown) as Promise<ServiceRegistry>
 }
 
 export async function deployStaking(

test/lib/fixtures.ts

@@ -41,7 +41,11 @@ export class NetworkFixture {
       controller.address,
       proxyAdmin,
     )
-    const serviceRegistry = await deployment.deployServiceRegistry(deployer, controller.address)
+    const serviceRegistry = await deployment.deployServiceRegistry(
+      deployer,
+      controller.address,
+      proxyAdmin,
+    )
 
     // Setup controller
     await controller.setContractProxy(utils.id('EpochManager'), epochManager.address)