Updated VM & added helper methods to state

* VM BALANCE opcode updated to pop 1 item and use that to retrieve the
  address' balance
* GetBalance and GetNonce on state that'll always return something valid

ethchain/state.go

@@ -26,6 +26,131 @@ func NewState(trie *ethtrie.Trie) *State {
 	return &State{trie: trie, stateObjects: make(map[string]*StateObject), manifest: NewManifest()}
 }
 
+// Iterate over each storage address and yield callback
+func (s *State) EachStorage(cb ethtrie.EachCallback) {
+	it := s.trie.NewIterator()
+	it.Each(cb)
+}
+
+// Retrieve the balance from the given address or 0 if object not found
+func (self *State) GetBalance(addr []byte) *big.Int {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		return stateObject.Amount
+	}
+
+	return ethutil.Big0
+}
+
+func (self *State) GetNonce(addr []byte) uint64 {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		return stateObject.Nonce
+	}
+
+	return 0
+}
+
+//
+// Setting, updating & deleting state object methods
+//
+
+// Update the given state object and apply it to state trie
+func (self *State) UpdateStateObject(stateObject *StateObject) {
+	addr := stateObject.Address()
+
+	ethutil.Config.Db.Put(ethcrypto.Sha3Bin(stateObject.Script()), stateObject.Script())
+
+	self.trie.Update(string(addr), string(stateObject.RlpEncode()))
+
+	self.manifest.AddObjectChange(stateObject)
+}
+
+// Delete the given state object and delete it from the state trie
+func (self *State) DeleteStateObject(stateObject *StateObject) {
+	self.trie.Delete(string(stateObject.Address()))
+
+	delete(self.stateObjects, string(stateObject.Address()))
+}
+
+// Retrieve a state object given my the address. Nil if not found
+func (self *State) GetStateObject(addr []byte) *StateObject {
+	stateObject := self.stateObjects[string(addr)]
+	if stateObject != nil {
+		return stateObject
+	}
+
+	data := self.trie.Get(string(addr))
+	if len(data) == 0 {
+		return nil
+	}
+
+	stateObject = NewStateObjectFromBytes(addr, []byte(data))
+	self.stateObjects[string(addr)] = stateObject
+
+	return stateObject
+}
+
+// Retrieve a state object or create a new state object if nil
+func (self *State) GetOrNewStateObject(addr []byte) *StateObject {
+	stateObject := self.GetStateObject(addr)
+	if stateObject == nil {
+		stateObject = self.NewStateObject(addr)
+	}
+
+	return stateObject
+}
+
+// Create a state object whether it exist in the trie or not
+func (self *State) NewStateObject(addr []byte) *StateObject {
+	statelogger.Infof("(+) %x\n", addr)
+
+	stateObject := NewStateObject(addr)
+	self.stateObjects[string(addr)] = stateObject
+
+	return stateObject
+}
+
+// Deprecated
+func (self *State) GetAccount(addr []byte) *StateObject {
+	return self.GetOrNewStateObject(addr)
+}
+
+//
+// Setting, copying of the state methods
+//
+
+func (s *State) Cmp(other *State) bool {
+	return s.trie.Cmp(other.trie)
+}
+
+func (self *State) Copy() *State {
+	if self.trie != nil {
+		state := NewState(self.trie.Copy())
+		for k, stateObject := range self.stateObjects {
+			state.stateObjects[k] = stateObject.Copy()
+		}
+
+		return state
+	}
+
+	return nil
+}
+
+func (self *State) Set(state *State) {
+	if state == nil {
+		panic("Tried setting 'state' to nil through 'Set'")
+	}
+
+	self.trie = state.trie
+	self.stateObjects = state.stateObjects
+	//*self = *state
+}
+
+func (s *State) Root() interface{} {
+	return s.trie.Root
+}
+
 // Resets the trie and all siblings
 func (s *State) Reset() {
 	s.trie.Undo()
@@ -83,112 +208,6 @@ func (self *State) Update() {
 	}
 }
 
