NoncustodialPSM + FIP 99#715

Merged

xklob merged 58 commits intodevelopfrom

feat/non-custodial-psm

Apr 28, 2022

Contributor

ElliotFriedman commented Apr 19, 2022

No description provided.


          Non Custodial PSM

0e2ab74

ElliotFriedman requested a review from a team as a code owner

April 19, 2022 07:18


          add unit tests, fix issues in RateLimited and MultiRateLimited

f9b2555

xklob force-pushed the feat/non-custodial-psm branch 2 times, most recently from 988d0dd to f9b2555 Compare

April 26, 2022 04:43

xklob and others added 13 commits

April 25, 2022 22:05


          rename volt to fei

0306c71


          add in test from volt + rate limited adjustment


          NonCustodialPriceBoundPSM compiles

511ccf4


          base of code for non custodial price bound psm test

51f2f15


          remove volt-specific forge tests

3ca3edf


          add specific tests for the noncustodial price-bound psm

9fbed60


          dao proposal basics

2f59296


          permissions and some param updates on the deploy script

fdac180


          add proposal to proposalsconfig

93eaa9d


          get proposal in working shape

65ba3a2


          Merge branch 'develop' into feat/non-custodial-psm

e9142b3


          update

f11c032


          Merge branch 'feat/non-custodial-psm' of github.com:fei-protocol/fei-…

a06c69b

…protocol-core into feat/non-custodial-psm

xklob changed the title ~~Non Custodial PSM~~ Price Bound Non Custodial PSM

xklob added 2 commits

April 26, 2022 16:26


          remove noncustodialpriceboundpsm, modify dao proposal to use pricebou…

9fe027a

…ndpsm


          fix verification tests

e2e1266

Joeysantoro reviewed

View reviewed changes

contracts/pcv/utils/PCVDripController.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed

View reviewed changes

contracts/peg/NonCustodialPSM.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed

View reviewed changes

contracts/peg/NonCustodialPSM.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed

View reviewed changes

contracts/peg/NonCustodialPSM.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed

View reviewed changes

contracts/peg/PegStabilityModule.sol Outdated Show resolved Hide resolved

Joeysantoro reviewed

View reviewed changes

proposals/description/fip_99.ts Outdated Show resolved Hide resolved

Joeysantoro reviewed

View reviewed changes

proposals/description/fip_99.ts Show resolved Hide resolved

ElliotFriedman commented

View reviewed changes

contracts/peg/NonCustodialPSM.sol Outdated Show resolved Hide resolved

ElliotFriedman commented

View reviewed changes

contracts/utils/MultiRateLimited.sol Outdated Show resolved Hide resolved

xklob self-assigned this

xklob and others added 9 commits

April 27, 2022 02:22


          revert accidental change from merge conflict reoslution

69b5d21


          staged changes

df91481


          fix typo

9039bab


          fix dep issue

58b8799


          final dep issues

891e417


          Merge branch 'develop' into feat/non-custodial-psm

62992f0


          Merge branch 'develop' into feat/non-custodial-psm

253eb00


          fix failing forge tests

7e78e32


          fix affected contract signoff

xklob requested review from eswak and thomas-waite

April 27, 2022 12:52


          Merge branch 'develop' into feat/non-custodial-psm

3de56be

Joeysantoro reviewed

View reviewed changes

proposals/description/fip_99.ts Outdated Show resolved Hide resolved

ElliotFriedman commented

View reviewed changes

proposals/dao/fip_99.ts Outdated Show resolved Hide resolved

ElliotFriedman commented

View reviewed changes

test/integration/tests/psm.ts Show resolved Hide resolved

xklob added 9 commits

April 27, 2022 21:14


          fix forge tests from oz upgrades

a671dae


          Merge branch 'feat/non-custodial-psm' of github.com:fei-protocol/fei-…

382b971

…protocol-core into feat/non-custodial-psm


          pr feedback and description update

797f985


          update proposalsconfig

94f67fc


          remove changes to foundry.toml

ffaadec


          fix var name

8c04012


          fix dependency issue

b036882


          fix test

5aaa4a0


          final dep fix

821117c

Joeysantoro approved these changes

View reviewed changes

xklob mentioned this pull request

Make RAI PSM integration test less brittle #754

Closed

xklob merged commit 0536999 into develop

xklob deleted the feat/non-custodial-psm branch

April 28, 2022 16:58

xklob mentioned this pull request

Add hardhat etherscan verification #753

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet