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.

Sign up for GitHub

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

Jump to bottom

[OETHb] Deploy 019 - Enable Async Withdrawals #2292

Merged
merged 1 commit into from
Oct 30, 2024
Merged

[OETHb] Deploy 019 - Enable Async Withdrawals #2292

merged 1 commit into from
Oct 30, 2024

Conversation

shahthepro
Copy link
Collaborator

Deployment

Contract Address
OETHBaseVaultCore 0xFCd2C974c2D627F1FADC545eda4A60a337Ab45f9
OETHBaseVaultAdmin 0xf9547Cb922f1BC8c54aadB88795bBB439278BF78

Governance

  • Upgrade VaultCore
  • Upgrade VaultAdmin
  • Set async withdrawal delay to 1d

Generated JSON files

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 (Expected to fail until the governance action is executed on the timelock)

@codecov Codecov
Copy link

codecov bot commented Oct 28, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.37%. Comparing base (16d7435) to head (1d8e980).
Report is 6 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #2292      +/-   ##
==========================================
+ Coverage   52.29%   53.37%   +1.07%     
==========================================
  Files          79       79              
  Lines        4090     4090              
  Branches     1079      824     -255     
==========================================
+ Hits         2139     2183      +44     
+ Misses       1948     1904      -44     
  Partials        3        3

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

clement-ux
clement-ux approved these changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@clement-ux clement-ux left a comment •
edited
Loading

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
    • OETHBaseVaultCore
    • OETHBaseVaultAdmin
  • Deployed contract's verified code (and all dependencies) match the code in master
    • OETHBaseVaultCore
    • OETHBaseVaultAdmin
  • Contract constructors have correct arguments
    • OETHBaseVaultCore: WETH.
    • OETHBaseVaultAdmin: No constructor.
  • The transactions that interacted with the newly deployed contract match the deploy script
    • Upgrade VaultCore with upgradeTo
    • Upgrade VaultAdmin with setAdminImpl
    • Set async claim delay to 1 day with setWithdrawalClaimDelay
  • Governance proposal matches the deploy script
    • No gov proposal

Code Diff

  • OETHBaseVaultCore
sol2uml diff 0xFCd2C974c2D627F1FADC545eda4A60a337Ab45f9 .,node_modules -n base
(node:7321) ExperimentalWarning: The Fetch API is an experimental feature. This feature could change at any time
(Use `node --trace-warnings ...` to show where the warning was created)
Compared the "OETHBaseVaultCore" contract with address 0xFCd2C974c2D627F1FADC545eda4A60a337Ab45f9 on base
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   @openzeppelin/contracts/utils/math/SafeMath.sol
match   contracts/governance/Governable.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IDripper.sol
match   contracts/interfaces/IGetExchangeRateToken.sol
match   contracts/interfaces/IOracle.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/utils/InitializableERC20Detailed.sol
match   contracts/utils/StableMath.sol
match   contracts/vault/OETHBaseVaultCore.sol
match   contracts/vault/OETHVaultCore.sol
match   contracts/vault/VaultCore.sol
match   contracts/vault/VaultInitializer.sol
match   contracts/vault/VaultStorage.sol
  • OETHBaseVaultAdmin
sol2uml diff 0xf9547Cb922f1BC8c54aadB88795bBB439278BF78 .,node_modules -n base
(node:7371) ExperimentalWarning: The Fetch API is an experimental feature. This feature could change at any time
(Use `node --trace-warnings ...` to show where the warning was created)
Compared the "OETHBaseVaultAdmin" contract with address 0xf9547Cb922f1BC8c54aadB88795bBB439278BF78 on base
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/SafeMath.sol
match   contracts/governance/Governable.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IOracle.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/interfaces/ISwapper.sol
match   contracts/interfaces/IVault.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/utils/InitializableERC20Detailed.sol
match   contracts/utils/StableMath.sol
match   contracts/vault/OETHBaseVaultAdmin.sol
match   contracts/vault/VaultAdmin.sol
match   contracts/vault/VaultStorage.sol

@naddison36
Copy link
Collaborator

I've verified the deployment

  • All deployed contracts are listed in the deploy PR's description
    • OETHBaseVaultCore
    • OETHBaseVaultAdmin
  • Deployed contract's verified code (and all dependencies) match the code in master
    • OETHBaseVaultCore
    • OETHBaseVaultAdmin
  • Contract constructors have correct arguments
    • OETHBaseVaultCore
    • OETHBaseVaultAdmin
  • 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 (Expected to fail until the governance action is executed on the timelock)
