From 6754633d9a8a94c56c7a86c451804555cbb3f52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Fri, 29 May 2026 15:22:40 +0200 Subject: [PATCH 1/4] Remove the Convex AMO strategy from the OETH Vault --- .../mainnet/196_remove_oeth_convex_amo.js | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 contracts/deploy/mainnet/196_remove_oeth_convex_amo.js diff --git a/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js b/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js new file mode 100644 index 0000000000..57c63b9002 --- /dev/null +++ b/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js @@ -0,0 +1,37 @@ +const { deploymentWithGovernanceProposal } = require("../../utils/deploy"); + +module.exports = deploymentWithGovernanceProposal( + { + deployName: "196_remove_oeth_convex_amo", + forceDeploy: false, + reduceQueueTime: true, + deployerIsProposer: false, + // proposalId: "", // Add once the proposal has been created on-chain + }, + async ({ ethers }) => { + // Current OETH Vault contracts + const cVaultProxy = await ethers.getContract("OETHVaultProxy"); + const cVault = await ethers.getContractAt("IVault", cVaultProxy.address); + + // Convex OETH/ETH AMO Strategy (0x1827F9eA98E0bf96550b2FC20F7233277FcD7E63) + // The old Curve OETH/ETH pool used by this AMO is no longer used. + const cStrategyProxy = await ethers.getContract( + "ConvexEthMetaStrategyProxy" + ); + + // Governance Actions + // ---------------- + return { + name: "Remove the Convex AMO Strategy from the OETH Vault", + actions: [ + { + // removeStrategy withdraws all assets from the strategy back to the + // Vault before marking it as unsupported. + contract: cVault, + signature: "removeStrategy(address)", + args: [cStrategyProxy.address], + }, + ], + }; + } +); From 397f7e82254039594c3ec60df7abfc4fee140f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Fri, 29 May 2026 15:31:41 +0200 Subject: [PATCH 2/4] Add proposalId for Convex AMO strategy removal in OETH Vault --- contracts/deploy/mainnet/196_remove_oeth_convex_amo.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js b/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js index 57c63b9002..1621f56498 100644 --- a/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js +++ b/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js @@ -6,7 +6,8 @@ module.exports = deploymentWithGovernanceProposal( forceDeploy: false, reduceQueueTime: true, deployerIsProposer: false, - // proposalId: "", // Add once the proposal has been created on-chain + proposalId: + "103423371549941850803617056393955997738077624682599514660888481101539457353886", // Add once the proposal has been created on-chain }, async ({ ethers }) => { // Current OETH Vault contracts From b7ac332140248735676dd7e8f61455380c5d57c2 Mon Sep 17 00:00:00 2001 From: Nicholas Addison Date: Mon, 22 Jun 2026 11:34:52 +1000 Subject: [PATCH 3/4] Recreated the gov prop to remove OETH Convex AMO --- .../mainnet/201_remove_oeth_convex_amo.js | 38 +++++++++++++++++++ .../deployments/mainnet/.migrations.json | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 contracts/deploy/mainnet/201_remove_oeth_convex_amo.js diff --git a/contracts/deploy/mainnet/201_remove_oeth_convex_amo.js b/contracts/deploy/mainnet/201_remove_oeth_convex_amo.js new file mode 100644 index 0000000000..4026b1b768 --- /dev/null +++ b/contracts/deploy/mainnet/201_remove_oeth_convex_amo.js @@ -0,0 +1,38 @@ +const { deploymentWithGovernanceProposal } = require("../../utils/deploy"); + +module.exports = deploymentWithGovernanceProposal( + { + deployName: "201_remove_oeth_convex_amo", + forceDeploy: false, + reduceQueueTime: true, + deployerIsProposer: false, + proposalId: + "65917466506012284308120271732167759811825281875173804912309711554959620397852", + }, + async ({ ethers }) => { + // Current OETH Vault contracts + const cVaultProxy = await ethers.getContract("OETHVaultProxy"); + const cVault = await ethers.getContractAt("IVault", cVaultProxy.address); + + // Convex OETH/ETH AMO Strategy (0x1827F9eA98E0bf96550b2FC20F7233277FcD7E63) + // The old Curve OETH/ETH pool used by this AMO is no longer used. + const cStrategyProxy = await ethers.getContract( + "ConvexEthMetaStrategyProxy" + ); + + // Governance Actions + // ---------------- + return { + name: "Remove the Convex AMO Strategy from the OETH Vault.", + actions: [ + { + // removeStrategy withdraws all assets from the strategy back to the + // Vault before marking it as unsupported. + contract: cVault, + signature: "removeStrategy(address)", + args: [cStrategyProxy.address], + }, + ], + }; + } +); diff --git a/contracts/deployments/mainnet/.migrations.json b/contracts/deployments/mainnet/.migrations.json index f8ef6eafe2..b3090af9dc 100644 --- a/contracts/deployments/mainnet/.migrations.json +++ b/contracts/deployments/mainnet/.migrations.json @@ -83,5 +83,6 @@ "197_migrate_xogn_module6_to_talos": 1780930872, "198_migrate_strategist_modules_to_talos": 1780930872, "199_deploy_compounding_staking_strategy": 1781093567, - "200_remove_old_compounding_ssv_strategy": 1781561627 + "200_remove_old_compounding_ssv_strategy": 1781561627, + "201_remove_oeth_convex_amo": 1782091931 } From 4d9a564940e14676d7747b9904dde9ea90e9af55 Mon Sep 17 00:00:00 2001 From: Nicholas Addison Date: Mon, 22 Jun 2026 11:38:19 +1000 Subject: [PATCH 4/4] Removed defeated deploy script --- .../mainnet/196_remove_oeth_convex_amo.js | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 contracts/deploy/mainnet/196_remove_oeth_convex_amo.js diff --git a/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js b/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js deleted file mode 100644 index 1621f56498..0000000000 --- a/contracts/deploy/mainnet/196_remove_oeth_convex_amo.js +++ /dev/null @@ -1,38 +0,0 @@ -const { deploymentWithGovernanceProposal } = require("../../utils/deploy"); - -module.exports = deploymentWithGovernanceProposal( - { - deployName: "196_remove_oeth_convex_amo", - forceDeploy: false, - reduceQueueTime: true, - deployerIsProposer: false, - proposalId: - "103423371549941850803617056393955997738077624682599514660888481101539457353886", // Add once the proposal has been created on-chain - }, - async ({ ethers }) => { - // Current OETH Vault contracts - const cVaultProxy = await ethers.getContract("OETHVaultProxy"); - const cVault = await ethers.getContractAt("IVault", cVaultProxy.address); - - // Convex OETH/ETH AMO Strategy (0x1827F9eA98E0bf96550b2FC20F7233277FcD7E63) - // The old Curve OETH/ETH pool used by this AMO is no longer used. - const cStrategyProxy = await ethers.getContract( - "ConvexEthMetaStrategyProxy" - ); - - // Governance Actions - // ---------------- - return { - name: "Remove the Convex AMO Strategy from the OETH Vault", - actions: [ - { - // removeStrategy withdraws all assets from the strategy back to the - // Vault before marking it as unsupported. - contract: cVault, - signature: "removeStrategy(address)", - args: [cStrategyProxy.address], - }, - ], - }; - } -);