fix: add missing serialize() and other nits

lekhovitsky · lekhovitsky · commit f8d10105d5a3 · 2025-02-10T12:12:39.000+02:00
diff --git a/contracts/oracles/BoundedPriceFeed.sol b/contracts/oracles/BoundedPriceFeed.sol
@@ -55,7 +55,7 @@ contract BoundedPriceFeed is IPriceFeed, SanityCheckTrait, PriceFeedValidationTr
     }
 
     /// @notice Serialized price feed parameters
-    function serialize() external view returns (bytes memory) {
+    function serialize() external view override returns (bytes memory) {
         return abi.encode(upperBound);
     }
 
diff --git a/contracts/oracles/CompositePriceFeed.sol b/contracts/oracles/CompositePriceFeed.sol
@@ -64,6 +64,9 @@ contract CompositePriceFeed is IPriceFeed, PriceFeedValidationTrait, SanityCheck
         return string.concat(_descriptionTicker.fromSmallString(), " composite price feed"); // U:[CPF-2]
     }
 
+    /// @notice Empty state serialization
+    function serialize() external pure override returns (bytes memory) {}
+
     /// @notice Returns the USD price of the target asset, computed as target/base price times base/USD price
     function latestRoundData() external view override returns (uint80, int256 answer, uint256, uint256, uint80) {
         answer = _getValidatedPrice(priceFeed0, stalenessPeriod0, skipCheck0); // U:[CPF-3]
diff --git a/contracts/oracles/LPPriceFeed.sol b/contracts/oracles/LPPriceFeed.sol
@@ -64,7 +64,7 @@ abstract contract LPPriceFeed is ILPPriceFeed, Ownable, SanityCheckTrait, PriceF
     }
 
     /// @notice Serialized price feed parameters
