Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

This commit is contained in:
obscuren
2014-04-15 16:18:04 -04:00
3 changed files with 73 additions and 23 deletions

View File

@@ -102,6 +102,9 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string)
asm, err := mutan.Compile(strings.NewReader(mainInput), false)
if err != nil {
fmt.Println(err)
for _, e := range err {
ui.win.Root().Call("addDebugMessage", e.Error())
}
}
callerScript := ethutil.Assemble(asm...)