Skip to content

Commit

Permalink
Merge branch 'main' of github.com:line/lbm-sdk into issues/555
Browse files Browse the repository at this point in the history
  • Loading branch information
shiki-tak committed Jun 21, 2022
2 parents 8fe027e + 0389c29 commit a5775f3
Show file tree
Hide file tree
Showing 250 changed files with 12,700 additions and 12,516 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- uses: DoozyX/clang-format-lint-action@v0.13
- uses: DoozyX/clang-format-lint-action@v0.14
with:
source: '.'
exclude: './third_party'
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v3.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- 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 get github.com/cosmos/tools/cmd/runsim@v1.0.0
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
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.2
- uses: actions/cache@v3.0.4
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.2
- uses: actions/cache@v3.0.4
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.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -34,14 +34,14 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/setup-go@v3.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
run: go version
- name: Install runsim
run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/runsim@v1.0.0
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -63,7 +63,7 @@ jobs:
!**/**_test.go
go.mod
go.sum
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- 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.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- 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.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- 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.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -22,14 +22,14 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/setup-go@v3.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
run: go version
- name: Install runsim
run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/runsim@v1.0.0
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
run: go version
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
run: go version
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
run: go version
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Go
uses: actions/setup-go@v3.1.0
uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Unshallow
run: git fetch --prune --unshallow
- name: Create release
uses: goreleaser/goreleaser-action@v2
uses: goreleaser/goreleaser-action@v3
with:
args: release --rm-dist --release-notes ./RELEASE_CHANGELOG.md
env:
Expand Down
15 changes: 6 additions & 9 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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- name: Display go version
run: go version
- name: install tparse
run: |
export GO111MODULE="on" && go get github.com/mfridman/tparse@v0.8.3
- uses: actions/cache@v3.0.2
- uses: actions/cache@v3.0.4
with:
path: ~/go/bin
key: ${{ runner.os }}-go-tparse-binary
Expand All @@ -43,14 +43,11 @@ jobs:
- goarch: "arm64"
gcc: "aarch64-linux-gnu-gcc"
package: "g++-aarch64-linux-gnu"
- goarch: "arm"
gcc: "arm-linux-gnueabi-gcc"
package: "g++-arm-linux-gnueabi"
steps:
- 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.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- uses: technote-space/get-diff-action@v6.0.1
Expand All @@ -68,7 +65,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-go@v3.1.0
# - uses: actions/setup-go@v3.2.0
# with:
# go-version: 1.15
# - name: Display go version
Expand Down Expand Up @@ -121,7 +118,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- uses: technote-space/get-diff-action@v6.0.1
Expand Down Expand Up @@ -201,7 +198,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.1.0
- uses: actions/setup-go@v3.2.0
with:
go-version: 1.15
- uses: technote-space/get-diff-action@v6.0.1
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (server/grpc) [\#516](https://github.com/line/lbm-sdk/pull/516) restore build norace flag
* (genesis) [\#517](https://github.com/line/lbm-sdk/pull/517) fix genesis auth account format(cosmos-sdk style -> lbm-sdk style)
* (x/foundation) [\#545](https://github.com/line/lbm-sdk/pull/545) fix genesis and support abstain
* (x/auth) [\#563](https://github.com/line/lbm-sdk/pull/563) fix unmarshal bug of `BaseAccountJSON`

### Breaking Changes
* (proto) [\#564](https://github.com/line/lbm-sdk/pull/564) change gRPC path to original cosmos path

### Build, CI

Expand Down
2 changes: 1 addition & 1 deletion baseapp/block_gas_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
require.Equal(t, []byte("ok"), okValue)
}
// check block gas is always consumed
baseGas := uint64(35000) // baseGas is the gas consumed before tx msg
baseGas := uint64(35030) // baseGas is the gas consumed before tx msg
expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas)
if expGasConsumed > txtypes.MaxGasWanted {
// capped by gasLimit
Expand Down
2 changes: 1 addition & 1 deletion client/debug/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func PubkeyCmd() *cobra.Command {
Long: fmt.Sprintf(`Decode a pubkey from proto JSON and display it's address.
Example:
$ %s debug pubkey '{"@type":"/lbm.crypto.secp256k1.PubKey","key":"AurroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJ"}'
$ %s debug pubkey '{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"AurroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJ"}'
`, version.AppName),
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
Expand Down
Loading

0 comments on commit a5775f3

Please sign in to comment.