From fd7579f08026e41c561ae538448be6b2e0069972 Mon Sep 17 00:00:00 2001
From: Pranay Valson <pranay.valson@gmail.com>
Date: Thu, 30 Jan 2025 14:46:56 -0800
Subject: [PATCH] Upgrade BSP to `geth-v1.14.13` (#241)(#239) (#240)

* version: release go-ethereum v1.14.13 stable
* Merge bsp-v2.0.0 to geth-v1.14.12
repatch state-specimen, block-specimen, blob-specimen producer, workflows, linters & docs
---------
Signed-off-by: Pranay Valson <pranay.valson@gmail.com>

Signed-off-by: Pranay Valson <pranay.valson@gmail.com>
---
 .github/workflows/build-test.yml |  2 +-
 Dockerfile                       |  2 +-
 build/ci.go                      | 12 +++++++++---
 crypto/crypto.go                 |  3 +++
 version/version.go               |  2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 2f8ed0acd..122105164 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   audit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.6.0
diff --git a/Dockerfile b/Dockerfile
index dd513466f..b34d5eaae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG USER=$USER
 # Build Geth in a stock Go builder container
 FROM golang:1.22-alpine as builder
 
-RUN apk add --no-cache gcc musl-dev linux-headers git
+RUN apk add --no-cache gcc musl-dev linux-headers git make
 
 COPY . /go-ethereum
 WORKDIR /go-ethereum
diff --git a/build/ci.go b/build/ci.go
index 754d88a86..bae31f728 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -888,11 +888,17 @@ func ppaUpload(workdir, ppa, sshUser string, files []string) {
 			os.WriteFile(idfile, sshkey, 0600)
 		}
 	}
-	// Upload
+	// Upload. This doesn't always work, so try up to three times.
 	dest := sshUser + "@ppa.launchpad.net"
-	if err := build.UploadSFTP(idfile, dest, incomingDir, files); err != nil {
-		log.Fatal(err)
+	for i := 0; i < 3; i++ {
+		err := build.UploadSFTP(idfile, dest, incomingDir, files)
+		if err == nil {
+			return
+		}
+		log.Println("PPA upload failed:", err)
+		time.Sleep(5 * time.Second)
 	}
+	log.Fatal("PPA upload failed all attempts.")
 }
 
 func getenvBase64(variable string) []byte {
diff --git a/crypto/crypto.go b/crypto/crypto.go
index aaa5cc43a..f9979aa4b 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -178,6 +178,9 @@ func UnmarshalPubkey(pub []byte) (*ecdsa.PublicKey, error) {
 	if x == nil {
 		return nil, errInvalidPubkey
 	}
+	if !S256().IsOnCurve(x, y) {
+		return nil, errInvalidPubkey
+	}
 	return &ecdsa.PublicKey{Curve: S256(), X: x, Y: y}, nil
 }
 
diff --git a/version/version.go b/version/version.go
index f010adf03..89a6a3c33 100644
--- a/version/version.go
+++ b/version/version.go
@@ -19,6 +19,6 @@ package version
 const (
 	Major = 1        // Major version component of the current release
 	Minor = 14       // Minor version component of the current release
-	Patch = 12       // Patch version component of the current release
+	Patch = 13       // Patch version component of the current release
 	Meta  = "stable" // Version metadata to append to the version string
 )