Mainnet Deploy 58 - New Vault Value Checker #1435
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Fork test when there's not active per block yield. from world import *
vvc = load_contract("OETHVaultValueChecker", "0x31fd8618379d8e473ec2b1540b906e8e11d2a99b")
vvc.takeSnapshot({'from':STRATEGIST})
vvc.checkDelta(0,0,0,0, {'from': STRATEGIST})
vvc.checkDelta(1,0,0,0, {'from': STRATEGIST})
vvc.checkDelta(-1,0,0,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,-1,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,2,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,2,3, {'from': STRATEGIST})
vvc.checkDelta(0,0,0,0, {'from': STRATEGIST})
WETH = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'
weth = load_contract('ERC20', WETH)
DUDE = '0x9026A229b535ecF0162Dfe48fDeb3c75f7b2A7AE'
unlock(DUDE)
dude = accounts.at(DUDE, force=True)
dude.transfer(to=weth, 2e18)
dude.transfer(to=weth, amount=2e18)
weth.transfer('0x39254033945AA2E4809Cc2977E7087BEE48bd7Ab', 2e18, {'from': dude})
OETH_VAULT_CORE = '0x39254033945AA2E4809Cc2977E7087BEE48bd7Ab'
evc = Contract.from_explorer(OETH_VAULT_CORE)
evc = Contract.from_abi("evc", OETH_VAULT_CORE, vault_core.abi)
evc.rebase({'from': STRATEGIST})
vvc.checkDelta(0,0,0,0, {'from': STRATEGIST})
vvc.takeSnapshot({'from':STRATEGIST})
vvc.checkDelta(0,0,0,0, {'from': STRATEGIST})
dude.transfer(to=weth, amount=2e18)
weth.transfer('0x39254033945AA2E4809Cc2977E7087BEE48bd7Ab', 2e18, {'from': dude})
evc.rebase({'from': STRATEGIST})
vvc.checkDelta(0,0,0,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,1e18,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,2e18,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,2e18,1, {'from': STRATEGIST})
vvc.checkDelta(0,0,2e18,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,1e18,0, {'from': STRATEGIST})
vvc.checkDelta(0,0,1e18,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,2e18,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,3e18,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,3e18+2,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,3e18+6,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,3e18+600,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,3e18+50,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,int(3e18)+50,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,int(3e18)+0,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,int(3e18)+1,1e18, {'from': STRATEGIST})
vvc.checkDelta(0,0,int(3e18)-1,1e18, {'from': STRATEGIST}) |
sparrowDom
approved these changes
May 11, 2023
sparrowDom
reviewed
May 11, 2023
| } | ||
|
|
||
| function takeSnapshot() external { | ||
| snapshots[msg.sender] = Snapshot({ | ||
| vaultValue: vault.totalValue(), | ||
| totalSupply: ousd.totalSupply() | ||
| totalSupply: ousd.totalSupply(), | ||
| time: block.timestamp |
There was a problem hiding this comment.
no storage slot issues here 👍
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]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
OETH Vault Value Checker:
0x31fd8618379d8e473ec2b1540b906e8e11d2a99b