From 72826bb5adddedf0fd4fb9903e883d4c64fa18a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 16 Mar 2016 12:48:33 +0200 Subject: accounts/abi/bind, cmd/abigen: Go API generator around an EVM ABI --- cmd/abigen/main.go | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 cmd/abigen/main.go (limited to 'cmd/abigen') diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go new file mode 100644 index 000000000..d36784de8 --- /dev/null +++ b/cmd/abigen/main.go @@ -0,0 +1,71 @@ +// Copyright 2016 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the go-ethereum library. If not, see . + +package main + +import ( + "flag" + "fmt" + "io/ioutil" + "os" + + "github.com/ethereum/go-ethereum/accounts/abi/bind" +) + +var ( + abiFlag = flag.String("abi", "", "Path to the Ethereum contract ABI json to bind") + pkgFlag = flag.String("pkg", "", "Go package name to generate the binding into") + typFlag = flag.String("type", "", "Go struct name for the binding (default = package name)") + outFlag = flag.String("out", "", "Output path for the generated binding") +) + +func main() { + // Parse and validate the command line flags + flag.Parse() + + if *abiFlag == "" { + fmt.Printf("No contract ABI path specified (--abi)\n") + os.Exit(-1) + } + if *pkgFlag == "" { + fmt.Printf("No destination Go package specified (--pkg)\n") + os.Exit(-1) + } + // Generate the contract binding + in, err := ioutil.ReadFile(*abiFlag) + if err != nil { + fmt.Printf("Failed to read input ABI: %v\n", err) + os.Exit(-1) + } + kind := *typFlag + if kind == "" { + kind = *pkgFlag + } + code, err := bind.Bind(string(in), *pkgFlag, kind) + if err != nil { + fmt.Printf("Failed to generate ABI binding: %v\n", err) + os.Exit(-1) + } + // Either flush it out to a file or display on the standard output + if *outFlag == "" { + fmt.Printf("%s\n", code) + return + } + if err := ioutil.WriteFile(*outFlag, []byte(code), 0600); err != nil { + fmt.Printf("Failed to write ABI binding: %v\n", err) + os.Exit(-1) + } +} -- cgit v1.2.3 From 86cfc22c79594bd0d9625650dcbfb60c3e6ba9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 17 Mar 2016 19:27:37 +0200 Subject: accounts/abi/bind: constructor, auth utils and various backends --- cmd/abigen/main.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'cmd/abigen') diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index d36784de8..227c390a6 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -27,9 +27,10 @@ import ( var ( abiFlag = flag.String("abi", "", "Path to the Ethereum contract ABI json to bind") + binFlag = flag.String("bin", "", "Path to the Ethereum contract bytecode (generate deploy method)") pkgFlag = flag.String("pkg", "", "Go package name to generate the binding into") typFlag = flag.String("type", "", "Go struct name for the binding (default = package name)") - outFlag = flag.String("out", "", "Output path for the generated binding") + outFlag = flag.String("out", "", "Output path for the generated binding (default = stdout)") ) func main() { @@ -44,17 +45,25 @@ func main() { fmt.Printf("No destination Go package specified (--pkg)\n") os.Exit(-1) } - // Generate the contract binding - in, err := ioutil.ReadFile(*abiFlag) + // Read the ABI json from disk and optionally the contract bytecode too + abi, err := ioutil.ReadFile(*abiFlag) if err != nil { fmt.Printf("Failed to read input ABI: %v\n", err) os.Exit(-1) } + bin := []byte{} + if *binFlag != "" { + if bin, err = ioutil.ReadFile(*binFlag); err != nil { + fmt.Printf("Failed to read input bytecode: %v\n", err) + os.Exit(-1) + } + } + // Generate the contract binding kind := *typFlag if kind == "" { kind = *pkgFlag } - code, err := bind.Bind(string(in), *pkgFlag, kind) + code, err := bind.Bind(string(abi), string(bin), *pkgFlag, kind) if err != nil { fmt.Printf("Failed to generate ABI binding: %v\n", err) os.Exit(-1) -- cgit v1.2.3 From 73308dbe0e08db015a7c461b5be1755dc3fcc737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 21 Mar 2016 14:34:49 +0200 Subject: accounts/abi/bind, cmd/abigen: port to templates, bind to solidity --- cmd/abigen/main.go | 84 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 20 deletions(-) (limited to 'cmd/abigen') diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 227c390a6..329e9b109 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -17,53 +17,97 @@ package main import ( + "encoding/json" "flag" "fmt" "io/ioutil" "os" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/common/compiler" ) var ( abiFlag = flag.String("abi", "", "Path to the Ethereum contract ABI json to bind") binFlag = flag.String("bin", "", "Path to the Ethereum contract bytecode (generate deploy method)") - pkgFlag = flag.String("pkg", "", "Go package name to generate the binding into") typFlag = flag.String("type", "", "Go struct name for the binding (default = package name)") - outFlag = flag.String("out", "", "Output path for the generated binding (default = stdout)") + + solFlag = flag.String("sol", "", "Path to the Ethereum contract Solidity source to build and bind") + solcFlag = flag.String("solc", "solc", "Solidity compiler to use if source builds are requested") + + pkgFlag = flag.String("pkg", "", "Go package name to generate the binding into") + outFlag = flag.String("out", "", "Output file for the generated binding (default = stdout)") ) func main() { - // Parse and validate the command line flags + // Parse and ensure all needed inputs are specified flag.Parse() - if *abiFlag == "" { - fmt.Printf("No contract ABI path specified (--abi)\n") + if *abiFlag == "" && *solFlag == "" { + fmt.Printf("No contract ABI (--abi) or Solidity source (--sol) specified\n") + os.Exit(-1) + } else if (*abiFlag != "" || *binFlag != "" || *typFlag != "") && *solFlag != "" { + fmt.Printf("Contract ABI (--abi), bytecode (--bin) and type (--type) flags are mutually exclusive with the Solidity source (--sol) flag\n") os.Exit(-1) } if *pkgFlag == "" { fmt.Printf("No destination Go package specified (--pkg)\n") os.Exit(-1) } - // Read the ABI json from disk and optionally the contract bytecode too - abi, err := ioutil.ReadFile(*abiFlag) - if err != nil { - fmt.Printf("Failed to read input ABI: %v\n", err) - os.Exit(-1) - } - bin := []byte{} - if *binFlag != "" { - if bin, err = ioutil.ReadFile(*binFlag); err != nil { - fmt.Printf("Failed to read input bytecode: %v\n", err) + // If the entire solidity code was specified, build and bind based on that + var ( + abis []string + bins []string + types []string + ) + if *solFlag != "" { + 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)) + if err != nil { + fmt.Printf("Failed to build Solidity contract: %v\n", err) + os.Exit(-1) + } + for name, contract := range contracts { + abi, _ := json.Marshal(contract.Info.AbiDefinition) // Flatten the compiler parse + abis = append(abis, string(abi)) + bins = append(bins, contract.Code) + types = append(types, name) + } + } else { + // Otherwise load up the ABI, optional bytecode and type name from the parameters + abi, err := ioutil.ReadFile(*abiFlag) + if err != nil { + fmt.Printf("Failed to read input ABI: %v\n", err) + os.Exit(-1) + } + abis = append(abis, string(abi)) + + bin := []byte{} + if *binFlag != "" { + if bin, err = ioutil.ReadFile(*binFlag); err != nil { + fmt.Printf("Failed to read input bytecode: %v\n", err) + os.Exit(-1) + } + } + bins = append(bins, string(bin)) + + kind := *typFlag + if kind == "" { + kind = *pkgFlag + } + types = append(types, kind) } // Generate the contract binding - kind := *typFlag - if kind == "" { - kind = *pkgFlag - } - code, err := bind.Bind(string(abi), string(bin), *pkgFlag, kind) + code, err := bind.Bind(types, abis, bins, *pkgFlag) if err != nil { fmt.Printf("Failed to generate ABI binding: %v\n", err) os.Exit(-1) -- cgit v1.2.3