From d99d3411de4eb9f72cb11037a02886b95e453dfd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 08:08:45 +0000 Subject: [PATCH 1/3] Bump github.com/skip-mev/block-sdk/v2 from 2.1.2 to 2.1.5 Bumps [github.com/skip-mev/block-sdk/v2](https://github.com/skip-mev/block-sdk) from 2.1.2 to 2.1.5. - [Release notes](https://github.com/skip-mev/block-sdk/releases) - [Changelog](https://github.com/skip-mev/block-sdk/blob/main/.goreleaser.yml) - [Commits](https://github.com/skip-mev/block-sdk/compare/v2.1.2...v2.1.5) --- updated-dependencies: - dependency-name: github.com/skip-mev/block-sdk/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 5 ++--- go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index e47c98848..7507c66e3 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,6 @@ module github.com/neutron-org/neutron/v4 go 1.22.3 - require ( cosmossdk.io/client/v2 v2.0.0-beta.1 cosmossdk.io/core v0.11.0 @@ -37,7 +36,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.19.1 github.com/rs/zerolog v1.32.0 - github.com/skip-mev/block-sdk/v2 v2.1.2 + github.com/skip-mev/block-sdk/v2 v2.1.5 github.com/skip-mev/feemarket v1.0.3 github.com/skip-mev/slinky v1.0.3 github.com/spf13/cast v1.6.0 @@ -47,7 +46,7 @@ require ( github.com/stretchr/testify v1.9.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 7ae72b2af..29128692f 100644 --- a/go.sum +++ b/go.sum @@ -975,8 +975,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= -github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss= -github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= +github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -1085,8 +1085,8 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/skip-mev/block-sdk/v2 v2.1.2 h1:fNKbrb+PVVzuU0JiSuWgBV4Afj5zZ1VeHQJp88wSl1g= -github.com/skip-mev/block-sdk/v2 v2.1.2/go.mod h1:kIq7SMva0/eHKTCiG/oI5XGxD4HNVK0t71TrUZqHcvA= +github.com/skip-mev/block-sdk/v2 v2.1.5 h1:3uoYG2ayP253wiohBPKdD3LrkJGd1Kgw914mmI1ZyOI= +github.com/skip-mev/block-sdk/v2 v2.1.5/go.mod h1:E8SvITZUdxkes3gI3+kgESZL+NLffkcLKnowUgYTOf4= github.com/skip-mev/chaintestutil v0.0.0-20240514161515-056d7ba45610 h1:4JlsiRVt/YZOvrKH525T7sZXgEWUEjqSDMwE6fXNbdo= github.com/skip-mev/chaintestutil v0.0.0-20240514161515-056d7ba45610/go.mod h1:kB8gFZX07CyJnw8q9iEZijI3qJTIe1K/Y++P5VGkrcg= github.com/skip-mev/feemarket v1.0.3 h1:DpB1tj51MlFN5iOg1lN+fwWqSF62xdND46BqgTko0C4= @@ -1835,8 +1835,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From 324b7749246cc43585a3cf23d549f5f2ddea2666 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 9 Jul 2024 16:49:26 +0300 Subject: [PATCH 2/3] lane fixes --- app/app.go | 3 ++- app/lane.go | 1 - go.mod | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/app.go b/app/app.go index 91f8204c5..87293d3f7 100644 --- a/app/app.go +++ b/app/app.go @@ -1198,7 +1198,7 @@ func New( baseLane.WithOptions(opts...) // set the block-sdk prepare / process-proposal handlers - blockSdkProposalHandler := blocksdkabci.NewProposalHandler( + blockSdkProposalHandler := blocksdkabci.NewDefaultProposalHandler( app.Logger(), app.GetTxConfig().TxDecoder(), app.GetTxConfig().TxEncoder(), @@ -1265,6 +1265,7 @@ func New( mempool, app.GetTxConfig().TxDecoder(), app.BaseApp.CheckTx, + app.BaseApp, ) app.SetCheckTx(parityCheckTx.CheckTx()) diff --git a/app/lane.go b/app/lane.go index dc19fc27f..d29dfe72f 100644 --- a/app/lane.go +++ b/app/lane.go @@ -30,7 +30,6 @@ func (app *App) CreateLanes() *blocksdkbase.BaseLane { baseLane := base_lane.NewDefaultLane(basecfg, blocksdkbase.DefaultMatchHandler()) baseLane.LaneMempool = blocksdkbase.NewMempool( blocksdkbase.NewDefaultTxPriority(), - basecfg.TxEncoder, basecfg.SignerExtractor, basecfg.MaxTxs, ) diff --git a/go.mod b/go.mod index 7507c66e3..39471f5ef 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/neutron-org/neutron/v4 -go 1.22.3 +go 1.22.4 + require ( cosmossdk.io/client/v2 v2.0.0-beta.1 cosmossdk.io/core v0.11.0 From 548ab792234b225a7457d923f8caf1f2b245717f Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 10 Jul 2024 12:26:39 +0300 Subject: [PATCH 3/3] alpine 20 for Dockerfile.builder --- Dockerfile.builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.builder b/Dockerfile.builder index a4bf34db0..7cd81b0ee 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -7,7 +7,7 @@ ARG RUNNER_IMAGE="gcr.io/distroless/static" # Builder # -------------------------------------------------------- -FROM golang:${GO_VERSION}-alpine3.18 as builder +FROM golang:${GO_VERSION}-alpine3.20 as builder ARG GIT_VERSION ARG GIT_COMMIT