Skip to content

fix(number/goldilocks): enforce canonicalization in from_str_radix #3470

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
MozirDmitriy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(number/goldilocks): enforce canonicalization in from_str_radix #3470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions number/src/goldilocks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,12 @@ impl FieldElement for GoldilocksField {
}

fn from_str_radix(s: &str, radix: u32) -> Result<Self, String> {
u64::from_str_radix(s, radix)
.map(Self)
.map_err(|e| e.to_string())
let n = u64::from_str_radix(s, radix).map_err(|e| e.to_string())?;
if n < Self::ORDER {
Ok(Self::from_canonical_u64(n))
} else {
Err(format!("Number \"{s}\" too large for Goldilocks field."))
}
}

fn checked_from(value: ibig::UBig) -> Option<Self> {
Expand Down Expand Up @@ -625,6 +628,19 @@ mod test {
assert!(!(y + 1.into()).is_in_lower_half());
}

#[test]
fn from_str_radix_rejects_modulus() {
// ORDER = 0xffffffff00000001, should be rejected
assert!(GoldilocksField::from_str_radix("ffffffff00000001", 16).is_err());
}

#[test]
fn from_str_radix_accepts_order_minus_one() {
// ORDER - 1 = 0xffffffff00000000, should be accepted and equal to the literal value
let v = GoldilocksField::from_str_radix("ffffffff00000000", 16).unwrap();
assert_eq!(v.to_canonical_u64(), 0xffff_ffff_0000_0000);
}

#[test]
#[should_panic]
fn integer_div_by_zero() {
Expand Down