From 978d03c7f102aafef02a0304bfca8c8d9a414db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20R=C3=B3=C5=BCa=C5=84ski?= Date: Fri, 12 Jul 2024 18:37:20 +0000 Subject: [PATCH] bump post-rs to v0.7.11 (#6114) ## Motivation Update to the latest release. Node: updated the post-rs binary name to post-service. --- Dockerfile | 2 +- Makefile-libs.Inc | 8 ++++---- activation/post_supervisor_nix.go | 2 +- activation/post_supervisor_win.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- systest/Dockerfile | 4 ++-- systest/Makefile | 4 ++-- systest/parameters/bignet/certifier.yaml | 4 ++++ systest/parameters/fastnet/certifier.yaml | 4 ++++ systest/parameters/longfast/certifier.yaml | 4 ++++ 11 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd1223a342..b1a4bd87ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ FROM linux AS spacemesh # Finally we copy the statically compiled Go binary. COPY --from=builder /src/build/go-spacemesh /bin/ -COPY --from=builder /src/build/service /bin/ +COPY --from=builder /src/build/post-service /bin/ COPY --from=builder /src/build/libpost.so /bin/ COPY --from=builder /src/build/gen-p2p-identity /bin/ COPY --from=builder /src/build/merge-nodes /bin/ diff --git a/Makefile-libs.Inc b/Makefile-libs.Inc index 03c0ad332e..7f80ae516b 100644 --- a/Makefile-libs.Inc +++ b/Makefile-libs.Inc @@ -50,21 +50,21 @@ else endif endif -POSTRS_SETUP_REV = 0.7.8 +POSTRS_SETUP_REV = 0.7.11 POSTRS_SETUP_ZIP = libpost-$(platform)-v$(POSTRS_SETUP_REV).zip POSTRS_SETUP_URL_ZIP ?= https://github.com/spacemeshos/post-rs/releases/download/v$(POSTRS_SETUP_REV)/$(POSTRS_SETUP_ZIP) POSTRS_PROFILER_ZIP = profiler-$(platform)-v$(POSTRS_SETUP_REV).zip POSTRS_PROFILER_URL ?= https://github.com/spacemeshos/post-rs/releases/download/v$(POSTRS_SETUP_REV)/$(POSTRS_PROFILER_ZIP) -POSTRS_SERVICE_ZIP = service-$(platform)-v$(POSTRS_SETUP_REV).zip +POSTRS_SERVICE_ZIP = post-service-$(platform)-v$(POSTRS_SETUP_REV).zip POSTRS_SERVICE_URL ?= https://github.com/spacemeshos/post-rs/releases/download/v$(POSTRS_SETUP_REV)/$(POSTRS_SERVICE_ZIP) ifeq ($(platform), windows) POSTRS_SETUP_LIBS = post.h post.dll POSTRS_PROFILER_BIN = profiler.exe - POSTRS_SERVICE_BIN = service.exe + POSTRS_SERVICE_BIN = post-service.exe else ifeq ($(platform), $(filter $(platform), macos macos-m1)) POSTRS_SETUP_LIBS = post.h libpost.dylib @@ -73,7 +73,7 @@ else endif POSTRS_PROFILER_BIN = profiler - POSTRS_SERVICE_BIN = service + POSTRS_SERVICE_BIN = post-service endif BINDIR_POSTRS_SETUP_LIBS = $(foreach X,$(POSTRS_SETUP_LIBS),$(BIN_DIR)$(X)) diff --git a/activation/post_supervisor_nix.go b/activation/post_supervisor_nix.go index 637ec40455..bfd2e50af3 100644 --- a/activation/post_supervisor_nix.go +++ b/activation/post_supervisor_nix.go @@ -2,4 +2,4 @@ package activation -const DefaultPostServiceName = "service" +const DefaultPostServiceName = "post-service" diff --git a/activation/post_supervisor_win.go b/activation/post_supervisor_win.go index 99628be55c..a42df38f6f 100644 --- a/activation/post_supervisor_win.go +++ b/activation/post_supervisor_win.go @@ -2,4 +2,4 @@ package activation -const DefaultPostServiceName = "service.exe" +const DefaultPostServiceName = "post-service.exe" diff --git a/go.mod b/go.mod index 43a58f7bea..0f46f7c94c 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/spacemeshos/go-scale v1.2.0 github.com/spacemeshos/merkle-tree v0.2.3 github.com/spacemeshos/poet v0.10.4 - github.com/spacemeshos/post v0.12.7 + github.com/spacemeshos/post v0.12.8 github.com/spf13/afero v1.11.0 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 78a3372a06..81206a3ccf 100644 --- a/go.sum +++ b/go.sum @@ -616,8 +616,8 @@ github.com/spacemeshos/merkle-tree v0.2.3 h1:zGEgOR9nxAzJr0EWjD39QFngwFEOxfxMloE github.com/spacemeshos/merkle-tree v0.2.3/go.mod h1:VomOcQ5pCBXz7goiWMP5hReyqOfDXGSKbrH2GB9Htww= github.com/spacemeshos/poet v0.10.4 h1:MHGG1dhMVwy5DdlsmwdRLDQTTqlPA21lSQB2PVd8MSk= github.com/spacemeshos/poet v0.10.4/go.mod h1:hz21GMyHb9h29CqNhVeKxCD5dxZdQK27nAqLpT46gjE= -github.com/spacemeshos/post v0.12.7 h1:0pLD19TWM6EktFhnd+7QW8ifvdVH952EKliGUN49gFk= -github.com/spacemeshos/post v0.12.7/go.mod h1:WzfVgaa1wxgrsytC4EVKkG8rwoUxjyoyQL0ZSxs56Y0= +github.com/spacemeshos/post v0.12.8 h1:xcxVPWTvt2zJYJUvdpmX7CwR1CQnMnmd4VndThGbSdY= +github.com/spacemeshos/post v0.12.8/go.mod h1:WzfVgaa1wxgrsytC4EVKkG8rwoUxjyoyQL0ZSxs56Y0= github.com/spacemeshos/sha256-simd v0.1.0 h1:G7Mfu5RYdQiuE+wu4ZyJ7I0TI74uqLhFnKblEnSpjYI= github.com/spacemeshos/sha256-simd v0.1.0/go.mod h1:O8CClVIilId7RtuCMV2+YzMj6qjVn75JsxOxaE8vcfM= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= diff --git a/systest/Dockerfile b/systest/Dockerfile index 4bd9b07388..ae6235ecbe 100644 --- a/systest/Dockerfile +++ b/systest/Dockerfile @@ -30,6 +30,6 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* COPY --from=build /src/build/tests.test /bin/tests -COPY --from=build /src/build/libpost.so /bin/libpost.so -COPY --from=build /src/build/service /bin/service +COPY --from=build /src/build/libpost.so /bin/ +COPY --from=build /src/build/post-service /bin/ ENV LD_LIBRARY_PATH="/bin/" diff --git a/systest/Makefile b/systest/Makefile index 489de35f9d..e45208caea 100644 --- a/systest/Makefile +++ b/systest/Makefile @@ -5,9 +5,9 @@ tmpfile := $(shell mktemp /tmp/systest-XXX) test_name ?= TestSmeshing org ?= spacemeshos image_name ?= $(org)/systest:$(version_info) -certifier_image ?= spacemeshos/certifier-service:v0.7.8 +certifier_image ?= spacemeshos/certifier-service:v0.7.11 poet_image ?= $(org)/poet:v0.10.3 -post_service_image ?= $(org)/post-service:v0.7.8 +post_service_image ?= $(org)/post-service:v0.7.11 post_init_image ?= $(org)/postcli:v0.12.5 smesher_image ?= $(org)/go-spacemesh-dev:$(version_info) bs_image ?= $(org)/go-spacemesh-dev-bs:$(version_info) diff --git a/systest/parameters/bignet/certifier.yaml b/systest/parameters/bignet/certifier.yaml index fb92d02979..0fb3bf3e0d 100644 --- a/systest/parameters/bignet/certifier.yaml +++ b/systest/parameters/bignet/certifier.yaml @@ -13,3 +13,7 @@ init_cfg: n: 2 r: 1 p: 1 +limits: + max_concurrent_requests: 2 + max_pending_requests: 100 + max_body_size: 4096 diff --git a/systest/parameters/fastnet/certifier.yaml b/systest/parameters/fastnet/certifier.yaml index fb92d02979..0fb3bf3e0d 100644 --- a/systest/parameters/fastnet/certifier.yaml +++ b/systest/parameters/fastnet/certifier.yaml @@ -13,3 +13,7 @@ init_cfg: n: 2 r: 1 p: 1 +limits: + max_concurrent_requests: 2 + max_pending_requests: 100 + max_body_size: 4096 diff --git a/systest/parameters/longfast/certifier.yaml b/systest/parameters/longfast/certifier.yaml index fb92d02979..0fb3bf3e0d 100644 --- a/systest/parameters/longfast/certifier.yaml +++ b/systest/parameters/longfast/certifier.yaml @@ -13,3 +13,7 @@ init_cfg: n: 2 r: 1 p: 1 +limits: + max_concurrent_requests: 2 + max_pending_requests: 100 + max_body_size: 4096