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

Injecting enabled precompiles list to EVM (backport #27) #32

Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 13, 2024

Related document: https://kava-labs.atlassian.net/wiki/spaces/ENG/pages/1464598529/Precompile+Registry+Design


This is an automatic backport of pull request #27 done by Mergify.

(cherry picked from commit 4dbf483)

# Conflicts:
#	core/vm/evm.go
(cherry picked from commit 91a9a53)
(cherry picked from commit eb83d29)
(cherry picked from commit 2c662dc)

# Conflicts:
#	build/checksums.txt
(cherry picked from commit 18d2cbf)
(cherry picked from commit 23ac221)
@mergify mergify bot added the conflicts label May 13, 2024
Copy link
Author

mergify bot commented May 13, 2024

Cherry-pick of 4dbf483 has failed:

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

You are currently cherry-picking commit 4dbf48322.
  (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/precompile_test.go
	modified:   precompile/modules/registerer.go
	modified:   precompile/modules/registerer_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/vm/evm.go

Cherry-pick of 2c662dc has failed:

On branch mergify/bp/kava/release/1.10/pr-27
Your branch is ahead of 'origin/kava/release/1.10' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2c662dca3.
  (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 <file>..." to mark resolution)
	both modified:   build/checksums.txt

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@evgeniy-scherbina evgeniy-scherbina force-pushed the mergify/bp/kava/release/1.10/pr-27 branch from d65f6d3 to b671135 Compare May 13, 2024 21:13
@evgeniy-scherbina evgeniy-scherbina merged commit 6e03834 into kava/release/1.10 May 13, 2024
6 checks passed
@evgeniy-scherbina evgeniy-scherbina deleted the mergify/bp/kava/release/1.10/pr-27 branch May 13, 2024 23:35
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