Readline repl for linux & osx

This commit is contained in:
obscuren 2014-05-17 15:15:46 +02:00
parent 2ac292dc7a
commit 770808ce0d
7 changed files with 122 additions and 39 deletions

View File

@ -197,7 +197,7 @@ func (gui *Gui) update() {
case b := <-blockChan: case b := <-blockChan:
block := b.Resource.(*ethchain.Block) block := b.Resource.(*ethchain.Block)
if bytes.Compare(block.Coinbase, gui.addr) == 0 { if bytes.Compare(block.Coinbase, gui.addr) == 0 {
gui.setWalletValue(gui.eth.StateManager().ProcState().GetAccount(gui.addr).Amount, nil) gui.setWalletValue(gui.eth.StateManager().CurrentState().GetAccount(gui.addr).Amount, nil)
} }
case txMsg := <-txChan: case txMsg := <-txChan:

View File

@ -151,9 +151,9 @@ save these words so you can restore your account later: %s
console := NewConsole(ethereum) console := NewConsole(ethereum)
go console.Start() go console.Start()
} else if StartJsConsole { } else if StartJsConsole {
c := NewJSConsole(ethereum) repl := NewJSRepl(ethereum)
go c.Start() go repl.Start()
} }
if StartRpc { if StartRpc {

View File

@ -1,47 +1,58 @@
package main package main
import ( import (
"bufio"
"fmt" "fmt"
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethpub"
"github.com/robertkrimen/otto" "github.com/robertkrimen/otto"
"os"
) )
type JSConsole struct { type Repl interface {
Start()
}
type JSRE struct {
vm *otto.Otto vm *otto.Otto
lib *ethpub.PEthereum lib *ethpub.PEthereum
} }
func NewJSConsole(ethereum *eth.Ethereum) *JSConsole { func NewJSRE(ethereum *eth.Ethereum) *JSRE {
return &JSConsole{vm: otto.New(), lib: ethpub.NewPEthereum(ethereum)} re := &JSRE{vm: otto.New(), lib: ethpub.NewPEthereum(ethereum)}
re.Bind("eth", &JSEthereum{re.lib, re.vm})
return re
} }
func (self *JSConsole) Start() { func (self *JSRE) Bind(name string, v interface{}) {
self.initBindings() self.vm.Set(name, v)
}
func (self *JSRE) Run(code string) (otto.Value, error) {
return self.vm.Run(code)
}
type JSRepl struct {
re *JSRE
}
func NewJSRepl(ethereum *eth.Ethereum) *JSRepl {
return &JSRepl{re: NewJSRE(ethereum)}
}
func (self *JSRepl) Start() {
fmt.Println("Eth JavaScript console") fmt.Println("Eth JavaScript console")
reader := bufio.NewReader(os.Stdin) self.read()
for {
fmt.Printf("eth >>> ")
str, _, err := reader.ReadLine()
if err != nil {
fmt.Println("Error reading input", err)
} else {
self.ParseInput(string(str))
}
}
} }
func (self *JSConsole) ParseInput(code string) { func (self *JSRepl) parseInput(code string) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
fmt.Println("[native] error", r) fmt.Println("[native] error", r)
} }
}() }()
value, err := self.vm.Run(code) value, err := self.re.Run(code)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return return
@ -50,28 +61,22 @@ func (self *JSConsole) ParseInput(code string) {
fmt.Println(value) fmt.Println(value)
} }
func (self *JSConsole) initBindings() { // The JSEthereum object attempts to wrap the PEthereum object and returns
t := &JSWrapper{self.lib, self.vm} // meaningful javascript objects
type JSEthereum struct {
self.vm.Set("eth", t)
}
// The JS wrapper attempts to wrap the PEthereum object and returns
// proper javascript objects
type JSWrapper struct {
*ethpub.PEthereum *ethpub.PEthereum
vm *otto.Otto vm *otto.Otto
} }
func (self *JSWrapper) GetKey() otto.Value { func (self *JSEthereum) GetKey() otto.Value {
return self.toVal(self.PEthereum.GetKey()) return self.toVal(self.PEthereum.GetKey())
} }
func (self *JSWrapper) GetStateObject(addr string) otto.Value { func (self *JSEthereum) GetStateObject(addr string) otto.Value {
return self.toVal(self.PEthereum.GetStateObject(addr)) return self.toVal(self.PEthereum.GetStateObject(addr))
} }
func (self *JSWrapper) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value { func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
r, err := self.PEthereum.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr) r, err := self.PEthereum.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
@ -82,7 +87,7 @@ func (self *JSWrapper) Transact(key, recipient, valueStr, gasStr, gasPriceStr, d
return self.toVal(r) return self.toVal(r)
} }
func (self *JSWrapper) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) otto.Value { func (self *JSEthereum) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) otto.Value {
r, err := self.PEthereum.Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr) r, err := self.PEthereum.Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr)
if err != nil { if err != nil {
@ -95,7 +100,7 @@ func (self *JSWrapper) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyS
} }
// Wrapper function // Wrapper function
func (self *JSWrapper) toVal(v interface{}) otto.Value { func (self *JSEthereum) toVal(v interface{}) otto.Value {
result, err := self.vm.ToValue(v) result, err := self.vm.ToValue(v)
if err != nil { if err != nil {

55
ethereum/repl_darwin.go Normal file
View File

@ -0,0 +1,55 @@
package main
// #cgo LDFLAGS: -lreadline
// #include <stdio.h>
// #include <stdlib.h>
// #include <readline/readline.h>
// #include <readline/history.h>
import "C"
import "unsafe"
func readLine(prompt *string) *string {
var p *C.char
//readline allows an empty prompt(NULL)
if prompt != nil {
p = C.CString(*prompt)
}
ret := C.readline(p)
if p != nil {
C.free(unsafe.Pointer(p))
}
if ret == nil {
return nil
} //EOF
s := C.GoString(ret)
C.free(unsafe.Pointer(ret))
return &s
}
func addHistory(s string) {
p := C.CString(s)
C.add_history(p)
C.free(unsafe.Pointer(p))
}
func (self *JSRepl) read() {
prompt := "eth >>> "
L:
for {
switch result := readLine(&prompt); true {
case result == nil:
break L //exit loop
case *result != "": //ignore blank lines
addHistory(*result) //allow user to recall this line
self.parseInput(*result)
}
}
}

1
ethereum/repl_linux.go Symbolic link
View File

@ -0,0 +1 @@
repl_darwin.go

20
ethereum/repl_windows.go Normal file
View File

@ -0,0 +1,20 @@
package main
import (
"bufio"
"fmt"
"os"
)
func (self *JSRepl) read() {
reader := bufio.NewReader(os.Stdin)
for {
fmt.Printf("eth >>> ")
str, _, err := reader.ReadLine()
if err != nil {
fmt.Println("Error reading input", err)
} else {
self.parseInput(string(str))
}
}
}

View File

@ -35,9 +35,11 @@ func DoMining(ethereum *eth.Ethereum) {
// Give it some time to connect with peers // Give it some time to connect with peers
time.Sleep(3 * time.Second) time.Sleep(3 * time.Second)
/*
for ethereum.IsUpToDate() == false { for ethereum.IsUpToDate() == false {
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
} }
*/
log.Println("Miner started") log.Println("Miner started")
miner := ethminer.NewDefaultMiner(addr, ethereum) miner := ethminer.NewDefaultMiner(addr, ethereum)