Merge pull request #307 from RTradeLtd/fix/krab

Fix Mismatching IPFS Key Generation

CHANGELOG-V2.md

@@ -3,6 +3,42 @@
 This document tracks changes to Temporal and its related projects for all `v2.x.x`
 releases. See our [versioning policy](/VERSIONING.md) for more details.
 
+## v2.0.4
+
+* relevant PRs:
+  * [#305](https://github.com/RTradeLtd/Temporal/pull/305)
+  * [#306](https://github.com/RTradeLtd/Temporal/pull/306)
+  * [#307](https://github.com/RTradeLtd/Temporal/pull/307)
+  * [#308](https://github.com/RTradeLtd/Temporal/pull/308)
+
+### scripts
+
+* miscellaneus script cleanup
+* add executable permissions to all scripts
+
+### configs
+
+* update zabbix monitoring template
+  * monitor all new services
+  * include graphs, and triggers for alerting
+
+### travis
+
+* fix personal access token for travis deployments
+
+### queue
+
+* fix key generation process
+
+### grpc clients
+
+* add client for kaas, and allow fallback mode
+
+### deps
+
+* general dependency update
+* update [RTradeLtd/config](https://github.com/RTradeLtd/config)
+
 ## v2.0.3
 
 * api/v2: fix private network creation ([#304](https://github.com/RTradeLtd/Temporal/pull/304))

Makefile

@@ -107,8 +107,8 @@ vendor:
 	# Nuke vendor directory
 	rm -rf vendor
 
-	# Update standard dependencies
-	dep ensure -v -update
+	# rebuild dependencies
+	dep ensure -v $(DEPFLAGS)
 
 	# Generate IPFS dependencies
 	rm -rf vendor/github.com/ipfs/go-ipfs

api/v2/api.go

@@ -9,14 +9,14 @@ import (
 	"strconv"
 	"time"
 
+	gClients "github.com/RTradeLtd/Temporal/grpc-clients"
+
 	"github.com/streadway/amqp"
 
 	"github.com/RTradeLtd/Temporal/log"
 	"github.com/RTradeLtd/Temporal/rtfscluster"
 	"go.uber.org/zap"
 
-	"github.com/RTradeLtd/kaas"
-
 	"github.com/RTradeLtd/ChainRider-Go/dash"
 	"github.com/RTradeLtd/Temporal/queue"
 	"github.com/RTradeLtd/rtfs"
@@ -46,7 +46,7 @@ var (
 type API struct {
 	ipfs        rtfs.Manager
 	ipfsCluster *rtfscluster.ClusterManager
-	keys        *kaas.Client
+	keys        keys
 	r           *gin.Engine
 	cfg         *config.TemporalConfig
 	dbm         *database.Manager
@@ -169,7 +169,11 @@ func new(cfg *config.TemporalConfig, router *gin.Engine, l *zap.SugaredLogger, c
 		Blockchain: networkVersion,
 		Token:      cfg.APIKeys.ChainRider,
 	})
-	keys, err := kaas.NewClient(cfg.Services)
+	kb1, err := gClients.NewKaasClient(cfg.Services, false)
+	if err != nil {
+		return nil, err
+	}
+	kb2, err := gClients.NewKaasClient(cfg.Services, true)
 	if err != nil {
 		return nil, err
 	}
@@ -218,7 +222,7 @@ func new(cfg *config.TemporalConfig, router *gin.Engine, l *zap.SugaredLogger, c
 	return &API{
 		ipfs:        ipfs,
 		ipfsCluster: ipfsCluster,
-		keys:        keys,
+		keys:        keys{kb1: kb1, kb2: kb2},
 		cfg:         cfg,
 		service:     "api",
 		r:           router,