Deploy 117 - OETH Fixed Rate Dripper #2351

clement-ux · 2025-01-14T17:37:37Z

Dependencies

Deploy a Fixed Rate Dripper for OETH. #2350

Deployment

117_oeth_fixed_rate_dripper.js

Contract

Contract	Address
current new OETHDripper Implementation	0x0929C0fbFF88e129ACaA51Bba0C959491325b4aD
new OETHFixedRateDripper Proxy	0xe3B3b4Fc77505EcfAACf6dD21619a8Cc12fcc501
new OETHFixedRateDripper Implementation	0x7F90FaDc4F4B155Cd2026Ed1Ac54343164e9E81D

Governance

Proposal id: 27194273192096049001033521868815029294031516460891881333743928574609945488001
Proposal tx: 0x65e0133ebf338c86150c523c6fa48e1aa0c8f8c79c8f42e1ca54d54bcd8fc346
Proposal payload:

[
  [
    "0xc0F42F73b8f01849a2DD99753524d4ba14317EB3",
    "0xc0F42F73b8f01849a2DD99753524d4ba14317EB3",
    "0x39254033945AA2E4809Cc2977E7087BEE48bd7Ab"
  ],
  [
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    },
    {
      "type": "BigNumber",
      "hex": "0x00"
    }
  ],
  [
    "upgradeTo(address)",
    "transferAllToken(address,address)",
    "setDripper(address)"
  ],
  [
    "0x0000000000000000000000000929c0fbff88e129acaa51bba0c959491325b4ad",
    "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e3b3b4fc77505ecfaacf6dd21619a8cc12fcc501",
    "0x000000000000000000000000e3b3b4fc77505ecfaacf6dd21619a8cc12fcc501"
  ]
]

0xda95691a00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000004600000000000000000000000000000000000000000000000000000000000000003000000000000000000000000c0f42f73b8f01849a2dd99753524d4ba14317eb3000000000000000000000000c0f42f73b8f01849a2dd99753524d4ba14317eb300000000000000000000000039254033945aa2e4809cc2977e7087bee48bd7ab00000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001275706772616465546f286164647265737329000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000217472616e73666572416c6c546f6b656e28616464726573732c616464726573732900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001373657444726970706572286164647265737329000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000929c0fbff88e129acaa51bba0c959491325b4ad0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e3b3b4fc77505ecfaacf6dd21619a8cc12fcc5010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000e3b3b4fc77505ecfaacf6dd21619a8cc12fcc5010000000000000000000000000000000000000000000000000000000000000000

Note

It would be nice to have this proposal merged before: #2350

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

shahthepro

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

Diff:

Compared the "OETHFixedRateDripperProxy" contract with address 0xe3B3b4Fc77505EcfAACf6dD21619a8Cc12fcc501 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

Compared the "OETHDripper" contract with address 0x0929C0fbFF88e129ACaA51Bba0C959491325b4aD 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   @openzeppelin/contracts/utils/math/SafeCast.sol
match   contracts/governance/Governable.sol
match   contracts/harvest/Dripper.sol
match   contracts/harvest/OETHDripper.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/interfaces/IVault.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/vault/VaultStorage.sol

Compared the "OETHFixedRateDripper" contract with address 0x7F90FaDc4F4B155Cd2026Ed1Ac54343164e9E81D 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   @openzeppelin/contracts/utils/math/SafeCast.sol
match   contracts/governance/Governable.sol
match   contracts/harvest/Dripper.sol
match   contracts/harvest/FixedRateDripper.sol
match   contracts/harvest/OETHFixedRateDripper.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/interfaces/IVault.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/vault/VaultStorage.sol

github-actions · 2025-01-16T11:43:34Z

	Warnings
⚠️	👀 This PR needs at least 2 reviewers

Generated by 🚫 dangerJS against b2bb713

codecov · 2025-01-16T11:51:38Z

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Project coverage is 53.04%. Comparing base (82baad3) to head (b2bb713).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
contracts/contracts/harvest/Dripper.sol	0.00%	3 Missing ⚠️
...ntracts/contracts/harvest/OETHFixedRateDripper.sol	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2351      +/-   ##
==========================================
- Coverage   53.09%   53.04%   -0.06%     
==========================================
  Files          82       83       +1     
  Lines        4196     4200       +4     
  Branches     1101     1102       +1     
==========================================
  Hits         2228     2228              
- Misses       1965     1969       +4     
  Partials        3        3

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

sparrowDom · 2025-01-16T12:57:17Z

contracts/contracts/harvest/Dripper.sol

+
+    /// @dev Transfer out all ERC20 held by the contract. Governor only.
+    /// @param _asset ERC20 token address
+    function transferAllToken(address _asset, address _receiver)


