Code

Bao Baskets - Live Code State#29

Code

Open

TotalPizza wants to merge 112 commits intomainbaofinance/bao-baskets:mainfrom basketsRecipebaofinance/bao-baskets:basketsRecipeCopy head branch name to clipboard

+2,632-41,972

Commits

Commits on Mar 26, 2022

• forge install: openzeppelin-contracts

  N0xMare

  committed
  cdc210d

  Copy full SHA for cdc210d

• forge install: ds-test

  N0xMare

  committed
  ef246cd

  Copy full SHA for ef246cd

• forge install: v2-periphery

  N0xMare

  committed
  cf9b407

  Copy full SHA for cf9b407

• forge install: solmate

  N0xMare

  committed
  5c84f2f

  Copy full SHA for 5c84f2f

Commits on Mar 27, 2022

• start converting repo to foundry

  N0xMare

  committed
  f1159b0

  Copy full SHA for f1159b0

• foundry refactor 1

  N0xMare

  committed
  6151f9f

  Copy full SHA for 6151f9f

• clean up imports

  N0xMare

  committed
  1a4c08e

  Copy full SHA for 1a4c08e

• version update

  N0xMare

  committed
  9392563

  Copy full SHA for 9392563

• version update2/cleanup

  N0xMare

  committed
  30bb747

  Copy full SHA for 30bb747

Commits on Mar 28, 2022

• plzCompile 1

  N0xMare

  committed
  18f51ab

  Copy full SHA for 18f51ab

• ayyyItCompiled

  N0xMare

  committed
  5a5ed34

  Copy full SHA for 5a5ed34

Commits on Mar 29, 2022

• add IWETH

  N0xMare

  committed
  7b6b349

  Copy full SHA for 7b6b349

• resolve merge conflicts

  N0xMare

  committed
  684bb48

  Copy full SHA for 684bb48

• resolve merge conflicts 2

  N0xMare

  committed
  7ec5778

  Copy full SHA for 7ec5778

• remove v2-periphery

  N0xMare

  committed
  74cd609

  Copy full SHA for 74cd609

• put IRecipe.sol back in to remove errors from current oven implementation

  N0xMare

  committed
  53bf9e4

  Copy full SHA for 53bf9e4

• clean up

  N0xMare

  committed
  e2d9d39

  Copy full SHA for e2d9d39

• clean up

  N0xMare

  committed
  3196aef

  Copy full SHA for 3196aef

• Fixing merge conflicts v1

  

  Marlon

  committed
  20f1634

  Copy full SHA for 20f1634

• Merge pull request #9 from baofinance/foundryRefactor

  Show description for 3aed7d8
  TotalPizza

  authored
  3aed7d8

  Copy full SHA for 3aed7d8

• Added interfaces that where removed with the merge. initiated recipe test

  

  Marlon

  committed
  02c7ca7

  Copy full SHA for 02c7ca7

• Add out and cache to gitignore, change test dir structure

  clabby

  committed
  a78cd9f

  Copy full SHA for a78cd9f

• Start writing test suite helper contract

  clabby

  committed
  5d1c85e

  Copy full SHA for 5d1c85e

• Push to laptop

  clabby

  committed
  00e62b3

  Copy full SHA for 00e62b3

• Add forge tests workflow

  clabby

  committed
  13f42bd

  Copy full SHA for 13f42bd

• Create test basket for suite

  clabby

  committed
  1cf39b1

  Copy full SHA for 1cf39b1

• Set OZ Submodule to v3.4.2-solc-0.7

  N0xMare

  committed
  214f577

  Copy full SHA for 214f577

Commits on Mar 30, 2022

• Revert to solc v0.7.0

  N0xMare

  committed
  18d8564

  Copy full SHA for 18d8564

• Merge branch 'projectRestructuring' into test-suite-helpers

  clabby

  committed
  90e4a3b

  Copy full SHA for 90e4a3b

• Fix PProxyStorage.sol

  clabby

  committed
  7eb8098

  Copy full SHA for 7eb8098

