Skip to content

fix(oracle): clamp upscaled price to uint32-safe bounds #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xCardiE wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix(oracle): clamp upscaled price to uint32-safe bounds #311

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0974508
fix(oracle): clamp upscaled price to uint32-safe bounds
0xCardiE May 22, 2026
9c73c9f
refactor(oracle): use compile-time price bound constants
0xCardiE Jun 30, 2026
56079cd
merge master for echidna harness compatibility
0xCardiE Jun 30, 2026
be8cea6
fix(echidna): use MINIMUM_PRICE_UPSCALED after oracle refactor
0xCardiE Jun 30, 2026
329f006
docs(oracle): document upscaled price bound constants
0xCardiE Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/PriceOracle.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ contract PriceOracle is AccessControl {
// The length of a round in blocks.
uint8 private constant ROUND_LENGTH = 152;

/// @dev Upper bound for upscaled price so `(currentPriceUpScaled >> 10)` fits in `uint32`.
/// Without this, `currentPrice()`'s `uint32(... >> 10)` truncates and can disagree with
/// `currentPriceUpScaled` and under-report vs `minimumPrice()`.
uint64 public constant MAX_CURRENT_PRICE_UPSCALED = uint64(uint256(type(uint32).max) << 10);
Comment thread
0xCardiE marked this conversation as resolved.
Outdated

// ----------------------------- Events ------------------------------

/**
Expand Down Expand Up @@ -78,13 +83,9 @@ contract PriceOracle is AccessControl {
revert CallerNotAdmin();
}

uint64 _currentPriceUpScaled = _price << 10;
uint64 _minimumPriceUpscaled = minimumPriceUpscaled;

// Enforce minimum price
if (_currentPriceUpScaled < _minimumPriceUpscaled) {
_currentPriceUpScaled = _minimumPriceUpscaled;
}
// Cast before shifting to avoid uint32 overflow/truncation.
uint64 _currentPriceUpScaled = uint64(_price) << 10;
_currentPriceUpScaled = _clampPriceUpscaled(_currentPriceUpScaled);
currentPriceUpScaled = _currentPriceUpScaled;

// Check if the setting of price in postagestamp succeded
Expand Down Expand Up @@ -124,7 +125,6 @@ contract PriceOracle is AccessControl {
}

uint64 _currentPriceUpScaled = currentPriceUpScaled;
uint64 _minimumPriceUpscaled = minimumPriceUpscaled;
uint32 _priceBase = priceBase;

// Set the number of rounds that were skipped, we substract 1 as lastAdjustedRound is set below and default result is 1
Expand All @@ -142,10 +142,7 @@ contract PriceOracle is AccessControl {
}
}

// Enforce minimum price
if (_currentPriceUpScaled < _minimumPriceUpscaled) {
_currentPriceUpScaled = _minimumPriceUpscaled;
}
_currentPriceUpScaled = _clampPriceUpscaled(_currentPriceUpScaled);

currentPriceUpScaled = _currentPriceUpScaled;
lastAdjustedRound = currentRoundNumber;
Expand Down Expand Up @@ -182,6 +179,18 @@ contract PriceOracle is AccessControl {
// STATE READING //
////////////////////////////////////////

/// @notice Clamp upscaled price to [minimumPriceUpscaled, MAX_CURRENT_PRICE_UPSCALED].
function _clampPriceUpscaled(uint64 priceUpScaled) private view returns (uint64) {
uint64 minU = uint64(minimumPriceUpscaled);
Comment thread
0xCardiE marked this conversation as resolved.
Outdated
if (priceUpScaled < minU) {
priceUpScaled = minU;
}
if (priceUpScaled > MAX_CURRENT_PRICE_UPSCALED) {
priceUpScaled = MAX_CURRENT_PRICE_UPSCALED;
}
return priceUpScaled;
}

/**
* @notice Return the number of the current round.
*/
Expand Down
Loading