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

BIP-45: Seed Gauge System #722

Merged
merged 460 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
460 commits
Select commit Hold shift + click to select a range
c5a69f8
Merge pull request #20 from AgrarianAlliance/brean-final-review
Brean0 Oct 14, 2023
246ecab
fix compiler issue
BrendanSanderson Oct 14, 2023
2624c5c
lot of documentation + naming changes
BrendanSanderson Oct 14, 2023
9b4b9de
fix app storage ordering
BrendanSanderson Oct 14, 2023
5b712c7
Merge pull request #22 from AgrarianAlliance/brendan-review
Brean0 Oct 14, 2023
6ae0f59
fix incorrect comment
BrendanSanderson Oct 14, 2023
5f64e42
merged
BrendanSanderson Oct 14, 2023
f90f4d7
Merge branch 'bip-38' into seedGauge
BrendanSanderson Oct 14, 2023
f2e3edf
refactor Init events
BrendanSanderson Oct 15, 2023
cf08e55
Merge pull request #23 from AgrarianAlliance/move-events
Brean0 Oct 15, 2023
9670cd4
Get from storage instead of pump
BrendanSanderson Oct 15, 2023
4e75c90
Merge pull request #24 from AgrarianAlliance/twa-reserves-from-storage
Brean0 Oct 15, 2023
5d60883
gas efficiency
BrendanSanderson Oct 15, 2023
51caac3
lots of style changes
BrendanSanderson Oct 15, 2023
7fb3f3a
Fix weather test
BrendanSanderson Oct 15, 2023
23c88eb
Merge pull request #25 from AgrarianAlliance/brendan-review
Brean0 Oct 15, 2023
f87d830
twa reserves (failing tests)
Brean0 Oct 15, 2023
ec43d42
comment
Brean0 Oct 15, 2023
f6841a0
fix tests
Brean0 Oct 15, 2023
1db9780
Merge pull request #26 from AgrarianAlliance/bean3crvTwa
Brean0 Oct 16, 2023
e1a4c28
Implement Locked Underlying fix
BrendanSanderson Oct 16, 2023
97c8c41
fix stem upgrade deploy
BrendanSanderson Oct 16, 2023
e3afb54
fix tests + small issue + docs
BrendanSanderson Oct 16, 2023
3ed3201
Merge pull request #27 from AgrarianAlliance/locked-underlying
BrendanSanderson Oct 16, 2023
1df2b93
skip iterating the gauge system if the oracle fails
Brean0 Oct 16, 2023
bc67ea4
gas efficiency changes
BrendanSanderson Oct 16, 2023
e6632b0
fixes
BrendanSanderson Oct 16, 2023
3fb378e
Merge pull request #29 from AgrarianAlliance/skip-on-oracle-failure-2
Brean0 Oct 16, 2023
dfb418d
Merge pull request #28 from AgrarianAlliance/skip-gauge-on-all-oracle…
Brean0 Oct 16, 2023
25d5276
remove unnecssary functions
BrendanSanderson Oct 18, 2023
bf38c37
fix metadata
Brean0 Oct 20, 2023
0834e04
fix metadata
Brean0 Oct 21, 2023
a5ce639
add bip 39 deploy script, remove bip 38
Brean0 Oct 30, 2023
c4cbae5
update event
Brean0 Oct 30, 2023
c8f80b5
Added siloFacet
Brean0 Oct 30, 2023
a4ac8a3
update mainnet test
Brean0 Oct 31, 2023
2313a47
Merge branch 'master' into seedGauge-v0.2
Brean0 Nov 3, 2023
32cdcf7
make libCurveMinting external library to fit contract limit
Brean0 Nov 3, 2023
cd100bb
add getters for last season update
Brean0 Nov 6, 2023
79a9256
rename lastSeedGaugeUpdate var
Brean0 Nov 6, 2023
68f9ea4
update ABI
Brean0 Nov 6, 2023
b65631b
updateStalkPerBdvPerSeason -> updateAverageStalkPerBdvPerSeason
Brean0 Nov 6, 2023
e24e96a
fix
Brean0 Nov 6, 2023
dd9295d
json
Brean0 Nov 6, 2023
f7d9fc9
update milestone stem in init script
Brean0 Nov 6, 2023
ae1b913
Merge branch 'milestoneStem-fix' into seedGauge-v0.2
Brean0 Nov 7, 2023
c8ae99c
update initial seed values, fix tests
Brean0 Nov 9, 2023
71ac661
fix milestonestem truncation
Brean0 Nov 10, 2023
6d58090
Fix libConvert view functions and deploy convertGettersFacet
Brean0 Nov 10, 2023
1107fe8
add to deploy.
Brean0 Nov 10, 2023
36a16c8
remove library linking from convertGettersFacet
Brean0 Nov 10, 2023
021ab79
add whitelistFacet to deploy script
Brean0 Nov 13, 2023
b3afe2c
Q3, Q5, Q12
Brean0 Nov 13, 2023
4c5f56a
Q7
Brean0 Nov 13, 2023
4aac372
Q8
Brean0 Nov 13, 2023
2dde6da
Q9
Brean0 Nov 13, 2023
801d204
add libraries to beanstalk.json
Brean0 Nov 14, 2023
4684eb3
re-added unripe -> ripe convert
Brean0 Nov 14, 2023
10edafa
Merge branch 'seedGauge-v0.2' into cyrfin-remediations-QA
Brean0 Nov 20, 2023
130ce9c
Init - Storage
Brean0 Nov 20, 2023
e99a8a4
Q1, Q2
Brean0 Nov 22, 2023
c1b2e23
Merge Master
Brean0 Nov 22, 2023
2463896
Merge branch 'cyrfin-remediations-QA' into seedGauge
Brean0 Nov 22, 2023
354b7cc
Merge branch 'seedGauge' into germination
Brean0 Nov 26, 2023
8221e96
liquidityWeight
Brean0 Nov 29, 2023
5a87b86
dewhitelist curve
Brean0 Dec 2, 2023
429064e
tests
Brean0 Dec 2, 2023
94b8cbb
add siloV2 earned beans
Brean0 Dec 3, 2023
12cad55
Germination
Brean0 Dec 14, 2023
1a92514
sop
Brean0 Dec 14, 2023
4c00624
comment instead of delete
Brean0 Dec 14, 2023
7bdd8b0
add back into price
Brean0 Dec 14, 2023
017a1b7
generalize gpPerBdv
Brean0 Dec 14, 2023
a9fe4cc
Updated submodule protocol/lib/forge-std
Brean0 Dec 14, 2023
fc881fe
change libGerminate implmentation
Brean0 Dec 14, 2023
f6c4473
siloGettersFacet
Brean0 Dec 14, 2023
8f7a119
add new anti lamda convert type blueprint
nickkatsios Dec 20, 2023
be43574
revert changes to previous commit
nickkatsios Dec 20, 2023
f49feff
remove missed variable
nickkatsios Dec 21, 2023
ebd7cb2
TBD - germination v0.1
Brean0 Dec 28, 2023
f75ae83
fix broken tests.
Brean0 Jan 6, 2024
0be7ab9
sg-germ (#742)
Brean0 Jan 6, 2024
f34139a
Merge branch 'sg-liquidityWeight' into seedGauge-v0.1-review
Brean0 Jan 6, 2024
b1036ca
compile
Brean0 Jan 6, 2024
068b146
fix curve tests
Brean0 Jan 6, 2024
3755d11
update sop
Brean0 Jan 14, 2024
3a1f0dd
SiloV3.1 init
Brean0 Jan 18, 2024
32b4f37
fin
Brean0 Jan 20, 2024
1fea840
more tests
Brean0 Jan 20, 2024
d97b3f2
add Add/RemoveDeposit event
Brean0 Jan 20, 2024
2917254
add removeDeposit
Brean0 Jan 20, 2024
802f233
Silo v3.1 (#750)
Brean0 Jan 20, 2024
ef238c8
7.3.6
Brean0 Jan 21, 2024
0f57955
7.4.1
Brean0 Jan 21, 2024
091f742
7.4.6 7.4.7
Brean0 Jan 21, 2024
2adf64a
7.5.1
Brean0 Jan 21, 2024
81b3639
7.5.4
Brean0 Jan 21, 2024
aaaaac1
add range bound to gauge point (accurate to 0.01%)
Brean0 Jan 21, 2024
3011d51
fix test
Brean0 Jan 21, 2024
1288c38
7.3.1
Brean0 Jan 21, 2024
4836756
7.3.3
Brean0 Jan 21, 2024
7726637
comments
Brean0 Jan 21, 2024
6fcbf0f
format
Brean0 Jan 21, 2024
00a9975
require bdv > 0 on partial withdraw
Brean0 Jan 21, 2024
d66ee74
bug fix
Brean0 Jan 21, 2024
41adb52
update metadata facet
Brean0 Jan 22, 2024
c849915
C remediation (#754)
Brean0 Jan 22, 2024
389e690
appStorage
Brean0 Jan 23, 2024
684c8d4
remove deprecate
Brean0 Jan 26, 2024
5fdba74
add max
Brean0 Feb 1, 2024
debde08
remove week-long delay on updating average gspbdvps
Brean0 Feb 2, 2024
6289101
depreciated -> deprecated
Brean0 Feb 2, 2024
0968bb4
add Whitelist Status list
BrendanSanderson Feb 10, 2024
265f36b
Add InitWhitelistStatuses
BrendanSanderson Feb 10, 2024
80f4e10
remove constants
Brean0 Feb 10, 2024
c0f762a
style + remove functions
Brean0 Feb 10, 2024
341447e
cleanup
Brean0 Feb 10, 2024
5b39fc5
remove
Brean0 Feb 10, 2024
d3558ab
mockUpdateAverageStalkPerBdvPerSeason
Brean0 Feb 10, 2024
b80676e
Merge branch 'seedGauge-v0.1-review' into dynamic-whitelist-statuses
Brean0 Feb 10, 2024
3ca5e73
Add dynamic Whitelist Status list (#766)
BrendanSanderson Feb 10, 2024
1333493
Fix 0 Deposited Bdv with > 2 tokens
BrendanSanderson Feb 13, 2024
fe51d77
`gpPerBdv = 0` when 0 Deposited Bdv (#767)
Brean0 Feb 13, 2024
66f749f
f62086f1 add tests for turning off bean:eth oracle
Brean0 Feb 13, 2024
8568ac0
generalize metadataD (#768)
Brean0 Feb 13, 2024
490e5ce
large liq
Brean0 Feb 13, 2024
54a9a35
sop initalize
Brean0 Feb 13, 2024
4bedbcf
comment
Brean0 Feb 13, 2024
e1f3be8
fix
Brean0 Feb 13, 2024
608b786
min sopBeans
Brean0 Feb 13, 2024
852bf21
comment
Brean0 Feb 13, 2024
20084b4
sop changes
BrendanSanderson Feb 13, 2024
4a9f8d3
update claim plenty
BrendanSanderson Feb 13, 2024
9218430
Sop Updates (#772)
Brean0 Feb 13, 2024
7360a70
large liq (#769)
BrendanSanderson Feb 13, 2024
f49cf75
Add events
Brean0 Feb 14, 2024
e8f444b
Merge remote-tracking branch 'origin/seedGauge-v0.1-review' into germ…
Brean0 Feb 14, 2024
1ecb60a
1
Brean0 Feb 14, 2024
fee9ee8
2
Brean0 Feb 14, 2024
12144b7
3
Brean0 Feb 14, 2024
9b0f1d2
4
Brean0 Feb 14, 2024
028f5a6
Germ events (#773)
BrendanSanderson Feb 14, 2024
a8eff77
5
Brean0 Feb 14, 2024
011a338
6
Brean0 Feb 14, 2024
75ddb8a
7
Brean0 Feb 14, 2024
a901a5f
8
Brean0 Feb 14, 2024
b79419b
9
Brean0 Feb 14, 2024
90a7308
10
Brean0 Feb 14, 2024
ea16972
11
Brean0 Feb 14, 2024
87d51ed
12
Brean0 Feb 14, 2024
1218fe7
13
Brean0 Feb 14, 2024
5f4f3b4
14
Brean0 Feb 14, 2024
b0aa9c4
15
Brean0 Feb 14, 2024
1281a4d
16
Brean0 Feb 14, 2024
0df04a2
17
Brean0 Feb 14, 2024
f4a724f
18
Brean0 Feb 14, 2024
424cf58
19
Brean0 Feb 14, 2024
9cb2f5c
20
Brean0 Feb 14, 2024
034d46c
21
Brean0 Feb 14, 2024
5c7c17f
Merge remote-tracking branch 'origin/seedGauge-v0.1-review' into bren…
Brean0 Feb 14, 2024
6e61fe0
fix tests
Brean0 Feb 14, 2024
61ad381
style
Brean0 Feb 14, 2024
3edc346
comment
Brean0 Feb 14, 2024
f77a9b5
young/mature
Brean0 Feb 14, 2024
6855a47
Brendan review remed (#775)
Brean0 Feb 14, 2024
c9aec8b
Seed gauge v0.1 review (#748)
Brean0 Feb 14, 2024
309c957
temperature changes at low/high debt levels
Brean0 Feb 15, 2024
82c72a1
temperature changes at low/high debt levels (#776)
Brean0 Feb 16, 2024
85c49d6
add unwrap contract to junction
Brean0 Feb 20, 2024
99ac464
update CI
Brean0 Feb 20, 2024
eefadf4
Merge remote-tracking branch 'origin/master' into bip39-seedGauge
Brean0 Feb 20, 2024
41029b7
remove vesting period, IWETH
Brean0 Feb 20, 2024
d2334b7
initial gauge points from 1000 -> 100
Brean0 Feb 21, 2024
54446e0
LibGerminate external library
Brean0 Feb 21, 2024
7b98fe1
Add Enroot Batch Transfer, merge master
Brean0 Mar 26, 2024
853d6d7
README update for setup
funderbrker Mar 29, 2024
064c643
remove coverage data from .gitignore
Brean0 Apr 6, 2024
c82dedb
remove forge libs
Brean0 Apr 6, 2024
49cdd76
M-01: Failure in Maintaining Gauge Points
Brean0 Apr 6, 2024
1d10ac8
M-02. Silo is not compatible with Fee-on-transfer or rebasing tokens
Brean0 Apr 6, 2024
9c76990
M-03. removeWhitelistStatus Ignores updating milestoneSeason variable
Brean0 Apr 6, 2024
ef16824
M-04. Temperature and caseId are incorrectly adjusted when oracle fails
Brean0 Apr 6, 2024
4255cf1
M-05. Chainlink oracle returns stale price due to CHAINLINK_TIMEOUT
Brean0 Apr 6, 2024
fc905c7
Increase max BEAN reward for calling sunrise.
Brean0 Apr 6, 2024
30a04c6
add mock price deployer task
Brean0 Apr 8, 2024
82534d6
add mock price deployer
Brean0 Apr 8, 2024
27eeaab
Update Bdv() to support dewhitelisted tokens.
Brean0 Apr 8, 2024
67ae965
deployBip39 -> deploy seedGauge
Brean0 Apr 8, 2024
810b09a
Fix tests due to MAX_BEAN sunrise reward increase.
Brean0 Apr 8, 2024
f0d0cea
verifyWhitelistStatus + style guideline
Brean0 Apr 8, 2024
c7e118c
Merge branch 'bip39-seedGauge' into bip39-seedGauge-remediations
Brean0 Apr 8, 2024
14271ca
Merge remote-tracking branch 'origin/master' into bip39-seedGauge-rem…
Brean0 Apr 8, 2024
16bb99b
add LibGerminate events
Brean0 Apr 9, 2024
bec353d
Add libWhitelistedTokens.sol to diamondABI
Brean0 Apr 9, 2024
c7ca000
omit changes from libraries without changed logic.
Brean0 Apr 9, 2024
cba8bf6
clean up.
Brean0 Apr 9, 2024
49dcaa9
refactor bip.js and hardhat.config slightly.
Brean0 Apr 9, 2024
380ca41
Remove deploying price (does not need to be redeployed).
Brean0 Apr 9, 2024
f5bda85
add revert upon invalid stalkIssuedPerBdv
Brean0 Apr 10, 2024
bd25667
Bip39 seed gauge remediations (#819)
Brean0 Apr 10, 2024
7a86fad
yarn.lock fix
Brean0 Apr 10, 2024
5ab2d8d
Add EnrootFacet in set of facets to upgrade.
Brean0 Apr 10, 2024
2404da8
Fix balanceOfGrownStalk view function bug.
Brean0 Apr 11, 2024
f96a7ab
Excessive price fix. BEAN/USD rather than USD/BEAN
Brean0 Apr 11, 2024
1174175
Merge branch 'excessive-price-fix' into bip39-seedGauge-remediations
Brean0 Apr 11, 2024
b5b2d76
add LibWellMinting to json
Brean0 Apr 12, 2024
737b8de
invalid json from legacy compilation.
Brean0 Apr 12, 2024
c6ec4ad
Add germinating stem getters
Brean0 Apr 12, 2024
1f29edd
update event, fix event in LibGerminate.
Brean0 Apr 14, 2024
6429ce1
Remove germination comment in LibTokenSilo.
Brean0 Apr 14, 2024
2914b19
various down casts to uint128.
Brean0 Apr 14, 2024
15f9250
Update sopWell comment.
Brean0 Apr 14, 2024
540eae2
Update `getFinishedGerminatingStalkAndRoots` view function
Brean0 Apr 14, 2024
a1f1d8c
add comment to __getGerminatingStem.
Brean0 Apr 14, 2024
490d2d0
Add overflow comment.
Brean0 Apr 14, 2024
7ef4481
fix spacing.
Brean0 Apr 14, 2024
d2a5238
TKN -> TOKEN
Brean0 Apr 14, 2024
feed470
Console log removed.
Brean0 Apr 14, 2024
71ea4c9
change != to <
Brean0 Apr 15, 2024
3946b5d
Update comment
Brean0 Apr 15, 2024
c82903a
add convert comment.
Brean0 Apr 15, 2024
b028b58
fix germination test.
Brean0 Apr 15, 2024
13e0086
seedGauge-remediation-fix (#829)
Brean0 Apr 15, 2024
b06526c
Bip39 seed gauge remediations (#830)
Brean0 Apr 15, 2024
d87ff4e
Soil Issuance above peg.
Brean0 Apr 15, 2024
45b0d58
Sun tests.
Brean0 Apr 15, 2024
54b462c
uint16 -> uint32
Brean0 Apr 16, 2024
acd27e4
seedGauge setSoil (#831)
Brean0 Apr 16, 2024
d071e84
spelling fix.
Brean0 Apr 19, 2024
97e5961
Skip updating beanToMaxLpGpPerBdvRatio on oracle failure.
Brean0 Apr 19, 2024
41009ba
spelling fix.
Brean0 Apr 19, 2024
d25f079
incorrect staging...
Brean0 Apr 19, 2024
c4288dd
add external gauge point calculator getter functions.
Brean0 Apr 19, 2024
ab0e06b
Update Json.
Brean0 Apr 19, 2024
62b12d0
Add libGerminate
Brean0 Apr 19, 2024
25f8cc6
move event outside of token loop.
Brean0 Apr 19, 2024
2f7dd90
add "TotalStalkChanged" event
Brean0 Apr 19, 2024
cdc5a03
Fix.
Brean0 Apr 20, 2024
77627f7
Update `FarmerGerminatingStalkBalanceChanged` to include germState.
Brean0 Apr 20, 2024
6455218
Add libGerminate Event (#837)
Brean0 Apr 20, 2024
fbdb792
Merge branch 'bip39-seedGauge' into skip-beanToMaxLPRatioChange-oracl…
Brean0 Apr 22, 2024
e12e9fd
Skip updating beanToMaxLpGpPerBdvRatio on oracle failure. (#836)
Brean0 Apr 22, 2024
95b7cb5
Add migration facet to deployment.
Brean0 Apr 24, 2024
05508c2
add view function for subgraph.
Brean0 Apr 28, 2024
daa0dd2
Remove unneeded functions.
Brean0 Apr 28, 2024
cbef4ff
add view function for subgraph. (#843)
Brean0 Apr 28, 2024
4a06802
remove decimal precision on unripesupply
Brean0 May 1, 2024
80de841
fix L2SR tests and add additional libLockedUnderlyingTests.
Brean0 May 1, 2024
9bd1232
clean up tests.
Brean0 May 1, 2024
ac8e681
Lib locked underlying fix (#854)
Brean0 May 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.protocol.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: Install Dependencies
if: steps.node-modules-cache.outputs.cache-hit != 'true'
run: yarn install --immutable
run: yarn install --no-immutable
- run: yarn generate
working-directory: protocol
- run: yarn test
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ diamondCut-*.json
# Foundry
cache/
out/
coverage_data/
.openzeppelin
protocol/lib/prb-math
protocol/remappings.txt
protocol/lib
.gas-snapshot

# From SDK Monorepo Join:
Expand All @@ -41,3 +39,5 @@ node_modules
.DS_Store
# Local Netlify folder
.netlify


3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "protocol/lib/forge-std"]
path = protocol/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "protocol/lib/prb-math"]
path = protocol/lib/prb-math
url = https://github.com/paulrberg/prb-math
[submodule "protocol/lib/solmate"]
path = protocol/lib/solmate
url = https://github.com/transmissions11/solmate
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"printWidth": 140,
"printWidth": 100,
"singleQuote": false,
"semi": true,
"trailingComma": "none"
Expand Down
1 change: 0 additions & 1 deletion projects/ui/src/components/Silo/Actions/Withdraw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ const WithdrawForm: FC<
withdrawSeasons,
},
]}
{...txActions}
/>
</TxnAccordion>
</Box>
Expand Down
2 changes: 2 additions & 0 deletions protocol/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ The Beanstalk contract is a multi-facet proxy that implements [EIP-2535](https:/
- You'll know you've installed nodejs right if you can run `node --version`and get an ouput like: `vx.x.x`
- [Yarn](https://classic.yarnpkg.com/lang/en/docs/install/)
- You'll know you've installed yarn right if you can run `yarn --version` And get an output like: `x.x.x`
- Rosetta (Apple Silicon)
- You'll know you've installed Rosetta right if you can execute the solc 0.7.6 binary `.../solc-macosx-amd64-v0.7.6+commit.7338295f --version`

## Installation

Expand Down
Loading
Loading