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

Make remote dominant

Browse Source
This commit is contained in:
obscuren 2015-03-13 17:47:00 +01:00
parent b663e8b29a
commit a0266489b4
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
state/managed_state.go
View File

@ -23,13 +23,19 @@ func ManageState(statedb *StateDB) *ManagedState {
} }
} }
func (ms *ManagedState) SetState(statedb *StateDB) {
ms.mu.Lock()
defer ms.mu.Unlock()
ms.StateDB = statedb
}
func (ms *ManagedState) RemoveNonce(addr []byte, n uint64) { func (ms *ManagedState) RemoveNonce(addr []byte, n uint64) {
if ms.hasAccount(addr) { if ms.hasAccount(addr) {
ms.mu.Lock() ms.mu.Lock()
defer ms.mu.Unlock() defer ms.mu.Unlock()
account := ms.getAccount(addr) account := ms.getAccount(addr)
if n-account.nstart < uint64(len(account.nonces)) { if n-account.nstart <= uint64(len(account.nonces)) {
reslice := make([]bool, n-account.nstart) reslice := make([]bool, n-account.nstart)
copy(reslice, account.nonces[:n-account.nstart]) copy(reslice, account.nonces[:n-account.nstart])
account.nonces = reslice account.nonces = reslice
@ -47,7 +53,7 @@ func (ms *ManagedState) NewNonce(addr []byte) uint64 {
return account.nstart + uint64(i) return account.nstart + uint64(i)
} }
} }
account.nonces = append(account.nonces, false) account.nonces = append(account.nonces, true)
return uint64(len(account.nonces)) + account.nstart return uint64(len(account.nonces)) + account.nstart
} }
@ -57,9 +63,17 @@ func (ms *ManagedState) hasAccount(addr []byte) bool {
} }
func (ms *ManagedState) getAccount(addr []byte) *account { func (ms *ManagedState) getAccount(addr []byte) *account {
if _, ok := ms.accounts[string(addr)]; !ok { if account, ok := ms.accounts[string(addr)]; !ok {
so := ms.GetOrNewStateObject(addr) so := ms.GetOrNewStateObject(addr)
ms.accounts[string(addr)] = newAccount(so) ms.accounts[string(addr)] = newAccount(so)
} else {
// Always make sure the state account nonce isn't actually higher
// than the tracked one.
so := ms.StateDB.GetStateObject(addr)
if so != nil && uint64(len(account.nonces))+account.nstart < so.nonce {
ms.accounts[string(addr)] = newAccount(so)
}
} }
return ms.accounts[string(addr)] return ms.accounts[string(addr)]

35
state/managed_state_test.go
View File

@ -1,12 +1,18 @@
package state package state
import "testing" import (
"testing"
var addr = []byte("test") "github.com/ethereum/go-ethereum/ethutil"
)
var addr = ethutil.Address([]byte("test"))
func create() (*ManagedState, *account) { func create() (*ManagedState, *account) {
ms := ManageState(nil) ms := ManageState(&StateDB{stateObjects: make(map[string]*StateObject)})
ms.accounts[string(addr)] = newAccount(&StateObject{nonce: 100}) so := &StateObject{address: addr, nonce: 100}
ms.StateDB.stateObjects[string(addr)] = so
ms.accounts[string(addr)] = newAccount(so)
return ms, ms.accounts[string(addr)] return ms, ms.accounts[string(addr)]
} }
@ -16,6 +22,11 @@ func TestNewNonce(t *testing.T) {
nonce := ms.NewNonce(addr) nonce := ms.NewNonce(addr)
if nonce != 100 { if nonce != 100 {
t.Error("expected nonce 100. got", nonce)
}
nonce = ms.NewNonce(addr)
if nonce != 101 {
t.Error("expected nonce 101. got", nonce) t.Error("expected nonce 101. got", nonce)
} }
} }
@ -52,3 +63,19 @@ func TestReuse(t *testing.T) {
t.Error("expected nonce to be 105. got", nonce) t.Error("expected nonce to be 105. got", nonce)
} }
} }
func TestRemoteNonceChange(t *testing.T) {
ms, account := create()
nn := make([]bool, 10)
for i, _ := range nn {
nn[i] = true
}
account.nonces = append(account.nonces, nn...)
nonce := ms.NewNonce(addr)
ms.StateDB.stateObjects[string(addr)].nonce = 200
nonce = ms.NewNonce(addr)
if nonce != 200 {
t.Error("expected nonce after remote update to be", 201, "got", nonce)
}
}