diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-10 22:24:14 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-10 22:24:14 +0800 |
| commit | a32dffb0e88c6df4f5a5e2dcfad17252dd37a325 (patch) | |
| tree | 680a6565083b76ff2bcd75f9991f809b9d31305d | |
| parent | 3af35d922e5751dcf265d31abf293b759e570fec (diff) | |
| parent | e22e83b19aabc7711a6cd4e95bae460142d4db04 (diff) | |
| download | go-tangerine-a32dffb0e88c6df4f5a5e2dcfad17252dd37a325.tar.gz go-tangerine-a32dffb0e88c6df4f5a5e2dcfad17252dd37a325.tar.zst go-tangerine-a32dffb0e88c6df4f5a5e2dcfad17252dd37a325.zip | |
Merge branch 'release/poc5-rc3'
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ethutil/config.go | 2 | ||||
| -rw-r--r-- | ethutil/script.go | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -6,7 +6,7 @@ Ethereum Ethereum Go Development package (C) Jeffrey Wilcke Ethereum is currently in its testing phase. The current state is "Proof -of Concept 5.0 RC1". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)). +of Concept 5.0 RC3". For build instructions see the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)). Ethereum Go is split up in several sub packages Please refer to each individual package for more information. 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 { |