fix: simplify nested price feeds deployment

lekhovitsky · lekhovitsky · commit fc8d3a0ab5bd · 2025-03-16T22:17:42.000+02:00
Underlying price feeds prices are no longer queried during deployment.
This call is redundant since price validity is checked when adding price feed to PFS and PO.
At the same time, it significantly complicates deployment when underlying feeds are updatable.
diff --git a/contracts/oracles/BoundedPriceFeed.sol b/contracts/oracles/BoundedPriceFeed.sol
@@ -44,7 +44,7 @@ contract BoundedPriceFeed is IPriceFeed, SanityCheckTrait, PriceFeedValidationTr
         if (_upperBound <= 0) revert IncorrectParameterException(); // U:[BPF-1]
         priceFeed = _priceFeed; // U:[BPF-1]
         stalenessPeriod = _stalenessPeriod; // U:[BPF-1]
-        skipCheck = _validatePriceFeed(priceFeed, stalenessPeriod); // U:[BPF-1]
+        skipCheck = _validatePriceFeedMetadata(priceFeed, stalenessPeriod); // U:[BPF-1]
         upperBound = _upperBound; // U:[BPF-1]
         _descriptionTicker = descriptionTicker.toSmallString();
     }
diff --git a/contracts/oracles/CompositePriceFeed.sol b/contracts/oracles/CompositePriceFeed.sol
@@ -54,7 +54,7 @@ contract CompositePriceFeed is IPriceFeed, PriceFeedValidationTrait, SanityCheck
         targetFeedScale = int256(10 ** IPriceFeed(priceFeed0).decimals()); // U:[CPF-1]
         // target/base price feed validation is omitted because it will fail if feed has other than 8 decimals
         skipCheck0 = false; // U:[CPF-1]
-        skipCheck1 = _validatePriceFeed(priceFeed1, stalenessPeriod1); // U:[CPF-1]
+        skipCheck1 = _validatePriceFeedMetadata(priceFeed1, stalenessPeriod1); // U:[CPF-1]
 
         _descriptionTicker = descriptionTicker.toSmallString();
     }
