forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge a6bcbe696a into 7dde2b902c

Browse source
This commit is contained in:
Viktor Trón 2015-11-27 13:14:49 +00:00
commit 18f4f58e6c
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/bytes.go
View file

@ -23,9 +23,14 @@ import (
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"math/big" "math/big"
"regexp"
"strings" "strings"
) )
var (
hexRe = regexp.MustCompile("^(0x)?([a-fA-f0-9]{2})+$")
)
func ToHex(b []byte) string { func ToHex(b []byte) string {
hex := Bytes2Hex(b) hex := Bytes2Hex(b)
// Prefer output of "0x0" instead of "0x" // Prefer output of "0x0" instead of "0x"
@ -139,8 +144,14 @@ func HasHexPrefix(str string) bool {
} }
func IsHex(str string) bool { func IsHex(str string) bool {
l := len(str) return hexRe.MatchString(str)
return l >= 4 && l%2 == 0 && str[0:2] == "0x" }
func NormaliseHex(str string) (string, bool) {
if HasHexPrefix(str) {
str = str[2:]
}
return str, IsHex(str)
} }
func Bytes2Hex(d []byte) string { func Bytes2Hex(d []byte) string {
@ -202,8 +213,8 @@ func ParseData(data ...interface{}) (ret []byte) {
switch t := item.(type) { switch t := item.(type) {
case string: case string:
var str []byte var str []byte
if IsHex(t) { if n, ok := NormaliseHex(t); ok {
str = Hex2Bytes(t[2:]) str = Hex2Bytes(n)
} else { } else {
str = []byte(t) str = []byte(t)
} }

7
common/types.go
View file

@ -95,11 +95,8 @@ 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 len(s) == 2+2*AddressLength && IsHex(s[2:]) { if s, ok := NormaliseHex(s); ok {
return true return len(s) == 2*AddressLength
}
if len(s) == 2*AddressLength && IsHex(s) {
return true
} }
return false return false
} }