liquity · RickGriff · Jan 20, 2025
diff --git a/contracts/lib/V2-gov b/contracts/lib/V2-gov
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/src/PriceFeeds/RETHPriceFeed.sol b/contracts/src/PriceFeeds/RETHPriceFeed.sol
@@ -36,7 +36,7 @@ contract RETHPriceFeed is CompositePriceFeed, IRETHPriceFeed {
         assert(priceSource == PriceSource.primary);
         (uint256 ethUsdPrice, bool ethUsdOracleDown) = _getOracleAnswer(ethUsdOracle);
         (uint256 rEthEthPrice, bool rEthEthOracleDown) = _getOracleAnswer(rEthEthOracle);
-        (uint256 rEthPerEth, bool exchangeRateIsDown) = _getCanonicalRate();
+        (uint256 ethPerReth, bool exchangeRateIsDown) = _getCanonicalRate();
 
         // If either the ETH-USD feed or exchange rate is down, shut down and switch to the last good price
         // seen by the system since we need both for primary and fallback price calcs
@@ -57,7 +57,7 @@ contract RETHPriceFeed is CompositePriceFeed, IRETHPriceFeed {
         uint256 rEthUsdMarketPrice = ethUsdPrice * rEthEthPrice / 1e18;
 
         // Calculate the canonical LST-USD price: USD_per_RETH = USD_per_ETH * ETH_per_RETH
-        uint256 rEthUsdCanonicalPrice = ethUsdPrice * rEthPerEth / 1e18;
+        uint256 rEthUsdCanonicalPrice = ethUsdPrice * ethPerReth / 1e18;
 
         uint256 rEthUsdPrice;
 

diff --git a/contracts/src/PriceFeeds/WETHPriceFeed.sol b/contracts/src/PriceFeeds/WETHPriceFeed.sol
@@ -33,10 +33,6 @@ contract WETHPriceFeed is MainnetPriceFeedBase {
     //  _fetchPricePrimary returns:
     // - The price
     // - A bool indicating whether a new oracle failure was detected in the call
-    function _fetchPricePrimary(bool /* _isRedemption */ ) internal virtual returns (uint256, bool) {
-        return _fetchPricePrimary();
-    }
-
     function _fetchPricePrimary() internal returns (uint256, bool) {
         assert(priceSource == PriceSource.primary);
         (uint256 ethUsdPrice, bool ethUsdOracleDown) = _getOracleAnswer(ethUsdOracle);
+3 −0		.gitmodules
+1 −0		lib/v4-core
+52 −2		script/DeploySepolia.s.sol
+49 −35		src/BribeInitiative.sol
+54 −84		src/Governance.sol
+191 −0		src/UniV4Donations.sol
+7 −16		src/interfaces/IBribeInitiative.sol
+10 −25		src/interfaces/IGovernance.sol
+158 −0		src/utils/BaseHook.sol
+0 −7		src/utils/VotingPower.sol
+119 −130		test/BribeInitiative.t.sol
+26 −25		test/CurveV2GaugeRewards.t.sol
+3 −337		test/Governance.t.sol
+0 −156		test/InitiativeHooks.t.sol
+280 −0		test/UniV4Donations.t.sol
+1 −1		test/recon/properties/BribeInitiativeProperties.sol
+3 −3		test/recon/targets/BribeInitiativeTargets.sol
+0 −193		CONTRIBUTING.md
+2 −18		README.md
+1 −1		package.json
+1 −12		scripts/vm.py
+1 −14		src/StdChains.sol
+5 −17		src/StdCheats.sol
+0 −9		src/StdInvariant.sol
+0 −104		src/StdJson.sol
+1 −1		src/StdStorage.sol
+0 −104		src/StdToml.sol
+76 −570		src/Vm.sol
+608 −635		src/console.sol
+1,555 −1		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+5 −1		src/mocks/MockERC721.sol
+4 −693		src/safeconsole.sol
+1 −1		test/StdAssertions.t.sol
+15 −21		test/StdChains.t.sol
+10 −10		test/StdCheats.t.sol
+12 −12		test/StdError.t.sol
+1 −1		test/StdJson.t.sol
+14 −4		test/StdMath.t.sol
+5 −13		test/StdStorage.t.sol
+1 −1		test/StdStyle.t.sol
+1 −1		test/StdToml.t.sol
+12 −12		test/StdUtils.t.sol
+6 −9		test/Vm.t.sol