Client code generation

.circleci/config.yml

@@ -81,6 +81,21 @@ jobs:
           command: |
             make e2e-test
 
+  cligen-test:
+    working_directory: /go/src/github.com/bluele/hypermint
+    docker:
+      - image: hypermint/go-rust:v0.2.0
+    environment:
+      GO111MODULE: "on"
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /
+      - run:
+          name: "cligen-test"
+          command: |
+            make cligen-test
+
   pre-release:
     <<: *release_config
     steps:
@@ -133,6 +148,12 @@ workflows:
               only: /.*/
           requires:
             - build
+      - cligen-test:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - build
   pre-release:
     jobs:
       - pre-release:

Makefile

@@ -3,6 +3,8 @@ GO_BIN?=go
 BUILD_DIR?=./build
 HMD?=$(BUILD_DIR)/hmd
 HMCLI?=$(BUILD_DIR)/hmcli
+ABIGEN?=$(BUILD_DIR)/abigen
+CLIGEN?=$(BUILD_DIR)/cligen
 HMD_HOME?=${HOME}/.hmd
 HMCLI_HOME?=${HOME}/.hmcli
 
@@ -30,9 +32,17 @@ server:
 cli:
 	$(GO_BUILD_CMD) -o $(HMCLI) ./cmd/hmcli
 
+abigen:
+	$(GO_BUILD_CMD) -o $(ABIGEN) ./cmd/abigen
+
+cligen:
+	$(GO_BUILD_CMD) -o $(CLIGEN) ./cmd/cligen
+
 release-build:
 	$(GO_BUILD_CMD) -o $(HMD)_$(GOOS)_$(GOARCH)   ./cmd/hmd
 	$(GO_BUILD_CMD) -o $(HMCLI)_$(GOOS)_$(GOARCH) ./cmd/hmcli
+	$(GO_BUILD_CMD) -o $(ABIGEN)_$(GOOS)_$(GOARCH) ./cmd/abigen
+	$(GO_BUILD_CMD) -o $(CLIGEN)_$(GOOS)_$(GOARCH) ./cmd/cligen
 
 fmt:
 	cd ./hmc && cargo fmt
@@ -66,6 +76,9 @@ integration-test:
 e2e-test:
 	$(MAKE) -C ./tests e2e-test
 
+cligen-test:
+	$(MAKE) -C ./tests cligen-test
+
 build-image:
 	docker build . -t bluele/hypermint:${VERSION}
 

cmd/abigen/main.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"github.com/bluele/hypermint/pkg/account/abi/bind"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"io/ioutil"
+	"os"
+	"path"
+	"strings"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "abigen",
+	Short: "Code generation from ABI",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if err := viper.BindPFlags(cmd.Flags()); err != nil {
+			return err
+		}
+		pkg := viper.GetString("package")
+		outdir := viper.GetString("outdir")
+		if len(outdir) == 0 {
+			outdir = pkg
+		}
+		name := viper.GetString("name")
+		if len(name) == 0 {
+			return errors.New("name not specified")
+		}
+		abi := viper.GetString("abi")
+		mock := viper.GetBool("mock")
+		return Generate(outdir, pkg, name, abi, mock)
+	},
+}
+
+func Generate(outdir, pkg, name, abiJsonFilename string, mock bool) error {
+	if abiJson, err := ioutil.ReadFile(abiJsonFilename); err != nil {
+		return err
+	} else if src, err := bind.Bind(pkg, name, string(abiJson), mock); err != nil {
+		return err
+	} else {
+		if err := os.MkdirAll(pkg, 0755); err != nil {
+			return err
+		}
+		if err := ioutil.WriteFile(path.Join(outdir, name+".go"), []byte(src), 0644); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func init() {
+	rootCmd.Flags().String("package", "contract", "package name")
+	rootCmd.Flags().String("name", "", "contract name")
+	rootCmd.Flags().String("abi", "", "abi json")
+	rootCmd.Flags().String("outdir", "", "output dir")
+	rootCmd.Flags().Bool("mock", false, "generate mock")
+	viper.AutomaticEnv()
+	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+}
+
+func main() {
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}

cmd/cligen/main.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"github.com/bluele/hypermint/pkg/account/abi/bind"
+	clibind "github.com/bluele/hypermint/pkg/account/cli/bind"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"io/ioutil"
+	"os"
+	"path"
+	"strings"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "cligen",
+	Short: "Code generation from ABI",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if err := viper.BindPFlags(cmd.Flags()); err != nil {
+			return err
+		}
+		pkg := viper.GetString("package")
+		outdir := viper.GetString("outdir")
+		if len(outdir) == 0 {
+			outdir = pkg
+		}
+		name := viper.GetString("name")
+		if len(name) == 0 {
+			return errors.New("name not specified")
+		}
+		abi := viper.GetString("abi")
+		return Generate(outdir, pkg, name, abi)
+	},
+}
+
+func Generate(outdir, pkg, name, abiJsonFilename string) error {
+	if abiJson, err := ioutil.ReadFile(abiJsonFilename); err != nil {
+		return err
+	} else if boundSrc, err := bind.Bind(pkg, name, string(abiJson), false); err != nil {
+		return err
+	} else if src, err := clibind.Bind(pkg, name, string(abiJson)); err != nil {
+		return err
+	} else {
+		if err := os.MkdirAll(outdir, 0755); err != nil {
+			return err
+		}
+		if err := ioutil.WriteFile(path.Join(outdir, name+".go"), []byte(boundSrc), 0644); err != nil {
+			return err
+		}
+		if err := ioutil.WriteFile(path.Join(outdir, name+"cmd.go"), []byte(src), 0644); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+
+func init() {
+	rootCmd.Flags().String("package", "contract", "package name")
+	rootCmd.Flags().String("name", "", "contract name")
+	rootCmd.Flags().String("abi", "", "abi json")
+	rootCmd.Flags().String("outdir", "", "output dir")
+	viper.AutomaticEnv()
+	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+}
+
+func main() {
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}

example/token/src/lib.rs

@@ -5,7 +5,7 @@ use hmcdk::prelude::*;
 
 static TOTAL: i64 = 10000;
 
-#[contract]
+#[contract(readonly)]
 pub fn get_balance() -> R<i64> {
     Ok(Some(read_state(&get_sender()?)?))
 }

go.mod

@@ -17,6 +17,8 @@ require (
 	github.com/gogo/protobuf v1.2.1
 	github.com/golang/protobuf v1.3.2
 	github.com/google/uuid v1.0.0 // indirect
+	github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365
+	github.com/immutability-io/go-ethereum-hdwallet v0.0.0-20190728144135-ecdde4803440
 	github.com/kr/pretty v0.1.0
 	github.com/mattn/go-isatty v0.0.4
 	github.com/mattn/go-shellwords v1.0.5
@@ -26,9 +28,9 @@ require (
 	github.com/perlin-network/life v0.0.0-20181106205055-98065d82a6ee
 	github.com/pkg/errors v0.8.1
 	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/spf13/cobra v0.0.1
-	github.com/spf13/pflag v1.0.3
-	github.com/spf13/viper v1.0.0
+	github.com/spf13/cobra v0.0.5
+	github.com/spf13/pflag v1.0.5
+	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.3.0
 	github.com/tendermint/go-amino v0.14.1
 	github.com/tendermint/iavl v0.12.4