merge upstream

This commit is contained in:
zelig
2014-07-01 15:03:02 +01:00
71 changed files with 13647 additions and 141 deletions

View File

@ -50,7 +50,10 @@ func MakeContract(tx *Transaction, state *State) *StateObject {
}
func NewStateObject(addr []byte) *StateObject {
return &StateObject{address: addr, Amount: new(big.Int), gasPool: new(big.Int)}
object := &StateObject{address: addr, Amount: new(big.Int), gasPool: new(big.Int)}
object.state = NewState(ethutil.NewTrie(ethutil.Config.Db, ""))
return object
}
func NewContract(address []byte, Amount *big.Int, root []byte) *StateObject {