From 402948597ce41abbcfbcfb4d4db4e46d4e585195 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 09:39:37 +0300 Subject: [PATCH 01/12] save --- .github/workflows/ci.yml | 2 +- erigon-lib/go.mod | 10 +++++----- erigon-lib/go.sum | 20 ++++++++++---------- erigon-lib/tools/golangci_lint.sh | 2 +- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6470959c1bb..aea733b4e19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: if: runner.os == 'Linux' uses: golangci/golangci-lint-action@v3 with: - version: v1.54.2 + version: v1.55.2 skip-build-cache: true args: --help diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index f57d8b5ea9a..fbb7e9d0328 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -42,11 +42,11 @@ require ( github.com/spaolacci/murmur3 v1.1.0 github.com/stretchr/testify v1.8.4 github.com/tidwall/btree v1.6.0 - golang.org/x/crypto v0.14.0 + golang.org/x/crypto v0.15.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 - golang.org/x/sync v0.4.0 - golang.org/x/sys v0.13.0 - golang.org/x/time v0.3.0 + golang.org/x/sync v0.5.0 + golang.org/x/sys v0.14.0 + golang.org/x/time v0.4.0 google.golang.org/grpc v1.59.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 google.golang.org/protobuf v1.31.0 @@ -140,7 +140,7 @@ require ( go.opentelemetry.io/otel/trace v1.8.0 // indirect golang.org/x/mod v0.13.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 11b04bcda59..66d6b142004 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -494,8 +494,8 @@ golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= @@ -549,8 +549,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -586,8 +586,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -601,10 +601,10 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= +golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/erigon-lib/tools/golangci_lint.sh b/erigon-lib/tools/golangci_lint.sh index 0b27a507523..b569f88e239 100755 --- a/erigon-lib/tools/golangci_lint.sh +++ b/erigon-lib/tools/golangci_lint.sh @@ -2,7 +2,7 @@ scriptDir=$(dirname "${BASH_SOURCE[0]}") scriptName=$(basename "${BASH_SOURCE[0]}") -version="v1.54.2" +version="v1.55.2" if [[ "$1" == "--install-deps" ]] then diff --git a/go.mod b/go.mod index c5bfbcee250..ae4c9a19318 100644 --- a/go.mod +++ b/go.mod @@ -86,12 +86,12 @@ require ( github.com/vektah/gqlparser/v2 v2.5.6 github.com/xsleonard/go-merkle v1.1.0 go.uber.org/zap v1.26.0 - golang.org/x/crypto v0.14.0 + golang.org/x/crypto v0.15.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 golang.org/x/net v0.17.0 - golang.org/x/sync v0.4.0 - golang.org/x/sys v0.13.0 - golang.org/x/time v0.3.0 + golang.org/x/sync v0.5.0 + golang.org/x/sys v0.14.0 + golang.org/x/time v0.4.0 google.golang.org/grpc v1.59.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 google.golang.org/protobuf v1.31.0 @@ -268,7 +268,7 @@ require ( go.uber.org/fx v1.20.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/mod v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect diff --git a/go.sum b/go.sum index adf49077416..581729d85df 100644 --- a/go.sum +++ b/go.sum @@ -958,8 +958,8 @@ golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1081,8 +1081,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1154,8 +1154,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -1170,14 +1170,14 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= +golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 1ea87e0543a9c066271becf106ea86c4d0207136 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 09:42:23 +0300 Subject: [PATCH 02/12] save --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ae4c9a19318..6c05ada7832 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( go.uber.org/zap v1.26.0 golang.org/x/crypto v0.15.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 - golang.org/x/net v0.17.0 + golang.org/x/net v0.18.0 golang.org/x/sync v0.5.0 golang.org/x/sys v0.14.0 golang.org/x/time v0.4.0 diff --git a/go.sum b/go.sum index 581729d85df..900a2d6c2b3 100644 --- a/go.sum +++ b/go.sum @@ -1054,8 +1054,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= From 705ebeb093597c2f029fc3d70d8fab992c2c73e4 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 09:44:53 +0300 Subject: [PATCH 03/12] save --- go.mod | 4 ++-- go.sum | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 6c05ada7832..808e12f5a9e 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - modernc.org/sqlite v1.26.0 + modernc.org/sqlite v1.27.0 pgregory.net/rapid v1.1.0 ) @@ -276,7 +276,7 @@ require ( lukechampine.com/uint128 v1.3.0 // indirect modernc.org/cc/v3 v3.41.0 // indirect modernc.org/ccgo/v3 v3.16.15 // indirect - modernc.org/libc v1.24.1 // indirect + modernc.org/libc v1.29.0 // indirect modernc.org/mathutil v1.6.0 // indirect modernc.org/memory v1.7.2 // indirect modernc.org/opt v0.1.3 // indirect diff --git a/go.sum b/go.sum index 900a2d6c2b3..6ae3309dd95 100644 --- a/go.sum +++ b/go.sum @@ -1400,6 +1400,7 @@ modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk= modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM= modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM= modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak= +modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ= modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E= @@ -1408,6 +1409,7 @@ modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sqlite v1.26.0 h1:SocQdLRSYlA8W99V8YH0NES75thx19d9sB/aFc4R8Lw= modernc.org/sqlite v1.26.0/go.mod h1:FL3pVXie73rg3Rii6V/u5BoHlSoyeZeIgKZEgHARyCU= +modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0= modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0= modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY= From 5f3f458fe20044fc50835bcc819c04bf1a0a7473 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 09:47:34 +0300 Subject: [PATCH 04/12] save --- go.sum | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/go.sum b/go.sum index 6ae3309dd95..6dc253c67df 100644 --- a/go.sum +++ b/go.sum @@ -1398,8 +1398,7 @@ modernc.org/ccgo/v3 v3.16.15 h1:KbDR3ZAVU+wiLyMESPtbtE/Add4elztFyfsWoNTgxS0= modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI= modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk= modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM= -modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM= -modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak= +modernc.org/libc v1.29.0 h1:tTFRFq69YKCF2QyGNuRUQxKBm1uZZLubf6Cjh/pVHXs= modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ= modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= @@ -1407,8 +1406,7 @@ modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E= modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sqlite v1.26.0 h1:SocQdLRSYlA8W99V8YH0NES75thx19d9sB/aFc4R8Lw= -modernc.org/sqlite v1.26.0/go.mod h1:FL3pVXie73rg3Rii6V/u5BoHlSoyeZeIgKZEgHARyCU= +modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8= modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0= modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0= From 59bc143b139771b5b39354ee27a0d0cd84c8cc43 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 09:50:28 +0300 Subject: [PATCH 05/12] save --- cmd/devnet/args/node_args.go | 9 +++++---- cmd/devnet/contracts/backend.go | 2 +- cmd/devnet/contracts/steps/subscriber.go | 3 ++- cmd/devnet/devnet/devnet.go | 2 +- cmd/devnet/devnet/network.go | 3 ++- cmd/devnet/devnet/service.go | 2 +- cmd/devnet/requests/account.go | 2 +- cmd/devnet/requests/block.go | 3 ++- cmd/devnet/requests/event.go | 1 + cmd/devnet/requests/trace.go | 1 + cmd/devnet/requests/transaction.go | 3 ++- cmd/devnet/services/polygon/proofgenerator.go | 3 ++- cmd/devnet/tests/bor/devnet_test.go | 3 ++- cmd/devnet/tests/context.go | 7 ++++--- cmd/devnet/tests/devnet_bor.go | 3 ++- cmd/devnet/tests/generic/devnet_test.go | 5 +++-- cmd/devnet/transactions/block.go | 3 ++- erigon-lib/kv/membatch/mapmutation_test.go | 5 +++-- erigon-lib/mmap/total_memory.go | 3 ++- erigon-lib/mmap/total_memory_cgroups.go | 3 ++- p2p/sentry/sentry_multi_client/sentry_api.go | 2 +- p2p/sentry/sentry_multi_client/sentry_multi_client.go | 2 +- 22 files changed, 43 insertions(+), 27 deletions(-) diff --git a/cmd/devnet/args/node_args.go b/cmd/devnet/args/node_args.go index c5f7373a8bd..50c73c0e96f 100644 --- a/cmd/devnet/args/node_args.go +++ b/cmd/devnet/args/node_args.go @@ -4,15 +4,16 @@ import ( "crypto/ecdsa" "encoding/hex" "fmt" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/params" "math/big" "net" "path/filepath" "strconv" + "github.com/ledgerwatch/erigon/core" + "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/ledgerwatch/erigon/params" + "github.com/ledgerwatch/erigon-lib/chain/networkname" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" "github.com/ledgerwatch/erigon/cmd/devnet/requests" diff --git a/cmd/devnet/contracts/backend.go b/cmd/devnet/contracts/backend.go index 98c6e71281c..950e6db078d 100644 --- a/cmd/devnet/contracts/backend.go +++ b/cmd/devnet/contracts/backend.go @@ -3,11 +3,11 @@ package contracts import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" "math/big" ethereum "github.com/ledgerwatch/erigon" libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon-lib/common/hexutil" "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" diff --git a/cmd/devnet/contracts/steps/subscriber.go b/cmd/devnet/contracts/steps/subscriber.go index 00322c95539..c3d66647d21 100644 --- a/cmd/devnet/contracts/steps/subscriber.go +++ b/cmd/devnet/contracts/steps/subscriber.go @@ -3,9 +3,10 @@ package contracts_steps import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" "math/big" + "github.com/ledgerwatch/erigon-lib/common/hexutil" + ethereum "github.com/ledgerwatch/erigon" libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon-lib/common/hexutility" diff --git a/cmd/devnet/devnet/devnet.go b/cmd/devnet/devnet/devnet.go index 3fc09bc6b7e..adb8030945e 100644 --- a/cmd/devnet/devnet/devnet.go +++ b/cmd/devnet/devnet/devnet.go @@ -1,7 +1,7 @@ package devnet import ( - context "context" + "context" "math/big" "regexp" "sync" diff --git a/cmd/devnet/devnet/network.go b/cmd/devnet/devnet/network.go index 2cb282b781b..29eee727cdf 100644 --- a/cmd/devnet/devnet/network.go +++ b/cmd/devnet/devnet/network.go @@ -3,7 +3,6 @@ package devnet import ( "context" "fmt" - "github.com/ledgerwatch/erigon/cmd/utils" "math/big" "os" "reflect" @@ -11,6 +10,8 @@ import ( "sync" "time" + "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/ledgerwatch/erigon-lib/common/dbg" devnet_args "github.com/ledgerwatch/erigon/cmd/devnet/args" "github.com/ledgerwatch/erigon/cmd/devnet/requests" diff --git a/cmd/devnet/devnet/service.go b/cmd/devnet/devnet/service.go index 5ec41a16fa0..520ce3fe740 100644 --- a/cmd/devnet/devnet/service.go +++ b/cmd/devnet/devnet/service.go @@ -1,6 +1,6 @@ package devnet -import context "context" +import "context" type Service interface { Start(context context.Context) error diff --git a/cmd/devnet/requests/account.go b/cmd/devnet/requests/account.go index 30e1fa7e506..49a9b51d297 100644 --- a/cmd/devnet/requests/account.go +++ b/cmd/devnet/requests/account.go @@ -2,10 +2,10 @@ package requests import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" "math/big" libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon-lib/common/hexutil" "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/rpc" ) diff --git a/cmd/devnet/requests/block.go b/cmd/devnet/requests/block.go index b5d719adf46..3125e27b4d1 100644 --- a/cmd/devnet/requests/block.go +++ b/cmd/devnet/requests/block.go @@ -2,9 +2,10 @@ package requests import ( "encoding/json" - hexutil2 "github.com/ledgerwatch/erigon-lib/common/hexutil" "math/big" + hexutil2 "github.com/ledgerwatch/erigon-lib/common/hexutil" + libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/cmd/devnet/requests/event.go b/cmd/devnet/requests/event.go index 379b78a77c1..4e4e182d258 100644 --- a/cmd/devnet/requests/event.go +++ b/cmd/devnet/requests/event.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/ledgerwatch/erigon-lib/common/hexutil" ethereum "github.com/ledgerwatch/erigon" diff --git a/cmd/devnet/requests/trace.go b/cmd/devnet/requests/trace.go index 9ebc7b43729..3da9042e745 100644 --- a/cmd/devnet/requests/trace.go +++ b/cmd/devnet/requests/trace.go @@ -3,6 +3,7 @@ package requests import ( "encoding/json" "fmt" + "github.com/ledgerwatch/erigon-lib/common/hexutil" libcommon "github.com/ledgerwatch/erigon-lib/common" diff --git a/cmd/devnet/requests/transaction.go b/cmd/devnet/requests/transaction.go index 06d0be67618..dbbec075724 100644 --- a/cmd/devnet/requests/transaction.go +++ b/cmd/devnet/requests/transaction.go @@ -4,9 +4,10 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" "math/big" + "github.com/ledgerwatch/erigon-lib/common/hexutil" + ethereum "github.com/ledgerwatch/erigon" libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon-lib/common/hexutility" diff --git a/cmd/devnet/services/polygon/proofgenerator.go b/cmd/devnet/services/polygon/proofgenerator.go index 3326639d7b0..d01e0e4467d 100644 --- a/cmd/devnet/services/polygon/proofgenerator.go +++ b/cmd/devnet/services/polygon/proofgenerator.go @@ -5,12 +5,13 @@ import ( "context" "errors" "fmt" - "github.com/ledgerwatch/erigon/cl/merkle_tree" "math" "math/big" "strings" "sync" + "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/ledgerwatch/erigon-lib/chain/networkname" libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon-lib/common/hexutility" diff --git a/cmd/devnet/tests/bor/devnet_test.go b/cmd/devnet/tests/bor/devnet_test.go index fa8d66ec005..ad43f982c28 100644 --- a/cmd/devnet/tests/bor/devnet_test.go +++ b/cmd/devnet/tests/bor/devnet_test.go @@ -4,6 +4,8 @@ package bor import ( "context" + "testing" + "github.com/ledgerwatch/erigon-lib/chain/networkname" accounts_steps "github.com/ledgerwatch/erigon/cmd/devnet/accounts/steps" contracts_steps "github.com/ledgerwatch/erigon/cmd/devnet/contracts/steps" @@ -11,7 +13,6 @@ import ( "github.com/ledgerwatch/erigon/cmd/devnet/services" "github.com/ledgerwatch/erigon/cmd/devnet/tests" "github.com/stretchr/testify/require" - "testing" ) func TestStateSync(t *testing.T) { diff --git a/cmd/devnet/tests/context.go b/cmd/devnet/tests/context.go index 6658ed80125..7a1a27f645b 100644 --- a/cmd/devnet/tests/context.go +++ b/cmd/devnet/tests/context.go @@ -2,15 +2,16 @@ package tests import ( "fmt" + "os" + "runtime" + "testing" + "github.com/ledgerwatch/erigon-lib/chain/networkname" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" "github.com/ledgerwatch/erigon/cmd/devnet/services" "github.com/ledgerwatch/erigon/cmd/devnet/services/polygon" "github.com/ledgerwatch/erigon/turbo/debug" "github.com/ledgerwatch/log/v3" - "os" - "runtime" - "testing" ) func initDevnet(chainName string, dataDir string, logger log.Logger) (devnet.Devnet, error) { diff --git a/cmd/devnet/tests/devnet_bor.go b/cmd/devnet/tests/devnet_bor.go index f1b88a197ac..003c662742b 100644 --- a/cmd/devnet/tests/devnet_bor.go +++ b/cmd/devnet/tests/devnet_bor.go @@ -1,6 +1,8 @@ package tests import ( + "time" + "github.com/ledgerwatch/erigon-lib/chain/networkname" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" "github.com/ledgerwatch/erigon/cmd/devnet/args" @@ -11,7 +13,6 @@ import ( "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/log/v3" - "time" ) func NewBorDevnetWithoutHeimdall( diff --git a/cmd/devnet/tests/generic/devnet_test.go b/cmd/devnet/tests/generic/devnet_test.go index a3229652ae1..8f0f944ab85 100644 --- a/cmd/devnet/tests/generic/devnet_test.go +++ b/cmd/devnet/tests/generic/devnet_test.go @@ -4,6 +4,9 @@ package generic import ( "context" + "testing" + "time" + "github.com/ledgerwatch/erigon/cmd/devnet/accounts" "github.com/ledgerwatch/erigon/cmd/devnet/admin" "github.com/ledgerwatch/erigon/cmd/devnet/contracts/steps" @@ -12,8 +15,6 @@ import ( "github.com/ledgerwatch/erigon/cmd/devnet/tests" "github.com/ledgerwatch/erigon/cmd/devnet/transactions" "github.com/stretchr/testify/require" - "testing" - "time" ) func testDynamicTx(t *testing.T, ctx context.Context) { diff --git a/cmd/devnet/transactions/block.go b/cmd/devnet/transactions/block.go index e759bdbaac8..cad6a359906 100644 --- a/cmd/devnet/transactions/block.go +++ b/cmd/devnet/transactions/block.go @@ -3,9 +3,10 @@ package transactions import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" "time" + "github.com/ledgerwatch/erigon-lib/common/hexutil" + libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/log/v3" diff --git a/erigon-lib/kv/membatch/mapmutation_test.go b/erigon-lib/kv/membatch/mapmutation_test.go index e3e9927036c..a658c834fa7 100644 --- a/erigon-lib/kv/membatch/mapmutation_test.go +++ b/erigon-lib/kv/membatch/mapmutation_test.go @@ -2,12 +2,13 @@ package membatch import ( "context" + "os" + "testing" + "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" - "os" - "testing" ) func TestMapmutation_Flush_Close(t *testing.T) { diff --git a/erigon-lib/mmap/total_memory.go b/erigon-lib/mmap/total_memory.go index 33eca4ea38a..75a2f38d7d8 100644 --- a/erigon-lib/mmap/total_memory.go +++ b/erigon-lib/mmap/total_memory.go @@ -1,9 +1,10 @@ package mmap import ( + "runtime/debug" + "github.com/ledgerwatch/erigon-lib/common/cmp" "github.com/pbnjay/memory" - "runtime/debug" ) func TotalMemory() uint64 { diff --git a/erigon-lib/mmap/total_memory_cgroups.go b/erigon-lib/mmap/total_memory_cgroups.go index 696a1f89e8f..dbca502d02f 100644 --- a/erigon-lib/mmap/total_memory_cgroups.go +++ b/erigon-lib/mmap/total_memory_cgroups.go @@ -30,10 +30,11 @@ package mmap import ( "errors" "fmt" + "os" + "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" "github.com/containerd/cgroups/v3/cgroup2" - "os" ) // cgroupsMemoryLimit will try to discover diff --git a/p2p/sentry/sentry_multi_client/sentry_api.go b/p2p/sentry/sentry_multi_client/sentry_api.go index 210e91d1d42..072ae9258c1 100644 --- a/p2p/sentry/sentry_multi_client/sentry_api.go +++ b/p2p/sentry/sentry_multi_client/sentry_api.go @@ -2,7 +2,6 @@ package sentry_multi_client import ( "context" - "github.com/ledgerwatch/erigon/p2p/sentry" "math/rand" "github.com/holiman/uint256" @@ -12,6 +11,7 @@ import ( "google.golang.org/grpc" "github.com/ledgerwatch/erigon/eth/protocols/eth" + "github.com/ledgerwatch/erigon/p2p/sentry" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" diff --git a/p2p/sentry/sentry_multi_client/sentry_multi_client.go b/p2p/sentry/sentry_multi_client/sentry_multi_client.go index 1766e399eca..a95d68af794 100644 --- a/p2p/sentry/sentry_multi_client/sentry_multi_client.go +++ b/p2p/sentry/sentry_multi_client/sentry_multi_client.go @@ -6,7 +6,6 @@ import ( "encoding/hex" "errors" "fmt" - sentry2 "github.com/ledgerwatch/erigon/p2p/sentry" "math/rand" "sort" "sync" @@ -37,6 +36,7 @@ import ( "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/eth/protocols/eth" + sentry2 "github.com/ledgerwatch/erigon/p2p/sentry" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" "github.com/ledgerwatch/erigon/turbo/services" From 0b905d297fdadaabed5495dc2e4fd24e7906a14a Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 10:10:51 +0300 Subject: [PATCH 06/12] save --- .golangci.yml | 3 +++ erigon-lib/txpool/pool_test.go | 3 +-- erigon-lib/types/txn_test.go | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 774ddc7e451..405bb463c4e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -25,7 +25,9 @@ linters: - errorlint #TODO: enable me - errchkjson #TODO: enable me - unused #TODO: enable me + - testifylint #TODO: enable me - gocheckcompilerdirectives + - protogetter enable: - unconvert # - predeclared #TODO: enable me @@ -124,6 +126,7 @@ issues: - unused - deadcode - gocritic + - perfsprint - path: hack\.go linters: - gosec diff --git a/erigon-lib/txpool/pool_test.go b/erigon-lib/txpool/pool_test.go index 64aa1903da7..f4b4b9e766d 100644 --- a/erigon-lib/txpool/pool_test.go +++ b/erigon-lib/txpool/pool_test.go @@ -19,7 +19,6 @@ package txpool import ( "bytes" "context" - // "crypto/rand" "fmt" "math" @@ -175,7 +174,7 @@ func TestReplaceWithHigherFee(t *testing.T) { sendersCache := kvcache.New(kvcache.DefaultCoherentConfig) pool, err := New(ch, coreDB, cfg, sendersCache, *u256.N1, nil, nil, nil, fixedgas.DefaultMaxBlobsPerBlock, log.New()) assert.NoError(err) - require.True(pool != nil) + require.NotEqual(nil, pool) ctx := context.Background() var stateVersionID uint64 = 0 pendingBaseFee := uint64(200000) diff --git a/erigon-lib/types/txn_test.go b/erigon-lib/types/txn_test.go index 9d71a545e5b..1a0eb1200a0 100644 --- a/erigon-lib/types/txn_test.go +++ b/erigon-lib/types/txn_test.go @@ -154,10 +154,10 @@ func TestDedupHashes(t *testing.T) { h = toHashes() c = h.DedupCopy() - assert.Equal(0, h.Len()) - assert.Equal(0, c.Len()) - assert.Equal(0, len(h)) - assert.Equal(0, len(c)) + assert.Zero(h.Len()) + assert.Zero(c.Len()) + assert.Zero(len(h)) + assert.Zero(len(c)) h = toHashes(1, 2, 3, 4) c = h.DedupCopy() From a2d60efa57d896075847780cfca60aa608927525 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 10:25:08 +0300 Subject: [PATCH 07/12] save --- cmd/downloader/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/downloader/main.go b/cmd/downloader/main.go index 4d702b102e5..0de70383f82 100644 --- a/cmd/downloader/main.go +++ b/cmd/downloader/main.go @@ -178,7 +178,7 @@ func Downloader(ctx context.Context, logger log.Logger) error { return err } - cfg.ClientConfig.PieceHashersPerTorrent = 4 * runtime.NumCPU() + cfg.ClientConfig.PieceHashersPerTorrent = 32 * runtime.NumCPU() cfg.ClientConfig.DisableIPv6 = disableIPV6 cfg.ClientConfig.DisableIPv4 = disableIPV4 From 8eda8828988f29739d1ce128f7e405843164c277 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 10:36:39 +0300 Subject: [PATCH 08/12] save --- erigon-lib/.golangci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erigon-lib/.golangci.yml b/erigon-lib/.golangci.yml index ffbb5f7922b..443458abf70 100644 --- a/erigon-lib/.golangci.yml +++ b/erigon-lib/.golangci.yml @@ -19,6 +19,7 @@ linters: - goerr113 - unparam - makezero + - testifylint #TODO: enable me enable: - unconvert - predeclared @@ -114,6 +115,7 @@ issues: - unused - deadcode - gocritic + - perfsprint - path: hack\.go linters: - gosec From 39de0f5959185bc0b3794ef3c22a38170edd78cf Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 10:36:59 +0300 Subject: [PATCH 09/12] save --- erigon-lib/.golangci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/erigon-lib/.golangci.yml b/erigon-lib/.golangci.yml index 443458abf70..4e45c12cb03 100644 --- a/erigon-lib/.golangci.yml +++ b/erigon-lib/.golangci.yml @@ -20,6 +20,7 @@ linters: - unparam - makezero - testifylint #TODO: enable me + - protogetter enable: - unconvert - predeclared From 13bd05c5bf8dea5cd66ddcf5f8a765cb33453ed4 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 11:24:03 +0300 Subject: [PATCH 10/12] save --- erigon-lib/compress/parallel_compress.go | 3 ++- erigon-lib/metrics/prometheus.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erigon-lib/compress/parallel_compress.go b/erigon-lib/compress/parallel_compress.go index a676f846651..552bfb37c1e 100644 --- a/erigon-lib/compress/parallel_compress.go +++ b/erigon-lib/compress/parallel_compress.go @@ -25,6 +25,7 @@ import ( "fmt" "io" "os" + "strconv" "sync" "sync/atomic" "time" @@ -529,7 +530,7 @@ func reducedict(ctx context.Context, trace bool, logPrefix, segmentFilePath stri if n == 0 { continue } - logCtx = append(logCtx, fmt.Sprintf("%d", i), fmt.Sprintf("%d", n)) + logCtx = append(logCtx, strconv.Itoa(i), strconv.Itoa(n)) } if lvl < log.LvlTrace { logger.Log(lvl, fmt.Sprintf("[%s] Effective dictionary", logPrefix), logCtx...) diff --git a/erigon-lib/metrics/prometheus.go b/erigon-lib/metrics/prometheus.go index 3ea14b35df5..aeb361b83d9 100644 --- a/erigon-lib/metrics/prometheus.go +++ b/erigon-lib/metrics/prometheus.go @@ -4,6 +4,7 @@ import ( "fmt" "net/http" "sort" + "strconv" metrics2 "github.com/VictoriaMetrics/metrics" "github.com/ledgerwatch/log/v3" @@ -72,7 +73,7 @@ func Handler(reg Registry) http.Handler { prevTypeName = typeName } w.Header().Add("Content-Type", "text/plain") - w.Header().Add("Content-Length", fmt.Sprint(c.buff.Len())) + w.Header().Add("Content-Length", strconv.Itoa(c.buff.Len())) w.Write(c.buff.Bytes()) }) } From eb6163173b05f3359127ce51e20cc647ec983572 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 11:24:27 +0300 Subject: [PATCH 11/12] save --- erigon-lib/state/inverted_index.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon-lib/state/inverted_index.go b/erigon-lib/state/inverted_index.go index 5ef8e6ec2a1..4fe6ba6c03b 100644 --- a/erigon-lib/state/inverted_index.go +++ b/erigon-lib/state/inverted_index.go @@ -1386,7 +1386,7 @@ func (ii *InvertedIndex) prune(ctx context.Context, txFrom, txTo, limit uint64, select { case <-logEvery.C: - ii.logger.Info("[snapshots] prune history", "name", ii.filenameBase, "to_step", fmt.Sprintf("%.2f", float64(txTo)/float64(ii.aggregationStep)), "prefix", fmt.Sprintf("%x", key[:8])) + ii.logger.Info("[snapshots] prune history", "name", ii.filenameBase, "to_step", fmt.Sprintf("%.2f", float64(txTo)/float64(ii.aggregationStep)), "prefix", fmt.Sprintf("%x", key[:8])) //nolint default: } } From 0cd010b449a9a6244f4fb8649309e9cb823c2f27 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Sat, 11 Nov 2023 12:21:30 +0300 Subject: [PATCH 12/12] save --- .golangci.yml | 1 + eth/tracers/logger/logger.go | 2 +- rpc/handler.go | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 405bb463c4e..ea4a442c1de 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -26,6 +26,7 @@ linters: - errchkjson #TODO: enable me - unused #TODO: enable me - testifylint #TODO: enable me + - perfsprint #TODO: enable me - gocheckcompilerdirectives - protogetter enable: diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go index 9e5ddb0889d..c49a6c4ca85 100644 --- a/eth/tracers/logger/logger.go +++ b/eth/tracers/logger/logger.go @@ -391,7 +391,7 @@ func (t *mdLogger) CaptureState(pc uint64, op vm.OpCode, gas, cost uint64, scope // format stack var a []string for _, elem := range stack.Data { - a = append(a, fmt.Sprintf("%v", elem.String())) + a = append(a, elem.String()) } b := fmt.Sprintf("[%v]", strings.Join(a, ",")) fmt.Fprintf(t.out, "%10v |", b) diff --git a/rpc/handler.go b/rpc/handler.go index 679aa2c8e38..66334087aaf 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -20,7 +20,6 @@ import ( "bytes" "context" "encoding/json" - "fmt" "reflect" "strconv" "strings" @@ -92,7 +91,7 @@ func HandleError(err error, stream *jsoniter.Stream) error { } stream.WriteMore() stream.WriteObjectField("message") - stream.WriteString(fmt.Sprintf("%v", err)) + stream.WriteString(err.Error()) de, ok := err.(DataError) if ok { stream.WriteMore() @@ -101,7 +100,7 @@ func HandleError(err error, stream *jsoniter.Stream) error { if derr == nil { stream.Write(data) } else { - stream.WriteString(fmt.Sprintf("%v", derr)) + stream.WriteString(derr.Error()) } } stream.WriteObjectEnd()