Skip to content

Commit

Permalink
Merge branch 'rc/v0.47.0-alpha1' into feat/backport_to_main
Browse files Browse the repository at this point in the history
* rc/v0.47.0-alpha1: (34 commits)
  ci: update docker action (Finschia#983)
  fix: revert Finschia#952 (Finschia#984)
  refactor: refactor x/token,collection query errors (Finschia#980)
  fix: not to throw error when no txs in block (Finschia#982)
  chore: change import path to `github.com/Finschia/finschia-sdk` (Finschia#970)
  fix: remove legacy events on x/collection and x/token (Finschia#966)
  chore: provide specific error messages on x/collection queries (Finschia#965)
  fix: check event determinism on original modules (Finschia#963)
  fix: refactor queries of x/collection and x/token (Finschia#957)
  chore: address generation of the empty coins in x/foundation (Finschia#952)
  fix: do not loop enum in x/collection (Finschia#961)
  fix: fix default next class ids of x/collection (Finschia#960)
  fix: revert Finschia#955 and add Query/HasParent into x/collection (Finschia#959)
  fix: replace query errors on the original modules into gRPC ones (Finschia#956)
  fix: return nil where the parent not exists in x/collection Query/Parent (Finschia#955)
  fix: remove duplicated events in x/collection Msg/Modify (Finschia#954)
  fix: allow zero amount of coin in x/collection Query/Balance (Finschia#953)
  fix: unpack proposals in x/foundation import-genesis (Finschia#947)
  fix: fix broken x/foundation invariant on treasury (Finschia#946)
  docs: update comments in the x/token,collection events proto (Finschia#944)
  ...
  • Loading branch information
zemyblue committed Apr 21, 2023
2 parents 598af0a + 834db49 commit d03627e
Show file tree
Hide file tree
Showing 1,451 changed files with 14,272 additions and 14,467 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/lbm-sdk/blob/main/CONTRIBUTING.md) and [code of conduct](https://github.com/line/lbm-sdk/blob/main/CODE_OF_CONDUCT.md).
- [ ] I followed the [contributing guidelines](https://github.com/Finschia/finschia-sdk/blob/main/CONTRIBUTING.md) and [code of conduct](https://github.com/Finschia/finschia-sdk/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/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
env:
registry: docker.io
repository: line/lbm-simapp
repository: finschia/finschia-simapp
jobs:
build:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Lint
# This workflow is run on every pull request and push to main
# The `golangci` will pass without running if no *.{go, mod, sum} files have been changed.
env:
GOPRIVATE: "github.com/line/*"
GOPRIVATE: "github.com/Finschia/*"
on:
pull_request:
push:
Expand All @@ -30,7 +30,7 @@ jobs:
- uses: golangci/golangci-lint-action@master
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.47.2
version: v1.49.0
args: --timeout 10m
github-token: ${{ secrets.GITHUB_TOKEN }}
if: env.GIT_DIFF
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ jobs:
excludelist="$(find ./ -type f -name '*.go' | xargs grep -l 'DONTCOVER')"
excludelist+=" $(find ./ -type f -path './tests/mocks/*.go')"
for filename in ${excludelist}; do
filename=$(echo $filename | sed 's/^./github.com\/line\/lbm-sdk/g')
filename=$(echo $filename | sed 's/^./github.com\/Finschia\/finschia-sdk/g')
echo "Excluding ${filename} from coverage report..."
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
Expand Down
4 changes: 2 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ changelog:

release:
github:
owner: line
name: lbm-sdk
owner: finschia
name: finschia-sdk
prerelease: auto
mode: replace
draft: false
Expand Down
39 changes: 30 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,22 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (log) [\#883](https://github.com/line/lbm-sdk/pull/883) add zerolog based rolling log system
* (Ostracon) [\#887](https://github.com/line/lbm-sdk/pull/887) apply the changes of vrf location in Ostracon
* (x/upgrade) [\#889](https://github.com/line/lbm-sdk/pull/889) remove time based upgrade
* (all) [\#970](https://github.com/Finschia/finschia-sdk/pull/970) change import path to `github.com/Finschia/finschia-sdk` and update license

### Improvements
* (cosmovisor) [\#792](https://github.com/line/lbm-sdk/pull/792) Use upstream's cosmovisor
* (server) [\#821](https://github.com/line/lbm-sdk/pull/821) Get validator pubkey considering KMS
* (client) [\#890](https://github.com/line/lbm-sdk/pull/890) Map Ostracon:ErrTxInMap to lbm-sdk:ErrTxInMempoolCache
* (x/collection) [\#894](https://github.com/line/lbm-sdk/pull/894) Change the default params of x/collection
* (ante) [\#895](https://github.com/line/lbm-sdk/pull/895) Remove max gas validation
* (x/collection,token) [\#900](https://github.com/line/lbm-sdk/pull/900) Add uri for MsgModify and deprecate the old ones
* (x/foundation) [\#912](https://github.com/line/lbm-sdk/pull/912) Introduce censorship into x/foundation
* (x/foundation) [\#933](https://github.com/line/lbm-sdk/pull/933) Clean up x/foundation apis
* (x/collection) [\#938](https://github.com/line/lbm-sdk/pull/938) Add progress log into x/collection import-genesis
* (x/collection,token) [\#900](https://github.com/Finschia/finschia-sdk/pull/900) Add uri for MsgModify and deprecate the old ones
* (x/foundation) [\#912](https://github.com/Finschia/finschia-sdk/pull/912) Introduce censorship into x/foundation
* (x/foundation) [\#933](https://github.com/Finschia/finschia-sdk/pull/933) Clean up x/foundation apis
* (x/collection) [\#938](https://github.com/Finschia/finschia-sdk/pull/938) Add progress log into x/collection import-genesis
* (x/foundation) [\#952](https://github.com/Finschia/finschia-sdk/pull/952) Address generation of the empty coins in x/foundation
* (x/collection,token,foundation) [\#963](https://github.com/Finschia/finschia-sdk/pull/963) Check event determinism on original modules
* (x/collection) [\#965](https://github.com/Finschia/finschia-sdk/pull/965) Provide specific error messages on x/collection queries
* (x/collection,token) [\#980](https://github.com/Finschia/finschia-sdk/pull/980) refactor x/token,collection query errors

### Bug Fixes
* (client) [\#817](https://github.com/line/lbm-sdk/pull/817) remove support for composite (BLS) type
Expand All @@ -63,13 +68,26 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (x/token,collection) [\#863](https://github.com/line/lbm-sdk/pull/863) Update x/collection,token proto
* (x/collection,token) [\#866](https://github.com/line/lbm-sdk/pull/866) Do not create account on x/token,collection
* (x/collection,token) [\#881](https://github.com/line/lbm-sdk/pull/881) Remove some x/token,collection queries on listable collections
* (x/collection) [\#911](https://github.com/line/lbm-sdk/pull/911) Add missing command(TxCmdModify) for CLI
* (x/foundation) [\#922](https://github.com/line/lbm-sdk/pull/922) Propagate events in x/foundation through sdk.Results
* (swagger) [\#898](https://github.com/Finschia/finschia-sdk/pull/898) fix a bug not added `lbm.tx.v1beta1.Service/GetBlockWithTxs` in swagger
* (x/collection) [\#911](https://github.com/Finschia/finschia-sdk/pull/911) Add missing command(TxCmdModify) for CLI
* (x/foundation) [\#922](https://github.com/Finschia/finschia-sdk/pull/922) Propagate events in x/foundation through sdk.Results
* (x/foundation) [\#946](https://github.com/Finschia/finschia-sdk/pull/946) Fix broken x/foundation invariant on treasury
* (x/foundation) [\#947](https://github.com/Finschia/finschia-sdk/pull/947) Unpack proposals in x/foundation import-genesis
* (x/collection) [\#953](https://github.com/Finschia/finschia-sdk/pull/953) Allow zero amount of coin in x/collection Query/Balance
* (x/collection) [\#954](https://github.com/Finschia/finschia-sdk/pull/954) Remove duplicated events in x/collection Msg/Modify
* (x/collection) [\#955](https://github.com/Finschia/finschia-sdk/pull/955) Return nil where the parent not exists in x/collection Query/Parent
* (x/collection) [\#959](https://github.com/Finschia/finschia-sdk/pull/959) Revert #955 and add Query/HasParent into x/collection
* (x/collection) [\#960](https://github.com/Finschia/finschia-sdk/pull/960) Fix default next class ids of x/collection
* (x/collection) [\#961](https://github.com/Finschia/finschia-sdk/pull/961) Do not loop enum in x/collection
* (x/collection,token) [\#957](https://github.com/Finschia/finschia-sdk/pull/957) Refactor queries of x/collection and x/token
* (x/auth) [\#982](https://github.com/Finschia/finschia-sdk/pull/957) Fix not to emit error when no txs in block while querying `GetBlockWithTxs`
* (x/foundation) [\#984](https://github.com/Finschia/finschia-sdk/pull/984) Revert #952

### Removed
* [\#853](https://github.com/line/lbm-sdk/pull/853) remove useless stub BeginBlock, EndBlock methods from modules below
* ibc, authz, collection, feegrant, ibc, token, wasm
* (x/ibc) [\#858](https://github.com/line/lbm-sdk/pull/858) detach ibc module(repo: [line/ibc-go](https://github.com/line/ibc-go))
* (x/collection,token) [\#966](https://github.com/Finschia/finschia-sdk/pull/966) Remove legacy events on x/collection and x/token

### Breaking Changes
* (rest) [\#807](https://github.com/line/lbm-sdk/pull/807) remove legacy REST API
Expand All @@ -78,12 +96,15 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (x/bank) [\#876](https://github.com/line/lbm-sdk/pull/876) Add `MultiSend` deactivation
* (x/auth) [\#891](https://github.com/line/lbm-sdk/pull/891) deprecate `cosmos.tx.v1beta1.Service/GetBlockWithTxs` and add `lbm.tx.v1beta1.Service/GetBlockWithTxs` for lbm
* (abci) [\#892](https://github.com/line/lbm-sdk/pull/892) remove the incompatible field `index=14` in `TxResponse`
* (proto) [\#923](https://github.com/line/lbm-sdk/pull/923) deprecate broadcast mode `block`
* (proto) [\#923](https://github.com/Finschia/finschia-sdk/pull/923) deprecate broadcast mode `block`
* (x/collection,token) [\#956](https://github.com/Finschia/finschia-sdk/pull/956) Replace query errors on the original modules into gRPC ones

### Build, CI
* (ci) [\#829](https://github.com/line/lbm-sdk/pull/829) automate release process
* (build) [\#872](https://github.com/line/lbm-sdk/pull/872) Retract v1.0.0
* (ci, build) [\#901](https://github.com/line/lbm-sdk/pull/901) Update release pipeline to match non-wasm env
* (ci, build) [\#901](https://github.com/Finschia/finschia-sdk/pull/901) Update release pipeline to match non-wasm env
* (ci) [\#983](https://github.com/Finschia/finschia-sdk/pull/983) update docker action to fit new repository

### Document Updates
* (x/foundation) [\#934](https://github.com/line/lbm-sdk/pull/934) Update permlinks in x/foundation documents
* (x/foundation) [\#934](https://github.com/Finschia/finschia-sdk/pull/934) Update permlinks in x/foundation documents
* (x/collection,token) [\#944](https://github.com/Finschia/finschia-sdk/pull/944) Update comments in the x/token,collection events proto
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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
Expand Down
28 changes: 14 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
- [Point Release Procedure](#point-release-procedure)
- [Code Owner Membership](#code-owner-membership)

Thank you for considering making contributions to lbm-sdk and related
Thank you for considering making contributions to finschia-sdk and related
repositories!

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/lbm-sdk/issues/new/choose) or
[find](https://github.com/line/lbm-sdk/issues) an issue you'd like to help with
1. Either [open](https://github.com/Finschia/finschia-sdk/issues/new/choose) or
[find](https://github.com/Finschia/finschia-sdk/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 All @@ -35,7 +35,7 @@ contributors, the general procedure for contributing has been established:
to begin work
4. Follow standard Github best practices: fork the repo, branch from the
HEAD of `main`, make some commits, and submit a PR to `main`
- For core developers working within the lbm-sdk repo, to ensure a clear
- For core developers working within the finschia-sdk repo, to ensure a clear
ownership of branches, branches must be named with the convention
`{moniker}/{issue#}-branch-name`
5. Be sure to submit the PR in `Draft` mode submit your PR early, even if
Expand All @@ -59,7 +59,7 @@ Other notes:
before each commit is available in the `contrib/githooks/` directory.

## Commit Convention
All commits pushed to `lbm-sdk` are classified according to the rules below.
All commits pushed to `finschia-sdk` are classified according to the rules below.
Therefore, it cannot be included in the release notes unless you properly assign the prefix to the commit. For example, you can write commit message like `feat: this is new feature`. However, if you want to clarify the scope of the commit, you can write it as follows `feat(x/token): this is new feature`.
- `chore` : a commit of the type chore makes trivial changes. If you don't want to include specific commit in the release note, add this prefix.
- `feat` : a commit of the type feat introduces a new feature to the codebase
Expand Down Expand Up @@ -104,20 +104,20 @@ If you open a PR on the LBM SDK, it is mandatory to update the relevant document
## Forking

Please note that Go requires code to live under absolute paths, which complicates forking.
While my fork lives at `https://github.com/someone/lbm-sdk`,
the code should never exist at `$GOPATH/src/github.com/someone/lbm-sdk`.
While my fork lives at `https://github.com/someone/finschia-sdk`,
the code should never exist at `$GOPATH/src/github.com/someone/finschia-sdk`.
Instead, we use `git remote` to add the fork as a new remote for the original repo,
`$GOPATH/src/github.com/line/lbm-sdk`, and do all the work there.
`$GOPATH/src/github.com/Finschia/finschia-sdk`, 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/lbm-sdk`)
- Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/Finschia/finschia-sdk`)
- `git remote rename origin upstream`
- `git remote add origin [email protected]:someone/lbm-sdk.git`
- `git remote add origin [email protected]:someone/finschia-sdk.git`

Now `origin` refers to my fork and `upstream` refers to the lbm-sdk version.
So I can `git push -u origin main` to update my fork, and make pull requests to lbm-sdk from there.
Now `origin` refers to my fork and `upstream` refers to the finschia-sdk version.
So I can `git push -u origin main` to update my fork, and make pull requests to finschia-sdk from there.
Of course, replace `someone` with your git handle.

To pull in updates from the origin repo, run
Expand All @@ -141,7 +141,7 @@ build, in which case we can fall back on `go mod tidy -v`.

## Protobuf

We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https://github.com/gogo/protobuf) to generate code for use in lbm-sdk.
We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https://github.com/gogo/protobuf) to generate code for use in finschia-sdk.

For determinstic behavior around Protobuf tooling, everything is containerized using Docker. Make sure to have Docker installed on your machine, or head to [Docker's website](https://docs.docker.com/get-docker/) to install it.

Expand Down Expand Up @@ -216,7 +216,7 @@ should be targeted against the release candidate branch.
- `main` must never fail `make lint test test-race`
- `main` should not fail `make lint`
- no `--force` onto `main` (except when reverting a broken commit, which should seldom happen)
- create a development branch either on github.com/line/lbm-sdk, or your fork (using `git remote add origin`)
- create a development branch either on github.com/Finschia/finschia-sdk, or your fork (using `git remote add origin`)
- before submitting a pull request, begin `git rebase` on top of `main`
### Pull Merge Procedure
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ ENV PACKAGES curl make git libc-dev bash gcc g++ linux-headers eudev-dev python3
RUN apk add --update --no-cache $PACKAGES

# Set working directory for the build
WORKDIR /go/src/github.com/line/lbm-sdk
WORKDIR /go/src/github.com/Finschia/finschia-sdk

# prepare dbbackend before building; this can be cached
COPY ./Makefile ./
COPY ./contrib ./contrib
#RUN make dbbackend

# Install GO dependencies
COPY ./go.mod /go/src/github.com/line/lbm-sdk/go.mod
COPY ./go.sum /go/src/github.com/line/lbm-sdk/go.sum
COPY ./go.mod /go/src/github.com/Finschia/finschia-sdk/go.mod
COPY ./go.sum /go/src/github.com/Finschia/finschia-sdk/go.sum
RUN go mod download

# Add source files
Expand All @@ -44,7 +44,7 @@ RUN apk add --update --no-cache ca-certificates libstdc++
WORKDIR /root

# Copy over binaries from the build-env
COPY --from=build-env /go/src/github.com/line/lbm-sdk/build/simd /usr/bin/simd
COPY --from=build-env /go/src/github.com/Finschia/finschia-sdk/build/simd /usr/bin/simd

EXPOSE 26656 26657 1317 9090

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,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.
Expand Down
Loading

0 comments on commit d03627e

Please sign in to comment.