forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "unifying hex prefix check"

Browse source 
This reverts commit 0c05e37996.
This commit is contained in:
lmittmann 2019-08-15 12:33:56 +02:00
parent 0c05e37996
commit d9258162ca
5 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/bytes.go
View file

@ -17,11 +17,7 @@
// Package common contains various helper functions. // Package common contains various helper functions.
package common package common
import ( import "encoding/hex"
"encoding/hex"
"github.com/ethereum/go-ethereum/common/hexutil"
)
// ToHex returns the hex representation of b, prefixed with '0x'. // ToHex returns the hex representation of b, prefixed with '0x'.
// For empty slices, the return value is "0x0". // For empty slices, the return value is "0x0".
@ -47,8 +43,10 @@ func ToHexArray(b [][]byte) []string {
// FromHex returns the bytes represented by the hexadecimal string s. // FromHex returns the bytes represented by the hexadecimal string s.
// s may be prefixed with "0x". // s may be prefixed with "0x".
func FromHex(s string) []byte { func FromHex(s string) []byte {
if hexutil.Has0xPrefix(s) { if len(s) > 1 {
s = s[2:] if s[0:2] == "0x" || s[0:2] == "0X" {
s = s[2:]
}
} }
if len(s)%2 == 1 { if len(s)%2 == 1 {
s = "0" + s s = "0" + s
@ -67,6 +65,11 @@ func CopyBytes(b []byte) (copiedBytes []byte) {
return return
} }
// hasHexPrefix validates str begins with '0x' or '0X'.
func hasHexPrefix(str string) bool {
return len(str) >= 2 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X')
}
// isHexCharacter returns bool of c being a valid hexadecimal. // isHexCharacter returns bool of c being a valid hexadecimal.
func isHexCharacter(c byte) bool { func isHexCharacter(c byte) bool {
return ('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F') return ('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F')

7
common/hexutil/hexutil.go
View file

@ -61,7 +61,7 @@ func Decode(input string) ([]byte, error) {
if len(input) == 0 { if len(input) == 0 {
return nil, ErrEmptyString return nil, ErrEmptyString
} }
if !Has0xPrefix(input) { if !has0xPrefix(input) {
return nil, ErrMissingPrefix return nil, ErrMissingPrefix
} }
b, err := hex.DecodeString(input[2:]) b, err := hex.DecodeString(input[2:])
@ -185,8 +185,7 @@ func EncodeBig(bigint *big.Int) string {
return fmt.Sprintf("%#x", bigint) return fmt.Sprintf("%#x", bigint)
} }
// Has0xPrefix validates input begins with '0x' or '0X'. func has0xPrefix(input string) bool {
func Has0xPrefix(input string) bool {
return len(input) >= 2 && input[0] == '0' && (input[1] == 'x' || input[1] == 'X') return len(input) >= 2 && input[0] == '0' && (input[1] == 'x' || input[1] == 'X')
} }
@ -194,7 +193,7 @@ func checkNumber(input string) (raw string, err error) {
if len(input) == 0 { if len(input) == 0 {
return "", ErrEmptyString return "", ErrEmptyString
} }
if !Has0xPrefix(input) { if !has0xPrefix(input) {
return "", ErrMissingPrefix return "", ErrMissingPrefix
} }
input = input[2:] input = input[2:]

4
common/math/big.go
View file

@ -20,8 +20,6 @@ package math
import ( import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common/hexutil"
) )
// Various big integer limit values. // Various big integer limit values.
@ -77,7 +75,7 @@ func ParseBig256(s string) (*big.Int, bool) {
} }
var bigint *big.Int var bigint *big.Int
var ok bool var ok bool
if hexutil.Has0xPrefix(s) { if len(s) >= 2 && (s[:2] == "0x" || s[:2] == "0X") {
bigint, ok = new(big.Int).SetString(s[2:], 16) bigint, ok = new(big.Int).SetString(s[2:], 16)
} else { } else {
bigint, ok = new(big.Int).SetString(s, 10) bigint, ok = new(big.Int).SetString(s, 10)

4
common/math/integer.go
View file

@ -19,8 +19,6 @@ package math
import ( import (
"fmt" "fmt"
"strconv" "strconv"
"github.com/ethereum/go-ethereum/common/hexutil"
) )
// Integer limit values. // Integer limit values.
@ -63,7 +61,7 @@ func ParseUint64(s string) (uint64, bool) {
if s == "" { if s == "" {
return 0, true return 0, true
} }
if hexutil.Has0xPrefix(s) { if len(s) >= 2 && (s[:2] == "0x" || s[:2] == "0X") {
v, err := strconv.ParseUint(s[2:], 16, 64) v, err := strconv.ParseUint(s[2:], 16, 64)
return v, err == nil return v, err == nil
} }

2
common/types.go
View file

@ -193,7 +193,7 @@ func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) }
// IsHexAddress verifies whether a string can represent a valid hex-encoded // IsHexAddress verifies whether a string can represent a valid hex-encoded
// Ethereum address or not. // Ethereum address or not.
func IsHexAddress(s string) bool { func IsHexAddress(s string) bool {
if hexutil.Has0xPrefix(s) { if hasHexPrefix(s) {
s = s[2:] s = s[2:]
} }
return len(s) == 2*AddressLength && isHex(s) return len(s) == 2*AddressLength && isHex(s)