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

M2 Goerli upgrade shadow fork testing #214

Merged
merged 18 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
RPC_MAINNET="https://eth.llamarpc.com"
RPC_GOERLI="https://ethereum-goerli.publicnode.com"
# RPC_MAINNET="https://mainnet.infura.io/v3/API-KEY"
539 changes: 539 additions & 0 deletions script/milestone/M2Deploy.s.sol

Large diffs are not rendered by default.

119 changes: 0 additions & 119 deletions script/milestone/M2Deploy.sol

This file was deleted.

19 changes: 19 additions & 0 deletions script/output/M2_deployment_data_goerli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"addresses": {
"delayedWithdrawalRouter": "0x89581561f1F98584F88b0d57c2180fb89225388f",
"delegation": "0x1b7b8F6b258f95Cf9596EabB9aa18B62940Eb0a8",
"delegationImplementation": "0x34A1D3fff3958843C43aD80F30b94c510645C316",
"eigenPodBeacon": "0x3093F3B560352F896F0e9567019902C9Aff8C9a5",
"eigenPodImplementation": "0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3",
"eigenPodManager": "0xa286b84C96aF280a49Fe1F40B9627C2A2827df41",
"eigenPodManagerImplementation": "0xA8452Ec99ce0C64f20701dB7dD3abDb607c00496",
"ethPOS": "0xff50ed3d0ec03aC01D4C79aAd74928BFF48a7b2b",
"slasher": "0xD11d60b669Ecf7bE10329726043B3ac07B380C22",
"strategyManager": "0x779d1b5315df083e3F9E94cB495983500bA8E907",
"strategyManagerImplementation": "0x90193C961A926261B756D1E5bb255e67ff9498A1"
},
"chainInfo": {
"chainId": 5,
"deploymentBlock": 9878481
}
}
5 changes: 4 additions & 1 deletion src/contracts/interfaces/IDelegationManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pragma solidity >=0.5.0;
import "./IStrategy.sol";
import "./ISignatureUtils.sol";
import "./IStakeRegistry.sol";
import "./IStrategyManager.sol";

/**
* @title DelegationManager
Expand Down Expand Up @@ -420,11 +421,13 @@ interface IDelegationManager is ISignatureUtils {
* for more detailed information please read EIP-712.
*/
function domainSeparator() external view returns (bytes32);

/// @notice Mapping: staker => cumulative number of queued withdrawals they have ever initiated.
/// @dev This only increments (doesn't decrement), and is used to help ensure that otherwise identical withdrawals have unique hashes.
function cumulativeWithdrawalsQueued(address staker) external view returns (uint256);

/// @notice Returns the keccak256 hash of `withdrawal`.
function calculateWithdrawalRoot(Withdrawal memory withdrawal) external pure returns (bytes32);

function migrateQueuedWithdrawals(IStrategyManager.DeprecatedStruct_QueuedWithdrawal[] memory withdrawalsToQueue) external;
}
7 changes: 7 additions & 0 deletions src/contracts/interfaces/IEigenPodManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,15 @@ interface IEigenPodManager is IPausable {
/// @notice EigenLayer's Slasher contract
function slasher() external view returns (ISlasher);

/// @notice Returns 'true' if the `podOwner` has created an EigenPod, and 'false' otherwise.
function hasPod(address podOwner) external view returns (bool);

/// @notice Returns the number of EigenPods that have been created
function numPods() external view returns (uint256);

/// @notice Returns the maximum number of EigenPods that can be created
function maxPods() external view returns (uint256);

/**
* @notice Mapping from Pod owner owner to the number of shares they have in the virtual beacon chain ETH strategy.
* @dev The share amount can become negative. This is necessary to accommodate the fact that a pod owner's virtual beacon chain ETH shares can
Expand Down
3 changes: 3 additions & 0 deletions src/contracts/interfaces/IStrategyManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ interface IStrategyManager {
/// @notice Returns the EigenPodManager contract of EigenLayer
function eigenPodManager() external view returns (IEigenPodManager);

/// @notice Returns the address of the `strategyWhitelister`
function strategyWhitelister() external view returns (address);

// LIMITED BACKWARDS-COMPATIBILITY FOR DEPRECATED FUNCTIONALITY
// packed struct for queued withdrawals; helps deal with stack-too-deep errors
struct DeprecatedStruct_WithdrawerAndNonce {
Expand Down
61 changes: 0 additions & 61 deletions src/test/SigP/BeaconProxy.sol

This file was deleted.

46 changes: 0 additions & 46 deletions src/test/SigP/DelegationTerms.sol

This file was deleted.

Loading
Loading