roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #548 from tgerring/typescleanup

Browse Source 
Fix Mist types build errors
This commit is contained in:
Jeffrey Wilcke 2015-03-23 12:12:29 +01:00
commit dbb2af6016
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/mist/bindings.go
View File

@ -67,7 +67,7 @@ func (self *Gui) DumpState(hash, path string) {
i, _ := strconv.Atoi(hash[1:]) i, _ := strconv.Atoi(hash[1:])
block = self.eth.ChainManager().GetBlockByNumber(uint64(i)) block = self.eth.ChainManager().GetBlockByNumber(uint64(i))
} else { } else {
block = self.eth.ChainManager().GetBlock(common.Hex2Bytes(hash)) block = self.eth.ChainManager().GetBlock(common.HexToHash(hash))
} }
if block == nil { if block == nil {

11
cmd/mist/gui.go
View File

@ -31,11 +31,11 @@ import (
"sort" "sort"
"time" "time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/ui/qt/qwhisper" "github.com/ethereum/go-ethereum/ui/qt/qwhisper"
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
@ -230,7 +230,8 @@ func (self *Gui) loadMergedMiningOptions() {
func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
var inout string var inout string
if gui.eth.AccountManager().HasAccount(tx.From()) { from, _ := tx.From()
if gui.eth.AccountManager().HasAccount(common.Hex2Bytes(from.Hex())) {
inout = "send" inout = "send"
} else { } else {
inout = "recv" inout = "recv"
@ -238,8 +239,8 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
var ( var (
ptx = xeth.NewTx(tx) ptx = xeth.NewTx(tx)
send = common.Bytes2Hex(tx.From()) send = from.Hex()
rec = common.Bytes2Hex(tx.To()) rec = tx.To().Hex()
) )
ptx.Sender = send ptx.Sender = send
ptx.Address = rec ptx.Address = rec
@ -263,7 +264,7 @@ func (gui *Gui) readPreviousTransactions() {
} }
func (gui *Gui) processBlock(block *types.Block, initial bool) { func (gui *Gui) processBlock(block *types.Block, initial bool) {
name := common.Bytes2Hex(block.Coinbase()) name := block.Coinbase().Hex()
b := xeth.NewBlock(block) b := xeth.NewBlock(block)
b.Name = name b.Name = name

4
cmd/mist/html_container.go
View File

@ -29,8 +29,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
"github.com/howeyc/fsnotify" "github.com/howeyc/fsnotify"
"github.com/obscuren/qml" "github.com/obscuren/qml"
@ -139,7 +139,7 @@ func (app *HtmlApplication) Window() *qml.Window {
} }
func (app *HtmlApplication) NewBlock(block *types.Block) { func (app *HtmlApplication) NewBlock(block *types.Block) {
b := &xeth.Block{Number: int(block.NumberU64()), Hash: common.Bytes2Hex(block.Hash())} b := &xeth.Block{Number: int(block.NumberU64()), Hash: block.Hash().Hex()}
app.webView.Call("onNewBlockCb", b) app.webView.Call("onNewBlockCb", b)
} }

3
cmd/mist/qml_container.go
View File

@ -25,7 +25,6 @@ import (
"runtime" "runtime"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
"github.com/obscuren/qml" "github.com/obscuren/qml"
) )
@ -68,7 +67,7 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) {
// Events // Events
func (app *QmlApplication) NewBlock(block *types.Block) { func (app *QmlApplication) NewBlock(block *types.Block) {
pblock := &xeth.Block{Number: int(block.NumberU64()), Hash: common.Bytes2Hex(block.Hash())} pblock := &xeth.Block{Number: int(block.NumberU64()), Hash: block.Hash().Hex()}
app.win.Call("onNewBlockCb", pblock) app.win.Call("onNewBlockCb", pblock)
} }