Skip to content

Commit 7f6fb4b

Browse files
0xClandestine0xClandestine
committed
refactor(tests): integration
refactor: move time travel getters to separate file chore: wand vacuum src/test/integration --delete refactor: reorganize + rename `IntegrationCheckUtils` -> `IntegrationChecks` chore: make fmt refactor: fixed time machine + beacon chain addresses fix: ci refactor: remove old random getters refactor: randomness refactor: reorganize chore: make fmt fix: ci perf: remove some vm.assumes perf: remove unused user setup return params chore: move `TimeMachine.t.sol` -> `src/test/utils` chore: wand vacuum src/test/integration --delete perf: optimize bitmap conversion + remove shuffle function refactor: update randomization functions + add parsing methods chore: remove unused imports feat: add `Constants.t.sol` refactor: use cheats alias refactor: remove logger from `BeaconChainMock` and `TimeMachine` refactor: renaming refactor: integration deployer + logger fix: ci refactor: rename deprecatedInterfaces -> deprecated refactor: move `src/test/integration/mocks` -> `src/test/mocks` refactor: sort strategies once chore: reduce fuzz runs for time intensive tests chore: forge snapshot refactor: condense storage refactor: cleanup refactor: check_Withdrawal_AsTokens_State chore: weekly fuzz seed reduce rpc usage fix: ci chore: comment out failing tests refactor: use new assertEq array fns chore: make fmt perf: _init is called in setUp (once per run) chore: make fmt chore: only use fuzz seed for fork testing refactor: cleanup `IntegrationDeployer` chore: remove gas snapshot chore: make fmt chore: remove vm.assumes perf: alm multi single run (too expensive) perf: test_multiple_deposits single run (too expensive) perf(refactor): ALM_RegisterAndModify.t.sol chore: make fmt refactor: remove redundant checks chore: make fmt perf: single run for `test_completeCP_withNoAddedShares` (too expensive) refactor: cleanup empty space chore: mv `UpgradeTest` to `integration/tests/upgrade/` chore: mv `TypeImporter` to `interfaces/ICore.sol` chore: remove snapshots fix: tests test: compiles fix: compile errors
1 parent 3289986 commit 7f6fb4b

File tree

62 files changed

+2398
-3589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2398
-3589
lines changed

‎.github/workflows/foundry.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
branches:
88
- "dev"
99

10-
1110
env:
1211
FOUNDRY_PROFILE: medium
1312
RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
@@ -62,6 +61,14 @@ jobs:
6261
forge --version
6362
forge build --sizes
6463
64+
# Generate a fuzz seed that changes weekly to avoid burning through RPC allowance.
65+
- name: "Generate A Fuzz Seed Weekly"
66+
if: ${{ matrix.suite == 'Fork' }}
67+
run: >
68+
echo "FOUNDRY_FUZZ_SEED=$(
69+
echo $(($EPOCHSECONDS - $EPOCHSECONDS % 604800))
70+
)" >> $GITHUB_ENV
71+
6572
# Run the test suite in parallel based on the matrix configuration.
6673
- name: Run ${{ matrix.suite }} tests
6774
run: |
@@ -91,7 +98,7 @@ jobs:
9198
submodules: recursive
9299

93100
# Restore Forge cache
94-
- name: Cache Forge Build
101+
- name: "Cache Forge Build"
95102
uses: actions/cache@v3
96103
with:
97104
path: |
@@ -115,7 +122,7 @@ jobs:
115122
id: build
116123

117124
# Run Forge Test (Intense)
118-
- name: Forge Test (Intense)
125+
- name: "Forge Test (Intense)"
119126
run: |
120127
echo -e "\033[1;33mWarning: This workflow may take several hours to complete.\033[0m"
121128
echo -e "\033[1;33mThis intense fuzzing workflow is optional but helps catch edge cases through extended testing.\033[0m"

‎script/output/devnet/SLASHING_deploy_from_scratch_deployment_data.json

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
{
22
"addresses": {
3-
"allocationManager": "0xAbD5Dd30CaEF8598d4EadFE7D45Fd582EDEade15",
4-
"allocationManagerImplementation": "0xBFF7154bAa41e702E78Fb082a8Ce257Ce13E6f55",
5-
"avsDirectory": "0xCa839541648D3e23137457b1Fd4A06bccEADD33a",
6-
"avsDirectoryImplementation": "0x1362e9Cb37831C433095f1f1568215B7FDeD37Ef",
7-
"baseStrategyImplementation": "0x61C6A250AEcAbf6b5e4611725b4f99C4DC85DB34",
8-
"delegationManager": "0x3391eBafDD4b2e84Eeecf1711Ff9FC06EF9Ed182",
9-
"delegationManagerImplementation": "0x4073a9B0fb0f31420C2A2263fB6E9adD33ea6F2A",
10-
"eigenLayerPauserReg": "0xBb02ACE793e921D6a454062D2933064F31Fae0B2",
11-
"eigenLayerProxyAdmin": "0xBf0c97a7df334BD83e0912c1218E44FD7953d122",
12-
"eigenPodBeacon": "0x8ad244c2a986e48862c5bE1FdCA27cef0aaa6E15",
13-
"eigenPodImplementation": "0x93cecf40F05389E99e163539F8d1CCbd4267f9A7",
14-
"eigenPodManager": "0x8C9781FD55c67CE4DC08e3035ECbdB2B67a07307",
15-
"eigenPodManagerImplementation": "0x3013B13BF3a464ff9078EFa40b7dbfF8fA67138d",
16-
"emptyContract": "0x689CEE9134e4234caEF6c15Bf1D82779415daFAe",
17-
"rewardsCoordinator": "0xa7DB7B0E63B5B75e080924F9C842758711177c07",
18-
"rewardsCoordinatorImplementation": "0x0e93df1A21CA53F93160AbDee19A92A20f8b397B",
19-
"strategies": [
20-
{
21-
"strategy_address": "0x4f812633943022fA97cb0881683aAf9f318D5Caa",
22-
"token_address": "0x94373a4919B3240D86eA41593D5eBa789FEF3848",
23-
"token_symbol": "WETH"
24-
}
25-
],
26-
"strategyBeacon": "0x957c04A5666079255fD75220a15918ecBA6039c6",
27-
"strategyFactory": "0x09F8f1c1ca1815083a8a05E1b4A0c65EFB509141",
28-
"strategyFactoryImplementation": "0x8b1F09f8292fd658Da35b9b3b1d4F7d1C0F3F592",
29-
"strategyManager": "0x70f8bC2Da145b434de66114ac539c9756eF64fb3",
30-
"strategyManagerImplementation": "0x1562BfE7Cb4644ff030C1dE4aA5A9aBb88a61aeC",
3+
"TestToken": "0xcae746B46013Bf4D43B8E2B9e98F9DBE2461532A",
4+
"allocationManager": "0xD718d5A27a29FF1cD22403426084bA0d479869a0",
5+
"allocationManagerImplementation": "0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D",
6+
"avsDirectory": "0x50EEf481cae4250d252Ae577A09bF514f224C6C4",
7+
"avsDirectoryImplementation": "0x8B71b41D4dBEb2b6821d44692d3fACAAf77480Bb",
8+
"baseStrategyImplementation": "0x29C66C9208f106f34754814f488FA80b6d566790",
9+
"delegationManager": "0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3",
10+
"delegationManagerImplementation": "0x4C52a6277b1B84121b3072C0c92b6Be0b7CC10F1",
11+
"eigenLayerPauserReg": "0x90193C961A926261B756D1E5bb255e67ff9498A1",
12+
"eigenLayerProxyAdmin": "0x34A1D3fff3958843C43aD80F30b94c510645C316",
13+
"eigenPodBeacon": "0xd21060559c9beb54fC07aFd6151aDf6cFCDDCAeB",
14+
"eigenPodImplementation": "0x416C42991d05b31E9A6dC209e91AD22b79D87Ae6",
15+
"eigenPodManager": "0x62c20Aa1e0272312BC100b4e23B4DC1Ed96dD7D1",
16+
"eigenPodManagerImplementation": "0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4",
17+
"emptyContract": "0xA8452Ec99ce0C64f20701dB7dD3abDb607c00496",
18+
"numStrategiesDeployed": 0,
19+
"permissionController": "0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351",
20+
"permissionControllerImplementation": "0xDeF3bca8c80064589E6787477FFa7Dd616B5574F",
21+
"rewardsCoordinator": "0xDEb1E9a6Be7Baf84208BB6E10aC9F9bbE1D70809",
22+
"rewardsCoordinatorImplementation": "0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6",
23+
"strategies": {
24+
"WETH": "0xC92B57772d68b7445F19ef9f08226f4C8C74E499"
25+
},
26+
"strategy": "0xC92B57772d68b7445F19ef9f08226f4C8C74E499",
27+
"strategyManager": "0xDB8cFf278adCCF9E9b5da745B44E754fC4EE3C76",
28+
"strategyManagerImplementation": "0x978e3286EB805934215a88694d80b09aDed68D90",
3129
"token": {
3230
"tokenProxyAdmin": "0x0000000000000000000000000000000000000000",
3331
"EIGEN": "0x0000000000000000000000000000000000000000",
@@ -39,14 +37,14 @@
3937
}
4038
},
4139
"chainInfo": {
42-
"chainId": 17000,
43-
"deploymentBlock": 2548240
40+
"chainId": 31337,
41+
"deploymentBlock": 1
4442
},
4543
"parameters": {
46-
"communityMultisig": "0xBB37b72F67A410B76Ce9b9aF9e37aa561B1C5B07",
47-
"executorMultisig": "0xBB37b72F67A410B76Ce9b9aF9e37aa561B1C5B07",
48-
"operationsMultisig": "0xBB37b72F67A410B76Ce9b9aF9e37aa561B1C5B07",
49-
"pauserMultisig": "0xBB37b72F67A410B76Ce9b9aF9e37aa561B1C5B07",
44+
"communityMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
45+
"executorMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
46+
"operationsMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
47+
"pauserMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
5048
"timelock": "0x0000000000000000000000000000000000000000"
5149
}
5250
}

‎script/releases/Env.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ import "src/contracts/core/AllocationManager.sol";
1212
import "src/contracts/core/AVSDirectory.sol";
1313
import "src/contracts/core/DelegationManager.sol";
1414
import "src/contracts/core/RewardsCoordinator.sol";
15-
import "src/contracts/interfaces/IRewardsCoordinator.sol";
15+
1616
import "src/contracts/core/StrategyManager.sol";
17+
import "src/contracts/interfaces/IRewardsCoordinator.sol";
1718

1819
/// permissions/
1920
import "src/contracts/permissions/PauserRegistry.sol";

‎script/releases/v1.4.0-slashing/1-deployContracts.s.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity ^0.8.12;
33

4-
import {EOADeployer} from "zeus-templates/templates/EOADeployer.sol";
54
import "../Env.sol";
5+
import {EOADeployer} from "zeus-templates/templates/EOADeployer.sol";
66

7-
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
87
import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
8+
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
99
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1010

1111
/**

‎script/releases/v1.4.0-slashing/2-queueUpgrade.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity ^0.8.12;
33

4-
import {Deploy} from "./1-deployContracts.s.sol";
54
import "../Env.sol";
5+
import {Deploy} from "./1-deployContracts.s.sol";
66

77
import {MultisigBuilder} from "zeus-templates/templates/MultisigBuilder.sol";
88
import "zeus-templates/utils/Encode.sol";

‎script/releases/v1.4.0-slashing/3-execute.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ pragma solidity ^0.8.12;
44
import "../Env.sol";
55
import {QueueUpgrade} from "./2-queueUpgrade.s.sol";
66

7-
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
87
import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
8+
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
99

1010
contract Execute is QueueUpgrade {
1111
using Env for *;

‎src/test/integration/TypeImporter.t.sol renamed to ‎src/contracts/interfaces/ICore.sol

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,10 @@ import "src/contracts/interfaces/IStrategyManager.sol";
1515
/// `AllocateParams memory params;`
1616
/// vs
1717
/// `IAllocationManagerTypes.AllocateParams memory params;`
18-
interface TypeImporter is IAllocationManagerTypes, IAVSDirectoryTypes, IDelegationManagerTypes, IEigenPodManagerTypes, IEigenPodTypes {}
18+
interface ICoreTypes is
19+
IAllocationManagerTypes,
20+
IAVSDirectoryTypes,
21+
IDelegationManagerTypes,
22+
IEigenPodManagerTypes,
23+
IEigenPodTypes
24+
{}

0 commit comments

Comments
 (0)