From f51e42db6f1232c6698f4d99e0edee7c12c116ed Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Mar 2025 16:15:15 -0700 Subject: [PATCH 1/4] chore: update go version to 1.24, fix go.mod for api package --- api/go.mod | 2 +- go.mod | 5 +++-- go.sum | 2 -- go.work | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/api/go.mod b/api/go.mod index 160ab2c65aa..f1e224e8b35 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/cometbft/cometbft/api -go 1.23 +go 1.24 require ( github.com/cosmos/gogoproto v1.4.12 diff --git a/go.mod b/go.mod index 3a2dfedff77..feb186e1c79 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,6 @@ module github.com/cometbft/cometbft -go 1.23 -toolchain go1.23.7 +go 1.24 require ( github.com/BurntSushi/toml v1.4.0 @@ -144,6 +143,8 @@ require ( gotest.tools v2.2.0+incompatible // indirect ) +replace github.com/cometbft/cometbft/api => ./api + retract ( // a regression was introduced v0.38.4 diff --git a/go.sum b/go.sum index 141701e448f..32b6f4758f8 100644 --- a/go.sum +++ b/go.sum @@ -76,8 +76,6 @@ github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtp github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= github.com/cometbft/cometbft-load-test v0.3.0 h1:z6iZZvFwhci29ca/EZQaWh/d92NLe8bK4eBvFyv2EKY= github.com/cometbft/cometbft-load-test v0.3.0/go.mod h1:zKrQpRm3Ay5+RfeRTNWoLniFJNIPnw9JPEM1wuWS3TA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro= diff --git a/go.work b/go.work index c44012091f6..4cddab53b02 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.23 +go 1.24 use ( . From b0836c4351707d96e5188461c88fadf913bf5d0b Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Mar 2025 17:33:59 -0700 Subject: [PATCH 2/4] chore: update go version to 1.24 in GH workflows --- .github/workflows/go-version.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go-version.env b/.github/workflows/go-version.env index 332e41f6435..20ad8974915 100644 --- a/.github/workflows/go-version.env +++ b/.github/workflows/go-version.env @@ -1,2 +1,2 @@ # .github/workflows/go-version.env -GO_VERSION=1.23 +GO_VERSION=1.24 From a729cfc1967e3e616f1523498fac956c5e426f73 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 17 Mar 2025 00:26:08 -0700 Subject: [PATCH 3/4] chore: bump cometbft-db-testing to v1.0.4-inj (uses Go 1.24) --- test/e2e/docker/Dockerfile | 2 +- test/e2e/docker/Dockerfile.debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile index f072ac3b865..76bf8882065 100644 --- a/test/e2e/docker/Dockerfile +++ b/test/e2e/docker/Dockerfile @@ -1,7 +1,7 @@ # We need to build in a Linux environment to support C libraries, e.g. RocksDB. # We use Debian instead of Alpine, so that we can use binary database packages # instead of spending time compiling them. -FROM cometbft/cometbft-db-testing:v1.0.2 +FROM injectivelabs/cometbft-db-testing:v1.0.4-inj RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null diff --git a/test/e2e/docker/Dockerfile.debug b/test/e2e/docker/Dockerfile.debug index e71f2fb4ed5..a5a1e293d68 100644 --- a/test/e2e/docker/Dockerfile.debug +++ b/test/e2e/docker/Dockerfile.debug @@ -1,7 +1,7 @@ # We need to build in a Linux environment to support C libraries, e.g. RocksDB. # We use Debian instead of Alpine, so that we can use binary database packages # instead of spending time compiling them. -FROM cometbft/cometbft-db-testing:v1.0.2 +FROM injectivelabs/cometbft-db-testing:v1.0.4-inj RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null RUN apt-get -qq install -y zsh vim >/dev/null From 5d21dbc66266a030f61cc1514fe4b8dde2fcf08d Mon Sep 17 00:00:00 2001 From: kakysha Date: Tue, 20 May 2025 14:31:20 +0300 Subject: [PATCH 4/4] fix(mempool): only run postCheck if tx check was successful --- mempool/clist_mempool.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go index a34621fed9a..6798199b780 100644 --- a/mempool/clist_mempool.go +++ b/mempool/clist_mempool.go @@ -407,7 +407,7 @@ func (mem *CListMempool) handleCheckTxResponse(tx types.Tx, sender p2p.ID) func( } var postCheckErr error - if mem.postCheck != nil { + if mem.postCheck != nil && res.Code == abci.CodeTypeOK { postCheckErr = mem.postCheck(tx, res) }