Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v0.14-dev' into feat/relaxed-mem…
Browse files Browse the repository at this point in the history
…pool-locking
  • Loading branch information
lklimek committed Mar 5, 2024
2 parents e2718ef + 6156c7c commit 8d6fc40
Show file tree
Hide file tree
Showing 80 changed files with 2,156 additions and 508 deletions.
2 changes: 1 addition & 1 deletion .github/actions/bls/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
steps:
- uses: actions/setup-go@v2
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v2
with:
submodules: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
steps:
- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand All @@ -79,7 +79,7 @@ jobs:
steps:
- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
steps:
- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"

- uses: actions/checkout@v4

- name: "Check generated mocks"
run: |
set -euo pipefail
readonly MOCKERY=2.33.2 # N.B. no leading "v"
readonly MOCKERY=2.41.0 # N.B. no leading "v"
curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
make mockery 2>/dev/null
Expand All @@ -49,7 +49,7 @@ jobs:
steps:
- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"

- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
platforms: all

- name: Set up Docker Build
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.1.0

- name: Login to DockerHub
if: ${{ github.event_name != 'pull_request' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
steps:
- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.1.0

- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
submodules: true
- uses: actions/setup-go@v5.0.0
with:
go-version: "^1.21"
go-version: "^1.22"
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
Expand All @@ -48,7 +48,7 @@ jobs:
name: Install BLS library
if: "env.GIT_DIFF != ''"

- uses: golangci/golangci-lint-action@v3.7.0
- uses: golangci/golangci-lint-action@v4.0.0
with:
# Required: the version of golangci-lint is required and
# must be specified without patch version: we always use the
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"

- name: Build
uses: goreleaser/goreleaser-action@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v5.0.0
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down
6 changes: 3 additions & 3 deletions DOCKER/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# * compile - builds final binaries
# * image - creates final image of minimal size

ARG ALIPNE_VERSION=3.17
ARG GOLANG_VERSION=1.21
ARG ALIPNE_VERSION=3.19
ARG GOLANG_VERSION=1.22
#################################
# STAGE 1: install dependencies #
#################################
Expand Down Expand Up @@ -93,7 +93,7 @@ COPY --from=compile /src/tenderdash/build/tenderdash /src/tenderdash/build/abcid
# You can overwrite these before the first run to influence
# config.json and genesis.json. Additionally, you can override
# CMD to add parameters to `tenderdash node`.
ENV PROXY_APP=kvstore MONIKER=dockernode CHAIN_ID=dockerchain
ENV PROXY_APP=kvstore MONIKER=dockernode CHAIN_ID=dockerchain ABCI=""

COPY ./DOCKER/docker-entrypoint.sh /usr/local/bin/

Expand Down
8 changes: 7 additions & 1 deletion DOCKER/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ if [ ! -d "$TMHOME/config" ]; then
-e 's/^prometheus\s*=.*/prometheus = true/' \
"$TMHOME/config/config.toml"

if [ -n "$ABCI" ]; then
sed -i \
-e "s/^abci\s*=.*/abci = \"$ABCI\"/" \
"$TMHOME/config/config.toml"
fi

jq ".chain_id = \"$CHAIN_ID\" | .consensus_params.block.time_iota_ms = \"500\"" \
"$TMHOME/config/genesis.json" > "$TMHOME/config/genesis.json.new"
"$TMHOME/config/genesis.json" >"$TMHOME/config/genesis.json.new"
mv "$TMHOME/config/genesis.json.new" "$TMHOME/config/genesis.json"
fi

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ to notify you of vulnerabilities and fixes in Tendermint Core. You can subscribe

| Requirement | Notes |
|-------------|------------------|
| Go version | Go1.21 or higher |
| Go version | Go1.22 or higher |

### Install

Expand Down
2 changes: 2 additions & 0 deletions abci/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ func NewClient(logger log.Logger, addr, transport string, mustConnect bool) (Cli
return NewSocketClient(logger, addr, mustConnect), nil
case "grpc":
return NewGRPCClient(logger, addr, mustConnect), nil
case "routed":
return NewRoutedClientWithAddr(logger, addr, mustConnect)
default:
return nil, fmt.Errorf("unknown abci transport %s", transport)
}
Expand Down
72 changes: 72 additions & 0 deletions abci/client/mocks/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8d6fc40

Please sign in to comment.