Skip to content

Commit e888714

Browse files
zemybluezemyblue
committed
Merge branch 'main' into feat/wasm_refactor
* 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 <[email protected]> # Conflicts: # CHANGELOG.md # client/docs/statik/statik.go # simapp/app.go # x/wasm/types/events.go
2 parents 6411ce4 + ded22b3 commit e888714

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3005
-1528
lines changed

‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
timeout-minutes: 6
1717
steps:
18-
- uses: actions/setup-go@v2.1.4
18+
- uses: actions/setup-go@v3.3.0
1919
with:
2020
go-version: 1.18
2121
- uses: actions/checkout@v3

‎.github/workflows/proto.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v2
27-
- uses: actions/setup-go@v3.2.1
27+
- uses: actions/setup-go@v3.3.0
2828
with:
2929
go-version: 1.18
3030
- uses: ./.github/actions/generate-swagger

‎.github/workflows/release-sims.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: install runsim
3232
run: |
3333
export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
34-
- uses: actions/[email protected].5
34+
- uses: actions/[email protected].8
3535
with:
3636
path: ~/go/bin
3737
key: ${{ runner.os }}-go-runsim-binary
@@ -41,7 +41,7 @@ jobs:
4141
needs: [build, install-runsim]
4242
steps:
4343
- uses: actions/checkout@v3
44-
- uses: actions/[email protected].5
44+
- uses: actions/[email protected].8
4545
with:
4646
path: ~/go/bin
4747
key: ${{ runner.os }}-go-runsim-binary
@@ -58,7 +58,7 @@ jobs:
5858
needs: [build, install-runsim, test-sim-multi-seed-long-part1]
5959
steps:
6060
- uses: actions/checkout@v3
61-
- uses: actions/[email protected].5
61+
- uses: actions/[email protected].8
6262
with:
6363
path: ~/go/bin
6464
key: ${{ runner.os }}-go-runsim-binary
@@ -75,7 +75,7 @@ jobs:
7575
needs: [build, install-runsim, test-sim-multi-seed-long-part2]
7676
steps:
7777
- uses: actions/checkout@v3
78-
- uses: actions/[email protected].5
78+
- uses: actions/[email protected].8
7979
with:
8080
path: ~/go/bin
8181
key: ${{ runner.os }}-go-runsim-binary

