From 4dfbb173c6436562b20a881744d2958bbfa24388 Mon Sep 17 00:00:00 2001
From: Shahul Hameed <10547529+shahthepro@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:22:18 +0530
Subject: [PATCH] Deploy 013 - Migrator and veOGV upgrade (#438)

* Updates to Deploy tooling

* Deploy 013 - Migrator and veOGV upgrade

* Update whale address

* Update whale address

* Fix governance action

* Fmt

* Tooling fixes

* Add transfer governance as part of deploy

* Fix tooling

* Update whale address

* Attempt at making tests stable
---
 build/deployments.json                              | 7 ++++---
 script/deploy/mainnet/013_UpgradeMigratorScript.sol | 9 ++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/deployments.json b/build/deployments.json
index 0a1057df..52f20a54 100644
--- a/build/deployments.json
+++ b/build/deployments.json
@@ -3,15 +3,16 @@
     "executions": {
       "010_xOGNSetup": 1716312107,
       "011_OgnOgvMigration": 1716485925,
-      "012_MigrationZapper": 1716910212
+      "012_MigrationZapper": 1716910212,
+      "013_UpgradeMigrator": 1717736099
     },
     "contracts": {
       "MIGRATION_ZAPPER": "0xC202CDa20A8C34C7a282890eAE2Bb9CC0B115877",
       "MIGRATOR": "0x95c347D6214614A780847b8aAF4f96Eb84f4da6d",
-      "MIGRATOR_IMPL": "0x946e9BED9EDebEBCE95Dea72bDD38F8c3F6efd2E",
+      "MIGRATOR_IMPL": "0x936B7855c3f20b09685770467f7621AC41B03063",
       "OGN_REWARDS_SOURCE": "0x7609c88E5880e934dd3A75bCFef44E31b1Badb8b",
       "OGN_REWARDS_SOURCE_IMPL": "0x16890bdd817Ed1c4654430d67329CB20b0B71bB0",
-      "VEOGV_IMPL": "0x2D86E0342a0d263Dff712CD0Aa96d075F61974ed",
+      "VEOGV_IMPL": "0x5DA3E12893bB8673aC482d7177a1836c83d671F4",
       "XOGN": "0x63898b3b6Ef3d39332082178656E9862bee45C57",
       "XOGN_IMPL": "0x97711c7a5D64A064a95d10e37f786d2bD8b1F3c8"
     }
diff --git a/script/deploy/mainnet/013_UpgradeMigratorScript.sol b/script/deploy/mainnet/013_UpgradeMigratorScript.sol
index 2bc9ac6b..83e24bb4 100644
--- a/script/deploy/mainnet/013_UpgradeMigratorScript.sol
+++ b/script/deploy/mainnet/013_UpgradeMigratorScript.sol
@@ -36,6 +36,9 @@ contract UpgradeMigratorScript is BaseMainnetScript {
         // Deploy migrator implementation
         Migrator migratorImpl = new Migrator(Addresses.OGV, Addresses.OGN, Addresses.VEOGV, deployedContracts["XOGN"]);
         _recordDeploy("MIGRATOR_IMPL", address(migratorImpl));
+
+        // Transfer Governance
+        migratorImpl.transferGovernance(Addresses.TIMELOCK);
     }
 
     function _buildGovernanceProposal() internal override {
@@ -43,9 +46,9 @@ contract UpgradeMigratorScript is BaseMainnetScript {
             deployedContracts["MIGRATOR"], "upgradeTo(address)", abi.encode(deployedContracts["MIGRATOR_IMPL"])
         );
 
-        govProposal.action(
-            deployedContracts["VEOGV"], "upgradeTo(address)", abi.encode(deployedContracts["VEOGV_IMPL"])
-        );
+        govProposal.action(Addresses.VEOGV, "upgradeTo(address)", abi.encode(deployedContracts["VEOGV_IMPL"]));
+
+        govProposal.action(deployedContracts["MIGRATOR_IMPL"], "claimGovernance()", "");
     }
 
     function _fork() internal override {