• Add Kashi Lending in Test helper

  clabby

  committed
  c82cae9

  Copy full SHA for c82cae9

• Make Ovens compatible with new Recipe

  

  Marlon

  committed
  4e5b2c8

  Copy full SHA for 4e5b2c8

• IRecipe and Oven changes to (likely make project compilable)

  

  Marlon

  committed
  46c125c

  Copy full SHA for 46c125c

• Make requrired DEX indexes queriable via getPricePie()

  

  Marlon

  committed
  2c8a60b

  Copy full SHA for 2c8a60b

• upgrading compiler versions to avoid conflicts

  

  Marlon

  committed
  6dde699

  Copy full SHA for 6dde699

• Merge pull request #11 from baofinance/basketsRecipe-OvensChange

  Show description for 86f6bcb
  TotalPizza

  authored
  86f6bcb

  Copy full SHA for 86f6bcb

• Merge pull request #12 from baofinance/basketsRecipe

  Show description for 225d185
  TotalPizza

  authored
  225d185

  Copy full SHA for 225d185

• Merge pull request #13 from baofinance/test-suite-helpers

  Show description for 1af3f11
  TotalPizza

  authored
  1af3f11

  Copy full SHA for 1af3f11

• Merge pull request #10 from baofinance/test-suite-helpers

  Show description for 12956d8
  TotalPizza

  authored
  12956d8

  Copy full SHA for 12956d8

• Fixes

  clabby

  committed
  3229fbb

  Copy full SHA for 3229fbb

• Merge branch 'test-suite-helpers' into projectRestructuring

  clabby

  committed
  be03487

  Copy full SHA for be03487

• Merge pull request #14 from baofinance/projectRestructuring

  Show description for cb3cac8
  TotalPizza

  authored
  cb3cac8

  Copy full SHA for cb3cac8

• Merge pull request #15 from baofinance/test-suite-helpers

  Show description for fd4974b
  TotalPizza

  authored
  fd4974b

  Copy full SHA for fd4974b

• initial mint test

  

  Marlon

  committed
  8907470

  Copy full SHA for 8907470

• Merge branch 'test-stuite-recipe' of https://github.com/baofinance/bao-baskets into test-stuite-recipe

  

  Marlon

  committed
  885f161

  Copy full SHA for 885f161

Commits on Mar 31, 2022

• basic recipe mint test, small recipe fixes

  TotalPizza

  committed
  b3dd359

  Copy full SHA for b3dd359

• Initialize oven tests, small contract/test adjustments to allow for oven tests

  TotalPizza

  committed
  9b662da

  Copy full SHA for 9b662da

Commits on Apr 1, 2022

• Added basic Oven tests, Minor changes to the Oven

  TotalPizza

  committed
  97ba371

  Copy full SHA for 97ba371

• spaces -> tabs

  TotalPizza

  committed
  c012688

  Copy full SHA for c012688

• Change Oven to not require dexIndex as parameter when baking

  TotalPizza

  committed
  355971c

  Copy full SHA for 355971c

Commits on Apr 4, 2022

• 🧹 & Redeem test

  clabby

  committed
  e351707

  Copy full SHA for e351707

• Lend from kashi (fails currently)

  clabby

  committed
  6f3b6e8

  Copy full SHA for 6f3b6e8

• Recipe and test contracts can receive ETH, include wrapped->underlying token logic in recipe price calculation, fix rounding error

  TotalPizza

  committed
  e3b9e2f

  Copy full SHA for e3b9e2f

• Cleanup, VIM is actually the worst

  

  Marlon

  committed
  33080b9

  Copy full SHA for 33080b9

• More spacing cleanup

  

  Marlon

  committed
  562d303

  Copy full SHA for 562d303

• Added AAVE Lending to the tests

  TotalPizza

  committed
  2a196f8

  Copy full SHA for 2a196f8

• Fix merge conflicts

  TotalPizza

  committed
  3ad96b9

  Copy full SHA for 3ad96b9

