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

Change to StoreCodeUnchecked in Genesis and snapshotter (backport #5167) #5241

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #5167 done by Mergify.
Cherry-pick of 10bb80b has failed:

On branch mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x/pr-5167
Your branch is up to date with 'origin/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x'.

You are currently cherry-picking commit 10bb80b7.
  (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:   modules/light-clients/08-wasm/internal/ibcwasm/expected_interfaces.go
	modified:   modules/light-clients/08-wasm/keeper/genesis.go
	modified:   modules/light-clients/08-wasm/keeper/msg_server.go
	modified:   modules/light-clients/08-wasm/testing/mock_engine.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/light-clients/08-wasm/keeper/keeper.go
	both modified:   modules/light-clients/08-wasm/keeper/snapshotter.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

* change to store code unchecked

* separate storeWasmCode and importWasmCode

* add parameter to storeWasmCode to pass the store function

* store code for msg server

* fix: typos in godocs

* Update modules/light-clients/08-wasm/internal/ibcwasm/expected_interfaces.go

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

* linting business

---------

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit 10bb80b)

# Conflicts:
#	modules/light-clients/08-wasm/keeper/keeper.go
#	modules/light-clients/08-wasm/keeper/snapshotter.go
…o mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x/pr-5167
@@ -10,7 +10,7 @@ import (
// state.
func (k Keeper) InitGenesis(ctx sdk.Context, gs types.GenesisState) error {
for _, contract := range gs.Contracts {
_, err := k.storeWasmCode(ctx, contract.CodeBytes)
_, err := k.storeWasmCode(ctx, contract.CodeBytes, k.wasmVM.StoreCodeUnchecked)
Copy link
Member

Choose a reason for hiding this comment

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

note: these calls to k.wasmVM.FuncCall should be replaced with ibcwasm.GetVM() in another backport so that all are consistent

@damiannolan damiannolan added priority PRs that need prompt reviews and removed conflicts labels Nov 29, 2023
Copy link
Member

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

👍🏻

@damiannolan damiannolan merged commit 4a08ef9 into 08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x Nov 29, 2023
17 checks passed
@damiannolan damiannolan deleted the mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.4.x/pr-5167 branch November 29, 2023 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority PRs that need prompt reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants