diff options
author | Felix Lange <fjl@twurst.com> | 2016-06-15 06:36:31 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2016-08-17 23:39:04 +0800 |
commit | 1a9e66915b415cb1ca2bc2680f8fb4ff1883787c (patch) | |
tree | 849620e85ab94fccf1e49a9a2ea9602d700ea7c1 /cmd | |
parent | 84d11c19fd246e245906ca7e498a67f6e0c55e1e (diff) | |
download | dexon-1a9e66915b415cb1ca2bc2680f8fb4ff1883787c.tar dexon-1a9e66915b415cb1ca2bc2680f8fb4ff1883787c.tar.gz dexon-1a9e66915b415cb1ca2bc2680f8fb4ff1883787c.tar.bz2 dexon-1a9e66915b415cb1ca2bc2680f8fb4ff1883787c.tar.lz dexon-1a9e66915b415cb1ca2bc2680f8fb4ff1883787c.tar.xz dexon-1a9e66915b415cb1ca2bc2680f8fb4ff1883787c.tar.zst dexon-1a9e66915b415cb1ca2bc2680f8fb4ff1883787c.zip |
common/compiler: simplify solc wrapper
Support for legacy version 0.9.x is gone. The compiler version is no
longer cached. Compilation results (and the version) are read directly
from stdout using the --combined-json flag. As a workaround for
ethereum/solidity#651, source code is written to a temporary file before
compilation.
Integration of solc in package ethapi and cmd/abigen is now much simpler
because the compiler wrapper is no longer passed around as a pointer.
Fixes #2806, accidentally
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/abigen/main.go | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index f36391351..9c9ab6d31 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -68,18 +68,7 @@ func main() { for _, kind := range strings.Split(*excFlag, ",") { exclude[strings.ToLower(kind)] = true } - // Build the Solidity source into bindable components - solc, err := compiler.New(*solcFlag) - if err != nil { - fmt.Printf("Failed to locate Solidity compiler: %v\n", err) - os.Exit(-1) - } - source, err := ioutil.ReadFile(*solFlag) - if err != nil { - fmt.Printf("Failed to read Soldity source code: %v\n", err) - os.Exit(-1) - } - contracts, err := solc.Compile(string(source)) + contracts, err := compiler.CompileSolidity(*solcFlag, *solFlag) if err != nil { fmt.Printf("Failed to build Solidity contract: %v\n", err) os.Exit(-1) |