Revert additional changes for stable v1.16.7 release

Author: calbera

cmd/bera-geth/config.go

@@ -35,6 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/beacon/blsync"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/eth/catalyst"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
@@ -278,11 +279,11 @@ func makeFullNode(ctx *cli.Context) *node.Node {
 	// Configure synchronization override service
 	var synctarget common.Hash
 	if ctx.IsSet(utils.SyncTargetFlag.Name) {
-		target := ctx.String(utils.SyncTargetFlag.Name)
-		if !common.IsHexHash(target) {
-			utils.Fatalf("sync target hash is not a valid hex hash: %s", target)
+		hex := hexutil.MustDecode(ctx.String(utils.SyncTargetFlag.Name))
+		if len(hex) != common.HashLength {
+			utils.Fatalf("invalid sync target length: have %d, want %d", len(hex), common.HashLength)
 		}
-		synctarget = common.HexToHash(target)
+		synctarget = common.BytesToHash(hex)
 	}
 	utils.RegisterSyncOverrideService(stack, eth, synctarget, ctx.Bool(utils.ExitWhenSyncedFlag.Name))
 

cmd/bera-geth/snapshot.go

@@ -639,11 +639,11 @@ func snapshotExportPreimages(ctx *cli.Context) error {
 
 	var root common.Hash
 	if ctx.NArg() > 1 {
-		hash := ctx.Args().Get(1)
-		if !common.IsHexHash(hash) {
+		rootBytes := common.FromHex(ctx.Args().Get(1))
+		if len(rootBytes) != common.HashLength {
 			return fmt.Errorf("invalid hash: %s", ctx.Args().Get(1))
 		}
-		root = common.HexToHash(hash)
+		root = common.BytesToHash(rootBytes)
 	} else {
 		headBlock := rawdb.ReadHeadBlock(chaindb)
 		if headBlock == nil {

common/types.go

@@ -76,15 +76,6 @@ func BigToHash(b *big.Int) Hash { return BytesToHash(b.Bytes()) }
 // If b is larger than len(h), b will be cropped from the left.
 func HexToHash(s string) Hash { return BytesToHash(FromHex(s)) }
 
-// IsHexHash verifies whether a string can represent a valid hex-encoded
-// Ethereum hash or not.
-func IsHexHash(s string) bool {
-	if has0xPrefix(s) {
-		s = s[2:]
-	}
-	return len(s) == 2*HashLength && isHex(s)
-}
-
 // Cmp compares two hashes.
 func (h Hash) Cmp(other Hash) int {
 	return bytes.Compare(h[:], other[:])

core/rawdb/database.go

@@ -330,7 +330,6 @@ func Open(db ethdb.KeyValueStore, opts OpenOptions) (ethdb.Database, error) {
 		}()
 	}
 	return &freezerdb{
-		readOnly:      opts.ReadOnly,
 		ancientRoot:   opts.Ancient,
 		KeyValueStore: db,
 		chainFreezer:  frdb,

version/version.go

@@ -17,8 +17,8 @@
 package version
 
 const (
-	Major = 1          // Major version component of the current release
-	Minor = 16         // Minor version component of the current release
-	Patch = 8          // Patch version component of the current release
-	Meta  = "unstable" // Version metadata to append to the version string
+	Major = 1        // Major version component of the current release
+	Minor = 16       // Minor version component of the current release
+	Patch = 7        // Patch version component of the current release
+	Meta  = "stable" // Version metadata to append to the version string
 )