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

Merge Master Into M2-Mainnet #352

Merged
merged 25 commits into from
Dec 1, 2023
Merged

Merge Master Into M2-Mainnet #352

merged 25 commits into from
Dec 1, 2023

Conversation

ypatil12
Copy link
Collaborator

Merging creates a much more understandable commit history vs. rebasing

Gajesh2007 and others added 24 commits November 7, 2023 01:48
chore: migrate BitmapUtils and BN254 to middleware
* ci(linting): apply linting to CI and update docs for it

* chore: remove git-patch for applying these changes

* fix: typo and mistake in git url

* ci: force fail fast to be false

* ci: remove fail fast behavior

* ci: move fail-fast option

---------

Co-authored-by: steven <[email protected]>
minor cleanup of some unused files; should help to clarify things a bit
Certora will be introducing v5 soon, which is expected to include breaking changes.
Fixing the version at v4.13.1 should allow continuity until we make changes to upgrade.
…#328)

* chore: switch implementation addresses in README table to M2 versions

* chore: fix link/"preview" text for updated links

* chore: fix misplaced link text (oops!)

* chore: fix misplaced text for _another_ link

my bad, don't know how I made this mistake 2x
See `/integration/README.md` for details on how it works

---------

Co-authored-by: Yash Patil <[email protected]>
* base

* add base setup file

* readd refactored file

* pending withdrawal tests

* add withdrawal test scaffold

* push

* finish withdrawal tests; pending additional proof sizes

* remove old EigenPod unit test file; transfer integration tests to EP test file

* update tree file

* add tests for proofs <32 ETH

* remove unused files and test comments

* remove stale comment

* base setup

* add more base test cases

* fix: update setup file pod address

* buggy

* test: fix setup

* pause tests

* some changes

* test: add verify WC test

* test: add withdrawal tests

* nit changes

---------

Co-authored-by: Yash Patil <[email protected]>
* refactor: initial changes

- Commented out and moved 'integration-like' withdrawal tests to Delegation.t.sol
- import paths are absolute
- fixed solidity version
- Inheriting EigenLayerUnitTestSetup helper contract now (deploys mocks contracts, pauserRegistry, etc)

* test: initial tree file

* refactor: revert tree file back to # syntax while wip

* test: update setup file; add initialization + setter tests

* test: minor tree file updates

* test: adding to tree file

* test: fixed `mananger` typo

* test: add register operator cases

* test: add modify operator tests

* test: add share adjustment tests

* test: add undelegate unit tests

* test: update tree file for withdrawals

* test: delegateTo unit tests

* fix: error from changed internal helper

* test: delegateToBySignature unit tests

* fix: update tree file

* test: minor cleanup

* test: add pausing tests

* test: remove unused helper functions

* test: update all tests to use defaultOperator

* test: remove old tests and formatting

- formatted tree file
- formatted unit test file
- removed old tests that have been readded and refactored
- removed bytes casting for revert strings

test: remove getPods file

* fix: remove duplicated logic

- removed assumes out of internal helpers
- removed a lot of dup tree branching for readability
- small nit fixes

* fix: delegateToBySignature tree cleanup

---------

Co-authored-by: Yash Patil <[email protected]>
Copy link
Collaborator

@wadealexc wadealexc left a comment

Choose a reason for hiding this comment

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

LGTM - docs, integration tests are pulled in and core contracts are pretty much unchanged.

Let's never do this again 😅

@ypatil12 ypatil12 merged commit b91a743 into m2-mainnet Dec 1, 2023
39 of 41 checks passed
@ypatil12 ypatil12 deleted the feat/merge_master_v1 branch December 1, 2023 03:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants