Merge branch 'master' into l2-engine-api

.github/workflows/go.yml

@@ -30,7 +30,7 @@ jobs:
           args: -c .golangci.yml
       # Strict linter configuration, only checking new code from pull requests.
       - name: golangci-lint-strict
-        run: golangci-lint run -c .golangci-strict.yml --new-from-rev=origin/master --out-format=github-actions,line-number
+        run: golangci-lint run -c .golangci-strict.yml --new-from-rev=origin/master --out-format=colored-line-number
 
   build:
     name: ubuntu
@@ -46,7 +46,7 @@ jobs:
           cache: true
 
       - name: Set up GolangCI-Lint
-        run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $HOME/bin v1.59.0
+        run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $HOME/bin v1.60.2
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4

.golangci-strict.yml

@@ -197,7 +197,6 @@ linters:
     - errname # checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error
     - errorlint # finds code that will cause problems with the error wrapping scheme introduced in Go 1.13
     - exhaustive # checks exhaustiveness of enum switch statements
-    - exportloopref # checks for pointers to enclosing loop variables
     - forbidigo # forbids identifiers
     - funlen # tool for detection of long functions
     - gocheckcompilerdirectives # validates go compiler directive comments (//go:)
@@ -243,6 +242,7 @@ linters:
     - usestdlibvars # detects the possibility to use variables/constants from the Go standard library
     - wastedassign # finds wasted assignment statements
     - whitespace # detects leading and trailing whitespace
+    - copyloopvar # detects places where loop variables are copied
 
     ## you may want to enable
     #- decorder # checks declaration order and count of types, constants, variables and functions
@@ -289,7 +289,6 @@ linters:
     #- interfacer # [deprecated] suggests narrower interface types
     #- maligned # [deprecated, replaced by govet fieldalignment] detects Go structs that would take less memory if their fields were sorted
     #- nosnakecase # [deprecated, replaced by revive var-naming] detects snake case of variable naming and function name
-    #- scopelint # [deprecated, replaced by exportloopref] checks for unpinned variables in go programs
     #- structcheck # [deprecated, replaced by unused] finds unused struct fields
     #- varcheck # [deprecated, replaced by unused] finds unused global variables and constants
 

Dockerfile.gowaves-it

@@ -55,6 +55,8 @@ CMD /app/node \
     -build-state-hashes \
     -serve-extended-api \
     -log-level=debug \
+    -log-network \
+    -log-fsm \
     -obsolescence=1h \
     -reward=$DESIRED_REWARD \
     -vote=$SUPPORTED_FEATURES \

go.mod

@@ -49,7 +49,7 @@ require (
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
 	golang.org/x/sync v0.8.0
 	golang.org/x/sys v0.24.0
-	google.golang.org/grpc v1.65.0
+	google.golang.org/grpc v1.66.0
 	google.golang.org/protobuf v1.34.2
 	moul.io/zapfilter v1.7.0
 )
@@ -110,7 +110,7 @@ require (
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect

go.sum

@@ -438,10 +438,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
-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/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
+google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
+google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
 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=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

itests/docker/docker.go

@@ -217,9 +217,9 @@ func (d *Docker) runGoNode(ctx context.Context, cfgPath string, suiteName string
 			"SUPPORTED_FEATURES=" + supportedFeatures,
 		},
 		ExposedPorts: []string{
-			GrpcApiPort,
-			RESTApiPort,
-			BindPort,
+			GrpcApiPort + "/tcp",
+			RESTApiPort + "/tcp",
+			BindPort + "/tcp",
 		},
 		Mounts: []string{
 			cfgPath + ":/home/gowaves/config",
@@ -311,9 +311,9 @@ func (d *Docker) runScalaNode(ctx context.Context, cfgPath string, suiteName str
 				"-Dwaves.network.enable-blacklisting=no",
 		},
 		ExposedPorts: []string{
-			GrpcApiPort,
-			RESTApiPort,
-			BindPort,
+			GrpcApiPort + "/tcp",
+			RESTApiPort + "/tcp",
+			BindPort + "/tcp",
 		},
 		Networks: []*dockertest.Network{d.network},
 	}