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

Support shanghai in geth tracer #497

Merged
merged 4 commits into from
May 9, 2023
Merged

Support shanghai in geth tracer #497

merged 4 commits into from
May 9, 2023

Conversation

lispc
Copy link

@lispc lispc commented May 3, 2023

Summary

  1. Add shanghai feature to bus-mapping, zkevm-circuits, mock and testool.

  2. Add shanghai config fields to a new struct ChainConfig in external-tracer. It is optional in TraceConfig.

  3. Fix to merge ChainConfig (if not null) from external-tracer in geth-utils.

Test

Test feature shanghai for part test cases as:

cargo test --features shanghai -- --nocapture begin_tx_

TODO

Suppose to work on other tasks in separate PRs. Move to issue #504.

add a feature flag "shanghai", with which, the shanghai fork of geth tracer used, the some circuit constraints changed accordingly like the gas of init code / warm coin base.
we can either merge this after ci pass (without push0), or add push0 to this pr too.

@lispc lispc changed the title try shanghai wip support shanghai fork May 3, 2023
@silathdiir silathdiir self-assigned this May 4, 2023
@lispc
Copy link
Author

lispc commented May 8, 2023

i changed the order of sub tasks here @silathdiir

@lispc
Copy link
Author

lispc commented May 8, 2023

i think after the first 2 sub tasks, ci can pass for shanghai feature. So we can merge it then start new sub tasks in new prs

@silathdiir silathdiir changed the title wip support shanghai fork Support shanghai in geth tracer May 9, 2023
@silathdiir silathdiir mentioned this pull request May 9, 2023
7 tasks
@lispc lispc merged commit 9d6aa63 into develop May 9, 2023
@lispc lispc deleted the feat/shanghai branch May 9, 2023 03:11
@silathdiir silathdiir restored the feat/shanghai branch May 22, 2023 05:44
@silathdiir silathdiir deleted the feat/shanghai branch May 22, 2023 05:45
github-merge-queue bot pushed a commit to privacy-scaling-explorations/zkevm-circuits that referenced this pull request Jun 2, 2023
…es (#1424)

### Description

1. Add Shanghai related fields to chain config in geth-utils.

2. EIP-3651 (Warm COINBASE): add a new access-list write for coinbase to
Begin TX.

3. Part of EIP-3860 (Limit and meter initcode): only add gas cost of
init code to Begin TX (missing gas cost changes in Create and OOG
Create).

### Issue Link

Issue
#1362

Local related PRs:
scroll-tech#497
scroll-tech#500
scroll-tech#507

Reference previous PR:
#1361

### Type of change

- [x] Breaking change (fix or feature that would cause existing
functionality to not work as expected)

### How Has This Been Tested?

Unit test cases of CI could pass with Shanghai geth traces.

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>
johntaiko pushed a commit to johntaiko/zkevm-circuits that referenced this pull request Aug 20, 2023
…es (privacy-scaling-explorations#1424)

1. Add Shanghai related fields to chain config in geth-utils.

2. EIP-3651 (Warm COINBASE): add a new access-list write for coinbase to
Begin TX.

3. Part of EIP-3860 (Limit and meter initcode): only add gas cost of
init code to Begin TX (missing gas cost changes in Create and OOG
Create).

Issue
privacy-scaling-explorations#1362

Local related PRs:
scroll-tech#497
scroll-tech#500
scroll-tech#507

Reference previous PR:
privacy-scaling-explorations#1361

- [x] Breaking change (fix or feature that would cause existing
functionality to not work as expected)

Unit test cases of CI could pass with Shanghai geth traces.

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>
johntaiko pushed a commit to johntaiko/zkevm-circuits that referenced this pull request Aug 20, 2023
…es (privacy-scaling-explorations#1424)

1. Add Shanghai related fields to chain config in geth-utils.

2. EIP-3651 (Warm COINBASE): add a new access-list write for coinbase to
Begin TX.

3. Part of EIP-3860 (Limit and meter initcode): only add gas cost of
init code to Begin TX (missing gas cost changes in Create and OOG
Create).

Issue
privacy-scaling-explorations#1362

Local related PRs:
scroll-tech#497
scroll-tech#500
scroll-tech#507

Reference previous PR:
privacy-scaling-explorations#1361

- [x] Breaking change (fix or feature that would cause existing
functionality to not work as expected)

Unit test cases of CI could pass with Shanghai geth traces.

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>
johntaiko pushed a commit to johntaiko/zkevm-circuits that referenced this pull request Aug 20, 2023
…es (privacy-scaling-explorations#1424)

1. Add Shanghai related fields to chain config in geth-utils.

2. EIP-3651 (Warm COINBASE): add a new access-list write for coinbase to
Begin TX.

3. Part of EIP-3860 (Limit and meter initcode): only add gas cost of
init code to Begin TX (missing gas cost changes in Create and OOG
Create).

Issue
privacy-scaling-explorations#1362

Local related PRs:
scroll-tech#497
scroll-tech#500
scroll-tech#507

Reference previous PR:
privacy-scaling-explorations#1361

- [x] Breaking change (fix or feature that would cause existing
functionality to not work as expected)

Unit test cases of CI could pass with Shanghai geth traces.

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>
johntaiko pushed a commit to johntaiko/zkevm-circuits that referenced this pull request Aug 20, 2023
…es (privacy-scaling-explorations#1424)

1. Add Shanghai related fields to chain config in geth-utils.

2. EIP-3651 (Warm COINBASE): add a new access-list write for coinbase to
Begin TX.

3. Part of EIP-3860 (Limit and meter initcode): only add gas cost of
init code to Begin TX (missing gas cost changes in Create and OOG
Create).

Issue
privacy-scaling-explorations#1362

Local related PRs:
scroll-tech#497
scroll-tech#500
scroll-tech#507

Reference previous PR:
privacy-scaling-explorations#1361

- [x] Breaking change (fix or feature that would cause existing
functionality to not work as expected)

Unit test cases of CI could pass with Shanghai geth traces.

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants