chore: move ownership calls for payments contract to their modules

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

Author: tmigone

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

@@ -11,6 +11,7 @@ export default buildModule('GraphPayments', (m) => {
   const { Controller } = m.useModule(GraphPeripheryModule)
   const { GraphPaymentsProxyAdmin, GraphPaymentsProxy } = m.useModule(HorizonProxiesModule)
 
+  const governor = m.getAccount(1)
   const protocolPaymentCut = m.getParameter('protocolPaymentCut')
 
   // Deploy GraphPayments implementation - requires periphery and proxies to be registered in the controller
@@ -30,6 +31,8 @@ export default buildModule('GraphPayments', (m) => {
       initArgs: [],
     })
 
+  m.call(GraphPaymentsProxyAdmin, 'transferOwnership', [governor], { after: [GraphPayments] })
+
   return { GraphPayments, GraphPaymentsProxyAdmin }
 })
 

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

@@ -11,6 +11,7 @@ export default buildModule('PaymentsEscrow', (m) => {
   const { Controller } = m.useModule(GraphPeripheryModule)
   const { PaymentsEscrowProxyAdmin, PaymentsEscrowProxy } = m.useModule(HorizonProxiesModule)
 
+  const governor = m.getAccount(1)
   const withdrawEscrowThawingPeriod = m.getParameter('withdrawEscrowThawingPeriod')
 
   // Deploy PaymentsEscrow implementation - requires periphery and proxies to be registered in the controller
@@ -30,6 +31,8 @@ export default buildModule('PaymentsEscrow', (m) => {
       initArgs: [],
     })
 
+  m.call(PaymentsEscrowProxyAdmin, 'transferOwnership', [governor], { after: [PaymentsEscrow] })
+
   return { PaymentsEscrow, PaymentsEscrowProxyAdmin }
 })
 

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, GraphPaymentsProxyAdmin } = m.useModule(GraphPaymentsModule)
-  const { PaymentsEscrow, PaymentsEscrowProxyAdmin } = m.useModule(PaymentsEscrowModule)
+  const { GraphPayments } = m.useModule(GraphPaymentsModule)
+  const { PaymentsEscrow } = m.useModule(PaymentsEscrowModule)
   const { TAPCollector } = m.useModule(TAPCollectorModule)
 
-  return { HorizonStaking, GraphPayments, PaymentsEscrow, TAPCollector, GraphPaymentsProxyAdmin, PaymentsEscrowProxyAdmin }
+  return { HorizonStaking, GraphPayments, PaymentsEscrow, TAPCollector }
 })
 
 export const MigrateHorizonCoreModule = buildModule('GraphHorizon_Core', (m) => {

packages/horizon/ignition/modules/deploy.ts

@@ -18,23 +18,18 @@ 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
+
+  // Accept ownership of Graph Governed based contracts
   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/migrate.ts

@@ -4,8 +4,21 @@ import { MigrateHorizonCoreModule } from './core/core'
 import { MigratePeripheryModule } from './periphery/periphery'
 
 export default buildModule('GraphHorizon_Migrate', (m) => {
-  const { L2Curation, RewardsManager, Controller, GraphProxyAdmin, EpochManager, GraphToken, GraphTokenGateway } = m.useModule(MigratePeripheryModule)
-  const { HorizonStaking, GraphPayments, PaymentsEscrow, TAPCollector } = m.useModule(MigrateHorizonCoreModule)
+  const {
+    L2Curation,
+    RewardsManager,
+    Controller,
+    GraphProxyAdmin,
+    EpochManager,
+    GraphToken,
+    GraphTokenGateway,
+  } = m.useModule(MigratePeripheryModule)
+  const {
+    HorizonStaking,
+    GraphPayments,
+    PaymentsEscrow,
+    TAPCollector,
+  } = m.useModule(MigrateHorizonCoreModule)
 
   return {
     L2Curation,