From 8303d31b4f5d6d31a039f4ff5b1923bf4ba20f74 Mon Sep 17 00:00:00 2001
From: Nicholas Addison <nick@addisonbrown.com.au>
Date: Mon, 6 Dec 2021 23:38:39 +1100
Subject: [PATCH] chore: EmissionsController deployment

---
 tasks/deployEmissionsController.ts   | 12 +++++++++---
 tasks/utils/networkAddressFactory.ts |  3 +--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tasks/deployEmissionsController.ts b/tasks/deployEmissionsController.ts
index d37877c7..c04b18d0 100644
--- a/tasks/deployEmissionsController.ts
+++ b/tasks/deployEmissionsController.ts
@@ -40,9 +40,6 @@ task("deploy-emissions")
         const emissionsController = await deployEmissionsController(signer, hre)
 
         console.log(`Set RewardsDistributor in the networkAddressFactory to ${emissionsController.address}`)
-
-        const votiumBribeForwarder = await deployVotiumBribeForwarder(signer, hre)
-        console.log(`Set VotiumForwarder to ${votiumBribeForwarder.address}`)
     })
 
 task("deploy-bridge-forwarder", "Deploys a BridgeForwarder contract on mainnet for Polygon dials.")
@@ -74,6 +71,15 @@ task("deploy-basic-forwarder", "Deploys a basic rewards forwarder from the emiss
         await deployBasicForwarder(signer, emissionsControllerAddress, taskArgs.recipient, hre, taskArgs.owner)
     })
 
+task("deploy-votium-forwarder", "Deploys a Votium forwarder from the emissions controller.")
+    .addOptionalParam("speed", "Defender Relayer speed param: 'safeLow' | 'average' | 'fast' | 'fastest'", "fast", types.string)
+    .setAction(async (taskArgs, hre) => {
+        const signer = await getSigner(hre, taskArgs.speed)
+
+        const votiumBribeForwarder = await deployVotiumBribeForwarder(signer, hre)
+        console.log(`Set VotiumForwarder contract name in networkAddressFactory to ${votiumBribeForwarder.address}`)
+    })
+
 task("deploy-revenue-buy-back")
     .addOptionalParam("speed", "Defender Relayer speed param: 'safeLow' | 'average' | 'fast' | 'fastest'", "fast", types.string)
     .setAction(async (taskArgs, hre) => {
diff --git a/tasks/utils/networkAddressFactory.ts b/tasks/utils/networkAddressFactory.ts
index 8c34d3a2..0df5c387 100644
--- a/tasks/utils/networkAddressFactory.ts
+++ b/tasks/utils/networkAddressFactory.ts
@@ -100,8 +100,7 @@ export const getChainAddress = (contractName: ContractNames, chain: Chain): stri
                 return "0xe595D67181D701A5356e010D9a58EB9A341f1DbD"
             case "RewardsDistributor":
             case "EmissionsController":
-                // TODO change after Emissions Controller deployment
-                return "0x04dfDfa471b79cc9E6E8C355e6C71F8eC4916C50"
+                return "0xFC33923d604b91579F045dFB36A6bdb885961C38"
             case "PolygonRootChainManager":
                 return "0xA0c68C638235ee32657e8f720a23ceC1bFc77C77"
             case "PolygonPoSBridge":