3 files changed, 26 insertions, 0 deletions
diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go
index 9e91eb7d6..b0fa64ed7 100644
--- a/ethdb/memory_database.go
+++ b/ethdb/memory_database.go
@@ -26,6 +26,12 @@ func (db *MemDatabase) Get(key []byte) ([]byte, error) {
 	return db.db[string(key)], nil
 }
 
+func (db *MemDatabase) GetKeys() []*ethutil.Key {
+	data, _ := db.Get([]byte("KeyRing"))
+
+	return []*ethutil.Key{ethutil.NewKeyFromBytes(data)}
+}
+
 func (db *MemDatabase) Delete(key []byte) error {
 	delete(db.db, string(key))
 
diff --git a/ethutil/db.go b/ethutil/db.go
index b11d5d726..abbf4a2b0 100644
--- a/ethutil/db.go
+++ b/ethutil/db.go
@@ -4,6 +4,7 @@ package ethutil
 type Database interface {
 	Put(key []byte, value []byte)
 	Get(key []byte) ([]byte, error)
+	GetKeys() []*Key
 	Delete(key []byte) error
 	LastKnownTD() []byte
 	Close()
diff --git a/ethutil/key.go b/ethutil/key.go
new file mode 100644
index 000000000..ec195f213
--- /dev/null
+++ b/ethutil/key.go
@@ -0,0 +1,19 @@
+package ethutil
+
+type Key struct {
+	PrivateKey []byte
+	PublicKey  []byte
+}
+
+func NewKeyFromBytes(data []byte) *Key {
+	val := NewValueFromBytes(data)
+	return &Key{val.Get(0).Bytes(), val.Get(1).Bytes()}
+}
+
+func (k *Key) Address() []byte {
+	return Sha3Bin(k.PublicKey[1:])[12:]
+}
+
+func (k *Key) RlpEncode() []byte {
+	return EmptyValue().Append(k.PrivateKey).Append(k.PublicKey).Encode()
+}