diff --git a/contracts/oracles/SingleAssetLPPriceFeed.sol b/contracts/oracles/SingleAssetLPPriceFeed.sol
@@ -20,7 +20,7 @@ abstract contract SingleAssetLPPriceFeed is LPPriceFeed {
     {
         priceFeed = _priceFeed; // U:[SAPF-1]
         stalenessPeriod = _stalenessPeriod; // U:[SAPF-1]
-        skipCheck = _validatePriceFeed(_priceFeed, _stalenessPeriod); // U:[SAPF-1]
+        skipCheck = _validatePriceFeedMetadata(_priceFeed, _stalenessPeriod); // U:[SAPF-1]
     }
 
     function getAggregatePrice() public view override returns (int256 answer) {
diff --git a/contracts/oracles/balancer/BPTStablePriceFeed.sol b/contracts/oracles/balancer/BPTStablePriceFeed.sol
@@ -55,11 +55,11 @@ contract BPTStablePriceFeed is LPPriceFeed {
 
         numAssets = priceFeed2 == address(0) ? 2 : (priceFeed3 == address(0) ? 3 : (priceFeed4 == address(0) ? 4 : 5)); // U:[BAL-S-2]
 
-        skipCheck0 = _validatePriceFeed(priceFeed0, stalenessPeriod0);
-        skipCheck1 = _validatePriceFeed(priceFeed1, stalenessPeriod1);
-        skipCheck2 = numAssets > 2 ? _validatePriceFeed(priceFeed2, stalenessPeriod2) : false;
-        skipCheck3 = numAssets > 3 ? _validatePriceFeed(priceFeed3, stalenessPeriod3) : false;
-        skipCheck4 = numAssets > 4 ? _validatePriceFeed(priceFeed4, stalenessPeriod4) : false;
+        skipCheck0 = _validatePriceFeedMetadata(priceFeed0, stalenessPeriod0);
+        skipCheck1 = _validatePriceFeedMetadata(priceFeed1, stalenessPeriod1);
+        skipCheck2 = numAssets > 2 ? _validatePriceFeedMetadata(priceFeed2, stalenessPeriod2) : false;
+        skipCheck3 = numAssets > 3 ? _validatePriceFeedMetadata(priceFeed3, stalenessPeriod3) : false;
+        skipCheck4 = numAssets > 4 ? _validatePriceFeedMetadata(priceFeed4, stalenessPeriod4) : false;
 
         _setLimiter(_lowerBound); // U:[BAL-S-1]
     }
diff --git a/contracts/oracles/balancer/BPTWeightedPriceFeed.sol b/contracts/oracles/balancer/BPTWeightedPriceFeed.sol
@@ -155,14 +155,14 @@ contract BPTWeightedPriceFeed is LPPriceFeed {
         stalenessPeriod6 = numAssets >= 7 ? priceFeeds[index6].stalenessPeriod : 0;
         stalenessPeriod7 = numAssets >= 8 ? priceFeeds[index7].stalenessPeriod : 0;
 
-        skipCheck0 = _validatePriceFeed(priceFeed0, stalenessPeriod0);
-        skipCheck1 = _validatePriceFeed(priceFeed1, stalenessPeriod1);
-        skipCheck2 = numAssets >= 3 ? _validatePriceFeed(priceFeed2, stalenessPeriod2) : false;
-        skipCheck3 = numAssets >= 4 ? _validatePriceFeed(priceFeed3, stalenessPeriod3) : false;
-        skipCheck4 = numAssets >= 5 ? _validatePriceFeed(priceFeed4, stalenessPeriod4) : false;
-        skipCheck5 = numAssets >= 6 ? _validatePriceFeed(priceFeed5, stalenessPeriod5) : false;
-        skipCheck6 = numAssets >= 7 ? _validatePriceFeed(priceFeed6, stalenessPeriod6) : false;
-        skipCheck7 = numAssets >= 8 ? _validatePriceFeed(priceFeed7, stalenessPeriod7) : false;
+        skipCheck0 = _validatePriceFeedMetadata(priceFeed0, stalenessPeriod0);
+        skipCheck1 = _validatePriceFeedMetadata(priceFeed1, stalenessPeriod1);
+        skipCheck2 = numAssets >= 3 ? _validatePriceFeedMetadata(priceFeed2, stalenessPeriod2) : false;
+        skipCheck3 = numAssets >= 4 ? _validatePriceFeedMetadata(priceFeed3, stalenessPeriod3) : false;
+        skipCheck4 = numAssets >= 5 ? _validatePriceFeedMetadata(priceFeed4, stalenessPeriod4) : false;
+        skipCheck5 = numAssets >= 6 ? _validatePriceFeedMetadata(priceFeed5, stalenessPeriod5) : false;
+        skipCheck6 = numAssets >= 7 ? _validatePriceFeedMetadata(priceFeed6, stalenessPeriod6) : false;
+        skipCheck7 = numAssets >= 8 ? _validatePriceFeedMetadata(priceFeed7, stalenessPeriod7) : false;
 
         _setLimiter(_lowerBound); // U:[BAL-W-1]
     }
diff --git a/contracts/oracles/curve/CurveCryptoLPPriceFeed.sol b/contracts/oracles/curve/CurveCryptoLPPriceFeed.sol
@@ -55,9 +55,9 @@ contract CurveCryptoLPPriceFeed is LPPriceFeed {
 
         nCoins = priceFeed2 == address(0) ? 2 : 3; // U:[CRV-C-2]
 
-        skipCheck0 = _validatePriceFeed(priceFeed0, stalenessPeriod0);
-        skipCheck1 = _validatePriceFeed(priceFeed1, stalenessPeriod1);
-        skipCheck2 = nCoins == 3 ? _validatePriceFeed(priceFeed2, stalenessPeriod2) : false;
+        skipCheck0 = _validatePriceFeedMetadata(priceFeed0, stalenessPeriod0);
+        skipCheck1 = _validatePriceFeedMetadata(priceFeed1, stalenessPeriod1);
+        skipCheck2 = nCoins == 3 ? _validatePriceFeedMetadata(priceFeed2, stalenessPeriod2) : false;
 
         _setLimiter(_lowerBound); // U:[CRV-C-1]
     }
diff --git a/contracts/oracles/curve/CurveStableLPPriceFeed.sol b/contracts/oracles/curve/CurveStableLPPriceFeed.sol
@@ -56,10 +56,10 @@ contract CurveStableLPPriceFeed is LPPriceFeed {
 
         nCoins = priceFeed2 == address(0) ? 2 : (priceFeed3 == address(0) ? 3 : 4); // U:[CRV-S-2]
 
-        skipCheck0 = _validatePriceFeed(priceFeed0, stalenessPeriod0);
-        skipCheck1 = _validatePriceFeed(priceFeed1, stalenessPeriod1);
-        skipCheck2 = nCoins > 2 ? _validatePriceFeed(priceFeed2, stalenessPeriod2) : false;
-        skipCheck3 = nCoins > 3 ? _validatePriceFeed(priceFeed3, stalenessPeriod3) : false;
+        skipCheck0 = _validatePriceFeedMetadata(priceFeed0, stalenessPeriod0);
+        skipCheck1 = _validatePriceFeedMetadata(priceFeed1, stalenessPeriod1);
+        skipCheck2 = nCoins > 2 ? _validatePriceFeedMetadata(priceFeed2, stalenessPeriod2) : false;
+        skipCheck3 = nCoins > 3 ? _validatePriceFeedMetadata(priceFeed3, stalenessPeriod3) : false;
 
         _setLimiter(_lowerBound); // U:[CRV-S-1]
     }
diff --git a/contracts/oracles/pendle/PendleTWAPPTPriceFeed.sol b/contracts/oracles/pendle/PendleTWAPPTPriceFeed.sol
@@ -59,7 +59,7 @@ contract PendleTWAPPTPriceFeed is IPriceFeed, PriceFeedValidationTrait, SanityCh
         expiry = IPendleMarket(_market).expiry();
         priceFeed = _priceFeed;
         stalenessPeriod = _stalenessPeriod;
-        skipCheck = _validatePriceFeed(priceFeed, stalenessPeriod);
+        skipCheck = _validatePriceFeedMetadata(priceFeed, stalenessPeriod);
         twapWindow = _twapWindow;
         priceToSy = _priceToSY;
 
diff --git a/lib/@gearbox-protocol/core-v3 b/lib/@gearbox-protocol/core-v3
@@ -1 +1 @@
-Subproject commit b9a9ceb9dacb13bd906f64a47a39ac8bfb0bfe47
+Subproject commit 9f228cf984d0a976e8fa0076fc7b2d958a02ad87

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ contract BoundedPriceFeed is IPriceFeed, SanityCheckTrait, PriceFeedValidationTr`
`44`	`44`	`if (_upperBound <= 0) revert IncorrectParameterException(); // U:[BPF-1]`
`45`	`45`	`priceFeed = _priceFeed; // U:[BPF-1]`
`46`	`46`	`stalenessPeriod = _stalenessPeriod; // U:[BPF-1]`
`47`		`- skipCheck = _validatePriceFeed(priceFeed, stalenessPeriod); // U:[BPF-1]`
	`47`	`+ skipCheck = _validatePriceFeedMetadata(priceFeed, stalenessPeriod); // U:[BPF-1]`
`48`	`48`	`upperBound = _upperBound; // U:[BPF-1]`
`49`	`49`	`_descriptionTicker = descriptionTicker.toSmallString();`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ contract CompositePriceFeed is IPriceFeed, PriceFeedValidationTrait, SanityCheck`
`54`	`54`	`targetFeedScale = int256(10 ** IPriceFeed(priceFeed0).decimals()); // U:[CPF-1]`
`55`	`55`	`// target/base price feed validation is omitted because it will fail if feed has other than 8 decimals`
`56`	`56`	`skipCheck0 = false; // U:[CPF-1]`
`57`		`- skipCheck1 = _validatePriceFeed(priceFeed1, stalenessPeriod1); // U:[CPF-1]`
	`57`	`+ skipCheck1 = _validatePriceFeedMetadata(priceFeed1, stalenessPeriod1); // U:[CPF-1]`
`58`	`58`
`59`	`59`	`_descriptionTicker = descriptionTicker.toSmallString();`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ abstract contract SingleAssetLPPriceFeed is LPPriceFeed {`
`20`	`20`	`{`
`21`	`21`	`priceFeed = _priceFeed; // U:[SAPF-1]`
`22`	`22`	`stalenessPeriod = _stalenessPeriod; // U:[SAPF-1]`
`23`		`- skipCheck = _validatePriceFeed(_priceFeed, _stalenessPeriod); // U:[SAPF-1]`
	`23`	`+ skipCheck = _validatePriceFeedMetadata(_priceFeed, _stalenessPeriod); // U:[SAPF-1]`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`function getAggregatePrice() public view override returns (int256 answer) {`