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

Fix memop reads, from_prover_inputs and cleanup.

Browse Source
This commit is contained in:
Linda Guiga 2023-09-07 12:15:17 +01:00
parent ddf2b81733
commit 9a06fc9b95
No known key found for this signature in database
2 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evm/src/proof.rs
View File

@ -257,7 +257,9 @@ impl PublicValuesTarget {
+ BlockHashesTarget::BLOCK_HASHES_SIZE],
),
extra_block_data: ExtraBlockDataTarget::from_public_inputs(
&pis[TrieRootsTarget::SIZE * 2 + BlockMetadataTarget::SIZE
&pis[TrieRootsTarget::SIZE * 2
+ BlockMetadataTarget::SIZE
+ BlockHashesTarget::BLOCK_HASHES_SIZE
..TrieRootsTarget::SIZE * 2
+ BlockMetadataTarget::SIZE
+ BlockHashesTarget::BLOCK_HASHES_SIZE

23
evm/src/recursive_verifier.rs
View File

@ -510,7 +510,7 @@ pub(crate) fn get_memory_extra_looking_products_circuit<
let mut product = builder.one();
// Add metadata writes.
let block_fields_without_beneficiary_and_basefee_and_bloom = [
let block_fields_scalars = [
(
GlobalMetadata::BlockTimestamp as usize,
public_values.block_metadata.block_timestamp,
@ -553,7 +553,7 @@ pub(crate) fn get_memory_extra_looking_products_circuit<
),
];
let beneficiary_base_fee_fields: [(usize, &[Target]); 2] = [
let beneficiary_base_fee_cur_hash_fields: [(usize, &[Target]); 3] = [
(
GlobalMetadata::BlockBeneficiary as usize,
&public_values.block_metadata.block_beneficiary,
@ -562,10 +562,14 @@ pub(crate) fn get_memory_extra_looking_products_circuit<
GlobalMetadata::BlockBaseFee as usize,
&public_values.block_metadata.block_base_fee,
),
(
GlobalMetadata::BlockCurrentHash as usize,
&public_values.block_hashes.cur_hash,
),
];
let metadata_segment = builder.constant(F::from_canonical_u32(Segment::GlobalMetadata as u32));
block_fields_without_beneficiary_and_basefee_and_bloom.map(|(field, target)| {
block_fields_scalars.map(|(field, target)| {
// Each of those fields fit in 32 bits, hence in a single Target.
product = add_data_write(
builder,
@ -577,7 +581,7 @@ pub(crate) fn get_memory_extra_looking_products_circuit<
);
});
beneficiary_base_fee_fields.map(|(field, targets)| {
beneficiary_base_fee_cur_hash_fields.map(|(field, targets)| {
product = add_data_write(
builder,
challenge,
@ -589,14 +593,6 @@ pub(crate) fn get_memory_extra_looking_products_circuit<
});
// Add block hashes writes.
product = add_data_write(
builder,
challenge,
product,
metadata_segment,
GlobalMetadata::BlockCurrentHash as usize,
&public_values.block_hashes.cur_hash,
);
let block_hashes_segment = builder.constant(F::from_canonical_u32(Segment::BlockHashes as u32));
for i in 0..256 {
product = add_data_write(
@ -620,7 +616,7 @@ pub(crate) fn get_memory_extra_looking_products_circuit<
i,
&public_values.block_metadata.block_bloom[i * 8..(i + 1) * 8],
);
}
for i in 0..8 {
product = add_data_write(
builder,
@ -642,7 +638,6 @@ pub(crate) fn get_memory_extra_looking_products_circuit<
&public_values.extra_block_data.block_bloom_after[i * 8..(i + 1) * 8],
);
}
}
// Add trie roots writes.
let trie_fields = [