Skip to content
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.

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

Merge upstream #44

Merged
merged 48 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
c9391be
Update check_ctls with extra looking values (#1290)
Nashtare Oct 16, 2023
29fdd3e
minor: use explicit builder.assert_zero for readability (#1293)
Nashtare Oct 16, 2023
817e3e7
Combine DUP and SWAP (#1254)
LindaGuiga Oct 18, 2023
49976ea
Check gas in sys_stop (#1297)
Nashtare Oct 19, 2023
05006de
Pad according to RATE rather than WIDTH (#1299)
LindaGuiga Oct 21, 2023
29005dc
Use SUBMOD in Kernel
Nashtare Oct 21, 2023
6ca9970
Alter stack to remove SWAPs for SUBMOD
Nashtare Oct 21, 2023
07ffe4f
Combine stack macros for fewer operations
Nashtare Oct 21, 2023
40de505
Remove outdated code
Nashtare Oct 21, 2023
6d2586e
Amortize bloom reset
Nashtare Oct 21, 2023
ba61d15
Add macro for copying sequences of bytes
Nashtare Oct 21, 2023
595dfa6
Merge pull request #1301 from topos-protocol/submod_kernel
Nashtare Oct 23, 2023
9607a41
Merge pull request #1303 from topos-protocol/amortize_receipt_reset
Nashtare Oct 23, 2023
e2b6620
Merge pull request #1302 from topos-protocol/remove_kernel_memory_zer…
Nashtare Oct 23, 2023
503a31b
Reviews
Nashtare Oct 23, 2023
4140eb5
Fix
Nashtare Oct 23, 2023
0300a32
Merge pull request #1304 from topos-protocol/memcpy_bytes
Nashtare Oct 23, 2023
d185d30
Speed-up memset and fix it to write 0 values
Nashtare Oct 23, 2023
385ab3c
Remove redundant
Nashtare Oct 23, 2023
8af189b
Merge pull request #1305 from topos-protocol/memset
Nashtare Oct 23, 2023
83054b0
Handle empty case for memcpy_bytes
Nashtare Oct 23, 2023
60811d0
Also for memset
Nashtare Oct 23, 2023
8326db6
refactor: remove usage of unstable `generic_const_exprs` in starky (#…
spiral-ladder Oct 24, 2023
b212fff
Merge pull request #1306 from topos-protocol/fix_empty_last_chunk
Nashtare Oct 24, 2023
b31f706
Apply rustfmt with latest nightly
Nashtare Oct 24, 2023
ed5ec3c
Merge pull request #1307 from topos-protocol/fmt
Nashtare Oct 24, 2023
c1c1ab6
Fix wcopy and extcodecopy for ranges over code limit
Nashtare Oct 24, 2023
44af80f
Merge pull request #1309 from topos-protocol/fix_padding_in_wcopy
Nashtare Oct 25, 2023
3aeec83
Add missing constraints for DUP/SWAP (#1310)
hratoanina Oct 26, 2023
3feb04d
Refactor wcopy syscalls
Nashtare Oct 26, 2023
a1b178f
Refactor memcpy
Nashtare Oct 26, 2023
a9e47af
Refactor codecopy
Nashtare Oct 26, 2023
ade5b8c
Fix
Nashtare Oct 26, 2023
75fdd34
Fix calldatacopy
Nashtare Oct 26, 2023
15a9e99
Fix test on interpreter side
Nashtare Oct 26, 2023
666a155
Remove new_stack_top_channel from StackBehavior (#1296)
LindaGuiga Oct 26, 2023
7447959
Fix kexit_info in test
Nashtare Oct 27, 2023
6f52b76
Review
Nashtare Oct 27, 2023
0258ad4
Merge pull request #1314 from topos-protocol/refactor_wcopy
Nashtare Oct 27, 2023
c96a870
Move empty check inside final iteration
Nashtare Oct 30, 2023
4b40bc0
Remerge context flags (#1292)
hratoanina Oct 30, 2023
af4935c
Merge NOT and POP flags. (#1257)
LindaGuiga Oct 30, 2023
0f299d4
Merge pull request #1316 from topos-protocol/memcpy_tiny
Nashtare Oct 30, 2023
afd357f
More of memcpy_bytes
Nashtare Oct 30, 2023
0d97b93
Add some documentation in EVM crate (#1295)
Nashtare Oct 30, 2023
6332900
Combine PUSH0 and PC flags. (#1256)
LindaGuiga Oct 30, 2023
3ca1662
Merge pull request #1317 from topos-protocol/more_memcpy_bytes
Nashtare Oct 31, 2023
e0a7ad9
Merge remote-tracking branch 'upstream/main' into matthias/upstream
matthiasgoergens Nov 1, 2023
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: 1 addition & 1 deletion plonky2/src/plonk/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub trait Hasher<F: RichField>: Sized + Copy + Debug + Eq + PartialEq {
fn hash_pad(input: &[F]) -> Self::Hash {
let mut padded_input = input.to_vec();
padded_input.push(F::ONE);
while (padded_input.len() + 1) % Self::Permutation::WIDTH != 0 {
while (padded_input.len() + 1) % Self::Permutation::RATE != 0 {
padded_input.push(F::ZERO);
}
padded_input.push(F::ONE);
Expand Down
1 change: 0 additions & 1 deletion starky/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![allow(incomplete_features)]
#![allow(clippy::too_many_arguments)]
#![allow(clippy::type_complexity)]
#![cfg_attr(not(feature = "std"), no_std)]
Expand Down