From 4bbbfac7afdec6ccbdb5a458f252a73f842c0648 Mon Sep 17 00:00:00 2001 From: Petrovska Date: Wed, 31 May 2023 12:55:45 -0600 Subject: [PATCH 1/4] feat: upgrade ownership of mint/burn controller to timelock --- helpers/addresses.py | 1 + scripts/issue/1277/mint_controller_admin_update.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 scripts/issue/1277/mint_controller_admin_update.py diff --git a/helpers/addresses.py b/helpers/addresses.py index d89926bc..52298dee 100644 --- a/helpers/addresses.py +++ b/helpers/addresses.py @@ -425,6 +425,7 @@ "restitution": "0x3F61344BA56df00dad9bBcA05d98CA2AeC43Ba0B", "bcrvBadger": "0xa54d8a596B4022CC4436b692C8ea0E342405eB6e", "dummy": "0xEC4bc89F35A7bf9ffe0375Fd67940Ded1e2253BF", + "minting": "0xebA06639750BADcDf5EE100D72F3C93f2D1918A7", }, "yearn_vaults": {"byvWBTC": "0x4b92d19c11435614CD49Af1b589001b7c08cD4D5"}, "peaks": { diff --git a/scripts/issue/1277/mint_controller_admin_update.py b/scripts/issue/1277/mint_controller_admin_update.py new file mode 100644 index 00000000..62a1c38c --- /dev/null +++ b/scripts/issue/1277/mint_controller_admin_update.py @@ -0,0 +1,12 @@ +from great_ape_safe import GreatApeSafe +from helpers.addresses import r + +def main(): + safe = GreatApeSafe(r.badger_wallets.dev_multisig) + + # contracts + controller = safe.contract(r.controllers.minting) + + controller.transferOwnership(r.governance_timelock) + + safe.post_safe_tx() \ No newline at end of file From 67ded3a75268c6fc54398cdc3b2b9768e53a3507 Mon Sep 17 00:00:00 2001 From: Petrovska Date: Wed, 31 May 2023 14:39:28 -0600 Subject: [PATCH 2/4] lint: script file --- scripts/issue/1277/mint_controller_admin_update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/issue/1277/mint_controller_admin_update.py b/scripts/issue/1277/mint_controller_admin_update.py index 62a1c38c..3600f65d 100644 --- a/scripts/issue/1277/mint_controller_admin_update.py +++ b/scripts/issue/1277/mint_controller_admin_update.py @@ -1,6 +1,7 @@ from great_ape_safe import GreatApeSafe from helpers.addresses import r + def main(): safe = GreatApeSafe(r.badger_wallets.dev_multisig) @@ -9,4 +10,4 @@ def main(): controller.transferOwnership(r.governance_timelock) - safe.post_safe_tx() \ No newline at end of file + safe.post_safe_tx() From 703863a55f39bc59f8f5090b208d55a50b576944 Mon Sep 17 00:00:00 2001 From: Petrovska Date: Wed, 7 Jun 2023 12:29:26 -0600 Subject: [PATCH 3/4] fix: not use proxy implementation of the controller, use actual controller addr --- helpers/addresses.py | 1 - scripts/issue/1277/mint_controller_admin_update.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/helpers/addresses.py b/helpers/addresses.py index 52298dee..d89926bc 100644 --- a/helpers/addresses.py +++ b/helpers/addresses.py @@ -425,7 +425,6 @@ "restitution": "0x3F61344BA56df00dad9bBcA05d98CA2AeC43Ba0B", "bcrvBadger": "0xa54d8a596B4022CC4436b692C8ea0E342405eB6e", "dummy": "0xEC4bc89F35A7bf9ffe0375Fd67940Ded1e2253BF", - "minting": "0xebA06639750BADcDf5EE100D72F3C93f2D1918A7", }, "yearn_vaults": {"byvWBTC": "0x4b92d19c11435614CD49Af1b589001b7c08cD4D5"}, "peaks": { diff --git a/scripts/issue/1277/mint_controller_admin_update.py b/scripts/issue/1277/mint_controller_admin_update.py index 3600f65d..89da6452 100644 --- a/scripts/issue/1277/mint_controller_admin_update.py +++ b/scripts/issue/1277/mint_controller_admin_update.py @@ -6,7 +6,7 @@ def main(): safe = GreatApeSafe(r.badger_wallets.dev_multisig) # contracts - controller = safe.contract(r.controllers.minting) + controller = safe.contract(r.GatedMiniMeController) controller.transferOwnership(r.governance_timelock) From d7332a7b1664323648d1ef29bd89db9b47f47eba Mon Sep 17 00:00:00 2001 From: Petrovska Date: Fri, 9 Jun 2023 12:54:47 -0600 Subject: [PATCH 4/4] feat: include techops as guardian in gov TL --- scripts/issue/1277/mint_controller_admin_update.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/issue/1277/mint_controller_admin_update.py b/scripts/issue/1277/mint_controller_admin_update.py index 89da6452..3f2a505e 100644 --- a/scripts/issue/1277/mint_controller_admin_update.py +++ b/scripts/issue/1277/mint_controller_admin_update.py @@ -7,7 +7,11 @@ def main(): # contracts controller = safe.contract(r.GatedMiniMeController) + timelock_gov = safe.contract(r.governance_timelock) - controller.transferOwnership(r.governance_timelock) + controller.transferOwnership(timelock_gov) + + # guardian setup + timelock_gov.setGuardian(r.badger_wallets.techops_multisig) safe.post_safe_tx()