From db4aaedcbdb409e17ea3de161e7b24a80ba0a58c Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 8 Jan 2015 11:47:04 +0100
Subject: Moved ptrie => trie. Removed old trie

---
 trie/hashnode.go | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 trie/hashnode.go

(limited to 'trie/hashnode.go')

diff --git a/trie/hashnode.go b/trie/hashnode.go
new file mode 100644
index 000000000..40ccd54c3
--- /dev/null
+++ b/trie/hashnode.go
@@ -0,0 +1,22 @@
+package trie
+
+type HashNode struct {
+	key []byte
+}
+
+func NewHash(key []byte) *HashNode {
+	return &HashNode{key}
+}
+
+func (self *HashNode) RlpData() interface{} {
+	return self.key
+}
+
+func (self *HashNode) Hash() interface{} {
+	return self.key
+}
+
+// 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 }
-- 
cgit v1.2.3


From 3c7181d28f1f24aaea2da5cce664ffac52f369df Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 2 Feb 2015 19:58:34 -0800
Subject: Fixed a copy issue in the trie which could cause a consensus failure

---
 trie/hashnode.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'trie/hashnode.go')

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) }
-- 
cgit v1.2.3