Commits on Apr 5, 2022

• Add SafeMath to Recipe, remove useless +1 math from Recipe, disable Kashi Lending for now.

  TotalPizza

  committed
  7031707

  Copy full SHA for 7031707

• see previous commit message

  TotalPizza

  committed
  2a265d8

  Copy full SHA for 2a265d8

• small cleanup

  

  Marlon

  committed
  0106bda

  Copy full SHA for 0106bda

Commits on Apr 6, 2022

• cleanup: tabs -> spaces

  

  Marlon

  committed
  aad57a9

  Copy full SHA for aad57a9

• Add foundry config

  TotalPizza

  committed
  e2f7f10

  Copy full SHA for e2f7f10

• Added Compound strategy to UnitTests

  

  Marlon

  committed
  d651299

  Copy full SHA for d651299

• Made compound test compilable....seems like rounding error also occurs with the other lending options

  TotalPizza

  committed
  5b28baa

  Copy full SHA for 5b28baa

• Recipes changes, +1 is back

  TotalPizza

  committed
  8365af4

  Copy full SHA for 8365af4

Commits on Apr 7, 2022

• Merge pull request #16 from baofinance/test-stuite-recipe

  Show description for 29fd234
  TotalPizza

  authored
  29fd234

  Copy full SHA for 29fd234

• Create Base ERC-4626 strategy

  

  Marlon

  committed
  ccc6a0b

  Copy full SHA for ccc6a0b

• Make Strategy compilable

  TotalPizza

  committed
  3cb7075

  Copy full SHA for 3cb7075

• Remove unsued parameter maxInput from _bake function

  TotalPizza

  committed
  176b17d

  Copy full SHA for 176b17d

Commits on Apr 8, 2022

• Merge pull request #18 from baofinance/recipe-small-cleanup

  Show description for 64a6c13
  clabby

  authored
  64a6c13

  Copy full SHA for 64a6c13

• Fix README.md tables

  clabby

  committed
  da5d1e0

  Copy full SHA for da5d1e0

• Add AAVE and Compound strategy tests

  clabby

  committed
  54d99d5

  Copy full SHA for 54d99d5

• Remove hop-mapping

  

  Marlon

  committed
  2e5ab03

  Copy full SHA for 2e5ab03

• Added base xSushi logic

  TotalPizza

  committed
  69fd22a

  Copy full SHA for 69fd22a

• Add xSushi staking interface

  TotalPizza

  committed
  d6a28cb

  Copy full SHA for d6a28cb

• Starting to add solmate submodule

  TotalPizza

  committed
  6ab6a92

  Copy full SHA for 6ab6a92

• added solmate sub-module

  

  Marlon

  committed
  b35bbbb

  Copy full SHA for b35bbbb

• actually adding the sub-module

  

  Marlon

  committed
  1b72f5e

  Copy full SHA for 1b72f5e

• Removing solmate submodule...apparently they are to good for ^0.7.0

  TotalPizza

  committed
  5c530c6

  Copy full SHA for 5c530c6

• integrate solmate from solmates FixedPointMathLib in xSushi staking logic

  TotalPizza

  committed
  ac0384c

  Copy full SHA for ac0384c

• solmate remapping isn't being used anymore

  TotalPizza

  committed
  439cd9e

  Copy full SHA for 439cd9e

Commits on Apr 12, 2022

• Merge pull request #21 from baofinance/xSushi-Strategy

  Show description for 61e4091
  clabby

  authored
  61e4091

  Copy full SHA for 61e4091

• Merge pull request #20 from baofinance/recipe-small-cleanup

  Show description for e8e51ce
  clabby

  authored
  e8e51ce

  Copy full SHA for e8e51ce

• Merge pull request #17 from baofinance/ERC-4626-strategy

  Show description for 31f9fcb
  clabby

  authored
  31f9fcb

  Copy full SHA for 31f9fcb

• Merge branch 'basketsRecipe' into strategy-tests

  clabby

  committed
  dec3173

  Copy full SHA for dec3173

