mirror of https://github.com/poanetwork/quorum.git
changed name for ethutil hex functions; and access to keyring via keyManager
This commit is contained in:
parent
8aea468744
commit
098f7f23ce
|
@ -49,7 +49,7 @@ func (self *DebuggerWindow) SetData(data string) {
|
|||
self.win.Set("dataText", data)
|
||||
}
|
||||
func (self *DebuggerWindow) SetAsm(data string) {
|
||||
dis := ethchain.Disassemble(ethutil.FromHex(data))
|
||||
dis := ethchain.Disassemble(ethutil.Hex2Bytes(data))
|
||||
for _, str := range dis {
|
||||
self.win.Root().Call("setAsm", str)
|
||||
}
|
||||
|
@ -101,7 +101,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
|
|||
gasPrice = ethutil.Big(gasPriceStr)
|
||||
value = ethutil.Big(valueStr)
|
||||
// Contract addr as test address
|
||||
keyPair = ethutil.GetKeyRing().Get(0)
|
||||
keyPair = self.lib.eth.KeyManager().KeyPair()
|
||||
callerTx = ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script)
|
||||
)
|
||||
callerTx.Sign(keyPair.PrivateKey)
|
||||
|
|
|
@ -121,10 +121,10 @@ out:
|
|||
func (app *ExtApplication) Watch(addr, storageAddr string) {
|
||||
var event string
|
||||
if len(storageAddr) == 0 {
|
||||
event = "object:" + string(ethutil.FromHex(addr))
|
||||
event = "object:" + string(ethutil.Hex2Bytes(addr))
|
||||
app.lib.eth.Reactor().Subscribe(event, app.changeChan)
|
||||
} else {
|
||||
event = "storage:" + string(ethutil.FromHex(addr)) + ":" + string(ethutil.FromHex(storageAddr))
|
||||
event = "storage:" + string(ethutil.Hex2Bytes(addr)) + ":" + string(ethutil.Hex2Bytes(storageAddr))
|
||||
app.lib.eth.Reactor().Subscribe(event, app.changeChan)
|
||||
}
|
||||
|
||||
|
|
|
@ -116,7 +116,7 @@ func (app *HtmlApplication) Window() *qml.Window {
|
|||
}
|
||||
|
||||
func (app *HtmlApplication) NewBlock(block *ethchain.Block) {
|
||||
b := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
|
||||
b := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())}
|
||||
app.webView.Call("onNewBlockCb", b)
|
||||
}
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) {
|
|||
|
||||
// Events
|
||||
func (app *QmlApplication) NewBlock(block *ethchain.Block) {
|
||||
pblock := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
|
||||
pblock := ðpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Bytes2Hex(block.Hash())}
|
||||
app.win.Call("onNewBlockCb", pblock)
|
||||
}
|
||||
|
||||
|
|
|
@ -77,9 +77,9 @@ func (ui *UiLib) AssetPath(p string) string {
|
|||
|
||||
func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
|
||||
dbWindow := NewDebuggerWindow(self)
|
||||
object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash))
|
||||
object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.Hex2Bytes(contractHash))
|
||||
if len(object.Script()) > 0 {
|
||||
dbWindow.SetCode("0x" + ethutil.Hex(object.Script()))
|
||||
dbWindow.SetCode("0x" + ethutil.Bytes2Hex(object.Script()))
|
||||
}
|
||||
dbWindow.SetData("0x" + data)
|
||||
|
||||
|
|
Loading…
Reference in New Issue