Removed exported fields from state object and added proper set/getters

obscuren · obscuren · commit ea9a549bbdc8 · 2015-02-20T14:19:34.000+01:00
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
@@ -51,8 +51,8 @@ func StateObjectFromAccount(db ethutil.Database, addr string, account Account) *
 	if ethutil.IsHex(account.Code) {
 		account.Code = account.Code[2:]
 	}
-	obj.Code = ethutil.Hex2Bytes(account.Code)
-	obj.Nonce = ethutil.Big(account.Nonce).Uint64()
+	obj.SetCode(ethutil.Hex2Bytes(account.Code))
+	obj.SetNonce(ethutil.Big(account.Nonce).Uint64())
 
 	return obj
 }
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
@@ -146,8 +146,8 @@ func (ui *UiLib) AssetPath(p string) string {
 func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
 	dbWindow := NewDebuggerWindow(self)
 	object := self.eth.ChainManager().State().GetStateObject(ethutil.Hex2Bytes(contractHash))
-	if len(object.Code) > 0 {
-		dbWindow.SetCode(ethutil.Bytes2Hex(object.Code))
+	if len(object.Code()) > 0 {
+		dbWindow.SetCode(ethutil.Bytes2Hex(object.Code()))
 	}
 	dbWindow.SetData(data)
 
diff --git a/core/state_transition.go b/core/state_transition.go
@@ -138,8 +138,8 @@ func (self *StateTransition) preCheck() (err error) {
 	)
 
 	// Make sure this transaction's nonce is correct
-	if sender.Nonce != msg.Nonce() {
-		return NonceError(msg.Nonce(), sender.Nonce)
+	if sender.Nonce() != msg.Nonce() {
+		return NonceError(msg.Nonce(), sender.Nonce())
 	}
 
 	// Pre-pay gas / Buy gas of the coinbase account
@@ -166,7 +166,7 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) {
 	defer self.RefundGas()
 
 	// Increment the nonce for the next transaction
-	self.state.SetNonce(sender.Address(), sender.Nonce+1)
+	self.state.SetNonce(sender.Address(), sender.Nonce()+1)
 	//sender.Nonce += 1
 
 	// Transaction gas
@@ -242,7 +242,7 @@ func MakeContract(msg Message, state *state.StateDB) *state.StateObject {
 	addr := AddressFromMessage(msg)
 
 	contract := state.GetOrNewStateObject(addr)
-	contract.InitCode = msg.Data()
+	contract.SetInitCode(msg.Data())
 
 	return contract
 }
diff --git a/core/transaction_pool.go b/core/transaction_pool.go
@@ -169,7 +169,7 @@ func (pool *TxPool) RemoveInvalid(query StateQuery) {
 	for _, tx := range pool.txs {
 		sender := query.GetAccount(tx.From())
 		err := pool.ValidateTransaction(tx)
-		if err != nil || sender.Nonce >= tx.Nonce() {
+		if err != nil || sender.Nonce() >= tx.Nonce() {
 			removedTxs = append(removedTxs, tx)
 		}
 	}
diff --git a/state/dump.go b/state/dump.go
@@ -30,7 +30,7 @@ func (self *StateDB) Dump() []byte {
 	for it.Next() {
 		stateObject := NewStateObjectFromBytes(it.Key, it.Value, self.db)
 
-		account := Account{Balance: stateObject.balance.String(), Nonce: stateObject.Nonce, Root: ethutil.Bytes2Hex(stateObject.Root()), CodeHash: ethutil.Bytes2Hex(stateObject.codeHash)}
+		account := Account{Balance: stateObject.balance.String(), Nonce: stateObject.nonce, Root: ethutil.Bytes2Hex(stateObject.Root()), CodeHash: ethutil.Bytes2Hex(stateObject.codeHash)}
 		account.Storage = make(map[string]string)
 
 		storageIt := stateObject.State.trie.Iterator()
@@ -50,7 +50,7 @@ func (self *StateDB) Dump() []byte {
 
 // Debug stuff
 func (self *StateObject) CreateOutputForDiff() {
-	fmt.Printf("%x %x %x %x\n", self.Address(), self.State.Root(), self.balance.Bytes(), self.Nonce)
+	fmt.Printf("%x %x %x %x\n", self.Address(), self.State.Root(), self.balance.Bytes(), self.nonce)
 	it := self.State.trie.Iterator()
 	for it.Next() {
 		fmt.Printf("%x %x\n", it.Key, it.Value)
diff --git a/state/state_object.go b/state/state_object.go
@@ -36,11 +36,11 @@ type StateObject struct {
 	// Shared attributes
 	balance  *big.Int
 	codeHash []byte
-	Nonce    uint64
+	nonce    uint64
 	// Contract related attributes
 	State    *StateDB
-	Code     Code
-	InitCode Code
+	code     Code
+	initCode Code
 
 	storage Storage
 
@@ -89,20 +89,21 @@ func NewStateObjectFromBytes(address, data []byte, db ethutil.Database) *StateOb
 
 	object := &StateObject{address: address, db: db}
 	//object.RlpDecode(data)
-	object.Nonce = extobject.Nonce
+	object.nonce = extobject.Nonce
 	object.balance = extobject.Balance
 	object.codeHash = extobject.CodeHash
 	object.State = New(extobject.Root, db)
 	object.storage = make(map[string]*ethutil.Value)
 	object.gasPool = new(big.Int)
-	object.Code, _ = db.Get(extobject.CodeHash)
+	object.code, _ = db.Get(extobject.CodeHash)
 
 	return object
 }
 
 func (self *StateObject) MarkForDeletion() {
 	self.remove = true
-	statelogger.DebugDetailf("%x: #%d %v (deletion)\n", self.Address(), self.Nonce, self.balance)
+	self.dirty = true
+	statelogger.DebugDetailf("%x: #%d %v (deletion)\n", self.Address(), self.nonce, self.balance)
 }
 
 func (c *StateObject) getAddr(addr []byte) *ethutil.Value {
@@ -159,25 +160,24 @@ func (self *StateObject) Sync() {
 }
 
 func (c *StateObject) GetInstr(pc *big.Int) *ethutil.Value {
-	if int64(len(c.Code)-1) < pc.Int64() {
+	if int64(len(c.code)-1) < pc.Int64() {
 		return ethutil.NewValue(0)
 	}
 
-	return ethutil.NewValueFromBytes([]byte{c.Code[pc.Int64()]})
+	return ethutil.NewValueFromBytes([]byte{c.code[pc.Int64()]})
 }
 
 func (c *StateObject) AddBalance(amount *big.Int) {
 	c.SetBalance(new(big.Int).Add(c.balance, amount))
-	c.dirty = true
 
-	statelogger.Debugf("%x: #%d %v (+ %v)\n", c.Address(), c.Nonce, c.balance, amount)
+	statelogger.Debugf("%x: #%d %v (+ %v)\n", c.Address(), c.nonce, c.balance, amount)
 }
 func (c *StateObject) AddAmount(amount *big.Int) { c.AddBalance(amount) }
 
 func (c *StateObject) SubBalance(amount *big.Int) {
 	c.SetBalance(new(big.Int).Sub(c.balance, amount))
 
-	statelogger.Debugf("%x: #%d %v (- %v)\n", c.Address(), c.Nonce, c.balance, amount)
+	statelogger.Debugf("%x: #%d %v (- %v)\n", c.Address(), c.nonce, c.balance, amount)
 }
 func (c *StateObject) SubAmount(amount *big.Int) { c.SubBalance(amount) }
 
@@ -186,8 +186,6 @@ func (c *StateObject) SetBalance(amount *big.Int) {
 	c.dirty = true
 }
 
-func (self *StateObject) Balance() *big.Int { return self.balance }
-
 //
 // Gas setters and getters
 //
@@ -243,12 +241,12 @@ func (self *StateObject) Copy() *StateObject {
 	stateObject := NewStateObject(self.Address(), self.db)
 	stateObject.balance.Set(self.balance)
 	stateObject.codeHash = ethutil.CopyBytes(self.codeHash)
-	stateObject.Nonce = self.Nonce
+	stateObject.nonce = self.nonce
 	if self.State != nil {
 		stateObject.State = self.State.Copy()
 	}
-	stateObject.Code = ethutil.CopyBytes(self.Code)
-	stateObject.InitCode = ethutil.CopyBytes(self.InitCode)
+	stateObject.code = ethutil.CopyBytes(self.code)
+	stateObject.initCode = ethutil.CopyBytes(self.initCode)
 	stateObject.storage = self.storage.Copy()
 	stateObject.gasPool.Set(self.gasPool)
 	stateObject.remove = self.remove
@@ -265,8 +263,12 @@ func (self *StateObject) Set(stateObject *StateObject) {
 // Attribute accessors
 //
 
+func (self *StateObject) Balance() *big.Int {
+	return self.balance
+}
+
 func (c *StateObject) N() *big.Int {
-	return big.NewInt(int64(c.Nonce))
+	return big.NewInt(int64(c.nonce))
 }
 
 // Returns the address of the contract/account
@@ -276,7 +278,7 @@ func (c *StateObject) Address() []byte {
 
 // Returns the initialization Code
 func (c *StateObject) Init() Code {
-	return c.InitCode
+	return c.initCode
 }
 
 func (self *StateObject) Trie() *trie.Trie {
@@ -287,8 +289,27 @@ func (self *StateObject) Root() []byte {
 	return self.Trie().Root()
 }
 
+func (self *StateObject) Code() []byte {
+	return self.code
+}
+
 func (self *StateObject) SetCode(code []byte) {
-	self.Code = code
+	self.code = code
+	self.dirty = true
+}
+
+func (self *StateObject) SetInitCode(code []byte) {
+	self.initCode = code
+	self.dirty = true
+}
+
+func (self *StateObject) SetNonce(nonce uint64) {
+	self.nonce = nonce
+	self.dirty = true
+}
+
+func (self *StateObject) Nonce() uint64 {
+	return self.nonce
 }
 
 //
@@ -297,24 +318,24 @@ func (self *StateObject) SetCode(code []byte) {
 
 // State object encoding methods
 func (c *StateObject) RlpEncode() []byte {
-	return ethutil.Encode([]interface{}{c.Nonce, c.balance, c.Root(), c.CodeHash()})
+	return ethutil.Encode([]interface{}{c.nonce, c.balance, c.Root(), c.CodeHash()})
 }
 
 func (c *StateObject) CodeHash() ethutil.Bytes {
-	return crypto.Sha3(c.Code)
+	return crypto.Sha3(c.code)
 }
 
 func (c *StateObject) RlpDecode(data []byte) {
 	decoder := ethutil.NewValueFromBytes(data)
-	c.Nonce = decoder.Get(0).Uint()
+	c.nonce = decoder.Get(0).Uint()
 	c.balance = decoder.Get(1).BigInt()
 	c.State = New(decoder.Get(2).Bytes(), c.db) //New(trie.New(ethutil.Config.Db, decoder.Get(2).Interface()))
 	c.storage = make(map[string]*ethutil.Value)
 	c.gasPool = new(big.Int)
 
 	c.codeHash = decoder.Get(3).Bytes()
 
-	c.Code, _ = c.db.Get(c.codeHash)
+	c.code, _ = c.db.Get(c.codeHash)
 }
 
 // Storage change object. Used by the manifest for notifying changes to
diff --git a/state/statedb.go b/state/statedb.go
@@ -72,7 +72,7 @@ func (self *StateDB) AddBalance(addr []byte, amount *big.Int) {
 func (self *StateDB) GetNonce(addr []byte) uint64 {
 	stateObject := self.GetStateObject(addr)
 	if stateObject != nil {
-		return stateObject.Nonce
+		return stateObject.nonce
 	}
 
 	return 0
@@ -81,7 +81,7 @@ func (self *StateDB) GetNonce(addr []byte) uint64 {
 func (self *StateDB) GetCode(addr []byte) []byte {
 	stateObject := self.GetStateObject(addr)
 	if stateObject != nil {
-		return stateObject.Code
+		return stateObject.code
 	}
 
 	return nil
@@ -99,32 +99,28 @@ func (self *StateDB) GetState(a, b []byte) []byte {
 func (self *StateDB) SetNonce(addr []byte, nonce uint64) {
 	stateObject := self.GetStateObject(addr)
 	if stateObject != nil {
-		stateObject.Nonce = nonce
-		stateObject.dirty = true
+		stateObject.SetNonce(nonce)
 	}
 }
 
 func (self *StateDB) SetCode(addr, code []byte) {
 	stateObject := self.GetStateObject(addr)
 	if stateObject != nil {
 		stateObject.SetCode(code)
-		stateObject.dirty = true
 	}
 }
 
 func (self *StateDB) SetState(addr, key []byte, value interface{}) {
 	stateObject := self.GetStateObject(addr)
 	if stateObject != nil {
 		stateObject.SetState(key, ethutil.NewValue(value))
-		stateObject.dirty = true
 	}
 }
 
 func (self *StateDB) Delete(addr []byte) bool {
 	stateObject := self.GetStateObject(addr)
 	if stateObject != nil {
 		stateObject.MarkForDeletion()
-		stateObject.dirty = true
 
 		return true
 	}
@@ -141,7 +137,7 @@ func (self *StateDB) UpdateStateObject(stateObject *StateObject) {
 	addr := stateObject.Address()
 
 	if len(stateObject.CodeHash()) > 0 {
-		self.db.Put(stateObject.CodeHash(), stateObject.Code)
+		self.db.Put(stateObject.CodeHash(), stateObject.code)
 	}
 
 	self.trie.Update(addr, stateObject.RlpEncode())
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
@@ -46,8 +46,8 @@ func StateObjectFromAccount(db ethutil.Database, addr string, account Account) *
 	if ethutil.IsHex(account.Code) {
 		account.Code = account.Code[2:]
 	}
-	obj.Code = ethutil.Hex2Bytes(account.Code)
-	obj.Nonce = ethutil.Big(account.Nonce).Uint64()
+	obj.SetCode(ethutil.Hex2Bytes(account.Code))
+	obj.SetNonce(ethutil.Big(account.Nonce).Uint64())
 
 	return obj
 }
diff --git a/xeth/xeth.go b/xeth/xeth.go
@@ -128,15 +128,15 @@ func (self *XEth) BalanceAt(addr string) string {
 }
 
 func (self *XEth) TxCountAt(address string) int {
-	return int(self.State().SafeGet(address).Nonce)
+	return int(self.State().SafeGet(address).Nonce())
 }
 
 func (self *XEth) CodeAt(address string) string {
-	return toHex(self.State().SafeGet(address).Code)
+	return toHex(self.State().SafeGet(address).Code())
 }
 
 func (self *XEth) IsContract(address string) bool {
-	return len(self.State().SafeGet(address).Code) > 0
+	return len(self.State().SafeGet(address).Code()) > 0
 }
 
 func (self *XEth) SecretToAddress(key string) string {

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ func StateObjectFromAccount(db ethutil.Database, addr string, account Account) *`
`51`	`51`	`if ethutil.IsHex(account.Code) {`
`52`	`52`	`account.Code = account.Code[2:]`
`53`	`53`	`}`
`54`		`- obj.Code = ethutil.Hex2Bytes(account.Code)`
`55`		`- obj.Nonce = ethutil.Big(account.Nonce).Uint64()`
	`54`	`+ obj.SetCode(ethutil.Hex2Bytes(account.Code))`
	`55`	`+ obj.SetNonce(ethutil.Big(account.Nonce).Uint64())`
`56`	`56`
`57`	`57`	`return obj`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func (pool *TxPool) RemoveInvalid(query StateQuery) {`
`169`	`169`	`for _, tx := range pool.txs {`
`170`	`170`	`sender := query.GetAccount(tx.From())`
`171`	`171`	`err := pool.ValidateTransaction(tx)`
`172`		`- if err != nil \|\| sender.Nonce >= tx.Nonce() {`
	`172`	`+ if err != nil \|\| sender.Nonce() >= tx.Nonce() {`
`173`	`173`	`removedTxs = append(removedTxs, tx)`
`174`	`174`	`}`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func (self StateDB) AddBalance(addr []byte, amount big.Int) {`
`72`	`72`	`func (self *StateDB) GetNonce(addr []byte) uint64 {`
`73`	`73`	`stateObject := self.GetStateObject(addr)`
`74`	`74`	`if stateObject != nil {`
`75`		`- return stateObject.Nonce`
	`75`	`+ return stateObject.nonce`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`return 0`
`@@ -81,7 +81,7 @@ func (self *StateDB) GetNonce(addr []byte) uint64 {`
`81`	`81`	`func (self *StateDB) GetCode(addr []byte) []byte {`
`82`	`82`	`stateObject := self.GetStateObject(addr)`
`83`	`83`	`if stateObject != nil {`
`84`		`- return stateObject.Code`
	`84`	`+ return stateObject.code`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`return nil`
`@@ -99,32 +99,28 @@ func (self *StateDB) GetState(a, b []byte) []byte {`
`99`	`99`	`func (self *StateDB) SetNonce(addr []byte, nonce uint64) {`
`100`	`100`	`stateObject := self.GetStateObject(addr)`
`101`	`101`	`if stateObject != nil {`
`102`		`- stateObject.Nonce = nonce`
`103`		`- stateObject.dirty = true`
	`102`	`+ stateObject.SetNonce(nonce)`
`104`	`103`	`}`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`func (self *StateDB) SetCode(addr, code []byte) {`
`108`	`107`	`stateObject := self.GetStateObject(addr)`
`109`	`108`	`if stateObject != nil {`
`110`	`109`	`stateObject.SetCode(code)`
`111`		`- stateObject.dirty = true`
`112`	`110`	`}`
`113`	`111`	`}`
`114`	`112`
`115`	`113`	`func (self *StateDB) SetState(addr, key []byte, value interface{}) {`
`116`	`114`	`stateObject := self.GetStateObject(addr)`
`117`	`115`	`if stateObject != nil {`
`118`	`116`	`stateObject.SetState(key, ethutil.NewValue(value))`
`119`		`- stateObject.dirty = true`
`120`	`117`	`}`
`121`	`118`	`}`
`122`	`119`
`123`	`120`	`func (self *StateDB) Delete(addr []byte) bool {`
`124`	`121`	`stateObject := self.GetStateObject(addr)`
`125`	`122`	`if stateObject != nil {`
`126`	`123`	`stateObject.MarkForDeletion()`
`127`		`- stateObject.dirty = true`
`128`	`124`
`129`	`125`	`return true`
`130`	`126`	`}`
`@@ -141,7 +137,7 @@ func (self StateDB) UpdateStateObject(stateObject StateObject) {`
`141`	`137`	`addr := stateObject.Address()`
`142`	`138`
`143`	`139`	`if len(stateObject.CodeHash()) > 0 {`
`144`		`- self.db.Put(stateObject.CodeHash(), stateObject.Code)`
	`140`	`+ self.db.Put(stateObject.CodeHash(), stateObject.code)`
`145`	`141`	`}`
`146`	`142`
`147`	`143`	`self.trie.Update(addr, stateObject.RlpEncode())`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ func StateObjectFromAccount(db ethutil.Database, addr string, account Account) *`
`46`	`46`	`if ethutil.IsHex(account.Code) {`
`47`	`47`	`account.Code = account.Code[2:]`
`48`	`48`	`}`
`49`		`- obj.Code = ethutil.Hex2Bytes(account.Code)`
`50`		`- obj.Nonce = ethutil.Big(account.Nonce).Uint64()`
	`49`	`+ obj.SetCode(ethutil.Hex2Bytes(account.Code))`
	`50`	`+ obj.SetNonce(ethutil.Big(account.Nonce).Uint64())`
`51`	`51`
`52`	`52`	`return obj`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,15 +128,15 @@ func (self *XEth) BalanceAt(addr string) string {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`func (self *XEth) TxCountAt(address string) int {`
`131`		`- return int(self.State().SafeGet(address).Nonce)`
	`131`	`+ return int(self.State().SafeGet(address).Nonce())`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`func (self *XEth) CodeAt(address string) string {`
`135`		`- return toHex(self.State().SafeGet(address).Code)`
	`135`	`+ return toHex(self.State().SafeGet(address).Code())`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`func (self *XEth) IsContract(address string) bool {`
`139`		`- return len(self.State().SafeGet(address).Code) > 0`
	`139`	`+ return len(self.State().SafeGet(address).Code()) > 0`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`func (self *XEth) SecretToAddress(key string) string {`