4 files changed, 151 insertions, 3 deletions

diff --git a/common/bytes.go b/common/bytes.go
index 4aef9a223..5e553d23c 100644
--- a/common/bytes.go
+++ b/common/bytes.go
@@ -211,7 +211,7 @@ func RightPadString(str string, l int) string {
 
 }
 
-func Address(slice []byte) (addr []byte) {
+func ToAddress(slice []byte) (addr []byte) {
 	if len(slice) < 20 {
 		addr = LeftPadBytes(slice, 20)
 	} else if len(slice) > 20 {
diff --git a/common/types.go b/common/types.go
index 6a9abdf18..38044d5c8 100644
--- a/common/types.go
+++ b/common/types.go
@@ -1,6 +1,91 @@
 package common
 
+import "math/big"
+
+const (
+	hashLength    = 32
+	addressLength = 20
+)
+
 type (
-	uHash    [32]byte
-	uAddress [20]byte
+	Hash    [hashLength]byte
+	Address [addressLength]byte
 )
+
+func BytesToHash(b []byte) Hash {
+	var h Hash
+	h.SetBytes(b)
+	return h
+}
+func StringToHash(s string) Hash { return BytesToHash([]byte(s)) }
+func BigToHash(b *big.Int) Hash  { return BytesToHash(b.Bytes()) }
+func HexToHash(s string) Hash    { return BytesToHash(FromHex(s)) }
+
+// Don't use the default 'String' method in case we want to overwrite
+
+// Get the string representation of the underlying hash
+func (h Hash) Str() string   { return string(h[:]) }
+func (h Hash) Bytes() []byte { return h[:] }
+func (h Hash) Big() *big.Int { return Bytes2Big(h[:]) }
+func (h Hash) Hex() string   { return "0x" + Bytes2Hex(h[:]) }
+
+// Sets the hash to the value of b. If b is larger than len(h) it will panic
+func (h *Hash) SetBytes(b []byte) {
+	if len(b) > len(h) {
+		b = b[len(b)-hashLength:]
+	}
+
+	// reverse loop
+	for i := len(b) - 1; i >= 0; i-- {
+		h[hashLength-len(b)+i] = b[i]
+	}
+}
+
+// Set string `s` to h. If s is larger than len(h) it will panic
+func (h *Hash) SetString(s string) { h.SetBytes([]byte(s)) }
+
+// Sets h to other
+func (h *Hash) Set(other Hash) {
+	for i, v := range other {
+		h[i] = v
+	}
+}
+
+/////////// Address
+func BytesToAddress(b []byte) Address {
+	var a Address
+	a.SetBytes(b)
+	return a
+}
+func StringToAddress(s string) Address { return BytesToAddress([]byte(s)) }
+func BigToAddress(b *big.Int) Address  { return BytesToAddress(b.Bytes()) }
+func HexToAddress(s string) Address    { return BytesToAddress(FromHex(s)) }
+
+// Get the string representation of the underlying address
+func (a Address) Str() string   { return string(a[:]) }
+func (a Address) Bytes() []byte { return a[:] }
+func (a Address) Big() *big.Int { return Bytes2Big(a[:]) }
+func (a Address) Hash() Hash    { return BytesToHash(a[:]) }
+func (a Address) Hex() string   { return "0x" + Bytes2Hex(a[:]) }
+
+// Sets the address to the value of b. If b is larger than len(a) it will panic
+func (a *Address) SetBytes(b []byte) {
+	if len(b) > len(a) {
+		b = b[len(b)-addressLength:]
+	}
+
+	// reverse loop
+	for i := len(b) - 1; i >= 0; i-- {
+		a[addressLength-len(b)+i] = b[i]
+	}
+}
+
+// Set string `s` to a. If s is larger than len(a) it will panic
+func (a *Address) SetString(s string) { a.SetBytes([]byte(s)) }
+
+// Sets a to other
+func (a *Address) Set(other Address) {
+	for i, v := range other {
+		a[i] = v
+	}
+}
diff --git a/common/types_template.go b/common/types_template.go
new file mode 100644
index 000000000..1c82a36dc
--- /dev/null
+++ b/common/types_template.go
@@ -0,0 +1,48 @@
+// +build none
+//sed -e 's/_N_/Hash/g' -e 's/_S_/32/g' -e '1d' types_template.go | gofmt -w hash.go
+
+package common
+
+import "math/big"
+
+type _N_ [_S_]byte
+
+func BytesTo_N_(b []byte) _N_ {
+	var h _N_
+	h.SetBytes(b)
+	return h
+}
+func StringTo_N_(s string) _N_ { return BytesTo_N_([]byte(s)) }
+func BigTo_N_(b *big.Int) _N_  { return BytesTo_N_(b.Bytes()) }
+func HexTo_N_(s string) _N_    { return BytesTo_N_(FromHex(s)) }
+
+// Don't use the default 'String' method in case we want to overwrite
+
+// Get the string representation of the underlying hash
+func (h _N_) Str() string   { return string(h[:]) }
+func (h _N_) Bytes() []byte { return h[:] }
+func (h _N_) Big() *big.Int { return Bytes2Big(h[:]) }
+func (h _N_) Hex() string   { return "0x" + Bytes2Hex(h[:]) }
+
+// Sets the hash to the value of b. If b is larger than len(h) it will panic
+func (h *_N_) SetBytes(b []byte) {
+	// Use the right most bytes
+	if len(b) > len(h) {
+		b = b[len(b)-_S_:]
+	}
+
+	// Reverse the loop
+	for i := len(b) - 1; i >= 0; i-- {
+		h[_S_-len(b)+i] = b[i]
+	}
+}
+
+// Set string `s` to h. If s is larger than len(h) it will panic
+func (h *_N_) SetString(s string) { h.SetBytes([]byte(s)) }
+
+// Sets h to other
+func (h *_N_) Set(other _N_) {
+	for i, v := range other {
+		h[i] = v
+	}
+}
diff --git a/common/types_test.go b/common/types_test.go
new file mode 100644
index 000000000..9f303152c
--- /dev/null
+++ b/common/types_test.go
@@ -0,0 +1,15 @@
+package common
+
+import "testing"
+
+func TestBytesConversion(t *testing.T) {
+	bytes := []byte{5}
+	hash := BytesToHash(bytes)
+
+	var exp Hash
+	exp[31] = 5
+
+	if hash != exp {
+		t.Errorf("expected %x got %x", exp, hash)
+	}
+}