Merge branch 'develop' into jsonrpc

Conflicts:
	rpc/ws/server.go

1 files changed, 9 insertions, 6 deletions

diff --git a/trie/hashnode.go b/trie/hashnode.go
index 40ccd54c3..e46628368 100644
--- a/trie/hashnode.go
+++ b/trie/hashnode.go
@@ -1,11 +1,14 @@
 package trie
 
+import "github.com/ethereum/go-ethereum/ethutil"
+
 type HashNode struct {
-	key []byte
+	key  []byte
+	trie *Trie
 }
 
-func NewHash(key []byte) *HashNode {
-	return &HashNode{key}
+func NewHash(key []byte, trie *Trie) *HashNode {
+	return &HashNode{key, trie}
 }
 
 func (self *HashNode) RlpData() interface{} {
@@ -17,6 +20,6 @@ func (self *HashNode) Hash() interface{} {
 }
 
 // These methods will never be called but we have to satisfy Node interface
-func (self *HashNode) Value() Node { return nil }
-func (self *HashNode) Dirty() bool { return true }
-func (self *HashNode) Copy() Node  { return self }
+func (self *HashNode) Value() Node       { return nil }
+func (self *HashNode) Dirty() bool       { return true }
+func (self *HashNode) Copy(t *Trie) Node { return NewHash(ethutil.CopyBytes(self.key), t) }