feat: separate x/wasm into x/wasmplus module of dynamiclink #36

da1suk8 · 2023-04-21T10:33:29Z

Description

closes: #23, #25

The dynamiclink branch was separated into wasmplus.
By implementing the interface, the import cycle problem was avoided and the dynamiclink functionality was properly moved to x/wasmplus.

Functions and variables to be exposed to the outside world are exposed in a file named exported_*.go.
This is because there was a possibility of large differences if they were exposed externally in uppercase letters.
The file x/wasmplus/common_test.go was used for the test, so I copied the original as it is.

Separation Process

Merge to 4c49132
Define functions and variables to be exposed externally 78f312f
Add Pluskeeper interface to keeper 6b4897f
pluskeeper is defined as x/wasm/keeper/exported_keeper.go
separate!

Motivation and context

In order to merge the dynamic_link branch into the main branch, it was necessary to separate the dynamic_link branch.

How has this been tested?

make build
make test

Checklist:

I followed the contributing guidelines and code of conduct.
I have added a relevant changelog to CHANGELOG.md
I have added tests to cover my changes.
I have updated the documentation accordingly.
I have updated API documentation client/docs/swagger-ui/swagger.yaml

Bumps [github.com/spf13/cast](https://github.com/spf13/cast) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/spf13/cast/releases) - [Commits](spf13/cast@v1.4.1...v1.5.0) --- updated-dependencies: - dependency-name: github.com/spf13/cast dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.12.1 to 1.12.2. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.12.1...v1.12.2) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

* Publish protobufs on release tags * Fix regex to match also rc versions

…ithub.com/prometheus/client_golang-1.12.2 Bump github.com/prometheus/client_golang from 1.12.1 to 1.12.2

* Fix wasm simulations + make functions compatible with tgrade * Fix lint issues * Fix simulation setup * Make simulations store msg pass * Use default values params to make operations succeed * Normalize wasm store * Add simulations to circleci config * Run simulation in temp dir * Store sim logs * Increase circleci machine type * Extract reflect contract api into helper * Add execute msg to simulations * Embed refect wasm contract Co-authored-by: Pino' Surace <pino.surace@live.it>

feat: setup and run script in dockerfile

…ithub.com/spf13/cast-1.5.0 Bump github.com/spf13/cast from 1.4.1 to 1.5.0

Remove unused NegotiateAppVersion ibc callback

Update config.yml

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.1 to 1.7.2. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.7.1...v1.7.2) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…ithub.com/stretchr/testify-1.7.2 Bump github.com/stretchr/testify from 1.7.1 to 1.7.2

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.2 to 1.8.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.7.2...v1.8.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…ithub.com/stretchr/testify-1.8.0 Bump github.com/stretchr/testify from 1.7.2 to 1.8.0

Bump sdk version to v0.45.5

…lusion Remove unnecessary string

Remove outdated proto.md

Output events are not part of consensus and can be non-deterministic

via Finschia#33

As for cosmwasmAPI, it is intentionally left by adding nolint:varcheck,deadcode to make it similar to original

x/wasm/keeper/api.go

x/wasmplus/keeper/api.go

Co-authored-by: Sujong Lee <leesj9476lsj@gmail.com>

via: Finschia#35

zemyblue · 2023-04-25T10:10:48Z

x/wasm/keeper/keeper.go


 	// prepare querier
 	querier := k.newQueryHandler(ctx, contractAddress)

 	// instantiate wasm contract
 	gas := k.runtimeGasForContract(ctx)
-	res, gasUsed, err := k.wasmVM.Instantiate(codeInfo.CodeHash, env, info, initMsg, wasmStore, k.cosmwasmAPI(ctx), querier, k.gasMeter(ctx), gas, costJSONDeserialization)
+	res, gasUsed, err := k.wasmVM.Instantiate(codeInfo.CodeHash, env, info, initMsg, prefixStore, k.pluskeeper.CosmwasmAPI(ctx), querier, k.gasMeter(ctx), gas, costJSONDeserialization)


How about extending the cosmwasmAPI to be able to add new function in other modules. Instead of using pluskeeper which replaces the original keeper function.

zemyblue · 2023-04-26T03:49:44Z

x/wasm/keeper/keeper.go

+		gasRegister:          NewDefaultWasmGasRegister(),
+		maxQueryStackSize:    types.DefaultMaxQueryStackSize,
+		acceptedAccountTypes: defaultAcceptedAccountTypes,
+		pluskeeper:           pluskeeper,


If there is not the plusKeeper, can this x/wasm module work?
The default wasm's keeper does not need other plus keepers. But this changes breaks this structure of x/wasm module. Because in this case, this x/wasm module should add plusKeeper.

So I think we need to change it to not using another plusKeeper.

da1suk8 · 2023-04-26T07:55:48Z

@zemyblue
What you mentioned will be addressed in another issue, #38.

zemyblue

Thank you.
Please modify to not reference x/wasmplus's keeper in x/wasm module.

da1suk8 · 2023-04-26T08:35:41Z

Please modify to not reference x/wasmplus's keeper in x/wasm module.

Yes, I will modify this in #38

dependabot bot and others added 30 commits May 12, 2022 08:12

