Skip to content

Commit d647010

Browse files
authored
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 <[email protected]>
1 parent c062f7f commit d647010

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG USER=$USER
88
# Build Geth in a stock Go builder container
99
FROM golang:1.22-alpine as builder
1010

11-
RUN apk add --no-cache gcc musl-dev linux-headers git
11+
RUN apk add --no-cache gcc musl-dev linux-headers git make
1212

1313
COPY . /go-ethereum
1414
WORKDIR /go-ethereum

build/ci.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,11 +888,17 @@ func ppaUpload(workdir, ppa, sshUser string, files []string) {
888888
os.WriteFile(idfile, sshkey, 0600)
889889
}
890890
}
891-
// Upload
891+
// Upload. This doesn't always work, so try up to three times.
892892
dest := sshUser + "@ppa.launchpad.net"
893-
if err := build.UploadSFTP(idfile, dest, incomingDir, files); err != nil {
894-
log.Fatal(err)
893+
for i := 0; i < 3; i++ {
894+
err := build.UploadSFTP(idfile, dest, incomingDir, files)
895+
if err == nil {
896+
return
897+
}
898+
log.Println("PPA upload failed:", err)
899+
time.Sleep(5 * time.Second)
895900
}
901+
log.Fatal("PPA upload failed all attempts.")
896902
}
897903

898904
func getenvBase64(variable string) []byte {

crypto/crypto.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@ func UnmarshalPubkey(pub []byte) (*ecdsa.PublicKey, error) {
178178
if x == nil {
179179
return nil, errInvalidPubkey
180180
}
181+
if !S256().IsOnCurve(x, y) {
182+
return nil, errInvalidPubkey
183+
}
181184
return &ecdsa.PublicKey{Curve: S256(), X: x, Y: y}, nil
182185
}
183186

version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ package version
1919
const (
2020
Major = 1 // Major version component of the current release
2121
Minor = 14 // Minor version component of the current release
22-
Patch = 12 // Patch version component of the current release
22+
Patch = 13 // Patch version component of the current release
2323
Meta = "stable" // Version metadata to append to the version string
2424
)

0 commit comments

Comments
 (0)