Merge/v1.10.18

cmd/abigen/main.go

@@ -21,11 +21,9 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"regexp"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common/compiler"
@@ -59,24 +57,6 @@ var (
 		Name:  "combined-json",
 		Usage: "Path to the combined-json file generated by compiler",
 	}
-	solFlag = cli.StringFlag{
-		Name:  "sol",
-		Usage: "Path to the Ethereum contract Solidity source to build and bind",
-	}
-	solcFlag = cli.StringFlag{
-		Name:  "solc",
-		Usage: "Solidity compiler to use if source builds are requested",
-		Value: "solc",
-	}
-	vyFlag = cli.StringFlag{
-		Name:  "vy",
-		Usage: "Path to the Ethereum contract Vyper source to build and bind",
-	}
-	vyperFlag = cli.StringFlag{
-		Name:  "vyper",
-		Usage: "Vyper compiler to use if source builds are requested",
-		Value: "vyper",
-	}
 	excFlag = cli.StringFlag{
 		Name:  "exc",
 		Usage: "Comma separated types to exclude from binding",
@@ -107,10 +87,6 @@ func init() {
 		binFlag,
 		typeFlag,
 		jsonFlag,
-		solFlag,
-		solcFlag,
-		vyFlag,
-		vyperFlag,
 		excFlag,
 		pkgFlag,
 		outFlag,
@@ -122,7 +98,7 @@ func init() {
 }
 
 func abigen(c *cli.Context) error {
-	utils.CheckExclusive(c, abiFlag, jsonFlag, solFlag, vyFlag) // Only one source can be selected.
+	utils.CheckExclusive(c, abiFlag, jsonFlag) // Only one source can be selected.
 	if c.GlobalString(pkgFlag.Name) == "" {
 		utils.Fatalf("No destination package specified (--pkg)")
 	}
@@ -186,33 +162,9 @@ func abigen(c *cli.Context) error {
 		for _, kind := range strings.Split(c.GlobalString(excFlag.Name), ",") {
 			exclude[strings.ToLower(kind)] = true
 		}
-		var err error
 		var contracts map[string]*compiler.Contract
 
-		switch {
-		case c.GlobalIsSet(solFlag.Name):
-			contracts, err = compiler.CompileSolidity(c.GlobalString(solcFlag.Name), c.GlobalString(solFlag.Name))
-			if err != nil {
-				utils.Fatalf("Failed to build Solidity contract: %v", err)
-			}
-		case c.GlobalIsSet(vyFlag.Name):
-			output, err := compiler.CompileVyper(c.GlobalString(vyperFlag.Name), c.GlobalString(vyFlag.Name))
-			if err != nil {
-				utils.Fatalf("Failed to build Vyper contract: %v", err)
-			}
-			contracts = make(map[string]*compiler.Contract)
-			for n, contract := range output {
-				name := n
-				// Sanitize the combined json names to match the
-				// format expected by solidity.
-				if !strings.Contains(n, ":") {
-					// Remove extra path components
-					name = abi.ToCamelCase(strings.TrimSuffix(filepath.Base(name), ".vy"))
-				}
-				contracts[name] = contract
-			}
-
-		case c.GlobalIsSet(jsonFlag.Name):
+		if c.GlobalIsSet(jsonFlag.Name) {
 			jsonOutput, err := os.ReadFile(c.GlobalString(jsonFlag.Name))
 			if err != nil {
 				utils.Fatalf("Failed to read combined-json from compiler: %v", err)

common/compiler/helpers.go

@@ -17,14 +17,6 @@
 // Package compiler wraps the Solidity and Vyper compiler executables (solc; vyper).
 package compiler
 
-import (
-	"bytes"
-	"os"
-	"regexp"
-)
-
-var versionRegexp = regexp.MustCompile(`([0-9]+)\.([0-9]+)\.([0-9]+)`)
-
 // Contract contains information about a compiled contract, alongside its code and runtime code.
 type Contract struct {
 	Code        string            `json:"code"`
@@ -51,15 +43,3 @@ type ContractInfo struct {
 	DeveloperDoc    interface{} `json:"developerDoc"`
 	Metadata        string      `json:"metadata"`
 }
-
-func slurpFiles(files []string) (string, error) {
-	var concat bytes.Buffer
-	for _, file := range files {
-		content, err := os.ReadFile(file)
-		if err != nil {
-			return "", err
-		}
-		concat.Write(content)
-	}
-	return concat.String(), nil
-}

common/compiler/solidity.go

@@ -14,26 +14,14 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// Package compiler wraps the Solidity and Vyper compiler executables (solc; vyper).
+// Package compiler wraps the ABI compilation outputs.
 package compiler
 
 import (
-	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
 )
 
-// Solidity contains information about the solidity compiler.
-type Solidity struct {
-	Path, Version, FullVersion string
-	Major, Minor, Patch        int
-	ExtraAllowedPath           []string
-}
-
 // --combined-output format
 type solcOutput struct {
 	Contracts map[string]struct {
@@ -59,109 +47,6 @@ type solcOutputV8 struct {
 	Version string
 }
 
-func (s *Solidity) allowedPaths() string {
-	paths := []string{".", "./", "../"} // default to support relative paths
-	if len(s.ExtraAllowedPath) > 0 {
-		paths = append(paths, s.ExtraAllowedPath...)
-	}
-	return strings.Join(paths, ", ")
-}
-
-func (s *Solidity) makeArgs() []string {
-	p := []string{
-		"--combined-json", "bin,bin-runtime,srcmap,srcmap-runtime,abi,userdoc,devdoc",
-		"--optimize", // code optimizer switched on
-		"--allow-paths", s.allowedPaths(),
-	}
-	if s.Major > 0 || s.Minor > 4 || s.Patch > 6 {
-		p[1] += ",metadata,hashes"
-	}
-	return p
-}
-
-// SolidityVersion runs solc and parses its version output.
-func SolidityVersion(solc string) (*Solidity, error) {
-	if solc == "" {
-		solc = "solc"
-	}
-	var out bytes.Buffer
-	cmd := exec.Command(solc, "--version")
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return nil, err
-	}
-	matches := versionRegexp.FindStringSubmatch(out.String())
-	if len(matches) != 4 {
-		return nil, fmt.Errorf("can't parse solc version %q", out.String())
-	}
-	s := &Solidity{Path: cmd.Path, FullVersion: out.String(), Version: matches[0]}
-	if s.Major, err = strconv.Atoi(matches[1]); err != nil {
-		return nil, err
-	}
-	if s.Minor, err = strconv.Atoi(matches[2]); err != nil {
-		return nil, err
-	}
-	if s.Patch, err = strconv.Atoi(matches[3]); err != nil {
-		return nil, err
-	}
-	return s, nil
-}
-
-// CompileSolidityString builds and returns all the contracts contained within a source string.
-func CompileSolidityString(solc, source string) (map[string]*Contract, error) {
-	if len(source) == 0 {
-		return nil, errors.New("solc: empty source string")
-	}
-	s, err := SolidityVersion(solc)
-	if err != nil {
-		return nil, err
-	}
-	return s.CompileSource(source)
-}
-
-// CompileSolidity compiles all given Solidity source files.
-func CompileSolidity(solc string, sourcefiles ...string) (map[string]*Contract, error) {
-	if len(sourcefiles) == 0 {
-		return nil, errors.New("solc: no source files")
-	}
-	s, err := SolidityVersion(solc)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.CompileFiles(sourcefiles...)
-}
-
-// CompileSource builds and returns all the contracts contained within a source string.
-func (s *Solidity) CompileSource(source string) (map[string]*Contract, error) {
-	args := append(s.makeArgs(), "--")
-	cmd := exec.Command(s.Path, append(args, "-")...)
-	cmd.Stdin = strings.NewReader(source)
-	return s.run(cmd, source)
-}
-
-// CompileFiles compiles all given Solidity source files.
-func (s *Solidity) CompileFiles(sourcefiles ...string) (map[string]*Contract, error) {
-	source, err := slurpFiles(sourcefiles)
-	if err != nil {
-		return nil, err
-	}
-	args := append(s.makeArgs(), "--")
-	cmd := exec.Command(s.Path, append(args, sourcefiles...)...)
-	return s.run(cmd, source)
-}
-
-func (s *Solidity) run(cmd *exec.Cmd, source string) (map[string]*Contract, error) {
-	var stderr, stdout bytes.Buffer
-	cmd.Stderr = &stderr
-	cmd.Stdout = &stdout
-	if err := cmd.Run(); err != nil {
-		return nil, fmt.Errorf("solc: %v\n%s", err, stderr.Bytes())
-	}
-	return ParseCombinedJSON(stdout.Bytes(), source, s.Version, s.Version, strings.Join(s.makeArgs(), " "))
-}
-
 // ParseCombinedJSON takes the direct output of a solc --combined-output run and
 // parses it into a map of string contract name to Contract structs. The
 // provided source, language and compiler version, and compiler options are all