roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge branch 'hotfix/4' into develop

Browse Source
This commit is contained in:
obscuren 2014-05-21 01:12:39 +02:00
commit 734b2e4cf7
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ethchain/state.go
View File

@ -60,6 +60,7 @@ func (s *State) GetStateObject(addr []byte) *StateObject {
// Check if there's a cached state for this contract
cachedStateObject := s.states[string(addr)]
if cachedStateObject != nil {
//fmt.Printf("get cached #%d %x addr: %x\n", cachedStateObject.trie.Cache().Len(), cachedStateObject.Root(), addr[0:4])
stateObject.state = cachedStateObject
}
@ -70,8 +71,9 @@ func (s *State) GetStateObject(addr []byte) *StateObject {
func (s *State) UpdateStateObject(object *StateObject) {
addr := object.Address()
if object.state != nil {
if object.state != nil && s.states[string(addr)] == nil {
s.states[string(addr)] = object.state
//fmt.Printf("update cached #%d %x addr: %x\n", object.state.trie.Cache().Len(), object.state.Root(), addr[0:4])
}
ethutil.Config.Db.Put(ethutil.Sha3Bin(object.Script()), object.Script())
@ -81,12 +83,6 @@ func (s *State) UpdateStateObject(object *StateObject) {
s.manifest.AddObjectChange(object)
}
func (s *State) SetStateObject(stateObject *StateObject) {
s.states[string(stateObject.address)] = stateObject.state
s.UpdateStateObject(stateObject)
}
func (s *State) GetAccount(addr []byte) (account *StateObject) {
data := s.trie.Get(string(addr))
if data == "" {

1
ethchain/state_object.go
View File

@ -78,6 +78,7 @@ func (c *StateObject) SetAddr(addr []byte, value interface{}) {
func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) {
addr := ethutil.BigToBytes(num, 256)
//fmt.Println("storing", val.BigInt(), "@", num)
c.SetAddr(addr, val)
}

6
ethchain/vm.go
View File

@ -450,7 +450,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
} else {
stack.Push(ethutil.BigD(addr))
vm.state.SetStateObject(contract)
vm.state.UpdateStateObject(contract)
}
case oCALL:
require(7)
@ -499,7 +499,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
stack.Push(ethutil.BigTrue)
}
vm.state.SetStateObject(contract)
vm.state.UpdateStateObject(contract)
mem.Set(retOffset.Int64(), retSize.Int64(), ret)
} else {
@ -517,7 +517,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
receiver := vm.state.GetAccount(stack.Pop().Bytes())
receiver.AddAmount(closure.object.Amount)
vm.state.SetStateObject(receiver)
vm.state.UpdateStateObject(receiver)
closure.object.state.Purge()

2
ethpub/pub.go
View File

@ -162,7 +162,7 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
acc := lib.stateManager.TransState().GetStateObject(keyPair.Address())
tx.Nonce = acc.Nonce
acc.Nonce += 1
lib.stateManager.TransState().SetStateObject(acc)
lib.stateManager.TransState().UpdateStateObject(acc)
tx.Sign(keyPair.PrivateKey)
lib.txPool.QueueTransaction(tx)

4
ethutil/trie.go
View File

@ -6,6 +6,10 @@ import (
"sync"
)
func (s *Cache) Len() int {
return len(s.nodes)
}
// TODO
// A StateObject is an object that has a state root
// This is goig to be the object for the second level caching (the caching of object which have a state such as contracts)