feat: merge upstream 1.0.0 #65

shiki-tak · 2022-06-02T10:54:38Z

Description

Closes #64

Types of changes

Bug fix (changes which fixes an issue)
New feature (changes which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
ETC (build, ci, docs, perf, refactor, style, test)

Checklist

I followed the contributing guidelines.
I have updated the documentation accordingly.
I have added tests to cover my changes.
The PR title and commits are followed conventional commit form.

Update to CosmWasm 1.0.0-soon

Upgrade to CosmWasm to 1.0.0-soon2

Upgrade cosmwasm to 1.0.0-beta

Go 1.17

Final touches for 1.0.0

CLAassistant · 2022-06-02T10:54:49Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 4 committers have signed the CLA.

✅ shiki-tak
❌ Deployer
❌ webmaster128
❌ ethanfrey

Deployer seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

loloicci · 2022-06-06T07:30:29Z

Could you modify commit titles only "fix"? (it. is ok to use force push)

shiki-tak · 2022-06-06T07:43:48Z

Could you modify commit titles only "fix"? (it. is ok to use force push)

Oops...I had forgotten to put together my commits, thx.

loloicci · 2022-06-07T05:22:57Z

api/callbacks.go

-		// TODO figure out how to pass the text in its `Descriptor` field through all the FFI
-		// TODO handle these cases on the Rust side in the first place
+		// These three types are "thrown" (which is not a thing in Go 🙃) in panics from the gas module
+		// (https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/store/types/gas.go):


replace link to ours (if needed)

loloicci · 2022-06-07T05:23:30Z

api/callbacks.go

+		// - https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/baseapp/baseapp.go#L607
+		// - https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/baseapp/recovery.go#L50-L60


loloicci · 2022-06-07T05:23:43Z

api/callbacks.go

+		// This turns the panic into a regular error with a helpful error message.
+		//
+		// The other two gas related panic types indicate programming errors and are handled along
+		// with all other errors in https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/baseapp/recovery.go#L66-L77.


loloicci · 2022-06-07T05:27:15Z

api/callbacks.go

@@ -207,16 +226,16 @@ func cGet(ptr *C.db_t, gasMeter *C.gas_meter_t, usedGas *cu64, key C.U8SliceView
 	// https://github.com/line/lfb-sdk/blob/786df84b8e0aaa0a1aff79ffbab0541e597ee004/store/types/store.go#L203


"lfb-sdk" left here (Maybe not about this PR)

fixed, thx!

loloicci · 2022-06-07T05:54:13Z

api/iterator_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/require"

 	"github.com/line/wasmvm/types"
+	dbm "github.com/tendermint/tm-db"


Is this needed? We removed the dependency to dbm with #15. Can it remove the dependency in this test?

If we don't need it, let's remove it from go.mod.

loloicci · 2022-06-07T05:59:07Z

builders/Makefile


 .PHONY: docker-image-alpine
 docker-image-alpine:
-	docker build . -t $(BUILDERS_PREFIX):alpine -f ./Dockerfile.alpine
+	docker build --pull . -t $(BUILDERS_PREFIX):alpine -f ./Dockerfile.alpine

 .PHONY: docker-image-static
 docker-image-static:


Isn't it needed update this line and Dockefile.static itself?

loloicci · 2022-06-07T06:05:36Z

types/queries.go

+// StargateQuery is encoded the same way as abci_query, with path and protobuf encoded request data.
+// The format is defined in [ADR-21](https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/adr-021-protobuf-query-encoding.md).
+// The response is protobuf encoded data directly without a JSON response wrapper.
+// The caller is responsible for compiling the proper protobuf definitions for both requests and responses.
 type StargateQuery struct {
 	// this is the fully qualified service path used for routing,
 	// eg. custom/lfb_sdk.x.bank.v1.Query/QueryBalance


fixed, thx!

tnasu · 2022-06-07T11:15:14Z

api/iterator_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/require"

 	"github.com/line/wasmvm/types"
+	dbm "github.com/tendermint/tm-db"


If we don't need it, let's remove it from go.mod.

go.mod

zemyblue · 2022-06-07T11:07:43Z

.github/workflows/builds_and_tests.yml

@@ -9,7 +9,7 @@ jobs:
      - name: Install Rust
        uses: actions-rs/toolchain@v1
        with:
-          toolchain: 1.54.0
+          toolchain: 1.59.0


Is it no problem?
I heard the appropriate rustc version is 1.57.0

thx! I changed to 1.57.0

Now, the toolchain version of Dockerfiles is 1.60.0. If there are no reasons we cannot unify, we should do.

zemyblue

LGTM

loloicci

Rust toolchain versions of Dockerfiles' are 1.60.0 and github workflows' are 1.57.0. If there are no reason we cannot unify, we should do.

ethanfrey and others added 30 commits September 22, 2021 15:30

Update cosmwasm versions

0525129

Update types

b363b71

Update contracts to 1.0

d26bb09

Fix all tests minus IBC callback

a325d24

Update events to fix IBC test

bc43e2e

Update Rust tests

9352d4c

Updated comments for bech32 encoding

0d68e4e

Merge pull request #260 from CosmWasm/update-1.0-soon

8369711

Update to CosmWasm 1.0.0-soon

[skip ci] Built release libraries

1b4cd96

[skip ci] Upgrade shfmt and pin version (#262)

098553f

Upgrade cosmwasm to 1.0.0-soon2 and adapt code

e0b959b

Update testing contracts and adjust gas limits to new behaviour

a210956

Merge pull request #261 from CosmWasm/upgrade-to-soon2

403cac5

Upgrade to CosmWasm to 1.0.0-soon2

[skip ci] Built release libraries

a7503ff

Upgrade cosmwasm to 1.0.0-beta

9f039dd

Merge pull request #263 from CosmWasm/upgrade-to-1.0.0-beta

6a12b4a

Upgrade cosmwasm to 1.0.0-beta

[skip ci] Built release libraries

e957dea

Fix none handling in copyAndDestroyUnmanagedVector

ceaebca

Bump CosmWasm to 1.0.0-beta2

da602fa

Add test unmanaged_vector_new_works

f6b35a1

Add Vec::into_raw_parts explanation

5ad99f8

Simplify UnmanagedVector::default implementation

39f915d

Use handle_c_error_default/handle_c_error_ptr consistently

16e8e0a

[skip ci] Built release libraries

b86de21

Go 1.17

6ccecde

bump tm-db

bf46d5f

Update README.md

a467478

Merge pull request #271 from faddat/17

8242dac

Go 1.17

[skip ci] Built release libraries

650aa7b

Merge branch 'main' into tm-db

33df6e4

webmaster128 and others added 8 commits May 16, 2022 08:42

Export LibwasmvmVersion at root level

487038e

Set cosmwasm version to 1.0.0

39a7cad

Update testing contracts

c3966d6

Set libwasmversion to 1.0.0

8c29bfd

Adapt tests

f4e8002

Merge pull request #334 from CosmWasm/final-touches

afefb23

Final touches for 1.0.0

[skip ci] Built release libraries

bc49a2f

Merge tag 'v1.0.0' into issues/64

61c7e3b

shiki-tak marked this pull request as draft June 2, 2022 10:54

shiki-tak added 2 commits June 2, 2022 19:59

fix: remove unnecessary files

74b41f0

fix: build error

6984ef5

shiki-tak requested review from loloicci, tnasu and zemyblue June 6, 2022 07:15

shiki-tak self-assigned this Jun 6, 2022

shiki-tak marked this pull request as ready for review June 6, 2022 07:16

fix: test error

181e9ea

loloicci reviewed Jun 7, 2022

View reviewed changes

tnasu reviewed Jun 7, 2022

View reviewed changes

zemyblue reviewed Jun 7, 2022

View reviewed changes

fix: apply review

e3bfe9b

zemyblue approved these changes Jun 13, 2022

View reviewed changes

loloicci reviewed Jun 13, 2022

View reviewed changes

chore: fix toolchain version and miss update

ef80dbc

tnasu approved these changes Jun 17, 2022

View reviewed changes

loloicci approved these changes Jun 20, 2022

View reviewed changes

shiki-tak merged commit bd8950c into Finschia:main Jun 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: merge upstream 1.0.0 #65

feat: merge upstream 1.0.0 #65

shiki-tak commented Jun 2, 2022

CLAassistant commented Jun 2, 2022 •

edited

Loading

loloicci commented Jun 6, 2022

shiki-tak commented Jun 6, 2022

loloicci Jun 7, 2022

shiki-tak Jun 10, 2022

loloicci Jun 7, 2022

shiki-tak Jun 10, 2022

loloicci Jun 7, 2022

shiki-tak Jun 10, 2022

loloicci Jun 7, 2022

shiki-tak Jun 10, 2022

loloicci Jun 7, 2022

tnasu Jun 7, 2022

loloicci Jun 7, 2022

shiki-tak Jun 10, 2022

loloicci Jun 7, 2022

shiki-tak Jun 10, 2022

tnasu Jun 7, 2022

zemyblue Jun 7, 2022

shiki-tak Jun 10, 2022

loloicci Jun 13, 2022

zemyblue left a comment

loloicci left a comment

		// - https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/baseapp/baseapp.go#L607
		// - https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/baseapp/recovery.go#L50-L60

		@@ -207,16 +226,16 @@ func cGet(ptr C.db_t, gasMeter C.gas_meter_t, usedGas *cu64, key C.U8SliceView
		// https://github.com/line/lfb-sdk/blob/786df84b8e0aaa0a1aff79ffbab0541e597ee004/store/types/store.go#L203

feat: merge upstream 1.0.0 #65

feat: merge upstream 1.0.0 #65

Conversation

shiki-tak commented Jun 2, 2022

Description

Types of changes

Checklist

CLAassistant commented Jun 2, 2022 • edited Loading

loloicci commented Jun 6, 2022

shiki-tak commented Jun 6, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zemyblue left a comment

Choose a reason for hiding this comment

loloicci left a comment

Choose a reason for hiding this comment

CLAassistant commented Jun 2, 2022 •

edited

Loading