logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-07 00:03:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix overflow check and test. Remove [..8] when using h256_limbs.

Browse Source
This commit is contained in:
Linda Guiga 2023-09-05 15:24:33 +01:00
parent c30b18346f
commit 1c01d682aa
No known key found for this signature in database
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
evm/src/cpu/kernel/asm/memory/metadata.asm
View File

@ -247,9 +247,12 @@ global blockhash:
// stack: block_number, retdest
%mload_global_metadata(@GLOBAL_METADATA_BLOCK_NUMBER)
// stack: cur_block_number, block_number, retdest
// Check for an overflow, since we're incrementing `block_number` afterwards.
DUP2 %eq_const(@U256_MAX) %jumpi(zero_hash)
// stack: cur_block_number, block_number, retdest
DUP1 DUP3 %increment GT %jumpi(zero_hash) // if block_number >= cur_block_number
// stack: cur_block_number, block_number, retdest
DUP2 PUSH 256 %add_or_fault
DUP2 PUSH 256 ADD
// stack: block_number+256, cur_block_number, block_number, retdest
DUP2 GT %jumpi(zero_hash) // if cur_block_number > block_number + 256
// If we are here, the provided block number is correct

16
evm/src/cpu/kernel/tests/block_hash.rs
View File

@ -97,8 +97,7 @@ fn test_small_index_block_hash() -> Result<()> {
}
#[test]
#[should_panic]
fn test_block_hash_with_overflow() {
fn test_block_hash_with_overflow() -> Result<()> {
let blockhash_label = KERNEL.global_labels["blockhash"];
let retdest = 0xDEADBEEFu32.into();
let cur_block_number = 1;
@ -111,5 +110,16 @@ fn test_block_hash_with_overflow() {
interpreter.set_memory_segment(Segment::BlockHashes, hashes[0..256].to_vec());
interpreter.set_global_metadata_field(GlobalMetadata::BlockCurrentHash, hashes[256]);
interpreter.set_global_metadata_field(GlobalMetadata::BlockNumber, cur_block_number.into());
let _ = interpreter.run();
interpreter.run()?;
let result = interpreter.stack();
assert_eq!(
result[0],
0.into(),
"Resulting block hash {:?} different from expected hash {:?}",
result[0],
0
);
Ok(())
}

4
evm/src/get_challenges.rs
View File

@ -155,9 +155,9 @@ fn observe_block_hashes<
block_hashes: &BlockHashes,
) {
for i in 0..256 {
challenger.observe_elements(&h256_limbs::<F>(block_hashes.prev_hashes[i])[0..8]);
challenger.observe_elements(&h256_limbs::<F>(block_hashes.prev_hashes[i]));
}
challenger.observe_elements(&h256_limbs::<F>(block_hashes.cur_hash)[0..8]);
challenger.observe_elements(&h256_limbs::<F>(block_hashes.cur_hash));
}
fn observe_block_hashes_target<

6
evm/src/recursive_verifier.rs
View File

@ -1057,7 +1057,7 @@ pub(crate) fn set_block_hashes_target<F, W, const D: usize>(
W: Witness<F>,
{
for i in 0..256 {
let block_hash_limbs: [F; 8] = h256_limbs::<F>(block_hashes.prev_hashes[i])[..8]
let block_hash_limbs: [F; 8] = h256_limbs::<F>(block_hashes.prev_hashes[i])
.try_into()
.unwrap();
witness.set_target_arr(
@ -1065,9 +1065,7 @@ pub(crate) fn set_block_hashes_target<F, W, const D: usize>(
&block_hash_limbs,
);
}
let cur_block_hash_limbs: [F; 8] = h256_limbs::<F>(block_hashes.cur_hash)[..8]
.try_into()
.unwrap();
let cur_block_hash_limbs: [F; 8] = h256_limbs::<F>(block_hashes.cur_hash).try_into().unwrap();
witness.set_target_arr(&block_hashes_target.cur_hash, &cur_block_hash_limbs);
}