diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-02 20:08:08 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-02 20:08:08 +0800 |
| commit | 231ad9b562f4870d6fa6b250e791437d330c5535 (patch) | |
| tree | f1af29b9485d98f6e3ea7c8b588beb7bd5181512 /ethereal/ui/gui.go | |
| parent | 60f9966cd8f991967882dd61e602822a95681d85 (diff) | |
| parent | 2582d719b2a8a3facac4410dd9a2ddaf5000f038 (diff) | |
| download | go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.gz go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.bz2 go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.lz go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.xz go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.tar.zst go-tangerine-231ad9b562f4870d6fa6b250e791437d330c5535.zip | |
Merge branch 'develop' into feature/rpc
Diffstat (limited to 'ethereal/ui/gui.go')
| -rw-r--r-- | ethereal/ui/gui.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 8e6433207..522c081a3 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethdb" + "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" "math/big" "strings" @@ -57,9 +57,9 @@ func (ui *Gui) Start(assetPath string) { // Register ethereum functions qml.RegisterTypes("Ethereum", 1, 0, []qml.TypeSpec{{ - Init: func(p *utils.PBlock, obj qml.Object) { p.Number = 0; p.Hash = "" }, + Init: func(p *ethpub.PBlock, obj qml.Object) { p.Number = 0; p.Hash = "" }, }, { - Init: func(p *utils.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" }, + Init: func(p *ethpub.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" }, }}) ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", "0.2")) @@ -130,13 +130,13 @@ func (ui *Gui) readPreviousTransactions() { for it.Next() { tx := ethchain.NewTransactionFromBytes(it.Value()) - ui.win.Root().Call("addTx", utils.NewPTx(tx)) + ui.win.Root().Call("addTx", ethpub.NewPTx(tx)) } it.Release() } func (ui *Gui) ProcessBlock(block *ethchain.Block) { - ui.win.Root().Call("addBlock", utils.NewPBlock(block)) + ui.win.Root().Call("addBlock", ethpub.NewPBlock(block)) } // Simple go routine function that updates the list of peers in the GUI @@ -157,13 +157,13 @@ func (ui *Gui) update() { if txMsg.Type == ethchain.TxPre { if bytes.Compare(tx.Sender(), ui.addr) == 0 && addrState.Nonce <= tx.Nonce { - ui.win.Root().Call("addTx", utils.NewPTx(tx)) + ui.win.Root().Call("addTx", ethpub.NewPTx(tx)) ui.txDb.Put(tx.Hash(), tx.RlpEncode()) addrState.Nonce += 1 unconfirmedFunds.Sub(unconfirmedFunds, tx.Value) } else if bytes.Compare(tx.Recipient, ui.addr) == 0 { - ui.win.Root().Call("addTx", utils.NewPTx(tx)) + ui.win.Root().Call("addTx", ethpub.NewPTx(tx)) ui.txDb.Put(tx.Hash(), tx.RlpEncode()) unconfirmedFunds.Add(unconfirmedFunds, tx.Value) |