|
|
|
@ -14,6 +14,7 @@ import ( |
|
|
|
|
"github.com/ethereum/eth-go/ethlog" |
|
|
|
|
"github.com/ethereum/eth-go/ethminer" |
|
|
|
|
"github.com/ethereum/eth-go/ethpub" |
|
|
|
|
"github.com/ethereum/eth-go/ethreact" |
|
|
|
|
"github.com/ethereum/eth-go/ethutil" |
|
|
|
|
"github.com/ethereum/eth-go/ethwire" |
|
|
|
|
"github.com/ethereum/go-ethereum/utils" |
|
|
|
@ -151,7 +152,7 @@ func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) { |
|
|
|
|
gui.readPreviousTransactions() |
|
|
|
|
}() |
|
|
|
|
|
|
|
|
|
go gui.update() |
|
|
|
|
gui.update() |
|
|
|
|
|
|
|
|
|
return win, nil |
|
|
|
|
} |
|
|
|
@ -284,30 +285,16 @@ func (self *Gui) getObjectByName(objectName string) qml.Object { |
|
|
|
|
|
|
|
|
|
// Simple go routine function that updates the list of peers in the GUI
|
|
|
|
|
func (gui *Gui) update() { |
|
|
|
|
reactor := gui.eth.Reactor() |
|
|
|
|
|
|
|
|
|
var ( |
|
|
|
|
blockChan = make(chan ethutil.React, 1) |
|
|
|
|
txChan = make(chan ethutil.React, 1) |
|
|
|
|
objectChan = make(chan ethutil.React, 1) |
|
|
|
|
peerChan = make(chan ethutil.React, 1) |
|
|
|
|
chainSyncChan = make(chan ethutil.React, 1) |
|
|
|
|
miningChan = make(chan ethutil.React, 1) |
|
|
|
|
blockChan = make(chan ethreact.Event, 100) |
|
|
|
|
txChan = make(chan ethreact.Event, 100) |
|
|
|
|
objectChan = make(chan ethreact.Event, 100) |
|
|
|
|
peerChan = make(chan ethreact.Event, 100) |
|
|
|
|
chainSyncChan = make(chan ethreact.Event, 100) |
|
|
|
|
miningChan = make(chan ethreact.Event, 100) |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
reactor.Subscribe("newBlock", blockChan) |
|
|
|
|
reactor.Subscribe("newTx:pre", txChan) |
|
|
|
|
reactor.Subscribe("newTx:post", txChan) |
|
|
|
|
reactor.Subscribe("chainSync", chainSyncChan) |
|
|
|
|
reactor.Subscribe("miner:start", miningChan) |
|
|
|
|
reactor.Subscribe("miner:stop", miningChan) |
|
|
|
|
|
|
|
|
|
nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg() |
|
|
|
|
if nameReg != nil { |
|
|
|
|
reactor.Subscribe("object:"+string(nameReg.Address()), objectChan) |
|
|
|
|
} |
|
|
|
|
reactor.Subscribe("peerList", peerChan) |
|
|
|
|
|
|
|
|
|
peerUpdateTicker := time.NewTicker(5 * time.Second) |
|
|
|
|
generalUpdateTicker := time.NewTicker(1 * time.Second) |
|
|
|
|
|
|
|
|
@ -319,6 +306,7 @@ func (gui *Gui) update() { |
|
|
|
|
|
|
|
|
|
lastBlockLabel := gui.getObjectByName("lastBlockLabel") |
|
|
|
|
|
|
|
|
|
go func() { |
|
|
|
|
for { |
|
|
|
|
select { |
|
|
|
|
case b := <-blockChan: |
|
|
|
@ -327,11 +315,10 @@ func (gui *Gui) update() { |
|
|
|
|
if bytes.Compare(block.Coinbase, gui.address()) == 0 { |
|
|
|
|
gui.setWalletValue(gui.eth.StateManager().CurrentState().GetAccount(gui.address()).Balance, nil) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
case txMsg := <-txChan: |
|
|
|
|
tx := txMsg.Resource.(*ethchain.Transaction) |
|
|
|
|
|
|
|
|
|
if txMsg.Event == "newTx:pre" { |
|
|
|
|
if txMsg.Name == "newTx:pre" { |
|
|
|
|
object := state.GetAccount(gui.address()) |
|
|
|
|
|
|
|
|
|
if bytes.Compare(tx.Sender(), gui.address()) == 0 { |
|
|
|
@ -370,12 +357,11 @@ func (gui *Gui) update() { |
|
|
|
|
case <-peerUpdateTicker.C: |
|
|
|
|
gui.setPeerInfo() |
|
|
|
|
case msg := <-miningChan: |
|
|
|
|
if msg.Event == "miner:start" { |
|
|
|
|
if msg.Name == "miner:start" { |
|
|
|
|
gui.miner = msg.Resource.(*ethminer.Miner) |
|
|
|
|
} else { |
|
|
|
|
gui.miner = nil |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
case <-generalUpdateTicker.C: |
|
|
|
|
statusText := "#" + gui.eth.BlockChain().CurrentBlock.Number.String() |
|
|
|
|
if gui.miner != nil { |
|
|
|
@ -387,6 +373,22 @@ func (gui *Gui) update() { |
|
|
|
|
lastBlockLabel.Set("text", statusText) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}() |
|
|
|
|
|
|
|
|
|
reactor := gui.eth.Reactor() |
|
|
|
|
|
|
|
|
|
reactor.Subscribe("newBlock", blockChan) |
|
|
|
|
reactor.Subscribe("newTx:pre", txChan) |
|
|
|
|
reactor.Subscribe("newTx:post", txChan) |
|
|
|
|
reactor.Subscribe("chainSync", chainSyncChan) |
|
|
|
|
reactor.Subscribe("miner:start", miningChan) |
|
|
|
|
reactor.Subscribe("miner:stop", miningChan) |
|
|
|
|
|
|
|
|
|
nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg() |
|
|
|
|
if nameReg != nil { |
|
|
|
|
reactor.Subscribe("object:"+string(nameReg.Address()), objectChan) |
|
|
|
|
} |
|
|
|
|
reactor.Subscribe("peerList", peerChan) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (gui *Gui) setPeerInfo() { |
|
|
|
|