Skip to content

srV3 deposits without valmart #1522

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

Open
wants to merge 3 commits into
base: feat/staking-router-3.0
Choose a base branch
from
Open

srV3 deposits without valmart #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17a4e72
fix: srV3 deposits without valmart
Amuhar Oct 22, 2025
a1ec818
Merge branch 'feat/staking-router-3.0' into feat/sr-3.0-without-valmart
Amuhar Oct 23, 2025
493cd32
fix: consolidation roles in upgrade steps
Amuhar Oct 24, 2025
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
7 changes: 5 additions & 2 deletions contracts/0.8.25/sr/SRLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ library SRLib {
depositTargetShare: smOld.stakeShareLimit,
withdrawalProtectShare: smOld.priorityExitShareThreshold,
status: StakingModuleStatus(smOld.status),
moduleType: StakingModuleType.Legacy
moduleType: StakingModuleType.Legacy,
withdrawalCredentialsType: SRUtils.WC_TYPE_01
})
);

Expand Down Expand Up @@ -283,6 +284,7 @@ library SRLib {
SRUtils._validateModuleName(_moduleName);
SRUtils._validateModulesCount();
SRUtils._validateModuleType(_moduleConfig.moduleType);
SRUtils._validateWithdrawalCredentialsType(_moduleConfig.withdrawalCredentialsType);

// Check for duplicate module address
/// @dev due to small number of modules, we can afford to do this check on add
Expand All @@ -301,6 +303,7 @@ library SRLib {
moduleState.config.moduleAddress = _moduleAddress;
moduleState.config.status = StakingModuleStatus.Active;
moduleState.config.moduleType = StakingModuleType(_moduleConfig.moduleType);
moduleState.config.withdrawalCredentialsType = uint8(_moduleConfig.withdrawalCredentialsType);

moduleState.name = _moduleName;

Expand Down Expand Up @@ -384,7 +387,7 @@ library SRLib {
if (_getCapacity && stateConfig.status == StakingModuleStatus.Active) {
// todo rethink getting capacity for new modules (maybe some additional limits will be applied)
(,, uint256 depositableValidatorsCount) = _moduleId.getIStakingModule().getStakingModuleSummary();
capacity = SRUtils._getModuleCapacity(stateConfig.moduleType, depositableValidatorsCount);
capacity = SRUtils._getModuleCapacity(stateConfig.withdrawalCredentialsType, depositableValidatorsCount);
}
// else capacity = 0
}
Expand Down
11 changes: 8 additions & 3 deletions contracts/0.8.25/sr/SRTypes.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ enum StakingModuleStatus {
}

/// @dev Type identifier for modules
/// For simplicity, only one deposit type is allowed per module.
/// Legacy - keys count-based accounting, old IStakingModule, WC type 0x01
/// New - balance-based accounting, new IStakingModuleV2, WC type 0x02
/// Identify module accounting algorithm
/// Legacy
/// New
enum StakingModuleType {
Legacy,
New
Expand Down Expand Up @@ -68,6 +68,8 @@ struct StakingModuleConfig {
/// @dev 0 = Legacy, 0x01 withdrawals, 1 = New, 0x02 withdrawals.
/// @dev See {StakingModuleType} enum.
uint256 moduleType;
/// @notice The type of withdrawal credentials for creation of validators
uint256 withdrawalCredentialsType;
}

/// @dev old data struct, kept for backward compatibility
Expand Down Expand Up @@ -106,6 +108,7 @@ struct StakingModule {
/// @dev Must be harmonized with `OracleReportSanityChecker.appearedValidatorsPerDayLimit`.
/// See docs for the `OracleReportSanityChecker.setAppearedValidatorsPerDayLimit` function).
uint64 minDepositBlockDistance;
/// TODO: we dont need moduleType in this release
/// @notice The type of staking module (Legacy/Standard), defines the module interface and withdrawal credentials type.
/// @dev 0 = Legacy, 0x01 withdrawals, 1 = New, 0x02 withdrawals.
/// @dev See {StakingModuleType} enum.
Expand All @@ -131,6 +134,8 @@ struct ModuleStateConfig {
StakingModuleStatus status;
/// @notice Staking module type (Legacy/Standard)
StakingModuleType moduleType;
/// @notice The type of withdrawal credentials for creation of validators
uint8 withdrawalCredentialsType;
}
// /// @notice The type of withdrawal credentials for creation of validators
// uint8 wcType;
Expand Down
34 changes: 14 additions & 20 deletions contracts/0.8.25/sr/SRUtils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ library SRUtils {
error StakingModuleWrongName();
error StakingModuleUnregistered();
error InvalidStakingModuleType();
error InvalidWithdrawalCredentialsType();
error InvalidPriorityExitShareThreshold();
error InvalidMinDepositBlockDistance();
error InvalidMaxDepositPerBlockValue();
Expand Down Expand Up @@ -83,6 +84,13 @@ library SRUtils {
}
}

function _validateWithdrawalCredentialsType(uint256 v) internal pure{
// allow exactly 1 or 2 (0x01 / 0x02)
if (v != WC_TYPE_01 && v != WC_TYPE_02) {
revert InvalidWithdrawalCredentialsType();
}
}

function _validateModulesCount() internal view {
if (SRStorage.getModulesCount() >= MAX_STAKING_MODULES_COUNT) {
revert StakingModulesLimitExceeded();
Expand All @@ -95,24 +103,10 @@ library SRUtils {
}
}

function _getModuleWCType(StakingModuleType moduleType) internal pure returns (uint8) {
if (moduleType == StakingModuleType.Legacy) {
return WC_TYPE_01;
} else if (moduleType == StakingModuleType.New) {
return WC_TYPE_02;
} else {
revert InvalidStakingModuleType();
}
}

function _getModuleMEB(StakingModuleType moduleType) internal pure returns (uint256) {
if (moduleType == StakingModuleType.Legacy) {
return MAX_EFFECTIVE_BALANCE_WC_TYPE_01;
} else if (moduleType == StakingModuleType.New) {
return MAX_EFFECTIVE_BALANCE_WC_TYPE_02;
} else {
revert InvalidStakingModuleType();
}
function _getModuleMEB(uint8 wcType) internal pure returns (uint256) {
if (wcType == WC_TYPE_01) return MAX_EFFECTIVE_BALANCE_WC_TYPE_01;
if (wcType == WC_TYPE_02) return MAX_EFFECTIVE_BALANCE_WC_TYPE_02;
revert InvalidWithdrawalCredentialsType();
}

function _toE4Precision(uint256 _value, uint256 _precision) internal pure returns (uint16) {
Expand Down Expand Up @@ -157,12 +151,12 @@ library SRUtils {
}

/// @dev calculate module capacity in ETH
function _getModuleCapacity(StakingModuleType moduleType, uint256 availableKeysCount)
function _getModuleCapacity(uint8 wcType, uint256 availableKeysCount)
internal
pure
returns (uint256)
{
return availableKeysCount * _getModuleMEB(moduleType);
return availableKeysCount * _getModuleMEB(wcType);
}

function _toGwei(uint256 amount) internal pure returns (uint96) {
Expand Down
109 changes: 30 additions & 79 deletions contracts/0.8.25/sr/StakingRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ import {AccessControlEnumerableUpgradeable} from
import {BeaconChainDepositor, IDepositContract} from "contracts/0.8.25/lib/BeaconChainDepositor.sol";
import {DepositsTracker} from "contracts/common/lib/DepositsTracker.sol";
import {DepositedState} from "contracts/common/interfaces/DepositedState.sol";
import {DepositsTempStorage} from "contracts/common/lib/DepositsTempStorage.sol";
import {WithdrawalCredentials} from "contracts/common/lib/WithdrawalCredentials.sol";
import {IStakingModule} from "contracts/common/interfaces/IStakingModule.sol";
import {IStakingModuleV2} from "contracts/common/interfaces/IStakingModuleV2.sol";
import {STASStorage} from "contracts/0.8.25/stas/STASTypes.sol";
import {STASCore} from "contracts/0.8.25/stas/STASCore.sol";
import {SRLib} from "./SRLib.sol";
Expand Down Expand Up @@ -73,7 +71,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
uint256 public constant INITIAL_DEPOSIT_SIZE = SRUtils.MAX_EFFECTIVE_BALANCE_WC_TYPE_01;

/// @dev Module trackers will be derived from this position
bytes32 internal constant DEPOSITS_TRACKER = keccak256("lido.StakingRouter.depositTracker");
// bytes32 internal constant DEPOSITS_TRACKER = keccak256("lido.StakingRouter.depositTracker");

/// @dev ACL roles
bytes32 public constant MANAGE_WITHDRAWAL_CREDENTIALS_ROLE = keccak256("MANAGE_WITHDRAWAL_CREDENTIALS_ROLE");
Expand Down Expand Up @@ -104,6 +102,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
error StakingModuleStatusTheSame();
error LegacyStakingModuleNotSupported();
error LegacyStakingModuleRequired();
error WithdrawalCredentials01TypeRequired();

/// @dev compatibility getters for constants removed in favor of SRLib
// function INITIAL_DEPOSIT_SIZE() external pure returns (uint256) {
Expand Down Expand Up @@ -336,6 +335,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
/// @param _operatorIds Ids of the node operators to be updated
/// @param _effectiveBalances Effective balances for the specified operators
/// @dev TODO: add separate role for this function
/// TODO: maybe dont need in first release
function reportStakingModuleOperatorBalances(
uint256 _stakingModuleId,
bytes calldata _operatorIds,
Expand All @@ -347,7 +347,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
if (stateConfig.moduleType != StakingModuleType.New) {
revert LegacyStakingModuleNotSupported();
}

_stakingModuleId.getIStakingModuleV2().updateOperatorBalances(_operatorIds, _effectiveBalances);
}

Expand Down Expand Up @@ -710,7 +710,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
/// @param _stakingModuleId Id of the staking module to be deposited.
/// @return withdrawal credentials: 0x01... - for Legacy modules, 0x02... - for New modules
function getStakingModuleWithdrawalCredentials(uint256 _stakingModuleId) external view returns (bytes32) {
return _getWithdrawalCredentialsWithType(getStakingModuleType(_stakingModuleId));
return _getWithdrawalCredentialsWithType(getStakingModuleWithdrawalCredentialsType(_stakingModuleId));
}

/// @notice Returns the staking module type: Legacy or New, i.e. balance-based (uses 0x02 withdrawal credentials)
Expand All @@ -721,46 +721,44 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
return stateConfig.moduleType;
}

/// @notice Returns the staking module type: Legacy or New, i.e. balance-based (uses 0x02 withdrawal credentials)
/// @param _stakingModuleId Id of the staking module
/// @return Staking module type: 0 - Legacy (WC type 0x01) or 1 - New (WC type 0x02)
function getStakingModuleWithdrawalCredentialsType(uint256 _stakingModuleId) public view returns (uint8) {
(, ModuleStateConfig storage stateConfig) = _validateAndGetModuleState(_stakingModuleId);
return stateConfig.withdrawalCredentialsType;
}

/// @notice Returns the max amount of Eth for initial 32 eth deposits in staking module.
/// @param _stakingModuleId Id of the staking module to be deposited.
/// @param _depositableEth Max amount of ether that might be used for deposits count calculation.
/// @return depositsAmount Max amount of Eth that can be deposited using the given staking module.
/// @return depositsCount Count of deposits corresponding to the deposits amount
function getStakingModuleMaxInitialDepositsAmount(uint256 _stakingModuleId, uint256 _depositableEth)
public
view
returns (uint256 depositsAmount, uint256 depositsCount)
{
(, ModuleStateConfig storage stateConfig) = _validateAndGetModuleState(_stakingModuleId);

// get max eth amount that can be deposited into the module, capped by its capacity (depositable validators count)
// If module is not active, then it capacity is 0, so stakingModuleDepositableEthAmount will be 0.
uint256 stakingModuleDepositableEthAmount = _getTargetDepositAllocation(_stakingModuleId, _depositableEth);

if (stakingModuleDepositableEthAmount == 0) return (0, 0);

if (stateConfig.moduleType == StakingModuleType.New) {
// get operators and their available operatorAllocations for deposits. In general case, not all depositable validators
// will be used for deposits, due to Module can apply its own rules to limit deposits per operator
(uint256[] memory operators, uint256[] memory operatorAllocations) =
IStakingModuleV2(stateConfig.moduleAddress).getAllocation(stakingModuleDepositableEthAmount);

uint256[] memory counts;
(depositsCount, counts) = _getNewDepositsCount02(stakingModuleDepositableEthAmount, operatorAllocations);

// this will be read and clean in deposit method
DepositsTempStorage.storeOperatorCounts(operators, counts);

depositsAmount = _getInitialDepositAmountByCount(depositsCount);
} else if (stateConfig.moduleType == StakingModuleType.Legacy) {
depositsCount = _getInitialDepositCountByAmount(stakingModuleDepositableEthAmount);
depositsAmount = _getInitialDepositAmountByCount(depositsCount);
if (stateConfig.withdrawalCredentialsType == SRUtils.WC_TYPE_01) {
depositsCount = stakingModuleDepositableEthAmount / SRUtils.MAX_EFFECTIVE_BALANCE_WC_TYPE_01;
depositsAmount = _getInitialDepositAmountByCount(depositsCount);
} else if (stateConfig.withdrawalCredentialsType == SRUtils.WC_TYPE_02) {
depositsCount = stakingModuleDepositableEthAmount / SRUtils.MAX_EFFECTIVE_BALANCE_WC_TYPE_02;
depositsAmount = _getInitialDepositAmountByCount(depositsCount);
} else {
revert SRUtils.InvalidStakingModuleType();
revert SRUtils.InvalidWithdrawalCredentialsType();
}
}

/// @notice DEPRECATED: use getStakingModuleMaxInitialDepositsAmount
/// This method only for the legacy modules
/// This method only for the modules with withdrawalCredentialsType 0x01
function getStakingModuleMaxDepositsCount(uint256 _stakingModuleId, uint256 _depositableEth)
external
view
Expand All @@ -769,8 +767,9 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
(, ModuleStateConfig storage stateConfig) = _validateAndGetModuleState(_stakingModuleId);

/// @dev This method is only supported for legacy modules
if (stateConfig.moduleType != StakingModuleType.Legacy) {
revert LegacyStakingModuleRequired();
// TODO: change on withdrawalCredentialsType check
if (stateConfig.withdrawalCredentialsType != SRUtils.WC_TYPE_01) {
revert WithdrawalCredentials01TypeRequired();
}

// If module is not active, then it capacity is 0, so stakingModuleDepositableEthAmount will be 0.
Expand All @@ -780,38 +779,6 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
return _getInitialDepositCountByAmount(stakingModuleDepositableEthAmount);
}

function _getNewDepositsCount02(uint256 moduleMaxAllocation, uint256[] memory operatorAllocations)
internal
pure
returns (uint256 totalCount, uint256[] memory counts)
{
uint256 len = operatorAllocations.length;
counts = new uint256[](len);
unchecked {
for (uint256 i = 0; i < len; ++i) {
uint256 allocation = operatorAllocations[i];

// sum of all `operatorAllocations` items should be <= moduleMaxAllocation
if (allocation > moduleMaxAllocation) {
revert AllocationExceedsTarget();
}

moduleMaxAllocation -= allocation;

if (allocation >= INITIAL_DEPOSIT_SIZE) {
// if allocation is 4000 - 2 (= 2048 (enough for 1st key: initial deposit 32 and rest deposit 2016) + 1952 (enough for 2nd key: initial deposit 32 and rest deposit 1920) )
// if allocation 32 - 1 (enough for initial deposit)
// if less than 32 - 0 (not enough for initial deposit)
// if allocation 2050 - 1 (= 2048 (enough for 1st key: initial deposit 32 and rest deposit 2016) + 2 (not enough even for initial deposit) )
uint256 depositsCount =
1 + (allocation - INITIAL_DEPOSIT_SIZE) / SRUtils.MAX_EFFECTIVE_BALANCE_WC_TYPE_02;
counts[i] = depositsCount;
totalCount += depositsCount;
}
}
}
}

/// @notice Returns the aggregate fee distribution proportion.
/// @return modulesFee Modules aggregate fee in base precision.
/// @return treasuryFee Treasury fee in base precision.
Expand Down Expand Up @@ -977,7 +944,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {

if (stateConfig.status != StakingModuleStatus.Active) revert StakingModuleNotActive();

bytes32 withdrawalCredentials = _getWithdrawalCredentialsWithType(stateConfig.moduleType);
bytes32 withdrawalCredentials = _getWithdrawalCredentialsWithType(stateConfig.withdrawalCredentialsType);

uint256 depositsValue = msg.value;
address stakingModuleAddress = stateConfig.moduleAddress;
Expand All @@ -996,7 +963,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
uint256 depositsCount = _getInitialDepositCountByAmount(depositsValue);

(bytes memory publicKeysBatch, bytes memory signaturesBatch) =
_getOperatorAvailableKeys(stateConfig.moduleType, stakingModuleAddress, depositsCount, _depositCalldata);
IStakingModule(stakingModuleAddress).obtainDepositData(depositsCount, _depositCalldata);

// TODO: maybe some checks of module's answer

Expand All @@ -1019,22 +986,6 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
assert(etherBalanceBeforeDeposits - etherBalanceAfterDeposits == depositsValue);
}

function _getOperatorAvailableKeys(
StakingModuleType moduleType,
address stakingModuleAddress,
uint256 depositsCount,
bytes calldata depositCalldata
) internal returns (bytes memory keys, bytes memory signatures) {
if (moduleType == StakingModuleType.Legacy) {
return IStakingModule(stakingModuleAddress).obtainDepositData(depositsCount, depositCalldata);
} else {
(uint256[] memory operators, uint256[] memory counts) = DepositsTempStorage.getOperatorCounts();
(keys, signatures) = IStakingModuleV2(stakingModuleAddress).getOperatorAvailableKeys(operators, counts);

DepositsTempStorage.clearOperatorCounts();
}
}

/// @notice Set 0x01 credentials to withdraw ETH on Consensus Layer side.
/// @param _withdrawalCredentials 0x01 withdrawal credentials field as defined in the Consensus Layer specs.
/// @dev Note that setWithdrawalCredentials discards all unused deposits data as the signatures are invalidated.
Expand All @@ -1059,10 +1010,10 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
emit WithdrawalCredentialsSet(wc, _msgSender());
}

function _getWithdrawalCredentialsWithType(StakingModuleType moduleType) internal view returns (bytes32) {
function _getWithdrawalCredentialsWithType(uint8 withdrawalCredentialsType) internal view returns (bytes32) {
bytes32 wc = getWithdrawalCredentials();
// if (wc == 0) revert EmptyWithdrawalsCredentials();
return wc.setType(SRUtils._getModuleWCType(moduleType));
return wc.setType(withdrawalCredentialsType);
}

/// @dev Save the last deposit state for the staking module and emit the event
Expand Down Expand Up @@ -1154,7 +1105,7 @@ contract StakingRouter is AccessControlEnumerableUpgradeable {
moduleState.status = uint8(stateConfig.status);
moduleState.priorityExitShareThreshold = stateConfig.withdrawalProtectShare;
moduleState.moduleType = uint8(stateConfig.moduleType);
moduleState.withdrawalCredentialsType = SRUtils._getModuleWCType(stateConfig.moduleType);
moduleState.withdrawalCredentialsType = uint8(stateConfig.withdrawalCredentialsType);

ModuleStateDeposits storage stateDeposits = state.getStateDeposits();
moduleState.lastDepositAt = stateDeposits.lastDepositAt;
Expand Down
Loading
Loading