Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bench to 3.7.4 and 0.106.0 version #176

Merged
merged 3 commits into from
May 30, 2024
Merged

Update bench to 3.7.4 and 0.106.0 version #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
999b591
build: update C# node RPC server config
AnnaShaleva May 21, 2024
812a0bd
*: update NeoGo to 0.106.0
AnnaShaleva May 21, 2024
8c2d1e6
build: update C# node Dockerfile to 3.7.4
AnnaShaleva May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/build/Dockerfile.golang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKDIR /neo-go
# Install deps:
RUN apk add --no-cache git

ARG REV="v0.105.1"
ARG REV="v0.106.0"
ARG REPO="github.com/nspcc-dev/neo-go"

# Clone and build repo:
Expand Down
12 changes: 6 additions & 6 deletions .docker/build/Dockerfile.sharp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NEO private network - Dockerfile
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS Build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS Build

RUN set -x \
&& apt-get update \
Expand All @@ -9,10 +9,10 @@ RUN set -x \
# APT cleanup to reduce image size
&& rm -rf /var/lib/apt/lists/*

FROM mcr.microsoft.com/dotnet/aspnet:7.0 as Final
FROM mcr.microsoft.com/dotnet/aspnet:8.0 as Final

# arguments to choose version of neo-cli to install
ARG VERSION="3.6.2"
ARG VERSION="3.7.4"

# Frontend non-interactive
ENV DEBIAN_FRONTEND noninteractive
Expand Down Expand Up @@ -41,12 +41,12 @@ RUN set -x \

# Download, add and decompress the neo-cli package. At the end, delete the zip file.
# $VERSION is a build argument
ENV URL="https://github.com/neo-project/neo-node/releases/download/v${VERSION}/neo-cli-linux-x64.zip"
ENV URL="https://github.com/neo-project/neo/releases/download/v${VERSION}/neo-cli-linux-x64.zip"
RUN wget -O /opt/neo-cli.zip ${URL} && \
unzip -q -d /tmp /opt/neo-cli.zip && \
mkdir /neo-cli && \
mv /tmp/neo-cli/* /neo-cli && \
rm -r /tmp/neo-cli && \
mv /tmp/neo-cli-linux-x64/* /neo-cli && \
rm -r /tmp/neo-cli-linux-x64 && \
rm /opt/neo-cli.zip

ENV MODULES="DBFTPlugin RocksDBStore LevelDBStore RpcServer"
Expand Down
6 changes: 5 additions & 1 deletion .docker/build/sharp.rpc.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
"MaxGasInvoke": 50,
"MaxFee": 0.1,
"MaxConcurrentConnections": 500,
"DisabledMethods": [ "openwallet" ]
"DisabledMethods": [ "openwallet" ],
"EnableCors": true,
"AllowOrigins": [],
"KeepAliveTimeout": 60,
"RequestHeadersTimeout": 15
}
]
}
Expand Down
37 changes: 16 additions & 21 deletions cmd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require (
github.com/k14s/ytt v0.30.0
github.com/mailru/easyjson v0.7.7
github.com/moby/moby v25.0.3+incompatible
github.com/nspcc-dev/neo-go v0.105.1
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20240227140908-cc38221d7798
github.com/nspcc-dev/neo-go v0.106.0
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20240521091047-78685785716d
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.18.2
github.com/valyala/fasthttp v1.52.0
Expand All @@ -27,7 +27,7 @@ require (
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.2-0.20231013160410-1f65e75b6dfb // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
Expand All @@ -36,12 +36,11 @@ require (
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/hashicorp/golang-lru v0.6.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -50,24 +49,23 @@ require (
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/nspcc-dev/go-ordered-json v0.0.0-20240112074137-296698a162ae // indirect
github.com/nspcc-dev/rfc6979 v0.2.0 // indirect
github.com/nspcc-dev/go-ordered-json v0.0.0-20240301084351-0246b013f8b2 // indirect
github.com/nspcc-dev/rfc6979 v0.2.1 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/onsi/gomega v1.17.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand All @@ -77,23 +75,20 @@ require (
github.com/spf13/cobra v1.5.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect
github.com/twmb/murmur3 v1.1.5 // indirect
github.com/twmb/murmur3 v1.1.8 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.etcd.io/bbolt v1.3.9 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/goleak v1.1.12 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
Expand Down
Loading
Loading