Merge branch 'release/0.9.0'

1 files changed, 35 insertions, 0 deletions

diff --git a/trie/shortnode.go b/trie/shortnode.go
new file mode 100644
index 000000000..d96492958
--- /dev/null
+++ b/trie/shortnode.go
@@ -0,0 +1,35 @@
+package trie
+
+import "github.com/ethereum/go-ethereum/ethutil"
+
+type ShortNode struct {
+	trie  *Trie
+	key   []byte
+	value Node
+}
+
+func NewShortNode(t *Trie, key []byte, value Node) *ShortNode {
+	return &ShortNode{t, []byte(CompactEncode(key)), value}
+}
+func (self *ShortNode) Value() Node {
+	self.value = self.trie.trans(self.value)
+
+	return self.value
+}
+func (self *ShortNode) Dirty() bool { return true }
+func (self *ShortNode) Copy(t *Trie) Node {
+	node := &ShortNode{t, nil, self.value.Copy(t)}
+	node.key = ethutil.CopyBytes(self.key)
+	return node
+}
+
+func (self *ShortNode) RlpData() interface{} {
+	return []interface{}{self.key, self.value.Hash()}
+}
+func (self *ShortNode) Hash() interface{} {
+	return self.trie.store(self)
+}
+
+func (self *ShortNode) Key() []byte {
+	return CompactDecode(string(self.key))
+}