From ae45a39dc1cddac885090872cefc6799b4a4c1d9 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 28 Feb 2015 20:52:10 +0100
Subject: [PATCH] Secure trie
---
cmd/evm/main.go | 1 -
core/execution.go | 2 +-
trie/secure_trie.go | 32 ++++++++++++++++++++++++++++++++
trie/trie_test.go | 1 -
4 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 trie/secure_trie.go
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 432cbd001..d6a93460e 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -65,7 +65,6 @@ func main() {
statedb := state.New(nil, db)
sender := statedb.NewStateObject([]byte("sender"))
receiver := statedb.NewStateObject([]byte("receiver"))
- //receiver.SetCode([]byte(*code))
receiver.SetCode(ethutil.Hex2Bytes(*code))
vmenv := NewEnv(statedb, []byte("evmuser"), ethutil.Big(*value))
diff --git a/core/execution.go b/core/execution.go
index 5e0cbd37e..f7d5a8945 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -61,10 +61,10 @@ func (self *Execution) exec(code, contextAddr []byte, caller vm.ContextRef) (ret
snapshot := env.State().Copy()
start := time.Now()
ret, err = evm.Run(to, caller, code, self.value, self.Gas, self.price, self.input)
+ chainlogger.Debugf("vm took %v\n", time.Since(start))
if err != nil {
env.State().Set(snapshot)
}
- chainlogger.Debugf("vm took %v\n", time.Since(start))
return
}
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
new file mode 100644
index 000000000..c6ef90351
--- /dev/null
+++ b/trie/secure_trie.go
@@ -0,0 +1,32 @@
+package trie
+
+import "github.com/ethereum/go-ethereum/crypto"
+
+type SecureTrie struct {
+ *Trie
+}
+
+func NewSecure(root []byte, backend Backend) *SecureTrie {
+ return &SecureTrie{New(root, backend)}
+}
+
+func (self *SecureTrie) Update(key, value []byte) Node {
+ return self.Trie.Update(crypto.Sha3(key), value)
+}
+func (self *SecureTrie) UpdateString(key, value string) Node {
+ return self.Update([]byte(key), []byte(value))
+}
+
+func (self *SecureTrie) Get(key []byte) []byte {
+ return self.Trie.Get(crypto.Sha3(key))
+}
+func (self *SecureTrie) GetString(key string) []byte {
+ return self.Get([]byte(key))
+}
+
+func (self *SecureTrie) Delete(key []byte) Node {
+ return self.Trie.Delete(crypto.Sha3(key))
+}
+func (self *SecureTrie) DeletString(key string) Node {
+ return self.Delete([]byte(key))
+}
diff --git a/trie/trie_test.go b/trie/trie_test.go
index 4b185f355..4b0243bcf 100644
--- a/trie/trie_test.go
+++ b/trie/trie_test.go
@@ -274,7 +274,6 @@ func TestLargeData(t *testing.T) {
trie.Update(value2.k, value2.v)
vals[string(value.k)] = value
vals[string(value2.k)] = value2
- fmt.Println(value, "\n", value2)
}
it := trie.Iterator()
--
GitLab