From 0e882f1b97a9365370239eaec72d938a9faf1671 Mon Sep 17 00:00:00 2001
From: Samuel Hawksby-Robinson <samuel@samyoul.com>
Date: Thu, 15 Aug 2024 10:31:47 +0100
Subject: [PATCH] feat(rpc_user_agent)_: Added application version to the RPC
 user client

---
 rpc/client.go      | 28 ++++++++++++++--------------
 rpc/client_test.go |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/rpc/client.go b/rpc/client.go
index caf9e75a3..16e997692 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"net/url"
 	"reflect"
-	"runtime"
 	"sync"
 	"time"
 
@@ -18,6 +17,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	gethrpc "github.com/ethereum/go-ethereum/rpc"
 
+	appCommon "github.com/status-im/status-go/common"
 	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/rpc/chain"
 	"github.com/status-im/status-go/rpc/network"
@@ -34,13 +34,16 @@ const (
 	providerInfura      = "infura"
 	ProviderStatusProxy = "status-proxy"
 
+	mobile  = "mobile"
+	desktop = "desktop"
+
 	// rpcUserAgentFormat 'procurator': *an agent representing others*, aka a "proxy"
 	// allows for the rpc client to have a dedicated user agent, which is useful for the proxy server logs.
-	rpcUserAgentFormat = "procuratee-%s/1.0"
+	rpcUserAgentFormat = "procuratee-%s/%s"
 
 	// rpcUserAgentUpstreamFormat a separate user agent format for upstream, because we should not be using upstream
 	// if we see this user agent in the logs that means parts of the application are using a malconfigured http client
-	rpcUserAgentUpstreamFormat = "procuratee-%s-upstream/1.0"
+	rpcUserAgentUpstreamFormat = "procuratee-%s-upstream/%s"
 )
 
 // List of RPC client errors.
@@ -50,20 +53,17 @@ var (
 
 var (
 	// rpcUserAgentName the user agent
-	rpcUserAgentName         = fmt.Sprintf(rpcUserAgentFormat, "no-GOOS")
-	rpcUserAgentUpstreamName = fmt.Sprintf(rpcUserAgentUpstreamFormat, "no-GOOS")
+	rpcUserAgentName         = fmt.Sprintf(rpcUserAgentFormat, "no-GOOS", params.Version)
+	rpcUserAgentUpstreamName = fmt.Sprintf(rpcUserAgentUpstreamFormat, "no-GOOS", params.Version)
 )
 
 func init() {
-	switch runtime.GOOS {
-	case "android", "ios":
-		mobile := "mobile"
-		rpcUserAgentName = fmt.Sprintf(rpcUserAgentFormat, mobile)
-		rpcUserAgentUpstreamName = fmt.Sprintf(rpcUserAgentUpstreamFormat, mobile)
-	default:
-		desktop := "desktop"
-		rpcUserAgentName = fmt.Sprintf(rpcUserAgentFormat, desktop)
-		rpcUserAgentUpstreamName = fmt.Sprintf(rpcUserAgentUpstreamFormat, desktop)
+	if appCommon.IsMobilePlatform() {
+		rpcUserAgentName = fmt.Sprintf(rpcUserAgentFormat, mobile, params.Version)
+		rpcUserAgentUpstreamName = fmt.Sprintf(rpcUserAgentUpstreamFormat, mobile, params.Version)
+	} else {
+		rpcUserAgentName = fmt.Sprintf(rpcUserAgentFormat, desktop, params.Version)
+		rpcUserAgentUpstreamName = fmt.Sprintf(rpcUserAgentUpstreamFormat, desktop, params.Version)
 	}
 }
 
diff --git a/rpc/client_test.go b/rpc/client_test.go
index 68e749178..3e7e46b91 100644
--- a/rpc/client_test.go
+++ b/rpc/client_test.go
@@ -198,6 +198,6 @@ func TestGetClientsUsingCache(t *testing.T) {
 }
 
 func TestUserAgent(t *testing.T) {
-	require.Equal(t, "procuratee-desktop/1.0", rpcUserAgentName)
-	require.Equal(t, "procuratee-desktop-upstream/1.0", rpcUserAgentUpstreamName)
+	require.Equal(t, "procuratee-desktop/", rpcUserAgentName)
+	require.Equal(t, "procuratee-desktop-upstream/", rpcUserAgentUpstreamName)
 }