diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-10 22:25:08 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-10 22:25:08 +0800 |
| commit | a3cc4b0b8048056037693f34c56b04d1a4efb22f (patch) | |
| tree | 1f72dca81e9fbad641eedbaed73c7cfc6ad5992d | |
| parent | faa3aa14ed261dc11247c6c059c184e9a31d09c5 (diff) | |
| parent | 23fc50c61b99735263eb682eb992c174eceea632 (diff) | |
| download | go-tangerine-a3cc4b0b8048056037693f34c56b04d1a4efb22f.tar go-tangerine-a3cc4b0b8048056037693f34c56b04d1a4efb22f.tar.gz go-tangerine-a3cc4b0b8048056037693f34c56b04d1a4efb22f.tar.bz2 go-tangerine-a3cc4b0b8048056037693f34c56b04d1a4efb22f.tar.lz go-tangerine-a3cc4b0b8048056037693f34c56b04d1a4efb22f.tar.xz go-tangerine-a3cc4b0b8048056037693f34c56b04d1a4efb22f.tar.zst go-tangerine-a3cc4b0b8048056037693f34c56b04d1a4efb22f.zip | |
Merge branch 'release/poc5-rc3' into develop
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ethereal/ui/gui.go | 4 | ||||
| -rw-r--r-- | ethereal/ui/ui_lib.go | 2 | ||||
| -rw-r--r-- | utils/compile.go | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -5,7 +5,7 @@ Ethereum Ethereum Go Client © 2014 Jeffrey Wilcke. -Current state: Proof of Concept 5.0 RC1. +Current state: Proof of Concept 5.0 RC3. For the development package please see the [eth-go package](https://github.com/ethereum/eth-go). diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 92c6e9389..46bfa0133 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -67,7 +67,7 @@ func (gui *Gui) Start(assetPath string) { Init: func(p *ethpub.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" }, }}) - ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", "0.5.0 RC2")) + ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", "0.5.0 RC3")) ethutil.Config.Log.Infoln("[GUI] Starting GUI") // Create a new QML engine gui.engine = qml.NewEngine() @@ -223,7 +223,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.Config.Db.GetKeys()[0] - mainInput, initInput := mutan.PreProcess(data) + mainInput, initInput := mutan.PreParse(data) return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput) } diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 35ceb7d79..6736e79ae 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -121,7 +121,7 @@ func DefaultAssetPath() string { func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) { state := ui.eth.BlockChain().CurrentBlock.State() - mainInput, _ := mutan.PreProcess(data) + mainInput, _ := mutan.PreParse(data) callerScript, err := utils.Compile(mainInput) if err != nil { ethutil.Config.Log.Debugln(err) diff --git a/utils/compile.go b/utils/compile.go index 6d75f73d1..967bd099b 100644 --- a/utils/compile.go +++ b/utils/compile.go @@ -24,7 +24,7 @@ func Compile(script string) ([]byte, error) { func CompileScript(script string) ([]byte, []byte, error) { // Preprocess - mainInput, initInput := mutan.PreProcess(script) + mainInput, initInput := mutan.PreParse(script) // Compile main script mainScript, err := Compile(mainInput) if err != nil { |