Skip to content

Commit

Permalink
Merge branch 'line-main' into fix/remove-outdated-queries
Browse files Browse the repository at this point in the history
  • Loading branch information
ulbqb committed Apr 19, 2023
2 parents a866f9a + 1cf7989 commit 5f05a1d
Show file tree
Hide file tree
Showing 453 changed files with 3,375 additions and 3,363 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ closes: #XXXX
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If any of the checklist items are not applicable, leave it `[ ]` and write a little note why. --->
<!--- 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/ibc-go/blob/main/CONTRIBUTING.md) and [code of conduct](https://github.com/line/ibc-go/blob/main/CODE_OF_CONDUCT.md).
- [ ] I followed the [contributing guidelines](https://github.com/Finschia/ibc-go/blob/main/CONTRIBUTING.md) and [code of conduct](https://github.com/Finschia/ibc-go/blob/main/CODE_OF_CONDUCT.md).
- [ ] I have added a relevant changelog to `CHANGELOG.md`
- [ ] I have added tests to cover my changes.
- [ ] I have updated the documentation accordingly.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
id: meta
uses: docker/metadata-action@69f6fc9d46f2f8bf0d5491e4aabe0bb8c6a4678a
with:
images: ${{ env.REGISTRY }}/line/${{ env.IMAGE_NAME }}
images: ${{ env.REGISTRY }}/Finschia/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ builds:
- -tags=netgo ledger
- -mod=readonly
ldflags:
- -s -w -X github.com/line/lbm-sdk/version.Name=sim -X github.com/line/lbm-sdk/version.AppName=simd -X github.com/line/lbm-sdk/version.Version={{.Version}} -X "github.com/line/lbm-sdk/version.BuildTags=netgo,ledger"
- -s -w -X github.com/Finschia/finschia-sdk/version.Name=sim -X github.com/Finschia/finschia-sdk/version.AppName=simd -X github.com/Finschia/finschia-sdk/version.Version={{.Version}} -X "github.com/Finschia/finschia-sdk/version.BuildTags=netgo,ledger"
env:
- CGO_ENABLED=0
goos:
Expand Down
13 changes: 7 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Changelog


## [Unreleased](https://github.com/line/ibc-go/compare/v3.3.2...HEAD)
## [Unreleased](https://github.com/Finschia/ibc-go/compare/v3.3.2...HEAD)

### Features
* (all) [\#10](https://github.com/Finschia/ibc-go/pull/10) chore: fix path due to change in organization

### Improvements
* [\#11](https://github.com/Finschia/ibc-go/pull/11) fix: delete queries generated from the removed `QueryAppVersionRequest`/`QueryAppVersionResponse`
Expand All @@ -17,15 +18,15 @@
### Document Updates


## [v3.3.2](https://github.com/line/ibc-go/compare/v3.3.1...v3.3.2) - 2023.04.03
## [v3.3.2](https://github.com/Finschia/ibc-go/compare/v3.3.1...v3.3.2) - 2023.04.03

### Features
* [\#5](https://github.com/line/ibc-go/pull/5) apply the changes of lbm-sdk and ostracon proto
* [\#6](https://github.com/line/ibc-go/pull/6) change to use 07-tendermint
* [\#5](https://github.com/Finschia/ibc-go/pull/5) apply the changes of finschia-sdk and ostracon proto
* [\#6](https://github.com/Finschia/ibc-go/pull/6) change to use 07-tendermint

### Improvements
* [\#1](https://github.com/line/ibc-go/pull/1) apply all changes of `x/ibc` in lbm-sdk until [lbm-sdk@0fbc2fcae6dba90fa80b815cf3219d6fcf46fc64](https://github.com/line/lbm-sdk/tree/0fbc2fcae6dba90fa80b815cf3219d6fcf46fc64)
* [\#3](https://github.com/line/ibc-go/pull/3) bump up github.com/cosmos/ibc-go from v3.0.0 to v3.3.1
* [\#1](https://github.com/Finschia/ibc-go/pull/1) apply all changes of `x/ibc` in finschia-sdk until [finschia-sdk@0fbc2fcae6dba90fa80b815cf3219d6fcf46fc64](https://github.com/Finschia/finschia-sdk/tree/0fbc2fcae6dba90fa80b815cf3219d6fcf46fc64)
* [\#3](https://github.com/Finschia/ibc-go/pull/3) bump up github.com/cosmos/ibc-go from v3.0.0 to v3.3.1


## [cosmos/ibc-go v3.0.0](https://github.com/cosmos/ibc-go/blob/v3.0.0/CHANGELOG.md) (2022-03-15)
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Contributing to this repo can mean many things such as participating in
discussion or proposing code changes. To ensure a smooth workflow for all
contributors, the general procedure for contributing has been established:

1. Either [open](https://github.com/line/ibc-go/issues/new/choose) or
[find](https://github.com/line/ibc-go/issues) an issue you'd like to help with
1. Either [open](https://github.com/Finschia/ibc-go/issues/new/choose) or
[find](https://github.com/Finschia/ibc-go/issues) an issue you'd like to help with
2. Participate in thoughtful discussion on that issue
3. If you would like to contribute:
1. If the issue is a proposal, ensure that the proposal has been accepted
Expand Down Expand Up @@ -52,7 +52,7 @@ taken place in a github issue, that PR runs a high likelihood of being rejected.
Other notes:

- Looking for a good place to start contributing? How about checking out some
[good first issues](https://github.com/line/ibc-go/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
[good first issues](https://github.com/Finschia/ibc-go/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
- Please make sure to run `make format` before every commit - the easiest way
to do this is have your editor run it for you upon saving a file. Additionally
please ensure that your code is lint compliant by running `golangci-lint run`.
Expand Down Expand Up @@ -95,12 +95,12 @@ Please note that Go requires code to live under absolute paths, which complicate
While my fork lives at `https://github.com/someone/ibc-go`,
the code should never exist at `$GOPATH/src/github.com/someone/ibc-go`.
Instead, we use `git remote` to add the fork as a new remote for the original repo,
`$GOPATH/src/github.com/line/ibc-go`, and do all the work there.
`$GOPATH/src/github.com/Finschia/ibc-go`, and do all the work there.

For instance, to create a fork and work on a branch of it, I would:

- Create the fork on github, using the fork button.
- Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/line/ibc-go`)
- Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/Finschia/ibc-go`)
- `git remote add fork git@github.com:someone/ibc-go.git`

Now `fork` refers to my fork and `origin` refers to the ibc-go version.
Expand Down Expand Up @@ -182,7 +182,7 @@ All development should be targeted against `main`. Bug fixes which are required
- the latest state of development is on `main`
- `main` must never fail `make test`
- no `--force` onto `main` (except when reverting a broken commit, which should seldom happen)
- create a development branch either on github.com/line/ibc-go, or your fork (using `git remote add fork`)
- create a development branch either on github.com/Finschia/ibc-go, or your fork (using `git remote add fork`)
- before submitting a pull request, begin `git rebase` on top of `main`

### Pull Merge Procedure
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 COSMOS
Copyright (c) 2023 Finschia Foundation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
40 changes: 20 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ BINDIR ?= $(GOPATH)/bin
BUILDDIR ?= $(CURDIR)/build
SIMAPP = ./testing/simapp
MOCKS_DIR = $(CURDIR)/tests/mocks
HTTPS_GIT := https://github.com/line/ibc-go.git
HTTPS_GIT := https://github.com/Finschia/ibc-go.git
DOCKER := $(shell which docker)
DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8

Expand Down Expand Up @@ -41,7 +41,7 @@ ifeq ($(LEDGER_ENABLED),true)
endif
endif

ifeq (cleveldb,$(findstring cleveldb,$(LBM_BUILD_OPTIONS)))
ifeq (cleveldb,$(findstring cleveldb,$(FNSA_BUILD_OPTIONS)))
build_tags += gcc
endif
build_tags += $(BUILD_TAGS)
Expand All @@ -54,40 +54,40 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))

# process linker flags

ldflags = -X github.com/line/lbm-sdk/version.Name=sim \
-X github.com/line/lbm-sdk/version.AppName=simd \
-X github.com/line/lbm-sdk/version.Version=$(VERSION) \
-X github.com/line/lbm-sdk/version.Commit=$(COMMIT) \
-X "github.com/line/lbm-sdk/version.BuildTags=$(build_tags_comma_sep)"
ldflags = -X github.com/Finschia/finschia-sdk/version.Name=sim \
-X github.com/Finschia/finschia-sdk/version.AppName=simd \
-X github.com/Finschia/finschia-sdk/version.Version=$(VERSION) \
-X github.com/Finschia/finschia-sdk/version.Commit=$(COMMIT) \
-X "github.com/Finschia/finschia-sdk/version.BuildTags=$(build_tags_comma_sep)"

# DB backend selection
ifeq (cleveldb,$(findstring cleveldb,$(LBM_BUILD_OPTIONS)))
ldflags += -X github.com/line/lbm-sdk/types.DBBackend=cleveldb
ifeq (cleveldb,$(findstring cleveldb,$(FNSA_BUILD_OPTIONS)))
ldflags += -X github.com/Finschia/finschia-sdk/types.DBBackend=cleveldb
endif
ifeq (badgerdb,$(findstring badgerdb,$(LBM_BUILD_OPTIONS)))
ldflags += -X github.com/line/lbm-sdk/types.DBBackend=badgerdb
ifeq (badgerdb,$(findstring badgerdb,$(FNSA_BUILD_OPTIONS)))
ldflags += -X github.com/Finschia/finschia-sdk/types.DBBackend=badgerdb
endif
# handle rocksdb
ifeq (rocksdb,$(findstring rocksdb,$(LBM_BUILD_OPTIONS)))
ifeq (rocksdb,$(findstring rocksdb,$(FNSA_BUILD_OPTIONS)))
CGO_ENABLED=1
BUILD_TAGS += rocksdb
ldflags += -X github.com/line/lbm-sdk/types.DBBackend=rocksdb
ldflags += -X github.com/Finschia/finschia-sdk/types.DBBackend=rocksdb
endif
# handle boltdb
ifeq (boltdb,$(findstring boltdb,$(LBM_BUILD_OPTIONS)))
ifeq (boltdb,$(findstring boltdb,$(FNSA_BUILD_OPTIONS)))
BUILD_TAGS += boltdb
ldflags += -X github.com/line/lbm-sdk/types.DBBackend=boltdb
ldflags += -X github.com/Finschia/finschia-sdk/types.DBBackend=boltdb
endif

ifeq (,$(findstring nostrip,$(LBM_BUILD_OPTIONS)))
ifeq (,$(findstring nostrip,$(FNSA_BUILD_OPTIONS)))
ldflags += -w -s
endif
ldflags += $(LDFLAGS)
ldflags := $(strip $(ldflags))

BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
# check for nostrip option
ifeq (,$(findstring nostrip,$(LBM_BUILD_OPTIONS)))
ifeq (,$(findstring nostrip,$(FNSA_BUILD_OPTIONS)))
BUILD_FLAGS += -trimpath
endif

Expand Down Expand Up @@ -187,7 +187,7 @@ update-swagger-docs: statik
.PHONY: update-swagger-docs

godocs:
@echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/line/lbm-sdk/types"
@echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/Finschia/finschia-sdk/types"
godoc -http=:6060

# This builds a docs site for each branch/tag in `./docs/versions`
Expand Down Expand Up @@ -346,12 +346,12 @@ format:
DEVDOC_SAVE = docker commit `docker ps -a -n 1 -q` devdoc:local

devdoc-init:
$(DOCKER) run -it -v "$(CURDIR):/go/src/github.com/line/lbm-sdk" -w "/go/src/github.com/line/lbm-sdk" tendermint/devdoc echo
$(DOCKER) run -it -v "$(CURDIR):/go/src/github.com/Finschia/finschia-sdk" -w "/go/src/github.com/Finschia/finschia-sdk" tendermint/devdoc echo
# TODO make this safer
$(call DEVDOC_SAVE)

devdoc:
$(DOCKER) run -it -v "$(CURDIR):/go/src/github.com/line/lbm-sdk" -w "/go/src/github.com/line/lbm-sdk" devdoc:local bash
$(DOCKER) run -it -v "$(CURDIR):/go/src/github.com/Finschia/finschia-sdk" -w "/go/src/github.com/Finschia/finschia-sdk" devdoc:local bash

devdoc-save:
# TODO make this safer
Expand Down
54 changes: 27 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
# ibc-go
<div align="center">
<a href="https://github.com/line/ibc-go/releases/latest">
<img alt="Version" src="https://img.shields.io/github/tag/line/ibc-go.svg" />
<a href="https://github.com/Finschia/ibc-go/releases/latest">
<img alt="Version" src="https://img.shields.io/github/tag/Finschia/ibc-go.svg" />
</a>
<a href="https://github.com/line/ibc-go/blob/main/LICENSE">
<img alt="License: Apache-2.0" src="https://img.shields.io/github/license/line/ibc-go.svg" />
<a href="https://github.com/Finschia/ibc-go/blob/main/LICENSE">
<img alt="License: Apache-2.0" src="https://img.shields.io/github/license/Finschia/ibc-go.svg" />
</a>
<a href="https://pkg.go.dev/github.com/line/ibc-go?tab=doc">
<img alt="GoDoc" src="https://godoc.org/github.com/line/ibc-go?status.svg" />
<a href="https://pkg.go.dev/github.com/Finschia/ibc-go?tab=doc">
<img alt="GoDoc" src="https://godoc.org/github.com/Finschia/ibc-go?status.svg" />
</a>
<a href="https://goreportcard.com/report/github.com/line/ibc-go">
<img alt="Go report card" src="https://goreportcard.com/badge/github.com/line/ibc-go" />
<a href="https://goreportcard.com/report/github.com/Finschia/ibc-go">
<img alt="Go report card" src="https://goreportcard.com/badge/github.com/Finschia/ibc-go" />
</a>
<a href="https://codecov.io/gh/line/ibc-go">
<img alt="Code Coverage" src="https://codecov.io/gh/line/ibc-go/branch/main/graph/badge.svg" />
<a href="https://codecov.io/gh/Finschia/ibc-go">
<img alt="Code Coverage" src="https://codecov.io/gh/Finschia/ibc-go/branch/main/graph/badge.svg" />
</a>
</div>
<div align="center">
<a href="https://github.com/line/ibc-go">
<img alt="Lines Of Code" src="https://tokei.rs/b1/github/line/ibc-go" />
<a href="https://github.com/Finschia/ibc-go">
<img alt="Lines Of Code" src="https://tokei.rs/b1/github/Finschia/ibc-go" />
</a>
<a href="https://discord.gg/AzefAFd">
<img alt="Discord" src="https://img.shields.io/discord/669268347736686612.svg" />
</a>
<a href="https://sourcegraph.com/github.com/line/ibc-go?badge">
<img alt="Imported by" src="https://sourcegraph.com/github.com/line/ibc-go/-/badge.svg" />
<a href="https://sourcegraph.com/github.com/Finschia/ibc-go?badge">
<img alt="Imported by" src="https://sourcegraph.com/github.com/Finschia/ibc-go/-/badge.svg" />
</a>
<img alt="Lint Status" src="https://github.com/line/cosmos-sdk/workflows/Lint/badge.svg" />
<img alt="Lint Status" src="https://github.com/Finschia/ibc-go/workflows/Lint/badge.svg" />
</div>

The Inter-Blockchain Communication protocol (IBC) allows blockchains to talk to each other. IBC handles transport across different sovereign blockchains. This end-to-end, connection-oriented, stateful protocol provides reliable, ordered, and authenticated communication between heterogeneous blockchains. This IBC implementation in Golang is built as a Cosmos SDK module.

## Contents

1. **[Core IBC Implementation](https://github.com/line/ibc-go/tree/main/modules/core)**
1. **[Core IBC Implementation](https://github.com/Finschia/ibc-go/tree/main/modules/core)**

1.1 [ICS 02 Client](https://github.com/line/ibc-go/tree/main/modules/core/02-client)
1.1 [ICS 02 Client](https://github.com/Finschia/ibc-go/tree/main/modules/core/02-client)

1.2 [ICS 03 Connection](https://github.com/line/ibc-go/tree/main/modules/core/03-connection)
1.2 [ICS 03 Connection](https://github.com/Finschia/ibc-go/tree/main/modules/core/03-connection)

1.3 [ICS 04 Channel](https://github.com/line/ibc-go/tree/main/modules/core/04-channel)
1.3 [ICS 04 Channel](https://github.com/Finschia/ibc-go/tree/main/modules/core/04-channel)

1.4 [ICS 05 Port](https://github.com/line/ibc-go/tree/main/modules/core/05-port)
1.4 [ICS 05 Port](https://github.com/Finschia/ibc-go/tree/main/modules/core/05-port)

1.5 [ICS 23 Commitment](https://github.com/line/ibc-go/tree/main/modules/core/23-commitment/types)
1.5 [ICS 23 Commitment](https://github.com/Finschia/ibc-go/tree/main/modules/core/23-commitment/types)

1.6 [ICS 24 Host](https://github.com/line/ibc-go/tree/main/modules/core/24-host)
1.6 [ICS 24 Host](https://github.com/Finschia/ibc-go/tree/main/modules/core/24-host)

2. **Applications**

2.1 [ICS 20 Fungible Token Transfers](https://github.com/line/ibc-go/tree/main/modules/apps/transfer)
2.1 [ICS 20 Fungible Token Transfers](https://github.com/Finschia/ibc-go/tree/main/modules/apps/transfer)

2.2 [ICS 27 Interchain Accounts](https://github.com/line/ibc-go/tree/main/modules/apps/27-interchain-accounts)
2.2 [ICS 27 Interchain Accounts](https://github.com/Finschia/ibc-go/tree/main/modules/apps/27-interchain-accounts)

3. **Light Clients**

3.1 [ICS 06 Solo Machine](https://github.com/line/ibc-go/tree/main/modules/light-clients/06-solomachine)
3.1 [ICS 06 Solo Machine](https://github.com/Finschia/ibc-go/tree/main/modules/light-clients/06-solomachine)

3.2 [ICS 07 Tendermint](https://github.com/line/ibc-go/tree/main/modules/light-clients/07-tendermint)
3.2 [ICS 07 Tendermint](https://github.com/Finschia/ibc-go/tree/main/modules/light-clients/07-tendermint)

Note: The localhost client is currently non-functional.

Expand All @@ -68,5 +68,5 @@ For an overview of upcoming changes to ibc-go take a look at the [roadmap](./doc
## Resources

- [IBC Website](https://ibcprotocol.org/)
- [IBC Specification](https://github.com/line/ibc)
- [IBC Specification](https://github.com/cosmos/ibc)
- [Documentation](https://ibc.cosmos.network/main/ibc/overview.html)
4 changes: 2 additions & 2 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ This is visually explained in the following decision tree:
<img src="releases-decision-tree.png?raw=true" alt="Releases decision tree" width="40%" />
</p>

When bumping the dependencies of [LBM SDK](https://github.com/line/lbm-sdk) and [Ostracon](https://github.com/line/ostracon) we will only treat patch releases as non state-machine breaking.
When bumping the dependencies of [Finschia SDK](https://github.com/Finschia/finschia-sdk) and [Ostracon](https://github.com/Finschia/ostracon) we will only treat patch releases as non state-machine breaking.

## <a name="backwards"></a> Backwards compatibility

[ibc-go](https://github.com/line/ibc-go) and the [IBC protocol specification](https://github.com/cosmos/ibc) maintain different versions. Furthermore, ibc-go serves several different user groups (chains, IBC app developers, relayers, IBC light client developers). Each of these groups has different expectations of what *backwards compatible* means. It simply isn't possible to categorize a change as backwards or non backwards compatible for all user groups. We are primarily interested in when our API breaks and when changes are state machine breaking (thus requiring a coordinated upgrade). This is scoping the meaning of ibc-go to that of those interacting with the code (IBC app developers, relayers, IBC light client developers), not chains using IBC to communicate (that should be encapsulated by the IBC protocol specification versioning).
[ibc-go](https://github.com/Finschia/ibc-go) and the [IBC protocol specification](https://github.com/cosmos/ibc) maintain different versions. Furthermore, ibc-go serves several different user groups (chains, IBC app developers, relayers, IBC light client developers). Each of these groups has different expectations of what *backwards compatible* means. It simply isn't possible to categorize a change as backwards or non backwards compatible for all user groups. We are primarily interested in when our API breaks and when changes are state machine breaking (thus requiring a coordinated upgrade). This is scoping the meaning of ibc-go to that of those interacting with the code (IBC app developers, relayers, IBC light client developers), not chains using IBC to communicate (that should be encapsulated by the IBC protocol specification versioning).

To summarize: **All our ibc-go releases allow chains to communicate successfully with any chain running any version of our code**. That is to say, we are still using IBC protocol specification v1.0.

Expand Down
Loading

0 comments on commit 5f05a1d

Please sign in to comment.