chore: rework named accounts generation

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

Author: tmigone

config/graph.localhost.yml

@@ -1,10 +1,10 @@
 general:
-  arbitrator: &arbitrator "0x3fD652C93dFA333979ad762Cf581Df89BaBa6795" # Arbitration Council
-  governor: &governor "0x325A621DeA613BCFb5B1A69a7aCED0ea4AfBD73A" # Governor Council
-  authority: &authority "0xF0D5BC18421fa04D0a2A2ef540ba5A9f04014BE3" # Authority that signs payment vouchers
-  availabilityOracle: &availabilityOracle "0x66FC63C2572bF3ADD0Fe5d44b97c2E614E35e9a3" # Subgraph Availability Oracle
-  pauseGuardian: &pauseGuardian "0xf408f04F9b7691f7174FA2bb73ad6d45fD5d3CBe" # Protocol pause guardian
-  allocationExchangeOwner: &allocationExchangeOwner "0x2F560290FEF1B3Ada194b6aA9c40aa71f8e95598" # Allocation Exchange owner
+  arbitrator: &arbitrator "0xFFcf8FDEE72ac11b5c542428B35EEF5769C409f0" # Arbitration Council
+  governor: &governor "0x22d491Bde2303f2f43325b2108D26f1eAbA1e32b" # Governor Council
+  authority: &authority "0xE11BA2b4D45Eaed5996Cd0823791E0C93114882d" # Authority that signs payment vouchers
+  availabilityOracle: &availabilityOracle "0xd03ea8624C8C5987235048901fB614fDcA89b117" # Subgraph Availability Oracle
+  pauseGuardian: &pauseGuardian "0x95cED938F7991cd0dFcb48F0a06a40FA1aF46EBC" # Protocol pause guardian
+  allocationExchangeOwner: &allocationExchangeOwner "0x3E5e9111Ae8eB78Fe1CC3bb8915d5D461F3Ef9A9" # Allocation Exchange owner
 
 contracts:
   Controller:

tasks/gre.ts

@@ -24,46 +24,46 @@ extendEnvironment((hre: HardhatRuntimeEnvironment) => {
       throw new Error(`Graph config not found: ${graphConfigPath}`)
     }
 
+    const namedAccountList = [
+      'arbitrator',
+      'governor',
+      'authority',
+      'availabilityOracle',
+      'pauseGuardian',
+      'allocationExchangeOwner',
+    ]
+
     const getAccounts = async (): Promise<Account[]> => {
       const accounts = []
       const signers: Signer[] = await hre.ethers.getSigners()
 
-      for (const signer of signers) {
-        accounts.push({ signer, address: await signer.getAddress() })
+      // Skip deployer and named accounts
+      for (let i = namedAccountList.length + 1; i < signers.length; i++) {
+        accounts.push({ signer: signers[i], address: await signers[i].getAddress() })
       }
       return accounts
     }
 
     const getNamedAccounts = async (): Promise<NamedAccounts> => {
-      const names = [
-        'arbitrator',
-        'governor',
-        'authority',
-        'availabilityOracle',
-        'pauseGuardian',
-        'allocationExchangeOwner',
-      ]
-
       const testAccounts = await getTestAccounts()
-      const namedAccounts = names.reduce((acc, name, i) => {
-        acc[name] = chainId === '1337' ? testAccounts[i] : getNamedAccount(name)
+      const namedAccounts = namedAccountList.reduce((acc, name, i) => {
+        acc[name] = chainId === '1337' ? testAccounts[i] : getNamedAccountFromConfig(name)
         return acc
       }, {} as NamedAccounts)
 
       return namedAccounts
     }
 
-    const getNamedAccount = (name: string): Account => {
+    const getNamedAccountFromConfig = (name: string): Account => {
       const signer = new VoidSigner(
         getItemValue(readConfig(graphConfigPath, true), `general/${name}`),
       )
       return { signer, address: signer.address }
     }
 
-    // Get accounts from the tail end of the signers list
-    // This is to prevent named accounts them from collisioning with test accounts
     const getTestAccounts = async (): Promise<Account[]> => {
-      return (await hre.ethers.getSigners()).reverse().map((s) => ({
+      // Skip deployer account
+      return (await hre.ethers.getSigners()).slice(1).map((s) => ({
         signer: s,
         address: s.address,
       }))
@@ -78,7 +78,8 @@ extendEnvironment((hre: HardhatRuntimeEnvironment) => {
       getNamedAccounts: lazyFunction(() => getNamedAccounts),
       getAccounts: lazyFunction(() => getAccounts),
       getDeployer: lazyFunction(() => async () => {
-        return (await getAccounts())[0]
+        const signer = hre.ethers.provider.getSigner(0)
+        return { signer, address: await signer.getAddress() }
       }),
     }
   }