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

ALM Controller v1.1.0 Merge Dev to Master #81

Merged
merged 22 commits into from
Jan 13, 2025
Merged

ALM Controller v1.1.0 Merge Dev to Master #81

merged 22 commits into from
Jan 13, 2025

Conversation

hexonaut
Copy link
Contributor

@hexonaut hexonaut commented Jan 6, 2025

Merging latest production deploy to master. Waiting on spell execution before merging.

!!! DO NOT SQUASH COMMITS !!!

hexonaut and others added 22 commits November 27, 2024 13:27
…#50)

* added erc4626 support; adding tests

* forge install: morpho-blue

v1.0.0

* forge install: metamorpho

v1.0.0

* add erc4626 support with morpho

* keep old block for existing tests

* minor change

* use existing helper function

* refactor the morpho test structure

* address registry update; match mainnet erc4626 naming

* remove todo

* review fixes

* chore: reorganize testing (#56)

---------

Co-authored-by: Lucas Manuel <[email protected]>
* feat: rm sepolia

* chore: skip staging testing

* feat: rm ci job for deployments
* feat: Add non-4626 related Ethena functions (SC-839) (#52)

* feat: add new functions, update sub

* feat: set up initial testing

* feat: update to get shanghai to pass

* feat: add rate limits

* fix: update to add state assertions

* fix: use standard rate limits

* feat: Refactor to use generalized 4626 (SC-840) (#53)

* feat: refactor to use generalized 4626

* feat: update helper

* feat: Add e2e test for Ethena (SC-841) (#54)

* feat: add new functions, update sub

* feat: set up initial testing

* feat: update to get shanghai to pass

* feat: refactor to use generalized 4626

* feat: update helper

* feat: add rate limits

* feat: add e2e test

* feat: push to use shares

* feat: Add rate limit on cooldowns (#59)

* feat: add rate limits to cooldowns, update testing

* fix: consolidate rate limits
* WIP: add aave support

* forge install: aave-v3-origin

v3.1.0

* finish adding aave main market support

* review changes

* feat: Add support for Base AAVE integration (#61)

* feat: udpate mainnet logic and testing

* feat: add base logic and tests

* fix: rmeove lib references in imports

---------

Co-authored-by: Lucas Manuel <[email protected]>
* fix: refactor to use relative paths for src

* fix: update and reorder imports

* fix: rm dup import
* feat: all tests passing

* feat: add testing for all functions

* fix: cleanup
* feat: add jsons to deployments

* feat: update prod addresses

* fix: update scripts and json

* feat: update json names

* feat: update addresses in json

* fix: update addresses
* refactor staging to most up to date and do another deploy

* remove custom psm in favour of real one

* new deploy and add sUSDe rate limits

* formating and fixed some modifiers

* split out into deps and release json

* formatting
* fix: update to use cooldown

* feat: update test

* test: add return val assertions

---------

Co-authored-by: Lucas <[email protected]>
* feat: add to readme

* fix: add usdc note

* fix: update to remove protocol-specific trust assumptions

* fix: add bolding

* remove the specifics

---------

Co-authored-by: Lucas <[email protected]>
Co-authored-by: Sam MacPherson <[email protected]>
* feat: add infinite withdraw test coverage for aave

* remove double paren

---------

Co-authored-by: Lucas <[email protected]>
Co-authored-by: Sam MacPherson <[email protected]>
* test: refactor to use getBlock

* test: fupdate aave blocks

---------

Co-authored-by: Lucas Manuel <[email protected]>
* test: refactor to get all test working

* test: add coverage for aave, ethena, and susds

* test: get full coverage

* fix: update file name to show diff

* fix: rm unneccesary bug fix

---------

Co-authored-by: Lucas Manuel <[email protected]>
Co-authored-by: Lucas Manuel <[email protected]>
* test: refactor to get all test working

* test: add coverage for aave, ethena, and susds

* test: get full coverage

* fix: update file name to show diff

* chore: update file name

* fix: eof

---------

Co-authored-by: Lucas Manuel <[email protected]>
Co-authored-by: Lucas Manuel <[email protected]>
* fix: update logo

* fix: adjust size

---------

Co-authored-by: Lucas Manuel <[email protected]>
…eleases (SC-888) (#76)

* feat: refactor init scripts, starting point

* test: create dedicated deploy file

* test: finish init tests

* test: get mainnet deploy, init, and upgrade tests working

* feat: mainnet scripts fully tested

* feat: update foreign controller init lib

* test: add deploy tests

* test: get init tests set up

* test: update foreign init tests

* test: update foreign init tests

* test: refactor to use test state not mainnet

* test: refactor to include upgrade tests

* test: add success tests

* test: refactor to use test deployed system

* test: main tests passing with new libs

* test: main tests passing with new libs

* feat: all tests passing

* fix: newlines

* fix: add back cctp tests

* fix: update setup

* chore: rename files for better diffing

* fix: stack too deep

* fix: rm conversion rate check for PSM

* fix: keep psm check

* test: add explicit deploy admin check

* fix: tidy up setups

* feat: staging deployment working with tests

* fix: update makefile

* add new staging deploy

* test: update staging date

* fix: review comments

* fix: update with fixes

* fix: compilation issue

---------

Co-authored-by: Lucas Manuel <[email protected]>
Co-authored-by: Sam MacPherson <[email protected]>
* fix: rm manual remappings

* fix: rename file
* setting evm version and bumping solc

* use shanghai

* adding releases

* newlines
* feat: add first file change

* feat: add working upgrade script

* feat: update documentation

* fix: use controller as a param

* fix: update command

* fix: update description
Copy link

github-actions bot commented Jan 6, 2025

Coverage after merging dev into master will be

99.36%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
deploy
   ControllerDeploy.sol100%100%100%100%
   ForeignControllerInit.sol100%100%100%100%
   MainnetControllerInit.sol97.30%93.75%100%100%136, 78
src
   ALMProxy.sol100%100%100%100%
   ForeignController.sol100%100%100%100%
   MainnetController.sol100%100%100%100%
   RateLimitHelpers.sol75%62.50%75%83.33%21–22, 39, 45, 49
   RateLimits.sol100%100%100%100%

@hexonaut hexonaut merged commit 41eb420 into master Jan 13, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants