diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 01:36:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 01:36:41 +0800 |
| commit | 1c51e12c181fb781cafaf34fc8dd2cb07fd85df7 (patch) | |
| tree | 38465edc586ae8080018f37efa8657c7dfeab6af /cmd/mist/gui.go | |
| parent | 45e15f62f594d6f5191e60a54aead33602838e98 (diff) | |
| parent | 872b2497114209119becf2e8a4d4a5818e2084ee (diff) | |
| download | dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.gz dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.bz2 dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.lz dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.xz dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.zst dexon-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.zip | |
Merge branch 'jsonrpc' into qt5.4
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index f78cb7c49..edc799abc 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -75,7 +75,7 @@ type Gui struct { logLevel logger.LogLevel open bool - xeth *xeth.JSXEth + xeth *xeth.XEth Session string clientIdentity *p2p.SimpleClientIdentity @@ -93,7 +93,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIden panic(err) } - xeth := xeth.NewJSXEth(ethereum) + xeth := xeth.New(ethereum) gui := &Gui{eth: ethereum, txDb: db, xeth: xeth, @@ -120,9 +120,9 @@ func (gui *Gui) Start(assetPath string) { // Register ethereum functions qml.RegisterTypes("Ethereum", 1, 0, []qml.TypeSpec{{ - Init: func(p *xeth.JSBlock, obj qml.Object) { p.Number = 0; p.Hash = "" }, + Init: func(p *xeth.Block, obj qml.Object) { p.Number = 0; p.Hash = "" }, }, { - Init: func(p *xeth.JSTransaction, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" }, + Init: func(p *xeth.Transaction, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" }, }, { Init: func(p *xeth.KeyVal, obj qml.Object) { p.Key = ""; p.Value = "" }, }}) @@ -276,7 +276,7 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { } var ( - ptx = xeth.NewJSTx(tx) + ptx = xeth.NewTx(tx) send = ethutil.Bytes2Hex(tx.From()) rec = ethutil.Bytes2Hex(tx.To()) ) @@ -303,7 +303,7 @@ func (gui *Gui) readPreviousTransactions() { func (gui *Gui) processBlock(block *types.Block, initial bool) { name := ethutil.Bytes2Hex(block.Coinbase()) - b := xeth.NewJSBlock(block) + b := xeth.NewBlock(block) b.Name = name gui.getObjectByName("chainView").Call("addBlock", b, initial) |