forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Include metadata with solc compiler outputs

Browse source
This commit is contained in:
Steve Waldman 2017-01-25 14:57:13 -08:00
parent 1886d03faa
commit 240b6b4b2a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/compiler/solidity.go
View file

@ -34,7 +34,7 @@ import (
var ( var (
versionRegexp = regexp.MustCompile(`[0-9]+\.[0-9]+\.[0-9]+`) versionRegexp = regexp.MustCompile(`[0-9]+\.[0-9]+\.[0-9]+`)
solcParams = []string{ solcParams = []string{
"--combined-json", "bin,abi,userdoc,devdoc", "--combined-json", "bin,abi,userdoc,devdoc,metadata",
"--add-std", // include standard lib contracts "--add-std", // include standard lib contracts
"--optimize", // code optimizer switched on "--optimize", // code optimizer switched on
} }
@ -54,6 +54,7 @@ type ContractInfo struct {
AbiDefinition interface{} `json:"abiDefinition"` AbiDefinition interface{} `json:"abiDefinition"`
UserDoc interface{} `json:"userDoc"` UserDoc interface{} `json:"userDoc"`
DeveloperDoc interface{} `json:"developerDoc"` DeveloperDoc interface{} `json:"developerDoc"`
Metadata interface{} `json:"metadata"`
} }
// Solidity contains information about the solidity compiler. // Solidity contains information about the solidity compiler.
@ -63,7 +64,7 @@ type Solidity struct {
// --combined-output format // --combined-output format
type solcOutput struct { type solcOutput struct {
Contracts map[string]struct{ Bin, Abi, Devdoc, Userdoc string } Contracts map[string]struct{ Bin, Abi, Devdoc, Userdoc, Metadata string }
Version string Version string
} }
@ -146,6 +147,10 @@ func runsolc(cmd *exec.Cmd, source string) (map[string]*Contract, error) {
if err := json.Unmarshal([]byte(info.Devdoc), &devdoc); err != nil { if err := json.Unmarshal([]byte(info.Devdoc), &devdoc); err != nil {
return nil, fmt.Errorf("solc: error reading dev doc: %v", err) return nil, fmt.Errorf("solc: error reading dev doc: %v", err)
} }
var metadata interface{}
if err := json.Unmarshal([]byte(info.Metadata), &metadata); err != nil {
return nil, fmt.Errorf("solc: error reading metadata: %v", err)
}
contracts[name] = &Contract{ contracts[name] = &Contract{
Code: "0x" + info.Bin, Code: "0x" + info.Bin,
Info: ContractInfo{ Info: ContractInfo{
@ -157,6 +162,7 @@ func runsolc(cmd *exec.Cmd, source string) (map[string]*Contract, error) {
AbiDefinition: abi, AbiDefinition: abi,
UserDoc: userdoc, UserDoc: userdoc,
DeveloperDoc: devdoc, DeveloperDoc: devdoc,
Metadata: metadata,
}, },
} }
} }