Skip to content

Improve the data-transformer::cairo-types::CairoU256 creation logic #3622

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
wants to merge 11 commits into
base: master
Choose a base branch
from
+35 −31
Open

Improve the data-transformer::cairo-types::CairoU256 creation logic #3622

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
652815d
update CairoU256::from_bytes signature and fix tests
Aug 8, 2025
ce66314
refactor CairoU256::from_bytes calls
Aug 8, 2025
3d73b2a
cargo gmt
Aug 8, 2025
c4b6d16
fix s_bytes indexing
Aug 11, 2025
deb118b
remove comment
Aug 11, 2025
9d91746
Merge branch 'master' into data-transformer-CairoU256
Aug 11, 2025
8305ac7
refactor generate_ecdsa_keys logic
Aug 19, 2025
968c56d
Merge branch 'master' into data-transformer-CairoU256
Aug 19, 2025
0f4c4c1
use inline closure to extract coordinates
Aug 19, 2025
80e8630
remove unused import
Aug 19, 2025
e24dc86
Merge branch 'master' into data-transformer-CairoU256
cptartur Aug 21, 2025
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
30 changes: 21 additions & 9 deletions crates/cheatnet/src/runtime_extensions/forge_runtime_extension/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,26 +361,36 @@ impl<'a> ExtensionLogic for ForgeExtension<'a> {
let curve: Felt = input_reader.read()?;
let curve = curve.to_short_string().ok();

let (signing_key_bytes, verifying_key_bytes) = {
let (signing_key_bytes, x_coordinate_bytes, y_coordinate_bytes) = {
match curve.as_deref() {
Some("Secp256k1") => {
let signing_key = k256::ecdsa::SigningKey::random(
&mut k256::elliptic_curve::rand_core::OsRng,
);
let verifying_key = signing_key.verifying_key();
let verifying_key = signing_key
.verifying_key()
.to_encoded_point(false)
.to_bytes();
let verifying_key = verifying_key.iter().as_slice();
(
signing_key.to_bytes(),
verifying_key.to_encoded_point(false).to_bytes(),
signing_key.to_bytes().as_slice()[0..32].try_into().unwrap(),
verifying_key[1..33].try_into().unwrap(),
verifying_key[33..65].try_into().unwrap(),
)
}
Some("Secp256r1") => {
let signing_key = p256::ecdsa::SigningKey::random(
&mut p256::elliptic_curve::rand_core::OsRng,
);
let verifying_key = signing_key.verifying_key();
let verifying_key = signing_key
.verifying_key()
.to_encoded_point(false)
.to_bytes();
let verifying_key = verifying_key.iter().as_slice();
(
signing_key.to_bytes(),
verifying_key.to_encoded_point(false).to_bytes(),
signing_key.to_bytes().as_slice()[0..32].try_into().unwrap(),
verifying_key[1..33].try_into().unwrap(),
verifying_key[33..65].try_into().unwrap(),
)
}
_ => return Ok(CheatcodeHandlingResult::Forwarded),
Expand All @@ -389,8 +399,8 @@ impl<'a> ExtensionLogic for ForgeExtension<'a> {

Ok(CheatcodeHandlingResult::from_serializable((
CairoU256::from_bytes(&signing_key_bytes),
CairoU256::from_bytes(&verifying_key_bytes[1..]), // bytes of public_key's x-coordinate
CairoU256::from_bytes(&verifying_key_bytes[33..]), // bytes of public_key's y-coordinate
CairoU256::from_bytes(&x_coordinate_bytes), // bytes of public_key's x-coordinate
CairoU256::from_bytes(&y_coordinate_bytes), // bytes of public_key's y-coordinate
)))
}
"ecdsa_sign_message" => {
Expand Down Expand Up @@ -438,6 +448,8 @@ impl<'a> ExtensionLogic for ForgeExtension<'a> {
};

let result = result.map(|(r_bytes, s_bytes)| {
let r_bytes: [u8; 32] = r_bytes.as_slice()[0..32].try_into().unwrap();
let s_bytes: [u8; 32] = s_bytes.as_slice()[0..32].try_into().unwrap();
(
CairoU256::from_bytes(&r_bytes),
CairoU256::from_bytes(&s_bytes),
Expand Down
25 changes: 3 additions & 22 deletions crates/data-transformer/src/cairo_types/u256.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ pub struct CairoU256 {

impl CairoU256 {
#[must_use]
pub fn from_bytes(bytes: &[u8]) -> Self {
// Takes slice without explicit size because of cheatnet's specific usages (See Issue #2575)
pub fn from_bytes(bytes: &[u8; 32]) -> Self {
Self {
low: u128::from_be_bytes(bytes[16..32].try_into().unwrap()),
high: u128::from_be_bytes(bytes[0..16].try_into().unwrap()),
Expand Down Expand Up @@ -85,37 +84,19 @@ mod tests {
244, 192, 163, 138, 253, 42, 253, 125, 53, 127, 44,
];

const TOO_BIG_NUMBER_BYTES: [u8; 48] = [
222, 9, 69, 194, 71, 77, 155, 51, 51, 49, 35, 229, 62, 55, 169, 63, 93, 228, 186, 10, 219,
244, 192, 163, 138, 253, 42, 253, 125, 53, 127, 44, 21, 37, 21, 37, 21, 37, 21, 37, 21, 37,
21, 37, 21, 37, 21, 37,
];

const BIG_NUMBER_LIMBS: [u128; 2] = [
124_805_820_680_284_125_994_760_982_863_763_832_620,
295_136_760_614_571_572_862_546_075_274_463_127_871,
];

#[test_case(&[0; 32], [0, 0] ; "zeros")]
#[test_case(&BIG_NUMBER_BYTES[..], BIG_NUMBER_LIMBS; "big")]
fn test_happy_case_from_bytes(bytes: &[u8], expected_limbs: [u128; 2]) {
#[test_case(&BIG_NUMBER_BYTES, BIG_NUMBER_LIMBS; "big")]
fn test_happy_case_from_bytes(bytes: &[u8; 32], expected_limbs: [u128; 2]) {
let result = CairoU256::from_bytes(bytes);

assert_eq!([result.low, result.high], expected_limbs);
}

#[should_panic(expected = "range end index 32 out of range for slice of length 4")]
#[test]
fn test_from_bytes_input_too_short() {
let _result = CairoU256::from_bytes(&[2, 1, 3, 7]);
}

#[test]
fn test_happy_case_from_bytes_longer_input() {
let result = CairoU256::from_bytes(&TOO_BIG_NUMBER_BYTES);
assert_eq!([result.low, result.high], BIG_NUMBER_LIMBS);
}

#[test_case("0x0", [0, 0] ; "zero_hex")]
#[test_case("0", [0, 0] ; "zero_dec")]
#[test_case("0x237abc", [2_325_180, 0] ; "small_hex")]
Expand Down
Loading