Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy 123 - Simple Harvester v2 #2387

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Conversation

clement-ux
Copy link
Contributor

@clement-ux clement-ux commented Feb 10, 2025

Description

  • Deploy a new harvester that will be used by all OETH strategies.

Deployment

Deploy script:

  • 123_simple_harvester_v2.js

Deployed Contract

Contract Address
OETHSimpleHarvesterProxy 0x6D416E576eECBB9F897856a7c86007905274ed04
OETHSimpleHarvester Implementation 0x04b7122D9FA42aEd0715293AfF2Bb65e1aA608B6

Governance

Description:

  • Change harvester on all SSV strategies.

  • Support all SSV strategies on new harvester.

  • Send all WETH in the OldDripper to FixedRateDripper.

  • Change harvester in Convex AMO strategy.

  • Support Convex AMO strategy on Harvester.

  • Proposal Id: 26550610486664057138305516943450169995813254080724548319324256884874259231291

  • Proposal tx: 0xefd6baa2e4dcf021708b2397da378741919766ac098b9ab71000b0237271ebab

Proposal Payload

[
  [
    "0x34eDb2ee25751eE67F68A45813B22811687C0238",
    "0x4685dB8bF2Df743c861d71E6cFb5347222992076",
    "0xE98538A0e8C2871C2482e1Be8cC6bd9F8E8fFD63",
    "0x6D416E576eECBB9F897856a7c86007905274ed04",
    "0x6D416E576eECBB9F897856a7c86007905274ed04",
    "0x6D416E576eECBB9F897856a7c86007905274ed04",
    "0xc0F42F73b8f01849a2DD99753524d4ba14317EB3",
    "0x1827F9eA98E0bf96550b2FC20F7233277FcD7E63",
    "0x6D416E576eECBB9F897856a7c86007905274ed04"
  ],
  [
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    }
  ],
  [
    "setHarvesterAddress(address)",
    "setHarvesterAddress(address)",
    "setHarvesterAddress(address)",
    "setSupportedStrategy(address,bool)",
    "setSupportedStrategy(address,bool)",
    "setSupportedStrategy(address,bool)",
    "transferAllToken(address,address)",
    "setHarvesterAddress(address)",
    "setSupportedStrategy(address,bool)"
  ],
  [
    "0x0000000000000000000000006d416e576eecbb9f897856a7c86007905274ed04",
    "0x0000000000000000000000006d416e576eecbb9f897856a7c86007905274ed04",
    "0x0000000000000000000000006d416e576eecbb9f897856a7c86007905274ed04",
    "0x00000000000000000000000034edb2ee25751ee67f68a45813b22811687c02380000000000000000000000000000000000000000000000000000000000000001",
    "0x0000000000000000000000004685db8bf2df743c861d71e6cfb53472229920760000000000000000000000000000000000000000000000000000000000000001",
    "0x000000000000000000000000e98538a0e8c2871c2482e1be8cc6bd9f8e8ffd630000000000000000000000000000000000000000000000000000000000000001",
    "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e3b3b4fc77505ecfaacf6dd21619a8cc12fcc501",
    "0x0000000000000000000000006d416e576eecbb9f897856a7c86007905274ed04",
    "0x0000000000000000000000001827f9ea98e0bf96550b2fc20f7233277fcd7e630000000000000000000000000000000000000000000000000000000000000001"
  ]
]
0xda95691a00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000007400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000000000000000000000000000000000000000000900000000000000000000000034edb2ee25751ee67f68a45813b22811687c02380000000000000000000000004685db8bf2df743c861d71e6cfb5347222992076000000000000000000000000e98538a0e8c2871c2482e1be8cc6bd9f8e8ffd630000000000000000000000006d416e576eecbb9f897856a7c86007905274ed040000000000000000000000006d416e576eecbb9f897856a7c86007905274ed040000000000000000000000006d416e576eecbb9f897856a7c86007905274ed04000000000000000000000000c0f42f73b8f01849a2dd99753524d4ba14317eb30000000000000000000000001827f9ea98e0bf96550b2fc20f7233277fcd7e630000000000000000000000006d416e576eecbb9f897856a7c86007905274ed04000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000002a00000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000003a0000000000000000000000000000000000000000000000000000000000000001c7365744861727665737465724164647265737328616464726573732900000000000000000000000000000000000000000000000000000000000000000000001c7365744861727665737465724164647265737328616464726573732900000000000000000000000000000000000000000000000000000000000000000000001c73657448617276657374657241646472657373286164647265737329000000000000000000000000000000000000000000000000000000000000000000000022736574537570706f72746564537472617465677928616464726573732c626f6f6c290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022736574537570706f72746564537472617465677928616464726573732c626f6f6c290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022736574537570706f72746564537472617465677928616464726573732c626f6f6c2900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000217472616e73666572416c6c546f6b656e28616464726573732c616464726573732900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c73657448617276657374657241646472657373286164647265737329000000000000000000000000000000000000000000000000000000000000000000000022736574537570706f72746564537472617465677928616464726573732c626f6f6c2900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000002a00000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000006d416e576eecbb9f897856a7c86007905274ed0400000000000000000000000000000000000000000000000000000000000000200000000000000000000000006d416e576eecbb9f897856a7c86007905274ed0400000000000000000000000000000000000000000000000000000000000000200000000000000000000000006d416e576eecbb9f897856a7c86007905274ed04000000000000000000000000000000000000000000000000000000000000004000000000000000000000000034edb2ee25751ee67f68a45813b22811687c0238000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000004685db8bf2df743c861d71e6cfb534722299207600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000e98538a0e8c2871c2482e1be8cc6bd9f8e8ffd6300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e3b3b4fc77505ecfaacf6dd21619a8cc12fcc50100000000000000000000000000000000000000000000000000000000000000200000000000000000000000006d416e576eecbb9f897856a7c86007905274ed0400000000000000000000000000000000000000000000000000000000000000400000000000000000000000001827f9ea98e0bf96550b2fc20f7233277fcd7e630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002b4d6f766520616c6c207374726174656769657320746f206e65772073696d706c6520686172766573746572000000000000000000000000000000000000000000

