Skip to content

Commit

Permalink
Upgrade BSP to geth-v1.14.13 (#241)(#239) (#240)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
noslav authored Jan 30, 2025
1 parent c062f7f commit d647010
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions build/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions crypto/crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

0 comments on commit d647010

Please sign in to comment.