From cbe67f19707f524e65f5b3f8395918775872e58e Mon Sep 17 00:00:00 2001
From: Preston Van Loon <pvanloon@offchainlabs.com>
Date: Wed, 28 Jun 2023 09:50:43 -0500
Subject: [PATCH] Update protobuf and protobuf deps (#12569)

* Update protobuf and protobuf deps

* gazelle

* enforce c++14

* bump to c++17 since practically all modern compilers support it

* update protobuf again to resolve mac issues, bump c++20

---------

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
---
 .bazelrc    |  4 ++++
 BUILD.bazel |  1 -
 WORKSPACE   | 10 ++++++----
 deps.bzl    |  9 ---------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 1dd33b336..d6cff251f 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -43,3 +43,7 @@ build:debug -s
 
 # Set bazel gotag
 build --define gotags=bazel
+
+# Abseil requires c++14 or greater.
+build --cxxopt=-std=c++20
+build --host_cxxopt=-std=c++20
diff --git a/BUILD.bazel b/BUILD.bazel
index b131104ac..3aa083784 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -3,7 +3,6 @@ load("@com_github_atlassian_bazel_tools//gometalinter:def.bzl", "gometalinter")
 load("@com_github_atlassian_bazel_tools//goimports:def.bzl", "goimports")
 load("@io_kubernetes_build//defs:run_in_workspace.bzl", "workspace_binary")
 load("@io_bazel_rules_go//go:def.bzl", "nogo")
-load("@vaticle_bazel_distribution//common:rules.bzl", "assemble_targz", "assemble_versioned")
 load("@bazel_skylib//rules:common_settings.bzl", "string_setting")
 
 prefix = "github.com/prysmaticlabs/prysm"
diff --git a/WORKSPACE b/WORKSPACE
index 816837d5d..9de539a98 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -321,11 +321,13 @@ http_archive(
     url = "https://github.com/bazelbuild/buildtools/archive/f2aed9ee205d62d45c55cfabbfd26342f8526862.zip",
 )
 
-git_repository(
+http_archive(
     name = "com_google_protobuf",
-    commit = "436bd7880e458532901c58f4d9d1ea23fa7edd52",
-    remote = "https://github.com/protocolbuffers/protobuf",
-    shallow_since = "1617835118 -0700",
+    sha256 = "4e176116949be52b0408dfd24f8925d1eb674a781ae242a75296b17a1c721395",
+    strip_prefix = "protobuf-23.3",
+    urls = [
+        "https://github.com/protocolbuffers/protobuf/archive/v23.3.tar.gz",
+    ],
 )
 
 # Group the sources of the library so that CMake rule have access to it
diff --git a/deps.bzl b/deps.bzl
index b2b48ff99..48c6f0687 100644
--- a/deps.bzl
+++ b/deps.bzl
@@ -4867,12 +4867,3 @@ def prysm_deps():
         sum = "h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=",
         version = "v1.24.0",
     )
-
-    # Note: go_repository is already wrapped with maybe!
-    maybe(
-        git_repository,
-        name = "vaticle_bazel_distribution",
-        commit = "96424c85195a97dad81f69fdbbef2e1574bf8801",
-        remote = "https://github.com/vaticle/bazel-distribution",
-        shallow_since = "1569509514 +0300",
-    )