Upgrade to wasmvm 1.3.0-rc.0 #1486
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #1486 +/- ##
==========================================
- Coverage 57.86% 57.78% -0.08%
==========================================
Files 63 63
Lines 8344 8348 +4
==========================================
- Hits 4828 4824 -4
- Misses 3112 3116 +4
- Partials 404 408 +4
|
alpe
approved these changes
Jul 6, 2023
| @@ -217,7 +217,7 @@ func (k Keeper) importCode(ctx sdk.Context, codeID uint64, codeInfo types.CodeIn | |||
| return types.ErrCreateFailed.Wrap(errorsmod.Wrap(err, "uncompress wasm archive").Error()) | |||
| } | |||
| } | |||
| newCodeHash, err := k.wasmVM.Create(wasmCode) | |||
| newCodeHash, err := k.wasmVM.StoreCodeUnchecked(wasmCode) | |||
| @@ -106,7 +106,7 @@ func restoreV1(_ sdk.Context, k *Keeper, compressedCode []byte) error { | |||
| } | |||
|
|
|||
| // FIXME: check which codeIDs the checksum matches?? | |||
| _, err = k.wasmVM.Create(wasmCode) | |||
| _, err = k.wasmVM.StoreCodeUnchecked(wasmCode) | |||
| @@ -88,6 +89,20 @@ func (m *MockWasmer) Create(codeID wasmvm.WasmCode) (wasmvm.Checksum, error) { | |||
| return m.CreateFn(codeID) | |||
| } | |||
|
|
|||
| func (m *MockWasmer) StoreCode(codeID wasmvm.WasmCode) (wasmvm.Checksum, error) { | |||
There was a problem hiding this comment.
I was wondering if we want to use Create at all now in this mock. The method is required to be compatible with the interface but why not always panic with "Deprecated: use StoreCode instead"? There should not be any reason to use it in tests anymore. WDYT?
Please add a deprecated annotation to the method, too.
x/wasm/types/test_fixtures.go
Outdated
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| ) | ||
|
|
||
| //go:embed testdata/reflect.wasm | ||
| var wasmCode []byte |
There was a problem hiding this comment.
it would be good to rename this to reflectWasmCode or something more verbose. There are some contracts used in this project
x/wasm/types/wasmer_engine.go
Outdated
| StoreCode(code wasmvm.WasmCode) (wasmvm.Checksum, error) | ||
|
|
||
| // Create will compile the wasm code, and store the resulting pre-compile | ||
| // as well as the original code. Both can be referenced later via CodeID |
There was a problem hiding this comment.
nit: here and above
Suggested change
| // as well as the original code. Both can be referenced later via CodeID | |
| // as well as the original code. Both can be referenced later via checksum |
| PinFn func(checksum wasmvm.Checksum) error | ||
| UnpinFn func(checksum wasmvm.Checksum) error | ||
| GetMetricsFn func() (*wasmvmtypes.Metrics, error) | ||
| CreateFn func(codeID wasmvm.WasmCode) (wasmvm.Checksum, error) |
There was a problem hiding this comment.
Remove? Please see my comment below
|
LGTM. What iss missing for 1.3 is support for the new message and query types: #1296 (comment) |
Closed
mergify bot
pushed a commit
that referenced
this pull request
Jul 17, 2023
* Upgrade to wasmvm 1.3.0-rc.0 * Fix comments (cherry picked from commit 1a5a2d9) # Conflicts: # README.md # go.sum # x/wasm/client/cli/gov_tx.go # x/wasm/keeper/genesis_test.go # x/wasm/keeper/snapshotter_integration_test.go
pinosu
added a commit
that referenced
this pull request
Jul 18, 2023
* Upgrade to wasmvm 1.3.0-rc.0 (#1486) * Upgrade to wasmvm 1.3.0-rc.0 * Fix comments (cherry picked from commit 1a5a2d9) # Conflicts: # README.md # go.sum # x/wasm/client/cli/gov_tx.go # x/wasm/keeper/genesis_test.go # x/wasm/keeper/snapshotter_integration_test.go * Resolve conflicts --------- Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: Alex Peters <alpe@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #1296
sha256.Sum256(raw); check for other places