build: merge main (#114)

* fix: wrong tag reference (v1.1.1-0.11.2) (#95) * chore: update latest `line/cosmwasm` commit (merged Finschia/cosmwasm#256 PR) Signed-off-by: zemyblue <[email protected]> * add library * add changelog * ci: add ci test about compiled internal libraries. Signed-off-by: zemyblue <[email protected]> --------- Signed-off-by: zemyblue <[email protected]> * feat: add codeowners file (#100) * fix: fix a test for rustc 1.68 or later (#108) * build: replace line modules with Finschia's (#109) * build: change depending cosmwasm and repository info to finschia * build: replace module name line/wasmvm with Finschia/wasmvm * docs: replace "line" with "Finschia" in docs and scripts related docs * docs: change copylight * build: rename docker containers from line/* to finschia/* * docs: replace lbm-sdk with finschia-sdk * docs: replace mail address and repository name * docs: replace lbm-sdk with finschia-sdk in comments * chore: update cargo author information. (#112) * chore: update cargo author information. Signed-off-by: zemyblue <[email protected]> * chore: update changelog Signed-off-by: zemyblue <[email protected]> --------- Signed-off-by: zemyblue <[email protected]> --------- Signed-off-by: zemyblue <[email protected]> Co-authored-by: zemyblue <[email protected]>
Finschia · Jun 14, 2023 · 1e43355 · 1e43355
1 parent 1f74bf7
commit 1e43355
Show file tree

Hide file tree

Showing 38 changed files with 436 additions and 296 deletions.
diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md
@@ -6,7 +6,7 @@
 {{ range .CommitGroups -}}
 ### {{ .Title }}
 
-{{ range .Commits -}}{{ if regexMatch `^.+\(\[#[1-9][0-9]*\]\(https://github.com/line/wasmvm/issues/[1-9][0-9]*\)\)$` .Subject }}
+{{ range .Commits -}}{{ if regexMatch `^.+\(\[#[1-9][0-9]*\]\(https://github.com/Finschia/wasmvm/issues/[1-9][0-9]*\)\)$` .Subject }}
 * {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ mustRegexReplaceAll `issues/([1-9][0-9]*)\)\)$` .Subject `pull/${1}))` }}{{ end }}{{ end }}
 {{ end -}}
 

diff --git a/.chglog/config.yml b/.chglog/config.yml
@@ -2,7 +2,7 @@ style: github
 template: CHANGELOG.tpl.md
 info:
   title: CHANGELOG
-  repository_url: https://github.com/line/wasmvm
+  repository_url: https://github.com/Finschia/wasmvm
 options:
   tag_filter_pattern: '^v\d+\.\d+\.\d+-\d+\.\d+\.\d+'
   commits:

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @da1suk8 @dudong2 @loloicci @kokeshiM0chi
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,7 +21,7 @@ Closes #0
 <!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 
-- [ ] I followed the [contributing guidelines](https://github.com/line/wasmvm/blob/main/CONTRIBUTING.md).
+- [ ] I followed the [contributing guidelines](https://github.com/Finschia/wasmvm/blob/main/CONTRIBUTING.md).
 - [ ] I have updated the documentation accordingly.
 - [ ] I have added tests to cover my changes.
 - [ ] The PR title and commits are followed [conventional commit form](https://www.conventionalcommits.org/en/v1.0.0).
diff --git a/.github/workflows/builds_and_tests.yml b/.github/workflows/builds_and_tests.yml
@@ -107,6 +107,26 @@ jobs:
       - name: Run shellcheck
         run: ./devtools/check_shellscript_lint.sh
 
+  test_internal_shared_lib:
+    runs-on: ubuntu-latest
+    env:
+      GORACE: "halt_on_error=1"
+      BUILD_VERSION: $(echo $GITHUB_SHA | cut -c 1-10)
+    steps:
+      - name: set up
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17
+        id: go
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Go integration tests
+        run: make test
+      - name: Go tests with cgo and race condition safety checks
+        run: make test-safety
+      - name: Make build-go
+        run: make build-go
+
   build_shared_library:
     runs-on: ubuntu-latest
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,34 +1,49 @@
 # Changelog
 
+## [Unreleased](https://github.com/Finschia/wasmvm/compare/v1.1.1-0.11.2...HEAD)
 
-## [[v1.1.1-0.11.1](https://github.com/line/wasmvm/compare/v1.1.1-0.11.0...v1.1.1-0.11.1)] - 2023-01-13
+### Features
+
+### Fixes
+
+### Changes
+* chore: update libwasmvm cargo author ([#112](https://github.com/Finschia/wasmvm/pull/112))
+
+## [[v1.1.1-0.11.2](https://github.com/Finschia/wasmvm/compare/v1.1.1-0.11.1...v1.1.1-0.11.2)] - 2023-03-13
+
+The functional changes of this version same with v1.1.1-0.11.1, The only difference is that fix the import problem other service (like wasmd and finshia), because I think it seems to be problem to change the v1.1.1-0.11.1 tag commit.
+
+### Fixes
+* fix: wrong tag reference (v1.1.1-0.11.2) ([#95](https://github.com/Finschia/wasmvm/pull/95))
+
+## [[v1.1.1-0.11.1](https://github.com/Finschia/wasmvm/compare/v1.1.1-0.11.0...v1.1.1-0.11.1)] - 2023-01-13
 
 ### Fixes
-* add .so / .dylib file and modify Makefile ([#85](https://github.com/line/wasmvm/pull/85))
+* add .so / .dylib file and modify Makefile ([#85](https://github.com/Finschia/wasmvm/pull/85))
 
-## [[v1.1.1-0.11.0](https://github.com/line/wasmvm/compare/v1.0.0-0.10.0...v1.1.1-0.11.0)] - 2023-01-11
+## [[v1.1.1-0.11.0](https://github.com/Finschia/wasmvm/compare/v1.0.0-0.10.0...v1.1.1-0.11.0)] - 2023-01-11
 
 ### Features
-* merge upstream 1.1.1 ([#84](https://github.com/line/wasmvm/pull/84))
+* merge upstream 1.1.1 ([#84](https://github.com/Finschia/wasmvm/pull/84))
 
 ### Fixes
-* fix: getmetrics test due to this is environment-dependent test ([#80](https://github.com/line/wasmvm/pull/80))
+* fix: getmetrics test due to this is environment-dependent test ([#80](https://github.com/Finschia/wasmvm/pull/80))
 
 ### Changes
-* chore: remove the copied interface from tm-db ([#82](https://github.com/line/wasmvm/pull/82))
-* refactor: Revert using line/tm-db ([#77](https://github.com/line/wasmvm/pull/77))
-* ci: add release job ([#71](https://github.com/line/wasmvm/pull/71))
-* chore: Revert linux_static ([#70](https://github.com/line/wasmvm/pull/70))
+* chore: remove the copied interface from tm-db ([#82](https://github.com/Finschia/wasmvm/pull/82))
+* refactor: Revert using line/tm-db ([#77](https://github.com/Finschia/wasmvm/pull/77))
+* ci: add release job ([#71](https://github.com/Finschia/wasmvm/pull/71))
+* chore: Revert linux_static ([#70](https://github.com/Finschia/wasmvm/pull/70))
 
 ## [v1.0.0-0.10.0] - 2022-06-21
 
 ### Features
 
-* merge upstream 1.0.0 ([#64](https://github.com/line/wasmvm/issues/64))
+* merge upstream 1.0.0 ([#64](https://github.com/Finschia/wasmvm/issues/64))
 
 ### Fixes
 
-* improve CHANGELOG's template and devtools/update_changlog.sh ([#60](https://github.com/line/wasmvm/pull/60))
+* improve CHANGELOG's template and devtools/update_changlog.sh ([#60](https://github.com/Finschia/wasmvm/pull/60))
 
 ## [v0.16.3-0.9.0] - 2022-03-03
 
@@ -37,31 +52,31 @@
 
 ### Features
 
-* merge upstream 0.16.3 ([#54](https://github.com/line/wasmvm/issues/54))
+* merge upstream 0.16.3 ([#54](https://github.com/Finschia/wasmvm/issues/54))
 
 ### Fixes
 
-* fix Cargo.toml path in devtools/set_version.sh (part of [#59](https://github.com/line/wasmvm/issues/59))
+* fix Cargo.toml path in devtools/set_version.sh (part of [#59](https://github.com/Finschia/wasmvm/issues/59))
 
 ## [v0.14.0-0.8.0] - 2021-10-01
 
 ### Features
 
-* change tag name for static build ([#49](https://github.com/line/wasmvm/issues/49))
+* change tag name for static build ([#49](https://github.com/Finschia/wasmvm/issues/49))
 
 
 ## [v0.14.0-0.7.0] - 2021-09-30
 
 ### Features
 
-* add static linking of wasmvm ([#46](https://github.com/line/wasmvm/issues/46))
+* add static linking of wasmvm ([#46](https://github.com/Finschia/wasmvm/issues/46))
 
 
 ## [v0.14.0-0.6.1] - 2021-07-15
 
 ### Fixes
 
-* rebuild shared libs to resolve compile error ([#44](https://github.com/line/wasmvm/issues/44))
+* rebuild shared libs to resolve compile error ([#44](https://github.com/Finschia/wasmvm/issues/44))
 
 
 ## [v0.14.0-0.6.0] - 2021-07-12
@@ -76,19 +91,19 @@
 
 ### Changes
 
-* Change the module uri from github.com/CosmWasm/wasmvm to github.com/link/wasmvm ([#23](https://github.com/line/wasmvm/issues/23))
+* Change the module uri from github.com/CosmWasm/wasmvm to github.com/link/wasmvm ([#23](https://github.com/Finschia/wasmvm/issues/23))
 
 
 ## [v0.14.0-0.4.0] - 2021-05-03
 
 ### Changes
 
-* change cargo use to tag from the version ([#17](https://github.com/line/wasmvm/issues/17))
+* change cargo use to tag from the version ([#17](https://github.com/Finschia/wasmvm/issues/17))
 
 ### Code Refactoring
 
-* add build tag 'mocks' ([#16](https://github.com/line/wasmvm/issues/16))
-* define own iterator interface spec ([#15](https://github.com/line/wasmvm/issues/15))
+* add build tag 'mocks' ([#16](https://github.com/Finschia/wasmvm/issues/16))
+* define own iterator interface spec ([#15](https://github.com/Finschia/wasmvm/issues/15))
 
   **BREAKING CHANGE**
 
@@ -122,14 +137,14 @@ Initial code is based on the wasmvm v0.12.0, cosmwasm v0.12.0
 
 Please refer [CHANGELOG_OF_WASMVM_v0.12.0](https://github.com/CosmWasm/wasmvm/releases?after=v0.13.0)
 
-[Unreleased]:https://github.com/line/wasmvm/compare/v1.0.0-0.10.0...HEAD
-[v1.0.0-0.10.0]:https://github.com/line/wasmvm/compare/v0.16.3-0.9.0...v1.0.0-0.10.0
-[v0.16.3-0.9.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.8.0...v0.16.3-0.9.0
-[v0.14.0-0.8.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.7.0...v0.14.0-0.8.0
-[v0.14.0-0.7.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.6.1...v0.14.0-0.7.0
-[v0.14.0-0.6.1]:https://github.com/line/wasmvm/compare/v0.14.0-0.6.0...v0.14.0-0.6.1
-[v0.14.0-0.6.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.5.0...v0.14.0-0.6.0
-[v0.14.0-0.5.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.4.0...v0.14.0-0.5.0
-[v0.14.0-0.4.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.3.0...v0.14.0-0.4.0
-[v0.14.0-0.3.0]:https://github.com/line/wasmvm/compare/v0.12.0-0.1.0...v0.14.0-0.3.0
-[v0.12.0-0.1.0]:https://github.com/line/wasmvm/compare/v0.12.0...v0.12.0-0.1.0
+[Unreleased]:https://github.com/Finschia/wasmvm/compare/v1.0.0-0.10.0...HEAD
+[v1.0.0-0.10.0]:https://github.com/Finschia/wasmvm/compare/v0.16.3-0.9.0...v1.0.0-0.10.0
+[v0.16.3-0.9.0]:https://github.com/Finschia/wasmvm/compare/v0.14.0-0.8.0...v0.16.3-0.9.0
+[v0.14.0-0.8.0]:https://github.com/Finschia/wasmvm/compare/v0.14.0-0.7.0...v0.14.0-0.8.0
+[v0.14.0-0.7.0]:https://github.com/Finschia/wasmvm/compare/v0.14.0-0.6.1...v0.14.0-0.7.0
+[v0.14.0-0.6.1]:https://github.com/Finschia/wasmvm/compare/v0.14.0-0.6.0...v0.14.0-0.6.1
+[v0.14.0-0.6.0]:https://github.com/Finschia/wasmvm/compare/v0.14.0-0.5.0...v0.14.0-0.6.0
+[v0.14.0-0.5.0]:https://github.com/Finschia/wasmvm/compare/v0.14.0-0.4.0...v0.14.0-0.5.0
+[v0.14.0-0.4.0]:https://github.com/Finschia/wasmvm/compare/v0.14.0-0.3.0...v0.14.0-0.4.0
+[v0.14.0-0.3.0]:https://github.com/Finschia/wasmvm/compare/v0.12.0-0.1.0...v0.14.0-0.3.0
+[v0.12.0-0.1.0]:https://github.com/Finschia/wasmvm/compare/v0.12.0...v0.12.0-0.1.0
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[[email protected]](mailto:[email protected]).
+[[email protected]](mailto:[email protected]).
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,19 +1,19 @@
-# How to contribute to `line/wasmvm`
+# How to contribute to `Finschia/wasmvm`
 
 First of all, thank you so much for taking your time to contribute!
 It will be amazing if you could help us by doing any of the following:
 
-- File an issue in [the issue tracker](https://github.com/line/wasmvm/issues) to report bugs and propose new features and
+- File an issue in [the issue tracker](https://github.com/Finschia/wasmvm/issues) to report bugs and propose new features and
   improvements.
-- Ask a question by creating a new issue in [the issue tracker](https://github.com/line/wasmvm/issues).
-  - Browse [the list of previously answered questions](https://github.com/line/wasmvm/issues?q=label%3Aquestion).
-- Contribute your work by sending [a pull request](https://github.com/line/wasmvm/pulls).
+- Ask a question by creating a new issue in [the issue tracker](https://github.com/Finschia/wasmvm/issues).
+  - Browse [the list of previously answered questions](https://github.com/Finschia/wasmvm/issues?q=label%3Aquestion).
+- Contribute your work by sending [a pull request](https://github.com/Finschia/wasmvm/pulls).
 
 ## Contributor license agreement
 
 When you are sending a pull request and it's a non-trivial change beyond fixing typos, please sign
 the ICLA (individual contributor license agreement). Please
-[contact us](mailto:[email protected]) if you need the CCLA (corporate contributor license agreement).
+[contact us](mailto:[email protected]) if you need the CCLA (corporate contributor license agreement).
 
 ## Code of conduct
 

diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 LINE Plus Corporation
+   Copyright 2023 Finschia Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 .PHONY: all build build-rust build-go test
 
 # Builds the Rust library libwasmvm
-BUILDERS_PREFIX := line/wasmvm-builder
+BUILDERS_PREFIX := finschia/wasmvm-builder
 # Contains a full Go dev environment in order to run Go tests on the built library
-ALPINE_TESTER := line/wasmvm-builder-alpine
+ALPINE_TESTER := finschia/wasmvm-builder-alpine
 
 USER_ID := $(shell id -u)
 USER_GROUP = $(shell id -g)

diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,6 @@
 Copyright 2019-2021 Confio OÜ
 Copyright 2021 LINE Plus Corporation
+Copyright 2023 Finschia Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # wasmvm
 
-[![Tests](https://github.com/line/wasmvm/actions/workflows/tests.yml/badge.svg)](https://github.com/line/wasmvm/actions/workflows/tests.yml)
+[![Tests](https://github.com/Finschia/wasmvm/actions/workflows/tests.yml/badge.svg)](https://github.com/Finschia/wasmvm/actions/workflows/tests.yml)
 
 This repository is forked from [CosmWasm/wasmvm](https://github.com/CosmWasm/wasmvm)
 
-This is a wrapper around the [CosmWasm VM](https://github.com/line/cosmwasm/tree/main/packages/vm).
+This is a wrapper around the [CosmWasm VM](https://github.com/Finschia/cosmwasm/tree/main/packages/vm).
 
 It allows you to compile, initialize and execute CosmWasm smart contracts
-from Go applications, in particular from [x/wasm](https://github.com/line/lbm-sdk/tree/main/x/wasm).
+from Go applications, in particular from [x/wasm](https://github.com/Finschia/finschia-sdk/tree/main/x/wasm).
 
 For more detail, see the [original document](https://github.com/CosmWasm/wasmvm#readme)
diff --git a/builders/Makefile b/builders/Makefile
@@ -1,7 +1,7 @@
 # Versioned by a simple counter that is not bound to a specific CosmWasm version
 # See builders/README.md
 #BUILDERS_PREFIX := cosmwasm/go-ext-builder:0013
-BUILDERS_PREFIX := line/wasmvm-builder
+BUILDERS_PREFIX := finschia/wasmvm-builder
 
 .PHONY: docker-image-centos7
 docker-image-centos7:

diff --git a/cmd/demo/main.go b/cmd/demo/main.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	wasmvm "github.com/line/wasmvm"
+	wasmvm "github.com/Finschia/wasmvm"
 )
 
 const (

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/line/wasmvm
+module github.com/Finschia/wasmvm
 
 go 1.17
 

diff --git a/ibc_test.go b/ibc_test.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/line/wasmvm/internal/api"
-	"github.com/line/wasmvm/types"
+	"github.com/Finschia/wasmvm/internal/api"
+	"github.com/Finschia/wasmvm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -28,19 +28,19 @@ func TestIBC(t *testing.T) {
 }
 
 // IBCInstantiateMsg is the Go version of
-// https://github.com/line/cosmwasm/blob/v0.14.0-0.4.0/contracts/ibc-reflect/src/msg.rs#L9-L11
+// https://github.com/Finschia/cosmwasm/blob/v0.14.0-0.4.0/contracts/ibc-reflect/src/msg.rs#L9-L11
 type IBCInstantiateMsg struct {
 	ReflectCodeID uint64 `json:"reflect_code_id"`
 }
 
 // IBCExecuteMsg is the Go version of
-// https://github.com/line/cosmwasm/blob/v0.14.0-0.4.0/contracts/ibc-reflect/src/msg.rs#L15
+// https://github.com/Finschia/cosmwasm/blob/v0.14.0-0.4.0/contracts/ibc-reflect/src/msg.rs#L15
 type IBCExecuteMsg struct {
 	InitCallback InitCallback `json:"init_callback"`
 }
 
 // InitCallback is the Go version of
-// https://github.com/line/cosmwasm/blob/v0.14.0-0.4.0/contracts/ibc-reflect/src/msg.rs#L17-L22
+// https://github.com/Finschia/cosmwasm/blob/v0.14.0-0.4.0/contracts/ibc-reflect/src/msg.rs#L17-L22
 type InitCallback struct {
 	ID           string `json:"id"`
 	ContractAddr string `json:"contract_addr"`

diff --git a/internal/api/api_test.go b/internal/api/api_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/line/wasmvm/types"
+	"github.com/Finschia/wasmvm/types"
 )
 
 func TestValidateAddressFailure(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"io/ioutil"
     	"os"
-    	wasmvm "github.com/line/wasmvm"
+    	wasmvm "github.com/Finschia/wasmvm"
     )
     const (
@@ Expand Down @@