From 400de4cfb5981a1e71bbba00470a25ce4165cf9a Mon Sep 17 00:00:00 2001
From: antonis19 <antonis19@mail.com>
Date: Tue, 19 Nov 2024 16:09:41 +0700
Subject: [PATCH] Reintroduce netgo (fix issues #12570 and #12556) (#12597)

Reintroducing `netgo` into the builds to fix the following issues:
https://github.com/erigontech/erigon/issues/12556
https://github.com/erigontech/erigon/issues/12570

`netgo` was removed in this PR:
https://github.com/erigontech/erigon/pull/7421

but didn't seem to fix that issue.

---------

Co-authored-by: antonis19 <antonis19@users.noreply.github.com>
---
 .../ci-cd-main-branch-docker-images.yml       |  4 +-
 .goreleaser.yml                               | 80 +++++++++----------
 Makefile                                      |  2 +-
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci-cd-main-branch-docker-images.yml b/.github/workflows/ci-cd-main-branch-docker-images.yml
index 2fbb28b0d2a..0892ddb8ff2 100644
--- a/.github/workflows/ci-cd-main-branch-docker-images.yml
+++ b/.github/workflows/ci-cd-main-branch-docker-images.yml
@@ -83,7 +83,7 @@ jobs:
           -v ${HOME}/go/pkg/mod:/go/pkg/mod \
           -w /erigon --entrypoint /bin/sh \
           ${{ env.BUILDER_IMAGE }} \
-          -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=arm64 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm erigon integration rpcdaemon"
+          -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=arm64 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm,netgo erigon integration rpcdaemon"
 
       - name: Build amd64
         run: |
@@ -94,7 +94,7 @@ jobs:
           -v ${HOME}/go/pkg/mod:/go/pkg/mod \
           -w /erigon --entrypoint /bin/sh \
           ${{ env.BUILDER_IMAGE }} \
-          -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=amd64 GOAMD64=v2 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm erigon integration rpcdaemon"
+          -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=amd64 GOAMD64=v2 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm,netgo erigon integration rpcdaemon"
 
       - name: Build and push multi-platform docker image based on the commit id ${{ steps.getCommitId.outputs.short_commit_id }} in the main branch
         env:
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 63ddb697a5f..92dd2b8d8b0 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -31,7 +31,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -51,7 +51,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -71,7 +71,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -91,7 +91,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -111,7 +111,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -131,7 +131,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -151,7 +151,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -171,7 +171,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -191,7 +191,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -211,7 +211,7 @@ builds:
       - CXX=o64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -232,7 +232,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -250,7 +250,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -268,7 +268,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -286,7 +286,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -304,7 +304,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -322,7 +322,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -340,7 +340,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -358,7 +358,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -376,7 +376,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -394,7 +394,7 @@ builds:
       - CXX=oa64-clang++
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT_DARWIN }}
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -418,7 +418,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -439,7 +439,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -460,7 +460,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -481,7 +481,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -502,7 +502,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -523,7 +523,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -544,7 +544,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -565,7 +565,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -586,7 +586,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -607,7 +607,7 @@ builds:
       - CXX=x86_64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }}
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -628,7 +628,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -646,7 +646,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -664,7 +664,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -682,7 +682,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -700,7 +700,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -718,7 +718,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -736,7 +736,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -754,7 +754,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -772,7 +772,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
@@ -790,7 +790,7 @@ builds:
       - CXX=aarch64-linux-gnu-g++
       - CGO_CFLAGS={{ .Env.CGO_CFLAGS_DEFAULT }} -D__BLST_PORTABLE__
       - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
-    tags: [ nosqlite, noboltdb, nosilkworm ]
+    tags: [ nosqlite, noboltdb, nosilkworm, netgo ]
     flags:
       - -trimpath
       - -buildvcs=false
diff --git a/Makefile b/Makefile
index c78ffa8530d..0df390eac4c 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ ifeq ($(shell uname -s), Darwin)
 endif
 
 # about netgo see: https://github.com/golang/go/issues/30310#issuecomment-471669125 and https://github.com/golang/go/issues/57757
-BUILD_TAGS = nosqlite,noboltdb
+BUILD_TAGS = nosqlite,noboltdb,netgo
 
 ifneq ($(shell "$(CURDIR)/turbo/silkworm/silkworm_compat_check.sh"),)
 	BUILD_TAGS := $(BUILD_TAGS),nosilkworm