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

chore: merge dev into mainnet #504

Merged
merged 1,633 commits into from
Apr 8, 2024
Merged

chore: merge dev into mainnet #504

merged 1,633 commits into from
Apr 8, 2024

Conversation

wadealexc
Copy link
Collaborator

  • fixes the massive commit history disparity between the two branches

ypatil12 and others added 28 commits January 2, 2024 20:17
* Fix: Update registration documentation & type hash (#383)

* feat: strategy configs (#392)

* Fix: flaky integration tests (#384)

* feat: strat settings

* Fix: flaky integration tests (#384)

* feat: strat settings

* feat: withdrawalDelayBlocks per strategy

* fix: set deprecated storage to private

* fix: pr review changes

* fix: require string

* docs: updated

* refactor: rename creditTransfersDisabled

* fix: doc typos

* docs: add new methods and fix formatting

* fix: nits and getWithdrawals view

* docs: add link

---------

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

* fix: update forge CI to include contract size checks (#402)

* fix: add contract size check

* fix: ignore harness build size

* refactor: decouple AVS<>Operator mapping from DelegationManager (#403)

* refactor: initial draft

* fix: revert require chages

* fix: small nits

* fix: operator<>AVS mapping tests (#407)

* test: added back avsRegistration tests

* fix: fuzz runs 4096

* fix: broken fuzz test

* docs: add docs for AVSDirectory (#408)

* Feat: Add events for beacon chain balance updates & move deposit event

* script update (#412)

* fix: middleware script (#414)

* Deneb Mainnet Patch (#395)

* init commit

* updated testFullWithdrawalFlow to deneb spec

* added two proof paths

* added both capella and deneb testS

* added testFullWithdrawalFlowCapellaWithdrawalAgainstDenebRoot

* added event

* fixed storage gap

* uncommented testsg

* fix: remove line

* fixed tesst

* added a setter in the EPM for deneForkTimetamp

* tests still broken

* cleanup

* added modifier

* fixing tests

* tests working

* added tests

* comments

* fixed failing test

* fix flaky test

* removed modifier

---------

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

* feat: simplify fork timestamp setting logic (#416)

* feat: simplify fork timestamp setting logic

* test: fix tests to account for only setting timestamp once

---------

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

* Goerli implementation script (#413)

* Create GoerliUpgrade2.s.sol

* preprod deploy

* Update GV2_preprod_deployment_2024_30_1.json

* nit: comments

* avs directory already deployed

* preprod deploy

* chore: fix numerous compiler warnings from script + test files (#419)

warnings were for unused or shadowed variables, or functions that could have stricter mutability

* docs: fixed comment

* Revert "fixed comment"

This reverts commit c3d7bff.

* Fixed comments (#422)

* fix: fixed comment

* fix: removed dead space

* fix: removed extraneous the

* fix: edited another comment

* feat: view func for avssync (#423)

* fix: failing certora-ci (#410)

* fix: try installing solc-select

* fix: addShares selector

* fix: add staker address to DEPOSIT typehash (#424)

This provides additional signature replay protection
for the `StrategyManager.depositIntoStrategyWithSignature` method

Specifically, it addresses the issue outlined in
https://mirror.xyz/curiousapple.eth/pFqAdW2LiJ-6S4sg_u1z08k4vK6BCJ33LcyXpnNb8yU
where some ERC1271 wallets might be vulnerable to "replays" of signatures

While the theoretical "damage" would be ~zero
(allowing someone to deposit and credit the deposit to a user),
adding this field to the typehash seems to be best practice, at least.

* Testnet Deploy (#425)

* fix: updated beacon chain proof docs and correct error message (#427)

* fix: updated doc

* fix: changed more incorrect references fo verifyBalanceUpdates

* fix: changed more incorrect references fo verifyBalanceUpdates

* fix: fixed image

* fix: fixed incorrect comment

* docs: fix formatting

---------

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

* feat: slight refactor to make better use of strategybase hooks (#428)

* feat: slight refactor to make better use of strategybase hooks

* docs: add clarifying comment

* test: unit tests for strat config (#426)

* fix: use correct license (#431)

this should be MIT licensed; looks like this was missed

* docs: update README to point to deployment info (#432)

* fix: include missing field from TYPEHASH calculation (#435)

`delegationApprover` was missing from the `DELEGATION_APPROVAL_TYPEHASH` definition

* fix: disable initializers in constructor (#436)

* chore: beacon proof constants cleanup (#437)

* fix: removed misc constants

* feat: prevent queuing withdrawals to other addresses (#438)

* fix: add back setMinWithdrawalDelayBlocks (#439)

* fix:add back withdrawal delay

* docs: update docs with new function

---------

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

* feat: cancel AVS registration salt  (#434)

* feat: cancel salt

* fix: require that salt cannot be cancelled twice

---------

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

* test: fix borked test after rebase

---------

Co-authored-by: Yash Patil <[email protected]>
Co-authored-by: Michael Sun <[email protected]>
Co-authored-by: quaq <[email protected]>
Co-authored-by: kachapah <[email protected]>
Co-authored-by: gpsanant <[email protected]>
Co-authored-by: ChaoticWalrus <[email protected]>
Co-authored-by: SiddyJ <[email protected]>
- clarify wording about change dates

- rename the "licensed work" for greater specificity
* chore: spring cleaning

* fix: test deployment path

* chore: revert back to  relative paths
* chore: remove maxPods

* docs: update docs

* refactor: set to private
* script: parser script helpers

* feat: holesky deploy scripts

* fix: config

* fix: ops multisig whitelister

* feat: track active validator count in pods (#474)

* chore: remove maxPods (#463)

* chore: remove maxPods

* docs: update docs

* refactor: set to private

* script: parser script helpers

* feat: holesky deploy scripts

* fix: config

* fix: ops multisig whitelister

* refactor: maxpods removal

* feat: preprod deployment

* refactor: reuse other script

---------

Co-authored-by: Alex <[email protected]>
* fix: fallback args

* fix: updated storage syntax
* fix: off-by-one error

strict inequality could cause funds that were part of a withdrawal
in the block where `mostRecentWithdrawalTimestamp` gets set to become stuck.
changing to non-strict inequality fixes the issue.

* chore: add regression test for off-by-one error

added a function to the harness contract to make this test possible

confirmed fails with previous behavior, but passes with new behavior

* chore: delete confusing test

it's unclear quite what this is supposed to be checking

will follow-up with a more reasonable test for what I think this is trying to do

* chore: add test to check that "too early" proof fails

should replace the confusingly named + deleted `testDeployEigenPodTooSoon` test
* docs: reinstate contract addresses to their former glory

* add updated contract addresses for holesky
* welcome home boys, we've missed you

* docs: fix typo

* docs: add missing strategy contracts
* feat: m2-mainnet upgrade script

* chore: remove test output

* feat: add upgrade queue test (#481)

this commit also imports various tx-queuing-related utils

* feat: fix encoding & complete M2 upgrade queuing test

* chore: adjustments to ordering, use parsed address

* fix: correct genesis time

* fix: max restake gwei config

---------

Co-authored-by: ChaoticWalrus <[email protected]>
* feat: add m2 upgrade output file

* fix: consistent writing + reading of deployment params

naming should now be consistent, so the ExistingDeploymentParser
should work with unmodified script outputs

* feat: appropriately parse new implementation addresses

`test_queueUpgrade` now more accurately models the upgrade,
and no longer simulates implementation deployment

* chore: appropriate timelock ETA

* chore: add a couple more "sanity" checks

these are performed after the upgrade is simulated
* chore: filter fork upgrade test out of default `forge t`

* chore: fix flaky test

this test failed when the fuzzed 'withdrawer' param collided with the sender.
by pranking the sender address, the 'assume' statement at the start of the test
now has its desired behavior
* test: clean pr for fork testing

* test: upgrade tests

* fix: gh secrets

* fix: remove lsts that error

* test: clean up fork testing (#487)

---------

Co-authored-by: Alex <[email protected]>
* chore: remove parallel tests

* feat: trigger fork tests via env var and lower fuzz runs

* mainnet fork tests are now triggered by setting the FOUNDRY_PROFILE to forktest
* forktest profile uses lower fuzz runs to reduce RPC load
* CI workflow is split into unit tests, integration tests, and integration forktests

* fix: remove no-match from CI

* fix: flaky unit test and also continue running tests if one job fails

* fix: try a different job order

* test: double the fork test runs since daddy alchemy is serving

* docs: update integration test README with fork test info
* chore: update the pragma from =0.8.12 to ^0.8.12

* test: add deprecated interface pragmas and fix flaky test

---------

Co-authored-by: wadealexc <[email protected]>
* fix: m2_deploy_from_scratch script for devnet

* feat: added github action to make sure deploy script is kept up-to-date

* fix(github-action): missing submodules in checkout step
* feat: update mainnet implementation addresses

additionally, add the EigenLayerBeaconOracle to table

* chore: correct shortened addresses for new implementations

* chore: remove duplicate entry, more consistent format

* chore: link to correct commit in table

* chore: holesky strats

* fix: update eigenpod beacon

---------

Co-authored-by: 8sunyuan <[email protected]>
Copy link
Contributor

@ChaoticWalrus ChaoticWalrus left a comment

Choose a reason for hiding this comment

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

works for me! but this unfortunately has some tiny merge conflict

@wadealexc wadealexc merged commit 2705829 into mainnet Apr 8, 2024
6 checks passed
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.