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

OETH Curve AMO #1341

Merged
merged 144 commits into from May 15, 2023
Merged

OETH Curve AMO #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
2010157
Start of VaultTwo
DanielVF Mar 27, 2023
6b3dd90
No vault Two
DanielVF Mar 30, 2023
ced0ee7
Extract units conversion to method
DanielVF Mar 31, 2023
53f34ab
Exchange rate supporting Vault
DanielVF Mar 31, 2023
f5112d0
Merge remote-tracking branch 'origin/master' into DanielVF/oeth
sparrowDom Apr 4, 2023
931c20d
Remove unneeded memory array
DanielVF Apr 4, 2023
4a459f4
Change to using enums for exchange rate types
DanielVF Apr 4, 2023
98b9076
Merge branch 'DanielVF/oeth' of github.com:OriginProtocol/origin-doll…
DanielVF Apr 4, 2023
7cb179f
Documentation on _toUnits
DanielVF Apr 4, 2023
49c5980
OETH - Allow initialize time control of OUSD resolution (#1273)
DanielVF Apr 4, 2023
02f04ae
Correct mint / redeem with oracle
DanielVF Apr 4, 2023
f42e4ea
merge
DanielVF Apr 4, 2023
a901de0
add the main deploy file for OETH
sparrowDom Apr 4, 2023
ead03b5
make it possible for the 5/8 multisig to be the governor of deployments
sparrowDom Apr 5, 2023
e61294a
prettier
sparrowDom Apr 5, 2023
f6f289a
Gas efficiency
DanielVF Apr 5, 2023
43d6b4d
Merge branch 'DanielVF/oeth' of github.com:OriginProtocol/origin-doll…
DanielVF Apr 5, 2023
dc0b390
add frax eth deployment
sparrowDom Apr 5, 2023
e1335b8
basic sfraxETH strategy implementation
sparrowDom Apr 5, 2023
d0b13ad
add brownie env to git ignore
sparrowDom Apr 5, 2023
534e8a7
prettier
sparrowDom Apr 5, 2023
ce311ae
Remove unused code
DanielVF Apr 5, 2023
d972dc6
add the infrastructure for fork tests
sparrowDom Apr 5, 2023
8355b24
hardcode oracle price
sparrowDom Apr 5, 2023
c62e66e
finish up the fraxETH strategy fork tests and fix a bug
sparrowDom Apr 7, 2023
7d34b28
lint and some minor fixes
sparrowDom Apr 7, 2023
56aed69
deployment file fix
sparrowDom Apr 7, 2023
03612ec
Slither db update for false positives
DanielVF Apr 7, 2023
6c490c6
add a test that checks we can withdraw what the checkBalance returns
sparrowDom Apr 9, 2023
08f4dd7
minor fix
sparrowDom Apr 9, 2023
8f8db30
Merge branch 'master' into DanielVF/oeth
DanielVF Apr 10, 2023
90ea59c
Correct license for new contracts
DanielVF Apr 10, 2023
b3c2d13
Deploy is ready
DanielVF Apr 10, 2023
4d9df7c
Add redeem fee variable
DanielVF Apr 10, 2023
c2ed29c
add slither exceptions
sparrowDom Apr 11, 2023
302f83d
fix tests (#1317)
sparrowDom Apr 12, 2023
5e51b99
OETH - Oracle router changes (#1314)
sparrowDom Apr 12, 2023
ddd33db
fix oracle tests
sparrowDom Apr 12, 2023
e14c126
fix tests
sparrowDom Apr 12, 2023
45fdf7b
more fixes
sparrowDom Apr 12, 2023
aac90cc
fix slither
sparrowDom Apr 12, 2023
4afcafd
ETH / sfrxeth zapper (#1316)
DanielVF Apr 13, 2023
1cde1b6
move decimals cache to asset struct (#1319)
sparrowDom Apr 13, 2023
9b9577a
WOETH deployment (#1320)
sparrowDom Apr 13, 2023
7454bc0
Let’s just call them decimals
DanielVF Apr 13, 2023
0a0d0a2
add decimalsCache to existing Vault
sparrowDom Apr 13, 2023
159bc61
prettier
sparrowDom Apr 13, 2023
80a4d1e
deployment numbering
sparrowDom Apr 13, 2023
1e65b31
fork test fix
sparrowDom Apr 13, 2023
e6ec811
run decimals cache only in forked environment
sparrowDom Apr 13, 2023
9fcb8ba
prettier
sparrowDom Apr 13, 2023
893f4cf
Remove unused buyback trigger
DanielVF Apr 13, 2023
6afa1c3
rETH support
DanielVF Apr 13, 2023
abde155
support oracles reporting feeds with different decimal format (#1321)
sparrowDom Apr 14, 2023
6253520
Add support for stETH
DanielVF Apr 14, 2023
aeba0b5
Use default strat for frxETH
DanielVF Apr 14, 2023
2a33eca
harvester & unit tests (#1331)
sparrowDom Apr 16, 2023
d789eb6
add some addresses
sparrowDom Apr 16, 2023
8911a63
deploy of OETH 053
sparrowDom Apr 17, 2023
b91b90f
add remaining deployment files
sparrowDom Apr 17, 2023
14a64fc
fix bug
sparrowDom Apr 18, 2023
9b2902f
add guardian actions helper
sparrowDom Apr 18, 2023
66d644f
use updated ABI in brownie
sparrowDom Apr 18, 2023
6869683
add deployment files
sparrowDom Apr 20, 2023
58b9b84
Deploy 53 OETH and 54 WOETH (#1334)
sparrowDom Apr 20, 2023
4e6f543
prepare forked environment for Curve pool
sparrowDom Apr 20, 2023
5ee294f
add initial code for the OETH Metastrategy implementation
sparrowDom Apr 21, 2023
aeed3b6
improvements
sparrowDom Apr 21, 2023
0f6b8f2
pass cli params to hardhat test when testing in forked mode
sparrowDom Apr 22, 2023
129e326
Merge remote-tracking branch 'origin/DanielVF/oeth' into sparrowDom/o…
sparrowDom Apr 22, 2023
61aeab4
when setting up curve pool add in some liqudity
sparrowDom Apr 22, 2023
bf3b238
fix bugs
sparrowDom Apr 22, 2023
ef9c1ec
pass mint fork test of Curve AMO
sparrowDom Apr 23, 2023
be01d25
various fixes
sparrowDom Apr 24, 2023
8668978
make the pool config vars the same as cbEth
sparrowDom Apr 24, 2023
cbf770c
use lp_price instead of virtual price when figuring out the amount of…
sparrowDom Apr 24, 2023
6402909
make redeems work
sparrowDom Apr 24, 2023
d0ac5c9
use virtual price instead of lp price
sparrowDom Apr 25, 2023
c8fa378
add withdrawAll test
sparrowDom Apr 25, 2023
99ab3aa
add harvester to the OETH deploy script and add harvesting of the rew…
sparrowDom Apr 25, 2023
e7d21bb
add additional harvester configuration
sparrowDom Apr 25, 2023
0012da4
Merge master
DanielVF Apr 26, 2023
d6a628b
Prettier
DanielVF Apr 26, 2023
dbc6569
Merge cleanup
DanielVF Apr 26, 2023
933998c
Zapper cleanup
DanielVF Apr 26, 2023
8af47e5
remove console.log
DanielVF Apr 26, 2023
3e4b672
Zapper: Better event name
DanielVF Apr 26, 2023
fef7507
Add slither excludes to triage file
DanielVF Apr 26, 2023
96761ed
Remove inline slither comments and add docstrings
DanielVF Apr 26, 2023
629a9aa
cleaner wording
DanielVF Apr 26, 2023
976ee49
Explicity access levels on vars
DanielVF Apr 26, 2023
1856d06
Zapper redeploy
DanielVF Apr 26, 2023
2e3f530
Lint: cleanup extra variable
DanielVF Apr 26, 2023
c396e73
Deploy 56 - OUSD Zapper Redeploy (#1364)
DanielVF Apr 26, 2023
2418f76
Merge branch 'DanielVF/oeth' of github.com:OriginProtocol/origin-doll…
DanielVF Apr 27, 2023
ef7bf5e
Don't show zapper no return checks
DanielVF Apr 27, 2023
a8d0b75
upgrade Oracle so that it supports price feeds of asset pairs. Adjust…
sparrowDom Apr 27, 2023
e2b6819
change asset count to 2
sparrowDom Apr 27, 2023
508921b
Move vault check to after redeem is complete.
DanielVF Apr 28, 2023
0f843ba
Happy Lint, happy Pretttier
DanielVF Apr 28, 2023
abf4856
Merge OETH
DanielVF Apr 29, 2023
d7bf446
Prettier
DanielVF Apr 29, 2023
29d25d5
Convert to Curve V1 ETH pool
DanielVF Apr 29, 2023
df6c29f
Small cleanup on EthMetaStrategy
DanielVF May 3, 2023
37bfada
Remove unused interface file
DanielVF May 3, 2023
986be9f
Allow zero governance deploy files
DanielVF May 3, 2023
3448b1b
Get unit tests mostly running again
DanielVF May 4, 2023
f055570
fix tests
sparrowDom May 4, 2023
46aaca2
simplify the Oracles and update the fork tests and deploy scripts
sparrowDom May 5, 2023
c445497
fix some unit tests
sparrowDom May 5, 2023
08b0d1c
some unit test fixes
sparrowDom May 6, 2023
80c6a51
more fixes
sparrowDom May 6, 2023
2054608
configure dripper deploy
sparrowDom May 6, 2023
02b3f1a
fix dripper configuration and test
sparrowDom May 6, 2023
757ad13
fix some comments and unit tests
sparrowDom May 8, 2023
32446c7
move important fixture config to deploy script
sparrowDom May 8, 2023
c0dd7e8
don't set it as the asset default strategy
sparrowDom May 8, 2023
d2033b3
fix another unit test
sparrowDom May 8, 2023
dc774b7
another test fix
sparrowDom May 8, 2023
fae211a
update deploy script to use Convex Gauge already deployed on the mainnet
sparrowDom May 9, 2023
5ff199d
prettier
sparrowDom May 9, 2023
bd38222
lint
sparrowDom May 9, 2023
72f4965
slither disable
sparrowDom May 9, 2023
d4b59ea
fix fork test
sparrowDom May 10, 2023
44467b0
update slither detector name
sparrowDom May 10, 2023
5fc5936
mainnet deploy 58 (#1435)
DanielVF May 11, 2023
6ccd7ce
Merge remote-tracking branch 'origin/master' into DanielVF/oeth
sparrowDom May 11, 2023
9231061
Merge branch 'DanielVF/oeth' into sparrowDom/oeth_curve
sparrowDom May 11, 2023
6fee583
add some reminder comments
sparrowDom May 11, 2023
d61676b
add safe equivalents of transfer and approve
sparrowDom May 11, 2023
d0c74f8
use transfer for WETH instead of safe transfer
sparrowDom May 11, 2023
2948f25
slither fix
sparrowDom May 11, 2023
430a0af
simplify calculation
sparrowDom May 11, 2023
69adf6c
another slither fix attempt
sparrowDom May 11, 2023
b4fad48
parenthesis are important
sparrowDom May 11, 2023
f126697
set unit test rebasingCreditsPerToken to 1e27 and fix vault value che…
sparrowDom May 11, 2023
d564d05
Merge branch 'DanielVF/oeth' into sparrowDom/oeth_curve
sparrowDom May 11, 2023
a534d02
apply changes on master branch
sparrowDom May 12, 2023
4401495
Merge branch 'master' into DanielVF/oeth
sparrowDom May 12, 2023
8b3d987
Merge branch 'DanielVF/oeth' into sparrowDom/oeth_curve
sparrowDom May 12, 2023
19c0da7
fix unit test and prettier
sparrowDom May 12, 2023
a40fd88
Merge branch 'DanielVF/oeth' into sparrowDom/oeth_curve
sparrowDom May 12, 2023
b077e35
change log to console.log
sparrowDom May 13, 2023
9970989
Merge remote-tracking branch 'origin/master' into sparrowDom/oeth_curve
sparrowDom May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions brownie/addresses.py
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@

# OUSD Contracts
OUSD = '0x2A8e1E676Ec238d8A992307B495b45B3fEAa5e86'
OETH = '0x856c4Efb76C1D1AE02e20CEB03A2A6a08b0b8dC3'
AAVE_STRAT = '0x5e3646A1Db86993f73E6b74A57D8640B69F7e259'
COMP_STRAT = '0x9c459eeb3FA179a40329b81C1635525e9A0Ef094'
CONVEX_STRAT = '0xEA2Ef2e2E5A749D4A66b41Db9aD85a38Aa264cb3'
Expand All @@ -27,6 +28,7 @@
HARVESTER = '0x21fb5812d70b3396880d30e90d9e5c1202266c89'
DRIPPER = '0x80c898ae5e56f888365e235ceb8cea3eb726cb58'
VAULT_PROXY_ADDRESS = '0xE75D77B1865Ae93c7eaa3040B038D7aA7BC02F70'
VAULT_OETH_PROXY_ADDRESS = '0x39254033945AA2E4809Cc2977E7087BEE48bd7Ab'
VAULT_ADMIN_IMPL = '0x1eF0553FEb80e6f133cAe3092e38F0b23dA6452b'
VAULT_CORE_IMPL = '0xf00d4b19458c594d4ea9d0b9861edfd2c444fa9a'
VAULT_VALUE_CHECKER = '0xEEcD72c99749A1FC977704AB900a05e8300F4318'
Expand All @@ -46,6 +48,7 @@
CVX = '0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B'
FRAX = '0x853d955aCEf822Db058eb8505911ED77F175b99e'
BUSD = '0x4Fabb145d64652a948d72533023f6E7A623C7C53'
WETH = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'

THREEPOOL_LP = '0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490'
OUSD_METAPOOL = '0x87650D7bbfC3A9F10587d7778206671719d9910D'
Expand Down
4 changes: 4 additions & 0 deletions brownie/world.py
View file
Open in desktop
Expand Up @@ -27,7 +27,9 @@ def load_contract(name, address):

frax = load_contract('ERC20', FRAX)
busd = load_contract('ERC20', BUSD)
weth = load_contract('ERC20', WETH)
ousd = load_contract('ousd', OUSD)
oeth = load_contract('ousd', OETH)
usdt = load_contract('usdt', USDT)
usdc = load_contract('usdc', USDC)
dai = load_contract('dai', DAI)
Expand All @@ -38,6 +40,8 @@ def load_contract(name, address):
veogv = load_contract('veogv', VEOGV)
vault_admin = load_contract('vault_admin', VAULT_PROXY_ADDRESS)
vault_core = load_contract('vault_core', VAULT_PROXY_ADDRESS)
vault_oeth_admin = load_contract('vault_admin', VAULT_OETH_PROXY_ADDRESS)
vault_oeth_core = load_contract('vault_core', VAULT_OETH_PROXY_ADDRESS)
vault_value_checker = load_contract('vault_value_checker', VAULT_VALUE_CHECKER)
dripper = load_contract('dripper', DRIPPER)
harvester = load_contract('harvester', HARVESTER)
Expand Down