merge
This commit is contained in:
commit
f802e17626
@ -5,7 +5,7 @@ Ethereum
|
||||
|
||||
Ethereum Go Client © 2014 Jeffrey Wilcke.
|
||||
|
||||
Current state: Proof of Concept 5.0 RC10.
|
||||
Current state: Proof of Concept 5.0 RC11.
|
||||
|
||||
For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -54,7 +54,7 @@ func New(ethereum *eth.Ethereum) *Gui {
|
||||
}
|
||||
|
||||
func (gui *Gui) Start(assetPath string) {
|
||||
const version = "0.5.0 RC10"
|
||||
const version = "0.5.0 RC11"
|
||||
|
||||
defer gui.txDb.Close()
|
||||
|
||||
|
@ -2,7 +2,6 @@ package ethui
|
||||
|
||||
import (
|
||||
"bitbucket.org/kardianos/osext"
|
||||
"encoding/hex"
|
||||
"github.com/ethereum/eth-go"
|
||||
"github.com/ethereum/eth-go/ethchain"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
@ -94,9 +93,9 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
|
||||
dbWindow := NewDebuggerWindow(self)
|
||||
object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash))
|
||||
if len(object.Script()) > 0 {
|
||||
dbWindow.SetCode("0x" + hex.EncodeToString(object.Script()))
|
||||
dbWindow.SetCode("0x" + ethutil.Hex(object.Script()))
|
||||
}
|
||||
dbWindow.SetData(data)
|
||||
dbWindow.SetData("0x" + data)
|
||||
|
||||
dbWindow.Show()
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user