From d44da58c13d8bf38e040c44565bb12b833c6e797 Mon Sep 17 00:00:00 2001 From: johnnyonline Date: Tue, 15 Oct 2024 23:28:57 +0900 Subject: [PATCH] fix: https://github.com/yieldnest/yieldnest-protocol/pull/164#discussion_r1800117233 --- .gitmodules | 3 --- lib/solady | 1 - src/ynEIGEN/EigenStrategyManager.sol | 12 +++--------- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 160000 lib/solady diff --git a/.gitmodules b/.gitmodules index 2e7d3490b..44f0f748e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,6 +18,3 @@ path = lib/eigenlayer-contracts url = https://github.com/layr-labs/eigenlayer-contracts commit = bda003385c5fec59e35196dc14d01f17d1eb7001 -[submodule "lib/solady"] - path = lib/solady - url = https://github.com/Vectorized/solady diff --git a/lib/solady b/lib/solady deleted file mode 160000 index e0ef35adb..000000000 --- a/lib/solady +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e0ef35adb0ccd1032794731a995cb599bba7b537 diff --git a/src/ynEIGEN/EigenStrategyManager.sol b/src/ynEIGEN/EigenStrategyManager.sol index b24c21fde..cfc2fb7cc 100644 --- a/src/ynEIGEN/EigenStrategyManager.sol +++ b/src/ynEIGEN/EigenStrategyManager.sol @@ -2,7 +2,6 @@ pragma solidity ^0.8.24; import {SafeCast} from "lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol"; -import {DynamicArrayLib} from "lib/solady/src/utils/DynamicArrayLib.sol"; import {Initializable} from "lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol"; import {AccessControlUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol"; import {ReentrancyGuardUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/utils/ReentrancyGuardUpgradeable.sol"; @@ -417,9 +416,9 @@ contract EigenStrategyManager is * @param assets An array of ERC20 tokens for which balances are to be retrieved. * @return stakedBalances An array of total balances for each asset, indexed in the same order as the `assets` array. */ - function getStakedAssetsBalances(IERC20[] calldata assets) public view returns (uint256[] memory) { + function getStakedAssetsBalances(IERC20[] calldata assets) public view returns (uint256[] memory stakedBalances) { - uint256[] memory stakedBalances = DynamicArrayLib.malloc(assets.length); + stakedBalances = new uint256[](assets.length); // Add balances contained in each TokenStakingNode, including those managed by strategies. uint256 assetsCount = assets.length; @@ -427,12 +426,7 @@ contract EigenStrategyManager is IERC20 asset = assets[j]; IStrategy strategy = strategies[asset]; StrategyBalance memory balance = strategiesBalance[strategy]; - DynamicArrayLib.set( - stakedBalances, - j, - wrapper.toUserAssetAmount(asset, balance.stakedBalance) - + balance.withdrawnBalance - ); + stakedBalances[j] = wrapper.toUserAssetAmount(asset, balance.stakedBalance) + balance.withdrawnBalance; } return stakedBalances;