Skip to content

Commit

Permalink
Merge branch 'main' into feat/wasm_refactor
Browse files Browse the repository at this point in the history
* main:
  fix: wasm module's FIXME in the snapshotter.go file (#649)
  chore(deps): Bump actions/setup-go from 3.2.1 to 3.3.0 (#650)
  chore(deps): Bump actions/cache from 3.0.7 to 3.0.8 (#648)
  fix: remove legacy codes of wasm (#640)
  chore(deps): Bump github.com/mattn/go-isatty from 0.0.14 to 0.0.16 (#643)
  chore(deps): Bump actions/cache from 3.0.6 to 3.0.7 (#642)
  chore: change some minor things that haven't been fixed in #549 (#635)
  refactor: rename x/collection events (#639)
  feat: add additional fields into x/collection events (#638)
  refactor: rename x/token events (#637)
  feat: add creator into x/token EventIssue (#636)
  chore(deps): Bump github.com/coinbase/rosetta-sdk-go (#641)
  chore: change `Keeper.space` type to be same with cosmos-sdk
  refactor: remove SetBalance and SetSupply (#629)
  refactor: revert changes in x/slashing proto (#627)
  chore(deps): Bump actions/cache from 3.0.5 to 3.0.6 (#631)
  chore(deps): Bump github.com/prometheus/client_golang (#632)
  chore(deps): Bump actions/setup-go from 2.1.4 to 3.2.1 (#624)
  feat: add Query/TokenClassTypeName (#622)
  feat: add additional information into EventXXXChanged (#621)

Signed-off-by: zemyblue <zemyblue@gmail.com>

# Conflicts:
#	CHANGELOG.md
#	client/docs/statik/statik.go
#	simapp/app.go
#	x/wasm/types/events.go
  • Loading branch information
zemyblue committed Sep 5, 2022
2 parents 6411ce4 + ded22b3 commit e888714
Show file tree
Hide file tree
Showing 72 changed files with 3,005 additions and 1,528 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 6
steps:
- uses: actions/setup-go@v2.1.4
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- uses: ./.github/actions/generate-swagger
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: install runsim
run: |
export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/runsim@v1.0.0
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -41,7 +41,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -58,7 +58,7 @@ jobs:
needs: [build, install-runsim, test-sim-multi-seed-long-part1]
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -75,7 +75,7 @@ jobs:
needs: [build, install-runsim, test-sim-multi-seed-long-part2]
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip-sims')"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
Expand All @@ -34,14 +34,14 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
run: go version
- name: Install runsim
run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/runsim@v1.0.0
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -51,7 +51,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
Expand All @@ -63,7 +63,7 @@ jobs:
!**/**_test.go
go.mod
go.sum
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -78,7 +78,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
Expand All @@ -92,7 +92,7 @@ jobs:
go.sum
SET_ENV_NAME_INSERTIONS: 1
SET_ENV_NAME_LINES: 1
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -107,7 +107,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
Expand All @@ -121,7 +121,7 @@ jobs:
go.sum
SET_ENV_NAME_INSERTIONS: 1
SET_ENV_NAME_LINES: 1
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -136,7 +136,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
Expand All @@ -150,7 +150,7 @@ jobs:
go.sum
SET_ENV_NAME_INSERTIONS: 1
SET_ENV_NAME_LINES: 1
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/sims_normal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip-sims')"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
Expand All @@ -22,14 +22,14 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
run: go version
- name: Install runsim
run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/runsim@v1.0.0
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -39,12 +39,12 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
run: go version
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -57,12 +57,12 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
run: go version
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -75,12 +75,12 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
run: go version
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Go
uses: actions/setup-go@v3.2.1
uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Unshallow
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
install-tparse:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- name: Display go version
run: go version
- name: install tparse
run: |
export GO111MODULE="on" && go install github.com/mfridman/tparse@v0.8.3
- uses: actions/cache@v3.0.5
- uses: actions/cache@v3.0.8
with:
path: ~/go/bin
key: ${{ runner.os }}-go-tparse-binary
Expand All @@ -47,7 +47,7 @@ jobs:
- run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
if: "matrix.package != ''"
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- uses: technote-space/get-diff-action@v6.1.0
Expand All @@ -65,7 +65,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-go@v3.2.1
# - uses: actions/setup-go@v3.3.0
# with:
# go-version: 1.18
# - name: Display go version
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- uses: technote-space/get-diff-action@v6.1.0
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.2.1
- uses: actions/setup-go@v3.3.0
with:
go-version: 1.18
- uses: technote-space/get-diff-action@v6.1.0
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (server/grpc) [\#607](https://github.com/line/lbm-sdk/pull/607) revert gRPC block height header.
* (global) [\#611](https://github.com/line/lbm-sdk/pull/611) bump github.com/cosmos/cosmos-sdk from v0.45.1 to v0.45.6
* (simapp) [\#620](https://github.com/line/lbm-sdk/pull/620) chore: add iterator feature for simapp
* (x/collection) [\#622](https://github.com/line/lbm-sdk/pull/622) add Query/TokenClassTypeName
* (x/bank) [\#629](https://github.com/line/lbm-sdk/pull/629) remove unsafe balance changing methods from bank keeper such as `SetBalance` and `SetSupply`.
* (x/wasm) [\#649](https://github.com/line/lbm-sdk/pull/649) fix: wasm module's FIXME in the snapshotter.go file

### Improvements

Expand All @@ -60,6 +63,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (x/collection) [\#604](https://github.com/line/lbm-sdk/pull/604) add EventOwnerChanged and EventRootChanged
* (x/collection) [\#608](https://github.com/line/lbm-sdk/pull/608) remove new APIs on x/collection
* (x/token) [\#609](https://github.com/line/lbm-sdk/pull/609) remove new APIs on x/token
* (x/collection) [\#621](https://github.com/line/lbm-sdk/pull/621) add additional information into EventXXXChanged
* (x/token) [\#636](https://github.com/line/lbm-sdk/pull/636) add creator into x/token EventIssue
* (x/token) [\#637](https://github.com/line/lbm-sdk/pull/637) rename x/token events
* (x/collection) [\#639](https://github.com/line/lbm-sdk/pull/639) rename x/collection events
* (x/wasm) [\#625](https://github.com/line/lbm-sdk/pull/625) detaching `StoreCodeAndInstantiateContract` from wasm's tx.proto
* (x/wasm) [\#655](https://github.com/line/lbm-sdk/pull/655) add inactive contract management in wasm (This replaces the contract blacklist function of contractStatus)

Expand All @@ -74,6 +81,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (client) [\#565](https://github.com/line/lbm-sdk/pull/565) fix the data race problem in `TestQueryABCIHeight`
* (x/token) [\#589](https://github.com/line/lbm-sdk/pull/589) fix naming collision in x/token enums
* (x/token) [\#599](https://github.com/line/lbm-sdk/pull/599) fix the order of events
* (x/wasm) [\#640](https://github.com/line/lbm-sdk/pull/640) remove legacy codes of wasm
* (amino) [\#635](https://github.com/line/lbm-sdk/pull/635) change some minor things that haven't been fixed in #549

### Breaking Changes
* (proto) [\#564](https://github.com/line/lbm-sdk/pull/564) change gRPC path to original cosmos path
Expand All @@ -82,6 +91,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (ostracon) [\#610](https://github.com/line/lbm-sdk/pull/610) apply change of prefix of key name in ostracon
* (ostracon) [\#614](https://github.com/line/lbm-sdk/pull/614) apply Ostracon's changes that replace `StakingPower` with `VotingPower` and `StakingPower` with `VotingPower`
* (proto) [\#617](https://github.com/line/lbm-sdk/pull/617) change wasm gRPC path to original `cosmwasm` path.
* (proto) [\#627](https://github.com/line/lbm-sdk/pull/627) revert changes in x/slashing proto

### Build, CI

Expand Down
2 changes: 1 addition & 1 deletion client/docs/statik/statik.go

Large diffs are not rendered by default.

Loading

0 comments on commit e888714

Please sign in to comment.