aboutsummaryrefslogtreecommitdiffstats
path: root/ethutil
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-10 22:24:21 +0800
committerobscuren <geffobscura@gmail.com>2014-05-10 22:24:21 +0800
commit36572f03a7acf24d9b0e86479d435d007134c3f1 (patch)
tree680a6565083b76ff2bcd75f9991f809b9d31305d /ethutil
parentbe7da48dadc04396d47c3fe8b631460853caf874 (diff)
parente22e83b19aabc7711a6cd4e95bae460142d4db04 (diff)
downloaddexon-36572f03a7acf24d9b0e86479d435d007134c3f1.tar
dexon-36572f03a7acf24d9b0e86479d435d007134c3f1.tar.gz
dexon-36572f03a7acf24d9b0e86479d435d007134c3f1.tar.bz2
dexon-36572f03a7acf24d9b0e86479d435d007134c3f1.tar.lz
dexon-36572f03a7acf24d9b0e86479d435d007134c3f1.tar.xz
dexon-36572f03a7acf24d9b0e86479d435d007134c3f1.tar.zst
dexon-36572f03a7acf24d9b0e86479d435d007134c3f1.zip
Merge branch 'release/poc5-rc3' into develop
Diffstat (limited to 'ethutil')
-rw-r--r--ethutil/config.go2
-rw-r--r--ethutil/script.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/ethutil/config.go b/ethutil/config.go
index 5e36b06d2..feab23e02 100644
--- a/ethutil/config.go
+++ b/ethutil/config.go
@@ -50,7 +50,7 @@ func ReadConfig(base string) *config {
}
}
- Config = &config{ExecPath: path, Debug: true, Ver: "0.5.0 RC2"}
+ Config = &config{ExecPath: path, Debug: true, Ver: "0.5.0 RC3"}
Config.Log = NewLogger(LogFile|LogStd, LogLevelDebug)
Config.SetClientString("/Ethereum(G)")
}
diff --git a/ethutil/script.go b/ethutil/script.go
index 620658025..94e401406 100644
--- a/ethutil/script.go
+++ b/ethutil/script.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 {