Deploy checklist

Two reviewers complete the following checklist:

- [ ] All deployed contracts are listed in the deploy PR's description
- [ ] Deployed contract's verified code (and all dependencies) match the code in master
- [ ] Contract constructors have correct arguments
- [ ] The transactions that interacted with the newly deployed contract match the deploy script.
- [ ] Governance proposal matches the deploy script
- [ ] Smoke tests pass after fork test execution of the governance proposal

Copy link

codecov bot commented Feb 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.31%. Comparing base (924f542) to head (b86c392).
Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2387   +/-   ##
=======================================
  Coverage   51.31%   51.31%           
=======================================
  Files          92       92           
  Lines        4529     4529           
  Branches     1203     1203           
=======================================
  Hits         2324     2324           
  Misses       2201     2201           
  Partials        4        4           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@clement-ux clement-ux marked this pull request as ready for review February 10, 2025 06:50
@naddison36
Copy link
Collaborator

  • All deployed contracts are listed in the deploy PR's description
  • Deployed contract's verified code (and all dependencies) match the code in master
  • Contract constructors have correct arguments
  • The transactions that interacted with the newly deployed contract match the deploy script.
    • initialize
  • Governance proposal matches the deploy script
  • Smoke tests pass after fork test execution of the governance proposal
sol2uml diff 0x6D416E576eECBB9F897856a7c86007905274ed04 .,node_modules
Compared the "OETHSimpleHarvesterProxy" contract with address 0x6D416E576eECBB9F897856a7c86007905274ed04 on mainnet to local files under folders ".,node_modules"

match   @openzeppelin/contracts/utils/Address.sol
match   contracts/governance/Governable.sol
match   contracts/proxies/InitializeGovernedUpgradeabilityProxy.sol
match   contracts/proxies/Proxies.sol
sol2uml diff 0x04b7122D9FA42aEd0715293AfF2Bb65e1aA608B6 .,node_modules
Compared the "OETHHarvesterSimple" contract with address 0x04b7122D9FA42aEd0715293AfF2Bb65e1aA608B6 on mainnet to local files under folders ".,node_modules"

match   @openzeppelin/contracts/token/ERC20/IERC20.sol
match   @openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol
match   @openzeppelin/contracts/utils/Address.sol
match   contracts/governance/Governable.sol
match   contracts/governance/Strategizable.sol
match   contracts/harvest/OETHHarvesterSimple.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/utils/Initializable.sol

naddison36
naddison36 previously approved these changes Feb 10, 2025
Copy link
Collaborator

@naddison36 naddison36 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have verified the deployment

shahthepro
shahthepro previously approved these changes Feb 10, 2025
Copy link
Collaborator

@shahthepro shahthepro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • All deployed contracts are listed in the deploy PR's description
  • Deployed contract's verified code (and all dependencies) match the code in master
  • Contract constructors have correct arguments
  • The transactions that interacted with the newly deployed contract match the deploy script.
  • Governance proposal matches the deploy script
  • Smoke tests pass after fork test execution of the governance proposal
  • Defender action code has been merged (but yet to be deployed, should happen after governance execution)
  • ⚪ Deployer is the governor of the implementation (but it's fine for now, governor can't change the implementation code or change its param in a way that'd affect the proxy)

@clement-ux clement-ux added OETH OETH related things deployment Deploying smart contract labels Feb 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployment Deploying smart contract OETH OETH related things
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants