Skip to content

Commit 58c1bb9

Browse files
0xClandestinebowenli86
0xClandestine
authored and
bowenli86
committed
refactor: remove v prefix from SemVerMixin (#1385)
**Motivation:** Slashing was deployed with using a `v` prefix, thus we're simply going to drop the prefix moving forward. **Modifications:** Prefix removed, and tests updated. **Result:** SemVerMixin no longer requires a `v` prefix.
1 parent bc58113 commit 58c1bb9

23 files changed

+48
-48
lines changed

‎src/contracts/interfaces/IRewardsCoordinator.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ interface IRewardsCoordinatorTypes {
258258
* @param MAX_RETROACTIVE_LENGTH The maximum retroactive length of a rewards submission
259259
* @param MAX_FUTURE_LENGTH The maximum future length of a rewards submission
260260
* @param GENESIS_REWARDS_TIMESTAMP The timestamp at which rewards are first calculated
261-
* @param version The semantic version of the contract (e.g. "v1.2.3")
261+
* @param version The semantic version of the contract (e.g. "1.2.3")
262262
* @dev Needed to avoid stack-too-deep errors
263263
*/
264264
struct RewardsCoordinatorConstructorParams {

‎src/contracts/interfaces/ISemVerMixin.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ pragma solidity ^0.8.0;
66
/// @dev Follows SemVer 2.0.0 specification (https://semver.org/)
77
interface ISemVerMixin {
88
/// @notice Returns the semantic version string of the contract.
9-
/// @return The version string in SemVer format (e.g., "v1.1.1")
9+
/// @return The version string in SemVer format (e.g., "1.1.1")
1010
function version() external view returns (string memory);
1111
}

‎src/contracts/mixins/SemVerMixin.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ abstract contract SemVerMixin is ISemVerMixin {
1111
using ShortStringsUpgradeable for *;
1212

1313
/// @notice The semantic version string for this contract, stored as a ShortString for gas efficiency.
14-
/// @dev Follows SemVer 2.0.0 specification (https://semver.org/). Prefixed with 'v' (e.g., "v1.2.3").
14+
/// @dev Follows SemVer 2.0.0 specification (https://semver.org/).
1515
ShortString internal immutable _VERSION;
1616

1717
/// @notice Initializes the contract with a semantic version string.
18-
/// @param _version The SemVer-formatted version string (e.g., "v1.2.3")
19-
/// @dev Version should follow SemVer 2.0.0 format with 'v' prefix: vMAJOR.MINOR.PATCH
18+
/// @param _version The SemVer-formatted version string (e.g., "1.2.3")
19+
/// @dev Version should follow SemVer 2.0.0 format: MAJOR.MINOR.PATCH
2020
constructor(
2121
string memory _version
2222
) {
@@ -29,10 +29,10 @@ abstract contract SemVerMixin is ISemVerMixin {
2929
}
3030

3131
/// @notice Returns the major version of the contract.
32-
/// @dev Supports single digit major versions (e.g., "v1" for version "v1.2.3")
33-
/// @return The major version string (e.g., "v1" for version "v1.2.3")
32+
/// @dev Supports single digit major versions (e.g., "1" for version "1.2.3")
33+
/// @return The major version string (e.g., "1" for version "1.2.3")
3434
function _majorVersion() internal view returns (string memory) {
3535
bytes memory v = bytes(_VERSION.toString());
36-
return string(bytes.concat(v[0], v[1]));
36+
return string(abi.encodePacked(v[0]));
3737
}
3838
}

‎src/contracts/mixins/SignatureUtilsMixin.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ abstract contract SignatureUtilsMixin is ISignatureUtilsMixin, SemVerMixin {
2121
using SignatureCheckerUpgradeable for address;
2222

2323
/// @notice Initializes the contract with a semantic version string.
24-
/// @param _version The SemVer-formatted version string (e.g., "v1.1.1") to use for this contract's domain separator.
24+
/// @param _version The SemVer-formatted version string (e.g., "1.1.1") to use for this contract's domain separator.
2525
/// @dev Version should follow SemVer 2.0.0 format with 'v' prefix: vMAJOR.MINOR.PATCH.
2626
/// Only the major version component is used in the domain separator to maintain signature compatibility
2727
/// across minor and patch version updates.

‎src/test/harnesses/AllocationManagerHarness.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ contract AllocationManagerHarness is AllocationManager {
1313
uint32 _DEALLOCATION_DELAY,
1414
uint32 _ALLOCATION_CONFIGURATION_DELAY
1515
)
16-
AllocationManager(_delegation, _pauserRegistry, _permissionController, _DEALLOCATION_DELAY, _ALLOCATION_CONFIGURATION_DELAY, "v9.9.9")
16+
AllocationManager(_delegation, _pauserRegistry, _permissionController, _DEALLOCATION_DELAY, _ALLOCATION_CONFIGURATION_DELAY, "9.9.9")
1717
{}
1818

1919
function deallocationQueueAtIndex(address operator, IStrategy strategy, uint index) external view returns (bytes32) {

‎src/test/harnesses/DelegationManagerHarness.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ contract DelegationManagerHarness is DelegationManager {
2020
_pauserRegistry,
2121
_permissionController,
2222
_MIN_WITHDRAWAL_DELAY,
23-
"v9.9.9"
23+
"9.9.9"
2424
)
2525
{}
2626

‎src/test/integration/IntegrationDeployer.t.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
4141
bool isUpgraded;
4242
uint mainnetForkBlock = 21_616_692; // Post Protocol Council upgrade
4343

44-
string version = "v9.9.9";
44+
string version = "9.9.9";
4545

4646
// Beacon chain genesis time when running locally
4747
// Multiple of 12 for sanity's sake
@@ -352,14 +352,14 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
352352
);
353353
avsDirectoryImplementation = new AVSDirectory(delegationManager, eigenLayerPauserReg, version);
354354
eigenPodManagerImplementation =
355-
new EigenPodManager(DEPOSIT_CONTRACT, eigenPodBeacon, delegationManager, eigenLayerPauserReg, "v9.9.9");
356-
strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg, "v9.9.9");
355+
new EigenPodManager(DEPOSIT_CONTRACT, eigenPodBeacon, delegationManager, eigenLayerPauserReg, "9.9.9");
356+
strategyFactoryImplementation = new StrategyFactory(strategyManager, eigenLayerPauserReg, "9.9.9");
357357
slashingWithdrawalRouterImplementation =
358-
new SlashingWithdrawalRouter(allocationManager, strategyManager, eigenLayerPauserReg, "v9.9.9");
358+
new SlashingWithdrawalRouter(allocationManager, strategyManager, eigenLayerPauserReg, "9.9.9");
359359

360360
// Beacon implementations
361-
eigenPodImplementation = new EigenPod(DEPOSIT_CONTRACT, eigenPodManager, BEACON_GENESIS_TIME, "v9.9.9");
362-
baseStrategyImplementation = new StrategyBase(strategyManager, eigenLayerPauserReg, "v9.9.9");
361+
eigenPodImplementation = new EigenPod(DEPOSIT_CONTRACT, eigenPodManager, BEACON_GENESIS_TIME, "9.9.9");
362+
baseStrategyImplementation = new StrategyBase(strategyManager, eigenLayerPauserReg, "9.9.9");
363363

364364
// Pre-longtail StrategyBaseTVLLimits implementation
365365
// TODO - need to update ExistingDeploymentParser

‎src/test/integration/tests/eigenpod/SlashBC_OneBCSF.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ contract Integration_SlashBC_OneBCSF is IntegrationCheckUtils {
3434
function _init() internal override {
3535
// 1. etch a new implementation to set staker's beaconChainSlashingFactor to 1
3636
EigenPodManagerWrapper eigenPodManagerWrapper =
37-
new EigenPodManagerWrapper(DEPOSIT_CONTRACT, eigenPodBeacon, delegationManager, eigenLayerPauserReg, "v9.9.9");
37+
new EigenPodManagerWrapper(DEPOSIT_CONTRACT, eigenPodBeacon, delegationManager, eigenLayerPauserReg, "9.9.9");
3838
address targetAddr = address(eigenPodManagerImplementation);
3939
cheats.etch(targetAddr, address(eigenPodManagerWrapper).code);
4040

‎src/test/mocks/EigenPodMock.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import "../../contracts/interfaces/IEigenPod.sol";
66
import "../../contracts/mixins/SemVerMixin.sol";
77

88
contract EigenPodMock is IEigenPod, SemVerMixin, Test {
9-
constructor() SemVerMixin("v9.9.9") {}
9+
constructor() SemVerMixin("9.9.9") {}
1010

1111
function nonBeaconChainETHBalanceWei() external view returns (uint) {}
1212

‎src/test/unit/AVSDirectoryUnit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ contract AVSDirectoryUnitTests is EigenLayerUnitTestSetup, IAVSDirectoryEvents,
3636
avsd = AVSDirectory(
3737
address(
3838
new TransparentUpgradeableProxy(
39-
address(new AVSDirectory(IDelegationManager(delegationManager), pauserRegistry, "v9.9.9")),
39+
address(new AVSDirectory(IDelegationManager(delegationManager), pauserRegistry, "9.9.9")),
4040
address(eigenLayerProxyAdmin),
4141
abi.encodeWithSelector(
4242
AVSDirectory.initialize.selector,
@@ -51,7 +51,7 @@ contract AVSDirectoryUnitTests is EigenLayerUnitTestSetup, IAVSDirectoryEvents,
5151
bytes memory v = bytes(avsd.version());
5252
bytes32 expectedDomainSeparator = keccak256(
5353
abi.encode(
54-
EIP712_DOMAIN_TYPEHASH, keccak256(bytes("EigenLayer")), keccak256(bytes.concat(v[0], v[1])), block.chainid, address(avsd)
54+
EIP712_DOMAIN_TYPEHASH, keccak256(bytes("EigenLayer")), keccak256(abi.encodePacked(v[0])), block.chainid, address(avsd)
5555
)
5656
);
5757

‎src/test/unit/AllocationManagerUnit.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ contract AllocationManagerUnitTests is EigenLayerUnitTestSetup, IAllocationManag
6464
strategyMock = StrategyBase(
6565
address(
6666
new TransparentUpgradeableProxy(
67-
address(new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "v9.9.9")),
67+
address(new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "9.9.9")),
6868
address(eigenLayerProxyAdmin),
6969
abi.encodeWithSelector(StrategyBase.initialize.selector, tokenMock)
7070
)

‎src/test/unit/DelegationUnit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ contract DelegationManagerUnitTests is EigenLayerUnitTestSetup, IDelegationManag
113113

114114
// Deploy mock token and strategy
115115
tokenMock = new ERC20PresetFixedSupply("Mock Token", "MOCK", tokenMockInitialSupply, address(this));
116-
strategyImplementation = new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "v9.9.9");
116+
strategyImplementation = new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "9.9.9");
117117
strategyMock = StrategyBase(
118118
address(
119119
new TransparentUpgradeableProxy(
@@ -1160,7 +1160,7 @@ contract DelegationManagerUnitTests_Initialization_Setters is DelegationManagerU
11601160
abi.encode(
11611161
EIP712_DOMAIN_TYPEHASH,
11621162
keccak256(bytes("EigenLayer")),
1163-
keccak256(bytes.concat(v[0], v[1])),
1163+
keccak256(abi.encodePacked(v[0])),
11641164
block.chainid,
11651165
address(delegationManager)
11661166
)

‎src/test/unit/EigenPodManagerUnit.t.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ contract EigenPodManagerUnitTests is EigenLayerUnitTestSetup, IEigenPodManagerEv
4343

4444
// Deploy EPM Implementation & Proxy
4545
eigenPodManagerImplementation =
46-
new EigenPodManager(ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "v9.9.9");
46+
new EigenPodManager(ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "9.9.9");
4747
eigenPodManager = EigenPodManager(
4848
address(
4949
new TransparentUpgradeableProxy(
@@ -234,7 +234,7 @@ contract EigenPodManagerUnitTests_ShareUpdateTests is EigenPodManagerUnitTests {
234234

235235
// Upgrade eigenPodManager to wrapper
236236
eigenPodManagerWrapper = new EigenPodManagerWrapper(
237-
ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "v9.9.9"
237+
ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "9.9.9"
238238
);
239239
eigenLayerProxyAdmin.upgrade(ITransparentUpgradeableProxy(payable(address(eigenPodManager))), address(eigenPodManagerWrapper));
240240
}
@@ -425,7 +425,7 @@ contract EigenPodManagerUnitTests_WithdrawSharesAsTokensTests is EigenPodManager
425425

426426
// Upgrade eigenPodManager to wrapper
427427
eigenPodManagerWrapper = new EigenPodManagerWrapper(
428-
ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "v9.9.9"
428+
ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "9.9.9"
429429
);
430430
eigenLayerProxyAdmin.upgrade(ITransparentUpgradeableProxy(payable(address(eigenPodManager))), address(eigenPodManagerWrapper));
431431
}
@@ -546,7 +546,7 @@ contract EigenPodManagerUnitTests_BeaconChainETHBalanceUpdateTests is EigenPodMa
546546

547547
// Upgrade eigenPodManager to wrapper
548548
eigenPodManagerWrapper = new EigenPodManagerWrapper(
549-
ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "v9.9.9"
549+
ethPOSMock, eigenPodBeacon, IDelegationManager(address(delegationManagerMock)), pauserRegistry, "9.9.9"
550550
);
551551
eigenLayerProxyAdmin.upgrade(ITransparentUpgradeableProxy(payable(address(eigenPodManager))), address(eigenPodManagerWrapper));
552552
}

‎src/test/unit/EigenPodUnit.t.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ contract EigenPodUnitTests is EigenLayerUnitTestSetup, EigenPodPausingConstants,
5858
beaconChain = new BeaconChainMock(EigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL);
5959

6060
// Deploy EigenPod
61-
podImplementation = new EigenPod(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "v9.9.9");
61+
podImplementation = new EigenPod(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "9.9.9");
6262

6363
// Deploy Beacon
6464
eigenPodBeacon = new UpgradeableBeacon(address(podImplementation));
@@ -302,7 +302,7 @@ contract EigenPodUnitTests is EigenLayerUnitTestSetup, EigenPodPausingConstants,
302302

303303
contract EigenPodUnitTests_Initialization is EigenPodUnitTests {
304304
function test_constructor() public {
305-
EigenPod pod = new EigenPod(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "v9.9.9");
305+
EigenPod pod = new EigenPod(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "9.9.9");
306306

307307
assertTrue(pod.ethPOS() == ethPOSDepositMock, "should have set ethPOS correctly");
308308
assertTrue(address(pod.eigenPodManager()) == address(eigenPodManagerMock), "should have set eigenpodmanager correctly");
@@ -330,7 +330,7 @@ contract EigenPodUnitTests_Initialization is EigenPodUnitTests {
330330
}
331331

332332
function test_initialize_revert_emptyPodOwner() public {
333-
EigenPod pod = new EigenPod(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "v9.9.9");
333+
EigenPod pod = new EigenPod(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "9.9.9");
334334
// un-initialize pod
335335
cheats.store(address(pod), 0, 0);
336336

@@ -1711,7 +1711,7 @@ contract EigenPodHarnessSetup is EigenPodUnitTests {
17111711

17121712
// Deploy EP Harness
17131713
eigenPodHarnessImplementation =
1714-
new EigenPodHarness(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "v9.9.9");
1714+
new EigenPodHarness(ethPOSDepositMock, IEigenPodManager(address(eigenPodManagerMock)), GENESIS_TIME_LOCAL, "9.9.9");
17151715

17161716
// Upgrade eigenPod to harness
17171717
UpgradeableBeacon(address(eigenPodBeacon)).upgradeTo(address(eigenPodHarnessImplementation));

‎src/test/unit/RewardsCoordinatorUnit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ contract RewardsCoordinatorUnitTests is EigenLayerUnitTestSetup, IRewardsCoordin
119119
MAX_RETROACTIVE_LENGTH: MAX_RETROACTIVE_LENGTH,
120120
MAX_FUTURE_LENGTH: MAX_FUTURE_LENGTH,
121121
GENESIS_REWARDS_TIMESTAMP: GENESIS_REWARDS_TIMESTAMP,
122-
version: "v9.9.9"
122+
version: "9.9.9"
123123
})
124124
);
125125

@@ -145,7 +145,7 @@ contract RewardsCoordinatorUnitTests is EigenLayerUnitTestSetup, IRewardsCoordin
145145
token2 = new ERC20PresetFixedSupply("jeo boden", "MOCK2", mockTokenInitialSupply, address(this));
146146
token3 = new ERC20PresetFixedSupply("pepe wif avs", "MOCK3", mockTokenInitialSupply, address(this));
147147

148-
strategyImplementation = new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "v9.9.9");
148+
strategyImplementation = new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "9.9.9");
149149
strategyMock1 = StrategyBase(
150150
address(
151151
new TransparentUpgradeableProxy(

‎src/test/unit/SlashingWithdrawalRouterStorageUnit.t.sol renamed to ‎src/test/unit/SlashingWithdrawalRouterUnit.t.sol

File renamed without changes.

‎src/test/unit/StrategyBaseTVLLimitsUnit.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ contract StrategyBaseTVLLimitsUnitTests is StrategyBaseUnitTests {
2424
StrategyBaseUnitTests.setUp();
2525

2626
// depoloy the TVL-limited strategy
27-
strategyBaseTVLLimitsImplementation = new StrategyBaseTVLLimits(strategyManager, pauserRegistry, "v9.9.9");
27+
strategyBaseTVLLimitsImplementation = new StrategyBaseTVLLimits(strategyManager, pauserRegistry, "9.9.9");
2828
strategyWithTVLLimits = StrategyBaseTVLLimits(
2929
address(
3030
new TransparentUpgradeableProxy(

‎src/test/unit/StrategyBaseUnit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ contract StrategyBaseUnitTests is Test {
5555

5656
underlyingToken = new ERC20PresetFixedSupply("Test Token", "TEST", initialSupply, initialOwner);
5757

58-
strategyImplementation = new StrategyBase(strategyManager, pauserRegistry, "v9.9.9");
58+
strategyImplementation = new StrategyBase(strategyManager, pauserRegistry, "9.9.9");
5959

6060
strategy = StrategyBase(
6161
address(
@@ -160,7 +160,7 @@ contract StrategyBaseUnitTests is Test {
160160
// Deploy token with 1e39 total supply
161161
underlyingToken = new ERC20PresetFixedSupply("Test Token", "TEST", 1e39, initialOwner);
162162

163-
strategyImplementation = new StrategyBase(strategyManager, pauserRegistry, "v9.9.9");
163+
strategyImplementation = new StrategyBase(strategyManager, pauserRegistry, "9.9.9");
164164

165165
strategy = StrategyBase(
166166
address(

‎src/test/unit/StrategyFactoryUnit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ contract StrategyFactoryUnitTests is EigenLayerUnitTestSetup {
4646

4747
underlyingToken = new ERC20PresetFixedSupply("Test Token", "TEST", initialSupply, initialOwner);
4848

49-
strategyImplementation = new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "v9.9.9");
49+
strategyImplementation = new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "9.9.9");
5050

5151
strategyBeacon = new UpgradeableBeacon(address(strategyImplementation));
5252
strategyBeacon.transferOwnership(beaconProxyOwner);
5353

54-
strategyFactoryImplementation = new StrategyFactory(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "v9.9.9");
54+
strategyFactoryImplementation = new StrategyFactory(IStrategyManager(address(strategyManagerMock)), pauserRegistry, "9.9.9");
5555

5656
strategyFactory = StrategyFactory(
5757
address(

‎src/test/unit/StrategyManagerUnit.t.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ contract StrategyManagerUnitTests is EigenLayerUnitTestSetup, IStrategyManagerEv
4646
IDelegationManager(address(delegationManagerMock)),
4747
ISlashingWithdrawalRouter(address(slashingWithdrawalRouterMock)),
4848
pauserRegistry,
49-
"v9.9.9"
49+
"9.9.9"
5050
);
5151
strategyManager = StrategyManager(
5252
address(
@@ -84,7 +84,7 @@ contract StrategyManagerUnitTests is EigenLayerUnitTestSetup, IStrategyManagerEv
8484
public
8585
returns (StrategyBase)
8686
{
87-
StrategyBase newStrategyImplementation = new StrategyBase(_strategyManager, _pauserRegistry, "v9.9.9");
87+
StrategyBase newStrategyImplementation = new StrategyBase(_strategyManager, _pauserRegistry, "9.9.9");
8888
StrategyBase newStrategy =
8989
StrategyBase(address(new TransparentUpgradeableProxy(address(newStrategyImplementation), address(admin), "")));
9090
newStrategy.initialize(_token);
@@ -243,7 +243,7 @@ contract StrategyManagerUnitTests_initialize is StrategyManagerUnitTests {
243243
abi.encode(
244244
EIP712_DOMAIN_TYPEHASH,
245245
keccak256(bytes("EigenLayer")),
246-
keccak256(bytes(bytes.concat(v[0], v[1]))),
246+
keccak256(abi.encodePacked(v[0])),
247247
block.chainid,
248248
address(strategyManager)
249249
)

‎src/test/unit/mixins/SemVerMixin.t.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ contract SemVerMixinTest is Test {
1818
SemVerMixinMock public semVer;
1919

2020
function test_version_returnsCorrectVersion() public {
21-
semVer = new SemVerMixinMock("v1.2.3");
22-
assertEq(semVer.version(), "v1.2.3");
21+
semVer = new SemVerMixinMock("1.2.3");
22+
assertEq(semVer.version(), "1.2.3");
2323
}
2424

2525
function test_majorVersion_returnsCorrectMajorVersion() public {
26-
semVer = new SemVerMixinMock("v1.2.3");
27-
assertEq(semVer.majorVersion(), "v1");
26+
semVer = new SemVerMixinMock("1.2.3");
27+
assertEq(semVer.majorVersion(), "1");
2828
}
2929
}

‎src/test/unit/mixins/SignatureUtilsUnit.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ contract MockSigner {
1616
}
1717
}
1818

19-
contract SignatureUtilsMixinUnit is Test, SignatureUtilsMixin("v0.0.0") {
19+
contract SignatureUtilsMixinUnit is Test, SignatureUtilsMixin("9.9.9") {
2020
uint signerPk;
2121
address signer;
2222
bytes32 hash;

0 commit comments

Comments
 (0)