aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-06-23 19:20:59 +0800
committerzelig <viktor.tron@gmail.com>2014-06-23 19:25:55 +0800
commit1024766514eea7bb628ec6e5ed974e997b8faefc (patch)
tree01b5846bd852822538e5010fe0c6116c6de900ea /ethereal
parent456167aca0b795c625d6718ef8a06fe5fcb00c2e (diff)
downloaddexon-1024766514eea7bb628ec6e5ed974e997b8faefc.tar
dexon-1024766514eea7bb628ec6e5ed974e997b8faefc.tar.gz
dexon-1024766514eea7bb628ec6e5ed974e997b8faefc.tar.bz2
dexon-1024766514eea7bb628ec6e5ed974e997b8faefc.tar.lz
dexon-1024766514eea7bb628ec6e5ed974e997b8faefc.tar.xz
dexon-1024766514eea7bb628ec6e5ed974e997b8faefc.tar.zst
dexon-1024766514eea7bb628ec6e5ed974e997b8faefc.zip
refactor cli and gui wrapper code. Details:
- all cli functions shared between ethereum and ethereal abstracted to utils/ cmd.go (should be ethcommon or shared or sth) - simplify main() now readable stepwise - rename main wrapper files to main.go - rename commmand line args definition file from config.go to flags.go - rename Do -> Start to parallel option names - register interrupt for rpc server stop - fix interrupt stopping js repl and ethereum - register interrupt for mining stop - custom config file option from command line - debug option from command line - loglevel option from command line - changed ethutil.Config API - default datadir and default config file set together with other flag defaults in wrappers - default assetpath set together with other command line flags defaults in gui wrapper (not in ethutil.Config or ui/ui_lib) - options precedence: default < config file < environment variables < command line
Diffstat (limited to 'ethereal')
-rw-r--r--ethereal/config.go43
-rw-r--r--ethereal/ethereum.go142
-rw-r--r--ethereal/flags.go81
-rw-r--r--ethereal/main.go43
-rw-r--r--ethereal/ui/ui_lib.go30
5 files changed, 125 insertions, 214 deletions
diff --git a/ethereal/config.go b/ethereal/config.go
deleted file mode 100644
index 2315d1435..000000000
--- a/ethereal/config.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package main
-
-import (
- "flag"
-)
-
-var Identifier string
-
-//var StartMining bool
-var StartRpc bool
-var RpcPort int
-var UseUPnP bool
-var OutboundPort string
-var ShowGenesis bool
-var AddPeer string
-var MaxPeer int
-var GenAddr bool
-var UseSeed bool
-var ImportKey string
-var ExportKey bool
-var AssetPath string
-
-var Datadir string
-
-func Init() {
- flag.StringVar(&Identifier, "id", "", "Custom client identifier")
- flag.StringVar(&OutboundPort, "port", "30303", "listening port")
- flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
- flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
- flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
- flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
- flag.StringVar(&AssetPath, "asset_path", "", "absolute path to GUI assets directory")
-
- flag.BoolVar(&ShowGenesis, "genesis", false, "prints genesis header and exits")
- flag.BoolVar(&UseSeed, "seed", true, "seed peers")
- flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
- flag.BoolVar(&ExportKey, "export", false, "export private key")
- flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
-
- flag.StringVar(&Datadir, "datadir", ".ethereal", "specifies the datadir to use. Takes precedence over config file.")
-
- flag.Parse()
-}
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go
deleted file mode 100644
index 0db1fa4cd..000000000
--- a/ethereal/ethereum.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package main
-
-import (
- "fmt"
- "github.com/ethereum/eth-go"
- "github.com/ethereum/eth-go/ethutil"
- "github.com/ethereum/go-ethereum/ethereal/ui"
- "github.com/ethereum/go-ethereum/utils"
- "github.com/go-qml/qml"
- "github.com/rakyll/globalconf"
- "log"
- "os"
- "os/signal"
- "path"
- "runtime"
-)
-
-const Debug = true
-
-// Register interrupt handlers so we can stop the ethereum
-func RegisterInterupts(s *eth.Ethereum) {
- // Buffered chan of one is enough
- c := make(chan os.Signal, 1)
- // Notify about interrupts for now
- signal.Notify(c, os.Interrupt)
- go func() {
- for sig := range c {
- fmt.Printf("Shutting down (%v) ... \n", sig)
-
- s.Stop()
- }
- }()
-}
-
-func main() {
- Init()
-
- qml.Init(nil)
-
- runtime.GOMAXPROCS(runtime.NumCPU())
-
- g, err := globalconf.NewWithOptions(&globalconf.Options{
- Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"),
- })
- if err != nil {
- fmt.Println(err)
- } else {
- g.ParseAll()
- }
- ethutil.ReadConfig(Datadir, ethutil.LogFile|ethutil.LogStd, g, Identifier)
-
- // Instantiated a eth stack
- ethereum, err := eth.New(eth.CapDefault, UseUPnP)
- if err != nil {
- log.Println("eth start err:", err)
- return
- }
- ethereum.Port = OutboundPort
-
- if GenAddr {
- fmt.Println("This action overwrites your old private key. Are you sure? (y/n)")
-
- var r string
- fmt.Scanln(&r)
- for ; ; fmt.Scanln(&r) {
- if r == "n" || r == "y" {
- break
- } else {
- fmt.Printf("Yes or no?", r)
- }
- }
-
- if r == "y" {
- utils.CreateKeyPair(true)
- }
- os.Exit(0)
- } else {
- if len(ImportKey) > 0 {
- fmt.Println("This action overwrites your old private key. Are you sure? (y/n)")
- var r string
- fmt.Scanln(&r)
- for ; ; fmt.Scanln(&r) {
- if r == "n" || r == "y" {
- break
- } else {
- fmt.Printf("Yes or no?", r)
- }
- }
-
- if r == "y" {
- utils.ImportPrivateKey(ImportKey)
- os.Exit(0)
- }
- }
- }
-
- if ExportKey {
- keyPair := ethutil.GetKeyRing().Get(0)
- fmt.Printf(`
-Generating new address and keypair.
-Please keep your keys somewhere save.
-
-++++++++++++++++ KeyRing +++++++++++++++++++
-addr: %x
-prvk: %x
-pubk: %x
-++++++++++++++++++++++++++++++++++++++++++++
-save these words so you can restore your account later: %s
-`, keyPair.Address(), keyPair.PrivateKey, keyPair.PublicKey)
-
- os.Exit(0)
- }
-
- if ShowGenesis {
- fmt.Println(ethereum.BlockChain().Genesis())
- os.Exit(0)
- }
-
- /*
- if StartMining {
- utils.DoMining(ethereum)
- }
- */
-
- if StartRpc {
- utils.DoRpc(ethereum, RpcPort)
- }
-
- log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver)
-
- // Set the max peers
- ethereum.MaxPeers = MaxPeer
-
- gui := ethui.New(ethereum)
-
- ethereum.Start(UseSeed)
-
- gui.Start(AssetPath)
-
- // Wait for shutdown
- ethereum.WaitForShutdown()
-}
diff --git a/ethereal/flags.go b/ethereal/flags.go
new file mode 100644
index 000000000..18f55071a
--- /dev/null
+++ b/ethereal/flags.go
@@ -0,0 +1,81 @@
+package main
+
+import (
+ "flag"
+)
+
+var Identifier string
+var StartRpc bool
+var RpcPort int
+var UseUPnP bool
+var OutboundPort string
+var ShowGenesis bool
+var AddPeer string
+var MaxPeer int
+var GenAddr bool
+var UseSeed bool
+var ImportKey string
+var ExportKey bool
+var NonInteractive bool
+var Datadir string
+var LogFile string
+var ConfigFile string
+var DebugFile string
+var LogLevel int
+
+// flags specific to gui client
+var AssetPath string
+
+func defaultAssetPath() string {
+ var assetPath string
+ // If the current working directory is the go-ethereum dir
+ // assume a debug build and use the source directory as
+ // asset directory.
+ pwd, _ := os.Getwd()
+ if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal") {
+ assetPath = path.Join(pwd, "assets")
+ } else {
+ switch runtime.GOOS {
+ case "darwin":
+ // Get Binary Directory
+ exedir, _ := osext.ExecutableFolder()
+ assetPath = filepath.Join(exedir, "../Resources")
+ case "linux":
+ assetPath = "/usr/share/ethereal"
+ case "window":
+ fallthrough
+ default:
+ assetPath = "."
+ }
+ }
+ return assetPath
+}
+
+func defaultDataDir() string {
+ usr, _ := user.Current()
+ return path.Join(usr.HomeDir, ".ethereum")
+}
+
+var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini")
+
+func Init() {
+ flag.StringVar(&Identifier, "id", "", "Custom client identifier")
+ flag.StringVar(&OutboundPort, "port", "30303", "listening port")
+ flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
+ flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
+ flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
+ flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
+ flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
+ flag.BoolVar(&UseSeed, "seed", true, "seed peers")
+ flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
+ flag.BoolVar(&ExportKey, "export", false, "export private key")
+ flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)")
+ flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
+ flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use")
+ flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file")
+ flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)")
+ flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)")
+ flag.StringVar(&AssetPath, "asset_path", defaultAssetPath, "absolute path to GUI assets directory")
+
+ flag.Parse()
+}
diff --git a/ethereal/main.go b/ethereal/main.go
new file mode 100644
index 000000000..4af068197
--- /dev/null
+++ b/ethereal/main.go
@@ -0,0 +1,43 @@
+package main
+
+import (
+ "fmt"
+ "github.com/ethereum/go-ethereum/ethereal/ui"
+ "github.com/ethereum/go-ethereum/utils"
+ "github.com/go-qml/qml"
+ "runtime"
+)
+
+const Debug = true
+
+func main() {
+ qml.Init(nil)
+
+ runtime.GOMAXPROCS(runtime.NumCPU())
+
+ // precedence: code-internal flag default < config file < environment variables < command line
+ Init() // parsing command line
+ utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH")
+
+ utils.InitDataDir(Datadir)
+
+ utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile)
+
+ ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer)
+
+ // create, import, export keys
+ utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive)
+
+ if ShowGenesis {
+ utils.ShowGenesis(ethereum)
+ }
+
+ if StartRpc {
+ utils.StartRpc(ethereum, RpcPort)
+ }
+
+ utils.StartEthereum(ethereum, UseSeed)
+
+ gui := ethui.New(ethereum, logLevel)
+ gui.Start(AssetPath)
+}
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 2dd66f4fd..156d55157 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@@ -29,9 +29,6 @@ type UiLib struct {
}
func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib {
- if assetPath == "" {
- assetPath = DefaultAssetPath()
- }
return &UiLib{engine: engine, eth: eth, assetPath: assetPath}
}
@@ -88,6 +85,7 @@ func (ui *UiLib) ConnectToPeer(addr string) {
func (ui *UiLib) AssetPath(p string) string {
return path.Join(ui.assetPath, p)
}
+
func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
dbWindow := NewDebuggerWindow(self)
object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash))
@@ -111,29 +109,3 @@ func (self *UiLib) StartDebugger() {
dbWindow.Show()
}
-
-func DefaultAssetPath() string {
- var base string
- // If the current working directory is the go-ethereum dir
- // assume a debug build and use the source directory as
- // asset directory.
- pwd, _ := os.Getwd()
- if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal") {
- base = path.Join(pwd, "assets")
- } else {
- switch runtime.GOOS {
- case "darwin":
- // Get Binary Directory
- exedir, _ := osext.ExecutableFolder()
- base = filepath.Join(exedir, "../Resources")
- case "linux":
- base = "/usr/share/ethereal"
- case "window":
- fallthrough
- default:
- base = "."
- }
- }
-
- return base
-}