Skip to content

Certora/composable stable pool #3

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
Open
wants to merge 238 commits into
base: Certora/ComposableStablePool
Choose a base branch
from
Open

Certora/composable stable pool #3

wants to merge 238 commits into from

Conversation

@Nick-Certora
Copy link

@Nick-Certora Nick-Certora commented Nov 22, 2022

Description

Type of change

  • Bug fix
  • New feature
  • Breaking change
  • Dependency changes
  • Code refactor / cleanup
  • Documentation or wording changes
  • Other

Checklist:

  • The diff is legible and has no extraneous changes
  • Complex code has been commented, including external interfaces
  • Tests are included for all code paths
  • The base branch is either master, or there's a description of how to merge

Issue Resolution

TomAFrench and others added 30 commits September 8, 2022 10:52
@TomAFrench
Return preJoinExitInvariant from _beforeJoinExit in WeightedPool (b…
1012b63 
…alancer#1718)

* refactor: return preJoinExitInvariant from beforeJoinExit

* fix: plaster fix over managed pool invariant issue
@TomAFrench @nventuro
Prepare weighted deployment (balancer#1719)
5fed1c2 
* chore: add deployment task for new WeightedPool

* chore: deprecate old weighted pool deployment

* chore: markdown formatting

* chore: address review comments

* fix: update import paths in deprecated task

* Update pkg/deployments/README.md

Co-authored-by: Nicolás Venturo <[email protected]>
@TomAFrench @nventuro
@EndymionJkb @markusbkoch
Composable stable deployment (balancer#1695)
93af2fd 
* Fix BasePool permissioned function owner only state not being used (balancer#1657)

* Make Stable `getRate` consider unpaid protocol fees (balancer#1683)

* Remove StableMath.getRate

* Clarify return value in protocol fee module

* Fix get rate

* Add tests

* Add yield tests

* Rename getBalances

* Reuse test code

* Add integration test

* Add exit tests

* style: lintooor

* Update pkg/pool-stable/contracts/ComposableStablePool.sol

Co-authored-by: EndymionJkb <[email protected]>

* Update pkg/pool-stable/test/ComposableStablePool.test.ts

Co-authored-by: EndymionJkb <[email protected]>

* Revert "Rename getBalances"

This reverts commit 0c7c75d.

* Update pkg/pool-stable/test/ComposableStablePool.test.ts

Co-authored-by: Tom French <[email protected]>

* Lintor

* Provide fee setter helper

Co-authored-by: Tom French <[email protected]>
Co-authored-by: EndymionJkb <[email protected]>
Co-authored-by: Tom French <[email protected]>

* typo

* Fix argument name of protocol fee cache update event (balancer#1689)

* Pay protocol fees on cache update (balancer#1684)

* Pay protocol fees on cache update

* Fix typo

* Add docs

* Add proto cache hook tests

* Add pause behavior and tests

* Fix tests

* Fix integration test

* Update pkg/pool-utils/contracts/ProtocolFeeCache.sol

Co-authored-by: EndymionJkb <[email protected]>

* Update pkg/pool-stable/contracts/ComposableStablePool.sol

Co-authored-by: Tom French <[email protected]>

Co-authored-by: EndymionJkb <[email protected]>
Co-authored-by: Tom French <[email protected]>

* Forfeit protocol fees on recovery mode disable (balancer#1687)

* Pay protocol fees on cache update

* Fix typo

* Add docs

* Add proto cache hook tests

* Add pause behavior and tests

* Fix tests

* Forfeit protocol fees on recovery mode disable

* Update pkg/pool-stable/contracts/ComposableStablePool.sol

Co-authored-by: EndymionJkb <[email protected]>

* Update pkg/pool-stable/test/ComposableStablePool.test.ts

Co-authored-by: EndymionJkb <[email protected]>

Co-authored-by: EndymionJkb <[email protected]>

* Add comment on decreasing StablePool token rates (balancer#1688)

* Add small comment on decreasing rates

* Apply suggestions from code review

Co-authored-by: EndymionJkb <[email protected]>

* Update ComposableStablePoolProtocolFees.sol

Co-authored-by: EndymionJkb <[email protected]>

* Prevent invariant overflow (balancer#1690)

* Add check to prevent invariant overflow

* Update pkg/pool-stable/contracts/ComposableStablePoolProtocolFees.sol

Co-authored-by: Tom French <[email protected]>

Co-authored-by: Tom French <[email protected]>

* fix: add missing bracket

* style: the lintoor

* Reduce ComposableStable bytecode size (balancer#1696)

* Simplify immutable accesses

* refactor: use stack variable for totalTokens

* refactor: unbreak the other function

Co-authored-by: Tom French <[email protected]>

* Add reentrancy comment (balancer#1703)

* Add getActualSupply (balancer#1704)

* Add getActualSupply

* Update pkg/pool-stable/test/ComposableStablePool.test.ts

Co-authored-by: Tom French <[email protected]>

* Update pkg/pool-stable/contracts/ComposableStablePool.sol

Co-authored-by: Tom French <[email protected]>

* Remove virtual supply

Co-authored-by: Tom French <[email protected]>

* Update deployment info (balancer#1707)

* Do deployment (balancer#1708)

* Fix missing migration

* Fix weighted build

* Remove old compo pool action ids

* New ComposableStablePool action ids (balancer#1711)

* ComposableStablePool mainnet action-ids

* ComposableStablePool arbitrum action-ids

* ComposableStablePool polygon action-ids

* ComposableStablePool goerli action-ids (balancer#1712)

Co-authored-by: Nicolás Venturo <[email protected]>
Co-authored-by: EndymionJkb <[email protected]>
Co-authored-by: Markus Buhatem Koch <[email protected]>
@EndymionJkb @nventuro
Use decimal amp (balancer#1716)
d354bc0 
Co-authored-by: Nicolás Venturo <[email protected]>
@nventuro
Do deployment (balancer#1721)
8831511
@nventuro @TomAFrench
Simpler fee cache (balancer#1720)
7dd423b 
* Simplify ProtocolFeeCache

* Remove extra argument in callsites

* fix: complete removal of hardcoded swap protocol fee

* docs: update stale comment

* style: linting

* fix: remove remaining protocolSwapFeePercentage arg

* fix: ok really removed the stragglers this time

* fix: ok *this* time

* docs: update stale comment

* style: pls

Co-authored-by: Tom French <[email protected]>
@TomAFrench
refactor: push zero value check inside _payProtocolFees (balancer#1722)
1552431
Test: peekChainedReferenceValue multicall (balancer#1697)
a678d54 
Testing peekChainedReferenceValue in a static multicall.
@markusbkoch
weighted-pool-v2 action-ids (balancer#1724)
bdcff71
@markusbkoch
ComposableStablePool optimism action-ids (balancer#1723)
3b8925c
@TomAFrench
chore: move managed pool into separate dir (balancer#1725)
c3ccf89
@nventuro
Test for asset managers on ManagedPool correctly (balancer#1729)
999e1c7
@nventuro
Ignore solc warnings (balancer#1728)
402faf9
@nventuro @TomAFrench
No longer add liquidity on addToken (balancer#1726)
f0fa71f 
* Remove join hook from add token

* Apply suggestions from code review

Co-authored-by: Tom French <[email protected]>
@TomAFrench
fix: add hardhat-ignore-warnings to pool-weighted (balancer#1735)
6289206
@TomAFrench
refactor: remove unnecessary override of _doRecoveryModeExit (balance…
e604050 
…r#1733)
@TomAFrench
docs: be explicit about not checking allowlist on exits (balancer#1732)
111d756
@TomAFrench
Add specialized invariant variant to calculate managed swap fees. (ba…
a7c4610 
…lancer#1731)

* refactor: use specialized invariant variant to calculate managed swap fees

* chore: remove ArrayHelpers

* fix: clean up dangling import

* refactor: replace fixed size arrays with raw uints
Gauge Actions test (balancer#1686)
159f73a 
Adding Gauge Actions test.

Testing:
- Liquidity and rewards-only gauges
- Multiple amounts (within and outside the allowed range)
- Immediate values and chained references
- Changing sender and recipient
@TomAFrench
Add library for managing information on ManagedPool tokens (balancer#…
f868743 
…1730)

* feat: add ManagedPoolTokenLib

* refactor: rework ManagedPool to make use of ManagedPoolTokenLib

* feat: add function to return a token's start and end weights

* feat: push search for minimum token weight into ManagedPoolTokenLib

* refactor: clean up unused constants and update comment to point to lib

* refactor: remove normalization functions from ManagedPool

* test: add test for getMinimumTokenEndWeight

* docs: natspec

* feat: add initializeTokenState function

* refactor: autocompute offsets

* refactor: expand _MAX_DENORM_WEIGHT to fill entire bit width

* docs: add natspec

* docs: add separator

* docs: bitmap comment

* fix: re-add weight compression and add comment for unsmort people
@TomAFrench
chore: add hardhat-ignore-warnings dependency (balancer#1737)
a3a3db4
@nventuro @TomAFrench
Upgrade to hardhat to v2.11.1 (balancer#1727)
789fbeb 
* Upgrade to 2.11.1

* Add to v2 helpers

* fix: add empty headers object to forking config

Co-authored-by: Tom French <[email protected]>
@TomAFrench
Use Hardhat's linking (balancer#1740)
fa76e3b 
* build: bump @nomiclabs/hardhat-ethers to 2.0.6

* refactor: make use of getContractFactoryFromArtifact so we can use hardhat's linking
@TomAFrench
refactor: remove fixedpoint muldiv (balancer#1741)
b2f2228
@TomAFrench
Move helper functions for scaling out BasePool to library (balancer#1738
7099fbd 
)

* refactor: move helper functions for scaling out to lib

* style: disable solhint

* test: move tests for scaling into separate test file

* docs: add blurb on ScalingHelpers

* style: re-add linting disable
@TomAFrench
Move pool registration code into a simple lib (balancer#1739)
10fd1c2 
* refactor: move pool registration code into a simple lib

* refactor: split of registration from setting immutables

* docs: add comment explaining lack of length checks on tokens/AMs

* test: add test to check that vault length checks apply
@TomAFrench
chore: vendor BasePool for ManagedPool (balancer#1745)
0902274
@TomAFrench
Begin flattening ManagedPool (balancer#1746)
4290622 
* refactor: simplify BaseWeightedPool hooks

* refactor: inline _onSwapGivenIn into ManagedPool

* refactor: remove unused function
@TomAFrench
Add ManagedPoolStorageLib (balancer#1734)
48e87e9 
* feat: add ManagedPoolStorageLib

* refactor: autocompute offsets

* refactor: rework weight and swap fee setters to nicer solidity which results in identical bytecode

* chore: rename miscData to poolState

* docs: natspec

* refactor: change swap fee bit lengths to match

* feat: add recovery mode to poolState

* chore: remove natspec from mock

* fix: re-add functions which got disappeared in a rebase

* docs: natspec

* feat: expose `getWeightChangeFields` and `getSwapFeeFields` from library
@TomAFrench @nventuro
Set _lastAumFeeCollectionTimestamp on initialisation (balancer#1736)
adbcce7 
* feat: set `_lastAumFeeCollectionTimestamp` on initialisation

* test: update tests to reflect new aum fee initialization

* feat: collect AUM fees before updating the protocol fee cache

* docs: add comment on no AUM fees before initialisation

* Move AUM fee calculation into a library (balancer#1742)

* refactor: move AUM fee calculation into a library

* test: add simple tests for ProtocolAUMFees

* Apply suggestions from code review

Co-authored-by: Nicolás Venturo <[email protected]>

* test: add worked example and test

* docs: add comment on BPT fee percentages

Co-authored-by: Nicolás Venturo <[email protected]>

* refactor: remove if statement

Co-authored-by: Nicolás Venturo <[email protected]>
Juan Ignacio Ubeira and others added 30 commits October 26, 2022 12:59
Add recovery mode tests for BaseWeightedPool. (balancer#1942)
3f7d61d
@EndymionJkb
PR template (balancer#1934)
4c8e1f5 
* PR template

Inspired by the front end; this might be useful for us to

* refactor: review comments
@nventuro
Add latest ToB audit (balancer#1952)
bddef99
@EndymionJkb
Great Pool Migration (prep) (balancer#1954)
21dc0f2 
* refactor: rename BasePool to LegacyBasePool

* refactor: move new BasePool out of managed pool

* refactor: rename again to reduce diff
@EndymionJkb
Rebase LinearPool (balancer#1955)
e791860 
* refactor: rename BasePool to LegacyBasePool

* refactor: move new BasePool out of managed pool

* refactor: generalize BasePool to handle LinearPool's need for the recipient

* refactor: add _computeScalingFactor to helpers (no longer in BasePool)

* refactor: move LinearPool to BasePool

* refactor: some renaming and reorganization

* refactor: rename again to reduce diff

* fix: cardinality of assetManagers

* refactor: don't mint if 0 tokens

* refactor: adjust to constant composable BPT index

* lint

* docs: move comments

* refactor: refactor token sorting; remove unused function

* eslint

* lint (function args)

* lint

* refactor: inline constants

* refactor: allow minting 0 BPT

* fix: encode targets

* test: add test to ensure target setting does not overwrite state
@bxmmm1 @nventuro
ProtocolFeeSplitter (balancer#1918)
26794aa 
* Protocol fee splitter wip

* add more tests

* add deployment, minor changes

* Minor changes regarding errors in tests

* Add default default revenue sharing fee percentage

* update function to pure

* Add Pool's beneficiary

* Use ProtocolFeesWithdrawer instead of ProtocolFeesCollector (#2)

* Protocol fee splitter refactor (#3)

* remove unused errors

* Update deployment script for ProtocolFeeSplitter

* update test, style change

* Update MockPool

* update modifier on MockPool

* Remove getOwner from IBasePool

* Fix linter error

* Remove getOwner from MockPool

* Last protocol fee splitter fixes (#4)

* Fix task inputs

* Update readmes and changelogs

* Hide struct inside contract

* Make interfaces 'view'

* Fix iface docs

* Minor refactors

* Rename random to other

* Minor test simplifications

* Split getter tests

* Remove unused values

* Fix test transfer

* Fix test

* Update pkg/interfaces/contracts/standalone-utils/IProtocolFeeSplitter.sol

Co-authored-by: Nicolás Venturo <[email protected]>

Co-authored-by: Nicolás Venturo <[email protected]>
@nventuro
Update README.md (balancer#1963)
72ba2ee
@EndymionJkb
fix: flaky circuit breaker test (balancer#1956)
1db13b8
L2 Gauge Checkpointer (balancer#1570)
66f0b33 
L2 Gauge Checkpointer: implementation and unit tests.
@EndymionJkb
Authorizer refactor preparation (tests) (balancer#1965)
ebe1741 
* refactor: remove explicit AuthorizerAdaptor deployment

* refactor: avoid explicit AuthorizerAdaptor deployment

* refactor: avoid explicit authorizer deployment in pool-utils

* refactor: remove explicit authorizer deployment in pool-weighted

* refactor: remove explicit authorizer deployment in solidity-utils, and silence lint warnings

* refactor: remove explicit deployment of Authorizer in standalone-utils

* refactor: remove explicit deployments from the vault

* refactor: have the Vault deploy an AuthorizerAdaptor

* refactor: getArtifact is synchronous

* Syntactic sugar

* fix: point to correct package
@nventuro
Add managed pool action ids (balancer#1970)
79250ab
@nventuro
Upgrade hardhat (balancer#1974)
3b091d2
@TomAFrench
chore: silence hardhat warnings in distributors package (balancer#1975)
68a5a4a
@EndymionJkb
refactor: replace UNHANDLED_BY_LINEAR_POOL with UNIMPLEMENTED (balanc…
9b68267 
…er#1976)
@EndymionJkb
Rebase LBP (balancer#1961)
0b5e10d 
* refactor: rebase LBP

* refactor: visibility and function order

* fix: adjust offset and remove redundant event

* refactor: use UNIMPLEMENTED error vs UNHANDLED_BY_LBP
@nventuro
Update hardhat verifier (balancer#1968)
30fade3 
Update hardhat verifier
@TomAFrench
Provide a 'contract' argument to extract-artifacts (balancer#1951)
420b883 
* Add file and name optional parameters to check-artifacts task.

* Improve deploying instructions for extract-artifacts.

* Nit: argument rename in artifact.ts.

* Update pkg/deployments/package.json

Co-authored-by: Tom French <[email protected]>

* Update pkg/deployments/DEPLOYING.md

Co-authored-by: Tom French <[email protected]>

* Remove extra try / catch in artifact.ts.

Co-authored-by: Tom French <[email protected]>
@TomAFrench
refactor: use constants rather than literals in poolState decoding (b…
743a5f1 
…alancer#1980)
Add note about Node / Yarn versions in README. (balancer#1987)
896f3d0 
* Add note about Node / Yarn versions in README.
Update dependencies (balancer#1985)
4371d9e 
Upgrade dependencies.
-  Using `yarn up`
- Linters / formatters excluded
Update node engine in main package.json. (balancer#1989)
4ebbfd9
ESLint + prettier update (balancer#1988)
d68a83c 
Upgrade ESLint and Prettier.
@TomAFrench @EndymionJkb
Adaptor entrypoint (balancer#1977)
fd06144 
Add authorizer adaptor entrypoint.

Co-authored-by: Tom French <[email protected]>
Co-authored-by: Jeffrey Bennett <[email protected]>
@nventuro @EndymionJkb
Add Certora ComposableStablePool report (balancer#1967)
d24834f 
* Add Certora ComposableStablePool report

* Update audit report with commit

* docs: fix filename

Co-authored-by: Jeffrey Bennett <[email protected]>
@Nick-Certora
added envfree and small changes
b02716b
@Nick-Certora
merged from master
35734b7
@Nick-Certora
cleaned up pause recovery
1c7a1a6
@Nick-Certora
synced word codec and amp rules
c9d7976
@Nick-Certora
comment cleanup
3b1b425
@Nick-Certora
Merge branch 'Certora/ComposableStablePool' of github.com:Certora/bal…
6642988 
…ancer-v2-monorepo into Certora/ComposableStablePool
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@Nick-Certora @TomAFrench @EndymionJkb @nventuro @markusbkoch @danielmkm @bxmmm1