-    function serialize() public view virtual returns (bytes memory) {
+    function serialize() public view virtual override returns (bytes memory) {
         uint256 lb = lowerBound;
         return abi.encode(lpToken, lpContract, lb, _calcUpperBound(lb));
     }
diff --git a/contracts/oracles/ZeroPriceFeed.sol b/contracts/oracles/ZeroPriceFeed.sol
@@ -15,6 +15,9 @@ contract ZeroPriceFeed is IPriceFeed {
     string public constant override description = "Zero price feed"; // U:[ZPF-1]
     bool public constant override skipPriceCheck = true; // U:[ZPF-1]
 
+    /// @notice Empty state serialization
+    function serialize() external pure override returns (bytes memory) {}
+
     /// @notice Returns zero price
     function latestRoundData() external pure override returns (uint80, int256, uint256, uint256, uint80) {
         return (0, 0, 0, 0, 0); // U:[ZPF-2]
diff --git a/contracts/oracles/balancer/BPTStablePriceFeed.sol b/contracts/oracles/balancer/BPTStablePriceFeed.sol
@@ -36,7 +36,7 @@ contract BPTStablePriceFeed is LPPriceFeed {
     uint32 public immutable stalenessPeriod4;
     bool public immutable skipCheck4;
 
-    constructor(address _owner, uint256 lowerBound, address _balancerPool, PriceFeedParams[5] memory priceFeeds)
+    constructor(address _owner, uint256 _lowerBound, address _balancerPool, PriceFeedParams[5] memory priceFeeds)
         LPPriceFeed(_owner, _balancerPool, _balancerPool) // U:[BAL-S-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[BAL-S-2]
         nonZeroAddress(priceFeeds[1].priceFeed) // U:[BAL-S-2]
@@ -61,7 +61,7 @@ contract BPTStablePriceFeed is LPPriceFeed {
         skipCheck3 = numAssets > 3 ? _validatePriceFeed(priceFeed3, stalenessPeriod3) : false;
         skipCheck4 = numAssets > 4 ? _validatePriceFeed(priceFeed4, stalenessPeriod4) : false;
 
-        _setLimiter(lowerBound); // U:[BAL-S-1]
+        _setLimiter(_lowerBound); // U:[BAL-S-1]
     }
 
     function getAggregatePrice() public view override returns (int256 answer) {
diff --git a/contracts/oracles/balancer/BPTWeightedPriceFeed.sol b/contracts/oracles/balancer/BPTWeightedPriceFeed.sol
@@ -96,7 +96,7 @@ contract BPTWeightedPriceFeed is LPPriceFeed {
     uint256 immutable scale6;
     uint256 immutable scale7;
 
-    constructor(address _owner, uint256 lowerBound, address _vault, address _pool, PriceFeedParams[] memory priceFeeds)
+    constructor(address _owner, uint256 _lowerBound, address _vault, address _pool, PriceFeedParams[] memory priceFeeds)
         LPPriceFeed(_owner, _pool, _pool) // U:[BAL-W-1]
         nonZeroAddress(_vault) // U:[BAL-W-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[BAL-W-2]
@@ -164,7 +164,7 @@ contract BPTWeightedPriceFeed is LPPriceFeed {
         skipCheck6 = numAssets >= 7 ? _validatePriceFeed(priceFeed6, stalenessPeriod6) : false;
         skipCheck7 = numAssets >= 8 ? _validatePriceFeed(priceFeed7, stalenessPeriod7) : false;
 
-        _setLimiter(lowerBound); // U:[BAL-W-1]
+        _setLimiter(_lowerBound); // U:[BAL-W-1]
     }
 
     /// @notice Serialized price feed parameters
diff --git a/contracts/oracles/curve/CurveCryptoLPPriceFeed.sol b/contracts/oracles/curve/CurveCryptoLPPriceFeed.sol
@@ -34,7 +34,13 @@ contract CurveCryptoLPPriceFeed is LPPriceFeed {
     uint32 public immutable stalenessPeriod2;
     bool public immutable skipCheck2;
 
-    constructor(address _owner, uint256 lowerBound, address _token, address _pool, PriceFeedParams[3] memory priceFeeds)
+    constructor(
+        address _owner,
+        uint256 _lowerBound,
+        address _token,
+        address _pool,
+        PriceFeedParams[3] memory priceFeeds
+    )
         LPPriceFeed(_owner, _token, _pool) // U:[CRV-C-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[CRV-C-2]
         nonZeroAddress(priceFeeds[1].priceFeed) // U:[CRV-C-2]
@@ -53,7 +59,7 @@ contract CurveCryptoLPPriceFeed is LPPriceFeed {
         skipCheck1 = _validatePriceFeed(priceFeed1, stalenessPeriod1);
         skipCheck2 = nCoins == 3 ? _validatePriceFeed(priceFeed2, stalenessPeriod2) : false;
 
-        _setLimiter(lowerBound); // U:[CRV-C-1]
+        _setLimiter(_lowerBound); // U:[CRV-C-1]
     }
 
     function getAggregatePrice() public view override returns (int256 answer) {
diff --git a/contracts/oracles/curve/CurveStableLPPriceFeed.sol b/contracts/oracles/curve/CurveStableLPPriceFeed.sol
@@ -33,7 +33,13 @@ contract CurveStableLPPriceFeed is LPPriceFeed {
     uint32 public immutable stalenessPeriod3;
     bool public immutable skipCheck3;
 
-    constructor(address _owner, uint256 lowerBound, address _token, address _pool, PriceFeedParams[4] memory priceFeeds)
+    constructor(
+        address _owner,
+        uint256 _lowerBound,
+        address _token,
+        address _pool,
+        PriceFeedParams[4] memory priceFeeds
+    )
         LPPriceFeed(_owner, _token, _pool) // U:[CRV-S-1]
         nonZeroAddress(priceFeeds[0].priceFeed) // U:[CRV-S-2]
         nonZeroAddress(priceFeeds[1].priceFeed) // U:[CRV-S-2]
@@ -55,7 +61,7 @@ contract CurveStableLPPriceFeed is LPPriceFeed {
         skipCheck2 = nCoins > 2 ? _validatePriceFeed(priceFeed2, stalenessPeriod2) : false;
         skipCheck3 = nCoins > 3 ? _validatePriceFeed(priceFeed3, stalenessPeriod3) : false;
 
-        _setLimiter(lowerBound); // U:[CRV-S-1]
+        _setLimiter(_lowerBound); // U:[CRV-S-1]
     }
 
     function getAggregatePrice() public view override returns (int256 answer) {
diff --git a/contracts/oracles/curve/CurveUSDPriceFeed.sol b/contracts/oracles/curve/CurveUSDPriceFeed.sol
@@ -17,15 +17,15 @@ contract CurveUSDPriceFeed is SingleAssetLPPriceFeed {
 
     constructor(
         address _owner,
-        uint256 lowerBound,
+        uint256 _lowerBound,
         address _crvUSD,
         address _pool,
         address _priceFeed,
         uint32 _stalenessPeriod
     )
         SingleAssetLPPriceFeed(_owner, _crvUSD, _pool, _priceFeed, _stalenessPeriod) // U:[CRV-D-1]
     {
-        _setLimiter(lowerBound); // U:[CRV-D-1]
+        _setLimiter(_lowerBound); // U:[CRV-D-1]
     }
 
     function getLPExchangeRate() public view override returns (uint256) {
diff --git a/contracts/oracles/erc4626/ERC4626PriceFeed.sol b/contracts/oracles/erc4626/ERC4626PriceFeed.sol
@@ -18,12 +18,12 @@ contract ERC4626PriceFeed is SingleAssetLPPriceFeed {
     /// @dev Amount of underlying asset comprising a single unit (accounting for decimals)
     uint256 immutable _assetUnit;
 
-    constructor(address _owner, uint256 lowerBound, address _vault, address _priceFeed, uint32 _stalenessPeriod)
+    constructor(address _owner, uint256 _lowerBound, address _vault, address _priceFeed, uint32 _stalenessPeriod)
         SingleAssetLPPriceFeed(_owner, _vault, _vault, _priceFeed, _stalenessPeriod) // U:[TV-1]
     {
         _shareUnit = 10 ** IERC4626(_vault).decimals();
         _assetUnit = 10 ** ERC20(IERC4626(_vault).asset()).decimals();
-        _setLimiter(lowerBound); // U:[TV-1]
+        _setLimiter(_lowerBound); // U:[TV-1]
     }
 
     function getLPExchangeRate() public view override returns (uint256) {
diff --git a/contracts/oracles/lido/WstETHPriceFeed.sol b/contracts/oracles/lido/WstETHPriceFeed.sol
@@ -12,10 +12,10 @@ contract WstETHPriceFeed is SingleAssetLPPriceFeed {
     uint256 public constant override version = 3_10;
     bytes32 public constant override contractType = "PRICE_FEED::WSTETH";
 
-    constructor(address _owner, uint256 lowerBound, address _wstETH, address _priceFeed, uint32 _stalenessPeriod)
+    constructor(address _owner, uint256 _lowerBound, address _wstETH, address _priceFeed, uint32 _stalenessPeriod)
         SingleAssetLPPriceFeed(_owner, _wstETH, _wstETH, _priceFeed, _stalenessPeriod) // U:[LDO-1]
     {
-        _setLimiter(lowerBound); // U:[LDO-1]
+        _setLimiter(_lowerBound); // U:[LDO-1]
     }
 
     function getLPExchangeRate() public view override returns (uint256) {
diff --git a/contracts/oracles/mellow/MellowLRTPriceFeed.sol b/contracts/oracles/mellow/MellowLRTPriceFeed.sol
@@ -16,12 +16,12 @@ contract MellowLRTPriceFeed is SingleAssetLPPriceFeed {
     /// @dev Amount of base token comprising a single unit (accounting for decimals)
     uint256 immutable _baseTokenUnit;
 
-    constructor(address _owner, uint256 lowerBound, address _vault, address _priceFeed, uint32 _stalenessPeriod)
+    constructor(address _owner, uint256 _lowerBound, address _vault, address _priceFeed, uint32 _stalenessPeriod)
         SingleAssetLPPriceFeed(_owner, _vault, _vault, _priceFeed, _stalenessPeriod) // U:[MEL-1]
     {
         address baseToken = IMellowVault(_vault).configurator().priceOracle().baseTokens(_vault);
         _baseTokenUnit = 10 ** ERC20(baseToken).decimals();
-        _setLimiter(lowerBound); // U:[MEL-1]
+        _setLimiter(_lowerBound); // U:[MEL-1]
     }
 
     function getLPExchangeRate() public view override returns (uint256) {
diff --git a/contracts/oracles/pendle/PendleTWAPPTPriceFeed.sol b/contracts/oracles/pendle/PendleTWAPPTPriceFeed.sol
@@ -75,7 +75,7 @@ contract PendleTWAPPTPriceFeed is IPriceFeed, PriceFeedValidationTrait, SanityCh
     }
 
     /// @notice Serialized price feed parameters
-    function serialize() external view returns (bytes memory) {
+    function serialize() external view override returns (bytes memory) {
         return abi.encode(market, sy, yt, expiry, twapWindow, priceToSy);
     }
 
diff --git a/contracts/oracles/updatable/PythPriceFeed.sol b/contracts/oracles/updatable/PythPriceFeed.sol
@@ -102,7 +102,7 @@ contract PythPriceFeed is IUpdatablePriceFeed {
     }
 
     /// @notice Serialized price feed parameters
-    function serialize() external view returns (bytes memory) {
+    function serialize() external view override returns (bytes memory) {
         return abi.encode(token, priceFeedId, pyth, maxConfToPriceRatio);
     }
 
diff --git a/contracts/oracles/updatable/RedstonePriceFeed.sol b/contracts/oracles/updatable/RedstonePriceFeed.sol
@@ -145,7 +145,7 @@ contract RedstonePriceFeed is IUpdatablePriceFeed, RedstoneConsumerNumericBase {
     }
 
     /// @notice Serialized price feed parameters
-    function serialize() external view returns (bytes memory) {
+    function serialize() external view override returns (bytes memory) {
         address[10] memory signers = [
             signerAddress0,
             signerAddress1,
diff --git a/contracts/oracles/yearn/YearnPriceFeed.sol b/contracts/oracles/yearn/YearnPriceFeed.sol
@@ -14,11 +14,11 @@ contract YearnPriceFeed is SingleAssetLPPriceFeed {
     /// @dev Scale of yVault's pricePerShare
     uint256 immutable _scale;
 
-    constructor(address _owner, uint256 lowerBound, address _yVault, address _priceFeed, uint32 _stalenessPeriod)
+    constructor(address _owner, uint256 _lowerBound, address _yVault, address _priceFeed, uint32 _stalenessPeriod)
         SingleAssetLPPriceFeed(_owner, _yVault, _yVault, _priceFeed, _stalenessPeriod) // U:[YFI-1]
     {
         _scale = 10 ** IYVault(_yVault).decimals();
-        _setLimiter(lowerBound); // U:[YFI-1]
+        _setLimiter(_lowerBound); // U:[YFI-1]
     }
 
     function getLPExchangeRate() public view override returns (uint256) {
diff --git a/lib/@gearbox-protocol/core-v3 b/lib/@gearbox-protocol/core-v3
@@ -1 +1 @@
-Subproject commit 1ba776314057e3dbcb05d0fb65e4d86547e830d1
+Subproject commit b9a9ceb9dacb13bd906f64a47a39ac8bfb0bfe47

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ contract BoundedPriceFeed is IPriceFeed, SanityCheckTrait, PriceFeedValidationTr`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/// @notice Serialized price feed parameters`
`58`		`- function serialize() external view returns (bytes memory) {`
	`58`	`+ function serialize() external view override returns (bytes memory) {`
`59`	`59`	`return abi.encode(upperBound);`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ contract CompositePriceFeed is IPriceFeed, PriceFeedValidationTrait, SanityCheck`
`64`	`64`	`return string.concat(_descriptionTicker.fromSmallString(), " composite price feed"); // U:[CPF-2]`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ /// @notice Empty state serialization`
	`68`	`+ function serialize() external pure override returns (bytes memory) {}`
	`69`	`+`
`67`	`70`	`/// @notice Returns the USD price of the target asset, computed as target/base price times base/USD price`
`68`	`71`	`function latestRoundData() external view override returns (uint80, int256 answer, uint256, uint256, uint80) {`
`69`	`72`	`answer = _getValidatedPrice(priceFeed0, stalenessPeriod0, skipCheck0); // U:[CPF-3]`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ abstract contract LPPriceFeed is ILPPriceFeed, Ownable, SanityCheckTrait, PriceF`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/// @notice Serialized price feed parameters`
`67`		`- function serialize() public view virtual returns (bytes memory) {`
	`67`	`+ function serialize() public view virtual override returns (bytes memory) {`
`68`	`68`	`uint256 lb = lowerBound;`
`69`	`69`	`return abi.encode(lpToken, lpContract, lb, _calcUpperBound(lb));`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@ contract CurveUSDPriceFeed is SingleAssetLPPriceFeed {`
`17`	`17`
`18`	`18`	`constructor(`
`19`	`19`	`address _owner,`
`20`		`- uint256 lowerBound,`
	`20`	`+ uint256 _lowerBound,`
`21`	`21`	`address _crvUSD,`
`22`	`22`	`address _pool,`
`23`	`23`	`address _priceFeed,`
`24`	`24`	`uint32 _stalenessPeriod`
`25`	`25`	`)`
`26`	`26`	`SingleAssetLPPriceFeed(_owner, _crvUSD, _pool, _priceFeed, _stalenessPeriod) // U:[CRV-D-1]`
`27`	`27`	`{`
`28`		`- _setLimiter(lowerBound); // U:[CRV-D-1]`
	`28`	`+ _setLimiter(_lowerBound); // U:[CRV-D-1]`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`function getLPExchangeRate() public view override returns (uint256) {`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ contract ERC4626PriceFeed is SingleAssetLPPriceFeed {`
`18`	`18`	`/// @dev Amount of underlying asset comprising a single unit (accounting for decimals)`
`19`	`19`	`uint256 immutable _assetUnit;`
`20`	`20`
`21`		`- constructor(address _owner, uint256 lowerBound, address _vault, address _priceFeed, uint32 _stalenessPeriod)`
	`21`	`+ constructor(address _owner, uint256 _lowerBound, address _vault, address _priceFeed, uint32 _stalenessPeriod)`
`22`	`22`	`SingleAssetLPPriceFeed(_owner, _vault, _vault, _priceFeed, _stalenessPeriod) // U:[TV-1]`
`23`	`23`	`{`
`24`	`24`	`_shareUnit = 10 ** IERC4626(_vault).decimals();`
`25`	`25`	`_assetUnit = 10 ** ERC20(IERC4626(_vault).asset()).decimals();`
`26`		`- _setLimiter(lowerBound); // U:[TV-1]`
	`26`	`+ _setLimiter(_lowerBound); // U:[TV-1]`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`function getLPExchangeRate() public view override returns (uint256) {`