diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-10 04:24:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-10 04:24:05 +0800 |
| commit | 006ac772e6c81271a84ff56e00527b2adbc0129c (patch) | |
| tree | 4057b75df6d269764d4e666561ea8b655836a372 /ethchain | |
| parent | fb6ff61730ed92ada68c9c5a5b3a6f9976a78161 (diff) | |
| parent | a51dfe89c05cc12b4a8483f683ff9f49b3a8f1bd (diff) | |
| download | go-tangerine-006ac772e6c81271a84ff56e00527b2adbc0129c.tar go-tangerine-006ac772e6c81271a84ff56e00527b2adbc0129c.tar.gz go-tangerine-006ac772e6c81271a84ff56e00527b2adbc0129c.tar.bz2 go-tangerine-006ac772e6c81271a84ff56e00527b2adbc0129c.tar.lz go-tangerine-006ac772e6c81271a84ff56e00527b2adbc0129c.tar.xz go-tangerine-006ac772e6c81271a84ff56e00527b2adbc0129c.tar.zst go-tangerine-006ac772e6c81271a84ff56e00527b2adbc0129c.zip | |
Merge branch 'release/poc5-rc12'
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/state_manager.go | 3 | ||||
| -rw-r--r-- | ethchain/vm.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go index 8479e9f44..f1c09b819 100644 --- a/ethchain/state_manager.go +++ b/ethchain/state_manager.go @@ -22,6 +22,7 @@ type Peer interface { Host() []byte Port() uint16 Version() string + PingTime() string Connected() *int32 } @@ -177,7 +178,7 @@ func (sm *StateManager) ApplyTransaction(state *State, block *Block, tx *Transac err = fmt.Errorf("[STATE] Unable to create contract") } } else { - err = fmt.Errorf("[STATE] contract creation tx: %v", err) + err = fmt.Errorf("[STATE] contract creation tx: %v for sender %x", err, tx.Sender()) } } else { // Find the state object at the "recipient" address. If diff --git a/ethchain/vm.go b/ethchain/vm.go index 9720d8be1..955be847f 100644 --- a/ethchain/vm.go +++ b/ethchain/vm.go @@ -309,7 +309,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro case SHA3: require(2) size, offset := stack.Popn() - data := mem.Get(offset.Int64(), size.Int64()) + data := ethutil.Sha3Bin(mem.Get(offset.Int64(), size.Int64())) stack.Push(ethutil.BigD(data)) // 0x30 range |