refactor: more intuitive naming for executors, fix e2e tst

thomas-waite · thomas-waite · commit 57df6c9f3dad · 2022-06-13T13:28:22.000+01:00
diff --git a/contracts/pods/PodExecutor.sol b/contracts/pods/PodExecutor.sol
@@ -8,7 +8,7 @@ import {CoreRef} from "../refs/CoreRef.sol";
 /// @notice Executor gateway contract which exposes the execution of prepared timelock transactions and makes them public
 /// @dev EXECUTOR_ROLE must be granted to this contract by the relevant timelock, in order for this contract to execute
 contract PodExecutor is CoreRef {
-    event ExecuteTransaction(address timelock, bytes32 dataHash);
+    event ExecuteTransaction(address timelock, bytes32 proposalId);
 
     constructor(address _core) CoreRef(_core) {}
 
diff --git a/proposals/dao/pod_exec_v2.ts b/proposals/dao/pod_exec_v2.ts
@@ -23,12 +23,12 @@ const fipNumber = 'pod_executor_v2';
 // This should exclusively include new contract deployments
 const deploy: DeployUpgradeFunc = async (deployAddress: string, addresses: NamedAddresses, logging: boolean) => {
   const PodExecutorFactory = await ethers.getContractFactory('PodExecutor');
-  const newPodExecutor = await PodExecutorFactory.deploy(addresses.core);
-  await newPodExecutor.deployTransaction.wait();
-  logging && console.log('Pod Executor deployed to: ', newPodExecutor.address);
+  const podExecutor = await PodExecutorFactory.deploy(addresses.core);
+  await podExecutor.deployTransaction.wait();
+  logging && console.log('Pod Executor deployed to: ', podExecutor.address);
 
   return {
-    newPodExecutor
+    podExecutor
   };
 };
 
@@ -52,10 +52,10 @@ const validate: ValidateUpgradeFunc = async (addresses, oldContracts, contracts,
 
   // 1. Validate new podExecutor has EXECUTOR role
   const EXECUTOR_ROLE = await tribalCouncilTimelock.EXECUTOR_ROLE();
-  expect(await tribalCouncilTimelock.hasRole(EXECUTOR_ROLE, addresses.newPodExecutor)).to.be.true;
+  expect(await tribalCouncilTimelock.hasRole(EXECUTOR_ROLE, addresses.podExecutor)).to.be.true;
 
   // 2. Revoke old podExecutor EXECUTOR_ROLE
-  expect(await tribalCouncilTimelock.hasRole(EXECUTOR_ROLE, addresses.podExecutor)).to.be.false;
+  expect(await tribalCouncilTimelock.hasRole(EXECUTOR_ROLE, addresses.oldPodExecutor)).to.be.false;
 };
 
 export { deploy, setup, teardown, validate };
diff --git a/proposals/description/pod_exec_v2.ts b/proposals/description/pod_exec_v2.ts
@@ -9,7 +9,7 @@ const pod_executor_v2: TemplatedProposalDescription = {
       method: 'grantRole(bytes32,address)',
       arguments: (addresses) => [
         '0xd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63', // EXECUTOR_ROLE
-        addresses.newPodExecutor
+        addresses.podExecutor
       ],
       description: `
       Tribal Council timelock grants the new Pod Executor v2 contract
@@ -22,7 +22,7 @@ const pod_executor_v2: TemplatedProposalDescription = {
       method: 'revokeRole(bytes32,address)',
       arguments: (addresses) => [
         '0xd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63', // EXECUTOR_ROLE
-        addresses.podExecutor
+        addresses.oldPodExecutor
       ],
       description: `
       Migrate Pod Executor contracts
diff --git a/protocol-configuration/mainnetAddresses.ts b/protocol-configuration/mainnetAddresses.ts
@@ -2038,12 +2038,12 @@ const MainnetContractsConfig: MainnetContractsConfig = {
     address: '0x84dc71500D504163A87756dB6368CC8bB654592f',
     category: AddressCategory.Volt
   },
-  podExecutor: {
+  oldPodExecutor: {
     artifactName: 'PodExecutor',
     address: '0x99d8b669F48A708f7C0373AF6CE31F0726ab6CaD',
     category: AddressCategory.Deprecated
   },
-  // newPodExecutor: {
+  // podExecutor: {
   //   artifactName: 'PodExecutor',
   //   address: '',
   //   category: AddressCategory.Governance
diff --git a/test/integration/tests/podExecutor.ts b/test/integration/tests/podExecutor.ts
@@ -75,7 +75,7 @@ describe('Pod executor', function () {
 
     tcMultisigSigner = await getImpersonatedSigner(contractAddresses.tribalCouncilSafe);
     tribalCouncilTimelock = contracts.tribalCouncilTimelock as TimelockController;
-    podExecutor = contracts.newPodExecutor as PodExecutor;
+    podExecutor = contracts.podExecutor as PodExecutor;
 
     // Setup Tribal Council timelock with DAI
     const daiWhale = '0x6B175474E89094C44Da98b954EedeAC495271d0F';
diff --git a/test/integration/tests/podOperation.ts b/test/integration/tests/podOperation.ts
@@ -146,14 +146,19 @@ describe('Pod operation and veto', function () {
     // 3.0 Execute transaction on Safe
     const executeTxResponse = await safeSDK.executeTransaction(safeTransaction);
     await executeTxResponse.transactionResponse?.wait();
+
+    // 4.0 Grant new PodExecutor contract the EXECUTOR role
+    const podTimelockSigner = await getImpersonatedSigner(podTimelock.address);
+    const EXECUTOR_ROLE = await podTimelock.EXECUTOR_ROLE();
+    await podTimelock.connect(podTimelockSigner).grantRole(EXECUTOR_ROLE, contractAddresses.podExecutor);
   });
 
   it('should allow a proposal to be proposed and executed', async () => {
     // Fast forward time on timelock
     await time.increase(podConfig.minDelay);
 
     // Execute timelocked transaction - need to call via the podExecutor
-    const podExecutor = contracts.newPodExecutor;
+    const podExecutor = contracts.podExecutor;
     const executeTx = await podExecutor.execute(
       timelockAddress,
       contractAddresses.governanceMetadataRegistry,
@@ -257,7 +262,7 @@ describe('Pod operation and veto', function () {
     // Fast forward time on timelock
     await time.increase(tribeCouncilPodConfig.minDelay);
 
-    const podExecutor = contracts.newPodExecutor;
+    const podExecutor = contracts.podExecutor;
     const executeTx = await podExecutor.execute(
       tribalCouncilTimelock.address,
       contractAddresses.roleBastion,
