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

Fix: Get Dev to Compile #835

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Fix: Get Dev to Compile #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa209f
fix: compile dev
ypatil12 Oct 16, 2024
3b15abf
fix: fixed compile (#830)
haike0513 Oct 16, 2024
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
2 changes: 1 addition & 1 deletion script/admin/mainnet/Mainnet_Unpause_Deposits.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "../../utils/TimelockEncoding.sol";

// forge script script/admin/mainnet/Mainnet_Unpause_Deposits.s.sol:Mainnet_Unpause_Deposits --fork-url $RPC_MAINNET -vvvv
contract Mainnet_Unpause_Deposits is ExistingDeploymentParser, TimelockEncoding {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

// Tues Apr 16 2024 12:00:00 GMT-0700 (Pacific Daylight Time)
uint256 timelockEta = 1713250800;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/holesky/Preprod_Upgrade_bEIGEN_and_EIGEN.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import "../../../src/contracts/token/Eigen.sol";

// forge script script/deploy/holesky/Preprod_Upgrade_bEIGEN_and_EIGEN.s.sol --rpc-url $RPC_HOLESKY --private-key $PRIVATE_KEY --broadcast -vvvv --verify --etherscan-api-key $ETHERSCAN_API_KEY
contract Preprod_Upgrade_bEIGEN_and_EIGEN is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

BackingEigen public bEIGEN_proxy = BackingEigen(0xA72942289a043874249E60469F68f08B8c6ECCe8);
BackingEigen public bEIGEN_implementation;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/holesky/bEIGEN_and_EIGEN_upgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import "forge-std/Test.sol";
// # To deploy and verify our contract
// forge script script/deploy/holesky/bEIGEN_and_EIGEN_upgrade.s.sol:bEIGEN_and_EIGEN_upgrade -vvv --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast
contract bEIGEN_and_EIGEN_upgrade is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

BackingEigen public bEIGEN_proxy = BackingEigen(0x275cCf9Be51f4a6C94aBa6114cdf2a4c45B9cb27);
BackingEigen public bEIGEN_implementation;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/holesky/upgrade_preprod_rewardsCoordinator.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ contract Upgrade_Preprod_RewardsCoordinator is Deploy_Test_RewardsCoordinator {
// Sanity Checks
_verifyContractPointers();
_verifyImplementations();
_verifyContractsInitialized();
_verifyContractsInitialized(false);
_verifyInitializationParams();

}
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/local/Deploy_From_Scratch.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import "forge-std/Test.sol";
// # To deploy and verify our contract
// RUST_LOG=forge,foundry=trace forge script script/deploy/local/Deploy_From_Scratch.s.sol --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast --sig "run(string memory configFile)" -- local/deploy_from_scratch.anvil.config.json
contract DeployFromScratch is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

// struct used to encode token info in config file
struct StrategyConfig {
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/mainnet/EIGEN_timelock_reduction.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import "forge-std/Test.sol";
// # To deploy and verify our contract
// forge script script/deploy/mainnet/EIGEN_timelock_reduction.s.sol:EIGEN_timelock_reduction -vvvv --rpc-url $RPC_URL
contract EIGEN_timelock_reduction is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

TimelockController public EIGEN_TimelockController = TimelockController(payable(0x2520C6b2C1FBE1813AB5c7c1018CDa39529e9FF2));
address public EIGEN_TimelockAdmin = 0xbb00DDa2832850a43840A3A86515E3Fe226865F2;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/mainnet/EIGEN_upgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import "forge-std/Test.sol";
// # To deploy and verify our contract
// forge script script/deploy/mainnet/EIGEN_upgrade.s.sol:EIGEN_upgrade -vvvv --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast
contract EIGEN_upgrade is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

BackingEigen public bEIGEN_proxy = BackingEigen(0x83E9115d334D248Ce39a6f36144aEaB5b3456e75);
BackingEigen public bEIGEN_implementation;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/mainnet/EigenPod_Minor_Upgrade_Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import "forge-std/Test.sol";
// # To deploy and verify our contract
// forge script script/deploy/mainnet/EigenPod_Minor_Upgrade_Deploy.s.sol:EigenPod_Minor_Upgrade_Deploy --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast -vvvv
contract EigenPod_Minor_Upgrade_Deploy is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

string public m2DeploymentOutputPath;
string public freshOutputPath;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ contract M2_Mainnet_Upgrade is ExistingDeploymentParser {

// forge t --mt test_queueUpgrade --fork-url $RPC_MAINNET -vvvv
contract Queue_M2_Upgrade is M2_Mainnet_Upgrade, TimelockEncoding {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

// Thurs Apr 08 2024 12:00:00 GMT-0700 (Pacific Daylight Time)
uint256 timelockEta = 1712559600;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/mainnet/bEIGEN_timelock_reduction.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import "forge-std/Test.sol";
// # To deploy and verify our contract
// forge script script/deploy/mainnet/bEIGEN_timelock_reduction.s.sol:bEIGEN_timelock_reduction -vvvv --rpc-url $RPC_URL
contract bEIGEN_timelock_reduction is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

TimelockController public bEIGEN_TimelockController = TimelockController(payable(0xd6EC41E453C5E7dA5494f4d51A053Ab571712E6f));
address public bEIGEN_TimelockAdmin = 0xbb00DDa2832850a43840A3A86515E3Fe226865F2;
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/mainnet/bEIGEN_upgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import "forge-std/Test.sol";
// # To deploy and verify our contract
// forge script script/deploy/mainnet/bEIGEN_upgrade.s.sol:bEIGEN_upgrade -vvvv --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast
contract bEIGEN_upgrade is Script, Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

BackingEigen public bEIGEN_proxy = BackingEigen(0x83E9115d334D248Ce39a6f36144aEaB5b3456e75);
BackingEigen public bEIGEN_implementation;
Expand Down
2 changes: 1 addition & 1 deletion script/whitelist/delegationFaucet/DeployDelegationFaucet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import "forge-std/StdJson.sol";
* - StrategyBase to be added to the StrategyManager whitelist
* - DelegationFaucet contract
*/
contract DeployDelegationFaucet is Script, DSTest {
contract DeployDelegationFaucet is Script, Test {
// EigenLayer contracts
ProxyAdmin public eigenLayerProxyAdmin;
PauserRegistry public eigenLayerPauserReg;
Expand Down
2 changes: 1 addition & 1 deletion src/test/EigenLayerDeployer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import "./mocks/ETHDepositMock.sol";
import "forge-std/Test.sol";

contract EigenLayerDeployer is Operators {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

// EigenLayer contracts
ProxyAdmin public eigenLayerProxyAdmin;
Expand Down
2 changes: 1 addition & 1 deletion src/test/integration/IntegrationDeployer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import "script/utils/ExistingDeploymentParser.sol";

abstract contract IntegrationDeployer is ExistingDeploymentParser {

Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

// Fork ids for specific fork tests
bool isUpgraded;
Expand Down
2 changes: 1 addition & 1 deletion src/test/integration/TimeMachine.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "forge-std/Test.sol";

contract TimeMachine is Test {

Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

bool pastExists = false;
uint lastSnapshot;
Expand Down
2 changes: 1 addition & 1 deletion src/test/integration/mocks/BeaconChainMock.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct StaleBalanceProofs {

contract BeaconChainMock is PrintUtils {

Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

struct Validator {
bool isDummy;
Expand Down
2 changes: 1 addition & 1 deletion src/test/integration/users/User.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface IUserDeployer {

contract User is PrintUtils {

Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

DelegationManager delegationManager;
StrategyManager strategyManager;
Expand Down
2 changes: 1 addition & 1 deletion src/test/mocks/Reenterer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.9;
import "forge-std/Test.sol";

contract Reenterer is Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

address public target;
uint256 public msgValue;
Expand Down
2 changes: 1 addition & 1 deletion src/test/unit/PausableUnit.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "../harnesses/PausableHarness.sol";

contract PausableUnitTests is Test {

Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

PauserRegistry public pauserRegistry;
PausableHarness public pausable;
Expand Down
2 changes: 1 addition & 1 deletion src/test/unit/PauserRegistryUnit.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "../../contracts/permissions/PauserRegistry.sol";

contract PauserRegistryUnitTests is Test {

Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

PauserRegistry public pauserRegistry;

Expand Down
2 changes: 1 addition & 1 deletion src/test/unit/StrategyBaseUnit.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import "../mocks/ERC20_SetTransferReverting_Mock.sol";
import "forge-std/Test.sol";

contract StrategyBaseUnitTests is Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

ProxyAdmin public proxyAdmin;
PauserRegistry public pauserRegistry;
Expand Down
2 changes: 1 addition & 1 deletion src/test/utils/EigenLayerUnitTestBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "src/contracts/permissions/PauserRegistry.sol";
import "forge-std/Test.sol";

abstract contract EigenLayerUnitTestBase is Test {
Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

PauserRegistry public pauserRegistry;
ProxyAdmin public eigenLayerProxyAdmin;
Expand Down
2 changes: 1 addition & 1 deletion src/test/utils/EigenPodUser.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ interface IUserDeployer {

contract EigenPodUser is PrintUtils {

Vm cheats = Vm(HEVM_ADDRESS);
Vm cheats = Vm(VM_ADDRESS);

TimeMachine timeMachine;
BeaconChainMock beaconChain;
Expand Down
Loading