aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-23 20:37:03 +0800
committerobscuren <geffobscura@gmail.com>2014-05-23 20:37:03 +0800
commitd35380c19e5ce92b57158e7780f7105dc4136916 (patch)
tree44b358714448d492dcf8cdcddb4d1e6e57c4318b /ethereal
parent5f8911f7cba2cf837d891735f46b02b34e4fc228 (diff)
downloaddexon-d35380c19e5ce92b57158e7780f7105dc4136916.tar.gz
dexon-d35380c19e5ce92b57158e7780f7105dc4136916.tar.zst
dexon-d35380c19e5ce92b57158e7780f7105dc4136916.zip
New main script through init return value
Diffstat (limited to 'ethereal')
-rw-r--r--ethereal/ui/gui.go5
-rw-r--r--ethereal/ui/ui_lib.go2
2 files changed, 3 insertions, 4 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 7290bd6ec..022f192bf 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -9,7 +9,6 @@ import (
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
- "github.com/obscuren/mutan"
"math/big"
"strings"
)
@@ -262,7 +261,7 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.
func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
keyPair := ethutil.GetKeyRing().Get(0)
- mainInput, initInput := mutan.PreParse(data)
+ //mainInput, initInput := mutan.PreParse(data)
- return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput)
+ return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, data)
}
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 0c43f1675..1c88b0181 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@@ -135,7 +135,7 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string)
for _, str := range dis {
ui.win.Root().Call("setAsm", str)
}
- callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), callerScript, nil)
+ callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), nil)
// Contract addr as test address
keyPair := ethutil.GetKeyRing().Get(0)