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

WOETH deployment #1320

Merged
merged 2 commits into from
Apr 13, 2023
Merged

WOETH deployment #1320

merged 2 commits into from
Apr 13, 2023

Conversation

sparrowDom
Copy link
Member

WOETH deployment

@DanielVF DanielVF merged commit 9b9577a into DanielVF/oeth Apr 13, 2023
@DanielVF DanielVF deleted the sparrowDom/WOETH branch April 13, 2023 13:32
sparrowDom added a commit that referenced this pull request Apr 16, 2023
* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* harvester now considers different oracle decimals. Fixing unit tests

---------

Co-authored-by: Daniel Von Fange <[email protected]>
sparrowDom added a commit that referenced this pull request May 15, 2023
* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* Add support for stETH

* Use default strat for frxETH

* harvester & unit tests (#1331)

* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* harvester now considers different oracle decimals. Fixing unit tests

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* add some addresses

* fix bug

* Deploy 53 OETH and 54 WOETH (#1334)

* deploy of OETH 053

* add remaining deployment files

* add guardian actions helper

* use updated ABI in brownie

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* Prettier

* Merge cleanup

* Zapper cleanup

* remove console.log

* Zapper: Better event name

* Add slither excludes to triage file

* Remove inline slither comments and add docstrings

* cleaner wording

* Explicity access levels on vars

* Zapper redeploy

* Lint: cleanup extra variable

* Deploy 56 - OUSD Zapper Redeploy (#1364)

* Deploy 56 Zapper

* Remove forceDeploy

* Don't show zapper no return checks

* Move vault check to after redeem is complete.

* Happy Lint, happy Pretttier

* mainnet deploy 58 (#1435)

* set unit test rebasingCreditsPerToken to 1e27 and fix vault value checker tests

* apply changes on master branch

* fix unit test and prettier

---------

Co-authored-by: Domen Grabec <[email protected]>
DanielVF added a commit that referenced this pull request May 15, 2023
* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* Add support for stETH

* Use default strat for frxETH

* harvester & unit tests (#1331)

* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* harvester now considers different oracle decimals. Fixing unit tests

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* add some addresses

* deploy of OETH 053

* add remaining deployment files

* fix bug

* add guardian actions helper

* use updated ABI in brownie

* add deployment files

* Deploy 53 OETH and 54 WOETH (#1334)

* deploy of OETH 053

* add remaining deployment files

* add guardian actions helper

* use updated ABI in brownie

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* prepare forked environment for Curve pool

* add initial code for the OETH Metastrategy implementation

* improvements

* pass cli params to hardhat test when testing in forked mode

* when setting up curve pool add in some liqudity

* fix bugs

* pass mint fork test of Curve AMO

* various fixes

* make the pool config vars the same as cbEth

* use lp_price instead of virtual price when figuring out the amount of underlying tokens

* make redeems work

* use virtual price instead of lp price

* add withdrawAll test

* add harvester to the OETH deploy script and add harvesting of the rewards to the strategy

* add additional harvester configuration

* Prettier

* Merge cleanup

* Zapper cleanup

* remove console.log

* Zapper: Better event name

* Add slither excludes to triage file

* Remove inline slither comments and add docstrings

* cleaner wording

* Explicity access levels on vars

* Zapper redeploy

* Lint: cleanup extra variable

* Deploy 56 - OUSD Zapper Redeploy (#1364)

* Deploy 56 Zapper

* Remove forceDeploy

* Don't show zapper no return checks

* upgrade Oracle so that it supports price feeds of asset pairs. Adjust the change accross the board.

* change asset count to 2

* Move vault check to after redeem is complete.

* Happy Lint, happy Pretttier

* Prettier

* Convert to Curve V1 ETH pool

* Small cleanup on EthMetaStrategy

* Remove unused interface file

* Allow zero governance deploy files

* Get unit tests mostly running again

* fix tests

* simplify the Oracles and update the fork tests and deploy scripts

* fix some unit tests

* some unit test fixes

* more fixes

* configure dripper deploy

* fix dripper configuration and test

* fix some comments and unit tests

* move important fixture config to deploy script

* don't set it as the asset default strategy

* fix another unit test

* another test fix

* update deploy script to use Convex Gauge already deployed on the mainnet

* prettier

* lint

* slither disable

* fix fork test

* update slither detector name

* mainnet deploy 58 (#1435)

* add some reminder comments

* add safe equivalents of transfer and approve

* use transfer for WETH instead of safe transfer

* slither fix

* simplify calculation

* another slither fix attempt

* parenthesis are important

* set unit test rebasingCreditsPerToken to 1e27 and fix vault value checker tests

* apply changes on master branch

* fix unit test and prettier

* change log to console.log

---------

Co-authored-by: Daniel Von Fange <[email protected]>
DanielVF added a commit that referenced this pull request May 16, 2023
* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* Add support for stETH

* Use default strat for frxETH

* harvester & unit tests (#1331)

* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* harvester now considers different oracle decimals. Fixing unit tests

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* add some addresses

* deploy of OETH 053

* add remaining deployment files

* fix bug

* add guardian actions helper

* use updated ABI in brownie

* add deployment files

* Deploy 53 OETH and 54 WOETH (#1334)

* deploy of OETH 053

* add remaining deployment files

* add guardian actions helper

* use updated ABI in brownie

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* prepare forked environment for Curve pool

* add initial code for the OETH Metastrategy implementation

* improvements

* pass cli params to hardhat test when testing in forked mode

* when setting up curve pool add in some liqudity

* fix bugs

* pass mint fork test of Curve AMO

* various fixes

* make the pool config vars the same as cbEth

* use lp_price instead of virtual price when figuring out the amount of underlying tokens

* make redeems work

* use virtual price instead of lp price

* add withdrawAll test

* add harvester to the OETH deploy script and add harvesting of the rewards to the strategy

* add additional harvester configuration

* Prettier

* Merge cleanup

* Zapper cleanup

* remove console.log

* Zapper: Better event name

* Add slither excludes to triage file

* Remove inline slither comments and add docstrings

* cleaner wording

* Explicity access levels on vars

* Zapper redeploy

* Lint: cleanup extra variable

* Deploy 56 - OUSD Zapper Redeploy (#1364)

* Deploy 56 Zapper

* Remove forceDeploy

* Don't show zapper no return checks

* upgrade Oracle so that it supports price feeds of asset pairs. Adjust the change accross the board.

* change asset count to 2

* Move vault check to after redeem is complete.

* Happy Lint, happy Pretttier

* Prettier

* Convert to Curve V1 ETH pool

* Small cleanup on EthMetaStrategy

* Remove unused interface file

* Allow zero governance deploy files

* Get unit tests mostly running again

* fix tests

* simplify the Oracles and update the fork tests and deploy scripts

* fix some unit tests

* some unit test fixes

* more fixes

* configure dripper deploy

* fix dripper configuration and test

* fix some comments and unit tests

* move important fixture config to deploy script

* don't set it as the asset default strategy

* fix another unit test

* another test fix

* update deploy script to use Convex Gauge already deployed on the mainnet

* prettier

* lint

* slither disable

* fix fork test

* update slither detector name

* mainnet deploy 58 (#1435)

* add some reminder comments

* add safe equivalents of transfer and approve

* use transfer for WETH instead of safe transfer

* slither fix

* simplify calculation

* another slither fix attempt

* parenthesis are important

* set unit test rebasingCreditsPerToken to 1e27 and fix vault value checker tests

* apply changes on master branch

* fix unit test and prettier

* mainnet deploy 55

* Regen prod network files

---------

Co-authored-by: Daniel Von Fange <[email protected]>
HrikB added a commit that referenced this pull request Jun 9, 2023
* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* Add support for stETH

* Use default strat for frxETH

* harvester & unit tests (#1331)

* Start of VaultTwo

* No vault Two

* Extract units conversion to method

* Exchange rate supporting Vault

* Remove unneeded memory array

* Change to using enums for exchange rate types

* Documentation on _toUnits

* OETH - Allow initialize time control of OUSD resolution (#1273)

* Allow initialize time control of OUSD resolution

* Remove debugging

* Correct mint / redeem with oracle

* add the main deploy file for OETH

* make it possible for the 5/8 multisig to be the governor of deployments

* prettier

* Gas efficiency

* add frax eth deployment

* basic sfraxETH strategy implementation

* add brownie env to git ignore

* prettier

* Remove unused code

* add the infrastructure for fork tests

* hardcode oracle price

* finish up the fraxETH strategy fork tests and fix a bug

* lint and some minor fixes

* deployment file fix

* Slither db update for false positives

* add a test that checks we can withdraw what the checkBalance returns

* minor fix

* Correct license for new contracts

* Deploy is ready

* Add redeem fee variable

* add slither exceptions

* fix tests (#1317)

* OETH - Oracle router changes (#1314)

* start oracle separation

* add slither ignores

* create a suggestion of how to check for prices in the Vault

* remove logs

* better name

* minor refactor

* minor refactor v2

* move unit pricing to a separate function

* refactor

* better comment

* refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions

* add range checks

* Prettier and address cleanup

* Small cleanup

* Add back in missing constant

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* fix oracle tests

* fix tests

* more fixes

* fix slither

* ETH / sfrxeth zapper (#1316)

* Initial draft zapper

* Initial draft zapper

* Add deploy file for zapper

* Remove WETH partial support, out of scope in this PR

* Happy Slither

* WETH support

* move decimals cache to asset struct (#1319)

* WOETH deployment (#1320)

* add WOETH deployment

* deploy separate files

* Let’s just call them decimals

* add decimalsCache to existing Vault

* prettier

* deployment numbering

* fork test fix

* run decimals cache only in forked environment

* prettier

* Remove unused buyback trigger

* rETH support

* support oracles reporting feeds with different decimal format (#1321)

* support oracles reporting feeds with different decimal format

* lint

* gas optimisation

* harvester now considers different oracle decimals. Fixing unit tests

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* add some addresses

* fix bug

* Deploy 53 OETH and 54 WOETH (#1334)

* deploy of OETH 053

* add remaining deployment files

* add guardian actions helper

* use updated ABI in brownie

---------

Co-authored-by: Daniel Von Fange <[email protected]>

* Prettier

* Merge cleanup

* Zapper cleanup

* remove console.log

* Zapper: Better event name

* Add slither excludes to triage file

* Remove inline slither comments and add docstrings

* cleaner wording

* Explicity access levels on vars

* Zapper redeploy

* Lint: cleanup extra variable

* Deploy 56 - OUSD Zapper Redeploy (#1364)

* Deploy 56 Zapper

* Remove forceDeploy

* Don't show zapper no return checks

* Direct clone

* Fix package.json

* Fix build for oeth

* Add build scripts

* Fix scripts

* Fix bash script

* Fix build scripts

* Update scripts

* Update scripts

* Try expression again

* Add hashbang

* Use bash instead

* Add ABI

* Fix deps

* Fix start script

* checkpoint

* Update more services

* checkpoint

* checkpoint

* Minting

* Add Zapper

* Cleanup balances

* Fix approval bug

* Fix animation balance

* Update Zapper address

* Update swap estimator

* Update gas for redeem

* Display OETH balance instead of OUSD

* Add wrap/unwrap

* Fix allowances on wrap/unwrap

* UI tweaks

* Fix circle graphics

* sfrxETH Zapper allowance

* Fix sfrxETH balance

* Switch to Analytics API v2

* Fix keys

* Fix lifetime earnings

* Add curve

* Fix broken code

* more precise inputs/outputs

* apy and oeth portfolio dapp reskin

* Cleanup tx history page

* In progress commit

* Fix path refs

* Fix menu

* Fix modal

* Fix rendering issue

* Adjust

* Add estimtes

* Fix estimate view

* Fix balances display

* Fix redeem

* Fix effective price

* Remove welcome

* Fix wrap view

* fix gfnosis safe

* Update the manifest

* Fix eth price with fallback, banner, add fonts

* Fix tx activity

* Fix swap routes pill styling

* Remove relative path

* Add activity

* Add activity count

* Fix font face inclusion

* Fix gas estimate

* wrap and history page

* Fix broken vault est

* Try fonts in images dir just for static files check

* header restyle

* Add swap routes styling

* Fix confirmation modal color

* Fix diff percentage visibility

* Fix arrow aplit

* Fix eth redeem

* Fix redeem

* Fix mix on pill

* responsive nav and data section

* Hide history nav item

* Fix IPFS DApp link

* Fix IPFS link

* Update meta description

* Fix wrap, curve redeem for eth

* Add in wrap/unwrap events

* Support multiple txs taking place

* Fix defaults, ordering, and mobile

* Fix effective price

* Cleanup GTM code. (#1428)

* Cleanup GTM code.

* Fix var.

* Make changes to correct folder.

* Fix various p2/p3 issues across the board. Sticky nav, decimals, images, and other various style fixes

* Fix first tx pending view

* Fix approvals when below max int provided

* Fix curve allowance issue

* Fix currency ordering

* Update contract name

* Hide irrelevant APY measures, change default to one week

* Gtm tracking updates (#1467)

* Start updating events.

* Tracking updates.

* Revert deployment file changes

* Swap Route (#1449)

* header-fix

* header fix

* heading padding fix

* remove double ipfs link on fleek

* swap responsiveness

* routes responsiveness

* merge fix

* btn fix

* swap route header on all browsers

* show links

* mobile responsiveness on wrap route

* Fix rate display wOETH -> OETH (#1473)

* Fix wOETH to oeth rate conversion

* Fix styling of wrap

* Fix sfrxeth -> oeth receive amount estimate (#1471)

* Add conversion rate

* Fix redeem and activity values

* Fix comment

* Fix address HEX and add in wrap events. (#1478)

* Fix address HEX and add in wrap events.

* Small fix for slice

* swap routes section in the swap route (#1489)

* swap routes section in the swap route

* padding

* desktop fixes

* add ledger live connector (#1454)

* add ledger live connector

* update manifest

* edit display name

* add csp header

* Oeth dapp UI style fixes (#1511)

* Many UI fixes

* Address background color discrepancy

* Revert contracts folder changes

* Fix padding on selectable pills, fix default swap mode to mint vs redeem

* Add inputMode to wrapped side

* Remove OETH from redeem

* Fix scrollbar styling

* Add drop shadow to apy, remove console log, remove value from redeem in modal

* Add drop shadow across menus and code cleanup

* fix: remove double IPFS and pull the logic to env variables (#1529)

* fix: remove double IPFS and pull the logic to env variables

* Revert "fix: remove double IPFS and pull the logic to env variables"

This reverts commit 81822e6.

* fix: remove IPFS link if deploy mode is IPFS

* refactor: clean up

* oeth dapp merge fix (#1530)

* Fix merge issue

* Remove yarn changes

* Fix url reference for learn more

* Fix icons and transition speed

* Revert dapp changes

* OETH Dapp, curve swap support for stETH, WETH, rETH, and frxETH (#1538)

* Add in curve routes

* Remove console log

* Set node engine to 16

* Run prettier on the fileset

* Add different approvals for oeth to LSD and oeth to eth pool

* Fix approval route

* Fix reth

* fix dapp crash from undefined (#1571)

* Undefined dapp crash (#1573)

* fix dapp crash from undefined

* fix get

* History route (#1567)

* bugs

* history route bug fixes and styling

* disconnected state

* history route style fixes

* disable export button

* Restore history nav link

* Add OETH DApp Linter to CI (#1616)

---------

Co-authored-by: Daniel Von Fange <[email protected]>
Co-authored-by: Domen Grabec <[email protected]>
Co-authored-by: Shahul Hameed <[email protected]>
Co-authored-by: Hrik Bhowal <[email protected]>
Co-authored-by: Micah Alcorn <[email protected]>
Co-authored-by: Jonathan Snow <[email protected]>
Co-authored-by: roland <[email protected]>
Co-authored-by: Rafael Ugolini <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants