Snapshot, Multisig, Escrow Approval, Fee Model, Bug Fixes

.circleci/config.yml

@@ -1,20 +1,28 @@
 version: 2
+defaults: &defaults
+    working_directory: ~/zoobc
+    docker:
+        - image: circleci/golang:1.14.0-stretch
 jobs:
     prepare:
-        working_directory: ~/zoobc
-        docker:
-            - image: circleci/golang:1.14.0-stretch
+        <<: *defaults
         steps:
             - run:
-                  name: SSH
-                  command: git config --global url.ssh://[email protected]/zoobc.insteadOf https://github.com/zoobc
+                  name: GIT CONF
+                  command: |
+                      git config --global url."https://github:[email protected]".insteadOf "https://github.com"
             - checkout
+            - add_ssh_keys
+            - run:
+                  name: ENV SET
+                  command: |
+                      echo 'export GOPRIVATE=github.com/zoobc/*' >> $BASH_ENV
             - restore_cache:
                   key: gopkg-{{ .Branch }}-{{ checksum "go.sum" }}
             - run:
                   name: GOMOD
                   command: |
-                      if [ ! -d ls | grep go.mod ]; then
+                      if ! [ -f "go.mod" ]; then
                           go mod init
                       fi
                       go mod download
@@ -23,31 +31,17 @@ jobs:
                   paths:
                       - /go/pkg/mod
     test:
-        working_directory: ~/zoobc
-        docker:
-            - image: circleci/golang:1.14.0-stretch
-        environment:
-            - GOLANGCI_LINT: 1.20.0
+        <<: *defaults
         steps:
             - checkout
             - restore_cache:
                   key: gopkg-{{ .Branch }}-{{ checksum "go.sum" }}
-            - run:
-                  name: ↓ GOLANGCI-LINT
-                  command: |
-                      curl -sfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v${GOLANGCI_LINT}
             - run:
                   name: ↓ GOLINT
                   command: go get -u golang.org/x/lint/golint
             - run:
-                  name: TEST
-                  command: go test `go list ./... | egrep -v 'common/model|common/service'` --short
-            - run:
-                  name: GO FMT
-                  command: go fmt `go list ./... | egrep -v 'common/model|common/service|vendor'`
-            - run:
-                  name: GOLANGCI-LINT RUN
-                  command: golangci-lint run
+                  name: GO Test
+                  command: make test
             - run:
                   name: GOLINT RUN
                   command: golint `go list ./... | egrep -v 'vendor|common/model|common/service'`
@@ -56,9 +50,7 @@ jobs:
                   paths:
                       - /go/pkg/mod
     build:
-        working_directory: ~/zoobc
-        docker:
-            - image: circleci/golang:1.14.0-stretch
+        <<: *defaults
         steps:
             - checkout
             - restore_cache:
@@ -77,15 +69,13 @@ jobs:
                   name: BUILD
                   command: |
                       go build -o ./dist/zoobc
-            #                   rsync -va --exclude='*.db' ./resource ./dist
+            #                       rsync -va --exclude='*.db' ./resource ./dist
             - save_cache:
                   key: build-cache-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ./dist
     deploy-develop:
-        working_directory: ~/zoobc
-        docker:
-            - image: circleci/golang:1.14.0-stretch
+        <<: *defaults
         steps:
             - checkout
             - add_ssh_keys
@@ -115,9 +105,7 @@ jobs:
                   command: |
                       for host in $ln1 $ln2 $ln3; do ssh root@$host 'sudo systemctl start zoobc.service'; done
     deploy-staging:
-        working_directory: ~/zoobc
-        docker:
-            - image: circleci/golang:1.14.0-stretch
+        <<: *defaults
         steps:
             - checkout
             - add_ssh_keys
@@ -169,4 +157,4 @@ workflows:
                       - build
                   filters:
                       branches:
-                          only: staging
+                          only: staging

.gitignore

@@ -18,6 +18,10 @@ coverage.*
 resource/zoobc_*
 resource/snapshots*
 resource_cluster/zoobc_*
+resource/*.prof
 cmd/*.new
 accounts.txt
+.editorconfig
 .manual
+release/
+github.token

.golangci.yml

@@ -76,6 +76,9 @@ run:
 
 issues:
     exclude-rules:
+        - text: "should be"
+          linters:
+              - stylecheck
         - text: "rows.Err must be checked"
           linters:
               - rowserrcheck

Makefile

@@ -0,0 +1,79 @@
+BIN_DIR := $(GOPATH)/bin
+GOLANGCILINT := $(BIN_DIR)/golangci-lint
+GOLANGCILINT_VERSION := v1.20.0
+XGO := $(BIN_DIR)/xgo
+VERSION ?= latest
+BINARY_CORE := zoobc
+BINARY_CLI := zoomd
+GITHUB_TOKEN ?= $(shell cat github.token)
+
+.PHONY: test
+test: go-fmt golangci-lint
+	$(info    running unit tests...)
+	go test `go list ./... | egrep -v 'common/model|common/service'` --short
+
+$(GOLANGCILINT):
+	$(info    fetching golangci-lint...)
+	curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin $(GOLANGCILINT_VERSION)
+
+$(XGO):
+	$(info    fetching zoobc/xgo...)
+	go get github.com/zoobc/xgo
+
+.PHONY: golangci-lint
+golangci-lint: $(GOLANGCILINT)
+	$(info    running linter...)
+	golangci-lint run
+
+.PHONY: go-fmt
+go-fmt:
+	$(info    running go-fmt...)
+	go fmt `go list ./... | egrep -v 'common/model|common/service|vendor'`
+
+.PHONY: build
+build:
+	$(info    build core with host os as target...)
+	mkdir -p release
+	go build -o release/$(BINARY_CORE)-$(VERSION)
+
+.PHONY: core-linux
+core-linux: $(XGO)
+	$(info    build core with linux as target...)
+	mkdir -p release
+	xgo --targets=linux/amd64 -out=release/$(BINARY_CORE)-$(VERSION) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN)  ./
+
+.PHONY: core-windows
+core-windows: $(XGO)
+	$(info    build core with windows as target...)
+	mkdir -p release
+	xgo --targets=windows/* -out=release/$(BINARY_CORE)-$(VERSION) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN)  ./
+
+.PHONY: core-darwin
+core-darwin: $(XGO)
+	$(info    build core with darwin/macos as target...)
+	mkdir -p release
+	xgo --targets=darwin/* -out=release/$(BINARY_CORE)-$(VERSION) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN)  ./
+
+.PHONY: cmd-darwin
+cmd-darwin: $(XGO)
+	$(info    build cmd with darwin/macos as target...)
+	mkdir -p cmd/release
+	xgo --targets=darwin/* -out=cmd/release/$(BINARY_CORE)-$(VERSION) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN)  ./cmd/
+
+.PHONY: cmd-linux
+cmd-linux: $(XGO)
+	$(info    build cmd with linux as target...)
+	mkdir -p release
+	xgo --targets=linux/amd64 -out=cmd/release/$(BINARY_CORE)-$(VERSION) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN)  ./
+
+.PHONY: cmd-windows
+cmd-windows: $(XGO)
+	$(info    build cmd with windows as target...)
+	mkdir -p release
+	xgo --targets=windows/* -out=cmd/release/$(BINARY_CORE)-$(VERSION) --go-private=github.com/zoobc/* --github-token=$(GITHUB_TOKEN)  ./
+
+.PHONY: release-core
+release-core: core-linux
+
+.PHONY: release-cmd
+release-cmd: cmd-linux

api/api.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"net/http"
 
-	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
+	grpcMiddleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	log "github.com/sirupsen/logrus"
 	"github.com/zoobc/zoobc-core/api/handler"
@@ -56,7 +56,7 @@ func startGrpcServer(
 	}
 	grpcServer := grpc.NewServer(
 		grpc.Creds(creds),
-		grpc.UnaryInterceptor(grpc_middleware.ChainUnaryServer(
+		grpc.UnaryInterceptor(grpcMiddleware.ChainUnaryServer(
 			interceptor.NewServerRateLimiterInterceptor(constant.MaxAPIRequestPerSecond),
 			interceptor.NewServerInterceptor(
 				logger,
@@ -167,6 +167,14 @@ func startGrpcServer(
 		)})
 	// Set GRPC handler for health check
 	rpcService.RegisterHealthCheckServiceServer(grpcServer, &handler.HealthCheckHandler{})
+
+	// Set GRPC handler for account dataset
+	rpcService.RegisterAccountDatasetServiceServer(grpcServer, &handler.AccountDatasetHandler{
+		Service: service.NewAccountDatasetService(
+			query.NewAccountDatasetsQuery(),
+			queryExecutor,
+		),
+	})
 	// run grpc-gateway handler
 	go func() {
 		if err := grpcServer.Serve(serv); err != nil {
@@ -243,5 +251,6 @@ func runProxy(apiPort, rpcPort int) error {
 	_ = rpcService.RegisterEscrowTransactionServiceHandlerFromEndpoint(ctx, mux, fmt.Sprintf("localhost:%d", rpcPort), opts)
 	_ = rpcService.RegisterMultisigServiceHandlerFromEndpoint(ctx, mux, fmt.Sprintf("localhost:%d", rpcPort), opts)
 	_ = rpcService.RegisterHealthCheckServiceHandlerFromEndpoint(ctx, mux, fmt.Sprintf("localhost:%d", rpcPort), opts)
+	_ = rpcService.RegisterAccountDatasetServiceHandlerFromEndpoint(ctx, mux, fmt.Sprintf("localhost:%d", rpcPort), opts)
 	return http.ListenAndServe(fmt.Sprintf(":%d", apiPort), mux)
 }

api/client/GenerateNodeKey/client.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/zoobc/zoobc-core/common/crypto"
@@ -21,7 +20,7 @@ import (
 func main() {
 	var apiRPCPort int
 	if err := util.LoadConfig("../../../resource", "config", "toml"); err != nil {
-		logrus.Fatal(err)
+		log.Fatal(err)
 	} else {
 		apiRPCPort = viper.GetInt("apiRPCPort")
 		if apiRPCPort == 0 {

api/client/GetAccountBalance/client.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	rpc_model "github.com/zoobc/zoobc-core/common/model"
@@ -16,7 +15,7 @@ import (
 func main() {
 	var apiRPCPort int
 	if err := util.LoadConfig("../../../resource", "config", "toml"); err != nil {
-		logrus.Fatal(err)
+		log.Fatal(err)
 	} else {
 		apiRPCPort = viper.GetInt("apiRPCPort")
 		if apiRPCPort == 0 {

api/client/GetAccountDataset/main.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+	"github.com/zoobc/zoobc-core/common/model"
+	rpcService "github.com/zoobc/zoobc-core/common/service"
+	"github.com/zoobc/zoobc-core/common/util"
+	"google.golang.org/grpc"
+)
+
+func main() {
+	var apiRPCPort int
+	if err := util.LoadConfig("../../../resource", "config", "toml"); err != nil {
+		logrus.Fatal(err)
+	} else {
+		apiRPCPort = viper.GetInt("apiRPCPort")
+	}
+
+	conn, err := grpc.Dial(fmt.Sprintf(":%d", apiRPCPort), grpc.WithInsecure())
+	if err != nil {
+		log.Fatalf("did not connect: %s", err)
+	}
+	defer conn.Close()
+
+	c := rpcService.NewAccountDatasetServiceClient(conn)
+	response, err := c.GetAccountDataset(context.Background(), &model.GetAccountDatasetRequest{
+		RecipientAccountAddress: "H1ftvv3n6CF5NDzdjmZKLRrBg6yPKHXpmatVUhQ5NWYx",
+	})
+	if err != nil {
+		log.Fatalf("error calling grpc GetAccountDatasets: %s", err.Error())
+	}
+	log.Printf("response from remote rpc_service.GetTransactions(): %s", response)
+}

api/client/GetAccountDatasets/main.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+	"github.com/zoobc/zoobc-core/common/model"
+	rpcService "github.com/zoobc/zoobc-core/common/service"
+	"github.com/zoobc/zoobc-core/common/util"
+	"google.golang.org/grpc"
+)
+
+func main() {
+	var apiRPCPort int
+	if err := util.LoadConfig("../../../resource", "config", "toml"); err != nil {
+		logrus.Fatal(err)
+	} else {
+		apiRPCPort = viper.GetInt("apiRPCPort")
+	}
+
+	conn, err := grpc.Dial(fmt.Sprintf(":%d", apiRPCPort), grpc.WithInsecure())
+	if err != nil {
+		log.Fatalf("did not connect: %s", err)
+	}
+	defer conn.Close()
+
+	c := rpcService.NewAccountDatasetServiceClient(conn)
+	response, err := c.GetAccountDatasets(context.Background(), &model.GetAccountDatasetsRequest{
+		SetterAccountAddress:    "HlZLh3VcnNlvByWoAzXOQ2jAlwFOiyO9_njI3oq5Ygha",
+		RecipientAccountAddress: "H1ftvv3n6CF5NDzdjmZKLRrBg6yPKHXpmatVUhQ5NWYx",
+	})
+	if err != nil {
+		log.Fatalf("error calling grpc GetAccountDatasets: %s", err.Error())
+	}
+	log.Printf("response from remote rpc_service.GetTransactions(): %s", response)
+}