From 610adfd83f14652ba08d99fb098d1d62123abd38 Mon Sep 17 00:00:00 2001
From: zsfelfoldi <zsfelfoldi@gmail.com>
Date: Fri, 12 Jun 2015 13:57:30 +0200
Subject: [PATCH] fixed xeth.gpo = nil bug

---
 xeth/xeth.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xeth/xeth.go b/xeth/xeth.go
index 1044b02f6..71753d6bd 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -42,6 +42,9 @@ const (
 func DefaultGas() *big.Int { return new(big.Int).Set(defaultGas) }
 
 func (self *XEth) DefaultGasPrice() *big.Int {
+	if self.gpo == nil {
+		self.gpo = eth.NewGasPriceOracle(self.backend)
+	}
 	return self.gpo.SuggestPrice()
 }
 
@@ -96,7 +99,6 @@ func New(ethereum *eth.Ethereum, frontend Frontend) *XEth {
 		transactionQueue: make(map[int]*hashQueue),
 		messages:         make(map[int]*whisperFilter),
 		agent:            miner.NewRemoteAgent(),
-		gpo:              eth.NewGasPriceOracle(ethereum),
 	}
 	if ethereum.Whisper() != nil {
 		xeth.whisper = NewWhisper(ethereum.Whisper())
@@ -233,6 +235,7 @@ func (self *XEth) WithState(statedb *state.StateDB) *XEth {
 	xeth := &XEth{
 		backend:  self.backend,
 		frontend: self.frontend,
+		gpo:      self.gpo,
 	}
 
 	xeth.state = NewState(xeth, statedb)