-// Purges the current trie.
-func (s *State) Purge() int {
-	return s.trie.NewIterator().Purge()
-}
-
-func (s *State) EachStorage(cb ethtrie.EachCallback) {
-	it := s.trie.NewIterator()
-	it.Each(cb)
-}
-
-func (self *State) ResetStateObject(stateObject *StateObject) {
-	delete(self.stateObjects, string(stateObject.Address()))
-
-	stateObject.state.Reset()
-}
-
-func (self *State) UpdateStateObject(stateObject *StateObject) {
-	addr := stateObject.Address()
-
-	ethutil.Config.Db.Put(ethcrypto.Sha3Bin(stateObject.Script()), stateObject.Script())
-
-	self.trie.Update(string(addr), string(stateObject.RlpEncode()))
-
-	self.manifest.AddObjectChange(stateObject)
-}
-
-func (self *State) DeleteStateObject(stateObject *StateObject) {
-	self.trie.Delete(string(stateObject.Address()))
-
-	delete(self.stateObjects, string(stateObject.Address()))
-}
-
-func (self *State) GetStateObject(addr []byte) *StateObject {
-	stateObject := self.stateObjects[string(addr)]
-	if stateObject != nil {
-		return stateObject
-	}
-
-	data := self.trie.Get(string(addr))
-	if len(data) == 0 {
-		return nil
-	}
-
-	stateObject = NewStateObjectFromBytes(addr, []byte(data))
-	self.stateObjects[string(addr)] = stateObject
-
-	return stateObject
-}
-
-func (self *State) GetOrNewStateObject(addr []byte) *StateObject {
-	stateObject := self.GetStateObject(addr)
-	if stateObject == nil {
-		stateObject = self.NewStateObject(addr)
-	}
-
-	return stateObject
-}
-
-func (self *State) NewStateObject(addr []byte) *StateObject {
-	statelogger.Infof("(+) %x\n", addr)
-
-	stateObject := NewStateObject(addr)
-	self.stateObjects[string(addr)] = stateObject
-
-	return stateObject
-}
-
-func (self *State) GetAccount(addr []byte) *StateObject {
-	return self.GetOrNewStateObject(addr)
-}
-
-func (s *State) Cmp(other *State) bool {
-	return s.trie.Cmp(other.trie)
-}
-
-func (self *State) Copy() *State {
-	if self.trie != nil {
-		state := NewState(self.trie.Copy())
-		for k, stateObject := range self.stateObjects {
-			state.stateObjects[k] = stateObject.Copy()
-		}
-
-		return state
-	}
-
-	return nil
-}
-
-func (self *State) Set(state *State) {
-	if state == nil {
-		panic("Tried setting 'state' to nil through 'Set'")
-	}
-
-	self.trie = state.trie
-	self.stateObjects = state.stateObjects
-	//*self = *state
-}
-
-func (s *State) Put(key, object []byte) {
-	s.trie.Update(string(key), string(object))
-}
-
-func (s *State) Root() interface{} {
-	return s.trie.Root
-}
-
 // Object manifest
 //
 // The object manifest is used to keep changes to the state so we can keep track of the changes

ethchain/vm.go

@@ -452,13 +452,26 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
 			data := ethcrypto.Sha3Bin(mem.Get(offset.Int64(), size.Int64()))
 
 			stack.Push(ethutil.BigD(data))
+
+			vm.Printf(" => %x", data)
 			// 0x30 range
 		case ADDRESS:
 			stack.Push(ethutil.BigD(closure.Object().Address()))
+
+			vm.Printf(" => %x", closure.Object().Address())
 		case BALANCE:
-			stack.Push(closure.object.Amount)
+			require(1)
+
+			addr := stack.Pop().Bytes()
+			balance := vm.state.GetBalance(addr)
+
+			stack.Push(balance)
+
+			vm.Printf(" => %v (%x)", balance, addr)
 		case ORIGIN:
 			stack.Push(ethutil.BigD(vm.vars.Origin))
+
+			vm.Printf(" => %v", vm.vars.Origin)
 		case CALLER:
 			caller := closure.caller.Address()
 			stack.Push(ethutil.BigD(caller))
@@ -712,7 +725,7 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
 
 				stack.Push(ethutil.BigFalse)
 			} else {
-				//snapshot := vm.state.Copy()
+				snapshot := vm.state.Copy()
 
 				stateObject := vm.state.GetOrNewStateObject(addr.Bytes())
 
@@ -728,8 +741,7 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
 
 					vmlogger.Debugf("Closure execution failed. %v\n", err)
 
-					//vm.state.Set(snapshot)
+					vm.state.Set(snapshot)
-					vm.state.ResetStateObject(stateObject)
 				} else {
 					stack.Push(ethutil.BigTrue)