Solid IStakingModule interface

contracts/0.4.24/Lido.sol

@@ -628,16 +628,16 @@ contract Lido is Versioned, StETHPermit, AragonApp {
             uint256 unaccountedEth = _getUnaccountedEther();
             /// @dev transfer ether to SR and make deposit at the same time
             /// @notice allow zero value of depositableEth, in this case SR will simply transfer the unaccounted ether to Lido contract
-            uint256 depositedKeysCount = IStakingRouter(locator.stakingRouter()).deposit.value(depositableEth)(
+            uint256 depositsCount = IStakingRouter(locator.stakingRouter()).deposit.value(depositableEth)(
                 _maxDepositsCount,
                 _stakingModuleId,
                 _depositCalldata
             );
-            assert(depositedKeysCount <= depositableEth / DEPOSIT_SIZE );
+            assert(depositsCount <= depositableEth / DEPOSIT_SIZE );
 
-            if (depositedKeysCount > 0) {
-                uint256 depositedAmount = depositedKeysCount.mul(DEPOSIT_SIZE);
-                DEPOSITED_VALIDATORS_POSITION.setStorageUint256(DEPOSITED_VALIDATORS_POSITION.getStorageUint256().add(depositedKeysCount));
+            if (depositsCount > 0) {
+                uint256 depositedAmount = depositsCount.mul(DEPOSIT_SIZE);
+                DEPOSITED_VALIDATORS_POSITION.setStorageUint256(DEPOSITED_VALIDATORS_POSITION.getStorageUint256().add(depositsCount));
 
                 _markAsUnbuffered(depositedAmount);
                 assert(_getUnaccountedEther() == unaccountedEth);

contracts/0.4.24/test_helpers/NodeOperatorsRegistryMock.sol

@@ -152,12 +152,11 @@ contract NodeOperatorsRegistryMock is NodeOperatorsRegistry {
         return _getSigningKeysAllocationData(_keysCount);
     }
 
-    function testing_requestValidatorsKeysForDeposits(uint256 _keysToAllocate)
+    function testing_obtainDepositData(uint256 _keysToAllocate)
         external
         returns (uint256 loadedValidatorsKeysCount, bytes memory publicKeys, bytes memory signatures)
     {
-        (loadedValidatorsKeysCount, publicKeys, signatures) =
-            this.requestValidatorsKeysForDeposits(_keysToAllocate, new bytes(0));
+        (loadedValidatorsKeysCount, publicKeys, signatures) = this.obtainDepositData(_keysToAllocate, new bytes(0));
         emit ValidatorsKeysLoaded(loadedValidatorsKeysCount, publicKeys, signatures);
     }
 

contracts/0.8.9/DepositSecurityModule.sol

@@ -23,7 +23,7 @@ interface IStakingRouter {
     function resumeStakingModule(uint256 _stakingModuleId) external;
     function getStakingModuleIsDepositsPaused(uint256 _stakingModuleId) external view returns (bool);
     function getStakingModuleIsActive(uint256 _stakingModuleId) external view returns (bool);
-    function getStakingModuleKeysOpIndex(uint256 _stakingModuleId) external view returns (uint256);
+    function getStakingModuleNonce(uint256 _stakingModuleId) external view returns (uint256);
     function getStakingModuleLastDepositBlock(uint256 _stakingModuleId) external view returns (uint256);
 }
 
@@ -199,7 +199,7 @@ contract DepositSecurityModule {
     }
 
     /**
-     * Returns number of valid guardian signatures required to vet (depositRoot, keysOpIndex) pair.
+     * Returns number of valid guardian signatures required to vet (depositRoot, nonce) pair.
      */
     function getGuardianQuorum() external view returns (uint256) {
         return quorum;
@@ -364,7 +364,7 @@ contract DepositSecurityModule {
 
     /**
      * Returns whether LIDO.deposit() can be called, given that the caller will provide
-     * guardian attestations of non-stale deposit root and `keysOpIndex`, and the number of
+     * guardian attestations of non-stale deposit root and `nonce`, and the number of
      * such attestations will be enough to reach quorum.
      */
     function canDeposit(uint256 stakingModuleId) external view validStakingModuleId(stakingModuleId) returns (bool) {
@@ -378,7 +378,7 @@ contract DepositSecurityModule {
      *
      * Reverts if any of the following is true:
      *   1. IDepositContract.get_deposit_root() != depositRoot.
-     *   2. StakingModule.getKeysOpIndex() != keysOpIndex.
+     *   2. StakingModule.getNonce() != nonce.
      *   3. The number of guardian signatures is less than getGuardianQuorum().
      *   4. An invalid or non-guardian signature received.
      *   5. block.number - StakingModule.getLastDepositBlock() < minDepositBlockDistance.
@@ -387,14 +387,14 @@ contract DepositSecurityModule {
      * Signatures must be sorted in ascending order by index of the guardian. Each signature must
      * be produced for keccak256 hash of the following message (each component taking 32 bytes):
      *
-     * | ATTEST_MESSAGE_PREFIX | blockNumber | blockHash | depositRoot | stakingModuleId | keysOpIndex |
+     * | ATTEST_MESSAGE_PREFIX | blockNumber | blockHash | depositRoot | stakingModuleId | nonce |
      */
     function depositBufferedEther(
         uint256 blockNumber,
         bytes32 blockHash,
         bytes32 depositRoot,
         uint256 stakingModuleId,
-        uint256 keysOpIndex,
+        uint256 nonce,
         bytes calldata depositCalldata,
         Signature[] calldata sortedGuardianSignatures
     ) external validStakingModuleId(stakingModuleId) {
@@ -409,10 +409,10 @@ contract DepositSecurityModule {
         require(block.number - lastDepositBlock >= minDepositBlockDistance, "too frequent deposits");
         require(blockHash != bytes32(0) && blockhash(blockNumber) == blockHash, "unexpected block hash");
 
-        uint256 onchainKeysOpIndex = STAKING_ROUTER.getStakingModuleKeysOpIndex(stakingModuleId);
-        require(keysOpIndex == onchainKeysOpIndex, "keys op index changed");
+        uint256 onchainNonce = STAKING_ROUTER.getStakingModuleNonce(stakingModuleId);
+        require(nonce == onchainNonce, "nonce changed");
 
-        _verifySignatures(depositRoot, blockNumber, blockHash, stakingModuleId, keysOpIndex, sortedGuardianSignatures);
+        _verifySignatures(depositRoot, blockNumber, blockHash, stakingModuleId, nonce, sortedGuardianSignatures);
 
         LIDO.deposit(maxDepositsPerBlock, stakingModuleId, depositCalldata);
     }
@@ -422,11 +422,11 @@ contract DepositSecurityModule {
         uint256 blockNumber,
         bytes32 blockHash,
         uint256 stakingModuleId,
-        uint256 keysOpIndex,
+        uint256 nonce,
         Signature[] memory sigs
     ) internal view {
         bytes32 msgHash = keccak256(
-            abi.encodePacked(ATTEST_MESSAGE_PREFIX, blockNumber, blockHash, depositRoot, stakingModuleId, keysOpIndex)
+            abi.encodePacked(ATTEST_MESSAGE_PREFIX, blockNumber, blockHash, depositRoot, stakingModuleId, nonce)
         );
 
         address prevSignerAddr = address(0);