Merge branch 'dependencies' into eventstreams

Signed-off-by: Nicko Guyer <[email protected]>

.github/workflows/go.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Build and Test
         run: make
@@ -38,7 +38,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Build Docker image
         run: make docker
@@ -117,7 +117,7 @@ jobs:
 
           - stack-type: ethereum
             blockchain-connector: ethconnect
-            test-suite: TestEthereumGatewayE2ESuite
+            test-suite: TestEthereumGatewayLegacyEthE2ESuite
             database-type: sqlite3
             token-provider: erc1155
             multiparty-enabled: false
@@ -130,7 +130,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Download Docker image
         uses: actions/download-artifact@v3

.github/workflows/integration.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Update manifest to latest commit for every service
         run: ./manifestgen.sh head
@@ -91,7 +91,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Update manifest to latest commit for every service
         run: ./manifestgen.sh head

.golangci.yml

@@ -3,6 +3,7 @@ run:
   skip-dirs:
   - "mocks"
   - "ffconfig"
+  - "test/e2e"
 linters-settings:
   golint: {}
   gocritic:

Makefile

@@ -23,7 +23,7 @@ lint: ${LINT}
 ${MOCKERY}:
 		$(VGO) install github.com/vektra/mockery/v2@latest
 ${LINT}:
-		$(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.47.3
+		$(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.0
 ffcommon:
 		$(eval WSCLIENT_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger/firefly-common/pkg/wsclient))
 
@@ -79,6 +79,7 @@ $(eval $(call makemock, internal/operations,        Manager,              operat
 $(eval $(call makemock, internal/multiparty,        Manager,              multipartymocks))
 $(eval $(call makemock, internal/apiserver,         FFISwaggerGen,        apiservermocks))
 $(eval $(call makemock, internal/apiserver,         Server,               apiservermocks))
+$(eval $(call makemock, internal/events/websockets, WebSocketsNamespaced, websocketsmocks))
 
 firefly-nocgo: ${GOFILES}
 		CGO_ENABLED=0 $(VGO) build -o ${BINARY_NAME}-nocgo -ldflags "-X main.buildDate=$(DATE) -X main.buildVersion=$(BUILD_VERSION) -X 'github.com/hyperledger/firefly/cmd.BuildVersionOverride=$(BUILD_VERSION)' -X 'github.com/hyperledger/firefly/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger/firefly/cmd.BuildCommit=$(GIT_REF)'" -tags=prod -tags=prod -v

docs/_i18n/en.yml

@@ -58,3 +58,4 @@ pages:
   xdc_testnet: XDC Testnet
   zksync_testnet: zkSync Testnet
   rotate_dx_certs: Rotate Data Exchange Certificates
+  tezos_testnet: Tezos Testnet

docs/contributors/dev_environment_setup.md

@@ -23,7 +23,7 @@ This guide will walk you through setting up your machine for contributing to Fir
 
 You will need a few prerequisites set up on your machine before you can build FireFly from source. We recommend doing development on macOS, Linux, or WSL 2.0.
 
-- [Go 1.18](https://golang.org/dl/)
+- [Go 1.21](https://golang.org/dl/)
 - make
 - GCC
 - openssl