Merge branch 'develop' into omerfirmak/fix-stuck-reorg

scroll-tech · Sep 20, 2024 · 8ad7469 · 8ad7469
2 parents 4726f8b + f044582
commit 8ad7469
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Dockerfile.mockccc b/Dockerfile.mockccc
@@ -10,8 +10,6 @@ FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder
 ADD . /go-ethereum
 RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth
 
-RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth
-
 # Pull Geth into a second stage deploy alpine container
 FROM ubuntu:20.04
 

diff --git a/params/version.go b/params/version.go
@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major version component of the current release
 	VersionMinor = 7         // Minor version component of the current release
-	VersionPatch = 17        // Patch version component of the current release
+	VersionPatch = 18        // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )