From 21e52efdfed19c4376b830f8ad0e52a9e599f633 Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 11 May 2015 15:43:14 +0200 Subject: cmd/geth, miner, backend, xeth: Fixed miner threads to be settable Miner threads are now settable through the admin interface (closes #897) and specify 0 CPU worker threads when eth_getWork is called (closes #916) --- cmd/mist/ui_lib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/mist/ui_lib.go') diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index a604e87ba..4653e0980 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -159,7 +159,7 @@ func (self *UiLib) RemoveLocalTransaction(id int) { func (self *UiLib) ToggleMining() bool { if !self.eth.IsMining() { - err := self.eth.StartMining() + err := self.eth.StartMining(4) return err == nil } else { self.eth.StopMining() -- cgit v1.2.3 From 66de3f0aa849849c5cf5ad84265f3f3ce8ca5282 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 12 May 2015 14:14:08 +0200 Subject: xeth, rpc: implement eth_estimateGas. Closes #930 --- cmd/mist/ui_lib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/mist/ui_lib.go') diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 4653e0980..0958294c3 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -127,7 +127,7 @@ func (self *UiLib) Transact(params map[string]interface{}) (string, error) { ) } -func (self *UiLib) Call(params map[string]interface{}) (string, error) { +func (self *UiLib) Call(params map[string]interface{}) (string, string, error) { object := mapToTxParams(params) return self.XEth.Call( -- cgit v1.2.3 From b79dd188d916da7adbf448dc27b0c59a04e0938d Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Tue, 12 May 2015 14:24:11 +0200 Subject: replaced several path.* with filepath.* which is platform independent --- cmd/mist/ui_lib.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cmd/mist/ui_lib.go') diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 4653e0980..eaf42db28 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -22,7 +22,8 @@ package main import ( "io/ioutil" - "path" + + "path/filepath" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" @@ -110,7 +111,7 @@ func (ui *UiLib) ConnectToPeer(nodeURL string) { } func (ui *UiLib) AssetPath(p string) string { - return path.Join(ui.assetPath, p) + return filepath.Join(ui.assetPath, p) } func (self *UiLib) Transact(params map[string]interface{}) (string, error) { @@ -218,7 +219,7 @@ func (self *UiLib) Messages(id int) *common.List { } func (self *UiLib) ReadFile(p string) string { - content, err := ioutil.ReadFile(self.AssetPath(path.Join("ext", p))) + content, err := ioutil.ReadFile(self.AssetPath(filepath.Join("ext", p))) if err != nil { guilogger.Infoln("error reading file", p, ":", err) } -- cgit v1.2.3 From 95773b9673ac78fdceb152d1dd2528f90e8a02b7 Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Tue, 12 May 2015 15:20:53 +0200 Subject: removed redundant newlines in import block --- cmd/mist/ui_lib.go | 1 - 1 file changed, 1 deletion(-) (limited to 'cmd/mist/ui_lib.go') diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index eaf42db28..4db0122d3 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -22,7 +22,6 @@ package main import ( "io/ioutil" - "path/filepath" "github.com/ethereum/go-ethereum/common" -- cgit v1.2.3