fix: further decouple governor modules from deployer modules

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

packages/horizon/ignition/configs/horizon-migrate.default.json5

@@ -13,13 +13,10 @@
     "rewardsManagerAddress": "0x1F49caE7669086c8ba53CC35d1E9f80176d67E79",
     "curationAddress": "0xDe761f075200E75485F4358978FB4d1dC8644FD5",
 
-    // Placeholder address for a standalone Horizon deployment, see README.md for more details
+    // Must be set for step 4 of the migration
     "subgraphServiceAddress": "0x0000000000000000000000000000000000000000"
   },
-  "HorizonStakingGovernor": {
-    "maxThawingPeriod": 2419200
-  },
-  "GraphPayments": {
+    "GraphPayments": {
     "protocolPaymentCut": 10000
   },
   "PaymentsEscrow": {
@@ -29,5 +26,23 @@
     "eip712Name": "TAPCollector",
     "eip712Version": "1",
     "revokeSignerThawingPeriod": 10000
+  },
+  "HorizonProxiesGovernor": {
+    // These addresses must be set for step 2 of the migration
+    "graphPaymentsAddress": "0x0000000000000000000000000000000000000000",
+    "paymentsEscrowAddress": "0x0000000000000000000000000000000000000000"
+  },
+  "HorizonStakingGovernor": {
+    "maxThawingPeriod": 2419200,
+    // Must be set for step 4 of the migration
+    "horizonStakingImplementationAddress": "0x0000000000000000000000000000000000000000"
+  },
+  "L2CurationGovernor": {
+    // Must be set for step 4 of the migration
+    "curationImplementationAddress": "0x0000000000000000000000000000000000000000"
+  },
+  "RewardsManagerGovernor": {
+    // Must be set for step 4 of the migration
+    "rewardsManagerImplementationAddress": "0x0000000000000000000000000000000000000000"
   }
 }

packages/horizon/ignition/configs/horizon.default.json5

