Merge pull request #50 from NodeFactoryIo/dev

Release v0.3.0
NodeFactoryIo · Dec 10, 2020 · 65d8ca0 · 65d8ca0
2 parents 203a5de + 0a20b79
commit 65d8ca0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,7 +38,7 @@ jobs:
       GO111MODULE: "on"
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2-beta
+        uses: actions/setup-go@v2.1.3
         with:
           go-version: 1.14.x
 

diff --git a/.version b/.version
@@ -1 +1 @@
-version=0.2.0
+version=0.3.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [unreleased](https://github.com/NodeFactoryIo/vedran-daemon/tree/HEAD)
+
+[Full Changelog](https://github.com/NodeFactoryIo/vedran-daemon/compare/v0.3.0...HEAD)
+
+## [v0.3.0](https://github.com/NodeFactoryIo/vedran-daemon/tree/v0.3.0)
+
+[Full Changelog](https://github.com/NodeFactoryIo/vedran-daemon/compare/v0.2.0...v0.3.0)
+
+### Fixed
+
+### Added
+- Added websocket support [\#49](https://github.com/NodeFactoryIo/vedran-daemon/pull/49) ([mpetrun5](https://github.com/mpetrun5))
+
+### Changed
+
+
 ## [v0.2.0](https://github.com/NodeFactoryIo/vedran-daemon/tree/v0.2.0)
 
 [Full Changelog](https://github.com/NodeFactoryIo/vedran-daemon/compare/v0.1.2...v0.2.0)

diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ Flags:
       --log-level string        Level of logging (eg. debug, info, warn, error) (default "info")
       --node-metrics string     Polkadot node metrics url (default "localhost:9615")
       --node-rpc string         Polkadot node rpc url (default "localhost:9933")
+      --node-ws string         Polkadot node ws url (default "localhost:9944")
       --payout-address string   Payout address to which reward tokens will be sent (required)
 ```
 ## Starting daemon
@@ -79,6 +80,8 @@ node and load balancer on registration which communicate via daemon used as a pr
 
 `--node-rpc` - local url to node rpc endpoint - **DEFAULT** [http://localhost:9933]
 
+`--node-ws` - local url to node websocket rpc endpoint - **DEFAULT** [http://localhost:9944]
+
 ## Development
 
 

diff --git a/cmd/start.go b/cmd/start.go
@@ -19,13 +19,15 @@ var (
 	logLevel       string
 	logFile        string
 	nodeRPCURL     string
+	nodeWSURL      string
 	nodeMetricsURL string
 	id             string
 	lbBaseURL      string
 	payoutAddress  string
 	lbURL          *url.URL
 	metricsURL     *url.URL
 	rpcURL         *url.URL
+	wsURL          *url.URL
 )
 
 var startCmd = &cobra.Command{
@@ -62,12 +64,18 @@ var startCmd = &cobra.Command{
 			return fmt.Errorf("Failed parsing rpc url: %v", err)
 		}
 
+		wsURL, err = url.Parse(nodeWSURL)
+		if err != nil {
+			return fmt.Errorf("Failed parsing ws url: %v", err)
+		}
+
 		return nil
 	},
 }
 
 func init() {
 	startCmd.Flags().StringVar(&nodeRPCURL, "node-rpc", "http://localhost:9933", "Polkadot node rpc url")
+	startCmd.Flags().StringVar(&nodeWSURL, "node-ws", "http://localhost:9944", "Polkadot node websocket url")
 	startCmd.Flags().StringVar(&nodeMetricsURL, "node-metrics", "http://localhost:9615", "Polkadot node metrics url")
 	startCmd.Flags().StringVar(&id, "id", "", "Vedran-daemon id string (required)")
 	startCmd.Flags().StringVar(&lbBaseURL, "lb", "", "Target load balancer url (required)")
@@ -88,6 +96,7 @@ func start(cmd *cobra.Command, _ []string) error {
 	telemetry := telemetry.NewTelemetry()
 	tunnel := &tunnel.Tunnel{
 		NodeRPCURL: rpcURL,
+		NodeWSURL:  wsURL,
 	}
 
 	err := run.Start(tunnel, lbClient, nodeClient, telemetry, id, payoutAddress)

diff --git a/internal/tunnel/tunnel.go b/internal/tunnel/tunnel.go
@@ -20,6 +20,7 @@ const (
 // Tunnel is tunnel connection with load balancer
 type Tunnel struct {
 	NodeRPCURL *url.URL
+	NodeWSURL  *url.URL
 }
 
 // Tunneler defines methods for connecting to load balancer tunnel
@@ -35,11 +36,16 @@ func (t *Tunnel) StartTunnel(nodeID string, tunnelServerAddress string, token st
 	c, err := client.NewClient(&client.ClientConfig{
 		ServerAddress: tunnelServerAddress,
 		Tunnels: map[string]*client.Tunnel{
-			"default": {
+			"http": {
 				Protocol:   Protocol,
 				Addr:       t.NodeRPCURL.Host,
 				RemoteAddr: RemoteAddr,
 			},
+			"ws": {
+				Protocol:   Protocol,
+				Addr:       t.NodeWSURL.Host,
+				RemoteAddr: RemoteAddr,
+			},
 		},
 		Logger:    log.NewEntry(log.New()),
 		AuthToken: token,