aboutsummaryrefslogtreecommitdiffstats
path: root/common/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'common/compiler')
-rw-r--r--common/compiler/solidity.go110
-rw-r--r--common/compiler/solidity_test.go42
2 files changed, 82 insertions, 70 deletions
diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go
index 6790f9a1d..0cfd41c95 100644
--- a/common/compiler/solidity.go
+++ b/common/compiler/solidity.go
@@ -18,7 +18,8 @@ import (
)
const (
- flair = "Christian <c@ethdev.com> and Lefteris <lefteris@ethdev.com> (c) 2014-2015"
+ // flair = "Christian <c@ethdev.com> and Lefteris <lefteris@ethdev.com> (c) 2014-2015"
+ flair = ""
languageVersion = "0"
)
@@ -91,7 +92,7 @@ func (sol *Solidity) Version() string {
return sol.version
}
-func (sol *Solidity) Compile(source string) (contract *Contract, err error) {
+func (sol *Solidity) Compile(source string) (contracts map[string]*Contract, err error) {
if len(source) == 0 {
err = fmt.Errorf("empty source")
@@ -122,58 +123,61 @@ func (sol *Solidity) Compile(source string) (contract *Contract, err error) {
err = fmt.Errorf("solc error: missing code output")
return
}
- if len(matches) > 1 {
- err = fmt.Errorf("multi-contract sources are not supported")
- return
- }
- _, file := filepath.Split(matches[0])
- base := strings.Split(file, ".")[0]
-
- codeFile := filepath.Join(wd, base+".binary")
- abiDefinitionFile := filepath.Join(wd, base+".abi")
- userDocFile := filepath.Join(wd, base+".docuser")
- developerDocFile := filepath.Join(wd, base+".docdev")
- code, err := ioutil.ReadFile(codeFile)
- if err != nil {
- err = fmt.Errorf("error reading compiler output for code: %v", err)
- return
- }
- abiDefinitionJson, err := ioutil.ReadFile(abiDefinitionFile)
- if err != nil {
- err = fmt.Errorf("error reading compiler output for abiDefinition: %v", err)
- return
- }
- var abiDefinition interface{}
- err = json.Unmarshal(abiDefinitionJson, &abiDefinition)
-
- userDocJson, err := ioutil.ReadFile(userDocFile)
- if err != nil {
- err = fmt.Errorf("error reading compiler output for userDoc: %v", err)
- return
- }
- var userDoc interface{}
- err = json.Unmarshal(userDocJson, &userDoc)
-
- developerDocJson, err := ioutil.ReadFile(developerDocFile)
- if err != nil {
- err = fmt.Errorf("error reading compiler output for developerDoc: %v", err)
- return
- }
- var developerDoc interface{}
- err = json.Unmarshal(developerDocJson, &developerDoc)
-
- contract = &Contract{
- Code: string(code),
- Info: ContractInfo{
- Source: source,
- Language: "Solidity",
- LanguageVersion: languageVersion,
- CompilerVersion: sol.version,
- AbiDefinition: abiDefinition,
- UserDoc: userDoc,
- DeveloperDoc: developerDoc,
- },
+ contracts = make(map[string]*Contract)
+ for _, path := range matches {
+ _, file := filepath.Split(path)
+ base := strings.Split(file, ".")[0]
+
+ codeFile := filepath.Join(wd, base+".binary")
+ abiDefinitionFile := filepath.Join(wd, base+".abi")
+ userDocFile := filepath.Join(wd, base+".docuser")
+ developerDocFile := filepath.Join(wd, base+".docdev")
+
+ var code, abiDefinitionJson, userDocJson, developerDocJson []byte
+ code, err = ioutil.ReadFile(codeFile)
+ if err != nil {
+ err = fmt.Errorf("error reading compiler output for code: %v", err)
+ return
+ }
+ abiDefinitionJson, err = ioutil.ReadFile(abiDefinitionFile)
+ if err != nil {
+ err = fmt.Errorf("error reading compiler output for abiDefinition: %v", err)
+ return
+ }
+ var abiDefinition interface{}
+ err = json.Unmarshal(abiDefinitionJson, &abiDefinition)
+
+ userDocJson, err = ioutil.ReadFile(userDocFile)
+ if err != nil {
+ err = fmt.Errorf("error reading compiler output for userDoc: %v", err)
+ return
+ }
+ var userDoc interface{}
+ err = json.Unmarshal(userDocJson, &userDoc)
+
+ developerDocJson, err = ioutil.ReadFile(developerDocFile)
+ if err != nil {
+ err = fmt.Errorf("error reading compiler output for developerDoc: %v", err)
+ return
+ }
+ var developerDoc interface{}
+ err = json.Unmarshal(developerDocJson, &developerDoc)
+
+ contract := &Contract{
+ Code: "0x" + string(code),
+ Info: ContractInfo{
+ Source: source,
+ Language: "Solidity",
+ LanguageVersion: languageVersion,
+ CompilerVersion: sol.version,
+ AbiDefinition: abiDefinition,
+ UserDoc: userDoc,
+ DeveloperDoc: developerDoc,
+ },
+ }
+
+ contracts[base] = contract
}
return
diff --git a/common/compiler/solidity_test.go b/common/compiler/solidity_test.go
index 68e54a7ec..46f733e59 100644
--- a/common/compiler/solidity_test.go
+++ b/common/compiler/solidity_test.go
@@ -9,7 +9,7 @@ import (
"github.com/ethereum/go-ethereum/common"
)
-const solcVersion = "0.9.17"
+const solcVersion = "0.9.23"
var (
source = `
@@ -20,37 +20,45 @@ contract test {
}
}
`
- code = "605280600c6000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063c6888fa114602e57005b60376004356041565b8060005260206000f35b6000600782029050604d565b91905056"
- info = `{"source":"\ncontract test {\n /// @notice Will multiply ` + "`a`" + ` by 7.\n function multiply(uint a) returns(uint d) {\n return a * 7;\n }\n}\n","language":"Solidity","languageVersion":"0","compilerVersion":"0.9.17","abiDefinition":[{"constant":false,"inputs":[{"name":"a","type":"uint256"}],"name":"multiply","outputs":[{"name":"d","type":"uint256"}],"type":"function"}],"userDoc":{"methods":{"multiply(uint256)":{"notice":"Will multiply ` + "`a`" + ` by 7."}}},"developerDoc":{"methods":{}}}`
+ code = "0x605880600c6000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063c6888fa114602e57005b603d6004803590602001506047565b8060005260206000f35b60006007820290506053565b91905056"
+ info = `{"source":"\ncontract test {\n /// @notice Will multiply ` + "`a`" + ` by 7.\n function multiply(uint a) returns(uint d) {\n return a * 7;\n }\n}\n","language":"Solidity","languageVersion":"0","compilerVersion":"0.9.23","abiDefinition":[{"constant":false,"inputs":[{"name":"a","type":"uint256"}],"name":"multiply","outputs":[{"name":"d","type":"uint256"}],"type":"function"}],"userDoc":{"methods":{"multiply(uint256)":{"notice":"Will multiply ` + "`a`" + ` by 7."}}},"developerDoc":{"methods":{}}}`
- infohash = common.HexToHash("0x834075768a68e500e459b9c3213750c84de3df47156500cb01bb664d3f88c60a")
+ infohash = common.HexToHash("0xea782f674eb898e477c20e8a7cf11c2c28b09fa68b5278732104f7a101aed255")
)
func TestCompiler(t *testing.T) {
sol, err := New("")
if err != nil {
- t.Skip("no solc installed")
+ t.Skip("solc not found: skip")
+ } else if sol.Version() != solcVersion {
+ t.Logf("WARNING: a newer version of solc found (%v, expect %v)", sol.Version(), solcVersion)
}
- contract, err := sol.Compile(source)
+ contracts, err := sol.Compile(source)
if err != nil {
- t.Errorf("error compiling source. result %v: %v", contract, err)
+ t.Errorf("error compiling source. result %v: %v", contracts, err)
return
}
- /*
- if contract.Code != code {
- t.Errorf("wrong code, expected\n%s, got\n%s", code, contract.Code)
- }
- */
+
+ if len(contracts) != 1 {
+ t.Errorf("one contract expected, got\n%s", len(contracts))
+ }
+
+ if contracts["test"].Code != code {
+ t.Errorf("wrong code, expected\n%s, got\n%s", code, contracts["test"].Code)
+ }
+
}
func TestCompileError(t *testing.T) {
sol, err := New("")
if err != nil || sol.version != solcVersion {
- t.Skip("no solc installed")
+ t.Skip("solc not found: skip")
+ } else if sol.Version() != solcVersion {
+ t.Logf("WARNING: a newer version of solc found (%v, expect %v)", sol.Version(), solcVersion)
}
- contract, err := sol.Compile(source[2:])
+ contracts, err := sol.Compile(source[2:])
if err == nil {
- t.Errorf("error expected compiling source. got none. result %v", contract)
+ t.Errorf("error expected compiling source. got none. result %v", contracts)
return
}
}
@@ -78,11 +86,11 @@ func TestExtractInfo(t *testing.T) {
os.Remove(filename)
cinfohash, err := ExtractInfo(contract, filename)
if err != nil {
- t.Errorf("%v", err)
+ t.Errorf("error extracting info: %v", err)
}
got, err := ioutil.ReadFile(filename)
if err != nil {
- t.Errorf("%v", err)
+ t.Errorf("error reading '%v': %v", filename, err)
}
if string(got) != info {
t.Errorf("incorrect info.json extracted, expected:\n%s\ngot\n%s", info, string(got))
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 09:44:19 +0800