Skip to content
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
3 changes: 2 additions & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
]
# An array of file paths from which warnings should be ignored during compilation.
ignored_warnings_from = [
"src/test"
"src/test",
"src/contracts/core/AllocationManager.sol" # TODO: Remove
]

# Test Configuration
Expand Down
17 changes: 8 additions & 9 deletions script/deploy/devnet/deploy_from_scratch.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ contract DeployFromScratch is Script, Test {
if (chainId == 1) ethPOSDeposit = IETHPOSDeposit(0x00000000219ab540356cBB839Cbe05303d7705Fa);
// if not on mainnet, deploy a mock
else ethPOSDeposit = IETHPOSDeposit(stdJson.readAddress(config_data, ".ethPOSDepositAddress"));
eigenPodImplementation = new EigenPod(ethPOSDeposit, eigenPodManager, SEMVER);
eigenPodImplementation = new EigenPod(ethPOSDeposit, eigenPodManager);

eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));

Expand All @@ -244,7 +244,7 @@ contract DeployFromScratch is Script, Test {
new StrategyManager(IAllocationManager(address(allocationManager)), delegation, eigenLayerPauserReg, SEMVER);
avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
eigenPodManagerImplementation =
new EigenPodManager(ethPOSDeposit, eigenPodBeacon, delegation, eigenLayerPauserReg, SEMVER);
new EigenPodManager(ethPOSDeposit, eigenPodBeacon, delegation, eigenLayerPauserReg);
rewardsCoordinatorImplementation = new RewardsCoordinator(
IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
delegation,
Expand All @@ -256,8 +256,7 @@ contract DeployFromScratch is Script, Test {
REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP,
SEMVER
REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP
)
);
allocationManagerImplementation = new AllocationManager(
Expand All @@ -267,11 +266,11 @@ contract DeployFromScratch is Script, Test {
eigenLayerPauserReg,
permissionController,
DEALLOCATION_DELAY,
ALLOCATION_CONFIGURATION_DELAY,
SEMVER
ALLOCATION_CONFIGURATION_DELAY
);
permissionControllerImplementation = new PermissionController(SEMVER);
strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg, SEMVER);

permissionControllerImplementation = new PermissionController();
strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg);

// Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
{
Expand Down Expand Up @@ -333,7 +332,7 @@ contract DeployFromScratch is Script, Test {

// Deploy strategyFactory & base
// Create base strategy implementation
baseStrategyImplementation = new StrategyBase(strategyManager, eigenLayerPauserReg, SEMVER);
baseStrategyImplementation = new StrategyBase(strategyManager, eigenLayerPauserReg);

// Create a proxy beacon for base strategy implementation
strategyBeacon = new UpgradeableBeacon(address(baseStrategyImplementation));
Expand Down
17 changes: 8 additions & 9 deletions script/deploy/local/deploy_from_scratch.slashing.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,13 @@ contract DeployFromScratch is Script, Test {
address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
);

eigenStrategy = IStrategy(new EigenStrategy(strategyManager, eigenLayerPauserReg, SEMVER));
eigenStrategy = IStrategy(new EigenStrategy(strategyManager, eigenLayerPauserReg));

// if on mainnet, use the ETH2 deposit contract address
if (chainId == 1) ethPOSDeposit = IETHPOSDeposit(0x00000000219ab540356cBB839Cbe05303d7705Fa);
// if not on mainnet, deploy a mock
else ethPOSDeposit = IETHPOSDeposit(stdJson.readAddress(config_data, ".ethPOSDepositAddress"));
eigenPodImplementation = new EigenPod(ethPOSDeposit, eigenPodManager, SEMVER);
eigenPodImplementation = new EigenPod(ethPOSDeposit, eigenPodManager);

eigenPodBeacon = new UpgradeableBeacon(address(eigenPodImplementation));

Expand All @@ -253,7 +253,7 @@ contract DeployFromScratch is Script, Test {
new StrategyManager(IAllocationManager(address(allocationManager)), delegation, eigenLayerPauserReg, SEMVER);
avsDirectoryImplementation = new AVSDirectory(delegation, eigenLayerPauserReg, SEMVER);
eigenPodManagerImplementation =
new EigenPodManager(ethPOSDeposit, eigenPodBeacon, delegation, eigenLayerPauserReg, SEMVER);
new EigenPodManager(ethPOSDeposit, eigenPodBeacon, delegation, eigenLayerPauserReg);
rewardsCoordinatorImplementation = new RewardsCoordinator(
IRewardsCoordinatorTypes.RewardsCoordinatorConstructorParams(
delegation,
Expand All @@ -265,8 +265,7 @@ contract DeployFromScratch is Script, Test {
REWARDS_COORDINATOR_MAX_REWARDS_DURATION,
REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH,
REWARDS_COORDINATOR_MAX_FUTURE_LENGTH,
REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP,
SEMVER
REWARDS_COORDINATOR_GENESIS_REWARDS_TIMESTAMP
)
);
allocationManagerImplementation = new AllocationManager(
Expand All @@ -276,10 +275,10 @@ contract DeployFromScratch is Script, Test {
eigenLayerPauserReg,
permissionController,
DEALLOCATION_DELAY,
ALLOCATION_CONFIGURATION_DELAY,
SEMVER
ALLOCATION_CONFIGURATION_DELAY
);
permissionControllerImplementation = new PermissionController(SEMVER);

permissionControllerImplementation = new PermissionController();

// Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
{
Expand Down Expand Up @@ -347,7 +346,7 @@ contract DeployFromScratch is Script, Test {
);

// deploy StrategyBaseTVLLimits contract implementation
baseStrategyImplementation = new StrategyBaseTVLLimits(strategyManager, eigenLayerPauserReg, SEMVER);
baseStrategyImplementation = new StrategyBaseTVLLimits(strategyManager, eigenLayerPauserReg);
// create upgradeable proxies that each point to the implementation and initialize them
for (uint256 i = 0; i < strategyConfigs.length; ++i) {
if (strategyConfigs[i].tokenAddress == address(0)) {
Expand Down

This file was deleted.

Loading