diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-11-27 20:23:31 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-11-27 20:23:31 +0800 |
| commit | ef7961b7d27be930a4d9dc81527a55497d3dea2e (patch) | |
| tree | 5746b715b1b66c5767779e2e4ca66be345333e13 /cmd/mist/ui_lib.go | |
| parent | c17a3cb0ceec44c10bc84d05f0d81f08894c792c (diff) | |
| parent | 8cf9ed0ea588e97f2baf0f834248727e8fbca18f (diff) | |
| download | dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.gz dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.bz2 dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.lz dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.xz dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.tar.zst dexon-ef7961b7d27be930a4d9dc81527a55497d3dea2e.zip | |
Merge pull request #194 from ethereum/poc8
Update tests branch to PoC8
Diffstat (limited to 'cmd/mist/ui_lib.go')
| -rw-r--r-- | cmd/mist/ui_lib.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 4e480144f..01352f192 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -26,6 +26,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/chain" + "github.com/ethereum/go-ethereum/chain/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/javascript" @@ -126,7 +127,7 @@ func (self *UiLib) PastPeers() *ethutil.List { } func (self *UiLib) ImportTx(rlpTx string) { - tx := chain.NewTransactionFromBytes(ethutil.Hex2Bytes(rlpTx)) + tx := types.NewTransactionFromBytes(ethutil.Hex2Bytes(rlpTx)) self.eth.TxPool().QueueTransaction(tx) } @@ -228,7 +229,7 @@ func (self *UiLib) NewFilter(object map[string]interface{}) (id int) { func (self *UiLib) NewFilterString(typ string) (id int) { filter := chain.NewFilter(self.eth) - filter.BlockCallback = func(block *chain.Block) { + filter.BlockCallback = func(block *types.Block) { if self.win != nil && self.win.Root() != nil { self.win.Root().Call("invokeFilterCallback", "{}", id) } else { |