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

Bao Baskets - Live Code State #29

Open
wants to merge 112 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
cdc210d
forge install: openzeppelin-contracts
N0xMare Mar 26, 2022
ef246cd
forge install: ds-test
N0xMare Mar 26, 2022
cf9b407
forge install: v2-periphery
N0xMare Mar 26, 2022
5c84f2f
forge install: solmate
N0xMare Mar 26, 2022
f1159b0
start converting repo to foundry
N0xMare Mar 27, 2022
6151f9f
foundry refactor 1
N0xMare Mar 27, 2022
1a4c08e
clean up imports
N0xMare Mar 27, 2022
9392563
version update
N0xMare Mar 27, 2022
30bb747
version update2/cleanup
N0xMare Mar 27, 2022
18f51ab
plzCompile 1
N0xMare Mar 28, 2022
5a5ed34
ayyyItCompiled
N0xMare Mar 28, 2022
7b6b349
add IWETH
N0xMare Mar 29, 2022
684bb48
resolve merge conflicts
N0xMare Mar 29, 2022
7ec5778
resolve merge conflicts 2
N0xMare Mar 29, 2022
74cd609
remove v2-periphery
N0xMare Mar 29, 2022
53bf9e4
put IRecipe.sol back in to remove errors from current oven implementa…
N0xMare Mar 29, 2022
e2d9d39
clean up
N0xMare Mar 29, 2022
3196aef
clean up
N0xMare Mar 29, 2022
20f1634
Fixing merge conflicts v1
Mar 29, 2022
3aed7d8
Merge pull request #9 from baofinance/foundryRefactor
TotalPizza Mar 29, 2022
02c7ca7
Added interfaces that where removed with the merge. initiated recipe …
Mar 29, 2022
a78cd9f
Add out and cache to gitignore, change test dir structure
clabby Mar 29, 2022
5d1c85e
Start writing test suite helper contract
clabby Mar 29, 2022
00e62b3
Push to laptop
clabby Mar 29, 2022
13f42bd
Add forge tests workflow
clabby Mar 29, 2022
1cf39b1
Create test basket for suite
clabby Mar 29, 2022
214f577
Set OZ Submodule to v3.4.2-solc-0.7
N0xMare Mar 29, 2022
18d8564
Revert to solc v0.7.0
N0xMare Mar 30, 2022
90e4a3b
Merge branch 'projectRestructuring' into test-suite-helpers
clabby Mar 30, 2022
7eb8098
Fix PProxyStorage.sol
clabby Mar 30, 2022
c82cae9
Add Kashi Lending in Test helper
clabby Mar 30, 2022
4e5b2c8
Make Ovens compatible with new Recipe
Mar 30, 2022
46c125c
IRecipe and Oven changes to (likely make project compilable)
Mar 30, 2022
2c8a60b
Make requrired DEX indexes queriable via getPricePie()
Mar 30, 2022
6dde699
upgrading compiler versions to avoid conflicts
Mar 30, 2022
86f6bcb
Merge pull request #11 from baofinance/basketsRecipe-OvensChange
TotalPizza Mar 30, 2022
225d185
Merge pull request #12 from baofinance/basketsRecipe
TotalPizza Mar 30, 2022
1af3f11
Merge pull request #13 from baofinance/test-suite-helpers
TotalPizza Mar 30, 2022
12956d8
Merge pull request #10 from baofinance/test-suite-helpers
TotalPizza Mar 30, 2022
3229fbb
Fixes
clabby Mar 30, 2022
be03487
Merge branch 'test-suite-helpers' into projectRestructuring
clabby Mar 30, 2022
cb3cac8
Merge pull request #14 from baofinance/projectRestructuring
TotalPizza Mar 30, 2022
fd4974b
Merge pull request #15 from baofinance/test-suite-helpers
TotalPizza Mar 30, 2022
8907470
initial mint test
Mar 30, 2022
885f161
Merge branch 'test-stuite-recipe' of https://github.com/baofinance/ba…
Mar 30, 2022
b3dd359
basic recipe mint test, small recipe fixes
TotalPizza Mar 31, 2022
9b662da
Initialize oven tests, small contract/test adjustments to allow for o…
TotalPizza Mar 31, 2022
97ba371
Added basic Oven tests, Minor changes to the Oven
TotalPizza Apr 1, 2022
c012688
spaces -> tabs
TotalPizza Apr 1, 2022
355971c
Change Oven to not require dexIndex as parameter when baking
TotalPizza Apr 1, 2022
e351707
:broom: & Redeem test
clabby Apr 3, 2022
6f3b6e8
Lend from kashi (fails currently)
clabby Apr 4, 2022
e3b9e2f
Recipe and test contracts can receive ETH, include wrapped->underlyin…
TotalPizza Apr 4, 2022
33080b9
Cleanup, VIM is actually the worst
Apr 4, 2022
562d303
More spacing cleanup
Apr 4, 2022
2a196f8
Added AAVE Lending to the tests
TotalPizza Apr 4, 2022
3ad96b9
Fix merge conflicts
TotalPizza Apr 4, 2022
7031707
Add SafeMath to Recipe, remove useless +1 math from Recipe, disable K…
TotalPizza Apr 5, 2022
2a265d8
see previous commit message
TotalPizza Apr 5, 2022
0106bda
small cleanup
Apr 5, 2022
aad57a9
cleanup: tabs -> spaces
Apr 6, 2022
e2f7f10
Add foundry config
TotalPizza Apr 6, 2022
d651299
Added Compound strategy to UnitTests
Apr 6, 2022
5b28baa
Made compound test compilable....seems like rounding error also occur…
TotalPizza Apr 6, 2022
8365af4
Recipes changes, +1 is back
TotalPizza Apr 6, 2022
29fd234
Merge pull request #16 from baofinance/test-stuite-recipe
TotalPizza Apr 7, 2022
ccc6a0b
Create Base ERC-4626 strategy
Apr 7, 2022
3cb7075
Make Strategy compilable
TotalPizza Apr 7, 2022
176b17d
Remove unsued parameter maxInput from _bake function
TotalPizza Apr 7, 2022
64a6c13
Merge pull request #18 from baofinance/recipe-small-cleanup
clabby Apr 8, 2022
da5d1e0
Fix README.md tables
clabby Apr 8, 2022
54d99d5
Add AAVE and Compound strategy tests
clabby Apr 8, 2022
2e5ab03
Remove hop-mapping
Apr 8, 2022
69fd22a
Added base xSushi logic
TotalPizza Apr 8, 2022
d6a28cb
Add xSushi staking interface
TotalPizza Apr 8, 2022
6ab6a92
Starting to add solmate submodule
TotalPizza Apr 8, 2022
b35bbbb
added solmate sub-module
Apr 8, 2022
1b72f5e
actually adding the sub-module
Apr 8, 2022
5c530c6
Removing solmate submodule...apparently they are to good for ^0.7.0
TotalPizza Apr 8, 2022
ac0384c
integrate solmate from solmates FixedPointMathLib in xSushi staking …
TotalPizza Apr 8, 2022
439cd9e
solmate remapping isn't being used anymore
TotalPizza Apr 8, 2022
61e4091
Merge pull request #21 from baofinance/xSushi-Strategy
clabby Apr 12, 2022
e8e51ce
Merge pull request #20 from baofinance/recipe-small-cleanup
clabby Apr 12, 2022
31f9fcb
Merge pull request #17 from baofinance/ERC-4626-strategy
clabby Apr 12, 2022
dec3173
Merge branch 'basketsRecipe' into strategy-tests
clabby Apr 12, 2022
1a43028
xSUSHI strategy tests
clabby Apr 12, 2022
6fc097a
Adjusted Contract/Basket setup to reflect production deployment
TotalPizza Apr 24, 2022
54b31e6
Switch token addresses over to the constant contract
TotalPizza Apr 24, 2022
33a319e
Update readme addresses
May 5, 2022
2b953e1
removed ERC4626 contract and CVX lending, as these won't be used
TotalPizza May 14, 2022
ba9201d
Merge pull request #23 from baofinance/production-near-tests
TotalPizza May 14, 2022
a14f4b2
Merge branch 'basketsRecipe' of github.com:baofinance/bao-baskets int…
clabby May 16, 2022
80b3570
forge install: forge-std
clabby May 16, 2022
85ca9eb
Remove ds-test in favor of forge-std, rework tests for RAI/DAI/USDC nest
clabby May 16, 2022
19bc1f2
Start curve recipe
clabby May 16, 2022
2c2d0cf
Allow ETH baking in CurveRecipe :shallow_pan_of_food:
clabby May 16, 2022
2543d4b
Handle lending assets in CurveRecipe :man_cook:
clabby May 16, 2022
371d2e2
Start Curve Recipe testing [Unfinished- getDx still broken]
clabby May 18, 2022
43d6c59
Progress. Not there just yet, though
clabby May 18, 2022
58d8284
SimpleUniV3 Recipe. Abandoning the curve recipe.
clabby May 19, 2022
b01b33d
Bake with ETH tests for SimpleUniRecipe
clabby May 21, 2022
b18ddf9
Fix compound test
clabby May 21, 2022
e162253
forge install: solmate
TotalPizza May 26, 2022
2675a11
Added amount buffer for recipe trades to avoid rounding errors
TotalPizza May 26, 2022
cf7043b
remove unneeded submodules
TotalPizza May 26, 2022
7886c7d
Fix stupid vim Tabs
May 26, 2022
7cbd848
More tabs/spaces formating
May 26, 2022
baaeec1
more tabs fixes
May 26, 2022
7c28092
Use DAI instead of USDC for Recipe; Add more tests
clabby May 27, 2022
c448226
Merge pull request #27 from baofinance/stableNestFix
TotalPizza May 28, 2022
d9f4ee0
Merge pull request #28 from baofinance/stableNest
TotalPizza May 28, 2022
171b60e
update ReadMe
Jun 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add out and cache to gitignore, change test dir structure
  • Loading branch information
clabby committed Mar 29, 2022
commit a78cd9f9850957194b660933a76da8d22553da1a
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@ coverage
coverage.json
typechain

# Forge files
out/
cache/

#Hardhat files
cache
artifacts
Loading