fix(task): accept ownership only if pending owner matches

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

Author: tmigone

tasks/deployment/ownership.ts

@@ -1,4 +1,5 @@
-import { ContractTransaction } from 'ethers'
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { Contract, ContractTransaction, ethers } from 'ethers'
 import { task } from 'hardhat/config'
 import { cliOpts } from '../../cli/defaults'
 
@@ -13,12 +14,36 @@ task('migrate:ownership', 'Accepts ownership of protocol contracts on behalf of
     console.log('> Accepting ownership of contracts')
     console.log(`- Governor: ${governor.address}`)
 
+    const governedContracts = [GraphToken, Controller, GraphProxyAdmin, SubgraphNFT]
     const txs: ContractTransaction[] = []
-    txs.push(await GraphToken.connect(governor).acceptOwnership())
-    txs.push(await Controller.connect(governor).acceptOwnership())
-    txs.push(await GraphProxyAdmin.connect(governor).acceptOwnership())
-    txs.push(await SubgraphNFT.connect(governor).acceptOwnership())
+    for (const contract of governedContracts) {
+      const tx = await acceptOwnershipIfPending(contract, governor)
+      if (tx) {
+        txs.push()
+      }
+    }
 
     await Promise.all(txs.map((tx) => tx.wait()))
     console.log('Done!')
   })
+
+async function acceptOwnershipIfPending(
+  contract: Contract,
+  signer: SignerWithAddress,
+): Promise<ContractTransaction | undefined> {
+  const pendingGovernor = await contract.connect(signer).pendingGovernor()
+
+  if (pendingGovernor === ethers.constants.AddressZero) {
+    console.log(`No pending governor for ${contract.address}`)
+    return
+  }
+
+  if (pendingGovernor === signer.address) {
+    console.log(`Accepting ownership of ${contract.address}`)
+    return contract.connect(signer).acceptOwnership()
+  } else {
+    console.log(
+      `Signer ${signer.address} is not the pending governor of ${contract.address}, it is ${pendingGovernor}`,
+    )
+  }
+}