tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed copy/set

Browse Source
This commit is contained in:
obscuren 2014-06-20 00:41:42 +02:00
parent 0b8ba1d55b
commit 6fcc6a2f7c
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ethchain/state_object.go
View File

@ -48,7 +48,7 @@ func MakeContract(tx *Transaction, state *State) *StateObject {
} }
func NewStateObject(addr []byte) *StateObject { func NewStateObject(addr []byte) *StateObject {
return &StateObject{address: addr, Amount: new(big.Int)} return &StateObject{address: addr, Amount: new(big.Int), gasPool: new(big.Int)}
} }
func NewContract(address []byte, Amount *big.Int, root []byte) *StateObject { func NewContract(address []byte, Amount *big.Int, root []byte) *StateObject {
@ -176,6 +176,26 @@ func (self *StateObject) RefundGas(gas, price *big.Int) {
self.Amount.Sub(self.Amount, rGas) self.Amount.Sub(self.Amount, rGas)
} }
func (self *StateObject) Copy() *StateObject {
stateObject := NewStateObject(self.Address())
stateObject.Amount.Set(self.Amount)
stateObject.ScriptHash = ethutil.CopyBytes(self.ScriptHash)
stateObject.Nonce = self.Nonce
if self.state != nil {
stateObject.state = self.state.Copy()
}
stateObject.script = ethutil.CopyBytes(self.script)
stateObject.initScript = ethutil.CopyBytes(self.initScript)
//stateObject.gasPool.Set(self.gasPool)
return self
}
func (self *StateObject) Set(stateObject *StateObject) {
self = stateObject
}
/*
func (self *StateObject) Copy() *StateObject { func (self *StateObject) Copy() *StateObject {
stCopy := &StateObject{} stCopy := &StateObject{}
stCopy.address = make([]byte, len(self.address)) stCopy.address = make([]byte, len(self.address))
@ -194,6 +214,7 @@ func (self *StateObject) Copy() *StateObject {
return stCopy return stCopy
} }
*/
// Returns the address of the contract/account // Returns the address of the contract/account
func (c *StateObject) Address() []byte { func (c *StateObject) Address() []byte {