Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 31, 2023

This is an automatic backport of pull request #6 done by Mergify.
Cherry-pick of 01221e9 has failed:

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

You are currently cherry-picking commit 01221e946.
  (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)

Changes to be committed:
	modified:   core/vm/gas_table.go
	modified:   core/vm/interpreter.go
	modified:   core/vm/operations_acl.go
	modified:   core/vm/stack.go
	modified:   eth/tracers/js/goja.go
	modified:   eth/tracers/logger/access_list_tracer.go
	modified:   eth/tracers/logger/logger.go
	modified:   eth/tracers/logger/logger_json.go
	modified:   eth/tracers/native/prestate.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   CHANGELOG.md
	both modified:   core/vm/eips.go
	both modified:   core/vm/instructions.go
	both modified:   core/vm/instructions_test.go
	both modified:   eth/tracers/native/call.go

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

(cherry picked from commit 01221e9)

# Conflicts:
#	CHANGELOG.md
#	core/vm/eips.go
#	core/vm/instructions.go
#	core/vm/instructions_test.go
#	eth/tracers/native/call.go
@mergify mergify bot added the conflicts label Jan 31, 2023
@mergify mergify bot mentioned this pull request Jan 31, 2023
@facs95
Copy link

facs95 commented Feb 1, 2023

Just as a note - TestOpTstore tests did not exists on this branch

@facs95
Copy link

facs95 commented Feb 1, 2023

The following functions at the respectives files neither, so I removed them from the PR

  • enable1153 at eips.go
  • CaptureFault at call.go

@facs95 facs95 merged commit 9afd9b4 into release/1.10 Feb 1, 2023
@facs95 facs95 deleted the mergify/bp/release/1.10/pr-6 branch February 1, 2023 13:46
GAtom22 referenced this pull request in GAtom22/tac-go-ethereum Apr 16, 2025
Co-authored-by: Vladislav Varadinov <vladislav.varadinov@gmail.com>
Co-authored-by: Freddy Caceres <facs95@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.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.

3 participants