‎.github/workflows/sims.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: "!contains(github.event.head_commit.message, 'skip-sims')"
2424
steps:
2525
- uses: actions/checkout@v3
26-
- uses: actions/setup-go@v3.2.1
26+
- uses: actions/setup-go@v3.3.0
2727
with:
2828
go-version: 1.18
2929
- name: Display go version
@@ -34,14 +34,14 @@ jobs:
3434
runs-on: ubuntu-latest
3535
needs: build
3636
steps:
37-
- uses: actions/setup-go@v3.2.1
37+
- uses: actions/setup-go@v3.3.0
3838
with:
3939
go-version: 1.18
4040
- name: Display go version
4141
run: go version
4242
- name: Install runsim
4343
run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
44-
- uses: actions/[email protected].5
44+
- uses: actions/[email protected].8
4545
with:
4646
path: ~/go/bin
4747
key: ${{ runner.os }}-go-runsim-binary
@@ -51,7 +51,7 @@ jobs:
5151
needs: [build, install-runsim]
5252
steps:
5353
- uses: actions/checkout@v3
54-
- uses: actions/setup-go@v3.2.1
54+
- uses: actions/setup-go@v3.3.0
5555
with:
5656
go-version: 1.18
5757
- name: Display go version
@@ -63,7 +63,7 @@ jobs:
6363
!**/**_test.go
6464
go.mod
6565
go.sum
66-
- uses: actions/[email protected].5
66+
- uses: actions/[email protected].8
6767
with:
6868
path: ~/go/bin
6969
key: ${{ runner.os }}-go-runsim-binary
@@ -78,7 +78,7 @@ jobs:
7878
needs: [build, install-runsim]
7979
steps:
8080
- uses: actions/checkout@v3
81-
- uses: actions/setup-go@v3.2.1
81+
- uses: actions/setup-go@v3.3.0
8282
with:
8383
go-version: 1.18
8484
- name: Display go version
@@ -92,7 +92,7 @@ jobs:
9292
go.sum
9393
SET_ENV_NAME_INSERTIONS: 1
9494
SET_ENV_NAME_LINES: 1
95-
- uses: actions/[email protected].5
95+
- uses: actions/[email protected].8
9696
with:
9797
path: ~/go/bin
9898
key: ${{ runner.os }}-go-runsim-binary
@@ -107,7 +107,7 @@ jobs:
107107
needs: [build, install-runsim]
108108
steps:
109109
- uses: actions/checkout@v3
110-
- uses: actions/setup-go@v3.2.1
110+
- uses: actions/setup-go@v3.3.0
111111
with:
112112
go-version: 1.18
113113
- name: Display go version
@@ -121,7 +121,7 @@ jobs:
121121
go.sum
122122
SET_ENV_NAME_INSERTIONS: 1
123123
SET_ENV_NAME_LINES: 1
124-
- uses: actions/[email protected].5
124+
- uses: actions/[email protected].8
125125
with:
126126
path: ~/go/bin
127127
key: ${{ runner.os }}-go-runsim-binary
@@ -136,7 +136,7 @@ jobs:
136136
needs: [build, install-runsim]
137137
steps:
138138
- uses: actions/checkout@v3
139-
- uses: actions/setup-go@v3.2.1
139+
- uses: actions/setup-go@v3.3.0
140140
with:
141141
go-version: 1.18
142142
- name: Display go version
@@ -150,7 +150,7 @@ jobs:
150150
go.sum
151151
SET_ENV_NAME_INSERTIONS: 1
152152
SET_ENV_NAME_LINES: 1
153-
- uses: actions/[email protected].5
153+
- uses: actions/[email protected].8
154154
with:
155155
path: ~/go/bin
156156
key: ${{ runner.os }}-go-runsim-binary

‎.github/workflows/sims_normal.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: "!contains(github.event.head_commit.message, 'skip-sims')"
1212
steps:
1313
- uses: actions/checkout@v3
14-
- uses: actions/setup-go@v3.2.1
14+
- uses: actions/setup-go@v3.3.0
1515
with:
1616
go-version: 1.18
1717
- name: Display go version
@@ -22,14 +22,14 @@ jobs:
2222
runs-on: ubuntu-latest
2323
needs: build
2424
steps:
25-
- uses: actions/setup-go@v3.2.1
25+
- uses: actions/setup-go@v3.3.0
2626
with:
2727
go-version: 1.18
2828
- name: Display go version
2929
run: go version
3030
- name: Install runsim
3131
run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
32-
- uses: actions/[email protected].5
32+
- uses: actions/[email protected].8
3333
with:
3434
path: ~/go/bin
3535
key: ${{ runner.os }}-go-runsim-binary
@@ -39,12 +39,12 @@ jobs:
3939
needs: [build, install-runsim]
4040
steps:
4141
- uses: actions/checkout@v3
42-
- uses: actions/setup-go@v3.2.1
42+
- uses: actions/setup-go@v3.3.0
4343
with:
4444
go-version: 1.18
4545
- name: Display go version
4646
run: go version
47-
- uses: actions/[email protected].5
47+
- uses: actions/[email protected].8
4848
with:
4949
path: ~/go/bin
5050
key: ${{ runner.os }}-go-runsim-binary
@@ -57,12 +57,12 @@ jobs:
5757
needs: [build, install-runsim]
5858
steps:
5959
- uses: actions/checkout@v3
60-
- uses: actions/setup-go@v3.2.1
60+
- uses: actions/setup-go@v3.3.0
6161
with:
6262
go-version: 1.18
6363
- name: Display go version
6464
run: go version
65-
- uses: actions/[email protected].5
65+
- uses: actions/[email protected].8
6666
with:
6767
path: ~/go/bin
6868
key: ${{ runner.os }}-go-runsim-binary
@@ -75,12 +75,12 @@ jobs:
7575
needs: [build, install-runsim]
7676
steps:
7777
- uses: actions/checkout@v3
78-
- uses: actions/setup-go@v3.2.1
78+
- uses: actions/setup-go@v3.3.0
7979
with:
8080
go-version: 1.18
8181
- name: Display go version
8282
run: go version
83-
- uses: actions/[email protected].5
83+
- uses: actions/[email protected].8
8484
with:
8585
path: ~/go/bin
8686
key: ${{ runner.os }}-go-runsim-binary

‎.github/workflows/tag.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v3
1515
- name: Install Go
16-
uses: actions/setup-go@v3.2.1
16+
uses: actions/setup-go@v3.3.0
1717
with:
1818
go-version: 1.18
1919
- name: Unshallow

‎.github/workflows/test.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
install-tparse:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/setup-go@v3.2.1
22+
- uses: actions/setup-go@v3.3.0
2323
with:
2424
go-version: 1.18
2525
- name: Display go version
2626
run: go version
2727
- name: install tparse
2828
run: |
2929
export GO111MODULE="on" && go install github.com/mfridman/[email protected]
30-
- uses: actions/[email protected].5
30+
- uses: actions/[email protected].8
3131
with:
3232
path: ~/go/bin
3333
key: ${{ runner.os }}-go-tparse-binary
@@ -47,7 +47,7 @@ jobs:
4747
- run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
4848
if: "matrix.package != ''"
4949
- uses: actions/checkout@v3
50-
- uses: actions/setup-go@v3.2.1
50+
- uses: actions/setup-go@v3.3.0
5151
with:
5252
go-version: 1.18
5353
- uses: technote-space/[email protected]
@@ -65,7 +65,7 @@ jobs:
6565
# runs-on: ubuntu-latest
6666
# steps:
6767
# - uses: actions/checkout@v3
68-
# - uses: actions/setup-go@v3.2.1
68+
# - uses: actions/setup-go@v3.3.0
6969
# with:
7070
# go-version: 1.18
7171
# - name: Display go version
@@ -118,7 +118,7 @@ jobs:
118118
part: ["00", "01", "02", "03"]
119119
steps:
120120
- uses: actions/checkout@v3
121-
- uses: actions/setup-go@v3.2.1
121+
- uses: actions/setup-go@v3.3.0
122122
with:
123123
go-version: 1.18
124124
- uses: technote-space/[email protected]
@@ -198,7 +198,7 @@ jobs:
198198
part: ["00", "01", "02", "03"]
199199
steps:
200200
- uses: actions/checkout@v3
201-
- uses: actions/setup-go@v3.2.1
201+
- uses: actions/setup-go@v3.3.0
202202
with:
203203
go-version: 1.18
204204
- uses: technote-space/[email protected]

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
5050
* (server/grpc) [\#607](https://github.com/line/lbm-sdk/pull/607) revert gRPC block height header.
5151
* (global) [\#611](https://github.com/line/lbm-sdk/pull/611) bump github.com/cosmos/cosmos-sdk from v0.45.1 to v0.45.6
5252
* (simapp) [\#620](https://github.com/line/lbm-sdk/pull/620) chore: add iterator feature for simapp
53+
* (x/collection) [\#622](https://github.com/line/lbm-sdk/pull/622) add Query/TokenClassTypeName
54+
* (x/bank) [\#629](https://github.com/line/lbm-sdk/pull/629) remove unsafe balance changing methods from bank keeper such as `SetBalance` and `SetSupply`.
55+
* (x/wasm) [\#649](https://github.com/line/lbm-sdk/pull/649) fix: wasm module's FIXME in the snapshotter.go file
5356

5457
### Improvements
5558

@@ -60,6 +63,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
6063
* (x/collection) [\#604](https://github.com/line/lbm-sdk/pull/604) add EventOwnerChanged and EventRootChanged
6164
* (x/collection) [\#608](https://github.com/line/lbm-sdk/pull/608) remove new APIs on x/collection
6265
* (x/token) [\#609](https://github.com/line/lbm-sdk/pull/609) remove new APIs on x/token
66+
* (x/collection) [\#621](https://github.com/line/lbm-sdk/pull/621) add additional information into EventXXXChanged
67+
* (x/token) [\#636](https://github.com/line/lbm-sdk/pull/636) add creator into x/token EventIssue
68+
* (x/token) [\#637](https://github.com/line/lbm-sdk/pull/637) rename x/token events
69+
* (x/collection) [\#639](https://github.com/line/lbm-sdk/pull/639) rename x/collection events
6370
* (x/wasm) [\#625](https://github.com/line/lbm-sdk/pull/625) detaching `StoreCodeAndInstantiateContract` from wasm's tx.proto
6471
* (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)
6572

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

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

8696
### Build, CI
8797

‎client/docs/statik/statik.go

+1-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)