From ea82a7fc0ced94eeb7b920444ac24955a0f75a36 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jkwon.work@gmail.com>
Date: Wed, 14 Jan 2015 00:07:13 -0800
Subject: [PATCH] Changed PubKey25519 Address to include TypeByte

---
 README.md         | 10 +++++++---
 account/pubkey.go |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index be57d5104..7c891fe27 100644
--- a/README.md
+++ b/README.md
@@ -90,17 +90,21 @@ You will also to need to have a genesis.json in ~/.tendermint/. This must be the
 {
   "Accounts": [
     {
-      "Address": "6070ff17c39b2b0a64ca2bc431328037fa0f4760",
+      "Address": "553722287BF1230C081C270908C1F453E7D1C397",
+      "Amount":  200000000
+    },
+    {
+      "Address": "AC89A6DDF4C309A89A2C4078CE409A5A7B282270",
       "Amount":  200000000
     }
   ],
   "Validators": [
     {
-      "PubKey": [1, "6bd490c212e701a2136eeea04f06fa4f287ee47e2b7a9b5d62edd84cd6ad9753"],
+      "PubKey": [1, "932A857D334BA5A38DD8E0D9CDE9C84687C21D0E5BEE64A1EDAB9C6C32344F1A"],
       "Amount": 100000000,
       "UnbondTo": [
         {
-          "Address": "6070ff17c39b2b0a64ca2bc431328037fa0f4760",
+          "Address": "553722287BF1230C081C270908C1F453E7D1C397",
           "Amount":  100000000
         }
       ]
diff --git a/account/pubkey.go b/account/pubkey.go
index 0dd37778e..d9e386707 100644
--- a/account/pubkey.go
+++ b/account/pubkey.go
@@ -50,7 +50,7 @@ type PubKeyEd25519 []byte
 func (key PubKeyEd25519) TypeByte() byte { return PubKeyTypeEd25519 }
 
 // TODO: Or should this just be BinaryRipemd160(key)? (The difference is the TypeByte.)
-func (key PubKeyEd25519) Address() []byte { return BinaryRipemd160([]byte(key)) }
+func (key PubKeyEd25519) Address() []byte { return BinaryRipemd160(key) }
 
 func (key PubKeyEd25519) ValidateBasic() error {
 	if len(key) != ed25519.PublicKeySize {