Merge branch 'main' into add_index_field

* main:
  fix: genesis auth account format (Finschia#517)
  Remove reviewers on dependabot.yml
  updated ostracon to v1.0.5; `unsafe-reset-all` command has been moved to the `ostracon` sub-command. (Finschia#536)
  build(deps): bump docker/build-push-action from 2 to 3 (Finschia#532)
  build(deps): bump docker/metadata-action from 3 to 4 (Finschia#530)
  build(deps): bump docker/login-action from 1 to 2 (Finschia#531)
  build(deps): bump docker/setup-buildx-action from 1 to 2 (Finschia#529)
  chore(deps): bump github.com/VictoriaMetrics/fastcache from 1.9.0 to 1.10.0 (Finschia#499)
  build(deps): bump google.golang.org/protobuf from 1.27.1 to 1.28.0 (Finschia#474)
  chore(deps): bump github.com/prometheus/common from 0.32.1 to 0.34.0 (Finschia#510)
  chore(deps): bump github.com/coinbase/rosetta-sdk-go from 0.7.0 to 0.7.9 (Finschia#520)
  build(deps): bump github.com/spf13/cobra from 1.3.0 to 1.4.0 (Finschia#458)
  build(deps): bump github.com/confio/ics23/go from 0.6.6 to 0.7.0 (Finschia#448)
  build(deps): bump github.com/stretchr/testify from 1.7.0 to 1.7.1 (Finschia#465)
  build(deps): bump github.com/armon/go-metrics from 0.3.10 to 0.3.11 (Finschia#522)
  build(deps): bump github.com/magiconair/properties from 1.8.5 to 1.8.6 (Finschia#445)
  ci: change automerge conditions of Mergify (Finschia#523)

.github/dependabot.yml

@@ -10,9 +10,6 @@ updates:
  schedule:
  interval: daily
  open-pull-requests-limit: 10
- reviewers:
- - alexanderbez
- - fedekunze
  labels:
  - automerge
  - dependencies
@@ -21,5 +18,3 @@ updates:
  schedule:
  interval: daily
  open-pull-requests-limit: 10
- reviewers:
- - fadeev

.github/workflows/docker.yml

@@ -18,21 +18,21 @@ jobs:
  with:
  fetch-depth: 0
  - name: login to the registry
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
  if: github.event_name != 'pull_request'
  with:
  registry: ${{env.registry}}
  username: ${{secrets.DOCKERHUB_USERNAME}}
  password: ${{secrets.DOCKERHUB_TOKEN}}
  - name: extract metadata for docker
  id: meta
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
  with:
  images: ${{env.registry}}/${{env.repository}}
  tags: |
  type=semver,pattern={{version}}
  - name: docker build
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
  with:
  push: ${{github.event_name != 'pull_request'}}
  tags: ${{steps.meta.outputs.tags}}

.github/workflows/proto-docker.yml

@@ -27,16 +27,16 @@ jobs:
  TAGS="${DOCKER_IMAGE}:${VERSION}"
  echo ::set-output name=tags::${TAGS}
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
 
  - name: Login to DockerHub
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
  with:
  username: ${{ secrets.DOCKERHUBTM_USERNAME }}
  password: ${{ secrets.DOCKERHUBTM_TOKEN }}
 
  - name: Publish to Docker Hub
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
  with:
  context: ./docker-build-sdk-proto
  file: ./docker-build-sdk-proto/Dockerfile

.mergify.yml

@@ -1,10 +1,18 @@
+queue_rules:
+ - name: default
+ conditions:
+ - "#approved-reviews-by>1"
+
 pull_request_rules:
- - name: automerge to master with label automerge and branch protection passing
+ - name: automerge to main with label automerge and branch protection passing
  conditions:
  - "#approved-reviews-by>1"
- - base=master
+ - base=main
  - label=automerge
  actions:
- merge:
+ queue:
+ name: default
  method: squash
- strict: true
+ commit_message_template: |
+ {{ title }} (#{{ number }})
+ {{ body }}

CHANGELOG.md

@@ -45,11 +45,13 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (refactor) [\#493](https://github.com/line/lbm-sdk/pull/493) restructure x/consortium
 * (server/grpc) [\#526](https://github.com/line/lbm-sdk/pull/526) add index field into TxResponse
+* (cli) [\#535](https://github.com/line/lbm-sdk/pull/536) updated ostracon to v1.0.5; `unsafe-reset-all` command has been moved to the `ostracon` sub-command.
 
 ### Bug Fixes
 * (x/wasm) [\#453](https://github.com/line/lbm-sdk/pull/453) modify wasm grpc query api path
 * (client) [\#476](https://github.com/line/lbm-sdk/pull/476) change the default value of the client output format in the config
 * (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)
 
 ### Breaking Changes
 

baseapp/block_gas_test.go

@@ -124,7 +124,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
  require.Equal(t, []byte("ok"), okValue)
  }
  // check block gas is always consumed
- baseGas := uint64(36950) // baseGas is the gas consumed before tx msg
+ baseGas := uint64(35000) // baseGas is the gas consumed before tx msg
  expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas)
  if expGasConsumed > txtypes.MaxGasWanted {
  // capped by gasLimit

go.mod

@@ -4,12 +4,12 @@ module github.com/line/lbm-sdk
 
 require (
  github.com/99designs/keyring v1.1.6
- github.com/VictoriaMetrics/fastcache v1.9.0
- github.com/armon/go-metrics v0.3.10
+ github.com/VictoriaMetrics/fastcache v1.10.0
+ github.com/armon/go-metrics v0.3.11
  github.com/bgentry/speakeasy v0.1.0
- github.com/btcsuite/btcd v0.22.0-beta
- github.com/coinbase/rosetta-sdk-go v0.7.0
- github.com/confio/ics23/go v0.6.6
+ github.com/btcsuite/btcd v0.22.1
+ github.com/coinbase/rosetta-sdk-go v0.7.9
+ github.com/confio/ics23/go v0.7.0
  github.com/coocood/freecache v1.2.1
  github.com/cosmos/btcutil v1.0.4
  github.com/cosmos/go-bip39 v1.0.0
@@ -29,35 +29,33 @@ require (
  github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3
  github.com/improbable-eng/grpc-web v0.15.0
  github.com/jhump/protoreflect v1.10.3
- github.com/lib/pq v1.10.4 // indirect
  github.com/line/iavl/v2 v2.0.0-init.1.0.20220215225951-cb11c91d8857
- github.com/line/ostracon v1.0.4
+ github.com/line/ostracon v1.0.5
  github.com/line/tm-db/v2 v2.0.0-init.1.0.20220121012851-61d2bc1d9486
  github.com/line/wasmvm v0.16.3-0.9.0
- github.com/magiconair/properties v1.8.5
+ github.com/magiconair/properties v1.8.6
  github.com/mailru/easyjson v0.7.7
  github.com/mattn/go-isatty v0.0.14
  github.com/onsi/ginkgo v1.16.4 // indirect
  github.com/pkg/errors v0.9.1
  github.com/prometheus/client_golang v1.12.1
- github.com/prometheus/common v0.32.1
+ github.com/prometheus/common v0.34.0
  github.com/rakyll/statik v0.1.7
  github.com/regen-network/cosmos-proto v0.3.1
  github.com/rs/zerolog v1.26.1
  github.com/spf13/cast v1.4.1
- github.com/spf13/cobra v1.3.0
+ github.com/spf13/cobra v1.4.0
  github.com/spf13/pflag v1.0.5
- github.com/spf13/viper v1.10.1
- github.com/stretchr/testify v1.7.0
- github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
+ github.com/spf13/viper v1.11.0
+ github.com/stretchr/testify v1.7.1
+ github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
  github.com/tendermint/btcd v0.1.1
  github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15
  github.com/tendermint/go-amino v0.16.0
- golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce
- golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
- google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
- google.golang.org/grpc v1.44.0
- google.golang.org/protobuf v1.27.1
+ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
+ google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac
+ google.golang.org/grpc v1.46.0
+ google.golang.org/protobuf v1.28.0
  gopkg.in/yaml.v2 v2.4.0
 )