• xSUSHI strategy tests

  clabby

  committed
  1a43028

  Copy full SHA for 1a43028

Commits on Apr 24, 2022

• Adjusted Contract/Basket setup to reflect production deployment

  TotalPizza

  committed
  6fc097a

  Copy full SHA for 6fc097a

• Switch token addresses over to the constant contract

  TotalPizza

  committed
  54b31e6

  Copy full SHA for 54b31e6

Commits on May 5, 2022

• Update readme addresses

  

  Marlon

  committed
  33a319e

  Copy full SHA for 33a319e

Commits on May 14, 2022

• removed ERC4626 contract and CVX lending, as these won't be used

  TotalPizza

  committed
  2b953e1

  Copy full SHA for 2b953e1

• Merge pull request #23 from baofinance/production-near-tests

  Show description for ba9201d
  TotalPizza

  authored
  ba9201d

  Copy full SHA for ba9201d

Commits on May 16, 2022

• Merge branch 'basketsRecipe' of github.com:baofinance/bao-baskets into basketsRecipe

  clabby

  committed
  a14f4b2

  Copy full SHA for a14f4b2

• forge install: forge-std

  clabby

  committed
  80b3570

  Copy full SHA for 80b3570

• Remove ds-test in favor of forge-std, rework tests for RAI/DAI/USDC nest

  clabby

  committed
  85ca9eb

  Copy full SHA for 85ca9eb

• Start curve recipe

  clabby

  committed
  19bc1f2

  Copy full SHA for 19bc1f2

• Allow ETH baking in CurveRecipe 🥘

  Show description for 2c2d0cf
  clabby

  committed
  2c2d0cf

  Copy full SHA for 2c2d0cf

• Handle lending assets in CurveRecipe 👨‍🍳

  clabby

  committed
  2543d4b

  Copy full SHA for 2543d4b

Commits on May 18, 2022

• Start Curve Recipe testing [Unfinished- getDx still broken]

  clabby

  committed
  371d2e2

  Copy full SHA for 371d2e2

• Progress. Not there just yet, though

  clabby

  committed
  43d6c59

  Copy full SHA for 43d6c59

Commits on May 19, 2022

• SimpleUniV3 Recipe. Abandoning the curve recipe.

  clabby

  committed
  58d8284

  Copy full SHA for 58d8284

Commits on May 21, 2022

• Bake with ETH tests for SimpleUniRecipe

  clabby

  committed
  b01b33d

  Copy full SHA for b01b33d

• Fix compound test

  clabby

  committed
  b18ddf9

  Copy full SHA for b18ddf9

Commits on May 26, 2022

• forge install: solmate

  TotalPizza

  committed
  e162253

  Copy full SHA for e162253

• Added amount buffer for recipe trades to avoid rounding errors

  TotalPizza

  committed
  2675a11

  Copy full SHA for 2675a11

• remove unneeded submodules

  TotalPizza

  committed
  cf7043b

  Copy full SHA for cf7043b

• Fix stupid vim Tabs

  

  Marlon

  committed
  7886c7d

  Copy full SHA for 7886c7d

• More tabs/spaces formating

  

  Marlon

  committed
  7cbd848

  Copy full SHA for 7cbd848

• more tabs fixes

  

  Marlon

  committed
  baaeec1

  Copy full SHA for baaeec1

Commits on May 27, 2022

• Use DAI instead of USDC for Recipe; Add more tests

  clabby

  committed
  7c28092

  Copy full SHA for 7c28092

Commits on May 28, 2022

• Merge pull request #27 from baofinance/stableNestFix

  Show description for c448226
  TotalPizza

  authored
  c448226

  Copy full SHA for c448226

• Merge pull request #28 from baofinance/stableNest

  Show description for d9f4ee0
  TotalPizza

  authored
  d9f4ee0

  Copy full SHA for d9f4ee0

Commits on Jun 10, 2022

• update ReadMe

  

  Marlon

  committed
  171b60e

  Copy full SHA for 171b60e