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

Squashed, rebased composable stable pool v2 deployment #2065

Merged
merged 9 commits into from
Nov 30, 2022
Merged

Squashed, rebased composable stable pool v2 deployment #2065

merged 9 commits into from
Nov 30, 2022

Conversation

TomAFrench
Copy link
Contributor

@TomAFrench TomAFrench commented Nov 25, 2022 •
edited
Loading

Description

#2059 but with some commit surgery to split code changes from deployment preparation and merge redundant code changes.

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

nventuro and others added 3 commits November 25, 2022 14:43
@nventuro @TomAFrench
Prevent invariant overflow (#1690)
a5f3958 
* Add check to prevent invariant overflow

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

Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com>

Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com>
@TomAFrench
Composable stable pool versioning (#2034)
0073f26 
* WIP: version for ComposableStablePool.

* Fix stack too deep error and adjust tests.

* ComposableStablePoolFactory test.

* Remove unused var.

* Add factory version / pool version.

* Fix benchmarks.

* Remove IVersionProvider.
@TomAFrench
feat: add proportional joins/exits
495a425
@TomAFrench TomAFrench added the do not merge Code playground or showcase - not intended to be merged label Nov 25, 2022
@TomAFrench TomAFrench marked this pull request as ready for review November 25, 2022 15:29
@TomAFrench @nventuro
Deployment preparation: Composable stable pool v2 (#2028)
8239faf 
* feat: add proportional joins/exits to ComposableStablePool

* deprecate 20220906-composable-stable-pool task

* add new task

* add artifacts

* checkpoint

* refactor: finish fork test

* refactor: remove weighted encoder name change (extraneous for this deployment)

* feat: add deprecations section to stable pool, and update deployments readme

* fix: deprecated paths

* Update README.md

Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
@TomAFrench TomAFrench changed the title test PR Squashed, rebased composable stable pool v2 deployment Nov 25, 2022
@TomAFrench
Merge branch 'master' into squashed-rebased-scp
67d3f1a 
* master: (269 commits)
  Do new aave linear deploy (#2055)
  Deploy entrypoint (#2062)
  (Re) deployment preparation: `AuthorizerAdaptorEntrypoint` (#2060)
  chore: update deployment readmes to point to artifact files rather than abis (#2061)
  Expose deployment artifacts from deployments package rather than ABI + bytecode (#2058)
  chore: add missing action-ids (#2025)
  Remove Protocol Fee Splitter task (#2054)
  Adaptor entrypoint events (#2051)
  Verify AaveLinearPool on deployment (#2040)
  Rename IPoolVersion --> IFactoryCreatedPoolVersion. (#2045)
  docs: remove deprecated networks from jsdoc (#2029)
  Add Version unit test. (#2038)
  Update linear build info (#2041)
  Make unnecessarily async functions sync (#2030)
  Do deployment (#2035)
  Aave linear pool versioning (#2032)
  Fix recovery readme (#2037)
  style: fix linter (#2036)
  Add tokens task (#2024)
  Create recovery helper deployment (#2033)
  ...
@TomAFrench TomAFrench removed the do not merge Code playground or showcase - not intended to be merged label Nov 25, 2022
nventuro
nventuro approved these changes Nov 25, 2022
View reviewed changes
Copy link
Contributor

@nventuro nventuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked that the build info at 8239faf8cb394b78450dae497f79d8abe694a7c6 matches what is committed here.

I also checked that all three commits that lead to that one are correct.

@jubeira jubeira mentioned this pull request Nov 28, 2022
Closed
11 tasks
@nventuro nventuro mentioned this pull request Nov 30, 2022
Merged
11 tasks
@TomAFrench TomAFrench mentioned this pull request Nov 30, 2022
Closed
11 tasks
jubeira
jubeira approved these changes Nov 30, 2022
View reviewed changes
Copy link
Contributor

@jubeira jubeira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've compared this PR @8239faf (i.e. where the build info for the deployment is generated) with the tip of #2069 @80a0c67.

Other than differences in comments and small refactors in ProtocolFees (i.e. functions that moved around performing the same operations) it's the same. Looks good!

@nventuro nventuro merged commit 3251913 into master Nov 30, 2022
@nventuro nventuro deleted the squashed-rebased-scp branch November 30, 2022 13:50
This was referenced Nov 30, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nventuro nventuro nventuro approved these changes

@jubeira jubeira jubeira approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TomAFrench @jubeira @nventuro