sol2uml diff 0xFCd2C974c2D627F1FADC545eda4A60a337Ab45f9 .,node_modules -n base
Compared the "OETHBaseVaultCore" contract with address 0xFCd2C974c2D627F1FADC545eda4A60a337Ab45f9 on base
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   @openzeppelin/contracts/utils/math/SafeMath.sol
match   contracts/governance/Governable.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IDripper.sol
match   contracts/interfaces/IGetExchangeRateToken.sol
match   contracts/interfaces/IOracle.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/utils/InitializableERC20Detailed.sol
match   contracts/utils/StableMath.sol
match   contracts/vault/OETHBaseVaultCore.sol
match   contracts/vault/OETHVaultCore.sol
match   contracts/vault/VaultCore.sol
match   contracts/vault/VaultInitializer.sol
match   contracts/vault/VaultStorage.sol

sol2uml diff 0xf9547Cb922f1BC8c54aadB88795bBB439278BF78 .,node_modules -n base
Compared the "OETHBaseVaultAdmin" contract with address 0xf9547Cb922f1BC8c54aadB88795bBB439278BF78 on base
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/SafeMath.sol
match   contracts/governance/Governable.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IOracle.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/interfaces/ISwapper.sol
match   contracts/interfaces/IVault.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/utils/InitializableERC20Detailed.sol
match   contracts/utils/StableMath.sol
match   contracts/vault/OETHBaseVaultAdmin.sol
match   contracts/vault/VaultAdmin.sol
match   contracts/vault/VaultStorage.sol

@sparrowDom
Copy link
Member

sparrowDom commented Oct 28, 2024 •
edited
Loading

checking that:

  • 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 (Expected to fail until the governance action is executed on the timelock)
    • some withdrawal related tests are failing on base withdrawalClaimDelay

✅ Diff of Vault Core

npx sol2uml diff 0xFCd2C974c2D627F1FADC545eda4A60a337Ab45f9 .,node_modules -n base
Compared the "OETHBaseVaultCore" contract with address 0xFCd2C974c2D627F1FADC545eda4A60a337Ab45f9 on base
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   @openzeppelin/contracts/utils/math/SafeMath.sol
match   contracts/governance/Governable.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IDripper.sol
match   contracts/interfaces/IGetExchangeRateToken.sol
match   contracts/interfaces/IOracle.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/utils/InitializableERC20Detailed.sol
match   contracts/utils/StableMath.sol
match   contracts/vault/OETHBaseVaultCore.sol
match   contracts/vault/OETHVaultCore.sol
match   contracts/vault/VaultCore.sol
match   contracts/vault/VaultInitializer.sol
match   contracts/vault/VaultStorage.sol

✅ diff of VaultAdmin

npx sol2uml diff 0xf9547Cb922f1BC8c54aadB88795bBB439278BF78 .,node_modules -n base
Compared the "OETHBaseVaultAdmin" contract with address 0xf9547Cb922f1BC8c54aadB88795bBB439278BF78 on base
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/SafeMath.sol
match   contracts/governance/Governable.sol
match   contracts/interfaces/IBasicToken.sol
match   contracts/interfaces/IOracle.sol
match   contracts/interfaces/IStrategy.sol
match   contracts/interfaces/ISwapper.sol
match   contracts/interfaces/IVault.sol
match   contracts/token/OUSD.sol
match   contracts/utils/Helpers.sol
match   contracts/utils/Initializable.sol
match   contracts/utils/InitializableERC20Detailed.sol
match   contracts/utils/StableMath.sol
match   contracts/vault/OETHBaseVaultAdmin.sol
match   contracts/vault/VaultAdmin.sol
match   contracts/vault/VaultStorage.sol

@shahthepro shahthepro merged commit a88f7e4 into master Oct 30, 2024
14 of 18 checks passed
@shahthepro shahthepro deleted the shah/deploy-019-async-withdrawals branch October 30, 2024 14:49
sparrowDom pushed a commit that referenced this pull request Oct 30, 2024
@shahthepro @sparrowDom
[OETHb] Deploy 019 - Enable Async Withdrawals (#2292)
5795ca3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clement-ux clement-ux clement-ux approved these changes

@naddison36 naddison36 naddison36 approved these changes

@sparrowDom sparrowDom sparrowDom approved these changes

@DanielVF DanielVF Awaiting requested review from DanielVF DanielVF is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@shahthepro @naddison36 @sparrowDom @clement-ux