@@ -1,6 +1,7 @@
 {
   "$global": {
     "pauseGuardian": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
+
     // Placeholder address for a standalone Horizon deployment, see README.md for more details
     "subgraphServiceAddress": "0x0000000000000000000000000000000000000000"
   },

packages/horizon/ignition/modules/core/HorizonProxies.ts

@@ -62,25 +62,20 @@ export const MigrateHorizonProxiesDeployerModule = buildModule('HorizonProxiesDe
 
 export const MigrateHorizonProxiesGovernorModule = buildModule('HorizonProxiesGovernor', (m) => {
   const { Controller } = m.useModule(MigrateControllerGovernorModule)
-  const {
-    GraphPaymentsProxy,
-    PaymentsEscrowProxy,
-    GraphPaymentsProxyAdmin,
-    PaymentsEscrowProxyAdmin,
-  } = m.useModule(MigrateHorizonProxiesDeployerModule)
 
-  const governor = m.getAccount(1)
+  const graphPaymentsAddress = m.getParameter('graphPaymentsAddress')
+  const paymentsEscrowAddress = m.getParameter('paymentsEscrowAddress')
 
   // Register proxies in controller
   m.call(Controller, 'setContractProxy',
-    [ethers.keccak256(ethers.toUtf8Bytes('GraphPayments')), GraphPaymentsProxy],
-    { id: 'setContractProxy_GraphPayments', from: governor },
+    [ethers.keccak256(ethers.toUtf8Bytes('GraphPayments')), graphPaymentsAddress],
+    { id: 'setContractProxy_GraphPayments' },
   )
 
   m.call(Controller, 'setContractProxy',
-    [ethers.keccak256(ethers.toUtf8Bytes('PaymentsEscrow')), PaymentsEscrowProxy],
-    { id: 'setContractProxy_PaymentsEscrow', from: governor },
+    [ethers.keccak256(ethers.toUtf8Bytes('PaymentsEscrow')), paymentsEscrowAddress],
+    { id: 'setContractProxy_PaymentsEscrow' },
   )
 
-  return { GraphPaymentsProxy, PaymentsEscrowProxy, GraphPaymentsProxyAdmin, PaymentsEscrowProxyAdmin }
+  return { }
 })

packages/horizon/ignition/modules/core/HorizonStaking.ts

@@ -1,12 +1,12 @@
+import { acceptUpgradeGraphProxy, upgradeGraphProxy } from '../proxy/GraphProxy'
 import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import { deployImplementation } from '../proxy/implementation'
-import { upgradeGraphProxy } from '../proxy/GraphProxy'
 
 import GraphPeripheryModule, { MigratePeripheryModule } from '../periphery/periphery'
 import HorizonProxiesModule from './HorizonProxies'
-import { MigrateGraphProxyAdminModule } from '../periphery/GraphProxyAdmin'
 
 import ExponentialRebatesArtifact from '../../../build/contracts/contracts/staking/libraries/ExponentialRebates.sol/ExponentialRebates.json'
+import GraphProxyAdminArtifact from '@graphprotocol/contracts/build/contracts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
 import GraphProxyArtifact from '@graphprotocol/contracts/build/contracts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
 import HorizonStakingArtifact from '../../../build/contracts/contracts/staking/HorizonStaking.sol/HorizonStaking.json'
 import HorizonStakingExtensionArtifact from '../../../build/contracts/contracts/staking/HorizonStakingExtension.sol/HorizonStakingExtension.json'
@@ -79,18 +79,21 @@ export const MigrateHorizonStakingDeployerModule = buildModule('HorizonStakingDe
 })
 
 export const MigrateHorizonStakingGovernorModule = buildModule('HorizonStakingGovernor', (m) => {
-  const { GraphProxyAdmin } = m.useModule(MigrateGraphProxyAdminModule)
-  const { HorizonStakingProxy, HorizonStakingImplementation } = m.useModule(MigrateHorizonStakingDeployerModule)
-
-  const governor = m.getAccount(1)
   const maxThawingPeriod = m.getParameter('maxThawingPeriod')
+  const graphProxyAdminAddress = m.getParameter('graphProxyAdminAddress')
+  const horizonStakingAddress = m.getParameter('horizonStakingAddress')
+  const horizonStakingImplementationAddress = m.getParameter('horizonStakingImplementationAddress')
+
+  const HorizonStakingImplementation = m.contractAt('HorizonStakingImplementation', HorizonStakingArtifact, horizonStakingImplementationAddress)
+  const HorizonStakingProxy = m.contractAt('HorizonStakingProxy', GraphProxyArtifact, horizonStakingAddress)
+  const GraphProxyAdmin = m.contractAt('GraphProxyAdmin', GraphProxyAdminArtifact, graphProxyAdminAddress)
 
   // Upgrade proxy to implementation contract
-  const HorizonStaking = upgradeGraphProxy(m, GraphProxyAdmin, HorizonStakingProxy, HorizonStakingImplementation, {
+  const HorizonStaking = acceptUpgradeGraphProxy(m, GraphProxyAdmin, HorizonStakingProxy, HorizonStakingImplementation, {
     name: 'HorizonStaking',
     artifact: HorizonStakingArtifact,
-  }, { from: governor })
-  m.call(HorizonStaking, 'setMaxThawingPeriod', [maxThawingPeriod], { from: governor })
+  })
+  m.call(HorizonStaking, 'setMaxThawingPeriod', [maxThawingPeriod])
 
   return { HorizonStaking }
 })

packages/horizon/ignition/modules/migrate/migrate-2.ts

@@ -3,17 +3,7 @@ import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import { MigrateHorizonProxiesGovernorModule } from '../core/HorizonProxies'
 
 export default buildModule('GraphHorizon_Migrate_2', (m) => {
-  const {
-    GraphPaymentsProxy,
-    PaymentsEscrowProxy,
-    GraphPaymentsProxyAdmin,
-    PaymentsEscrowProxyAdmin,
-  } = m.useModule(MigrateHorizonProxiesGovernorModule)
+  m.useModule(MigrateHorizonProxiesGovernorModule)
 
-  return {
-    GraphPaymentsProxy,
-    PaymentsEscrowProxy,
-    GraphPaymentsProxyAdmin,
-    PaymentsEscrowProxyAdmin,
-  }
+  return { }
 })

packages/horizon/ignition/modules/periphery/Controller.ts

@@ -2,8 +2,6 @@
 import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import { ethers } from 'ethers'
 
-import { MigrateGraphProxyAdminModule } from './GraphProxyAdmin'
-
 import ControllerArtifact from '@graphprotocol/contracts/build/contracts/contracts/governance/Controller.sol/Controller.json'
 
 export default buildModule('Controller', (m) => {
@@ -27,14 +25,14 @@ export const MigrateControllerDeployerModule = buildModule('ControllerDeployer',
 })
 
 export const MigrateControllerGovernorModule = buildModule('ControllerGovernor', (m) => {
-  const { GraphProxyAdmin } = m.useModule(MigrateGraphProxyAdminModule)
   const { Controller } = m.useModule(MigrateControllerDeployerModule)
-  const governor = m.getAccount(1)
+
+  const graphProxyAdminAddress = m.getParameter('graphProxyAdminAddress')
 
   // GraphProxyAdmin was not registered in the controller in the original protocol
   m.call(Controller, 'setContractProxy',
-    [ethers.keccak256(ethers.toUtf8Bytes('GraphProxyAdmin')), GraphProxyAdmin],
-    { id: 'setContractProxy_GraphProxyAdmin', from: governor },
+    [ethers.keccak256(ethers.toUtf8Bytes('GraphProxyAdmin')), graphProxyAdminAddress],
+    { id: 'setContractProxy_GraphProxyAdmin' },
   )
 
   return { Controller }

packages/horizon/ignition/modules/periphery/Curation.ts

@@ -1,12 +1,13 @@
+import { acceptUpgradeGraphProxy, deployWithGraphProxy } from '../proxy/GraphProxy'
 import { buildModule, IgnitionModuleBuilder } from '@nomicfoundation/ignition-core'
-import { deployWithGraphProxy, upgradeGraphProxy } from '../proxy/GraphProxy'
 import { deployImplementation } from '../proxy/implementation'
 
-import GraphProxyAdminModule, { MigrateGraphProxyAdminModule } from './GraphProxyAdmin'
 import ControllerModule from './Controller'
+import GraphProxyAdminModule from './GraphProxyAdmin'
 
 import CurationArtifact from '@graphprotocol/contracts/build/contracts/contracts/l2/curation/L2Curation.sol/L2Curation.json'
 import GraphCurationTokenArtifact from '@graphprotocol/contracts/build/contracts/contracts/curation/GraphCurationToken.sol/GraphCurationToken.json'
+import GraphProxyAdminArtifact from '@graphprotocol/contracts/build/contracts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
 import GraphProxyArtifact from '@graphprotocol/contracts/build/contracts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
 
 export default buildModule('L2Curation', (m) => {
@@ -44,19 +45,22 @@ export const MigrateCurationDeployerModule = buildModule('L2CurationDeployer', (
 })
 
 export const MigrateCurationGovernorModule = buildModule('L2CurationGovernor', (m: IgnitionModuleBuilder) => {
-  const { GraphProxyAdmin } = m.useModule(MigrateGraphProxyAdminModule)
-  const { L2CurationProxy, L2CurationImplementation } = m.useModule(MigrateCurationDeployerModule)
-
-  const governor = m.getAccount(1)
+  const curationAddress = m.getParameter('curationAddress')
+  const curationImplementationAddress = m.getParameter('curationImplementationAddress')
   const subgraphServiceAddress = m.getParameter('subgraphServiceAddress')
+  const graphProxyAdminAddress = m.getParameter('graphProxyAdminAddress')
+
+  const GraphProxyAdmin = m.contractAt('GraphProxyAdmin', GraphProxyAdminArtifact, graphProxyAdminAddress)
+  const L2CurationProxy = m.contractAt('L2CurationProxy', GraphProxyArtifact, curationAddress)
+  const L2CurationImplementation = m.contractAt('L2CurationImplementation', CurationArtifact, curationImplementationAddress)
 
   const implementationMetadata = {
     name: 'L2Curation',
     artifact: CurationArtifact,
   }
 
-  const L2Curation = upgradeGraphProxy(m, GraphProxyAdmin, L2CurationProxy, L2CurationImplementation, implementationMetadata, { from: governor })
-  m.call(L2Curation, 'setSubgraphService', [subgraphServiceAddress], { from: governor })
+  const L2Curation = acceptUpgradeGraphProxy(m, GraphProxyAdmin, L2CurationProxy, L2CurationImplementation, implementationMetadata)
+  m.call(L2Curation, 'setSubgraphService', [subgraphServiceAddress])
 
   return { L2Curation }
 })

packages/horizon/ignition/modules/periphery/RewardsManager.ts

@@ -1,10 +1,11 @@
+import { acceptUpgradeGraphProxy, deployWithGraphProxy } from '../proxy/GraphProxy'
 import { buildModule, IgnitionModuleBuilder } from '@nomicfoundation/ignition-core'
-import { deployWithGraphProxy, upgradeGraphProxy } from '../proxy/GraphProxy'
 import { deployImplementation } from '../proxy/implementation'
 
-import GraphProxyAdminModule, { MigrateGraphProxyAdminModule } from './GraphProxyAdmin'
 import ControllerModule from './Controller'
+import GraphProxyAdminModule from './GraphProxyAdmin'
 
+import GraphProxyAdminArtifact from '@graphprotocol/contracts/build/contracts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
 import GraphProxyArtifact from '@graphprotocol/contracts/build/contracts/contracts/upgrades/GraphProxy.sol/GraphProxy.json'
 import RewardsManagerArtifact from '@graphprotocol/contracts/build/contracts/contracts/rewards/RewardsManager.sol/RewardsManager.json'
 
@@ -43,19 +44,23 @@ export const MigrateRewardsManagerDeployerModule = buildModule('RewardsManagerDe
 })
 
 export const MigrateRewardsManagerGovernorModule = buildModule('RewardsManagerGovernor', (m: IgnitionModuleBuilder) => {
-  const { GraphProxyAdmin } = m.useModule(MigrateGraphProxyAdminModule)
-  const { RewardsManagerProxy, RewardsManagerImplementation } = m.useModule(MigrateRewardsManagerDeployerModule)
+  const rewardsManagerAddress = m.getParameter('rewardsManagerAddress')
+  const rewardsManagerImplementationAddress = m.getParameter('rewardsManagerImplementationAddress')
+  const graphProxyAdminAddress = m.getParameter('graphProxyAdminAddress')
+
+  const GraphProxyAdmin = m.contractAt('GraphProxyAdmin', GraphProxyAdminArtifact, graphProxyAdminAddress)
+  const RewardsManagerProxy = m.contractAt('RewardsManagerProxy', GraphProxyArtifact, rewardsManagerAddress)
+  const RewardsManagerImplementation = m.contractAt('RewardsManagerImplementation', RewardsManagerArtifact, rewardsManagerImplementationAddress)
 
-  const governor = m.getAccount(1)
   const subgraphServiceAddress = m.getParameter('subgraphServiceAddress')
 
   const implementationMetadata = {
     name: 'RewardsManager',
     artifact: RewardsManagerArtifact,
   }
 
-  const RewardsManager = upgradeGraphProxy(m, GraphProxyAdmin, RewardsManagerProxy, RewardsManagerImplementation, implementationMetadata, { from: governor })
-  m.call(RewardsManager, 'setSubgraphService', [subgraphServiceAddress], { from: governor })
+  const RewardsManager = acceptUpgradeGraphProxy(m, GraphProxyAdmin, RewardsManagerProxy, RewardsManagerImplementation, implementationMetadata)
+  m.call(RewardsManager, 'setSubgraphService', [subgraphServiceAddress])
 
   return { RewardsManager }
 })

packages/horizon/ignition/modules/proxy/GraphProxy.ts

@@ -27,7 +27,6 @@ export function deployGraphProxy(
   }
 }
 
-// Same as upgradeGraphProxy, but without loading the proxy contracts
 export function upgradeGraphProxy(
   m: IgnitionModuleBuilder,
   proxyAdmin: CallableContractFuture<string>,
@@ -42,6 +41,19 @@ export function upgradeGraphProxy(
   return loadProxyWithABI(m, proxy, metadata, { ...options, after: [acceptCall] })
 }
 
+export function acceptUpgradeGraphProxy(
+  m: IgnitionModuleBuilder,
+  proxyAdmin: CallableContractFuture<string>,
+  proxy: CallableContractFuture<string>,
+  implementation: ContractFuture<string>,
+  metadata: ImplementationMetadata,
+  options?: ContractOptions,
+) {
+  const acceptCall = m.call(proxyAdmin, 'acceptProxy', [implementation, proxy], { ...options })
+
+  return loadProxyWithABI(m, proxy, metadata, { ...options, after: [acceptCall] })
+}
+
 export function deployWithGraphProxy(
   m: IgnitionModuleBuilder,
   proxyAdmin: CallableContractFuture<string>,

packages/horizon/scripts/migrate.ts

@@ -8,7 +8,7 @@ import MigrateModuleStep4 from '../ignition/modules/migrate/migrate-4'
 
 async function main() {
   console.log(getHorizonBanner())
-  const HorizonMigrateConfig = IgnitionHelper.loadConfig('./ignition/configs/', 'horizon-migrate', hre.network.name)
+  const HorizonMigrateConfig = IgnitionHelper.loadConfig('./ignition/configs/', 'horizon-migrate', `horizon-${hre.network.name}`)
 
   const signers = await hre.ethers.getSigners()
   const deployer = signers[0]