diff options
| author | obscuren <geffobscura@gmail.com> | 2014-04-16 10:08:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-04-16 10:08:25 +0800 |
| commit | 1cd7d4456b80c38f343cb54a624408c28c5acb13 (patch) | |
| tree | de63c196b7a707a9bbc0787fb7af9992bf628948 /ethereal/ui/ui_lib.go | |
| parent | 6b644c17a7ff2746863c03f2d67b24ae75951256 (diff) | |
| download | dexon-1cd7d4456b80c38f343cb54a624408c28c5acb13.tar dexon-1cd7d4456b80c38f343cb54a624408c28c5acb13.tar.gz dexon-1cd7d4456b80c38f343cb54a624408c28c5acb13.tar.bz2 dexon-1cd7d4456b80c38f343cb54a624408c28c5acb13.tar.lz dexon-1cd7d4456b80c38f343cb54a624408c28c5acb13.tar.xz dexon-1cd7d4456b80c38f343cb54a624408c28c5acb13.tar.zst dexon-1cd7d4456b80c38f343cb54a624408c28c5acb13.zip | |
Updated to use new state object
Diffstat (limited to 'ethereal/ui/ui_lib.go')
| -rw-r--r-- | ethereal/ui/ui_lib.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index b2552cdce..a0d2f557a 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -6,14 +6,13 @@ import ( "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/go-ethereum/utils" "github.com/niemeyer/qml" - "github.com/obscuren/mutan" "math/big" "os" "path" "path/filepath" "runtime" - "strings" ) type memAddr struct { @@ -99,25 +98,24 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) state := ui.eth.BlockChain().CurrentBlock.State() mainInput, _ := ethutil.PreProcess(data) - asm, err := mutan.Compile(strings.NewReader(mainInput), false) + callerScript, err := utils.Compile(mainInput) if err != nil { - fmt.Println(err) - for _, e := range err { - ui.win.Root().Call("addDebugMessage", e.Error()) - } + ethutil.Config.Log.Debugln(err) + + return } - callerScript := ethutil.Assemble(asm...) dis := ethchain.Disassemble(callerScript) ui.win.Root().Call("clearAsm") + for _, str := range dis { ui.win.Root().Call("setAsm", str) } - callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasPriceStr), callerScript) + callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasPriceStr), callerScript, nil) // Contract addr as test address keyPair := ethutil.Config.Db.GetKeys()[0] - account := ui.eth.StateManager().GetAddrState(keyPair.Address()).Account + account := ui.eth.StateManager().GetAddrState(keyPair.Address()).Object c := ethchain.MakeContract(callerTx, state) callerClosure := ethchain.NewClosure(account, c, c.Script(), state, ethutil.Big(gasStr), new(big.Int)) |