cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/eth-go into feature/ethutil-refactor

Browse Source
This commit is contained in:
zelig 2014-07-04 19:40:23 +01:00
commit 44d0d6abd2
5 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ethchain/state_manager.go
View File

@ -182,11 +182,24 @@ func (sm *StateManager) Process(block *Block, dontReact bool) (err error) {
if err != nil {
if len(receipts) == len(block.Receipts()) {
for i, receipt := range block.Receipts() {
statelogger.Debugf("diff (r) %v ~ %x <=> (c) %v ~ %x (%x)\n", receipt.CumulativeGasUsed, receipt.PostState[0:4], receipts[i].CumulativeGasUsed, receipts[i].PostState[0:4], receipt.Tx.Hash())
statelogger.Infof("diff (r) %v ~ %x <=> (c) %v ~ %x (%x)\n", receipt.CumulativeGasUsed, receipt.PostState[0:4], receipts[i].CumulativeGasUsed, receipts[i].PostState[0:4], receipt.Tx.Hash())
}
} else {
statelogger.Warnln("Unable to print receipt diff. Length didn't match", len(receipts), "for", len(block.Receipts()))
}
} else {
/*
for i, receipt := range receipts {
gu := new(big.Int)
if i != 0 {
gu.Sub(receipt.CumulativeGasUsed, receipts[i-1].CumulativeGasUsed)
} else {
gu.Set(receipt.CumulativeGasUsed)
}
statelogger.Infof("[r] %v ~ %x (%x)\n", gu, receipt.PostState[0:4], receipt.Tx.Hash())
}
*/
}
}()

11
ethchain/state_transition.go
View File

@ -201,8 +201,7 @@ func (self *StateTransition) TransitionState() (err error) {
// script section for the state object.
self.data = nil
statelogger.Debugln("~> init")
code, err := self.Eval(receiver.Init(), receiver)
code, err := self.Eval(receiver.Init(), receiver, "init")
if err != nil {
//self.state.Set(snapshot)
self.state.ResetStateObject(receiver)
@ -213,8 +212,7 @@ func (self *StateTransition) TransitionState() (err error) {
receiver.script = code
} else {
if len(receiver.Script()) > 0 {
statelogger.Debugln("~> code")
_, err = self.Eval(receiver.Script(), receiver)
_, err = self.Eval(receiver.Script(), receiver, "code")
if err != nil {
//self.state.Set(snapshot)
self.state.ResetStateObject(receiver)
@ -240,7 +238,7 @@ func (self *StateTransition) transferValue(sender, receiver *StateObject) error
return nil
}
func (self *StateTransition) Eval(script []byte, context *StateObject) (ret []byte, err error) {
func (self *StateTransition) Eval(script []byte, context *StateObject, typ string) (ret []byte, err error) {
var (
block = self.block
initiator = self.Sender()
@ -259,6 +257,7 @@ func (self *StateTransition) Eval(script []byte, context *StateObject) (ret []by
Value: self.value,
})
vm.Verbose = true
vm.Fn = typ
ret, err = Call(vm, closure, self.data)
@ -279,7 +278,7 @@ func Call(vm *Vm, closure *Closure, data []byte) (ret []byte, err error) {
// TODO FIXME ASAP
context.state.trie = t2
statelogger.Debugln("Warn: PARANOIA: Different state object roots during copy")
statelogger.Infoln("Warn: PARANOIA: Different state object roots during copy")
}
}

7
ethchain/vm.go
View File

@ -56,6 +56,7 @@ type Vm struct {
Hook DebugHook
BreakPoints []int64
Stepping bool
Fn string
}
type DebugHook func(step int, op OpCode, mem *Memory, stack *Stack, stateObject *StateObject) bool
@ -107,7 +108,7 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
}
}()
vmlogger.Debugf("(~) %x gas: %v (d) %x\n", closure.object.Address(), closure.Gas, closure.Args)
vmlogger.Debugf("(%s) %x gas: %v (d) %x\n", vm.Fn, closure.object.Address(), closure.Gas, closure.Args)
var (
op OpCode
@ -577,7 +578,7 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
stack.Push(val.BigInt())
vm.Printf(" {0x%x} 0x%x", loc.Bytes(), val.Bytes())
vm.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
case SSTORE:
require(2)
val, loc := stack.Popn()
@ -586,7 +587,7 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
// Add the change to manifest
vm.state.manifest.AddStorageChange(closure.Object(), loc.Bytes(), val)
vm.Printf(" {0x%x} 0x%x", loc, val)
vm.Printf(" {0x%x : 0x%x}", loc, val)
case JUMP:
require(1)
pc = stack.Pop()

2
ethpub/pub.go
View File

@ -217,7 +217,7 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, sc
if ethutil.IsHex(scriptStr) {
script = ethutil.Hex2Bytes(scriptStr[2:])
} else {
script, err = ethutil.Compile(scriptStr)
script, err = ethutil.Compile(scriptStr, false)
if err != nil {
return nil, err
}

5
ethutil/script.go
View File

@ -9,11 +9,11 @@ import (
)
// General compile function
func Compile(script string) (ret []byte, err error) {
func Compile(script string, silent bool) (ret []byte, err error) {
if len(script) > 2 {
line := strings.Split(script, "\n")[0]
if line[0:2] == "#!" {
if len(line) > 1 && line[0:2] == "#!" {
switch line {
case "#!serpent":
byteCode, err := serpent.Compile(script)
@ -26,6 +26,7 @@ func Compile(script string) (ret []byte, err error) {
} else {
compiler := mutan.NewCompiler(backend.NewEthereumBackend())
compiler.Silent = silent
byteCode, errors := compiler.Compile(strings.NewReader(script))
if len(errors) > 0 {
var errs string