From 08caeedd842526373d30a929e63101a5fe7fda55 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Tue, 30 Jun 2015 23:49:34 +0200
Subject: core, core/state: only write necessary state. Skip intermediate
---
core/block_processor.go | 2 +-
core/state/state_object.go | 8 --------
core/state/statedb.go | 22 ++++++++++++++++++++--
3 files changed, 21 insertions(+), 11 deletions(-)
(limited to 'core')
diff --git a/core/block_processor.go b/core/block_processor.go
index e8014ec22..5f745e491 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -243,7 +243,7 @@ func (sm *BlockProcessor) processWithParent(block, parent *types.Block) (logs st
// Commit state objects/accounts to a temporary trie (does not save)
// used to calculate the state root.
- state.Update()
+ state.CleanUpdate()
if header.Root != state.Root() {
err = fmt.Errorf("invalid merkle root. received=%x got=%x", header.Root, state.Root())
return
diff --git a/core/state/state_object.go b/core/state/state_object.go
index a31c182d2..e40aeda82 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -57,8 +57,6 @@ type StateObject struct {
initCode Code
// Cached storage (flushed when updated)
storage Storage
- // Temporary prepaid gas, reward after transition
- prepaid *big.Int
// Total gas pool is the total amount of gas currently
// left if this object is the coinbase. Gas is directly
@@ -77,14 +75,10 @@ func (self *StateObject) Reset() {
}
func NewStateObject(address common.Address, db common.Database) *StateObject {
- // This to ensure that it has 20 bytes (and not 0 bytes), thus left or right pad doesn't matter.
- //address := common.ToAddress(addr)
-
object := &StateObject{db: db, address: address, balance: new(big.Int), gasPool: new(big.Int), dirty: true}
object.trie = trie.NewSecure((common.Hash{}).Bytes(), db)
object.storage = make(Storage)
object.gasPool = new(big.Int)
- object.prepaid = new(big.Int)
return object
}
@@ -110,7 +104,6 @@ func NewStateObjectFromBytes(address common.Address, data []byte, db common.Data
object.trie = trie.NewSecure(extobject.Root[:], db)
object.storage = make(map[string]common.Hash)
object.gasPool = new(big.Int)
- object.prepaid = new(big.Int)
object.code, _ = db.Get(extobject.CodeHash)
return object
@@ -172,7 +165,6 @@ func (self *StateObject) Update() {
self.setAddr([]byte(key), value)
}
- self.storage = make(Storage)
}
func (c *StateObject) GetInstr(pc *big.Int) *common.Value {
diff --git a/core/state/statedb.go b/core/state/statedb.go
index f6f63f329..bd4ff6ff3 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -18,6 +18,7 @@ import (
type StateDB struct {
db common.Database
trie *trie.SecureTrie
+ root common.Hash
stateObjects map[string]*StateObject
@@ -31,7 +32,7 @@ type StateDB struct {
// Create a new state from a given trie
func New(root common.Hash, db common.Database) *StateDB {
trie := trie.NewSecure(root[:], db)
- return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), refund: new(big.Int), logs: make(map[common.Hash]Logs)}
+ return &StateDB{root: root, db: db, trie: trie, stateObjects: make(map[string]*StateObject), refund: new(big.Int), logs: make(map[common.Hash]Logs)}
}
func (self *StateDB) PrintRoot() {
@@ -185,7 +186,7 @@ func (self *StateDB) DeleteStateObject(stateObject *StateObject) {
addr := stateObject.Address()
self.trie.Delete(addr[:])
- delete(self.stateObjects, addr.Str())
+ //delete(self.stateObjects, addr.Str())
}
// Retrieve a state object given my the address. Nil if not found
@@ -340,6 +341,23 @@ func (self *StateDB) Update() {
}
}
+func (self *StateDB) CleanUpdate() {
+ self.trie = trie.NewSecure(self.root[:], self.db)
+
+ self.refund = new(big.Int)
+
+ for _, stateObject := range self.stateObjects {
+ if stateObject.remove {
+ self.DeleteStateObject(stateObject)
+ } else {
+ stateObject.Update()
+
+ self.UpdateStateObject(stateObject)
+ }
+ stateObject.dirty = false
+ }
+}
+
// Debug stuff
func (self *StateDB) CreateOutputForDiff() {
for _, stateObject := range self.stateObjects {
--
cgit v1.2.3