its ok for now, but ideally the feature change PR would be separate from the deploy PR of that feature. Like you had a separate feature PR here then you can fork off of the feature branch to create the deployment branch that only has the deployment related files.

sparrowDom · 2025-01-16T13:36:55Z

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

code diff checks

npx sol2uml diff 0x0929C0fbFF88e129ACaA51Bba0C959491325b4aD .,node_modules
Compared the "OETHDripper" contract with address 0x0929C0fbFF88e129ACaA51Bba0C959491325b4aD 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   @openzeppelin/contracts/utils/math/SafeCast.sol
match   contracts/governance/Governable.sol
match   contracts/harvest/Dripper.sol
match   contracts/harvest/OETHDripper.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/interfaces/IVault.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/vault/VaultStorage.sol

npx sol2uml diff 0xe3B3b4Fc77505EcfAACf6dD21619a8Cc12fcc501 .,node_modules
Compared the "OETHFixedRateDripperProxy" contract with address 0xe3B3b4Fc77505EcfAACf6dD21619a8Cc12fcc501 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

npx sol2uml diff 0x7F90FaDc4F4B155Cd2026Ed1Ac54343164e9E81D .,node_modules
Compared the "OETHFixedRateDripper" contract with address 0x7F90FaDc4F4B155Cd2026Ed1Ac54343164e9E81D 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   @openzeppelin/contracts/utils/math/SafeCast.sol
match   contracts/governance/Governable.sol
match   contracts/harvest/Dripper.sol
match   contracts/harvest/FixedRateDripper.sol
match   contracts/harvest/OETHFixedRateDripper.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/interfaces/IVault.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/vault/VaultStorage.sol

DanielVF · 2025-01-16T14:26:37Z

✅

clement-ux added 9 commits January 13, 2025 17:40

feat: add OETH Fixed Rate Dripper.

d88d411

feat: add new function to Dripper.

ab5c0e1

fix: adjust deployment file.

64fedfc

fix: allow to transferERC20 to custom receiver.

1b488bc

prettier.

5f1361e

fix: adjust deployment script.

e5729d6

fix: remove hardcoded addresses.

b836478

docs: adjust comments.

d6e4165

Deploy OETH Fixed Rate Dripper

3462275

clement-ux changed the title ~~Clement/deploy 117~~ Deploy 117 - OETH Fixed Rate Dripper Jan 14, 2025

clement-ux marked this pull request as ready for review January 14, 2025 17:42

clement-ux requested review from sparrowDom, DanielVF, naddison36 and shahthepro as code owners January 14, 2025 17:42

clement-ux added 3 commits January 14, 2025 19:17

fix: add proposal description.

f024b1c

feat: add proposal Id.

ce7a383

fix: adjust proposal id.

16bedbc

shahthepro reviewed Jan 16, 2025

View reviewed changes

shahthepro previously approved these changes Jan 16, 2025

View reviewed changes

Merge branch 'master' into clement/deploy_117

b2bb713

shahthepro dismissed their stale review via b2bb713 January 16, 2025 11:43

clement-ux mentioned this pull request Jan 16, 2025

Deploy a Fixed Rate Dripper for OETH. #2350

Closed

6 tasks

sparrowDom reviewed Jan 16, 2025

View reviewed changes

sparrowDom approved these changes Jan 16, 2025

View reviewed changes

shahthepro merged commit 5ff14c4 into master Jan 16, 2025
17 of 20 checks passed

shahthepro deleted the clement/deploy_117 branch January 16, 2025 15:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deploy 117 - OETH Fixed Rate Dripper #2351

Deploy 117 - OETH Fixed Rate Dripper #2351

clement-ux commented Jan 14, 2025 •

edited by sparrowDom

Loading

shahthepro left a comment •

edited

Loading

github-actions bot commented Jan 16, 2025

codecov bot commented Jan 16, 2025 •

edited

Loading

sparrowDom Jan 16, 2025

sparrowDom commented Jan 16, 2025 •

edited

Loading

DanielVF commented Jan 16, 2025

Deploy 117 - OETH Fixed Rate Dripper #2351

Deploy 117 - OETH Fixed Rate Dripper #2351

Conversation

clement-ux commented Jan 14, 2025 • edited by sparrowDom Loading

Dependencies

Deployment

Contract

Governance

Note

Deploy checklist

shahthepro left a comment • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Jan 16, 2025

codecov bot commented Jan 16, 2025 • edited Loading

Codecov Report

sparrowDom Jan 16, 2025

Choose a reason for hiding this comment

sparrowDom commented Jan 16, 2025 • edited Loading

DanielVF commented Jan 16, 2025

clement-ux commented Jan 14, 2025 •

edited by sparrowDom

Loading

shahthepro left a comment •

edited

Loading

codecov bot commented Jan 16, 2025 •

edited

Loading

sparrowDom commented Jan 16, 2025 •

edited

Loading