Skip to content

feat(vm): EVM active precompiles (backport #7) #16

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

Merged
merged 5 commits into from
Feb 3, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 31, 2023

This is an automatic backport of pull request #7 done by Mergify.
Cherry-pick of e61d503 has failed:

On branch mergify/bp/release/1.10/pr-7
Your branch is up to date with 'origin/release/1.10'.

You are currently cherry-picking commit e61d503bf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   CHANGELOG.md
	both modified:   core/state_transition.go
	both modified:   core/vm/contracts.go
	both modified:   core/vm/evm.go
	both modified:   core/vm/runtime/runtime.go
	both modified:   eth/tracers/js/goja.go
	both modified:   eth/tracers/native/4byte.go
	both modified:   internal/ethapi/api.go
	both modified:   tests/state_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: Vladislav Varadinov <[email protected]>
(cherry picked from commit e61d503)

# Conflicts:
#	CHANGELOG.md
#	core/state_transition.go
#	core/vm/contracts.go
#	core/vm/evm.go
#	core/vm/runtime/runtime.go
#	eth/tracers/js/goja.go
#	eth/tracers/native/4byte.go
#	internal/ethapi/api.go
#	tests/state_test.go
@mergify mergify bot added the conflicts label Jan 31, 2023
@mergify mergify bot mentioned this pull request Jan 31, 2023
@facs95 facs95 requested a review from fedekunze February 1, 2023 00:43
@facs95
Copy link

facs95 commented Feb 1, 2023

Fixed the conflicts - please check d52d91d and 719e9d3 to see what had to be done just to make sure you agree with the changes

@Vvaradinov
Copy link

@facs95 changes LGTM.

@fedekunze fedekunze merged commit 8d40791 into release/1.10 Feb 3, 2023
@fedekunze fedekunze deleted the mergify/bp/release/1.10/pr-7 branch February 3, 2023 13:15
GAtom22 referenced this pull request in GAtom22/tac-go-ethereum Apr 16, 2025
Co-authored-by: Federico Kunze Küllmer <[email protected]>
Co-authored-by: Freddy Caceres <[email protected]>
Co-authored-by: Vladislav Varadinov <[email protected]>
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.

3 participants