Merge branch 'release/poc5-rc3' into develop
This commit is contained in:
commit
36572f03a7
@ -6,7 +6,7 @@ Ethereum
|
|||||||
Ethereum Go Development package (C) Jeffrey Wilcke
|
Ethereum Go Development package (C) Jeffrey Wilcke
|
||||||
|
|
||||||
Ethereum is currently in its testing phase. The current state is "Proof
|
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
|
Ethereum Go is split up in several sub packages Please refer to each
|
||||||
individual package for more information.
|
individual package for more information.
|
||||||
|
@ -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.Log = NewLogger(LogFile|LogStd, LogLevelDebug)
|
||||||
Config.SetClientString("/Ethereum(G)")
|
Config.SetClientString("/Ethereum(G)")
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ func Compile(script string) ([]byte, error) {
|
|||||||
|
|
||||||
func CompileScript(script string) ([]byte, []byte, error) {
|
func CompileScript(script string) ([]byte, []byte, error) {
|
||||||
// Preprocess
|
// Preprocess
|
||||||
mainInput, initInput := mutan.PreProcess(script)
|
mainInput, initInput := mutan.PreParse(script)
|
||||||
// Compile main script
|
// Compile main script
|
||||||
mainScript, err := Compile(mainInput)
|
mainScript, err := Compile(mainInput)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user