aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/console/main.go3
-rw-r--r--cmd/geth/main.go4
-rw-r--r--cmd/utils/flags.go21
-rw-r--r--common/path.go3
-rw-r--r--core/block_processor.go4
-rw-r--r--core/vm/environment.go1
-rw-r--r--core/vm/errors.go12
-rw-r--r--core/vm/logger.go13
-rw-r--r--core/vm/vm.go69
9 files changed, 73 insertions, 57 deletions
diff --git a/cmd/console/main.go b/cmd/console/main.go
index 9020a12fe..e8dd412ba 100644
--- a/cmd/console/main.go
+++ b/cmd/console/main.go
@@ -52,7 +52,6 @@ func init() {
app.Action = run
app.Flags = []cli.Flag{
- utils.IPCDisabledFlag,
utils.IPCPathFlag,
utils.VerbosityFlag,
utils.JSpathFlag,
@@ -93,7 +92,7 @@ func main() {
func run(ctx *cli.Context) {
jspath := ctx.GlobalString(utils.JSpathFlag.Name)
- ipcpath := ctx.GlobalString(utils.IPCPathFlag.Name)
+ ipcpath := utils.IpcSocketPath(ctx)
repl := newJSRE(jspath, ipcpath)
repl.welcome(ipcpath)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8e55b310c..0f2438cfd 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -308,7 +308,7 @@ func console(ctx *cli.Context) {
ethereum,
ctx.String(utils.JSpathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
- ctx.GlobalString(utils.IPCPathFlag.Name),
+ utils.IpcSocketPath(ctx),
true,
nil,
)
@@ -330,7 +330,7 @@ func execJSFiles(ctx *cli.Context) {
ethereum,
ctx.String(utils.JSpathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
- ctx.GlobalString(utils.IPCPathFlag.Name),
+ utils.IpcSocketPath(ctx),
false,
nil,
)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 4c3690d49..ec29598fb 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -385,9 +385,28 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
return accounts.NewManager(ks)
}
+func IpcSocketPath(ctx *cli.Context) (ipcpath string) {
+ if common.IsWindows() {
+ ipcpath = common.DefaultIpcPath()
+ if ipcpath != ctx.GlobalString(IPCPathFlag.Name) {
+ ipcpath = ctx.GlobalString(IPCPathFlag.Name)
+ }
+ } else {
+ ipcpath = common.DefaultIpcPath()
+ if ctx.GlobalString(IPCPathFlag.Name) != common.DefaultIpcPath() {
+ ipcpath = ctx.GlobalString(IPCPathFlag.Name)
+ } else if ctx.GlobalString(DataDirFlag.Name) != "" &&
+ ctx.GlobalString(DataDirFlag.Name) != common.DefaultDataDir() {
+ ipcpath = filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc")
+ }
+ }
+
+ return
+}
+
func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error {
config := comms.IpcConfig{
- Endpoint: ctx.GlobalString(IPCPathFlag.Name),
+ Endpoint: IpcSocketPath(ctx),
}
xeth := xeth.New(eth, nil)
diff --git a/common/path.go b/common/path.go
index 63a23abcd..6e3259656 100644
--- a/common/path.go
+++ b/common/path.go
@@ -95,6 +95,9 @@ func DefaultDataDir() string {
}
func DefaultIpcPath() string {
+ if runtime.GOOS == "windows" {
+ return `\\.\pipe\geth.ipc`
+ }
return filepath.Join(DefaultDataDir(), "geth.ipc")
}
diff --git a/core/block_processor.go b/core/block_processor.go
index 3ec3c585f..54378b2b9 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -71,14 +71,10 @@ func (sm *BlockProcessor) TransitionState(statedb *state.StateDB, parent, block
func (self *BlockProcessor) ApplyTransaction(coinbase *state.StateObject, statedb *state.StateDB, block *types.Block, tx *types.Transaction, usedGas *big.Int, transientProcess bool) (*types.Receipt, *big.Int, error) {
// If we are mining this block and validating we want to set the logs back to 0
- //statedb.EmptyLogs()
cb := statedb.GetStateObject(coinbase.Address())
_, gas, err := ApplyMessage(NewEnv(statedb, self.bc, tx, block), tx, cb)
if err != nil && (IsNonceErr(err) || state.IsGasLimitErr(err) || IsInvalidTxErr(err)) {
- // If the account is managed, remove the invalid nonce.
- //from, _ := tx.From()
- //self.bc.TxState().RemoveNonce(from, tx.Nonce())
return nil, nil, err
}
diff --git a/core/vm/environment.go b/core/vm/environment.go
index 5c04e7022..c103049a2 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -45,6 +45,7 @@ type StructLog struct {
Memory []byte
Stack []*big.Int
Storage map[common.Hash][]byte
+ Err error
}
type Account interface {
diff --git a/core/vm/errors.go b/core/vm/errors.go
index fc3459de0..799eb6797 100644
--- a/core/vm/errors.go
+++ b/core/vm/errors.go
@@ -2,20 +2,14 @@ package vm
import (
"fmt"
+
"github.com/ethereum/go-ethereum/params"
- "math/big"
)
-type OutOfGasError struct {
- req, has *big.Int
-}
-
-func OOG(req, has *big.Int) OutOfGasError {
- return OutOfGasError{req, has}
-}
+type OutOfGasError struct{}
func (self OutOfGasError) Error() string {
- return fmt.Sprintf("out of gas! require %v, have %v", self.req, self.has)
+ return "Out Of Gas"
}
func IsOOGErr(err error) bool {
diff --git a/core/vm/logger.go b/core/vm/logger.go
index 96d07dab5..0e2a417ae 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -3,15 +3,20 @@ package vm
import (
"fmt"
"os"
- "unicode/utf8"
+ "unicode"
"github.com/ethereum/go-ethereum/common"
)
func StdErrFormat(logs []StructLog) {
- fmt.Fprintf(os.Stderr, "VM Stats %d ops\n", len(logs))
+ fmt.Fprintf(os.Stderr, "VM STAT %d OPs\n", len(logs))
for _, log := range logs {
- fmt.Fprintf(os.Stderr, "PC %08d: %s GAS: %v COST: %v\n", log.Pc, log.Op, log.Gas, log.GasCost)
+ fmt.Fprintf(os.Stderr, "PC %08d: %s GAS: %v COST: %v", log.Pc, log.Op, log.Gas, log.GasCost)
+ if log.Err != nil {
+ fmt.Fprintf(os.Stderr, " ERROR: %v", log.Err)
+ }
+ fmt.Fprintf(os.Stderr, "\n")
+
fmt.Fprintln(os.Stderr, "STACK =", len(log.Stack))
for i := len(log.Stack) - 1; i >= 0; i-- {
@@ -27,7 +32,7 @@ func StdErrFormat(logs []StructLog) {
for _, r := range data {
if r == 0 {
str += "."
- } else if utf8.ValidRune(rune(r)) {
+ } else if unicode.IsPrint(rune(r)) {
str += fmt.Sprintf("%s", string(r))
} else {
str += "?"
diff --git a/core/vm/vm.go b/core/vm/vm.go
index 4c0ab0f47..c5ad761f6 100644
--- a/core/vm/vm.go
+++ b/core/vm/vm.go
@@ -43,6 +43,31 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
code = context.Code
value = context.value
price = context.Price
+
+ op OpCode // current opcode
+ codehash = crypto.Sha3Hash(code) // codehash is used when doing jump dest caching
+ mem = NewMemory() // bound memory
+ stack = newstack() // local stack
+ statedb = self.env.State() // current state
+ // For optimisation reason we're using uint64 as the program counter.
+ // It's theoretically possible to go above 2^64. The YP defines the PC to be uint256. Pratically much less so feasible.
+ pc = uint64(0) // program counter
+
+ // jump evaluates and checks whether the given jump destination is a valid one
+ // if valid move the `pc` otherwise return an error.
+ jump = func(from uint64, to *big.Int) error {
+ if !context.jumpdests.has(codehash, code, to) {
+ nop := context.GetOp(to.Uint64())
+ return fmt.Errorf("invalid jump destination (%v) %v", nop, to)
+ }
+
+ pc = to.Uint64()
+
+ return nil
+ }
+
+ newMemSize *big.Int
+ cost *big.Int
)
// User defer pattern to check for an error and, based on the error being nil or not, use all gas and return.
@@ -52,6 +77,7 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
}
if err != nil {
+ self.log(pc, op, context.Gas, cost, mem, stack, context, err)
// In case of a VM exception (known exceptions) all gas consumed (panics NOT included).
context.UseGas(context.Gas)
@@ -71,30 +97,6 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
return context.Return(nil), nil
}
- var (
- op OpCode // current opcode
- codehash = crypto.Sha3Hash(code) // codehash is used when doing jump dest caching
- mem = NewMemory() // bound memory
- stack = newstack() // local stack
- statedb = self.env.State() // current state
- // For optimisation reason we're using uint64 as the program counter.
- // It's theoretically possible to go above 2^64. The YP defines the PC to be uint256. Pratically much less so feasible.
- pc = uint64(0) // program counter
-
- // jump evaluates and checks whether the given jump destination is a valid one
- // if valid move the `pc` otherwise return an error.
- jump = func(from uint64, to *big.Int) error {
- if !context.jumpdests.has(codehash, code, to) {
- nop := context.GetOp(to.Uint64())
- return fmt.Errorf("invalid jump destination (%v) %v", nop, to)
- }
-
- pc = to.Uint64()
-
- return nil
- }
- )
-
for {
// The base for all big integer arithmetic
base := new(big.Int)
@@ -103,24 +105,23 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
op = context.GetOp(pc)
// calculate the new memory size and gas price for the current executing opcode
- newMemSize, gas, err := self.calculateGasAndSize(context, caller, op, statedb, mem, stack)
+ newMemSize, cost, err = self.calculateGasAndSize(context, caller, op, statedb, mem, stack)
if err != nil {
return nil, err
}
- self.log(pc, op, context.Gas, gas, mem, stack, context)
-
// Use the calculated gas. When insufficient gas is present, use all gas and return an
// Out Of Gas error
- if !context.UseGas(gas) {
- tmp := new(big.Int).Set(context.Gas)
+ if !context.UseGas(cost) {
context.UseGas(context.Gas)
- return context.Return(nil), OOG(gas, tmp)
+ return context.Return(nil), OutOfGasError{}
}
// Resize the memory calculated previously
mem.Resize(newMemSize.Uint64())
+ // Add a log message
+ self.log(pc, op, context.Gas, cost, mem, stack, context, nil)
switch op {
case ADD:
@@ -783,15 +784,13 @@ func (self *Vm) RunPrecompiled(p *PrecompiledAccount, input []byte, context *Con
return context.Return(ret), nil
} else {
- tmp := new(big.Int).Set(context.Gas)
-
- return nil, OOG(gas, tmp)
+ return nil, OutOfGasError{}
}
}
// log emits a log event to the environment for each opcode encountered. This is not to be confused with the
// LOG* opcode.
-func (self *Vm) log(pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *stack, context *Context) {
+func (self *Vm) log(pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *stack, context *Context, err error) {
if Debug {
mem := make([]byte, len(memory.Data()))
copy(mem, memory.Data())
@@ -804,7 +803,7 @@ func (self *Vm) log(pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, st
storage[common.BytesToHash(k)] = v
})
- self.env.AddStructLog(StructLog{pc, op, new(big.Int).Set(gas), cost, mem, stck, storage})
+ self.env.AddStructLog(StructLog{pc, op, new(big.Int).Set(gas), cost, mem, stck, storage, err})
}
}
generated by cgit (git 2.34.1) at 2024-11-12 16:55:20 +0800