feat: ensure ignition deploy script handles contract ownership

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

Author: tmigone

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

@@ -1,12 +1,11 @@
 {
   "$global": {
-    "governor": "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0",
     "pauseGuardian": "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC",
-    "subgraphAvailabilityOracle": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
     // Placeholder address for a standalone Horizon deployment, see README.md for more details
     "subgraphServiceAddress": "0x0000000000000000000000000000000000000000"
   },
   "RewardsManager": {
+    "subgraphAvailabilityOracle": "0xd03ea8624C8C5987235048901fB614fDcA89b117",
     "issuancePerBlock": "114155251141552511415n"
   },
   "EpochManager": {

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

@@ -7,11 +7,11 @@ import TAPCollectorModule, { MigrateTAPCollectorModule } from './TAPCollector'
 
 export default buildModule('GraphHorizon_Core', (m) => {
   const { HorizonStaking } = m.useModule(HorizonStakingModule)
-  const { GraphPayments } = m.useModule(GraphPaymentsModule)
-  const { PaymentsEscrow } = m.useModule(PaymentsEscrowModule)
+  const { GraphPayments, GraphPaymentsProxyAdmin } = m.useModule(GraphPaymentsModule)
+  const { PaymentsEscrow, PaymentsEscrowProxyAdmin } = m.useModule(PaymentsEscrowModule)
   const { TAPCollector } = m.useModule(TAPCollectorModule)
 
-  return { HorizonStaking, GraphPayments, PaymentsEscrow, TAPCollector }
+  return { HorizonStaking, GraphPayments, PaymentsEscrow, TAPCollector, GraphPaymentsProxyAdmin, PaymentsEscrowProxyAdmin }
 })
 
 export const MigrateHorizonCoreModule = buildModule('GraphHorizon_Core', (m) => {

packages/horizon/ignition/modules/deploy.ts

@@ -18,8 +18,23 @@ export default buildModule('GraphHorizon_Deploy', (m) => {
     GraphPayments,
     PaymentsEscrow,
     TAPCollector,
+    GraphPaymentsProxyAdmin,
+    PaymentsEscrowProxyAdmin,
   } = m.useModule(GraphHorizonCoreModule)
 
+  const governor = m.getAccount(1)
+
+  // Accept ownership of Graph Governed based contracts
+  // BUG?: acceptOwnership should be called after everything in GraphHorizonCoreModule and GraphPeripheryModule is resolved
+  // but it seems that it's not waiting for interal calls. Waiting on HorizonStaking seems to fix the issue for some reason
+  // Removing HorizonStaking from the after list will trigger the bug
+  m.call(Controller, 'acceptOwnership', [], { from: governor, after: [GraphPeripheryModule, GraphHorizonCoreModule, HorizonStaking] })
+  m.call(GraphProxyAdmin, 'acceptOwnership', [], { from: governor, after: [GraphPeripheryModule, GraphHorizonCoreModule, HorizonStaking] })
+
+  // Transfer ownership of TransparentUpgradeableProxy based contracts
+  m.call(GraphPaymentsProxyAdmin, 'transferOwnership', [governor], { after: [GraphHorizonCoreModule, HorizonStaking] })
+  m.call(PaymentsEscrowProxyAdmin, 'transferOwnership', [governor], { after: [GraphHorizonCoreModule, HorizonStaking] })
+
   return {
     Controller,
     L2Curation,

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

@@ -7,13 +7,13 @@ import { MigrateGraphProxyAdminModule } from './GraphProxyAdmin'
 import ControllerArtifact from '@graphprotocol/contracts/build/contracts/contracts/governance/Controller.sol/Controller.json'
 
 export default buildModule('Controller', (m) => {
-  const governor = m.getParameter('governor')
+  const governor = m.getAccount(1)
   const pauseGuardian = m.getParameter('pauseGuardian')
 
   const Controller = m.contract('Controller', ControllerArtifact)
   m.call(Controller, 'setPauseGuardian', [pauseGuardian])
-  m.call(Controller, 'transferOwnership', [governor])
   m.call(Controller, 'setPaused', [false])
+  m.call(Controller, 'transferOwnership', [governor])
 
   return { Controller }
 })

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

@@ -3,7 +3,7 @@ import { buildModule } from '@nomicfoundation/hardhat-ignition/modules'
 import GraphProxyAdminArtifact from '@graphprotocol/contracts/build/contracts/contracts/upgrades/GraphProxyAdmin.sol/GraphProxyAdmin.json'
 
 export default buildModule('GraphProxyAdmin', (m) => {
-  const governor = m.getParameter('governor')
+  const governor = m.getAccount(1)
 
   const GraphProxyAdmin = m.contract('GraphProxyAdmin', GraphProxyAdminArtifact)
   m.call(GraphProxyAdmin, 'transferOwnership', [governor])

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

@@ -13,7 +13,7 @@ export default buildModule('L2GraphToken', (m) => {
   const { GraphTokenGateway } = m.useModule(GraphTokenGatewayModule)
 
   const deployer = m.getAccount(0)
-  const governor = m.getParameter('governor')
+  const governor = m.getAccount(1)
   const initialSupply = m.getParameter('initialSupply')
 
   const GraphToken = deployWithGraphProxy(m, GraphProxyAdmin, {
@@ -22,11 +22,14 @@ export default buildModule('L2GraphToken', (m) => {
     initArgs: [deployer],
   })
 
-  m.call(GraphToken, 'mint', [deployer, initialSupply])
-  m.call(GraphToken, 'renounceMinter', [])
-  m.call(GraphToken, 'addMinter', [RewardsManager], { id: 'addMinterRewardsManager' })
-  m.call(GraphToken, 'addMinter', [GraphTokenGateway], { id: 'addMinterGateway' })
-  m.call(GraphToken, 'transferOwnership', [governor])
+  const mintCall = m.call(GraphToken, 'mint', [deployer, initialSupply])
+  const renounceMinterCall = m.call(GraphToken, 'renounceMinter', [])
+  const addMinterRewardsManagerCall = m.call(GraphToken, 'addMinter', [RewardsManager], { id: 'addMinterRewardsManager' })
+  const addMinterGatewayCall = m.call(GraphToken, 'addMinter', [GraphTokenGateway], { id: 'addMinterGateway' })
+
+  // No further calls are needed so we can transfer ownership now
+  const transferOwnershipCall = m.call(GraphToken, 'transferOwnership', [governor], { after: [mintCall, renounceMinterCall, addMinterRewardsManagerCall, addMinterGatewayCall] })
+  m.call(GraphToken, 'acceptOwnership', [], { from: governor, after: [transferOwnershipCall] })
 
   return { GraphToken }
 })