aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethereum/flags.go6
-rw-r--r--cmd/ethereum/main.go2
-rw-r--r--cmd/ethereum/repl/repl.go1
-rw-r--r--cmd/evm/main.go1
4 files changed, 9 insertions, 1 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go
index 7d410c8e4..c42083160 100644
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@@ -135,6 +135,12 @@ func Init() {
flag.Parse()
+ // When the javascript console is started log to a file instead
+ // of stdout
+ if StartJsConsole {
+ LogFile = path.Join(Datadir, "ethereum.log")
+ }
+
var err error
if NAT, err = nat.Parse(*natstr); err != nil {
log.Fatalf("-nat: %v", err)
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 45e6f7b93..f72b11e14 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -137,6 +137,8 @@ func main() {
utils.StartEthereum(ethereum)
+ fmt.Printf("Welcome to the FRONTIER\n")
+
if StartJsConsole {
InitJsConsole(ethereum)
} else if len(InputFile) > 0 {
diff --git a/cmd/ethereum/repl/repl.go b/cmd/ethereum/repl/repl.go
index 4a7880ff4..11b812617 100644
--- a/cmd/ethereum/repl/repl.go
+++ b/cmd/ethereum/repl/repl.go
@@ -60,6 +60,7 @@ func (self *JSRepl) Start() {
if !self.running {
self.running = true
repllogger.Infoln("init JS Console")
+
reader := bufio.NewReader(self.history)
for {
line, err := reader.ReadString('\n')
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 432cbd001..d6a93460e 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -65,7 +65,6 @@ func main() {
statedb := state.New(nil, db)
sender := statedb.NewStateObject([]byte("sender"))
receiver := statedb.NewStateObject([]byte("receiver"))
- //receiver.SetCode([]byte(*code))
receiver.SetCode(ethutil.Hex2Bytes(*code))
vmenv := NewEnv(statedb, []byte("evmuser"), ethutil.Big(*value))