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

Feature/fork etrog #114

Merged
merged 40 commits into from
Jan 26, 2024
Merged

Feature/fork etrog #114

merged 40 commits into from
Jan 26, 2024

Conversation

krlosMata
Copy link
Contributor

This PR does the following:

  • implements all functionalities related with fork-etrog

ignasirv and others added 5 commits September 12, 2023 17:00
Move isForced to batch level

Update tests to fork id 6

fix header timestamp

Implement forced batches logic

Remove GER from batchData

Set block gas limit
Store block info tree root at the end of tx processing
Copy link

sonarcloud bot commented Dec 20, 2023

Quality Gate Passed Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

26 New issues
0 Security Hotspots
No data about Coverage
2.9% Duplication on New Code

See analysis details on SonarCloud

@krlosMata krlosMata marked this pull request as ready for review January 26, 2024 08:49
Copy link

sonarcloud bot commented Jan 26, 2024

Quality Gate Passed Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

26 New issues
0 Security Hotspots
No data about Coverage
2.8% Duplication on New Code

See analysis details on SonarCloud

@@ -12,6 +12,7 @@ on:
branches:
- main
- develop
- feature/fork-etrog
Copy link
Contributor

Choose a reason for hiding this comment

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

No need now

@@ -35,7 +37,7 @@
},
"homepage": "https://github.com/0xPolygonHermez/zkevm-commonjs#readme",
"devDependencies": {
"@0xpolygonhermez/zkevm-contracts": "github:0xPolygonHermez/zkevm-contracts#v3.0.0-rc.1-fork.6",
"@0xpolygonhermez/zkevm-contracts": "github:0xPolygonHermez/zkevm-contracts#feature/l1-info-tree",
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we have tag?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

tests will fail since we need still to migrate to new bridge LxLy

Copy link
Contributor

@ignasirv ignasirv left a comment

Choose a reason for hiding this comment

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

💯

@krlosMata krlosMata merged commit 2aa8a9a into develop Jan 26, 2024
4 checks passed
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.

4 participants