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.

Sign up for GitHub

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

Jump to bottom

Sync taiko 2024-03-27 #5

Merged
merged 8 commits into from
Mar 28, 2024
Merged

Sync taiko 2024-03-27 #5

merged 8 commits into from
Mar 28, 2024

Conversation

CeciliaZ030
Copy link

@CeciliaZ030 CeciliaZ030 commented Mar 27, 2024 •
edited
Loading

  • squashed the previous taiko changes from Sync taiko v3.5 #2
  • reapply to the latest upstream
  • change "optimism" flags to "flags" while reserving "taiko-default-handler" for BBR
  • keep a dummy L1BlockInfo for potential usage in accessing L1 state

** Note: looks like some newly included dep breaks cargo check --target riscv32imac-unknown-none-elf --no-default-features again so powdr would not compile, but who cares. All vm should support std.

@CeciliaZ030
Squashed commit of the following:
92c7a18 
commit b960c3f
Merge: 983db4b 70ab8b6
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Fri Jan 19 03:28:32 2024 +0800

    Merge remote-tracking branch 'cecilia/main' into sync-taiko-v3.5

commit 983db4b
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Fri Jan 19 03:21:10 2024 +0800

    non exclusive op & taiko flags

commit 115d5fe
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Fri Jan 19 03:11:48 2024 +0800

    cleanup

commit 7b0065b
Merge: c306f98 9d655c4
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Fri Jan 19 03:06:29 2024 +0800

    Merge remote-tracking branch 'cecilia/main' into sync-taiko-v3.5

commit c306f98
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Fri Jan 19 03:02:19 2024 +0800

    handler register

commit 72a085e
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Thu Jan 18 16:02:07 2024 +0800

    fix specs and conditional op/taiko flags, todo: taiko handlers

commit 3ec69ee
Merge: a983b13 9a03c7e
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Thu Jan 18 16:01:11 2024 +0800

    Merge remote-tracking branch 'cecilia/serde-no-std' into sync-taiko-v3.5

commit 9a03c7e
Merge: cf4da2f 0629883
Author: CeciliaZ030 <45245961+CeciliaZ030@users.noreply.github.com>
Date:   Thu Jan 18 14:44:30 2024 +0800

    Merge branch 'main' into serde-no-std

commit cf4da2f
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Thu Jan 18 14:35:37 2024 +0800

    "preserve_order"

commit 6f95113
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Thu Jan 18 14:33:28 2024 +0800

    delete comment #"std"

commit 15c51fa
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Thu Jan 18 13:30:33 2024 +0800

    optional serde std

commit a983b13
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Thu Jan 18 13:30:33 2024 +0800

    optional serde std

commit 546cb51
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Thu Jan 18 12:47:50 2024 +0800

    update

commit f0d6806
Author: Leo Alt <leo@ethereum.org>
Date:   Fri Nov 24 16:32:08 2023 +0100

    use serde as no-std

commit 0546172
Merge: c7aee3a 327dc05
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Wed Jan 17 03:46:52 2024 +0800

    Merge remote-tracking branch 'john/feat/taiko' into cecilia-taiko

commit c7aee3a
Author: ceciliaz030 <zhangyixin319@gmail.com>
Date:   Wed Jan 17 03:11:35 2024 +0800

    init

commit 327dc05
Author: john xu <john@taiko.xyz>
Date:   Mon Dec 18 06:58:08 2023 +0000

    Refactor handler functions in EVM implementation

commit 2e96144
Author: john xu <john@taiko.xyz>
Date:   Sat Dec 9 07:59:10 2023 +0000

    Add condition to disable gas refund for anchor transactions

commit 13c2272
Author: john xu <john@taiko.xyz>
Date:   Sat Dec 9 07:21:01 2023 +0000

    Remove once_cell dependency

commit 6c6b061
Author: john xu <john@taiko.xyz>
Date:   Sat Dec 9 07:13:20 2023 +0000

    Add taiko module and handler

commit cbbfe9c
Author: Leo Alt <leo@ethereum.org>
Date:   Fri Nov 24 16:32:08 2023 +0100

    use serde as no-std

commit 0e7d779
Author: john xu <john@taiko.xyz>
Date:   Thu Oct 19 12:28:10 2023 +0000

    feat: anchor check in zeth

commit daf73ee
Author: john xu <john@taiko.xyz>
Date:   Tue Oct 17 13:18:20 2023 +0000

    feat: support taiko protocol

taiko reimburse_caller & reward_beneficiary

KATLA is before CANCUN, aka does not have 4844

--features taiko

more registers

update

pub mod handler_register

Update Cargo.toml

manual pick: bluealloy/pull/1073 & succinct/john/v5.0.0-patched

update c-kzg 1.0.0

latest bump compiled
@CeciliaZ030
optimism -> taiko & keep default-handler
3b2817c
@CeciliaZ030 CeciliaZ030 changed the title Sync taiko 2024 03 27 Sync taiko 2024-03-27 Mar 27, 2024
Brechtpd
Brechtpd reviewed Mar 28, 2024
View reviewed changes
crates/precompile/src/lib.rs Outdated Show resolved Hide resolved
crates/precompile/Cargo.toml Outdated Show resolved Hide resolved
crates/primitives/src/env.rs Outdated Show resolved Hide resolved
crates/primitives/src/result.rs Outdated Show resolved Hide resolved
crates/primitives/src/result.rs Outdated Show resolved Hide resolved
crates/revm/src/lib.rs Outdated Show resolved Hide resolved
crates/interpreter/src/instructions/opcode.rs Outdated Show resolved Hide resolved
crates/revm/src/taiko/handler_register.rs Outdated Show resolved Hide resolved
crates/revm/src/taiko/handler_register.rs Outdated Show resolved Hide resolved
crates/revm/src/taiko/handler_register.rs Outdated Show resolved Hide resolved
@CeciliaZ030 CeciliaZ030 changed the base branch from main to unstable March 28, 2024 02:56
Brechtpd
Brechtpd reviewed Mar 28, 2024
View reviewed changes
crates/primitives/src/result.rs Outdated Show resolved Hide resolved
crates/revm/src/taiko/handler_register.rs Outdated
Comment on lines 41 to 42
let _beneficiary = context.evm.env.block.coinbase;
let _effective_gas_price = context.evm.env.effective_gas_price();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just remove?

crates/revm/src/taiko/handler_register.rs Show resolved Hide resolved
CeciliaZ030 and others added 3 commits March 27, 2024 20:11
@CeciliaZ030 @Brechtpd
Update result.rs
b2a2042 
Co-authored-by: Brecht Devos <Brechtp.Devos@gmail.com>
@CeciliaZ030 @Brechtpd
Update handler_register.rs
2ce3836 
Co-authored-by: Brecht Devos <Brechtp.Devos@gmail.com>
@CeciliaZ030
last change
a7a5e78
@CeciliaZ030 CeciliaZ030 merged commit 94e8392 into taikoxyz:unstable Mar 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Brechtpd Brechtpd Brechtpd left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@CeciliaZ030 @Brechtpd