aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-30 22:57:58 +0800
committerobscuren <geffobscura@gmail.com>2014-05-30 22:57:58 +0800
commit17c825f53a2676ffe17fd7731f8f550aebcb56b0 (patch)
tree7c8aca5aaf4355256bf245543842065073e56771
parentb15e03acd7d6184ad920292a10d9a2bbf2b59f00 (diff)
downloadgo-tangerine-17c825f53a2676ffe17fd7731f8f550aebcb56b0.tar.gz
go-tangerine-17c825f53a2676ffe17fd7731f8f550aebcb56b0.tar.zst
go-tangerine-17c825f53a2676ffe17fd7731f8f550aebcb56b0.zip
Peer changes broadcasting and minor miner fix
-rw-r--r--ethereum.go1
-rw-r--r--ethminer/miner.go2
-rw-r--r--ethutil/config.go54
3 files changed, 43 insertions, 14 deletions
diff --git a/ethereum.go b/ethereum.go
index 6be989a10..d9281cd57 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -238,6 +238,7 @@ func (s *Ethereum) ConnectToPeer(addr string) error {
s.peers.PushBack(peer)
ethutil.Config.Log.Infof("[SERV] Adding peer (%s) %d / %d\n", addr, s.peers.Len(), s.MaxPeers)
+ s.reactor.Post("peerList", s.peers)
}
return nil
diff --git a/ethminer/miner.go b/ethminer/miner.go
index e7237bae2..19ff5dd9e 100644
--- a/ethminer/miner.go
+++ b/ethminer/miner.go
@@ -149,7 +149,7 @@ func (self *Miner) mineNewBlock() {
// Find a valid nonce
self.block.Nonce = self.pow.Search(self.block, self.powQuitChan)
if self.block.Nonce != nil {
- err := self.ethereum.StateManager().Process(self.block, true)
+ err := self.ethereum.StateManager().Process(self.block, false)
if err != nil {
ethutil.Config.Log.Infoln(err)
} else {
diff --git a/ethutil/config.go b/ethutil/config.go
index fb270ce72..916b0d186 100644
--- a/ethutil/config.go
+++ b/ethutil/config.go
@@ -22,26 +22,54 @@ type config struct {
Identifier string
}
+const defaultConf = `
+id = ""
+port = 30303
+upnp = true
+maxpeer = 10
+rpc = false
+rpcport = 8080
+`
+
var Config *config
+func ApplicationFolder(base string) string {
+ usr, _ := user.Current()
+ p := path.Join(usr.HomeDir, base)
+
+ if len(base) > 0 {
+ //Check if the logging directory already exists, create it if not
+ _, err := os.Stat(p)
+ if err != nil {
+ if os.IsNotExist(err) {
+ log.Printf("Debug logging directory %s doesn't exist, creating it\n", p)
+ os.Mkdir(p, 0777)
+
+ }
+ }
+
+ iniFilePath := path.Join(p, "conf.ini")
+ _, err = os.Stat(iniFilePath)
+ if err != nil && os.IsNotExist(err) {
+ file, err := os.Create(iniFilePath)
+ if err != nil {
+ fmt.Println(err)
+ } else {
+ assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal", "assets")
+ file.Write([]byte(defaultConf + "\nasset_path = " + assetPath))
+ }
+ }
+ }
+
+ return p
+}
+
// Read config
//
// Initialize the global Config variable with default settings
func ReadConfig(base string, logTypes LoggerType, id string) *config {
if Config == nil {
- usr, _ := user.Current()
- path := path.Join(usr.HomeDir, base)
-
- if len(base) > 0 {
- //Check if the logging directory already exists, create it if not
- _, err := os.Stat(path)
- if err != nil {
- if os.IsNotExist(err) {
- log.Printf("Debug logging directory %s doesn't exist, creating it\n", path)
- os.Mkdir(path, 0777)
- }
- }
- }
+ path := ApplicationFolder(base)
Config = &config{ExecPath: path, Debug: true, Ver: "0.5.0 RC11"}
Config.Identifier = id