Merge pull request #6109 from mysteriumnetwork/bump-golang-1.24.1

Update Docker images and Go version to 1.24.1 for Android packaging

Author: soffokl

bin/build_xgo

@@ -27,7 +27,7 @@ DIR_BUILD="build/myst"
 mkdir -p ${DIR_BUILD}
 DIR_TEMP=`mktemp -d ${DIR_BUILD}/${tempname}.XXXXXX`
 
-IMAGE="mysteriumnetwork/xgo:1.20.2"
+IMAGE="mysteriumnetwork/xgo:1.24.1"
 
 docker run --rm \
     -v "$PWD"/$DIR_TEMP:/build \

bin/package_android

@@ -26,14 +26,14 @@ docker run --rm \
     -e FLAG_V=false \
     -e FLAG_X=false \
     -e FLAG_RACE=false \
-    -e FLAG_LDFLAGS="-w -s $(get_linker_ldflags)" \
+    -e FLAG_LDFLAGS="-w -s $(get_linker_ldflags) -checklinkname=0" \
     -e FLAG_BUILDMODE=default \
     -e FLAG_TAGS="android" \
     -e TARGETS=android/. \
     -e EXT_GOPATH=/ext-go/1 \
     -e GO111MODULE=on \
     -e GOFLAGS=-mod=mod \
-    mysteriumnetwork/xgomobile:1.20.2 ./mobile/mysterium
+    mysteriumnetwork/xgomobile:1.24.1 ./mobile/mysterium
 
 if [[ -f $OUT_FILENAME_AAR ]]; then
     print_success "Android package ${OUT_FILENAME_AAR} build complete!"

bin/package_android_provider

@@ -26,14 +26,14 @@ docker run --rm \
     -e FLAG_V=false \
     -e FLAG_X=false \
     -e FLAG_RACE=false \
-    -e FLAG_LDFLAGS="-w -s $(get_linker_ldflags)" \
+    -e FLAG_LDFLAGS="-w -s $(get_linker_ldflags) -checklinkname=0" \
     -e FLAG_BUILDMODE=default \
     -e FLAG_TAGS="android mobile_provider" \
     -e TARGETS=android_provider/. \
     -e EXT_GOPATH=/ext-go/1 \
     -e GO111MODULE=on \
     -e GOFLAGS=-mod=mod \
-    mysteriumnetwork/xgomobile:1.20.2 ./mobile/mysterium
+    mysteriumnetwork/xgomobile:1.24.1 ./mobile/mysterium
 
 if [[ -f $OUT_FILENAME_AAR ]]; then
     print_success "Android package ${OUT_FILENAME_AAR} build complete!"

go.mod

@@ -1,8 +1,6 @@
 module github.com/mysteriumnetwork/node
 
-go 1.22.0
-
-toolchain go1.24.1
+go 1.24.1
 
 require (
 	github.com/BurntSushi/toml v1.3.2

services/wireguard/endpoint/netstack-provider/netstack.go

@@ -29,8 +29,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/mysteriumnetwork/node/config"
-
 	"github.com/rs/zerolog/log"
 	"golang.org/x/time/rate"
 	"golang.zx2c4.com/wireguard/tun"
@@ -47,6 +45,8 @@ import (
 	"gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
 	"gvisor.dev/gvisor/pkg/tcpip/transport/udp"
 	"gvisor.dev/gvisor/pkg/waiter"
+
+	"github.com/mysteriumnetwork/node/config"
 )
 
 type netTun struct {
@@ -239,7 +239,7 @@ func (tun *netTun) acceptTCP(r *tcp.ForwarderRequest) {
 	var wq waiter.Queue
 	ep, tcpErr := r.CreateEndpoint(&wq)
 	if tcpErr != nil {
-		log.Error().Err(fmt.Errorf(tcpErr.String())).Msg("Failed to create TCP endpoint for forwarding request")
+		log.Error().Err(fmt.Errorf("%s", tcpErr.String())).Msg("Failed to create TCP endpoint for forwarding request")
 		r.Complete(true)
 		return
 	}
@@ -300,7 +300,7 @@ func (tun *netTun) acceptUDP(req *udp.ForwarderRequest) {
 
 	ep, udpErr := req.CreateEndpoint(&wq)
 	if udpErr != nil {
-		log.Error().Err(fmt.Errorf(udpErr.String())).Msg("Failed to create UDP endpoint for forwarding request")
+		log.Error().Err(fmt.Errorf("%s", udpErr.String())).Msg("Failed to create UDP endpoint for forwarding request")
 		return
 	}