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

feat(ci): Remove support for features after MSRV #1018

Merged
merged 9 commits into from
Feb 10, 2025

Conversation

ratankaliani
Copy link
Contributor

@ratankaliani ratankaliani commented Feb 7, 2025

Motivation

Currently in kona, the CI runs with the latest stable toolchain.

This allows for features stabilized after the latest MSRV (e.g. rust-lang/rust#129195) to be used, which causes crates such as OP Succinct to fail to compile. This is because SP1's Rust toolchain (as well as other zkVM Rust toolchains) are not always up to date with the latest stable Rust toolchain, though they're above the MSRV in kona, which is currently set to 1.81.

Solution

  • Update CI to use the MSRV toolchain (1.81).
  • Add a rust-toolchain.toml file, which ensures during local development that the MSRV toolchain is used.
  • Update functions to reflect the fact that const_mut_refs is not stabilized.
  • Set clippy in justfile to use stable, instead of nightly. fmt should still use nightly for features enabled in rustfmt.toml.
  • Remove #![allow(clippy::unnecessary_map_or)], which does not exist in the clippy toolchain for 1.81

Misc

  • Expose start_server, which is nice for OP Succinct. Happy to separate this into a different PR.

Context

SP1's current supported Rust toolchain is 1.82, and the const_mut_refs feature was stabilized in 1.83.

[sp1]  error[E0658]: mutable references are not allowed in constant functions
[sp1]    --> /home/ubuntu/.cargo/git/checkouts/kona-eb08956031b8bea7/2e37ea5/crates/mpt/src/list_walker.rs:80:29
[sp1]     |
[sp1]  80 |     pub const fn take_inner(&mut self) -> Option<VecDeque<(Bytes, Bytes)>> {
[sp1]     |                             ^^^^^^^^^
[sp1]     |
[sp1]     = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
[sp1]     = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
[sp1]  
[sp1]  error[E0658]: mutable references are not allowed in constant functions
[sp1]    --> /home/ubuntu/.cargo/git/checkouts/kona-eb08956031b8bea7/2e37ea5/crates/mpt/src/list_walker.rs:81:9
[sp1]     |
[sp1]  81 |         self.inner.take()
[sp1]     |         ^^^^^^^^^^
[sp1]     |
[sp1]     = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
[sp1]     = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
[sp1]  
[sp1]  error: `core::option::Option::<T>::take` is not yet stable as a const fn
[sp1]    --> /home/ubuntu/.cargo/git/checkouts/kona-eb08956031b8bea7/2e37ea5/crates/mpt/src/list_walker.rs:81:9
[sp1]     |
[sp1]  81 |         self.inner.take()
[sp1]     |         ^^^^^^^^^^^^^^^^^
[sp1]     |
[sp1]     = help: add `#![feature(const_option)]` to the crate attributes to enable

@ratankaliani ratankaliani marked this pull request as ready for review February 7, 2025 07:56
@ratankaliani ratankaliani changed the title feat: Remove support for features after MSRV feat(ci): Remove support for features after MSRV Feb 7, 2025
@ratankaliani
Copy link
Contributor Author

@clabby Let me know if you want me to consolidate the toolchain declaration as 1.81 in a cleaner way. This is the main issue blocking us from using the upstream, and would help us move off of our fork.

FWIW, we're generally within 2 versions of the latest stable Rust toolchain, and it's on our todo list to add 1.83 support. This PR is warranted IMO, because the MSRV declared inside of the Cargo.toml isn't being respected.

@ratankaliani ratankaliani force-pushed the ratan/fix-const-mut-1.81 branch from 96bd1d6 to f854cf4 Compare February 7, 2025 21:02
@clabby
Copy link
Collaborator

clabby commented Feb 10, 2025

Ran CI over in #1021, looks good. Need to figure out what's going on with codecov tokenless upload. Thanks :)

@clabby clabby merged commit 2e02cbd into op-rs:main Feb 10, 2025
10 of 14 checks passed
@github-actions github-actions bot mentioned this pull request Feb 10, 2025
byteflyfunny pushed a commit to mantle-xyz/kona that referenced this pull request Feb 13, 2025
byteflyfunny pushed a commit to mantle-xyz/kona that referenced this pull request Feb 14, 2025
byteflyfunny added a commit to mantle-xyz/kona that referenced this pull request Mar 4, 2025
* adjust kona code to support Mantle's current version

- Updated kona-executor codebase to ensure compatibility with the latest Mantle version

* feat: Add EigenDA as a new data source for retrieval

* feature: Adjust derive code to adapt to the Mantle version.

* feature: Adjust derive code to adapt to the Mantle version.

* feat: adapt revm for mantle

* feature: Adjust derive code to adapt to the Mantle version.

* remove grpc request method for zkvm compile

* add test;

* update revm

* add some errors type

* pub use some types

* Refactor code structure; update alloy package version; add new features.

* change bin for proof

* remove da_indexer

* remove da_indexer

* chore: Improve error handling messages for Eigen DA

* add log info

* add log info

* add log info

* add log info

* add log info

* add log info

* fix bug in eigen da blob size

* debug derive

* debug derive

* debug derive

* debug derive

* fix: set base_fee to None (#2)

* build: remove useless deps

* fix: Prior to Holocene activation, this base_fee should always be none

* fix: use non problematic hashmap fns

* Synchronize the latest remote repository code on the main branch; rebase the development branch onto the main branch.

* feat(build): Adjust RV target - `riscv64g` -> `riscv64ima` (op-rs#868)

* feat(build): `riscv64g` -> `riscv64ima`

* turn off `ziscr`, `zfencei`, `zicntr`, `zihpm`

* fmt

* fix

* fix(derive): `BatchStream` Past batch handling (op-rs#876)

* fix(derive): `BatchStream` Past batch handling

* test

* feat(build): Bump `asterisc-builder` version (op-rs#879)

* fix: op-rs rename (op-rs#883)

* fix: op-rs rename

* fix: justfile

* chore: op-rs rename:

* chore(derive): Test Ignoring EIP-7702 (op-rs#887)

* fix: Small Spelling Issue (op-rs#893)

* Move temporary error logs to lower level than WARN (op-rs#897)

* chore: fix some typos in comment (op-rs#906)

Signed-off-by: piguagua <piguagua@aliyun.com>

* feat(driver): Multi-block derivation (op-rs#888)

Co-authored-by: refcell <abigger87@gmail.com>

* chore(executor): Remove `anyhow` dev-dependency (op-rs#937)

* feat: use empty requests hash when isthmus enabled (op-rs#951)

* feat: Derive Eq/Ord/Hash for (Archived) PreimageKey(Type) (op-rs#956)

* feat: allow 7702 receipts after Isthmus active (op-rs#959)

* feat: fill eip 7702 tx env with auth list (op-rs#958)

Co-authored-by: refcell <abigger87@gmail.com>

* feat(executor): EIP-2935 Syscall Support [ISTHMUS] (op-rs#963)

* feat(executor): EIP-7251 Syscall Support [ISTHMUS] (op-rs#968)

* chore(executor): TxEnv Stuffing (op-rs#970)

* feat(client): EIP-2537 BLS12-381 Curve Precompile Acceleration (op-rs#960)

Co-authored-by: clabby <ben@clab.by>

* chore(executor): De-duplicate `TrieAccount` type (op-rs#977)

* fix(executor): Removes EIP-7002 and EIP-7251 Pre-block Calls (op-rs#990)

* feat(proof-sdk): Cleanup `Hint` API (op-rs#998)

* feat(mpt): Copy-on-hash (op-rs#1001)

* feat(host): Accelerate all BLS12-381 Precompiles (op-rs#1010)

* chore(client): Dedup MSM Required Gas Fn (op-rs#1012)

* chore(client): Precompile Run Macro (op-rs#1014)

* feat(executor): Sort trie keys (op-rs#1016)

* feat(ci): Remove support for features after MSRV (op-rs#1018)

* update upstream kona with some cherry pick commit

* implemente clear func in eigenda source

* fix: deposit_receipt_version should be None (#6)

* fix: deposit_receipt_version should be None

* chore: cargo fmt

* Mantle kona mpt verify (#7)


* downgrade the version of crossbeam-channel

* Integrated the adjusted Hokulea and rust-kzg-bn254.

* Integrated the eigenda verify

* Adjust the EigenDA blob saving method to temporarily use one-time saving.

* Optimize EigenDA blob data caching and proof generation.

* optimize log levels

* feat: support 7702 && cargo fmt

* fix decode blob data bug

* change eigen da point file

* update op-alloy

* without verification for commitment

* remove point file

---------

Co-authored-by: PinelliaC <wylbzc4928@gmail.com>

---------

Signed-off-by: piguagua <piguagua@aliyun.com>
Co-authored-by: PinelliaC <wylbzc4928@gmail.com>
Co-authored-by: clabby <ben@clab.by>
Co-authored-by: refcell <abigger87@gmail.com>
Co-authored-by: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Co-authored-by: piguagua <piguagua@aliyun.com>
Co-authored-by: Rami <2418646+hashcashier@users.noreply.github.com>
Co-authored-by: Julian Meyer <julianmeyer2000@gmail.com>
Co-authored-by: Julian Meyer <julian.meyer@coinbase.com>
Co-authored-by: Ratan Kaliani <ratankaliani@berkeley.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants