aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ethchain/state.go6
-rw-r--r--ethchain/state_manager.go7
-rw-r--r--ethchain/state_object.go53
-rw-r--r--ethchain/vm.go33
-rw-r--r--ethereum.go2
-rw-r--r--ethwire/messaging.go2
-rw-r--r--peer.go4
7 files changed, 83 insertions, 24 deletions
diff --git a/ethchain/state.go b/ethchain/state.go
index f5c038226..d93ab3e01 100644
--- a/ethchain/state.go
+++ b/ethchain/state.go
@@ -36,7 +36,8 @@ func (s *State) Reset() {
continue
}
- stateObject.state.Reset()
+ //stateObject.state.Reset()
+ stateObject.Reset()
}
s.Empty()
@@ -69,6 +70,8 @@ func (self *State) Update() {
if stateObject.remove {
self.DeleteStateObject(stateObject)
} else {
+ stateObject.Sync()
+
self.UpdateStateObject(stateObject)
}
}
@@ -78,7 +81,6 @@ func (self *State) Update() {
if !valid {
self.trie = t2
}
-
}
// Purges the current trie.
diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go
index f3fd92913..a5afa5096 100644
--- a/ethchain/state_manager.go
+++ b/ethchain/state_manager.go
@@ -66,6 +66,11 @@ type StateManager struct {
// Mining state. The mining state is used purely and solely by the mining
// operation.
miningState *State
+
+ // The last attempted block is mainly used for debugging purposes
+ // This does not have to be a valid block and will be set during
+ // 'Process' & canonical validation.
+ lastAttemptedBlock *Block
}
func NewStateManager(ethereum EthManager) *StateManager {
@@ -165,6 +170,8 @@ func (sm *StateManager) Process(block *Block, dontReact bool) (err error) {
return ParentError(block.PrevHash)
}
+ sm.lastAttemptedBlock = block
+
var (
parent = sm.bc.GetBlock(block.PrevHash)
state = parent.State()
diff --git a/ethchain/state_object.go b/ethchain/state_object.go
index 2c7f36e65..ebc050863 100644
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@@ -27,6 +27,8 @@ type StateObject struct {
script Code
initScript Code
+ storage map[string]*ethutil.Value
+
// Total gas pool is the total amount of gas currently
// left if this object is the coinbase. Gas is directly
// purchased of the coinbase.
@@ -38,6 +40,10 @@ type StateObject struct {
remove bool
}
+func (self *StateObject) Reset() {
+ self.storage = make(map[string]*ethutil.Value)
+}
+
// Converts an transaction in to a state object
func MakeContract(tx *Transaction, state *State) *StateObject {
// Create contract if there's no recipient
@@ -55,14 +61,19 @@ func MakeContract(tx *Transaction, state *State) *StateObject {
}
func NewStateObject(addr []byte) *StateObject {
- object := &StateObject{address: addr, Amount: new(big.Int), gasPool: new(big.Int)}
+ // This to ensure that it has 20 bytes (and not 0 bytes), thus left or right pad doesn't matter.
+ address := ethutil.LeftPadBytes(addr, 20)
+
+ object := &StateObject{address: address, Amount: new(big.Int), gasPool: new(big.Int)}
object.state = NewState(ethtrie.NewTrie(ethutil.Config.Db, ""))
+ object.storage = make(map[string]*ethutil.Value)
return object
}
func NewContract(address []byte, Amount *big.Int, root []byte) *StateObject {
- contract := &StateObject{address: address, Amount: Amount, Nonce: 0}
+ contract := NewStateObject(address)
+ contract.Amount = Amount
contract.state = NewState(ethtrie.NewTrie(ethutil.Config.Db, string(root)))
return contract
@@ -95,24 +106,43 @@ func (c *StateObject) SetAddr(addr []byte, value interface{}) {
c.state.trie.Update(string(addr), string(ethutil.NewValue(value).Encode()))
}
-func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) {
- addr := ethutil.BigToBytes(num, 256)
+func (self *StateObject) GetStorage(key *big.Int) *ethutil.Value {
+ return self.getStorage(key.Bytes())
+}
+func (self *StateObject) SetStorage(key *big.Int, value *ethutil.Value) {
+ self.setStorage(key.Bytes(), value)
+}
- if val.BigInt().Cmp(ethutil.Big0) == 0 {
- c.state.trie.Delete(string(addr))
+func (self *StateObject) getStorage(key []byte) *ethutil.Value {
+ k := ethutil.LeftPadBytes(key, 32)
- return
+ value := self.storage[string(k)]
+ if value == nil {
+ value = self.GetAddr(k)
+
+ self.storage[string(k)] = value
}
- c.SetAddr(addr, val)
+ return value
}
-func (c *StateObject) GetStorage(num *big.Int) *ethutil.Value {
- nb := ethutil.BigToBytes(num, 256)
+func (self *StateObject) setStorage(key []byte, value *ethutil.Value) {
+ k := ethutil.LeftPadBytes(key, 32)
- return c.GetAddr(nb)
+ self.storage[string(k)] = value
}
+func (self *StateObject) Sync() {
+ for key, value := range self.storage {
+ if value.BigInt().Cmp(ethutil.Big0) == 0 {
+ self.state.trie.Delete(string(key))
+ continue
+ }
+
+ self.SetAddr([]byte(key), value)
+
+ }
+}
func (c *StateObject) GetInstr(pc *big.Int) *ethutil.Value {
if int64(len(c.script)-1) < pc.Int64() {
return ethutil.NewValue(0)
@@ -249,6 +279,7 @@ func (c *StateObject) RlpDecode(data []byte) {
c.Nonce = decoder.Get(0).Uint()
c.Amount = decoder.Get(1).BigInt()
c.state = NewState(ethtrie.NewTrie(ethutil.Config.Db, decoder.Get(2).Interface()))
+ c.storage = make(map[string]*ethutil.Value)
c.ScriptHash = decoder.Get(3).Bytes()
diff --git a/ethchain/vm.go b/ethchain/vm.go
index 71605b069..56456fdab 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -22,6 +22,9 @@ var (
GasMemory = big.NewInt(1)
GasData = big.NewInt(5)
GasTx = big.NewInt(500)
+
+ LogTyPretty byte = 0x1
+ LogTyDiff byte = 0x2
)
type Debugger interface {
@@ -44,6 +47,7 @@ type Vm struct {
Verbose bool
+ logTy byte
logStr string
err error
@@ -69,7 +73,7 @@ type RuntimeVars struct {
}
func (self *Vm) Printf(format string, v ...interface{}) *Vm {
- if self.Verbose {
+ if self.Verbose && self.logTy == LogTyPretty {
self.logStr += fmt.Sprintf(format, v...)
}
@@ -77,7 +81,7 @@ func (self *Vm) Printf(format string, v ...interface{}) *Vm {
}
func (self *Vm) Endl() *Vm {
- if self.Verbose {
+ if self.Verbose && self.logTy == LogTyPretty {
vmlogger.Debugln(self.logStr)
self.logStr = ""
}
@@ -86,7 +90,7 @@ func (self *Vm) Endl() *Vm {
}
func NewVm(state *State, stateManager *StateManager, vars RuntimeVars) *Vm {
- return &Vm{vars: vars, state: state, stateManager: stateManager}
+ return &Vm{vars: vars, state: state, stateManager: stateManager, logTy: LogTyPretty}
}
var Pow256 = ethutil.BigPow(2, 256)
@@ -132,6 +136,17 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
// Get the opcode (it must be an opcode!)
op = OpCode(val.Uint())
+ // XXX Leave this Println intact. Don't change this to the log system.
+ // Used for creating diffs between implementations
+ if vm.logTy == LogTyDiff {
+ b := pc.Bytes()
+ if len(b) == 0 {
+ b = []byte{0}
+ }
+
+ fmt.Printf("%x %x %x %x\n", closure.object.Address(), b, []byte{byte(op)}, closure.Gas.Bytes())
+ }
+
gas := new(big.Int)
addStepGasUsage := func(amount *big.Int) {
if amount.Cmp(ethutil.Big0) >= 0 {
@@ -167,7 +182,9 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
require(2)
newMemSize = stack.Peek().Uint64() + 32
case MLOAD:
+ require(1)
+ newMemSize = stack.Peek().Uint64() + 32
case MSTORE8:
require(2)
newMemSize = stack.Peek().Uint64() + 1
@@ -415,7 +432,10 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
require(2)
val, th := stack.Popn()
if th.Cmp(big.NewInt(32)) < 0 {
- stack.Push(big.NewInt(int64(len(val.Bytes())-1) - th.Int64()))
+ byt := big.NewInt(int64(val.Bytes()[th.Int64()]))
+ stack.Push(byt)
+
+ vm.Printf(" => 0x%x", byt.Bytes())
} else {
stack.Push(ethutil.BigFalse)
}
@@ -562,8 +582,9 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
case MSTORE8:
require(2)
val, mStart := stack.Popn()
- base.And(val, new(big.Int).SetInt64(0xff))
- mem.Set(mStart.Int64(), 32, ethutil.BigToBytes(base, 256))
+ //base.And(val, new(big.Int).SetInt64(0xff))
+ //mem.Set(mStart.Int64(), 32, ethutil.BigToBytes(base, 256))
+ mem.store[mStart.Int64()] = byte(val.Int64() & 0xff)
vm.Printf(" => 0x%x", val)
case SLOAD:
diff --git a/ethereum.go b/ethereum.go
index a032ef515..35d98e831 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -430,8 +430,6 @@ func (s *Ethereum) Seed() {
s.ConnectToPeer(string(body))
}
-
- s.ConnectToPeer("54.72.69.180:30303")
}
func (s *Ethereum) peerHandler(listener net.Listener) {
diff --git a/ethwire/messaging.go b/ethwire/messaging.go
index a2e0651dc..f13b72353 100644
--- a/ethwire/messaging.go
+++ b/ethwire/messaging.go
@@ -279,7 +279,7 @@ func ReadMessages(conn net.Conn) (msgs []*Msg, err error) {
var totalBytes int
for {
// Give buffering some time
- conn.SetReadDeadline(time.Now().Add(200 * time.Millisecond))
+ conn.SetReadDeadline(time.Now().Add(500 * time.Millisecond))
// Create a new temporarily buffer
b := make([]byte, 1440)
// Wait for a message from this peer
diff --git a/peer.go b/peer.go
index cc2863a33..13b81d1a8 100644
--- a/peer.go
+++ b/peer.go
@@ -252,7 +252,7 @@ func (p *Peer) writeMessage(msg *ethwire.Msg) {
}
}
- peerlogger.DebugDetailln("<=", msg.Type, msg.Data)
+ peerlogger.DebugDetailf("(%v) <= %v %v\n", p.conn.RemoteAddr(), msg.Type, msg.Data)
err := ethwire.WriteMessage(p.conn, msg)
if err != nil {
@@ -326,7 +326,7 @@ func (p *Peer) HandleInbound() {
peerlogger.Debugln(err)
}
for _, msg := range msgs {
- peerlogger.DebugDetailln("=>", msg.Type, msg.Data)
+ peerlogger.DebugDetailf("(%v) => %v %v\n", p.conn.RemoteAddr(), msg.Type, msg.Data)
switch msg.Type {
case ethwire.MsgHandshakeTy:
generated by cgit (git 2.34.1) at 2024-11-13 00:44:03 +0800