From ce70a3856778212042d6f28d971ec24020e74a08 Mon Sep 17 00:00:00 2001 From: TAKASE Ryo Date: Tue, 18 Apr 2023 18:32:36 +0900 Subject: [PATCH] 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 --- .chglog/CHANGELOG.tpl.md | 2 +- .chglog/config.yml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CHANGELOG.md | 66 ++++++++++++++++---------------- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 12 +++--- LICENSE | 2 +- Makefile | 4 +- NOTICE | 1 + README.md | 6 +-- builders/Makefile | 2 +- cmd/demo/main.go | 2 +- go.mod | 2 +- ibc_test.go | 10 ++--- internal/api/api_test.go | 2 +- internal/api/callbacks.go | 20 +++++----- internal/api/iterator_test.go | 2 +- internal/api/lib.go | 2 +- internal/api/lib_test.go | 4 +- internal/api/mocks.go | 6 +-- lib.go | 4 +- lib_test.go | 4 +- libwasmvm/Cargo.lock | 8 ++-- libwasmvm/Cargo.toml | 6 +-- testdata/README.md | 4 +- testdata/download_releases.sh | 2 +- types/ibc.go | 8 ++-- types/msg.go | 6 +-- types/queries.go | 4 +- 29 files changed, 99 insertions(+), 98 deletions(-) diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md index 5b98abb4..ef821302 100755 --- 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 index 5aa2bb10..0198ef9a 100755 --- 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/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9450715a..43ecddcc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,7 +21,7 @@ Closes #0 -- [ ] 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/CHANGELOG.md b/CHANGELOG.md index 9510acf2..7adbbb08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,41 +1,41 @@ # Changelog -## [[v1.1.1-0.11.2](https://github.com/line/wasmvm/compare/v1.1.1-0.11.1...v1.1.1-0.11.2)] - 2023-03-13 +## [[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/line/wasmvm/pull/95)) +* 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/line/wasmvm/compare/v1.1.1-0.11.0...v1.1.1-0.11.1)] - 2023-01-13 +## [[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 @@ -44,31 +44,31 @@ The functional changes of this version same with v1.1.1-0.11.1, The only differe ### 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 @@ -83,19 +83,19 @@ The functional changes of this version same with v1.1.1-0.11.1, The only differe ### 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** @@ -129,14 +129,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 index bdb31303..8edb283b 100644 --- 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 -[dl_oss_dev@linecorp.com](mailto:dl_oss_dev@linecorp.com). +[dev@finschia.org](mailto:dev@finschia.org). 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 index e3066b64..18e9f69e 100644 --- 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:dl_oss_dev@linecorp.com) if you need the CCLA (corporate contributor license agreement). +[contact us](mailto:dev@finschia.org) if you need the CCLA (corporate contributor license agreement). ## Code of conduct diff --git a/LICENSE b/LICENSE index 9a52d7bc..ff7fa4fb 100644 --- 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 index 4bec0f91..196ed8e4 100644 --- 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 index 63aba584..2aab1f79 100644 --- 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 index 2bf45c1e..4e6bb573 100644 --- 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 index 81bec32d..b43b76a0 100644 --- 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 index a72b9997..f526af6d 100644 --- 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 index d745a38a..6da84d89 100644 --- 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 index 723e87eb..1e8c3cc7 100644 --- 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 index 87c7ec1a..f7c26142 100644 --- 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) { diff --git a/internal/api/callbacks.go b/internal/api/callbacks.go index 7cd6aec0..3d8a94cb 100644 --- a/internal/api/callbacks.go +++ b/internal/api/callbacks.go @@ -45,7 +45,7 @@ import ( dbm "github.com/tendermint/tm-db" - "github.com/line/wasmvm/types" + "github.com/Finschia/wasmvm/types" ) // Note: we have to include all exports in the same file (at least since they both import bindings.h), @@ -69,18 +69,18 @@ func recoverPanic(ret *C.GoError) { name := reflect.TypeOf(rec).Name() switch name { // These three types are "thrown" (which is not a thing in Go šŸ™ƒ) in panics from the gas module - // (https://github.com/line/lbm-sdk/blob/main/store/types/gas.go): + // (https://github.com/Finschia/finschia-sdk/blob/main/store/types/gas.go): // 1. ErrorOutOfGas // 2. ErrorGasOverflow // 3. ErrorNegativeGasConsumed // // In the baseapp, ErrorOutOfGas gets special treatment: - // - https://github.com/line/lbm-sdk/blob/main/baseapp/baseapp.go#L647 - // - https://github.com/line/lbm-sdk/blob/main/baseapp/recovery.go#L50-L60 + // - https://github.com/Finschia/finschia-sdk/blob/main/baseapp/baseapp.go#L647 + // - https://github.com/Finschia/finschia-sdk/blob/main/baseapp/recovery.go#L50-L60 // 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/line/lbm-sdk/blob/main/baseapp/recovery.go#L66-L77. + // with all other errors in https://github.com/Finschia/finschia-sdk/blob/main/baseapp/recovery.go#L66-L77. case "ErrorOutOfGas": // TODO: figure out how to pass the text in its `Descriptor` field through all the FFI *ret = C.GoError_OutOfGas @@ -94,17 +94,17 @@ func recoverPanic(ret *C.GoError) { type Gas = uint64 -// GasMeter is a copy of an interface declaration from lbm-sdk -// Defined in https://github.com/line/lbm-sdk/blob/main/store/types/gas.go +// GasMeter is a copy of an interface declaration from finschia-sdk +// Defined in https://github.com/Finschia/finschia-sdk/blob/main/store/types/gas.go type GasMeter interface { GasConsumed() Gas } /****** DB ********/ -// KVStore copies a subset of types from lbm-sdk +// KVStore copies a subset of types from finschia-sdk // We may wish to make this more generic sometime in the future, but not now -// Original KVStore is defined in https://github.com/line/lbm-sdk/blob/main/store/types/store.go +// Original KVStore is defined in https://github.com/Finschia/finschia-sdk/blob/main/store/types/store.go type KVStore interface { Get(key []byte) []byte Set(key, value []byte) @@ -201,7 +201,7 @@ func cGet(ptr *C.db_t, gasMeter *C.gas_meter_t, usedGas *cu64, key C.U8SliceView *usedGas = (cu64)(gasAfter - gasBefore) // v will equal nil when the key is missing - // https://github.com/line/lbm-sdk/blob/786df84b8e0aaa0a1aff79ffbab0541e597ee004/store/types/store.go#L203 + // https://github.com/Finschia/finschia-sdk/blob/786df84b8e0aaa0a1aff79ffbab0541e597ee004/store/types/store.go#L203 *val = newUnmanagedVector(v) return C.GoError_None diff --git a/internal/api/iterator_test.go b/internal/api/iterator_test.go index 52a31793..f7da8668 100644 --- a/internal/api/iterator_test.go +++ b/internal/api/iterator_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/line/wasmvm/types" + "github.com/Finschia/wasmvm/types" dbm "github.com/tendermint/tm-db" ) diff --git a/internal/api/lib.go b/internal/api/lib.go index 07b072f9..6a4eb714 100644 --- a/internal/api/lib.go +++ b/internal/api/lib.go @@ -9,7 +9,7 @@ import ( "runtime" "syscall" - "github.com/line/wasmvm/types" + "github.com/Finschia/wasmvm/types" ) // Value types diff --git a/internal/api/lib_test.go b/internal/api/lib_test.go index caab944f..9cc7b4c7 100644 --- a/internal/api/lib_test.go +++ b/internal/api/lib_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/line/wasmvm/types" + "github.com/Finschia/wasmvm/types" ) const ( @@ -889,7 +889,7 @@ func TestCustomReflectQuerier(t *testing.T) { type QueryMsg struct { Capitalized *CapitalizedQuery `json:"capitalized,omitempty"` // There are more queries but we don't use them yet - // https://github.com/line/cosmwasm/blob/v0.14.0-0.4.0/contracts/reflect/src/msg.rs#L38-L57 + // https://github.com/Finschia/cosmwasm/blob/v0.14.0-0.4.0/contracts/reflect/src/msg.rs#L38-L57 } type CapitalizedResponse struct { diff --git a/internal/api/mocks.go b/internal/api/mocks.go index fe9a0275..e58bea0b 100644 --- a/internal/api/mocks.go +++ b/internal/api/mocks.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" dbm "github.com/tendermint/tm-db" - "github.com/line/wasmvm/types" + "github.com/Finschia/wasmvm/types" ) /** helper constructors **/ @@ -178,7 +178,7 @@ func MockIBCPacketTimeout(myChannel string, data []byte) types.IBCPacketTimeoutM } /*** Mock GasMeter ****/ -// This code is borrowed from lbm-sdk store/types/gas.go +// This code is borrowed from finschia-sdk store/types/gas.go // ErrorOutOfGas defines an error thrown when an action results in out of gas. type ErrorOutOfGas struct { @@ -241,7 +241,7 @@ func (g *mockGasMeter) ConsumeGas(amount Gas, descriptor string) { } /*** Mock KVStore ****/ -// Much of this code is borrowed from lbm-sdk store/transient.go +// Much of this code is borrowed from finschia-sdk store/transient.go // Note: these gas prices are all in *wasmer gas* and (sdk gas * 100) // diff --git a/lib.go b/lib.go index d215c40f..01844cc6 100644 --- a/lib.go +++ b/lib.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/line/wasmvm/internal/api" - "github.com/line/wasmvm/types" + "github.com/Finschia/wasmvm/internal/api" + "github.com/Finschia/wasmvm/types" ) // Checksum represents a hash of the Wasm bytecode that serves as an ID. Must be generated from this library. diff --git a/lib_test.go b/lib_test.go index b220a5d5..6c8f9b56 100644 --- a/lib_test.go +++ b/lib_test.go @@ -6,8 +6,8 @@ import ( "os" "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" ) diff --git a/libwasmvm/Cargo.lock b/libwasmvm/Cargo.lock index 745339a2..6e1e7b4c 100644 --- a/libwasmvm/Cargo.lock +++ b/libwasmvm/Cargo.lock @@ -224,7 +224,7 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" version = "1.1.9-0.7.0" -source = "git+https://github.com/line/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" +source = "git+https://github.com/Finschia/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" dependencies = [ "digest 0.10.6", "ed25519-zebra", @@ -237,7 +237,7 @@ dependencies = [ [[package]] name = "cosmwasm-derive" version = "1.1.9-0.7.0" -source = "git+https://github.com/line/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" +source = "git+https://github.com/Finschia/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" dependencies = [ "convert_case", "proc-macro2", @@ -248,7 +248,7 @@ dependencies = [ [[package]] name = "cosmwasm-std" version = "1.1.9-0.7.0" -source = "git+https://github.com/line/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" +source = "git+https://github.com/Finschia/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" dependencies = [ "base64", "cosmwasm-crypto", @@ -267,7 +267,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" version = "1.1.9-0.7.0" -source = "git+https://github.com/line/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" +source = "git+https://github.com/Finschia/cosmwasm?rev=6ea2dfb#6ea2dfb77929c901fa8629df5c7753457b546860" dependencies = [ "bitflags", "bytecheck", diff --git a/libwasmvm/Cargo.toml b/libwasmvm/Cargo.toml index 8f209f32..0c38fa64 100644 --- a/libwasmvm/Cargo.toml +++ b/libwasmvm/Cargo.toml @@ -5,7 +5,7 @@ publish = false authors = ["LINE Plus Corporation"] edition = "2021" description = "Go bindings for cosmwasm contracts" -repository = "https://github.com/line/wasmvm" +repository = "https://github.com/Finschia/wasmvm" license = "Apache-2.0" readme = "README.md" exclude = [".circleci/*", ".gitignore"] @@ -30,8 +30,8 @@ default = [] backtraces = [] [dependencies] -cosmwasm-std = { git = "https://github.com/line/cosmwasm", rev = "6ea2dfb", features = ["iterator","staking","stargate"]} -cosmwasm-vm = { git = "https://github.com/line/cosmwasm", rev = "6ea2dfb", features = ["iterator","staking","stargate"]} +cosmwasm-std = { git = "https://github.com/Finschia/cosmwasm", rev = "6ea2dfb", features = ["iterator","staking","stargate"]} +cosmwasm-vm = { git = "https://github.com/Finschia/cosmwasm", rev = "6ea2dfb", features = ["iterator","staking","stargate"]} errno = "0.2" serde_json = "1.0" thiserror = "1.0" diff --git a/testdata/README.md b/testdata/README.md index 59652b8b..49ed06cc 100644 --- a/testdata/README.md +++ b/testdata/README.md @@ -1,3 +1,3 @@ Current contracts manually generated from commit `v0.14.0-beta1` -of https://github.com/line/cosmwasm. Using -[these instructions](https://github.com/line/cosmwasm/tree/v0.14.0-0.4.0/contracts/README.md#optimized-builds). +of https://github.com/Finschia/cosmwasm. Using +[these instructions](https://github.com/Finschia/cosmwasm/tree/v0.14.0-0.4.0/contracts/README.md#optimized-builds). diff --git a/testdata/download_releases.sh b/testdata/download_releases.sh index ac05bfbe..8c4b47bb 100755 --- a/testdata/download_releases.sh +++ b/testdata/download_releases.sh @@ -10,7 +10,7 @@ fi tag="$1" for contract in cyberpunk hackatom queue reflect ibc_reflect; do - url="https://github.com/line/cosmwasm/releases/download/$tag/$contract.wasm" + url="https://github.com/Finschia/cosmwasm/releases/download/$tag/$contract.wasm" echo "Downloading $url ..." wget -O "$contract.wasm" "$url" done diff --git a/types/ibc.go b/types/ibc.go index 31d6d338..4d0ed6b0 100644 --- a/types/ibc.go +++ b/types/ibc.go @@ -149,8 +149,8 @@ type IBCPacketTimeoutMsg struct { } // TODO: test what the sdk Order.String() represents and how to parse back -// `Order` in Proto files: https://github.com/line/lbm-sdk/blob/main/proto/ibc/core/channel/v1/channel.proto -// `ORder` in Auto-gen code: https://github.com/line/lbm-sdk/blob/main/x/ibc/core/04-channel/types/channel.pb.go +// `Order` in Proto files: https://github.com/Finschia/finschia-sdk/blob/main/proto/ibc/core/channel/v1/channel.proto +// `ORder` in Auto-gen code: https://github.com/Finschia/finschia-sdk/blob/main/x/ibc/core/04-channel/types/channel.pb.go type IBCOrder = string // These are the only two valid values for IbcOrder @@ -221,7 +221,7 @@ type IBCBasicResult struct { } // IBCBasicResponse defines the return value on a successful processing. -// This is the counterpart of `IbcBasicResponse` in https://github.com/line/cosmwasm/blob/main/packages/std/src/ibc.rs . +// This is the counterpart of `IbcBasicResponse` in https://github.com/Finschia/cosmwasm/blob/main/packages/std/src/ibc.rs . type IBCBasicResponse struct { // Messages comes directly from the contract and is its request for action. // If the ReplyOn value matches the result, the runtime will invoke this @@ -252,7 +252,7 @@ type IBCReceiveResult struct { // Where the Acknowledgement bytes contain an encoded error message to be returned to // the calling chain. (Returning IBCReceiveResult::Err will abort processing of this packet // and not inform the calling chain). -// This is the counterpart of `IbcReceiveResponse` in https://github.com/line/cosmwasm/blob/main/packages/std/src/ibc.rs . +// This is the counterpart of `IbcReceiveResponse` in https://github.com/Finschia/cosmwasm/blob/main/packages/std/src/ibc.rs . type IBCReceiveResponse struct { // binary encoded data to be returned to calling chain as the acknowledgement Acknowledgement []byte `json:"acknowledgement"` diff --git a/types/msg.go b/types/msg.go index e2109755..ade3384c 100644 --- a/types/msg.go +++ b/types/msg.go @@ -15,7 +15,7 @@ type ContractResult struct { } // Response defines the return value on a successful instantiate/execute/migrate. -// This is the counterpart of `Response` in https://github.com/line/cosmwasm/blob/main/packages/std/src/results/response.rs . +// This is the counterpart of `Response` in https://github.com/Finschia/cosmwasm/blob/main/packages/std/src/results/response.rs . type Response struct { // Messages comes directly from the contract and is its request for action. // If the ReplyOn value matches the result, the runtime will invoke this @@ -112,7 +112,7 @@ type BankMsg struct { Burn *BurnMsg `json:"burn,omitempty"` } -// SendMsg contains instructions for a lbm-sdk/SendMsg +// SendMsg contains instructions for a finschia-sdk/SendMsg // It has a fixed interface here and should be converted into the proper SDK format before dispatching type SendMsg struct { ToAddress string `json:"to_address"` @@ -282,7 +282,7 @@ type ExecuteMsg struct { // InstantiateMsg will create a new contract instance from a previously uploaded CodeID. // This allows one contract to spawn "sub-contracts". type InstantiateMsg struct { - // CodeID is the reference to the wasm byte code as used by the lbm-sdk + // CodeID is the reference to the wasm byte code as used by the finschia-sdk CodeID uint64 `json:"code_id"` // Msg is assumed to be a json-encoded message, which will be passed directly // as `userMsg` when calling `Init` on a new contract with the above-defined CodeID diff --git a/types/queries.go b/types/queries.go index e9d1aa09..58dd8240 100644 --- a/types/queries.go +++ b/types/queries.go @@ -124,7 +124,7 @@ type AllBalancesResponse struct { } // IBCQuery defines a query request from the contract into the chain. -// This is the counterpart of `IbcQuery` in https://github.com/line/cosmwasm/blob/main/packages/std/src/ibc.rs . +// This is the counterpart of `IbcQuery` in https://github.com/Finschia/cosmwasm/blob/main/packages/std/src/ibc.rs . type IBCQuery struct { PortID *PortIDQuery `json:"port_id,omitempty"` ListChannels *ListChannelsQuery `json:"list_channels,omitempty"` @@ -140,7 +140,7 @@ type PortIDResponse struct { // ListChannelsQuery is an IBCQuery that lists all channels that are bound to a given port. // If `PortID` is unset, this list all channels bound to the contract's port. // Returns a `ListChannelsResponse`. -// This is the counterpart of `IbcQuery::ListChannels` in https://github.com/line/cosmwasm/blob/main/packages/std/src/ibc.rs . +// This is the counterpart of `IbcQuery::ListChannels` in https://github.com/Finschia/cosmwasm/blob/main/packages/std/src/ibc.rs . type ListChannelsQuery struct { // optional argument PortID string `json:"port_id,omitempty"`