Skip to content

Commit

Permalink
fix: Rename isSync function
Browse files Browse the repository at this point in the history
  • Loading branch information
@fzavalia
fzavalia committed Feb 13, 2025
1 parent 2de65d2 commit 001b0b3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/interfaces/ITokenStakingNode.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ interface ITokenStakingNode {
* @dev Compares the locally stored delegatedTo address with the actual delegation in DelegationManager.
* @return True if the delegation state is synced, false otherwise.
*/
function isSynchronized() external view returns (bool);
function isOperatorSynchronized() external view returns (bool);

function delegatedTo() external view returns (address);

Expand Down
2 changes: 1 addition & 1 deletion src/ynEIGEN/EigenStrategyManager.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ contract EigenStrategyManager is

_strategiesBalance += strategy.userUnderlyingView((address(node)));

if (!node.isSynchronized()) {
if (!node.isOperatorSynchronized()) {
revert NodeNotSynchronized(i);
}

Expand Down
20 changes: 10 additions & 10 deletions src/ynEIGEN/TokenStakingNode.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
IERC20[] calldata assets,
uint256[] calldata amounts,
IStrategy[] calldata strategies
) external nonReentrant onlyYieldNestStrategyManager onlyWhenSynchronized {
) external nonReentrant onlyYieldNestStrategyManager onlyWhenOperatorSynchronized {
uint256 assetsLength = assets.length;
if (assetsLength != amounts.length || assetsLength != strategies.length) {
revert ArrayLengthMismatch();
Expand Down Expand Up @@ -147,7 +147,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
function queueWithdrawals(IStrategy _strategy, uint256 _depositShares)
external
onlyTokenStakingNodesWithdrawer
onlyWhenSynchronized
onlyWhenOperatorSynchronized
returns (bytes32[] memory _fullWithdrawalRoots)
{
IStrategy[] memory _strategiesArray = new IStrategy[](1);
Expand Down Expand Up @@ -199,7 +199,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
function completeQueuedWithdrawals(
IDelegationManager.Withdrawal[] memory withdrawals,
bool updateTokenStakingNodesBalances
) public onlyTokenStakingNodesWithdrawer onlyWhenSynchronized {
) public onlyTokenStakingNodesWithdrawer onlyWhenOperatorSynchronized {
IDelegationManagerExtended _delegationManager = IDelegationManagerExtended(address(tokenStakingNodesManager.delegationManager()));
IERC20V4[][] memory _tokens = new IERC20V4[][](withdrawals.length);
IStrategy[] memory _strategies = new IStrategy[](withdrawals.length);
Expand Down Expand Up @@ -259,7 +259,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
function completeQueuedWithdrawals(
IDelegationManager.Withdrawal calldata withdrawal,
bool updateTokenStakingNodesBalances
) public onlyTokenStakingNodesWithdrawer onlyWhenSynchronized {
) public onlyTokenStakingNodesWithdrawer onlyWhenOperatorSynchronized {
IDelegationManager.Withdrawal[] memory _withdrawals = new IDelegationManager.Withdrawal[](1);
_withdrawals[0] = withdrawal;
completeQueuedWithdrawals(_withdrawals, updateTokenStakingNodesBalances);
Expand All @@ -281,7 +281,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
*/
function completeQueuedWithdrawalsAsShares(
IDelegationManager.Withdrawal[] calldata withdrawals
) external onlyDelegator onlyWhenSynchronized {
) external onlyDelegator onlyWhenOperatorSynchronized {
IDelegationManagerExtended _delegationManager = IDelegationManagerExtended(address(tokenStakingNodesManager.delegationManager()));
IERC20V4[][] memory _tokens = new IERC20V4[][](withdrawals.length);
bool[] memory _receiveAsTokens = new bool[](withdrawals.length);
Expand Down Expand Up @@ -335,7 +335,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
public
virtual
onlyDelegator
onlyWhenSynchronized
onlyWhenOperatorSynchronized
{
IDelegationManager delegationManager = tokenStakingNodesManager.delegationManager();
delegationManager.delegateTo(operator, signature, approverSalt);
Expand All @@ -352,7 +352,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
public
override
onlyDelegator
onlyWhenSynchronized
onlyWhenOperatorSynchronized
returns (bytes32[] memory withdrawalRoots)
{
IDelegationManager delegationManager = tokenStakingNodesManager.delegationManager();
Expand Down Expand Up @@ -385,7 +385,7 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
* @dev Compares the locally stored delegatedTo address with the actual delegation in DelegationManager.
* @return True if the delegation state is synced, false otherwise.
*/
function isSynchronized() public view returns (bool) {
function isOperatorSynchronized() public view returns (bool) {
IDelegationManager delegationManager = IDelegationManager(address(tokenStakingNodesManager.delegationManager()));
return delegatedTo == delegationManager.delegatedTo(address(this));
}
Expand Down Expand Up @@ -501,8 +501,8 @@ contract TokenStakingNode is ITokenStakingNode, Initializable, ReentrancyGuardUp
}

/// @notice Modifier to ensure the token staking node's delegatedTo is synchronized with the DelegationManager.
modifier onlyWhenSynchronized() {
if (!isSynchronized()) {
modifier onlyWhenOperatorSynchronized() {
if (!isOperatorSynchronized()) {
revert NotSynchronized();
}
_;
Expand Down
10 changes: 5 additions & 5 deletions test/integration/ynEIGEN/TokenStakingNode.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ contract TokenStakingNodeDelegate is ynEigenIntegrationBaseTest {
"Delegation not cleared in DelegationManager"
);

assertEq(tokenStakingNodeInstance.isSynchronized(), true, "TokenStakingNode should be synchronized");
assertEq(tokenStakingNodeInstance.isOperatorSynchronized(), true, "TokenStakingNode should be synchronized");

// Verify queued shares increased by the correct amount
for (uint256 i = 0; i < strategies.length; i++) {
Expand Down Expand Up @@ -850,7 +850,7 @@ contract TokenStakingNodeDelegate is ynEigenIntegrationBaseTest {
"TokenStakingNode delegatedTo not set to operator1 after undelegation even if state is not synchronized"
);

assertEq(tokenStakingNodeInstance.isSynchronized(), false, "TokenStakingNode should not be synchronized");
assertEq(tokenStakingNodeInstance.isOperatorSynchronized(), false, "TokenStakingNode should not be synchronized");

IStrategy[] memory strategies = new IStrategy[](1);
uint256[] memory initialShares = new uint256[](1);
Expand Down Expand Up @@ -969,7 +969,7 @@ contract TokenStakingNodeDelegate is ynEigenIntegrationBaseTest {
vm.prank(actors.admin.STAKING_NODES_DELEGATOR);
tokenStakingNodeInstance.synchronize();

assertEq(tokenStakingNodeInstance.isSynchronized(), true, "TokenStakingNode should be synchronized");
assertEq(tokenStakingNodeInstance.isOperatorSynchronized(), true, "TokenStakingNode should be synchronized");

// Verify queued shares increased by the correct amount
for (uint256 i = 0; i < strategies.length; i++) {
Expand Down Expand Up @@ -1098,7 +1098,7 @@ contract TokenStakingNodeDelegate is ynEigenIntegrationBaseTest {
vm.prank(actors.admin.STAKING_NODES_DELEGATOR);
tokenStakingNodeInstance.synchronize();

assertEq(tokenStakingNodeInstance.isSynchronized(), true, "TokenStakingNode should be synchronized");
assertEq(tokenStakingNodeInstance.isOperatorSynchronized(), true, "TokenStakingNode should be synchronized");

vm.prank(actors.admin.STAKING_NODES_DELEGATOR);
tokenStakingNodeInstance.delegate(operator2, signature, approverSalt);
Expand Down Expand Up @@ -1229,7 +1229,7 @@ contract TokenStakingNodeDelegate is ynEigenIntegrationBaseTest {
vm.prank(actors.admin.STAKING_NODES_DELEGATOR);
tokenStakingNodeInstance.synchronize();

assertEq(tokenStakingNodeInstance.isSynchronized(), true, "TokenStakingNode should be synchronized");
assertEq(tokenStakingNodeInstance.isOperatorSynchronized(), true, "TokenStakingNode should be synchronized");

// Verify queued shares increased by the correct amount
for (uint256 i = 0; i < strategies.length; i++) {
Expand Down
4 changes: 2 additions & 2 deletions test/scenarios/ynEIGEN/Delegation.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ contract YnEigenDelegationScenarioTest is ynLSDeScenarioBaseTest {
assertEq(totalAssetsBefore, yneigen.totalAssets(), "Total assets should not change after undelegation");

// Assert node is not synchronized after undelegation
assertFalse(tokenStakingNode.isSynchronized(), "Node should not be synchronized after undelegation");
assertFalse(tokenStakingNode.isOperatorSynchronized(), "Node should not be synchronized after undelegation");

//Call synchronize after verifying not synchronized
vm.prank(actors.admin.TOKEN_STAKING_NODES_DELEGATOR);
Expand Down Expand Up @@ -148,7 +148,7 @@ contract YnEigenDelegationScenarioTest is ynLSDeScenarioBaseTest {
address(0),
"Node should not be delegated after undelegation"
);
assertTrue(tokenStakingNode.isSynchronized(), "Node should be synchronized after undelegation");
assertTrue(tokenStakingNode.isOperatorSynchronized(), "Node should be synchronized after undelegation");
assertApproxEqAbs(
totalAssetsBefore, yneigen.totalAssets(), 10, "Total assets should not change after undelegation"
);
Expand Down

0 comments on commit 001b0b3

Please sign in to comment.