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

USDs-v2 contract deployment #62

Merged
merged 75 commits into from
Jan 19, 2024
Merged

USDs-v2 contract deployment #62

merged 75 commits into from
Jan 19, 2024

Conversation

YashP16
Copy link
Contributor

@YashP16 YashP16 commented Jan 19, 2024

Overview:

  1. Standardize formatting with forge-fmt.
  2. Improve nat-spec docs.
  3. Improve test coverage and assertions.
  4. Add sequence diagrams for important transactional flows in the protocol.
  5. Improve contracts post audit.
  6. Add deployment scripts and post-deployment artifacts.

Changes

  • Strategies:
    • Update response of checkRewardEarned()
    • StargateStrategy: Add updateFarm()
    • AaveStrategy: Add depositLp()
  • SPABuyback:
    • Integrate new veSPA rewarder contract
  • Dripper:
    • call collect() internally in addUSDs()
    • update lastCollectTS even if nothing to collect.

arcantheon and others added 30 commits November 24, 2023 16:56
@arcantheon
prettier formatting
639b356
@arcantheon
fix(emergency-withdraw): allocatedAmt - amtRcv
bc7b37a
@arcantheon
guarded deposit function with onlyVault (SPE-12)
73167a7
@arcantheon
Added recover erc20 function (SPE-15)
2dd4f81
@arcantheon
removed recovererc20 function
6e8a0f2
@arcantheon
Added recover erc20 function (SPE-15)
99ca91e
@arcantheon
using safeIncreaseAllowance (SPE-17)
dc0b609
@arcantheon
updated to forceApprove
010105b
@arcantheon
Updated Stargate strategy to update farm
9175d36
@arcantheon
dripRate updation reconfigured SPE-27
f928904
@arcantheon
Merge branch 'dev' into fix/stargate-strategy
0a5e22b
@arcantheon
Merge branch 'dev' into fix/dripper
99bc748
@arcantheon
Updated Yield reserve to call addUSDs
9a92c49
@arcantheon
Added checks for toDripper and skipped revert
cf11a11
@arcantheon
Fixed test cases
98fba0b
@arcantheon
Added recoverERC20 test cases
9f3db4e
@arcantheon
Cached rewardPID in updateFarm()
51259ed
@parv3213
Gas Optimization
8230f6e
@YashP16
Revert "Cached rewardPID in updateFarm()"
8c98c51 
This reverts commit 51259ed.
@YashP16
Revert "Updated Stargate strategy to update farm"
1816acc 
This reverts commit 9175d36.
@arcantheon
Added invalid amount check
27b1ee5
@arcantheon
Merge branch 'dev' into fix/dripper
dbb6288
@arcantheon
Removed extra check
0cc65e3
@arcantheon
Review comments to fix number units
7b8198d
@arcantheon
Updated Stargate strategy to update farm
5ba139d
@arcantheon
Cached rewardPID in updateFarm()
0d7fdac
@arcantheon
Updated updateFarm function
0f33ebb
@arcantheon
Edited updateFarm to withdraw & deposit all tokens
e080048
@arcantheon
Merge branch 'dev' into fix/stargate-strategy
53a51ce
@arcantheon @parv3213
Update contracts/strategies/stargate/StargateStrategy.sol
be8deab 
Co-authored-by: Parv Garg <parv3213@gmail.com>
parv3213 and others added 17 commits January 10, 2024 17:45
@parv3213
perf(contracts/rebase): Move collect() after zero check
96ea5fc
@YashP16
feat(contracts/buyback): Add mintUSDs() in YieldReserve contract
a31f999 
Changes:
* Add mintUSDs() in yieldReserve contract to directly convert collaterals to USDs.
* Don't charge any mint fee for yieldReserve contract.
@YashP16
refactor(contracts/rebase): Update lastCollectTs even on 0 collect fr…
a0769cf 
…om dripper.
@YashP16
docs: Add deployment artifacts
60f1e90
@YashP16
feat(scripts): Add deployment and preset script for USDsV2
d8d5f86
@YashP16
feat(script): Add preset script
211a6ad
@YashP16
feat(contracts/strategies): Add depositLp() in AaveStrategy to facili…
eb5c451 
…tate migration
@YashP16
refactor(contracts/strategies): Make rewardTokenConfigurable in updat…
1bb5ecc 
…eFarm()
@YashP16
chore(scripts): Add strategy deployment configs
5f3b7fc
@YashP16
feat(contracts/utils): Add interfaces to interact with old contracts …
9bced99 
…for migration.
@YashP16
docs(deployment-artifacts): Add deployment data for aaveStrategy
63d2158
@YashP16
chore(scripts): Update preset script for simulating migration
0df5520
@YashP16
docs(deployment-artifacts): Add strategy deployment data.
2afdb10
@YashP16
refactor(scripts): Remove unnecessary steps post migration
3ef3bd9
@parv3213 @YashP16
@TechnoGeek01 @arcantheon
Fix/Improve Tests (#59)
29760f7 
* chore(test): Improved MasterPriceOracle tests

- Refactor tests into separate contracts
- Made constant variables for all manual variables
- Made event emit checks more robust

* test(buyback/SPABuyback): Fix test naming convention and generalize test

* improved naming convention and event testing in test files

* test cases improved

* improved stargate testing

* improved FeeCalculator testing

* chore(test): Improved USDs tests

- Refactor tests into separate contracts
- Made constant variables for all manual variables
- Made event emit checks more robust

* chore(test): Fix failing USDs tests

- Fix fuzz range

* improved test cases

* update

* fixed stargate testing

* chore(VaultCore.t): Add fee related tests

* chore(Dripper.t): Improve tests

* standarfized test function names

* fixed test function names

* chore(Dripper.t): Fix tests

* test(VaultCore): Fix redemption from strategy tests

* improved variable names in VaultCore.t.sol

* chore(USDs.t): Fix failing USDs tests

- Fix fuzz range

* chore(Dripper.t): Add additional test for modifier code

* chore(RebaseManager.t): Fix/add tests

* chore(Dripper.t): Fix test for modified code

* fixed test_burn_rebasing test case in USDs.t.sol

* refactor(tests): Update old addresses and other fixes

* added depositLp test cases for aave

* improved compound strategy coverage and test cases

* update

* refactor(tests): Improve tests and coverage

* refactor(tests): Consistent use of `RevertWhen`

* refactor(USDs.t): Remove TODOs

* refactor(AaveStrategy.t): reduce redundancy and improve tests

---------

Co-authored-by: YashP16 <yash.pitroda786@gmail.com>
Co-authored-by: TechnoGeek01 <rsudharsangames@gmail.com>
Co-authored-by: mehultuteja <arcantheon@gmail.com>
@YashP16
Merge pull request #60 from Sperax/wip/deployment
be375fa 
Wip/deployment
@YashP16
Merge branch 'main' into dev
68629d1
@YashP16 YashP16 self-assigned this Jan 19, 2024
@parv3213
Copy link
Member

Forge coverage has significantly improved. The only cases not covered are either due to bugs in the Forge coverage or are attributed to dead code.

@YashP16 YashP16 merged commit ff71faf into main Jan 19, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bayou020 bayou020 bayou020 approved these changes

@TechnoGeek01 TechnoGeek01 TechnoGeek01 approved these changes

@parv3213 parv3213 parv3213 approved these changes

Assignees

@YashP16 YashP16

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@YashP16 @parv3213 @bayou020 @TechnoGeek01 @arcantheon