diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 22:07:33 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 22:07:33 +0800 |
| commit | 554f20930abba7e55fb0dd2718a00c4bd066c973 (patch) | |
| tree | 41ba92fa976a28547e4e7e43f7e80a4a4f680685 /trie/trie.go | |
| parent | 8b20c3cc976a149c64ef0ac2cabbe49e93ba739d (diff) | |
| parent | a756dbeb7b1027eb91130ecf8d5440dca8e738d8 (diff) | |
| download | dexon-554f20930abba7e55fb0dd2718a00c4bd066c973.tar dexon-554f20930abba7e55fb0dd2718a00c4bd066c973.tar.gz dexon-554f20930abba7e55fb0dd2718a00c4bd066c973.tar.bz2 dexon-554f20930abba7e55fb0dd2718a00c4bd066c973.tar.lz dexon-554f20930abba7e55fb0dd2718a00c4bd066c973.tar.xz dexon-554f20930abba7e55fb0dd2718a00c4bd066c973.tar.zst dexon-554f20930abba7e55fb0dd2718a00c4bd066c973.zip | |
Merge branch 'develop' into rpcfrontier
Diffstat (limited to 'trie/trie.go')
| -rw-r--r-- | trie/trie.go | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/trie/trie.go b/trie/trie.go index 1c1112a7f..d990338ee 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" ) func ParanoiaCheck(t1 *Trie, backend Backend) (bool, *Trie) { @@ -302,14 +302,21 @@ func (self *Trie) mknode(value *common.Value) Node { case 2: // A value node may consists of 2 bytes. if value.Get(0).Len() != 0 { - return NewShortNode(self, CompactDecode(string(value.Get(0).Bytes())), self.mknode(value.Get(1))) + key := CompactDecode(string(value.Get(0).Bytes())) + if key[len(key)-1] == 16 { + return NewShortNode(self, key, &ValueNode{self, value.Get(1).Bytes()}) + } else { + return NewShortNode(self, key, self.mknode(value.Get(1))) + } } case 17: - fnode := NewFullNode(self) - for i := 0; i < l; i++ { - fnode.set(byte(i), self.mknode(value.Get(i))) + if len(value.Bytes()) != 17 { + fnode := NewFullNode(self) + for i := 0; i < 16; i++ { + fnode.set(byte(i), self.mknode(value.Get(i))) + } + return fnode } - return fnode case 32: return &HashNode{value.Bytes(), self} } |