Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Both branches support Stwo prover opcodes (Blake2s, QM31) since v2.0.0.

#### Upcoming Changes

* perf: remove redundant Felt252 bytes roundtrip in SignatureBuiltinRunner [#2323](https://github.com/lambdaclass/cairo-vm/pull/2323)

* feat: Make `write_encoded` API public again [#2306](https://github.com/lambdaclass/cairo-vm/pull/2306)

* refactor: deduplicate memcpy/memset scope initialization in builtin hint processor [#2313](https://github.com/lambdaclass/cairo-vm/pull/2313)
Expand Down
38 changes: 7 additions & 31 deletions vm/src/vm/runners/builtin_runner/signature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,7 @@ impl SignatureBuiltinRunner {
relocatable: Relocatable,
(r, s): &(Felt252, Felt252),
) -> Result<(), MemoryError> {
let r_be_bytes = r.to_bytes_be();
let s_be_bytes = s.to_bytes_be();
let (r_felt, s_felt) = (
Felt252::from_bytes_be(&r_be_bytes),
Felt252::from_bytes_be(&s_be_bytes),
);

let signature = Signature {
r: r_felt,
s: s_felt,
};
let signature = Signature { r: *r, s: *s };

self.signatures
.borrow_mut()
Expand Down Expand Up @@ -131,10 +121,8 @@ impl SignatureBuiltinRunner {
.get(&pubkey_addr)
.ok_or_else(|| MemoryError::SignatureNotFound(Box::new(pubkey_addr)))?;

let public_key = Felt252::from_bytes_be(&pubkey.to_bytes_be());
let (r, s) = (signature.r, signature.s);
let message = Felt252::from_bytes_be(&msg.to_bytes_be());
match verify(&public_key, &message, &r, &s) {
match verify(&pubkey, &msg, &r, &s) {
Ok(true) => Ok(vec![]),
_ => Err(MemoryError::InvalidSignature(Box::new((
format!("({}, {})", signature.r, signature.s),
Expand Down Expand Up @@ -171,15 +159,7 @@ impl SignatureBuiltinRunner {
.signatures
.borrow()
.iter()
.map(|(k, v)| {
(
*k,
(
Felt252::from_bytes_be(&v.r.to_bytes_be()),
Felt252::from_bytes_be(&v.s.to_bytes_be()),
),
)
})
.map(|(k, v)| (*k, (v.r, v.s)))
.collect();
BuiltinAdditionalData::Signature(signatures)
}
Expand All @@ -197,13 +177,9 @@ impl SignatureBuiltinRunner {
if addr.segment_index != self.base as isize {
return Err(RunnerError::InvalidAdditionalData(BuiltinName::ecdsa));
}
self.signatures.borrow_mut().insert(
*addr,
Signature {
r: Felt252::from_bytes_be(&r.to_bytes_be()),
s: Felt252::from_bytes_be(&s.to_bytes_be()),
},
);
self.signatures
.borrow_mut()
.insert(*addr, Signature { r: *r, s: *s });
}
Ok(())
}
Expand Down Expand Up @@ -235,7 +211,7 @@ impl SignatureBuiltinRunner {
pubkey: *pubkey,
msg: *msg,
signature_input: SignatureInput {
r: Felt252::from_bytes_be(&signature.r.to_bytes_be()),
r: signature.r,
w: Felt252::from(
&div_mod(
&BigInt::one(),
Expand Down