Publish protobufs on release tags (CosmWasm#869)

aadc8bf

* Publish protobufs on release tags * Fix regex to match also rc versions

Merge pull request CosmWasm#857 from CosmWasm/dependabot/go_modules/g…

34e0783

…ithub.com/prometheus/client_golang-1.12.2 Bump github.com/prometheus/client_golang from 1.12.1 to 1.12.2

feat: setup and run script in dockerfile

1da0a6f

Merge pull request CosmWasm#875 from j0nl1/feat/setup_and_run

490d31e

feat: setup and run script in dockerfile

Merge pull request CosmWasm#855 from CosmWasm/dependabot/go_modules/g…

4525d51

…ithub.com/spf13/cast-1.5.0 Bump github.com/spf13/cast from 1.4.1 to 1.5.0

Remove obsolete ibc callback

f6ca36f

Update config.yml

3997ab1

Merge pull request CosmWasm#879 from CosmWasm/ibc_cleanup

775f1cc

Remove unused NegotiateAppVersion ibc callback

Merge pull request CosmWasm#883 from faddat/patch-4

9bd57b0

Update config.yml

Merge pull request CosmWasm#886 from CosmWasm/dependabot/go_modules/g…

14688c0

…ithub.com/stretchr/testify-1.7.2 Bump github.com/stretchr/testify from 1.7.1 to 1.7.2

Bump sdk version to v0.45.5

59e0710

Merge pull request CosmWasm#895 from CosmWasm/dependabot/go_modules/g…

1ab9f73

…ithub.com/stretchr/testify-1.8.0 Bump github.com/stretchr/testify from 1.7.2 to 1.8.0

Merge pull request CosmWasm#888 from CosmWasm/sdk-upgrade0455

3787f3d

Bump sdk version to v0.45.5

Remove unnecessary string

72e8b7d

Merge pull request CosmWasm#899 from shiki-tak/unnecessary-string-inc…

39be44b

…lusion Remove unnecessary string

Prevent migration to a restricted code

ffd8a3c

Restrict code access config modifications

e5ff7c1

Remove outdated proto.md

b570f49

Merge pull request CosmWasm#902 from CosmWasm/remove-outdated-proto-docs

8213046

Remove outdated proto.md

Remove unnecessary error check

29340b6

Create .gitpod.yml

3864815

Don't pass non-wasm events to reply()

ee44cc0

Output events are not part of consensus and can be non-deterministic

Oops

9671a21

Add changelog for fix

f7211b8

Fix tests in keeper

ce1cf74

da1suk8 added 4 commits April 21, 2023 19:06

fix: fixed doing wrap twice

714f7d4

via Finschia#33

build: update commit-hash

fa70dbf

docs: add CHANGELOG

db77a7f

fix: reflect golangci-lint

f3f0bb9

As for cosmwasmAPI, it is intentionally left by adding nolint:varcheck,deadcode to make it similar to original

da1suk8 marked this pull request as ready for review April 21, 2023 10:50

da1suk8 requested review from zemyblue, dudong2, loloicci and Kynea0b April 21, 2023 10:51

da1suk8 self-assigned this Apr 21, 2023

da1suk8 mentioned this pull request Apr 24, 2023

Propose methods to completely separate the functions of dynamic_link into wasmplus #23

Closed

dudong2 reviewed Apr 24, 2023

View reviewed changes

x/wasm/keeper/api.go Show resolved Hide resolved

dudong2 reviewed Apr 24, 2023

View reviewed changes

x/wasmplus/keeper/api.go Outdated Show resolved Hide resolved

Update x/wasmplus/keeper/api.go

a655dce

Co-authored-by: Sujong Lee <leesj9476lsj@gmail.com>

da1suk8 requested a review from dudong2 April 24, 2023 08:13

loloicci and others added 2 commits April 24, 2023 18:40

fix: cherry-pick c23a2db

2bac3d0

via: Finschia#35

refactor: remove duplicated assertStoreCodeResponse

979cc83

loloicci approved these changes Apr 24, 2023

View reviewed changes

Kynea0b approved these changes Apr 24, 2023

View reviewed changes

dudong2 approved these changes Apr 24, 2023

View reviewed changes

zemyblue reviewed Apr 25, 2023

View reviewed changes

zemyblue reviewed Apr 26, 2023

View reviewed changes

da1suk8 mentioned this pull request Apr 26, 2023

Add wasmvm.GoAPI field to the keeper structure #38

Closed

zemyblue approved these changes Apr 26, 2023

View reviewed changes

da1suk8 merged commit d6ea9ec into Finschia:dynamic_link Apr 27, 2023

da1suk8 deleted the separate_wasmplus_dynamiclink branch April 27, 2023 01:59

This was referenced Apr 27, 2023

Enable the use of wasmplus's IsInactiveContract() in cosmwasmAPI #25

Closed

feat!: add cosmwasmAPIGenerator to keeper #41

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: separate x/wasm into x/wasmplus module of dynamiclink #36

feat: separate x/wasm into x/wasmplus module of dynamiclink #36

da1suk8 commented Apr 21, 2023 •

edited

Loading

zemyblue Apr 25, 2023

zemyblue Apr 26, 2023 •

edited

Loading

da1suk8 commented Apr 26, 2023

zemyblue left a comment

da1suk8 commented Apr 26, 2023

feat: separate x/wasm into x/wasmplus module of dynamiclink #36

feat: separate x/wasm into x/wasmplus module of dynamiclink #36

Conversation

da1suk8 commented Apr 21, 2023 • edited Loading

Description

Motivation and context

How has this been tested?

Checklist:

zemyblue Apr 25, 2023

Choose a reason for hiding this comment

zemyblue Apr 26, 2023 • edited Loading

Choose a reason for hiding this comment

da1suk8 commented Apr 26, 2023

zemyblue left a comment

Choose a reason for hiding this comment

da1suk8 commented Apr 26, 2023

da1suk8 commented Apr 21, 2023 •

edited

Loading

zemyblue Apr 26, 2023 •

edited

Loading